Feat/events resource page

.github/workflows/integrate.yml

@@ -0,0 +1,67 @@
+name: Integration
+on:
+  pull_request:
+    branches: [master]
+
+jobs:
+  # Build job creates a docker image and publishes it to the registry
+  build:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_PUBLIC_USERNAME: savvycodes
+      DOCKER_IMAGE_NAME: openstad-frontend
+      FRONTEND_MONGO_SCHEME: mongodb://mongo
+      FRONTEND_MONGO_DB_HOST: mongo
+      FRONTEND_MONGO_PORT: 27017
+      DEFAULT_HOST: localhost:4444
+      APP_URL: http://localhost:4444
+      FRONTED_PORT: 4444
+      COOKIE_SECURE_OFF: yes
+      API: http://localhost:8111
+      IMAGE_API_URL: http://localhost:3333
+      IMAGE_API_ACCESS_TOKEN: xxxx
+      SITE_API_KEY: xxxx
+
+    # Setup docker and mongodb services
+    services:
+      docker:
+        image: docker
+      mongodb:
+        image: mongo:4
+        ports:
+          - 27017:27017
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set outputs
+        id: vars
+        run: |
+          echo "::set-output name=sha_short::$(echo ${{ github.sha }} | cut -c1-7)"
+          echo "::set-output name=branch::$(echo ${{github.event.pull_request.head.ref}} | sed 's/\//-/g')"
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+
+      - name: Install node_modules
+        run: npm ci
+
+      # We skip tests for now
+
+      - name: Generate and bundle assets
+        run: |
+          mongo default --eval 'db.createUser({user:"ci",pwd:"test",roles:["readWrite"]});'
+          mkdir -p assets
+          NODE_ENV=production APOS_MINIFY=1 APOS_WORKFLOW=ON APOS_BUNDLE=assets MINIFY_JS='ON' node apostrophe.js apostrophe:generation --create-bundle assets
+
+      - name: Build container
+        run: docker build -t ${DOCKER_PUBLIC_USERNAME}/${DOCKER_IMAGE_NAME}:${{ steps.vars.outputs.branch }}-${{ steps.vars.outputs.sha_short }} .
+
+      - name: Login to Docker Hub
+        run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Publish container
+        run: docker push ${DOCKER_PUBLIC_USERNAME}/${DOCKER_IMAGE_NAME}:${{ steps.vars.outputs.branch }}-${{ steps.vars.outputs.sha_short }}

.gitignore

@@ -97,3 +97,5 @@ fabric.properties
 
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
+
+assets/

config/contentWidgets.js

@@ -1,78 +1,17 @@
 const contentWidgets = {
-  'admin': {
-    adminOnly: true
-  },
-  'resource-overview': {
-    adminOnly: true
-  },
-  'resource-form': {
-    adminOnly: true
-  },
-  'resource-representation': {
-    adminOnly: true
-  },
-  'agenda': {},
-  'accordeon': {},
-  'arguments-block': {
-    adminOnly: true
-  },
-  'arguments-form': {
+  '@savvycodes/openstad-event-planner': {
     adminOnly: true,
-    deprecated: true
   },
-  'arguments': {
+  '@savvycodes/openstad-event-browser': {
     adminOnly: true,
-    deprecated: true
-  },
-  'section': {
-    addLabel: 'Columns',
-    controls: {
-      movable: true,
-      removable: true,
-      position: 'bottom-left'
-    },
-  },
-  'slider': {
-  },
-  'counter': {
-    addLabel: 'Counter',
-  },
-  'cookie-warning': {
-    adminOnly: true
-  },
-  'date-bar': {},
-  'idea-form': {
-    adminOnly: true
-  },
-  'idea-map': {
-    adminOnly: true
   },
-  'idea-overview': {},
-  'idea-single': {
-    adminOnly: false
-  },
-  'ideas-on-map': {
-    addLabel: 'Ideeen op een kaart',
-    adminOnly: true
-  },
-  'previous-next-button-block': {
-    addLabel: 'Vorige volgende knoppen',
-  },
-  'iframe': {
-    adminOnly: true
-  },
-  'image': {},
-  'info-bar': {},
-  'link': {},
-  'list': {},
-  'begroot': {
-    addLabel: 'Begroot (deprecated, please use Participatory budgetting)',
+  'decision-tree': {
     adminOnly: true,
     readOnly: true,
   },
   'participatory-budgeting': {
     addLabel: 'Participatory budgetting',
-    adminOnly: true
+    adminOnly: true,
   },
   'choices-guide': {
     addLabel: 'Keuzewijzer',
@@ -81,91 +20,61 @@ const contentWidgets = {
     addLabel: 'Keuzewijzer resultaten',
   },
   'main-image': {
-    adminOnly: true
+    adminOnly: true,
   },
   'apostrophe-rich-text': {
-    toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-',],
-    styles: [
-      {name: 'Paragraph', element: 'p'}
+    toolbar: [
+      'Styles',
+      'Bold',
+      'Italic',
+      'Link',
+      'Unlink',
+      'BulletedList',
+      '-',
+      'JustifyLeft',
+      'JustifyCenter',
+      'JustifyRight',
+      'JustifyBlock',
+      '-',
     ],
+    styles: [{ name: 'Paragraph', element: 'p' }],
     controls: {
       movable: true,
       removable: true,
-      position: 'top-left'
-    }
+      position: 'top-left',
+    },
   },
   'speech-bubble': {
     controls: {
-      position: 'top-left'
+      position: 'top-left',
     },
   },
-  'title': {},
+  title: {},
   'user-form': {
-    adminOnly: true
+    adminOnly: true,
   },
   'local-video': {
     addLabel: 'Video (upload)',
   },
   'apostrophe-video': {
     addLabel: 'Video (3d party, youtube, vimeo, etc.)',
   },
-  'location': {
-    adminOnly: true
+  location: {
+    adminOnly: true,
   },
-  'share': {
-    adminOnly: true
+  share: {
+    adminOnly: true,
   },
   'recource-raw': {
-    adminOnly: true
+    adminOnly: true,
   },
   'recource-image': {
-    adminOnly: true
+    adminOnly: true,
   },
   'recource-like': {
-    adminOnly: true
+    adminOnly: true,
+  },
+  'apostrophe-forms': {
+    forceDisplay: true,
   },
-  'resource-admin': {
-    adminOnly: true
-  }
 };
-
-exports.getAdminWidgets = () => {
-  const filteredContentWidgets = {};
-
-  Object.keys(contentWidgets).forEach(function(key) {
-    filteredContentWidgets[key] = contentWidgets[key];
-
-    /**
-     * Edit the settings for admin, so they can  edit all modules.
-     */
-    if (filteredContentWidgets[key].adminOnly) {
-      //readonly = false shows the module from the menu
-      filteredContentWidgets[key].readOnly = false;
-      filteredContentWidgets[key].edit = true;
-    }
-
-  });
-
-  return filteredContentWidgets;
-}
-
-exports.getEditorWidgets = () => {
-  const filteredContentWidgets = {};
-
-  Object.keys(contentWidgets).forEach(function(key) {
-    filteredContentWidgets[key] = contentWidgets[key];
-
-    /**
-     * Edit the settings for editors, so they can only edit specific modules.
-     */
-    if (filteredContentWidgets[key].adminOnly) {
-      //readonly hides the module from the menu
-      filteredContentWidgets[key].readOnly = true;
-      //setting edit to false removes the edit controls for this module
-      filteredContentWidgets[key].edit = false;
-    }
-
-  });
-
-  return filteredContentWidgets;
-}

config/resources.js

@@ -0,0 +1,16 @@
+module.exports = [
+  {
+    label: 'Event',
+    value: 'event',
+    resourceEndPoint: 'event',
+    //config is used in API config
+    configKey: 'events',
+  },
+  {
+    label: 'Organisation',
+    value: 'organisation',
+    resourceEndPoint: 'organisation',
+    //config is used in API config
+    configKey: 'organisations',
+  },
+];

config/smtp.js

@@ -0,0 +1,11 @@
+require('dotenv').config();
+
+module.exports = {
+    port: process.env.SMTP_PORT || 1025,
+    host: process.env.SMTP_HOST ||'127.0.0.1',
+    auth: {
+        user: process.env.SMTP_USER || 'user',
+        pass: process.env.SMTP_PASS ||'pass'
+    },
+    secure: process.env.SMTP_SECURE && process.env.SMTP_SECURE === 'true' ? true : false
+}

index.js

@@ -1,12 +1,50 @@
+require('dotenv').config();
 const openstadCms = require('@openstad/cms');
 
-require('dotenv').config();
+const contentWidgets = require('./config/contentWidgets')
+const smtp = require('./config/smtp')
+const resources = require('./config/resources')
 
 var apos = openstadCms.site({
   bundles: ['@openstad/cms'],
   // See lib/modules for basic project-level configuration of our modules
   // responsible for serving static assets, managing page templates and
   // configuring user accounts.
 
-  modules: {  }
+  modules: {
+    'resource-pages': {
+      resources: resources,
+    },
+    'resource-representation-widgets': {
+      resources: resources,
+    },
+    'resource-overview-widgets': {
+      resources: resources,
+    },
+    'resource-form-widgets': {
+      resources: resources,
+    },
+    '@savvycodes/openstad-event-global-settings': {},
+    '@savvycodes/openstad-event-planner-widgets': {},
+    '@savvycodes/openstad-event-browser-widgets': {},
+    '@savvycodes/openstad-event-favorites-widgets': {},
+    'apostrophe-forms': {
+      // Best practice: set to first or last so that inputs are nested in labels
+      // and easier to style
+      optionLabelPosition: 'last',
+      classPrefix: 'os-form',
+    },
+    'apostrophe-forms-widgets': {},
+    // Enable only the field widgets that your application needs to make it
+    // easier for application/website managers.
+    'apostrophe-forms-text-field-widgets': {},
+    'apostrophe-forms-textarea-field-widgets': {},
+    'apostrophe-forms-select-field-widgets': {},
+    'apostrophe-email': {
+      nodemailer: smtp,
+    },
+    settings: {
+      contentWidgets: contentWidgets,
+    },
+  },
 });

locales/default-draft.json

@@ -5,5 +5,6 @@
 	"Control of this document has been taken by another user.": "Control of this document has been taken by another user.",
 	"You are now editing this document in another tab or window.": "You are now editing this document in another tab or window.",
 	"Legacy Trash": "Legacy Trash",
-	"That document may be being edited by %s (%s).\nIf you take control, they could lose unsaved work.\nDo you want to take control?": "That document may be being edited by %s (%s).\nIf you take control, they could lose unsaved work.\nDo you want to take control?"
+	"That document may be being edited by %s (%s).\nIf you take control, they could lose unsaved work.\nDo you want to take control?": "That document may be being edited by %s (%s).\nIf you take control, they could lose unsaved work.\nDo you want to take control?",
+	"Select all %s item(s) that match this search": "Select all %s item(s) that match this search"
 }