Save widgets reload

packages/cms/app.js

@@ -97,7 +97,7 @@ function serveSites (req, res, next) {
 function serveSite(req, res, siteConfig, forceRestart) {
   const runner = Promise.promisify(run);
   let dbName = siteConfig.config && siteConfig.config.cms && siteConfig.config.cms.dbName ? siteConfig.config.cms.dbName : '';
-
+  
   // check if the mongodb database exist. The name for databse
   return dbExists(dbName).then((exists) => {
       // if default DB is set

packages/cms/config/contentWidgets.js

@@ -28,7 +28,7 @@ const contentWidgets = {
   },
   'cookie-warning': {
     adminOnly: true,
-    hideByDefault: true
+    hideByDefault: false
   },
   'date-bar': {},
   'idea-form': {

packages/cms/lib/modules/accordeon-widgets/public/js/accordeon.js

@@ -1,29 +1,33 @@
-(function () {
-    $(document).ready(function () {
-        $('.accordeon-item .title').on('click', function () {
-
-            var $accordeonItem = $(this).closest('.accordeon-item');
-
-            if ($accordeonItem.hasClass('closed')) {
-                // Close all open items
-                closeItem($('.accordeon-item:not(.closed)'));
-
-                // Open the clicked item
-                openItem($accordeonItem);
-            } else {
-                // Close all open items
-                closeItem($('.accordeon-item:not(.closed)'));
-            }
-        });
-    });
-
+apos.define('accordeon-widgets', {
+  extend: 'openstad-widgets',
+  construct: function (self, options) {
+    self.play = function ($widget, data, options) {
+
+      $widget.find('.accordeon-item .title').on('click', function () {
+
+        var $accordeonItem = $(this).closest('.accordeon-item');
+
+        if ($accordeonItem.hasClass('closed')) {
+          // Close all open items
+          closeItem($('.accordeon-item:not(.closed)'));
+
+          // Open the clicked item
+          openItem($accordeonItem);
+        } else {
+          // Close all open items
+          closeItem($widget.find('.accordeon-item:not(.closed)'));
+        }
+      });
+    }
+
     function closeItem($el) {
-        $el.addClass('closed').find('.description').css({maxHeight: 0});
+      $el.addClass('closed').find('.description').css({maxHeight: 0});
     }
-    
+
     function openItem($el) {
-        // Get height of description and set it as maxheight on the accordeon item
-        var height = $el.find('.description p').outerHeight();
-        $el.removeClass('closed').find('.description').css({maxHeight: height});
+      // Get height of description and set it as maxheight on the accordeon item
+      var height = $el.find('.description p').outerHeight();
+      $el.removeClass('closed').find('.description').css({maxHeight: height});
     }
-})();
+  }
+});

packages/cms/lib/modules/arguments-form-widgets/public/js/main.js

@@ -1,9 +1,26 @@
-/**
- * Show not logged in users the message they have to login
- */
-$('.argument-form.not-logged-in textarea').click(function (ev) {
-//   ev.preventDefault();
-  // window.location.hash = 'login-required';
+apos.define('arguments-form-widgets', {
+  extend: 'openstad-widgets',
+  construct: function (self, options) {
+    self.play = function ($widget, data, options) {
+      $widget.find('.argument-form').each(function(){
+        bindArgumentValidation($(this));
+      });
+
+      $widget.on('submit', '.argument-form', function (ev) {
+        ev.preventDefault();
+        var $form = $(this);
+        //clean up, in case already submitted before
+       self.submit($form);
+      });
+    }
+
+    self.submit = function($form) {
+      $form.unbind();
+      $form.data("validator", null);
+      bindArgumentValidation($form);
+      $form.submit();
+    }
+  }
 });
 
 function bindArgumentValidation ($form){
@@ -57,21 +74,3 @@ function bindArgumentValidation ($form){
     }
   });
 }
-
-/**
- * Handle form validation and submit form with ajax
- */
-$(document).ready(function(){
-    $('.argument-form').each(function(){
-      bindArgumentValidation($(this));
-    });
-    $('body').on('submit', '.argument-form', function (ev) {
-      ev.preventDefault();
-      var $form = $(this);
-      //clean up, in case already submitted before
-      $form.unbind();
-      $form.data("validator", null);
-      bindArgumentValidation($form);
-      $form.submit();
-    });
-});

packages/cms/lib/modules/arguments-widgets/public/js/main.js

@@ -1,46 +1,54 @@
-/**
- * Make sure after creating the user is scrolled to the comment
- */
-window.onload = function() { // using (function {} {})() happens too early
-  var arguments = $('.argument');
-  if (arguments.length > 0) {
-    var hash = window.location.hash;
-    if (hash.startsWith('#arg') && $(hash).length >0) {
-      $('html, body').animate({
-        scrollTop: $(hash).offset().top
-      }, 600, function() { });
-    }
-  }
-
-
-};
-
-$(document).ready(function() {
-  $('body').on('click',  '.argument-edit, .argument-edit-cancel', function (ev) {
-      ev.preventDefault();
-      $(this).closest('.argument').toggleClass('edit-mode');
-  });
-
-  $('body').on('click', '.reaction-edit, .reaction-edit-cancel', function (ev) {
-      ev.preventDefault();
-      $(this).closest('.reaction').toggleClass('edit-mode');
-  });
-
-  $('body').on('click', '.reply-click', function (ev) {
-    ev.preventDefault();
-
-    if ($(this).hasClass('logged-in')) {
-      var $replyForm = $(this).closest('.argument').find('.reply-form');
-      var $argument = $(this).closest('.argument-container');
-      var $replyForm = $argument.find('.reply-form');
-
-      if ($replyForm.hasClass('active')) {
-        $replyForm.removeClass('active');
-      } else {
-        $replyForm.addClass('active');
-        $replyForm.find('textarea').focus();
+apos.define('arguments-widgets', {
+  extend: 'openstad-widgets',
+  construct: function (self, options) {
+    self.play = function ($widget, data, options) {
+      var arguments = $widget.find('.argument');
+      if (arguments.length > 0) {
+        var hash = window.location.hash;
+
+        /**
+         * Make sure after creating the user is scrolled to the comment
+         */
+        if (hash.startsWith('#arg') && $(hash).length >0) {
+          $('html, body').animate({
+            scrollTop: $(hash).offset().top
+          }, 600, function() { });
+        }
       }
-    }
-  })
 
-})
+      $widget.on('submit', '.argument-form', function (ev) {
+        ev.preventDefault();
+        var $form = $(this);
+        //clean up, in case already submitted before
+        apos.modules['arguments-form-widgets'].submit($form);
+      });
+
+      $widget.on('click',  '.argument-edit, .argument-edit-cancel', function (ev) {
+        ev.preventDefault();
+        $(this).closest('.argument').toggleClass('edit-mode');
+      });
+
+      $widget.on('click', '.reaction-edit, .reaction-edit-cancel', function (ev) {
+        ev.preventDefault();
+        $(this).closest('.reaction').toggleClass('edit-mode');
+      });
+
+      $widget.on('click', '.reply-click', function (ev) {
+        ev.preventDefault();
+
+        if ($(this).hasClass('logged-in')) {
+          var $replyForm = $(this).closest('.argument').find('.reply-form');
+          var $argument = $(this).closest('.argument-container');
+          var $replyForm = $argument.find('.reply-form');
+
+          if ($replyForm.hasClass('active')) {
+            $replyForm.removeClass('active');
+          } else {
+            $replyForm.addClass('active');
+            $replyForm.find('textarea').focus();
+          }
+        }
+      })
+    }
+  }
+});

packages/cms/lib/modules/attachment-upload/index.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
-const multer            = require('multer');
-const upload            = multer();
+const multer = require('multer');
+const upload = multer();
 
 module.exports = {
   extend:    'apostrophe-widgets',
@@ -14,13 +14,19 @@ module.exports = {
 
         // check user - this module is used by the admin server which has the same SITE_API_KEY
         // TODO: this should be done through generic middleware that does a more sensible check
-        let authHeader = req.headers['x-authorization'];
+        const authHeader = req.headers['x-authorization'];
         if (!authHeader || authHeader != process.env.SITE_API_KEY) return next('Iznogood');
 
         // collect files
-        let promises = [];
+        const promises = [];
         req.files.forEach((file, i) => {
-          let path = 'public/uploads/attachments/' + file.originalname;
+          const attachmentsPath = 'public/uploads/attachments';
+          const path = `${attachmentsPath}/${file.originalname}`;
+
+          if(fs.existsSync(attachmentsPath) === false) {
+            fs.mkdirSync(attachmentsPath);
+          }
+
           promises.push(
             new Promise( (resolve,reject) => {
               // existing files are ignored; it  is more then likely the same file
@@ -31,7 +37,7 @@ module.exports = {
                 };
                 console.log('Create file', file.originalname);
                 fs.writeFile(path, file.buffer, err => {
-                  err ? reject() : resolve()
+                  err ? reject(err) : resolve()
                 });
               });
             })
@@ -42,10 +48,16 @@ module.exports = {
         Promise
           .all(promises)
           .then(result => {
+            // Todo: create consistent and better api success response
             res.json({res: 'ok'})
           })
-          .catch(next)
-
+          .catch(error => {
+            console.error(error);
+            res.status(500);
+            // Todo: create consistent and better api error response
+            res.json({res: 'error'});
+          })
+
       });
   }
 }

packages/cms/lib/modules/cookie-warning-widgets/index.js

@@ -3,7 +3,7 @@
  *
  */
 module.exports = {
-  extend: 'apostrophe-widgets',
+  extend: 'openstad-widgets',
   alias: 'cookieWarning',
   label: 'Cookies preference',
   addFields: [
@@ -67,10 +67,10 @@ module.exports = {
     /**
      * Add the cookieConsent to the req.data object so it ca be used in widget templates for checking before loading
      */
-    self.apos.app.use(function(req, res, next){
-        req.data.cookieConsent = req.data.global.useCookieWarning ? req.cookies && req.cookies['cookie-consent'] == 1 : true;
-        next();
-    });
+    self.expressMiddleware = (req, res, next) => {
+      req.data.cookieConsent = req.data.global.useCookieWarning ? req.cookies && req.cookies['cookie-consent'] == 1 : true;
+      next();
+    };
 
     const superLoad = self.load;
     self.load = function(req, widgets, next) {

packages/cms/lib/modules/cookie-warning-widgets/public/js/main.js

@@ -1,11 +1,11 @@
 apos.define('cookie-warning-widgets', {
-    extend: 'apostrophe-widgets',
+    extend: 'openstad-widgets',
     construct: function(self, options) {
 
         self.play = function($widget, data, options) {
             $widget.find('.cookie-button').click(function(event) {
                 event.preventDefault();
-                
+
                 if(
                   (self.getCookieConsent() && $(this).data('allow') === true) ||
                   (!self.getCookieConsent() && $(this).data('allow') === false)
@@ -32,8 +32,9 @@ apos.define('cookie-warning-widgets', {
     }
 });
 
-$(document).ready(function() {
+apos.utils.onReady(function() {
     var cookieConsent = apos.cookieWarning.getCookieConsent();
+
     if (typeof cookieConsent == 'undefined') {
         document.getElementById('cookiewarning-container-top') && document.getElementById('cookiewarning-container-top').classList.remove("hidden")
     } else {

packages/cms/lib/modules/cookie-warning-widgets/views/widget.html

@@ -3,6 +3,6 @@
     <strong>{{ data.widget.statusText }}</strong> {%if data.cookieConsent %}{{ data.widget.statusAllowText }}{% else %}{{ data.widget.statusDenyText }}{% endif %}<br>
     <strong>{{ data.widget.description }}</strong><br>
     <a href="#" class="cookie-button cookie-button-{%if data.cookieConsent %}gray{% else %}blue{% endif %}" data-allow="true" title="{{ data.widget.buttonAllowText }}">{{ data.widget.buttonAllowText }}</a>
-    <a href="#" class="cookie-button cookie-button-{%if data.cookieConsent %}white{% else %}gray{% endif %}" data-allow="false" title="{{ data.widget.buttonDenyText }}>{{ data.widget.buttonDenyText }}</a>
+    <a href="#" class="cookie-button cookie-button-{%if data.cookieConsent %}white{% else %}gray{% endif %}" data-allow="false" title="{{ data.widget.buttonDenyText }}">{{ data.widget.buttonDenyText }}</a>
   </div>
 </div>