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()
   })

package.json

 {
-  "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",

src/get_config.pug

-- var __env = locals[process.env.ENV]
-
--
-  for(k in __env){
-    eval(`var ${k} = __env[${JSON.stringify(k)}]`);
-  }
-  

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>"
+  //- )
 
   sib-display(
     bind-resources

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
+        

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'

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>"
+  //- )
 
   sib-display(
     bind-resources

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="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="dislikes"
+  //-   counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
+  //- )
 
   sib-display(
     bind-resources

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");
@@ -634,6 +647,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

src/styles/index.scss

@@ -768,7 +768,6 @@ footer#footer{
     background:var(--bg-block);
     height: auto;
     box-shadow: 0 2px 10px 0 rgba(0,0,0,0.14);
-    position: absolute;
     padding-top: 2rem;
     bottom: 0;
     width: 100%;