added client and bake it into the docker container (not yet tested)

Timtam · Mar 9, 2024 · 0a987f3 · 0a987f3
1 parent 51edfa9
commit 0a987f3
Show file tree

Hide file tree

Showing 17 changed files with 3,282 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,12 @@
-FROM rust:1.76-slim-bookworm as build
+FROM node:20 AS CLIENT_BUILD_IMAGE
+
+WORKDIR /app
+
+COPY ./client /app
+
+RUN npm install && npm run build
+
+FROM rust:1.76-slim-bookworm as SERVER_CLIENT_IMAGE
 
 # create a new empty shell project
 RUN apt-get update && apt-get -y install libssl-dev pkg-config && \
@@ -25,6 +33,8 @@ RUN cargo build --release
 # our final base
 FROM debian:bookworm-slim
 
+WORKDIR /hitster
+
 # prepare the OS
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
@@ -33,7 +43,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # copy the build artifact from the build stage
-COPY --from=build /hitster/target/release/hitster-server ./hitster
+COPY --from=SERVER_BUILD_IMAGE /hitster/target/release/hitster-server /hitster/server/hitster
+COPY --from=CLIENT_BUILD_IMAGE /app/dist /hitster/client/dist
 
 # set the startup command to run your binary
-CMD ["./hitster"]
+CMD ["/hitster/server/hitster"]
diff --git a/client/.eslintrc.cjs b/client/.eslintrc.cjs
@@ -0,0 +1,18 @@
+module.exports = {
+    root: true,
+    env: { browser: true, es2020: true },
+    extends: [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:react-hooks/recommended",
+    ],
+    ignorePatterns: ["dist", ".eslintrc.cjs"],
+    parser: "@typescript-eslint/parser",
+    plugins: ["react-refresh"],
+    rules: {
+        "react-refresh/only-export-components": [
+            "warn",
+            { allowConstantExport: true },
+        ],
+    },
+}
diff --git a/client/.gitignore b/client/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/client/.prettierignore b/client/.prettierignore
@@ -0,0 +1 @@
+dist
diff --git a/client/.prettierrc.json b/client/.prettierrc.json
@@ -0,0 +1,4 @@
+{
+    "tabWidth": 4,
+    "semi": false
+}
diff --git a/client/index.html b/client/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Vite + React + TS</title>
+    </head>
+    <body>
+        <div id="root"></div>
+        <script type="module" src="/src/main.tsx"></script>
+    </body>
+</html>