Merge branch 'refs/heads/astro'

# Conflicts: # website/assets/style.css # website_astro/src/content/index/rest.md
hyperknot · Jun 13, 2024 · 6516339 · 6516339
2 parents fb8488e + d6f457a
commit 6516339
Show file tree

Hide file tree

Showing 47 changed files with 2,863 additions and 1,682 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ venv
 
 
 /pnpm-lock.yaml
+/astro_blog
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -3,6 +3,16 @@ const config = {
   semi: false,
   singleQuote: true,
   arrowParens: 'avoid',
+
+  plugins: ['prettier-plugin-astro'],
+  overrides: [
+    {
+      files: '*.astro',
+      options: {
+        parser: 'astro',
+      },
+    },
+  ],
 }
 
 module.exports = config
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
-    "prettier": "^3.2.4"
+    "prettier": "^3.2.4",
+    "prettier-plugin-astro": "^0.14.0"
   }
 }
diff --git a/website/.gitignore b/website/.gitignore
diff --git a/website/README.md b/website/README.md
diff --git a/website/assets/berlin.png b/website/assets/berlin.png
diff --git a/website/assets/london.jpg b/website/assets/london.jpg
diff --git a/website/assets/pricing.json b/website/assets/pricing.json