refactor!: separate source code

Dockerfile

@@ -4,8 +4,9 @@
 FROM docker.io/library/node:18-alpine AS build_node_modules
 
 # Copy Web UI
-COPY src/ /app/
-WORKDIR /app
+COPY backend/ /app/backend/
+COPY frontend/ /app/frontend/
+WORKDIR /app/backend
 RUN npm ci --omit=dev &&\
     mv node_modules /node_modules
 
@@ -50,5 +51,5 @@ EXPOSE 51821/tcp
 ENV DEBUG=Server,WireGuard
 
 # Run Web UI
-WORKDIR /app
+WORKDIR /app/backend
 CMD ["/usr/bin/dumb-init", "node", "server.js"]

README.md

@@ -99,10 +99,10 @@ These options can be configured by setting environment variables using `-e KEY="
 | `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Clients IP address range. |
 | `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use. If set to blank value, clients will not use any DNS. |
 | `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use. |
-| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L19) for the default value. |
-| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L20) for the default value. |
-| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L27) for the default value. |
-| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L28) for the default value. |
+| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/backend/config.js#L19) for the default value. |
+| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/backend/config.js#L20) for the default value. |
+| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/backend/config.js#L27) for the default value. |
+| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/backend/config.js#L28) for the default value. |
 | `LANG` | `en` | `de` | Web UI language (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th, hi). |
 | `UI_TRAFFIC_STATS` | `false` | `true` | Enable detailed RX / TX client stats in Web UI |
 

src/lib/Server.js → backend/lib/Server.js

@@ -213,7 +213,7 @@ module.exports = class Server {
       }));
 
     // Static assets
-    const publicDir = 'www';
+    const publicDir = join(__dirname, '../../frontend');
     app.use(
       defineEventHandler((event) => {
         return serveStatic(event, {

src/package.json → backend/package.json

@@ -7,8 +7,7 @@
   "scripts": {
     "serve": "DEBUG=Server,WireGuard nodemon server.js",
     "serve-with-password": "PASSWORD=wg npm run serve",
-    "lint": "eslint .",
-    "buildcss": "npx tailwindcss -i ./www/src/css/app.css -o ./www/css/app.css"
+    "lint": "eslint ."
   },
   "author": "Emile Nijssen",
   "license": "GPL",
@@ -21,13 +20,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "eslint-config-athom": "^3.1.3",
-    "tailwindcss": "^3.4.1"
-  },
-  "nodemonConfig": {
-    "ignore": [
-      "www/*"
-    ]
+    "eslint-config-athom": "^3.1.3"
   },
   "engines": {
     "node": "18"

docker-compose.dev.yml

@@ -4,7 +4,8 @@ services:
     image: wg-easy
     command: npm run serve
     volumes:
-      - ./src/:/app/
+      - ./frontend/:/app/frontend/
+      - ./backend/:/app/backend/
     environment:
       # - PASSWORD=p
       - WG_HOST=192.168.1.233

frontend/.gitignore

@@ -0,0 +1 @@
+/node_modules

frontend/package.json

@@ -0,0 +1,8 @@
+{
+  "scripts": {
+    "buildcss": "npx tailwindcss -i ./src/css/app.css -o ./css/app.css"
+  },
+  "devDependencies": {
+    "tailwindcss": "^3.4.1"
+  }
+}

src/tailwind.config.js → frontend/tailwind.config.js

@@ -4,7 +4,7 @@
 
 module.exports = {
   darkMode: 'selector',
-  content: ['./www/**/*.{html,js}'],
+  content: ['./index.html'],
   theme: {
     screens: {
       xxs: '450px',