fix: new address

Added a Tripetto form

.drone.yml

@@ -1,25 +0,0 @@
----
-kind: pipeline
-name: deploy to biobulkbende.org
-steps:
-  - name: build container
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: docker_reg_username
-      password:
-        from_secret: docker_reg_passwd
-      repo: decentral1se/biobulkbende.org
-      tags: latest
-
-  - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
-    settings:
-      stack: biobulkbende_org
-      host: biobulkbende.org
-      port: 12345
-      deploy_key:
-        from_secret: drone_ssh_vps_biobulbende_org
-trigger:
-  branch:
-    - main

README.md

@@ -1,20 +1,84 @@
 # biobulkbende.org
 
-[![Build Status](https://drone.autonomic.zone/api/badges/biobulkbende/biobulkbende.org/status.svg?ref=refs/heads/main)](https://drone.autonomic.zone/biobulkbende/biobulkbende.org)
+> [biobulkbende.org](https://biobulkbende.org)
 
-> https://biobulkbende.org
+Our public website made by members.
-
-Our public website made by members!
 
 ## Hacking
 
-- Make sure you have installed git, node.js and npm
+- Make sure you have installed `git`, `node` (v14 LTS) and `npm`
 - Clone this repo: `git clone https://github.com/biobulkbende/biobulkbende.org`
 - From within the folder install all packages: `npm install`
 - Run gulp for automation: `gulp watch`
 
 ## Deployment
 
-Just push commits and our [CD config](https://drone.autonomic.zone/biobulkbende/biobulkbende.org) will deploy the website.
+(You need to be a member of the systems workgroup to do this).
 
-Once the [mirrored repository](https://git.autonomic.zone/biobulkbende/biobulkbende.org) synchronises, the deploy will run.
+```
+make
+```
+
+## Structure
+
+The website is served from the folder `/app`. The folder `/assets` is only for
+development while the folder `/bundle` contains the files linked to
+`index.html` and `/en/index.html`
+
+### HTML
+
+There are two pages:
+
+- `index.html` (Dutch)
+- `/en/index.html` (English)
+
+Changes to the text can be done directly to these files without having to run
+any automation.
+
+### (S)CSS
+
+The CSS files to be changed are stored in /assets/scss which contains:
+
+- `/base` (global CSS declarations)
+- `/modules` (specific CSS declarations)
+
+The CSS is written in SCSS and after changing it must be compiled and bundled
+together. The command `gulp watch` runs automation and make sure that when you
+save the change in automatic everything is compiled and bundled. The final file
+is stored in `/bundle/styles` and provide the CSS to `index.html` and
+`/en/index.html`.
+
+### JS
+
+The JS files to be changed are stored in `assets/js/modules`. The JS is written
+in ES6 and after changing it must be compiled in ES5 and bundled together. The
+command `gulp watch` runs automation and make sure that when you save the
+change in automatic everything is compiled and bundled. The final file is
+stored in `/bundle/scripts` and provide the JS to `index.html` and
+`/en/index.html`.
+
+### Media
+
+The media are stored in `/assets/media` containing:
+
+- Icons
+- Fonts
+- Images
+
+Icons are compressed in a sprite through the command `gulp icons`. (This is
+complicated as it generates a single sprite with all the icons together and a
+CSS which points at the right icon in the sprite). After this command
+automation for the CSS must be run.
+
+Images are minified through the command `gulp images`. All the media are copied
+with the command `gulp copyMediaInBundle` (it also minified the images) into
+the folder `/bundle/media` which provide the media to `index.html` and
+`/en/index.html`.
+
+If you want to change an Image you have to put it in `/assets/media/images` and
+run `gulp copyMediaInBundle`. The html must refer to the image that has been
+copied and minified in `/bundle/media/images`.
+
+### Video
+
+The video is stored on vimeo.

app/assets/scss/modules/_video-container.scss

@@ -22,7 +22,7 @@
   }
 }
 
-.video-container video {
+.video-container iframe {
   position: absolute;
   top: 0;
   left: 0;

app/bundle/styles/style.css

@@ -805,7 +805,7 @@ a {
       margin-right: 0px;
       margin-left: 0px; } }
 
-.video-container video {
+.video-container iframe {
   position: absolute;
   top: 0;
   left: 0;

app/en/index.html

@@ -182,9 +182,9 @@
           </picture>
           <h2 class="headline__subtitle">
             We come together every first monday of the month from 18:00 to 20:00
-            at the Wijkcoop010 in de <b>Zomerhofstraat 75</b>, <b>ZOHO</b>.
+            at the <a href="https://www.huisvandetoekomst.org/">Huis van de
-            People who are interested to become a member can join the
+            Toekomst</a> on <b>Jan Kobellstraat 66a</b>. People who are
-            introduction at 19:00.
+            interested to become a member can join the introduction from 19:00.
           </h2>
         </div>
         <div class="row row--gutters">
@@ -446,7 +446,7 @@
                   also a chance to meet other members and have an affordable
                   vegan dinner cooked by our members. During the pick-up day we
                   have an introduction for people interested to join the co-op.
-                  This takes place at 8pm sharp.
+                  This takes place at 19:00. Please arrive on time, thank you!
                 </p>
                 <p>
                   <a href="#" class="btn btn--pickupday open-modal"
@@ -456,7 +456,11 @@
                 <p>
                   Attending the introduction is mandatory so that you learn all
                   the ins and outs of the co-op right from the start. After you
-                  have joined the introduction you can become a member. The membership work group will send an email to you shortly after. Please check your spam folder or whitelist @biobulkbende.org in your email client to ensure you see the emails from us.
+                  have joined the introduction you can become a member. The
+                  membership work group will send an email to you shortly
+                  after. Please check your spam folder or allow list for
+                  <b>@biobulkbende.org</b> in your email client to ensure you
+                  see the emails from us.
                 </p>
               </div>
             </div>
@@ -486,13 +490,9 @@
         <h2 class="modal__title">Join <strong>Biobulkbende</strong></h2>
         <div class="wrapper">
           <p class="modal__description">
-            Due to COVID-19 restrictions the introduction is currently held
+          The introduction is currently held physically at <a href="https://www.huisvandetoekomst.org">Huis van de Toekomst</a>, <b>Jan Kobellstraat 66a</b> at 19:00 during the pick-up day on the first Monday of the month.<br>
-            online at 8pm at this link
+            To become a member shoot us an email at <a href="mailto: membership@biobulkbende.org">membership@biobulkbende.org</a>.<br>
-            <a href="http://meet.jit.si/bbb_introduction" target="_blank"
+            For general questions please write to <a href="mailto: info@biobulkbende.org">info@biobulkbende.org</a>.
-              >http://meet.jit.si/bbb_introduction</a
-            >.<br />
-            For any question shoot us an email at
-            <a href="mailto: info@biobulkbende.org">info@biobulkbende.org</a>.
           </p>
         </div>
 

app/index.html

@@ -188,9 +188,11 @@
           </picture>
           <h2 class="headline__subtitle">
             We komen elke eerste maandag van de maand samen tussen 18:00 en
-            20:00 bij de <b>Zomerhofstraat 75</b>, <b>ZOHO</b>. Ben je
+            20:00 bij de <b>Jan Kobellstraat 66a</b>, <a
-            geïnteresseerd in een lidmaatschap van de co-op? Dan kun je daar
+              href="https://www.huisvandetoekomst.org">Huis van de
-            maandelijks de introductie bijwonen om 19:00.
+              Toekomst</a>. Ben je geïnteresseerd in een lidmaatschap van de
+            co-op? Dan kun je daar maandelijks de introductie bijwonen om
+            19:00.
           </h2>
         </div>
         <div class="row row--gutters">
@@ -455,9 +457,10 @@
                   bestellingen op te halen. Ophaaldag draait niet alleen om het
                   ophalen van je bestelling. Dit is ook je kans om andere leden
                   te leren kennen en samen te genieten van een betaalbare
-                  veganistische maaltijd van de kookwerkgroep. Op elke ophaaldag
+                  veganistische maaltijd van de kookwerkgroep. Op elke
-                  houden we een introductiebijeenkomst voor potentiële nieuwe
+                  ophaaldag houden we een introductiebijeenkomst voor
-                  leden. De introductie vindt plaats om 20:00.
+                  potentiële nieuwe leden. De introductie vindt plaats om
+                  19:00.
                 </p>
                 <p>
                   <a href="#" class="btn btn--pickupday open-modal"
@@ -468,7 +471,10 @@
                   Het bijwonen van een introductie is verplicht voor nieuwe
                   leden, zodat je de ins en outs direct meekrijgt. Na het
                   bijwonen van de introductie kun je ervoor kiezen om lid te
-                  worden. De werkgroep lidmaatschap stuurt je hierover een email. Check je spam folder of whitelist @biobulkbende.org in je e-mail programma om zeker te weten dat je al onze mails ontvangt. 
+                  worden. De werkgroep lidmaatschap stuurt je hierover een
+                  email. Check je spam folder of lijst toestaan voor
+                  <b>@biobulkbende.org</b> in je e-mail programma om zeker te
+                  weten dat je al onze mails ontvangt.
                 </p>
               </div>
             </div>
@@ -498,13 +504,9 @@
         <h2 class="modal__title">Join <strong>Biobulkbende</strong></h2>
         <div class="wrapper">
           <p class="modal__description">
-            Vanwege de COVID-19 restricties vindt de introductie tijdelijk
+          De introductie vindt momenteel fysiek plaats bij <a href="https://www.huisvandetoekomst.org">Huis van de Toekomst</a>, <b>Jan Kobellstraat 66a</b> om 19.00 uur tijdens onze maandelijkse ophaaldag op de eerste maandag van de maand.<br />
-            online plaats om 20.00 uur via deze link
+            Om lid te worden kun je ons een e-mail op <a href="mailto: membership@biobulkbende.org">membership@biobulkbende.org</a>.<br>
-            <a href="http://meet.jit.si/bbb_introduction" target="_blank"
+            Voor algemene vragen kun je mailen naar <a href="mailto: info@biobulkbende.org">info@biobulkbende.org</a>.
-              >http://meet.jit.si/bbb_introduction</a
-            >.<br />
-            Mocht je vragen hebben, stuur ons een mailtje
-            <a href="mailto: info@biobulkbende.org">info@biobulkbende.org</a>.
           </p>
         </div>
 

app/survey.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Biobulkbende - Survey</title>
+</head>
+<body>
+
+<script src="https://cdn.jsdelivr.net/npm/tripetto-runner-foundation"></script>
+<script src="https://cdn.jsdelivr.net/npm/tripetto-runner-autoscroll"></script>
+<script src="https://cdn.jsdelivr.net/npm/tripetto-services"></script>
+<script>
+var tripetto = TripettoServices.init({ token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoiN3ZzOEh0c2RudlZGdDBEYThqbVhWNXNUc1VQb0hkVGRlSkNYVDRMNFJjcz0iLCJkZWZpbml0aW9uIjoiVFVBQ1hmbFlFVldkTThyVTA2amVsWEZhWUtrek51MHFRdXlZcFBVN2FNZz0iLCJ0eXBlIjoiY29sbGVjdCJ9.i_-M5y-2EyS7585xtb0mpUHyMYTpoYpRIFK7yKvUszA" });
+
+TripettoAutoscroll.run({
+    element: document.body, /* Or supply your own element here */
+    definition: tripetto.definition,
+    styles: tripetto.styles,
+    l10n: tripetto.l10n,
+    locale: tripetto.locale,
+    translations: tripetto.translations,
+    attachments: tripetto.attachments,
+    onSubmit: tripetto.onSubmit
+});
+</script>
+    
+</body>
+</html>

gulpfile.js

@@ -148,6 +148,7 @@ function copyFonts() {
 }
 
 exports.watch = watch;
+exports.images = imagesTask;
 exports.icons = series(
   beginClean,
   createSprite,
@@ -155,7 +156,7 @@ exports.icons = series(
   copySpriteCSS,
   endClean
 );
-exports.images = imagesTask;
+
 
 exports.copyMediaInBundle = series(
   copySpriteGraphic,

makefile

@@ -0,0 +1,10 @@
+default:
+	@docker build -t decentral1se/biobulkbende.org:latest . && \
+	docker push decentral1se/biobulkbende.org:latest && \
+	docker context use biobulkbende.org && \
+	docker stack rm biobulkbende_org && \
+	sleep 5 && \
+	docker system prune -fa && \
+	sleep 3 && \
+	docker stack deploy -c compose.yml biobulkbende_org && \
+	docker context use default