replace old angular frontend with gridsome vue app

With this change data for spaces and machines is handled via content folder and yml files and no longer uses django backend. Backend is still used for facebook and twitter post parsing
fablabs-ch · Nov 11, 2021 · f0a1d98 · f0a1d98
1 parent 3f011f7
commit f0a1d98
Show file tree

Hide file tree

Showing 376 changed files with 14,974 additions and 13,259 deletions.
diff --git a/.env.sample b/.env.sample
@@ -0,0 +1,20 @@
+DEBUG=
+STATIC_ROOT=/app/static/
+STATIC_URL=/static/
+MEDIA_ROOT=/app/media/
+MEDIA_URL=/media/
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+DATABASE_URL=
+SENTRY_DSN=
+FACEBOOK_CLIENT_ID=
+FACEBOOK_CLIENT_SECRET=
+TWITTER_BEARER_TOKEN=
+SECRET_KEY=
+EMAIL_HOST=
+EMAIL_PORT=
+EMAIL_HOST_USER=
+EMAIL_HOST_PASSWORD=
+EMAIL_USE_TLS=True
+DEFAULT_FROM_EMAIL=
+HTTPS=on
diff --git a/.gitattributes b/.gitattributes
diff --git a/README.md b/README.md
@@ -7,11 +7,29 @@ Community website for swiss fablabs: https://fablabs.ch
 - List of machines available in FabLabs
 - Aggregates Events through ics feeds (google calendar,...)
   + Used event fields: dates, summary, description
-  + description is parsed for #tags and url
+  + description field is parsed for #tags and url
   + first url becomes the official link to the event
   + one image is supported, first attachment link (icalendar ATTACH)
-
 
 ## Contribution
 Create issue or pull request for udpates.
 
+- To add a lab copy the content/spaces/_template.yml file
+- To edit a lab update the content/spaces/fablab_[name].
+yml file (name must be lowercase without spaces)
+- A lab logo must be a png file at the same loaction with minimum size of 160x160px
+
+- Machines are defined in the content/machines/[type]/[vendor]/[model].yml file
+- Type used must be listed in the frontend/src/data/machine_types.yml file.
+
+## Development
+
+### Frontend
+  Vue.js gridsome application creating lab pages from [content](./content) folder
+
+  Thumbnail generation and image conversion are handled on build and develop script
+
+### Backend
+  Django REST application for parsing twitter and facebook and exposing an api consumed by the frontend
+
+  *Space, Resource, SpaceResource are no longer taken from backend but via content folder.*
diff --git a/.gitignore → backend/.gitignore b/.gitignore → backend/.gitignore
@@ -54,7 +54,7 @@ node_modules/
 .sass-cache
 
 .env
-/static/
-/media/
-/tmp/
-/smedia/
+static/
+media/
+tmp/
+smedia/
diff --git a/Dockerfile → backend/Dockerfile b/Dockerfile → backend/Dockerfile
diff --git a/backend/backup.sh b/backend/backup.sh
@@ -0,0 +1,2 @@
+docker exec fablabsch_db_1 sh -c "pg_dump --username=fablabsch fablabsch > /tmp/db.sql"
+docker cp fablabsch_db_1:/tmp/db.sql ./sql/db.sql
diff --git a/fablabsch/__init__.py → backend/fablabsch/__init__.py b/fablabsch/__init__.py → backend/fablabsch/__init__.py
diff --git a/fablabsch/admin.py → backend/fablabsch/admin.py b/fablabsch/admin.py → backend/fablabsch/admin.py
diff --git a/fablabsch/migrations/0001_initial.py → backend/fablabsch/migrations/0001_initial.py b/fablabsch/migrations/0001_initial.py → backend/fablabsch/migrations/0001_initial.py
diff --git a/...sch/migrations/0002_auto_20160224_1955.py → ...sch/migrations/0002_auto_20160224_1955.py b/...sch/migrations/0002_auto_20160224_1955.py → ...sch/migrations/0002_auto_20160224_1955.py
diff --git a/fablabsch/migrations/0003_space_marker.py → ...fablabsch/migrations/0003_space_marker.py b/fablabsch/migrations/0003_space_marker.py → ...fablabsch/migrations/0003_space_marker.py
diff --git a/...ns/0004_disable_unique_social_on_space.py → ...ns/0004_disable_unique_social_on_space.py b/...ns/0004_disable_unique_social_on_space.py → ...ns/0004_disable_unique_social_on_space.py
diff --git a/fablabsch/migrations/0005_event.py → backend/fablabsch/migrations/0005_event.py b/fablabsch/migrations/0005_event.py → backend/fablabsch/migrations/0005_event.py
diff --git a/...absch/migrations/0006_space_events_ics.py → ...absch/migrations/0006_space_events_ics.py b/...absch/migrations/0006_space_events_ics.py → ...absch/migrations/0006_space_events_ics.py
diff --git a/fablabsch/migrations/0007_page.py → backend/fablabsch/migrations/0007_page.py b/fablabsch/migrations/0007_page.py → backend/fablabsch/migrations/0007_page.py
diff --git a/fablabsch/migrations/__init__.py → backend/fablabsch/migrations/__init__.py b/fablabsch/migrations/__init__.py → backend/fablabsch/migrations/__init__.py
diff --git a/fablabsch/models.py → backend/fablabsch/models.py b/fablabsch/models.py → backend/fablabsch/models.py
diff --git a/fablabsch/serializers.py → backend/fablabsch/serializers.py b/fablabsch/serializers.py → backend/fablabsch/serializers.py
diff --git a/fablabsch/settings.py → backend/fablabsch/settings.py b/fablabsch/settings.py → backend/fablabsch/settings.py
diff --git a/fablabsch/templates/admin/base.html → backend/fablabsch/templates/admin/base.html b/fablabsch/templates/admin/base.html → backend/fablabsch/templates/admin/base.html
diff --git a/fablabsch/templates/fablabsch/layout.html → ...fablabsch/templates/fablabsch/layout.html b/fablabsch/templates/fablabsch/layout.html → ...fablabsch/templates/fablabsch/layout.html
diff --git a/fablabsch/urls.py → backend/fablabsch/urls.py b/fablabsch/urls.py → backend/fablabsch/urls.py
diff --git a/fablabsch/utils.py → backend/fablabsch/utils.py b/fablabsch/utils.py → backend/fablabsch/utils.py
diff --git a/fablabsch/views.py → backend/fablabsch/views.py b/fablabsch/views.py → backend/fablabsch/views.py
diff --git a/fablabsch/wsgi.py → backend/fablabsch/wsgi.py b/fablabsch/wsgi.py → backend/fablabsch/wsgi.py
diff --git a/manage.py → backend/manage.py b/manage.py → backend/manage.py
diff --git a/requirements.txt → backend/requirements.txt b/requirements.txt → backend/requirements.txt
diff --git a/content/machines/3D_printing/Anycubic/Photon.png b/content/machines/3D_printing/Anycubic/Photon.png
diff --git a/content/machines/3D_printing/Anycubic/Photon.yml b/content/machines/3D_printing/Anycubic/Photon.yml
@@ -0,0 +1 @@
+name: Photon
diff --git a/content/machines/3D_printing/C Enterprise LTD/Robox.png b/content/machines/3D_printing/C Enterprise LTD/Robox.png
diff --git a/content/machines/3D_printing/C Enterprise LTD/Robox.yml b/content/machines/3D_printing/C Enterprise LTD/Robox.yml
@@ -0,0 +1,2 @@
+name: Robox
+work_size: 210mm x 150mm x 100mm
diff --git a/content/machines/3D_printing/Creality/CR-10S pro.png b/content/machines/3D_printing/Creality/CR-10S pro.png
diff --git a/content/machines/3D_printing/Creality/CR-10S pro.yml b/content/machines/3D_printing/Creality/CR-10S pro.yml
@@ -0,0 +1,2 @@
+name: CR-10S pro
+work_size: 300x300x400 mm
diff --git a/content/machines/3D_printing/Creality/CR-20.png b/content/machines/3D_printing/Creality/CR-20.png
diff --git a/content/machines/3D_printing/Creality/CR-20.yml b/content/machines/3D_printing/Creality/CR-20.yml
@@ -0,0 +1 @@
+name: CR-20
diff --git a/content/machines/3D_printing/Creality/Ender-3 Pro.png b/content/machines/3D_printing/Creality/Ender-3 Pro.png
diff --git a/content/machines/3D_printing/Creality/Ender-3 Pro.yml b/content/machines/3D_printing/Creality/Ender-3 Pro.yml
@@ -0,0 +1,2 @@
+name: Ender-3 Pro
+work_size: 220x220x250 mm
diff --git a/content/machines/3D_printing/Formlabs/Form2.png b/content/machines/3D_printing/Formlabs/Form2.png
diff --git a/content/machines/3D_printing/Formlabs/Form2.yml b/content/machines/3D_printing/Formlabs/Form2.yml
@@ -0,0 +1,2 @@
+name: Form2
+work_size: 145mm x 145mm x 175mm
diff --git a/content/machines/3D_printing/HP/Jet Fusion 540.png b/content/machines/3D_printing/HP/Jet Fusion 540.png
diff --git a/content/machines/3D_printing/HP/Jet Fusion 540.yml b/content/machines/3D_printing/HP/Jet Fusion 540.yml
@@ -0,0 +1,2 @@
+name: Jet Fusion 540
+work_size: 332mm × 190mm × 248 mm
diff --git a/content/machines/3D_printing/Makerbot/Replicator 2X.png b/content/machines/3D_printing/Makerbot/Replicator 2X.png
diff --git a/content/machines/3D_printing/Makerbot/Replicator 2X.yml b/content/machines/3D_printing/Makerbot/Replicator 2X.yml
@@ -0,0 +1,2 @@
+name: Replicator 2X
+work_size: 246mm x 152mm x 155mm
diff --git a/content/machines/3D_printing/Makerbot/Replicator 5th Generation.png b/content/machines/3D_printing/Makerbot/Replicator 5th Generation.png
diff --git a/content/machines/3D_printing/Makerbot/Replicator 5th Generation.yml b/content/machines/3D_printing/Makerbot/Replicator 5th Generation.yml
@@ -0,0 +1,2 @@
+name: Replicator 5th Generation
+work_size: 252mm x 199mm x 150mm
diff --git a/content/machines/3D_printing/Makerbot/Replicator v.2.png b/content/machines/3D_printing/Makerbot/Replicator v.2.png
diff --git a/content/machines/3D_printing/Makerbot/Replicator v.2.yml b/content/machines/3D_printing/Makerbot/Replicator v.2.yml
@@ -0,0 +1,2 @@
+name: Replicator v.2
+work_size: 285mm x 153mm x 155mm
diff --git a/content/machines/3D_printing/Printrbot/Printrbot Play.png b/content/machines/3D_printing/Printrbot/Printrbot Play.png
diff --git a/content/machines/3D_printing/Printrbot/Printrbot Play.yml b/content/machines/3D_printing/Printrbot/Printrbot Play.yml
@@ -0,0 +1,2 @@
+name: Printrbot Play
+work_size: 100mm x 100mm x 130mm
diff --git a/content/machines/3D_printing/RepRap/Itopie.png b/content/machines/3D_printing/RepRap/Itopie.png
diff --git a/content/machines/3D_printing/RepRap/Itopie.yml b/content/machines/3D_printing/RepRap/Itopie.yml
@@ -0,0 +1 @@
+name: Itopie
diff --git a/content/machines/3D_printing/RepRap/MendelMax 2.png b/content/machines/3D_printing/RepRap/MendelMax 2.png
diff --git a/content/machines/3D_printing/RepRap/MendelMax 2.yml b/content/machines/3D_printing/RepRap/MendelMax 2.yml
@@ -0,0 +1,2 @@
+name: MendelMax 2
+work_size: 230mm x 310mm x 225mm
diff --git a/content/machines/3D_printing/RepRap/Micro Delta.png b/content/machines/3D_printing/RepRap/Micro Delta.png
diff --git a/content/machines/3D_printing/RepRap/Micro Delta.yml b/content/machines/3D_printing/RepRap/Micro Delta.yml
@@ -0,0 +1,2 @@
+name: Micro Delta
+work_size: Ø110 x 190 mm
diff --git a/content/machines/3D_printing/Stratasys/Fortus 360mc.png b/content/machines/3D_printing/Stratasys/Fortus 360mc.png
diff --git a/content/machines/3D_printing/Stratasys/Fortus 360mc.yml b/content/machines/3D_printing/Stratasys/Fortus 360mc.yml
@@ -0,0 +1,2 @@
+name: Fortus 360mc
+work_size: 355mm × 254mm × 254mm
diff --git a/content/machines/3D_printing/Stratasys/J750.png b/content/machines/3D_printing/Stratasys/J750.png
diff --git a/content/machines/3D_printing/Stratasys/J750.yml b/content/machines/3D_printing/Stratasys/J750.yml
@@ -0,0 +1,2 @@
+name: J750
+work_size: 490mm x 390mm x 200mm
diff --git a/content/machines/3D_printing/Stratasys/Objet Eden 260V.png b/content/machines/3D_printing/Stratasys/Objet Eden 260V.png
diff --git a/content/machines/3D_printing/Stratasys/Objet Eden 260V.yml b/content/machines/3D_printing/Stratasys/Objet Eden 260V.yml
@@ -0,0 +1,2 @@
+name: Objet Eden 260V
+work_size: 255mm x 252mm x200mm
diff --git a/content/machines/3D_printing/Stratasys/uPrint.png b/content/machines/3D_printing/Stratasys/uPrint.png
diff --git a/content/machines/3D_printing/Stratasys/uPrint.yml b/content/machines/3D_printing/Stratasys/uPrint.yml
@@ -0,0 +1,2 @@
+name: uPrint
+work_size: 203mm x 152mm x 152mm
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 2+ extended.png b/content/machines/3D_printing/Ultimaker/Ultimaker 2+ extended.png
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 2+ extended.yml b/content/machines/3D_printing/Ultimaker/Ultimaker 2+ extended.yml
@@ -0,0 +1,2 @@
+name: Ultimaker 2+ extended
+work_size: 223mm x 223mm x 305mm
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 2+.png b/content/machines/3D_printing/Ultimaker/Ultimaker 2+.png
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 2+.yml b/content/machines/3D_printing/Ultimaker/Ultimaker 2+.yml
@@ -0,0 +1,2 @@
+name: Ultimaker 2+
+work_size: 223mm x 223mm x 205mm
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 2.png b/content/machines/3D_printing/Ultimaker/Ultimaker 2.png
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 2.yml b/content/machines/3D_printing/Ultimaker/Ultimaker 2.yml
@@ -0,0 +1,2 @@
+name: Ultimaker 2
+work_size: 223mm x 223mm x 205mm
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 3 extended.png b/content/machines/3D_printing/Ultimaker/Ultimaker 3 extended.png
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker 3 extended.yml b/content/machines/3D_printing/Ultimaker/Ultimaker 3 extended.yml
@@ -0,0 +1,2 @@
+name: Ultimaker 3 extended
+work_size: 215mm x 215mm x 300mm
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker Original+.png b/content/machines/3D_printing/Ultimaker/Ultimaker Original+.png
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker Original+.yml b/content/machines/3D_printing/Ultimaker/Ultimaker Original+.yml
@@ -0,0 +1,2 @@
+name: Ultimaker Original+
+work_size: 210mm x 210mm x 205mm
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker Original.png b/content/machines/3D_printing/Ultimaker/Ultimaker Original.png
diff --git a/content/machines/3D_printing/Ultimaker/Ultimaker Original.yml b/content/machines/3D_printing/Ultimaker/Ultimaker Original.yml
@@ -0,0 +1,2 @@
+name: Ultimaker Original
+work_size: 210mm x 210mm x 205mm
diff --git a/content/machines/3D_printing/Velleman/K8200.png b/content/machines/3D_printing/Velleman/K8200.png
diff --git a/content/machines/3D_printing/Velleman/K8200.yml b/content/machines/3D_printing/Velleman/K8200.yml
@@ -0,0 +1,2 @@
+name: K8200
+work_size: 200mm x 200mm x 200mm
diff --git a/content/machines/3D_printing/Zortrax/Zortrax M200.png b/content/machines/3D_printing/Zortrax/Zortrax M200.png
diff --git a/content/machines/3D_printing/Zortrax/Zortrax M200.yml b/content/machines/3D_printing/Zortrax/Zortrax M200.yml
@@ -0,0 +1,2 @@
+name: Zortrax M200
+work_size: 200mm x 200mm x 180mm
diff --git a/content/machines/3D_printing/Zortrax/Zortrax M300plus.png b/content/machines/3D_printing/Zortrax/Zortrax M300plus.png
diff --git a/content/machines/3D_printing/Zortrax/Zortrax M300plus.yml b/content/machines/3D_printing/Zortrax/Zortrax M300plus.yml
@@ -0,0 +1,2 @@
+name: Zortrax M300plus
+work_size: 300mm x 300mm x 300mm
diff --git a/content/machines/3D_printing/re3d/Gigabot.png b/content/machines/3D_printing/re3d/Gigabot.png
diff --git a/content/machines/3D_printing/re3d/Gigabot.yml b/content/machines/3D_printing/re3d/Gigabot.yml
@@ -0,0 +1,2 @@
+name: Gigabot
+work_size: 590 x 600 x 600 mm
diff --git a/content/machines/3D_scanning/Artec/Eva.png b/content/machines/3D_scanning/Artec/Eva.png
diff --git a/content/machines/3D_scanning/Artec/Eva.yml b/content/machines/3D_scanning/Artec/Eva.yml
@@ -0,0 +1 @@
+name: Eva
diff --git a/content/machines/3D_scanning/CADscan/Cubik 3D.png b/content/machines/3D_scanning/CADscan/Cubik 3D.png
diff --git a/content/machines/3D_scanning/CADscan/Cubik 3D.yml b/content/machines/3D_scanning/CADscan/Cubik 3D.yml
@@ -0,0 +1 @@
+name: Cubik 3D
diff --git a/content/machines/3D_scanning/HP/David SLS-2.png b/content/machines/3D_scanning/HP/David SLS-2.png
diff --git a/content/machines/3D_scanning/HP/David SLS-2.yml b/content/machines/3D_scanning/HP/David SLS-2.yml
@@ -0,0 +1 @@
+name: David SLS-2
diff --git a/content/machines/3D_scanning/Occipital/Structure Sensor Ipad.png b/content/machines/3D_scanning/Occipital/Structure Sensor Ipad.png
diff --git a/content/machines/3D_scanning/Occipital/Structure Sensor Ipad.yml b/content/machines/3D_scanning/Occipital/Structure Sensor Ipad.yml
@@ -0,0 +1 @@
+name: Structure Sensor Ipad
diff --git a/content/machines/CNC_milling/Bodor/6090.png b/content/machines/CNC_milling/Bodor/6090.png
diff --git a/content/machines/CNC_milling/Bodor/6090.yml b/content/machines/CNC_milling/Bodor/6090.yml
@@ -0,0 +1,2 @@
+name: '6090'
+work_size: 600mm x 900mm x 120mm
diff --git a/content/machines/CNC_milling/Haas/Mini Mill.png b/content/machines/CNC_milling/Haas/Mini Mill.png
diff --git a/content/machines/CNC_milling/Haas/Mini Mill.yml b/content/machines/CNC_milling/Haas/Mini Mill.yml
@@ -0,0 +1 @@
+name: Mini Mill
diff --git a/content/machines/CNC_milling/Huayuan/LGK-100IGBT.png b/content/machines/CNC_milling/Huayuan/LGK-100IGBT.png
diff --git a/content/machines/CNC_milling/Huayuan/LGK-100IGBT.yml b/content/machines/CNC_milling/Huayuan/LGK-100IGBT.yml
@@ -0,0 +1 @@
+name: LGK-100IGBT
diff --git a/content/machines/CNC_milling/KRESS 1500/openbuilds-ox.png b/content/machines/CNC_milling/KRESS 1500/openbuilds-ox.png
diff --git a/content/machines/CNC_milling/KRESS 1500/openbuilds-ox.yml b/content/machines/CNC_milling/KRESS 1500/openbuilds-ox.yml
@@ -0,0 +1 @@
+name: OpenBuilds / OX
diff --git a/content/machines/CNC_milling/Makko/M850-KU.png b/content/machines/CNC_milling/Makko/M850-KU.png
diff --git a/content/machines/CNC_milling/Makko/M850-KU.yml b/content/machines/CNC_milling/Makko/M850-KU.yml
@@ -0,0 +1 @@
+name: M850-KU
diff --git a/content/machines/CNC_milling/MillStep/MillStep PA1070V3.png b/content/machines/CNC_milling/MillStep/MillStep PA1070V3.png
diff --git a/content/machines/CNC_milling/MillStep/MillStep PA1070V3.yml b/content/machines/CNC_milling/MillStep/MillStep PA1070V3.yml
@@ -0,0 +1,2 @@
+name: MillStep PA1070V3
+work_size: 1000mm x 680mm x 300mm
diff --git a/content/machines/CNC_milling/Optimum/OPTImill BF 20LVario.png b/content/machines/CNC_milling/Optimum/OPTImill BF 20LVario.png
diff --git a/content/machines/CNC_milling/Optimum/OPTImill BF 20LVario.yml b/content/machines/CNC_milling/Optimum/OPTImill BF 20LVario.yml
@@ -0,0 +1 @@
+name: OPTImill BF 20LVario
diff --git a/content/machines/CNC_milling/Pocket NC/Pocket NC 5 Axis Desktop.png b/content/machines/CNC_milling/Pocket NC/Pocket NC 5 Axis Desktop.png
diff --git a/content/machines/CNC_milling/Pocket NC/Pocket NC 5 Axis Desktop.yml b/content/machines/CNC_milling/Pocket NC/Pocket NC 5 Axis Desktop.yml
@@ -0,0 +1,2 @@
+name: Pocket NC 5 Axis Desktop
+work_size: 114mm x 122mm x 88mm
diff --git a/content/machines/CNC_milling/Printrbot/Crawlbot.png b/content/machines/CNC_milling/Printrbot/Crawlbot.png
diff --git a/content/machines/CNC_milling/Printrbot/Crawlbot.yml b/content/machines/CNC_milling/Printrbot/Crawlbot.yml
@@ -0,0 +1,2 @@
+name: Crawlbot
+work_size: 1200mm x 2400mm x 50mm
diff --git a/content/machines/CNC_milling/ShopBot/ShopBot Buddy 48''.png b/content/machines/CNC_milling/ShopBot/ShopBot Buddy 48''.png
diff --git a/content/machines/CNC_milling/ShopBot/ShopBot Buddy 48''.yml b/content/machines/CNC_milling/ShopBot/ShopBot Buddy 48''.yml
@@ -0,0 +1,2 @@
+name: ShopBot Buddy 48''
+work_size: 610mm x 1219mm x 127mm
diff --git a/content/machines/CNC_milling/VK-Technik/PA8050.png b/content/machines/CNC_milling/VK-Technik/PA8050.png
diff --git a/content/machines/CNC_milling/VK-Technik/PA8050.yml b/content/machines/CNC_milling/VK-Technik/PA8050.yml
@@ -0,0 +1,2 @@
+name: PA8050
+work_size: 500mm x 800mm x 190mm
diff --git a/content/machines/CNC_milling/cncshop/CNC 3040.png b/content/machines/CNC_milling/cncshop/CNC 3040.png
diff --git a/content/machines/CNC_milling/cncshop/CNC 3040.yml b/content/machines/CNC_milling/cncshop/CNC 3040.yml
@@ -0,0 +1,2 @@
+name: CNC 3040
+work_size: 320mm x 580mm x 75mm
diff --git a/content/machines/_template.yml b/content/machines/_template.yml
@@ -0,0 +1,2 @@
+name: Machine Name
+work_size: 304mm x 440mm
diff --git a/content/machines/laser/Acctek/AKJ9060.png b/content/machines/laser/Acctek/AKJ9060.png
diff --git a/content/machines/laser/Acctek/AKJ9060.yml b/content/machines/laser/Acctek/AKJ9060.yml
@@ -0,0 +1,2 @@
+name: AKJ9060
+work_size: 600mm x 900mm
diff --git a/content/machines/laser/Bodor/BCL-0605MU.png b/content/machines/laser/Bodor/BCL-0605MU.png
diff --git a/content/machines/laser/Bodor/BCL-0605MU.yml b/content/machines/laser/Bodor/BCL-0605MU.yml
@@ -0,0 +1,2 @@
+name: BCL-0605MU
+work_size: 600mm x 500mm
diff --git a/content/machines/laser/Bodor/BCL-1006XU.png b/content/machines/laser/Bodor/BCL-1006XU.png
diff --git a/content/machines/laser/Bodor/BCL-1006XU.yml b/content/machines/laser/Bodor/BCL-1006XU.yml
@@ -0,0 +1,2 @@
+name: BCL-1006XU
+work_size: 500mm x 1000mm
diff --git a/content/machines/laser/Epilog/Legend 36EXT.png b/content/machines/laser/Epilog/Legend 36EXT.png
diff --git a/content/machines/laser/Epilog/Legend 36EXT.yml b/content/machines/laser/Epilog/Legend 36EXT.yml
@@ -0,0 +1,2 @@
+name: Legend 36EXT
+work_size: 914mm x 610mm
diff --git a/content/machines/laser/GV Laser/GV1390.png b/content/machines/laser/GV Laser/GV1390.png
diff --git a/content/machines/laser/GV Laser/GV1390.yml b/content/machines/laser/GV Laser/GV1390.yml
@@ -0,0 +1,2 @@
+name: GV1390
+work_size: 1300mm x 900mm
diff --git a/content/machines/laser/Glowforge/Glowforge Basic.png b/content/machines/laser/Glowforge/Glowforge Basic.png
diff --git a/content/machines/laser/Glowforge/Glowforge Basic.yml b/content/machines/laser/Glowforge/Glowforge Basic.yml
@@ -0,0 +1,2 @@
+name: Glowforge Basic
+work_size: 500mm x 300mm
diff --git a/content/machines/laser/Lasersaur/Lasersaur.png b/content/machines/laser/Lasersaur/Lasersaur.png
diff --git a/content/machines/laser/Lasersaur/Lasersaur.yml b/content/machines/laser/Lasersaur/Lasersaur.yml
@@ -0,0 +1,2 @@
+name: Lasersaur
+work_size: 1200mm x 600mm
diff --git a/content/machines/laser/Perfect Laser/PEDK-9060.png b/content/machines/laser/Perfect Laser/PEDK-9060.png
diff --git a/content/machines/laser/Perfect Laser/PEDK-9060.yml b/content/machines/laser/Perfect Laser/PEDK-9060.yml
@@ -0,0 +1,2 @@
+name: PEDK-9060
+work_size: 900mm x 600mm
diff --git a/content/machines/laser/SignsTech/1060SP.png b/content/machines/laser/SignsTech/1060SP.png
diff --git a/content/machines/laser/SignsTech/1060SP.yml b/content/machines/laser/SignsTech/1060SP.yml
@@ -0,0 +1 @@
+name: 1060SP
diff --git a/content/machines/laser/ThunderLaser/Mars 90 PLUS.png b/content/machines/laser/ThunderLaser/Mars 90 PLUS.png
diff --git a/content/machines/laser/ThunderLaser/Mars 90 PLUS.yml b/content/machines/laser/ThunderLaser/Mars 90 PLUS.yml
@@ -0,0 +1,2 @@
+name: Mars 90 PLUS
+work_size: 900mm x 600mm
diff --git a/content/machines/laser/Trotec/Speedmarker 700.png b/content/machines/laser/Trotec/Speedmarker 700.png
diff --git a/content/machines/laser/Trotec/Speedmarker 700.yml b/content/machines/laser/Trotec/Speedmarker 700.yml
@@ -0,0 +1,2 @@
+name: Speedmarker 700
+work_size: 580mm x 495mm
diff --git a/content/machines/laser/Trotec/Speedy 100.png b/content/machines/laser/Trotec/Speedy 100.png
diff --git a/content/machines/laser/Trotec/Speedy 100.yml b/content/machines/laser/Trotec/Speedy 100.yml
@@ -0,0 +1,2 @@
+name: Speedy 100
+work_size: 610mm x 305mm
diff --git a/content/machines/laser/Trotec/Speedy 300.png b/content/machines/laser/Trotec/Speedy 300.png
diff --git a/content/machines/laser/Trotec/Speedy 300.yml b/content/machines/laser/Trotec/Speedy 300.yml
@@ -0,0 +1,2 @@
+name: Speedy 300
+work_size: 728mm x 430mm
diff --git a/content/machines/laser/Trotec/Speedy 360.png b/content/machines/laser/Trotec/Speedy 360.png
diff --git a/content/machines/laser/Trotec/Speedy 360.yml b/content/machines/laser/Trotec/Speedy 360.yml
@@ -0,0 +1 @@
+name: Speedy 360
diff --git a/content/machines/laser/Trotec/Speedy 360flexx.png b/content/machines/laser/Trotec/Speedy 360flexx.png
diff --git a/content/machines/laser/Trotec/Speedy 360flexx.yml b/content/machines/laser/Trotec/Speedy 360flexx.yml
@@ -0,0 +1,2 @@
+name: Speedy 360flexx
+work_size: 813mm x 508mm
diff --git a/content/machines/laser/Trotec/Speedy 400.png b/content/machines/laser/Trotec/Speedy 400.png
diff --git a/content/machines/laser/Trotec/Speedy 400.yml b/content/machines/laser/Trotec/Speedy 400.yml
@@ -0,0 +1,2 @@
+name: Speedy 400
+work_size: 1000mm x 600mm
diff --git a/content/machines/other/Generic/Lathe.png b/content/machines/other/Generic/Lathe.png
diff --git a/content/machines/other/Generic/Lathe.yml b/content/machines/other/Generic/Lathe.yml
@@ -0,0 +1 @@
+name: Lathe
diff --git a/content/machines/other/PromaShirt/Press T-Shirt.png b/content/machines/other/PromaShirt/Press T-Shirt.png
diff --git a/content/machines/other/PromaShirt/Press T-Shirt.yml b/content/machines/other/PromaShirt/Press T-Shirt.yml
@@ -0,0 +1,2 @@
+name: Press T-Shirt
+work_size: 380mm x 380mm
diff --git a/content/machines/vinyl_cutting/Creation/PCUT CT.png b/content/machines/vinyl_cutting/Creation/PCUT CT.png
diff --git a/content/machines/vinyl_cutting/Creation/PCUT CT.yml b/content/machines/vinyl_cutting/Creation/PCUT CT.yml
@@ -0,0 +1,2 @@
+name: PCUT CT
+work_size: 1200mm
diff --git a/content/machines/vinyl_cutting/Creation/PCUT PC-43.png b/content/machines/vinyl_cutting/Creation/PCUT PC-43.png
diff --git a/content/machines/vinyl_cutting/Creation/PCUT PC-43.yml b/content/machines/vinyl_cutting/Creation/PCUT PC-43.yml
@@ -0,0 +1,2 @@
+name: PCUT PC-43
+work_size: 330mm
diff --git a/content/machines/vinyl_cutting/Roland/CAMM-1 GS-24.png b/content/machines/vinyl_cutting/Roland/CAMM-1 GS-24.png
diff --git a/content/machines/vinyl_cutting/Roland/CAMM-1 GS-24.yml b/content/machines/vinyl_cutting/Roland/CAMM-1 GS-24.yml
@@ -0,0 +1,2 @@
+name: CAMM-1 GS-24
+work_size: 50 to 700 mm
diff --git a/content/machines/vinyl_cutting/Silhouette/Cameo.png b/content/machines/vinyl_cutting/Silhouette/Cameo.png
diff --git a/content/machines/vinyl_cutting/Silhouette/Cameo.yml b/content/machines/vinyl_cutting/Silhouette/Cameo.yml
@@ -0,0 +1,2 @@
+name: Cameo
+work_size: 300mm
diff --git a/content/machines/vinyl_cutting/Silhouette/Curio.png b/content/machines/vinyl_cutting/Silhouette/Curio.png
diff --git a/content/machines/vinyl_cutting/Silhouette/Curio.yml b/content/machines/vinyl_cutting/Silhouette/Curio.yml
@@ -0,0 +1,2 @@
+name: Curio
+work_size: 215mm
diff --git a/content/machines/vinyl_cutting/Sylverbullet/Sylverbullet 24.png b/content/machines/vinyl_cutting/Sylverbullet/Sylverbullet 24.png
diff --git a/content/machines/vinyl_cutting/Sylverbullet/Sylverbullet 24.yml b/content/machines/vinyl_cutting/Sylverbullet/Sylverbullet 24.yml
@@ -0,0 +1 @@
+name: Sylverbullet 24"
diff --git a/content/pages/about.md b/content/pages/about.md
@@ -0,0 +1,33 @@
+# About
+
+Fablabs.ch is promoting the MIT concept of Fab Labs in the geographical territory of Switzerland.
+
+It provides a central location to see activities of swiss fab labs by aggregating their public social network feeds.
+<p class="my-5">
+	<v-btn href="https://docs.google.com/forms/d/1tPK7CAc_udVFaZOikjJVoXztbVOJ_-vZfB-Ymq2u8qw/viewform" target="_blank" color="primary" class="mr-5">Contact Swiss Fablabs.ch</v-btn>
+	<v-btn href="https://fablabs-ch.slack.com" target="_blank" color="primary" class="mr-5">Slack fablabs-ch</v-btn>
+	<v-btn href="https://github.com/orgs/fablabs-ch/" target="_blank" color="primary">Github fablabs-ch</v-btn>
+</p>
+
+The FabLab concept is described in the [Fab Charter](https://fab.cba.mit.edu/about/charter/), copied below:
+
+## The Fab Charter
+
+<dl>
+	<dt>What is a fab lab?</dt>
+	<dd>Fab labs are a global network of local labs, enabling invention by providing access to tools for digital fabrication</dd>
+	<dt>What&rsquo;s in a fab lab?</dt>
+	<dd>Fab labs share an evolving inventory of core capabilities to make (almost) anything, allowing people and projects to be shared</dd>
+	<dt>What does the fab lab network provide?</dt>
+	<dd>Operational, educational, technical, financial, and logistical assistance beyond what&rsquo;s available within one lab</dd>
+	<dt>Who can use a fab lab?</dt>
+	<dd>Fab labs are available as a community resource, offering open access for individuals as well as scheduled access for programs</dd>
+	<dt>What are your responsibilities?</dt>
+	<dd>safety: not hurting people or machines<br />
+	operations: assisting with cleaning, maintaining, and improving the lab<br />
+	knowledge: contributing to documentation and instruction</dd>
+	<dt>Who owns fab lab inventions?</dt>
+	<dd>Designs and processes developed in fab labs can be protected and sold however an inventor chooses, but should remain available for individuals to use and learn from</dd>
+	<dt>How can businesses use a fab lab?</dt>
+	<dd>Commercial activities can be prototyped and incubated in a fab lab, but they must not conflict with other uses, they should grow beyond rather than within the lab, and they are expected to benefit the inventors, labs, and networks that contribute to their success</dd>
+</dl>
diff --git a/content/spaces/_template.yml b/content/spaces/_template.yml
@@ -0,0 +1,29 @@
+name: Lab Name
+description: |-
+  Some description
+
+
+city:
+zip: 'xxyz'
+street:
+country_code: CH
+state_code: VD
+latitude: 46.38353
+longitude: 6.21673
+founded: 2021-11-01
+email: info@
+website: https://...
+facebook: FabLabLaCote
+# facebook_filter: '#FablabBB' #optional hashtag which needs to be in content to consider post
+twitter: FabLabLaCote
+# twitter_filter: ' #FablabBB' #optional hashtag which needs to be in content to consider post
+lang: FR
+members: '10'
+fablabsio:
+#events_ics: #url to a ics (google calendar for example)
+#events_ics_filter: '#\w*' # optional regex to filter posts
+machines:
+- Machine Name #must be a name of a yml file which exist in machines subfolder
+- ref: Machine Name # ref version to add attribute for this specific machine and this lab
+  power: 100W
+  qty: 2
diff --git a/content/spaces/at3flo.png b/content/spaces/at3flo.png
diff --git a/content/spaces/at3flo.yml b/content/spaces/at3flo.yml
@@ -0,0 +1,29 @@
+name: At3flo
+description: |-
+  At3flo est un tiers-lieu, alliant prototypage rapide, échange de temps, partage de savoirs et surtout plaisir. En d'autres termes, mixer la fabrication numérique et la ludification.
+
+  Pour une présentation plus interactive rendez-vous ici : <a href="https://at3flo.ch/presentation">lien de présentation</a>
+city: Ins
+zip: '3232'
+street: Moosgasse 12
+country_code: CH
+state_code: BE
+latitude: 47.0042997
+longitude: 7.1043073
+founded: 2015-12-30
+email: info@at3flo.ch
+website: https://www.at3flo.ch
+facebook: at3flo
+twitter: at3flo
+language: FR, DE, EN, LSF-CH
+events_ics: https://calendar.google.com/calendar/ical/at3flo.ch_meqjpg0ogk7k6ugbb18rc1smp4%40group.calendar.google.com/public/basic.ics
+members: 10
+fablabsio: at3flo
+events_ics_filter: '#w\w*'
+machines:
+- Cameo
+- Robox
+- Pocket NC 5 Axis Desktop
+- ref: GV1390
+  power: 100W
+- Crawlbot
diff --git a/content/spaces/ceff-lab.png b/content/spaces/ceff-lab.png
diff --git a/content/spaces/ceff-lab.yml b/content/spaces/ceff-lab.yml
@@ -0,0 +1,24 @@
+name: ceff-LAB Moutier
+description: ''
+city: Moutier
+zip: '2740'
+street: Rue Pré Jean-Meunier 1
+country_code: CH
+state_code: ''
+latitude: 47.2766062
+longitude: 7.3796285
+founded: 2019-11-01
+email: ''
+website: https://ceff-lab.ch/
+facebook:
+twitter:
+language: fr
+events_ics: ''
+machines:
+- CAMM-1 GS-24
+- ref: Speedy 360
+  power: 60W
+- ref: Mini Mill
+  power: 5,6kW
+- CR-10S pro
+- Ender-3 Pro
diff --git a/content/spaces/closed/fablab-hepl.png b/content/spaces/closed/fablab-hepl.png