Formatting and config

.dockerignore

@@ -1,8 +0,0 @@
-Dockerfile
-.dockerignore
-node_modules
-npm-debug.log
-README.md
-.output
-.vinxi
-.git

.eslintrc.cjs

@@ -1,8 +0,0 @@
-module.exports = {
-  parser: "@typescript-eslint/parser",
-  plugins: ["solid"],
-  extends: ["eslint:recommended", "plugin:solid/typescript", "prettier"],
-  env: {
-    node: true,
-  },
-};

.gitignore

@@ -1,27 +1,21 @@
-dist
-.vinxi
-.output
-.vercel
-.netlify
-netlify
+# build output
+dist/
 
-# Environment
-.env
-.env*.local
+# generated types
+.astro/
 
 # dependencies
-/node_modules
+node_modules/
 
-# IDEs and editors
-/.idea
-.project
-.classpath
-*.launch
-.settings/
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
 
-# Temp
-gitignore
+# environment variables
+.env
+.env.production
 
-# System Files
+# macOS-specific files
 .DS_Store
-Thumbs.db

.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,53 +0,0 @@
-# Use the desired base image
-FROM node:21-alpine AS base
-
-# Set the NODE_ENV to production
-ENV NODE_ENV production
-
-# Install dependencies only when needed
-FROM base AS deps
-# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
-RUN apk add --no-cache libc6-compat
-WORKDIR /app
-
-# Install dependencies based on the preferred package manager
-COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
-# Pass the Font Awesome token as a build argument
-ARG FONT_AWESOME_TOKEN
-RUN echo "@fortawesome:registry=https://npm.fontawesome.com/" > ~/.npmrc \
-  && echo "//npm.fontawesome.com/:_authToken=${FONT_AWESOME_TOKEN}" >> ~/.npmrc \
-  && if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
-  elif [ -f package-lock.json ]; then npm ci; \
-  elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
-
-# Rebuild the source code only when needed
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-RUN npm run build
-
-# Production image, copy all the files and run next
-FROM base AS runner
-WORKDIR /app
-
-# Remove existing 'node' user and create a new user 'node' with UID 99 and use the existing group with GID 100
-RUN deluser --remove-home node \
-  && adduser -S -G users -u 99 node
-
-COPY --from=builder /app/public ./public
-COPY --from=builder --chown=node:users /app/.output ./.output
-COPY --from=builder --chown=node:users /app/.vinxi ./.vinxi
-
-# Switch to the non-root user
-USER node
-
-EXPOSE 3000
-
-# Set the default values for environment variables
-ENV PORT 3000
-ENV HOSTNAME "0.0.0.0"
-
-CMD ["node", ".output/server/index.mjs"]

app.config.ts

@@ -1,3 +0,0 @@
-import { defineConfig } from "@solidjs/start/config";
-
-export default defineConfig({});

astro.config.mjs

@@ -0,0 +1,8 @@
+import solidJs from "@astrojs/solid-js"
+import { defineConfig } from "astro/config"
+
+// https://astro.build/config
+export default defineConfig({
+  integrations: [solidJs()],
+  output: "hybrid",
+})

package.json

@@ -1,36 +1,22 @@
 {
   "name": "jg-eucs",
-  "scripts": {
-    "dev": "vinxi dev",
-    "build": "vinxi build",
-    "start": "vinxi start",
-    "lint": "eslint --fix \"src/**/*.{ts,tsx,js,jsx}\"",
-    "typecheck": "tsc --noEmit --checkJs false --skipLibCheck"
-  },
   "type": "module",
-  "devDependencies": {
-    "@types/node": "^20.11.21",
-    "@typescript-eslint/parser": "^7.1.0",
-    "esbuild": "^0.20.1",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-solid": "^0.13.1",
-    "prettier": "^3.2.5",
-    "prettier-plugin-organize-imports": "^3.2.4",
-    "typescript": "^5.3.3"
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview",
+    "astro": "astro"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.5.1",
-    "@fortawesome/free-brands-svg-icons": "^6.5.1",
-    "@fortawesome/pro-regular-svg-icons": "^6.5.1",
-    "@solidjs/meta": "^0.29.3",
-    "@solidjs/router": "^0.12.4",
-    "@solidjs/start": "^0.6.0",
-    "sass": "^1.71.1",
-    "solid-js": "^1.8.15",
-    "vinxi": "^0.3.4"
+    "@astrojs/solid-js": "^2.2.1",
+    "astro": "^2.10.12",
+    "solid-js": "^1.4.3"
   },
-  "engines": {
-    "node": ">=18"
+  "devDependencies": {
+    "prettier": "^3.0.2",
+    "prettier-plugin-astro": "^0.11.1",
+    "prettier-plugin-organize-imports": "^3.2.3"
   }
 }

prettier.config.cjs

@@ -1,3 +1,8 @@
 module.exports = {
-  plugins: ["prettier-plugin-organize-imports"],
-};
+  semi: false,
+  printWidth: 1000,
+  plugins: [
+    "prettier-plugin-astro",
+    "prettier-plugin-organize-imports",
+  ],
+}

public/favicon/manifest.json

@@ -2,39 +2,39 @@
  "name": "App",
  "icons": [
   {
-      "src": "/android-icon-36x36.png",
+   "src": "\/android-icon-36x36.png",
    "sizes": "36x36",
-      "type": "image/png",
+   "type": "image\/png",
    "density": "0.75"
   },
   {
-      "src": "/android-icon-48x48.png",
+   "src": "\/android-icon-48x48.png",
    "sizes": "48x48",
-      "type": "image/png",
+   "type": "image\/png",
    "density": "1.0"
   },
   {
-      "src": "/android-icon-72x72.png",
+   "src": "\/android-icon-72x72.png",
    "sizes": "72x72",
-      "type": "image/png",
+   "type": "image\/png",
    "density": "1.5"
   },
   {
-      "src": "/android-icon-96x96.png",
+   "src": "\/android-icon-96x96.png",
    "sizes": "96x96",
-      "type": "image/png",
+   "type": "image\/png",
    "density": "2.0"
   },
   {
-      "src": "/android-icon-144x144.png",
+   "src": "\/android-icon-144x144.png",
    "sizes": "144x144",
-      "type": "image/png",
+   "type": "image\/png",
    "density": "3.0"
   },
   {
-      "src": "/android-icon-192x192.png",
+   "src": "\/android-icon-192x192.png",
    "sizes": "192x192",
-      "type": "image/png",
+   "type": "image\/png",
    "density": "4.0"
   }
  ]

public/sitemap.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/sitemap.xsl"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url>
-    <loc>https://jg-eucs.com/en</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/en/KSS22</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/en/manufacturers</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/en/overview</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/de</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/de/imprint</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/de/KSS22</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/de/manufacturers</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-  <url>
-    <loc>https://jg-eucs.com/de/overview</loc>
-    <lastmod>2024-03-13</lastmod>
-  </url>
-</urlset>

public/sitemap.xsl

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0"
-                xmlns:html="http://www.w3.org/TR/REC-html40"
-                xmlns:image="http://www.google.com/schemas/sitemap-image/1.1"
-                xmlns:sitemap="http://www.sitemaps.org/schemas/sitemap/0.9"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
-    <xsl:template match="/">
-        <html xmlns="http://www.w3.org/1999/xhtml">
-            <head>
-                <title>XML Sitemap</title>
-                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-                <style type="text/css">
-                    body {
-                        font-family: sans-serif;
-                        font-size: 16px;
-                        color: #242628;
-                    }
-                    a {
-                        color: #000;
-                        text-decoration: none;
-                    }
-                    a:hover {
-                        text-decoration: underline;
-                    }
-                    table {
-                        border: none;
-                        border-collapse: collapse;
-                        width: 100%
-                    }
-                    th {
-                        text-align: left;
-                        padding-right: 30px;
-                        font-size: 11px;
-                    }
-                    thead th {
-                        border-bottom: 1px solid #7d878a;
-                        cursor: pointer;
-                    }
-                    td {
-                        font-size:11px;
-                        padding: 5px;
-                    }
-                    tr:nth-child(odd) td {
-                        background-color: rgba(0,0,0,0.04);
-                    }
-                    tr:hover td {
-                        background-color: #e2edf2;
-                    }
-
-                    #content {
-                        margin: 0 auto;
-                        padding: 2% 5%;
-                        max-width: 800px;
-                    }
-
-                    .desc {
-                        margin: 18px 3px;
-                        line-height: 1.2em;
-                    }
-                    .desc a {
-                        color: #5ba4e5;
-                    }
-                </style>
-            </head>
-            <body>
-                <div id="content">
-                    <h1>XML Sitemap</h1>
-                    <p class="desc">
-                        This is a sitemap created by <a href="https://unlimited-dev.de">Unlimited Development</a> to allow search engines to discover this site's content.
-                    </p>
-                        <table id="sitemap" cellpadding="3">
-                            <thead>
-                                <tr>
-                                    <th width="70%">URL (<xsl:value-of select="count(sitemap:urlset/sitemap:url)"/> total)</th>
-                                    <th width="15%">Images</th>
-                                    <th title="Last Modification Time" width="15%">Last Modified</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <xsl:variable name="lower" select="'abcdefghijklmnopqrstuvwxyz'"/>
-                                <xsl:variable name="upper" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-                                <xsl:for-each select="sitemap:urlset/sitemap:url">
-                                    <tr>
-                                        <td>
-                                            <xsl:variable name="itemURL">
-                                                <xsl:value-of select="sitemap:loc"/>
-                                            </xsl:variable>
-                                            <a href="{$itemURL}">
-                                                <xsl:value-of select="sitemap:loc"/>
-                                            </a>
-                                        </td>
-                                        <td>
-                                            <xsl:value-of select="count(image:image)"/>
-                                        </td>
-                                        <td>
-                                            <xsl:value-of select="concat(substring(sitemap:lastmod,0,11),concat(' ', substring(sitemap:lastmod,12,5)))"/>
-                                        </td>
-                                    </tr>
-                                </xsl:for-each>
-                            </tbody>
-                        </table>
-                </div>
-            </body>
-        </html>
-
-    </xsl:template>
-</xsl:stylesheet>