diff --git a/Dockerfile b/Dockerfile index ab645f1d..f07f3e06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,7 @@ RUN update-alternatives --install /sbin/iptables iptables /sbin/iptables-legacy # Set Environment ENV DEBUG=Server,WireGuard +ENV PORT=51821 # Run Web UI WORKDIR /app diff --git a/src/nuxt.config.ts b/src/nuxt.config.ts index 3fbf727c..14ea466a 100644 --- a/src/nuxt.config.ts +++ b/src/nuxt.config.ts @@ -2,5 +2,8 @@ export default defineNuxtConfig({ compatibilityDate: '2024-04-03', devtools: { enabled: true }, - modules: ["@nuxtjs/i18n", "@nuxtjs/tailwindcss", "@nuxt/eslint"] + modules: ["@nuxtjs/i18n", "@nuxtjs/tailwindcss"], + $development: { + modules: ["@nuxt/eslint"] + } }) \ No newline at end of file diff --git a/src/package.json b/src/package.json index 4323b617..29119379 100644 --- a/src/package.json +++ b/src/package.json @@ -18,7 +18,7 @@ "dependencies": { "@nuxtjs/i18n": "^8.3.3", "@nuxtjs/tailwindcss": "^6.12.1", - "bcrypt": "^5.1.1", + "bcryptjs": "^2.4.3", "debug": "^4.3.6", "nuxt": "^3.12.4", "qrcode": "^1.5.3", @@ -26,7 +26,7 @@ }, "devDependencies": { "@nuxt/eslint": "^0.5.0", - "@types/bcrypt": "^5.0.2", + "@types/bcryptjs": "^2.4.6", "@types/debug": "^4.1.12", "@types/qrcode": "^1.5.5", "eslint": "^9.8.0", diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 66c164bf..b060abb1 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -14,9 +14,9 @@ importers: '@nuxtjs/tailwindcss': specifier: ^6.12.1 version: 6.12.1(magicast@0.3.4)(rollup@4.19.2) - bcrypt: - specifier: ^5.1.1 - version: 5.1.1 + bcryptjs: + specifier: ^2.4.3 + version: 2.4.3 debug: specifier: ^4.3.6 version: 4.3.6 @@ -33,9 +33,9 @@ importers: '@nuxt/eslint': specifier: ^0.5.0 version: 0.5.0(eslint@9.8.0)(magicast@0.3.4)(rollup@4.19.2)(typescript@5.5.4)(vite@5.3.5(@types/node@22.0.2)(terser@5.31.3)) - '@types/bcrypt': - specifier: ^5.0.2 - version: 5.0.2 + '@types/bcryptjs': + specifier: ^2.4.6 + version: 2.4.6 '@types/debug': specifier: ^4.1.12 version: 4.1.12 @@ -49,7 +49,7 @@ importers: specifier: ^5.5.4 version: 5.5.4 vue-tsc: - specifier: ^2 + specifier: ^2.0.29 version: 2.0.29(typescript@5.5.4) packages: @@ -1205,8 +1205,8 @@ packages: resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} - '@types/bcrypt@5.0.2': - resolution: {integrity: sha512-6atioO8Y75fNcbmj0G7UjI9lXN2pQ/IGJ2FWT4a/btd0Lk9lQalHLKhkgKVZ3r+spnmWUKfbMi1GEe9wyHQfNQ==} + '@types/bcryptjs@2.4.6': + resolution: {integrity: sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ==} '@types/debug@4.1.12': resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} @@ -1592,9 +1592,8 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - bcrypt@5.1.1: - resolution: {integrity: sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==} - engines: {node: '>= 10.0.0'} + bcryptjs@2.4.3: + resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==} binary-extensions@2.3.0: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} @@ -3032,9 +3031,6 @@ packages: xml2js: optional: true - node-addon-api@5.1.0: - resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==} - node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} @@ -5680,9 +5676,7 @@ snapshots: '@trysound/sax@0.2.0': {} - '@types/bcrypt@5.0.2': - dependencies: - '@types/node': 22.0.2 + '@types/bcryptjs@2.4.6': {} '@types/debug@4.1.12': dependencies: @@ -6192,13 +6186,7 @@ snapshots: base64-js@1.5.1: {} - bcrypt@5.1.1: - dependencies: - '@mapbox/node-pre-gyp': 1.0.11 - node-addon-api: 5.1.0 - transitivePeerDependencies: - - encoding - - supports-color + bcryptjs@2.4.3: {} binary-extensions@2.3.0: {} @@ -7800,8 +7788,6 @@ snapshots: - supports-color - uWebSockets.js - node-addon-api@5.1.0: {} - node-addon-api@7.1.1: {} node-fetch-native@1.6.4: {} diff --git a/src/utils/password.ts b/src/utils/password.ts index a6320b03..377b637c 100644 --- a/src/utils/password.ts +++ b/src/utils/password.ts @@ -1,4 +1,4 @@ -import bcrypt from 'bcrypt'; +import bcrypt from 'bcryptjs'; import { PASSWORD_HASH } from "~/utils/config";