Compare commits

..

No commits in common. "8c4f60372c4c0cb55c9a3e163d6a511cda102dd4" and "f3a81238fddb0b34bdad21db24dfff5ae2e9c5eb" have entirely different histories.

4 changed files with 17875 additions and 3266 deletions

View File

@ -1,53 +1,48 @@
# biobulkbende.org
> [biobulkbende.org](https://biobulkbende.org)
> https://biobulkbende.org
Our public website made by members.
## Hacking
- Make sure you have installed `git`, `node` (v14 LTS) and `npm`
- Make sure you have installed git, node.js 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`
## 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`
The website is served from the folder `/app`
### HTML
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.
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)
- /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`.
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 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`.
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
@ -57,19 +52,11 @@ The media are stored in `/assets/media` containing:
- 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.
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`.
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`.
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

View File

@ -182,9 +182,9 @@
</picture>
<h2 class="headline__subtitle">
We come together every first monday of the month from 17:30 to 20:00
at the <a href="https://www.huisvandetoekomst.org/">Huis van de
Toekomst</a> on <b>Jan Kobellstraat 56a</b>. People who are
interested to become a member can join the introduction at 19:00.
at the Wijkcoop010 in de <b>Jan Kobellstraat 56a</b>, <b>Huis van de Toekomst</b>.
People who are interested to become a member can join the
introduction at 19:00.
</h2>
</div>
<div class="row row--gutters">
@ -486,7 +486,7 @@
<h2 class="modal__title">Join <strong>Biobulkbende</strong></h2>
<div class="wrapper">
<p class="modal__description">
The introduction is currently held physically at <a href="https://www.huisvandetoekomst.org">Huis van de Toekomst</a>, <b>Jan Kobellstraat 56a</b> at 7pm during the pick-up day on the first Monday of the month.<br>
The introduction is currently held physically at Huis van de Toekomst 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>

View File

@ -188,10 +188,9 @@
</picture>
<h2 class="headline__subtitle">
We komen elke eerste maandag van de maand samen tussen 17:30 en
20:00 bij de <b>Jan Kobellstraat 56a</b>, <a
href="https://www.huisvandetoekomst.org">Huis van de
Toekomst</a>. Ben je geïnteresseerd in een lidmaatschap van de
co-op? Dan kun je daar maandelijks de introductie bijwonen om 19:00.
20:00 bij de <b>Jan Kobellstraat 56a</b>, <b>Huis van de Toekomst</b>. 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">
@ -499,7 +498,7 @@
<h2 class="modal__title">Join <strong>Biobulkbende</strong></h2>
<div class="wrapper">
<p class="modal__description">
De introductie vindt momenteel fysiek plaats bij <a href="https://www.huisvandetoekomst.org">Huis van de Toekomst</a>, <b>Jan Kobellstraat 56a</b> om 19.00 uur tijdens onze maandelijkse ophaaldag op de eerste maandag van de maand.<br />
De introductie vindt momenteel fysiek plaats bij Huis van de Toekomst 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>

21071
package-lock.json generated

File diff suppressed because it is too large Load Diff