Move frontend to core and serve statics from rocket

.dockerignore

@@ -1 +1,3 @@
 target/
+web/node_modules
+web/dist

.gitignore

@@ -1,3 +1,10 @@
 target/
 defguard.db*
 .volumes
+node_modules
+.DS_Store
+dist
+dist-ssr
+*.local
+build
+ladle-build

Dockerfile

@@ -30,11 +30,23 @@ COPY migrations migrations
 ENV SQLX_OFFLINE true
 RUN cargo install --locked --path . --root /build
 
+FROM node:19-alpine3.15 as web
+
+WORKDIR /app
+COPY web/package.json .
+COPY web/pnpm-lock.yaml .
+COPY web/.npmrc .
+RUN npm i -g pnpm
+RUN pnpm install --ignore-scripts
+COPY web/ .
+RUN pnpm build
+
 # run
 FROM debian:bullseye-slim as runtime
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 WORKDIR /app
 COPY --from=builder /build/bin/defguard .
+COPY --from=web /app/dist ./web
 ENTRYPOINT ["./defguard"]

src/lib.rs

@@ -45,7 +45,7 @@ use handlers::{
         add_webhook, change_enabled, change_webhook, delete_webhook, get_webhook, list_webhooks,
     },
 };
-use rocket::{config::Config, error::Error as RocketError, Build, Ignite, Rocket};
+use rocket::{config::Config, error::Error as RocketError, Build, Ignite, Rocket, fs::FileServer};
 use std::{
     net::{IpAddr, Ipv4Addr},
     sync::{Arc, Mutex},
@@ -86,6 +86,8 @@ pub async fn build_webapp(
     };
     let license_decoded = License::decode(&config.license);
     let webapp = rocket::custom(cfg)
+        .mount("/", FileServer::from("./web"));
+    let webapp = webapp
         .mount(
             "/api/v1",
             routes![

web/.commitlintrc.json

@@ -0,0 +1,3 @@
+{
+    "extends": ["@commitlint/config-conventional"]
+}

web/.eslintignore

@@ -0,0 +1,7 @@
+/dist
+*.scss
+*.css
+/.next
+/node_modules
+/build
+*.js