Merge branch 'master' into dpo/switch-to-skypack

src/styles/base/table.scss

@@ -154,14 +154,13 @@
   [name='button'] {
 
     input[type='submit'] {
-      @extend
-      .button,
-      .text-bold,
-      .text-uppercase,
-      .reversed,
-      .button-secondary,
-      .bordered,
-      .desktop-btn-margin__left;
+      @extend .button;
+      @extend .text-bold;
+      @extend .text-uppercase;
+      @extend .reversed;
+      @extend .button-secondary;
+      @extend .bordered;
+      @extend .desktop-btn-margin__left;
     }
   }
 

src/styles/index.scss

 @charset "UTF-8";
 
-@import '../../node_modules/include-media/dist/include-media';
-@import '../../node_modules/normalize.css/normalize';
+@import 'normalize.css';
 
 @import 'abstracts/fonts';
 @import 'abstracts/variables';
 @import 'abstracts/mixins';
 @import 'components/loader';
-@import 'components/icons/index';
+@import 'components/icons';
 @import 'base/main';
 @import 'base/about';
 
 #viewport {
     display: flex;
     flex: 1;
-    /*height: auto;
-    min-height: 100vh;*/
     overflow-y: auto;
-    @import 'components/index';
-    @import 'layout/members/index';
-    @import 'layout/job-offers/index';
-    @import 'layout/user/index';
-    @import 'layout/events/index';    
-    @import 'layout/resources/index';
-    @import 'layout/dashboard/index';
-    @import 'layout/polls/index';
+    @import 'components';
+    @import 'layout/members';
+    @import 'layout/job-offers';
+    @import 'layout/user';
+    @import 'layout/events';    
+    @import 'layout/resources';
+    @import 'layout/dashboard';
+    @import 'layout/polls';
 }

src/sw.js

-const CACHE_NAME = 'hubl-store';
+const CACHE_NAME = 'hubl-store-cnt82i';
 
 self.addEventListener('install', function (e) {
   self.skipWaiting();
@@ -30,84 +30,86 @@ self.addEventListener('activate', function (e) {
   self.clients.claim();
 });
 
-self.addEventListener('fetch', function (event) {
-  let requestURL = new URL(event.request.url);
-  if (requestURL.origin == location.origin) {
-    // Static asset, cache then network
-    event.respondWith(
-      caches.open(CACHE_NAME).then(function (cache) {
-        return cache.match(event.request).then(function (response) {
-          var fetchPromise = fetch(event.request).then(function (networkResponse) {
-            cache.put(event.request, networkResponse.clone());
-            return networkResponse;
+if(process.env.NODE_ENV === 'production'){
+  self.addEventListener('fetch', function (event) {
+    let requestURL = new URL(event.request.url);
+    if (requestURL.origin == location.origin) {
+      // Static asset, cache then network
+      event.respondWith(
+        caches.open(CACHE_NAME).then(function (cache) {
+          return cache.match(event.request).then(function (response) {
+            var fetchPromise = fetch(event.request).then(function (networkResponse) {
+              cache.put(event.request, networkResponse.clone());
+              return networkResponse;
+            });
+            return response || fetchPromise;
           });
-          return response || fetchPromise;
-        });
-      }),
-    );
-  } else {
-    if (
-      event.request.method == 'POST' ||
-      event.request.method == 'PUT'
-    ) {
-      // disabled: lead to cors errors
-      // // POST/PUT to api, rewrite the cache
-      // event.respondWith(
-      //   caches.open(CACHE_NAME + '-api').then(function (cache) {
-      //     return fetch(event.request).then(function (response) {
-      //       cache.put(event.request, response.clone());
-      //       return response;
-      //     })
-      //   }));
-      // api: no cache
-      event.respondWith(fetch(event.request));
-    } else if (
-      /matomo/.test(requestURL.origin) ||
-      /sentry/.test(requestURL.origin) ||
-      /jabber/.test(requestURL.origin) ||
-      /xmpp/.test(requestURL.origin)
-    ) {
-      // analytics, always distant
-      event.respondWith(fetch(event.request));
+        }),
+      );
     } else {
       if (
-        /unpkg/.test(requestURL.origin) ||
-        /skypack/.test(request.origin) ||
-        /jspm/.test(requestURL.origin) ||
-        /jsdeliver/.test(requestURL.origin) ||
-        /cdn/.test(requestURL.origin) ||
-        /googleapis/.test(requestURL.origin)
+        event.request.method == 'POST' ||
+        event.request.method == 'PUT'
       ) {
-        // cdn: cache then network
-        event.respondWith(
-          caches.open(CACHE_NAME + '-cdn').then(function (cache) {
-            return cache.match(event.request).then(function (response) {
-              var fetchPromise = fetch(event.request).then(function (networkResponse) {
-                cache.put(event.request, networkResponse.clone());
-                return networkResponse;
-              });
-              return response || fetchPromise;
-            });
-          }),
-        );
-      } else {
         // disabled: lead to cors errors
-        // // api: distant then cache
+        // // POST/PUT to api, rewrite the cache
         // event.respondWith(
-        //   fetch(event.request)
-        //   .then((response) => {
-        //     caches.open(CACHE_NAME + '-api').then(function (cache) {
+        //   caches.open(CACHE_NAME + '-api').then(function (cache) {
+        //     return fetch(event.request).then(function (response) {
         //       cache.put(event.request, response.clone());
         //       return response;
-        //     });
-        //   })
-        //   .catch(() => {
-        //     return caches.match(event.request);
-        //   })
-        // );
+        //     })
+        //   }));
         // api: no cache
         event.respondWith(fetch(event.request));
+      } else if (
+        /matomo/.test(requestURL.origin) ||
+        /sentry/.test(requestURL.origin) ||
+        /jabber/.test(requestURL.origin) ||
+        /xmpp/.test(requestURL.origin)
+      ) {
+        // analytics, always distant
+        event.respondWith(fetch(event.request));
+      } else {
+        if (
+          /unpkg/.test(requestURL.origin) ||
+          /skypack/.test(requestURL.origin) ||
+          /jspm/.test(requestURL.origin) ||
+          /jsdeliver/.test(requestURL.origin) ||
+          /cdn/.test(requestURL.origin) ||
+          /googleapis/.test(requestURL.origin)
+        ) {
+          // cdn: cache then network
+          event.respondWith(
+            caches.open(CACHE_NAME + '-cdn').then(function (cache) {
+              return cache.match(event.request).then(function (response) {
+                var fetchPromise = fetch(event.request).then(function (networkResponse) {
+                  cache.put(event.request, networkResponse.clone());
+                  return networkResponse;
+                });
+                return response || fetchPromise;
+              });
+            }),
+          );
+        } else {
+          // disabled: lead to cors errors
+          // // api: distant then cache
+          // event.respondWith(
+          //   fetch(event.request)
+          //   .then((response) => {
+          //     caches.open(CACHE_NAME + '-api').then(function (cache) {
+          //       cache.put(event.request, response.clone());
+          //       return response;
+          //     });
+          //   })
+          //   .catch(() => {
+          //     return caches.match(event.request);
+          //   })
+          // );
+          // api: no cache
+          event.respondWith(fetch(event.request));
+        }
       }
     }
-  }
-});
\ No newline at end of file
+  });
+}
\ No newline at end of file

src/templates/hubl-user-avatar.pug

-solid-widget(name='hubl-user-avatar')
-  template ${await value ? `<img src="${await value}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}

src/page-admin.pug → src/views/page-admin.pug

 .views-container.sidebar-is-closed
   if endpoints.circles || (endpoints.get && endpoints.get.circles)
     #admin-circles(hidden, data-view="admin-circles")
-      include views/admin/page-admin-circles.pug
+      include partials/admin/page-admin-circles.pug
   if endpoints.projects || (endpoints.get && endpoints.get.projects)
     #admin-projects(hidden, data-view="admin-projects")
-      include views/admin/page-admin-projects.pug
+      include partials/admin/page-admin-projects.pug
   if (endpoints.users || (endpoints.get && endpoints.get.users))
     #admin-communities(hidden, data-view="admin-communities")
-      include views/admin/page-admin-communities.pug
+      include partials/admin/page-admin-communities.pug
 nav.jsRightMenu(role='navigation')
   solid-router(default-route='admin-circles')
     ul

src/page-circle.pug → src/views/page-circle.pug

@@ -13,15 +13,15 @@
     div.content-box__height
       solid-ac-checker(permission='acl:Read', bind-resources)
         #circle-chat(hidden, data-view="circle-chat")
-          include views/circle/page-circle-chat.pug
+          include partials/circle/page-circle-chat.pug
         #circle-information.content-box__height(hidden, data-view="circle-information")
-          include views/circle/page-circle-profile.pug
+          include partials/circle/page-circle-profile.pug
         #circle-events(hidden, data-view="circle-events")
-          include views/circle/page-circle-events.pug
+          include partials/circle/page-circle-events.pug
         #circle-resources(hidden, data-view="circle-resources")
-          include views/circle/page-circle-resources.pug
+          include partials/circle/page-circle-resources.pug
         #circle-polls(hidden, data-view="circle-polls")
-          include views/circle/page-circle-polls.pug
+          include partials/circle/page-circle-polls.pug
 
 nav.jsRightMenu(role='navigation')
   solid-router(default-route='circle-chat')

src/page-project.pug → src/views/page-project.pug

@@ -17,11 +17,11 @@
     div.content-box__height
       solid-ac-checker(permission='acl:Read', bind-resources)
         #project-chat(hidden, data-view="project-chat")
-          include views/project/page-project-chat.pug
+          include partials/project/page-project-chat.pug
         #project-information.content-box__height(hidden, data-view="project-information")
-          include views/project/page-project-profile.pug
+          include partials/project/page-project-profile.pug
         #project-picture(hidden, data-view="project-picture")
-          include views/project/page-project-picture.pug
+          include partials/project/page-project-picture.pug
 
 nav.jsRightMenu(role='navigation')
   solid-router(default-route='project-chat')

src/views/admin/page-admin-circles.pug → src/views/partials/admin/page-admin-circles.pug

@@ -11,7 +11,6 @@
   include ../circle/page-circle-left.pug
 
   #admin-circle-list.content-box__height(hidden, data-view="admin-circle-list")
-    include ../../templates/hubl-user-avatar.pug
 
     solid-widget(name='hubl-circle-owner')
       template
@@ -90,7 +89,7 @@
                 value-user.username='hubl-workaround-493'
                 widget-user.username='solid-form-hidden'
 
-                submit-button='Rejoindre'
+                submit-button=''
                 data-trans='submit-button=circle.list.buttonJoin'
               )
               hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')