Merge pull request #33 from munichmakerlab/adjust-content

Restructure pages, adjust textes

src/components/Navbar.vue

@@ -26,6 +26,14 @@ const links = [
   {
     name: 'About',
     path: '/about',
+  },
+   {
+    name: 'Visit',
+    path: '/visit',
+  },
+  {
+    name: 'Contact',
+    path: '/contact',
   },
   {
     name: 'Calendar',
@@ -35,10 +43,7 @@ const links = [
     name: 'Wiki',
     path: 'https://wiki.munichmakerlab.de/',
   },
-  {
-    name: 'Contact',
-    path: '/contact',
-  },
+ 
 ]
 
 const isCollapsed = ref(true)

src/components/Status.vue

@@ -11,13 +11,6 @@
           ? "The Space is currently open! You may come over and hang out. Keep in mind that there is no guarantee that people will be there for an extended period of time (unless it's currently the open thursday)."
           : 'The Lab is currently closed. A member will need to come in and open it for visitors.'
       }}
-      <br />
-      <br />
-      For more details, take a look at the
-      <a href="https://wiki.munichmakerlab.de/wiki/StartYourEngines"
-        >Start Your Engines</a
-      >
-      project in our wiki.
     </div>
   </div>
 </template>

src/pages/about.mdx

@@ -6,24 +6,42 @@ headline: "About Us"
 sub_headline: "What's the Munich Maker Lab?"
 ---
 
-The Munich Maker Lab is a non-profit organization, creating an open community 
-workspace, where you can learn, teach, share, make, hack, create, enjoy or 
-simply relax. We try to create an environment that supports the do-it-yourself, 
-hacker, and maker culture by providing workspace, tools, and infrastructure to 
-our members and everyone else.
+The Munich Maker Lab is a non-profit organization, creating an open community workspace, where you can learn, teach, share, make, hack, create, enjoy or simply relax. We try to create an environment that supports the do-it-yourself, hacker, and maker culture by providing workspace, tools, and infrastructure to our members and everyone else.
 
-[Our statutes](statutes) and [our scale of fees](scaleoffees)
+Everyone is welcome to visit when our website indicates an open status, as we don't have fixed opening times apart from our open Thursday. We are a fully community-driven space, and no one is paid for their contributions to the lab. 
+Our members are an diverse group of tech-savvy and non-tech individuals alike. They come to build and explore new things, work on their personal projects, create improvements for the lab, make art, and learn new skills.
+
+The Hacking Room Project was started in April 2013 to create a new Hacker-/Makerspace in Munich. After less than a year, in February 2014, we founded the Munich Maker Lab e.V. and moved into our first space, a 25m² room at Werk1 München. A year later, we expanded and moved into new rooms in Obersendling. Since early 2017, we have a  industrial space in the Kreativquartier.
+
+Join us at one of our next meetups.
+
+[→ Visit us ← ](visit)
+
+More questions?
+
+[→ Check our Frequently Asked Questions ←](https://wiki.munichmakerlab.de/wiki/Frequently_Asked_Questions)
+
+OR
+
+[→ Contact us ←](contact)
+
+## Organization
+
+We are a non-profit organization, which is completely run by volunteers. If you want to become a member and support us on a regular basis, please fill out our [membership form](https://wiki.munichmakerlab.de/images/6/62/Membership_Form_2024.pdf), 
+and bring it to one of our meetings. However, being a member is not a prerequisite to use the space, so feel free to just stop by.
+For more details check our [Onboarding](https://wiki.munichmakerlab.de/wiki/Onboarding)
+
+Being a member has some benefits, such as the possibility to get a 
+key to the space. 
+
+
+[Our statutes](statutes)  and [Our scale of fees](scaleoffees)
 
 ## Support us
 
 We need to pay rent for our space, maintenance for tools, and we'd also like 
 to support projects that happen at the space. To do so, we need money. We try 
-to cover our fixed costs with membership fees (20€ per month, 10€ if you're 
-under 18). Being a member has some benefits, such as the possibility to get a 
-key to the space. If you want to become a member and support us on a regular 
-basis, please fill out our [membership form](https://wiki.munichmakerlab.de/images/6/62/Membership_Form_2024.pdf), 
-and bring it to one of our meetings. However, being a member is not a 
-prerequisite to use the space, so feel free to just stop by.
+to cover our fixed costs with membership fees.
 
 If you like what we do, and want to give us a quick boost: we also take 
 donations. Since we are a non-profit organisation according to German law, we 

src/pages/contact.mdx

@@ -8,24 +8,16 @@ sub_headline: "Any questions? Contact us!"
 If you have any questions, drop us an email at info[at]munichmakerlab.de. 
 Or join our IRC channel #munichmakerlab over at the hackint network.
 
-## Mailinglist
+## Messenger Slack
 
-If you're up for it, join our mailing list discuss[at]munichmakerlab.de by 
-signing up [here](http://lists.munichmakerlab.de/listinfo/discuss). The 
-mailing list is where most of our communication happens.
+Our main communication platform is slack. 
 
-## Address
+[Join](https://slack.munichmakerlab.de/) our slack or [login](https://munichmakerlab.slack.com/) :-) 
 
-Munich Maker Lab  
-Dachauerstr. 112h  
-80636 München  
+## Mailinglist
 
-## Visit us
+If you're up for it, join our mailing list discuss[at]munichmakerlab.de by 
+signing up [here](http://lists.munichmakerlab.de/listinfo/discuss). The 
+mailing list.
 
-Going in through the main entry of Dachauerstr. 112, head into the building 
-almost straight ahead, with the two white garage doors.
 
-<iframe frameborder="0" scrolling="no" marginheight="0" marginwidth="0" 
-src="https://www.openstreetmap.org/export/embed.html?bbox=11.548647880554201%2C48.15798972420428%2C11.551544666290285%2C48.15957318159677&amp;layer=mapnik&amp;marker=48.158780564401%2C11.550096273422241" 
-style="width:100%;height:300px;"></iframe><br/>
-<small>[Show bigger map](https://www.openstreetmap.org/node/3426114357#map=19/48.15884/11.55063)</small>

src/pages/visit.mdx

@@ -0,0 +1,37 @@
+---
+layout: ../layouts/Content.astro
+title: "Munich Maker Lab - Visit"
+header_image: "/img/bg_letter.png"
+headline: "Visit"
+sub_headline: "Come and join us!"
+---
+
+## Join us on Open Thursday
+
+Open Thursdays are for everyone! You don't need to be a member to join us, and we'll be giving tours!
+
+It's Thursday, and time for another MuMaLab e.V. club meeting! We have 3D printers, a CNC router, a huge laser cutter, Arduinos, wood & metal tools, and cold drinks, all in the cozy atmosphere of our big industrial-style hall. Come by to help out, chat, and meet new people!
+
+Not a club member yet? Come and get to know us – we love meeting new faces!
+
+Every Thursday starting at 6PM. 
+
+## Address
+
+Munich Maker Lab  
+Dachauerstr. 112h  
+80636 München  
+
+## Find the space
+
+Going in through the main entry of Dachauerstr. 112, head into the building 
+almost straight ahead, with the two white garage doors.
+
+<iframe frameborder="0" scrolling="no" marginheight="0" marginwidth="0" 
+src="https://www.openstreetmap.org/export/embed.html?bbox=11.548647880554201%2C48.15798972420428%2C11.551544666290285%2C48.15957318159677&amp;layer=mapnik&amp;marker=48.158780564401%2C11.550096273422241" 
+style="width:100%;height:300px;"></iframe><br/>
+<small>[Show bigger map](https://www.openstreetmap.org/node/3426114357#map=19/48.15884/11.55063)</small>
+
+## Entrance
+
+![Picture of entrance](/img/entrance.jpg)