diff --git a/compile-pug.js b/compile-pug.js
index 4589b01d04d402e150e2eb683e976cd9c16f160d..ddb3ba2056e5191c5201e294e4d005f2bf98fb82 100644
--- a/compile-pug.js
+++ b/compile-pug.js
@@ -8,12 +8,15 @@ const chokidar = require('chokidar')
//Set default language
const default_lang = 'en'
-const pugFile = './src/index.pug'
+const pugDir = './src'
+const pugFile = `${pugDir}/index.pug`
//Set the translation directory
const dataDir = './translation'
const outDir = './www'
+const paramFile = './src/config.json'
+
//Compile custom function
async function compile() {
//Retrieve langues proposed
@@ -41,7 +44,7 @@ async function compile() {
)
}
- const options = JSON.parse(await fs.readFile('./src/config.json', 'utf-8'))
+ const options = JSON.parse(await fs.readFile(paramFile, 'utf-8'))
const pugFct = pug.compileFile(pugFile)
await fs.mkdir(outDir, { recursive: true })
@@ -64,7 +67,7 @@ async function compile() {
compile().then(() => {
if (!process.argv.includes('-w') && !process.argv.includes('--watch')) return
console.log('watching for changes…')
- chokidar.watch([pugFile, dataDir]).on('change', editedFilePath => {
+ chokidar.watch([`${pugDir}/**/*.pug`, `${dataDir}/**/*.yml`, paramFile]).on('change', editedFilePath => {
console.log(`\nchanged: ${editedFilePath}`)
compile()
})
diff --git a/package.json b/package.json
index c0eded1870a636c860ecb365eb7515dc68d96459..a838486e5bd3573eb58ff22cbc02fda8698459d4 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,11 @@
{
- "name": "Coop-starter",
+ "name": "coop-starter",
"version": "1.0.0",
"license": "MIT",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"scss": "node-sass -w ./src/styles/index.scss -o ./www/styles/",
"pug": "node ./compile-pug.js -w",
- "pugprod": "pug ./src/index.pug --out ./www/ --obj prod.json",
"copy-js": "cp ./src/scripts/*.js ./www/scripts/",
"copy-fonts": "cp -R ./src/fonts ./www",
"copy-images": "cp -R ./src/images ./www",
diff --git a/src/get_config.pug b/src/get_config.pug
deleted file mode 100644
index d2fd8950071161ce9bac35a518ac026d43a488cb..0000000000000000000000000000000000000000
--- a/src/get_config.pug
+++ /dev/null
@@ -1,7 +0,0 @@
-- var __env = locals[process.env.ENV]
-
--
- for(k in __env){
- eval(`var ${k} = __env[${JSON.stringify(k)}]`);
- }
-
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index fdc6ed46b9169e06ce317170a1a124a3624236f5..8966001885700234c1a93efc83566c38136e7a4a 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -80,19 +80,19 @@
//- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
//- </div>
- sib-display(
- bind-resources
- fields=""
- nested-field="likes"
- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>"
- )
-
- sib-display(
- bind-resources
- fields=""
- nested-field="dislikes"
- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
- )
+ //- sib-display(
+ //- bind-resources
+ //- fields=""
+ //- nested-field="likes"
+ //- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>"
+ //- )
+
+ //- sib-display(
+ //- bind-resources
+ //- fields=""
+ //- nested-field="dislikes"
+ //- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
+ //- )
p SHARE
sib-display.email-link(
diff --git a/src/includes/head.pug b/src/includes/head.pug
index f56002384b93bcf66a10bee7f5c0df2fdbcfad72..2536f32032ead71c333d5ab3b88ea565350b6918 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,10 +2,10 @@ head
title CoopStarter
meta(charset="utf-8")
script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
- script(type="module" src="https://unpkg.com/@startinblox/core")
- script(type="module" src="https://unpkg.com/@startinblox/router")
- script(type="module" src="https://unpkg.com/@startinblox/oidc")
- script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
+ script(type="module" src="https://unpkg.com/@startinblox/core@0.9")
+ script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
+ script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8")
+ script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.4")
script(src="https://kit.fontawesome.com/48014d2af3.js")
script(src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous")
script(src="/scripts/coopstarter.js")
@@ -17,4 +17,4 @@ head
"mentorProfile": "http://happy-dev.fr/owl/#mentor_profile",
"account": "http://happy-dev.fr/owl/#account"
}
-
\ No newline at end of file
+
diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index b9f62c266201792bc21d830aaaf3db320307be27..6159b93594c758cda68367aa4a5cd1352414cc09 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -17,7 +17,7 @@
naked
)
.dropdownWrapper
- sib-display#mentor-account-picture.dropdownLabel(
+ sib-display#user-account-picture.dropdownLabel(
bind-user
fields='account.picture',
widget-account.picture='cs-account-picture'
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 190dbabff8424cd1872b983c4819a7fba37c860a..be3b63b7bbb6a99e19b27862f53385c9a2b91b29 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -80,19 +80,19 @@
//- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
//- </div>
- sib-display(
- bind-resources
- fields=""
- nested-field="likes"
- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>"
- )
-
- sib-display(
- bind-resources
- fields=""
- nested-field="dislikes"
- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
- )
+ //- sib-display(
+ //- bind-resources
+ //- fields=""
+ //- nested-field="likes"
+ //- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>"
+ //- )
+
+ //- sib-display(
+ //- bind-resources
+ //- fields=""
+ //- nested-field="dislikes"
+ //- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
+ //- )
p SHARE
sib-display.email-link(
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 23af1c761799883dacae385a55347f93c950bd3d..104939c4ec52f30ff54fc5962342f666c2dcade8 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -80,19 +80,19 @@
//- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
//- </div>
- sib-display(
- bind-resources
- fields=""
- nested-field="likes"
- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>"
- )
-
- sib-display(
- bind-resources
- fields=""
- nested-field="dislikes"
- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
- )
+ //- sib-display(
+ //- bind-resources
+ //- fields=""
+ //- nested-field="likes"
+ //- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>"
+ //- )
+
+ //- sib-display(
+ //- bind-resources
+ //- fields=""
+ //- nested-field="dislikes"
+ //- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
+ //- )
p SHARE
sib-display.email-link(
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index b3d2e79ba141d654d0c9bd07a05a3a7688713840..781b4317d8d8a90cdb627dd7854cf5ad65116636 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -374,6 +374,22 @@ function initFileUpload(){
}
}
+/**
+ * Manage the like sender hidden form
+ * @param {*} event
+ * @param {*} userWhoSubmitLike
+ * @param {*} formSenderLike
+ */
+function fillSenderLike(userWhoSubmitLike, formSenderLike, currentResource) {
+ formSenderLike.querySelector(
+ "input[name='sender']"
+ ).value = JSON.stringify({ "@id": userWhoSubmitLike });
+ formSenderLike.querySelector(
+ "input[name='receiver_object_id']"
+ ).value = JSON.stringify({ "@id": currentResource });
+ receiver_object_id
+}
+
/**
* For entrepreneur dashboard only :
* As we cannot have multiple imbricated filtering with the native sib-display, we manage it manually.
@@ -402,11 +418,6 @@ function addProperFilterToSearchComponents(targetId) {
`input[name="name_keyword"]`
);
- let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
- let keyword_hidden_fields = baseElement.querySelectorAll(
- 'hidden-widget[name="search_for_a_resource"] input'
- );
-
if (keyword_field) {
let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
let keyword_hidden_fields = baseElement.querySelectorAll(
@@ -576,6 +587,8 @@ jQuery(document).ready(function($) {
linkDatasetToField(userAccountDataSrc, "improvement-dialog-form", "reviewer");
linkDatasetToField(userAccountDataSrc, "refusal-dialog-form", "reviewer");
linkDatasetToField(userAccountDataSrc, "change_status_request", "reviewer");
+ // linkDatasetToField(userAccountDataSrc, "add-like", "sender");
+ // linkDatasetToField(userAccountDataSrc, "add-dislike", "sender");
//On form submission, we sometime have to refresh a list.
refreshList("resource-creation-form", "resources-history");
@@ -639,6 +652,34 @@ jQuery(document).ready(function($) {
var userWhoSubmitReport = userAccountDataSrc.dataset.src
var formBrokenLink = document.getElementById("report-broken-link-mentor");
fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink);
+
+ // Fill the hidden like-form
+ document.querySelector('sib-auth').getUser().then(data=> {
+ let targetFormLike = document.getElementById('add-like');
+ targetFormLike.addEventListener("populate", event => {
+ let resourceField = targetFormLike.querySelector(`input[name="sender"]`);
+ if (resourceField) {
+ resourceField.value = JSON.stringify(data);
+ resourceField.setAttribute(
+ "value",
+ JSON.stringify(data)
+ );
+ }
+ });
+ let targetFormDislike = document.getElementById('add-dislike');
+ targetFormDislike.addEventListener("populate", event => {
+ let resourceField = targetFormDislike.querySelector(`input[name="sender"]`);
+ if (resourceField) {
+ resourceField.value = JSON.stringify(data);
+ resourceField.setAttribute(
+ "value",
+ JSON.stringify(data)
+ );
+ }
+ });
+
+ })
+
});
//Init the form file behaviour