Merge pull request #32 from munichmakerlab/astro

Move to Astro

.dockerignore

@@ -0,0 +1,3 @@
+.DS_Store
+node_modules
+dist

.github/workflows/docker-build-push.yml

@@ -24,8 +24,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
       # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1

.gitignore

@@ -1,6 +1,24 @@
-_site
-.sass-cache
-.jekyll-cache
-.jekyll-metadata
-vendor
-id_rsa*
+# build output
+dist/
+
+# generated types
+.astro/
+
+# dependencies
+node_modules/
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store
+
+# jetbrains setting folder
+.idea/

.vscode/extensions.json

@@ -0,0 +1,4 @@
+{
+  "recommendations": ["astro-build.astro-vscode"],
+  "unwantedRecommendations": []
+}

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "./node_modules/.bin/astro dev",
+      "name": "Development server",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

Dockerfile

@@ -1,10 +1,12 @@
-FROM jekyll/jekyll AS build
-COPY --chown=jekyll:jekyll . /srv/jekyll/
-RUN jekyll build
+FROM node:lts AS runtime
+WORKDIR /app
 
-FROM php:8.3-apache
-COPY docker/mumalab-website.conf /etc/apache2/conf-available/mumalab-website.conf
-COPY --from=build /srv/jekyll/_site /var/www/html
-RUN a2enconf mumalab-website && \
-    a2enmod proxy proxy_http ssl && a2enmod rewrite && \
-    pecl install apcu && docker-php-ext-enable apcu
+COPY . .
+
+RUN npm install
+RUN npm run build
+
+ENV HOST=0.0.0.0
+ENV PORT=80
+EXPOSE 80
+CMD node ./dist/server/entry.mjs

README.md

@@ -1,20 +1,39 @@
-# New MuMaLab Website
-
-Based on [Clean Blog](https://startbootstrap.com/theme/clean-blog) by [Start Bootstrap](http://startbootstrap.com/), which was released under [Apache 2.0](https://github.com/IronSummitMedia/startbootstrap-clean-blog/blob/gh-pages/LICENSE) license.
-
-## Additional libraries
-* [tumblr-rss.js](https://github.com/calvinbushor/Tumblr-RSS-Client-Side-JS-Plugin)
-** heavily modified to work with our template
-* [ResponsiveSlides.js](https://github.com/viljamis/ResponsiveSlides.js)
-* [jquery.ics](http://bitfish.eu/projects/jquery-ics/)
-** fixed for multiline values in .ics files
-* [FullCalendar](http://fullcalendar.io/)
-
-## Webserver
-Even though this is a static page, we have some weird-ish quirks in here that could be fixed eventually
-* We proxy the tumblr json via a PHP script (``/static/blog.php``), which gets redirected via mod_redirect from ``/api/read/json`` (via ``.htaccess``)
-  * This is used by the frontpage blog, and iirc did this to ensure all content is loaded via HTTPS, which it otherwise would not.
-* We proxy our calendar, which comes in via google, via mod_proxy
-  * Not sure if this is actually still being used.
-
-All this requires this to be served via an Apache webserver at the moment, with PHP and the proxy, proxy_http, ssl and redirect modules enabled. The blog.php script uses the PHP extension APCu.
+MunichMakerLab Website
+
+this website has been built with astro and tries to minimize the gotchas and special purpose additions for maintainabilities sake.
+
+## 🚀 Project Structure
+
+Inside of this project, you'll see the following folders and files:
+
+```text
+/
+├── public/
+│   └── favicon.svg
+├── src/
+│   ├── layouts/
+│   │   └── Layout.astro
+│   └── pages/
+│       └── index.astro
+└── package.json
+```
+
+To learn more about the folder structure of an Astro project, refer to [our guide on project structure](https://docs.astro.build/en/basics/project-structure/).
+Tl;dr: The actual pages of the website are in [src/pages](/src/pages/) and are mostly markdown. Adding another page should be as easy as just creating another file, copy-pasting the head section and customizing it and the page itself.
+
+## 🧞 Commands
+
+All commands are run from the root of the project, from a terminal:
+
+| Command                   | Action                                           |
+| :------------------------ | :----------------------------------------------- |
+| `npm install`             | Installs dependencies                            |
+| `npm run dev`             | Starts local dev server at `localhost:4321`      |
+| `npm run build`           | Build your production site to `./dist/`          |
+| `npm run preview`         | Preview your build locally, before deploying     |
+| `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |
+| `npm run astro -- --help` | Get help using the Astro CLI                     |
+
+## 👀 Want to learn more?
+
+Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).