Compare commits

..

7 Commits

Author SHA1 Message Date
49ca3f532d Added a Tripetto form 2022-05-27 11:07:02 +02:00
dc2b404dc2 Not using that anymore 2021-08-11 14:07:35 +02:00
ba011d55f3 Fix README with new deets 2021-08-11 13:46:25 +02:00
c9254f2df6 changed hour introduction + added membership@
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-01 15:41:52 +02:00
ef135101a0 adjusted md
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-26 12:12:28 +02:00
4ed5c56cf9 adjusted md 2021-05-26 11:59:11 +02:00
e282b3c3c9 more info on the website and how it works 2021-05-26 11:53:59 +02:00
7 changed files with 1477 additions and 2155 deletions

View File

@ -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

View File

@ -1,10 +1,8 @@
# 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)
> https://biobulkbende.org
Our public website made by members!
Our public website made by members.
## Hacking
@ -13,8 +11,53 @@ Our public website made by members!
- From within the folder install all packages: `npm install`
- Run gulp for automation: `gulp watch`
## Deployment
## Structure
Just push commits and our [CD config](https://drone.autonomic.zone/biobulkbende/biobulkbende.org) will deploy the website.
The website is served from the folder `/app`
Once the [mirrored repository](https://git.autonomic.zone/biobulkbende/biobulkbende.org) synchronises, the deploy will run.
The folder `/assets` is only for developement while the folde `/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 togheter.
The command `gulp watch` runs automation and make sure that when you save the change in atuomatic 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 file to be changed are stored in `assets/js/modules`
The JS is writted in ES6 and after changing it must be compiled in ES5 and bundled togheter.
The command `gulp watch` runs automation and make sure that when you save the change in atuomatic 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 togheter and a CSS which points at the right icon in the sprite). After this command automation for the CSS must be runned.
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.

View File

@ -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 7pm sharp.
</p>
<p>
<a href="#" class="btn btn--pickupday open-modal"
@ -486,13 +486,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
online at 8pm at this link
<a href="http://meet.jit.si/bbb_introduction" target="_blank"
>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>.
The introduction is currently held physically at ZOHO at 7pm during the pick-up day on the first Monday of the month.<br>
To become a member shoot us an email at <a href="mailto: membership@biobulkbende.org">membership@biobulkbende.org</a>.<br>
For general questions please write to <a href="mailto: info@biobulkbende.org">info@biobulkbende.org</a>.
</p>
</div>

View File

@ -457,7 +457,7 @@
te leren kennen en samen te genieten van een betaalbare
veganistische maaltijd van de kookwerkgroep. Op elke ophaaldag
houden we een introductiebijeenkomst voor potentiële nieuwe
leden. De introductie vindt plaats om 20:00.
leden. De introductie vindt plaats om 19:00.
</p>
<p>
<a href="#" class="btn btn--pickupday open-modal"
@ -498,13 +498,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
online plaats om 20.00 uur via deze link
<a href="http://meet.jit.si/bbb_introduction" target="_blank"
>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>.
De introductie vindt momenteel fysiek plaats bij ZOHO om 19.00 uur tijdens onze maandelijkse ophaaldag op de eerste maandag van de maand.<br />
Om lid te worden kun je ons een e-mail op <a href="mailto: membership@biobulkbende.org">membership@biobulkbende.org</a>.<br>
Voor algemene vragen kun je mailen naar <a href="mailto: info@biobulkbende.org">info@biobulkbende.org</a>.
</p>
</div>

30
app/survey.html Normal file
View File

@ -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>

View File

@ -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,

3495
package-lock.json generated

File diff suppressed because it is too large Load Diff