webnext to web (#195)

* content tweaks

* remove old web

* rename webnext -> web

* readd ui submodule

* Update vite.config.ts

Author: filipslezaklab

.dockerignore

@@ -1,8 +1,6 @@
 target/
 web/node_modules
 web/dist
-webnext/node_modules
-webnext/dist
 .volumes/
 .github/
 docs/

.github/workflows/lint-web.yml

@@ -32,16 +32,16 @@ jobs:
         with:
           node-version: 24
       - name: install deps
-        working-directory: ./webnext
+        working-directory: ./web
         run: |
           npm i -g pnpm
           pnpm i --frozen-lockfile
       - name: Build translations
-        working-directory: ./webnext
+        working-directory: ./web
         run: pnpm dlx @inlang/paraglide-js compile --project ./project.inlang --outdir ./src/paraglide
       - name: Lint
-        working-directory: ./webnext
+        working-directory: ./web
         run: pnpm lint
       - name: Audit
-        working-directory: ./webnext
+        working-directory: ./web
         run: pnpm audit --prod

.github/workflows/release.yml

@@ -122,15 +122,15 @@ jobs:
         with:
           node-version: 24
           cache: "pnpm"
-          cache-dependency-path: ./webnext/pnpm-lock.yaml
+          cache-dependency-path: ./web/pnpm-lock.yaml
 
       - name: Install frontend dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
-        working-directory: webnext
+        working-directory: web
 
       - name: Build frontend
         run: pnpm build
-        working-directory: webnext
+        working-directory: web
 
       - name: Build release binary
         uses: actions-rs/cargo@v1

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "web/src/shared/defguard-ui"]
 	path = web/src/shared/defguard-ui
 	url = git@github.com:DefGuard/ui.git
-[submodule "webnext/src/shared/defguard-ui"]
-	path = webnext/src/shared/defguard-ui
-	url = git@github.com:DefGuard/ui.git

Dockerfile

@@ -1,10 +1,10 @@
 FROM node:24-alpine AS web
 
 WORKDIR /app
-COPY webnext/package.json webnext/pnpm-lock.yaml ./
+COPY web/package.json web/pnpm-lock.yaml ./
 RUN npm i -g pnpm
 RUN pnpm install --ignore-scripts --frozen-lockfile
-COPY webnext/ .
+COPY web/ .
 RUN pnpm build
 
 FROM rust:1 AS chef
@@ -28,7 +28,7 @@ COPY --from=planner /build/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 
 # build project
-COPY --from=web /app/dist ./webnext/dist
+COPY --from=web /app/dist ./web/dist
 RUN apt-get update && apt-get -y install protobuf-compiler libprotobuf-dev
 COPY Cargo.toml Cargo.lock build.rs ./
 # for vergen

README.md

@@ -46,7 +46,7 @@ cargo run
 To run webapp dev server:
 
 ```bash
-cd webnext/
+cd web/
 pnpm install
 pnpm run dev
 ```

src/assets.rs

@@ -16,7 +16,7 @@ pub async fn index() -> impl IntoResponse {
 }
 
 #[derive(Embed)]
-#[folder = "webnext/"]
+#[folder = "web/"]
 #[include = "dist/*"]
 struct WebAsset;
 

web/.editorconfig

@@ -7,22 +7,5 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.{ts,tsx}]
-indent_style = space
-indent_size = 2
+[*.{ts,tsx,js,jsx,scss,html,json,yaml}]
 rulers = 90
-
-[*.{scss}]
-indent_style = space
-indent_size = 2
-rulers = 90
-
-[*.{html}]
-indent_style = space
-indent_size = 2
-rulers = 90
-
-[*.{json,yaml}]
-indent_style = space
-indent_size = 2
-rulers = 80

web/.env.template

@@ -0,0 +1,2 @@
+VITE_UPDATE_BASE_URL="/update/api"
+UPDATE_TARGET_URL=""