diff --git a/.vscode/settings.json b/.vscode/settings.json index 9143452..30ffe0b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { - "i18n-ally.localesPaths": "app/src/locales", + "i18n-ally.localesPaths": "src/locales", "i18n-ally.keystyle": "nested" } \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index cd1e00e..4f581af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM node:15.11.0-alpine3.13 -RUN apk add git -f WORKDIR /app COPY . . -RUN yarn && cd app && yarn && cd .. -RUN yarn electron:package +RUN yarn +RUN yarn build \ No newline at end of file diff --git a/README.md b/README.md index 1dead16..134a330 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,20 @@ # @lfk/scanclient ## ✒️ Overview -This is an API client for @lfk/backend +This is an API client for [https://git.odit.services/lfk/backend](@lfk/backend) - WebApp built with [Svelte](https://svelte.dev), [WindiCSS](https://windicss.org/) (to compile [TailwindCSS](https://tailwindcss.com/)) and [Vite](https://vitejs.dev). -- Served to clients via by [Electron](https://electronjs.org/). ## 🚀 Getting Started ``` -yarn && cd app && yarn && cd .. +yarn ``` -## WebApp Development +## Development ``` yarn dev / yarn dev --open ``` -## Run in electron +## Build ``` -yarn electron:start -``` -# Package electron -``` -yarn electron:package +yarn build ``` \ No newline at end of file diff --git a/app/package.json b/app/package.json deleted file mode 100644 index 58b6847..0000000 --- a/app/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "@lfk/scanclient", - "version": "0.0.0", - "scripts": { - "dev": "vite", - "build": "vite build", - "format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte" - }, - "devDependencies": { - "@svitejs/vite-plugin-svelte": "^0.11.1", - "@tsconfig/svelte": "^1.0.10", - "@types/html-minifier": "^4.0.0", - "axios": "^0.21.1", - "glob": "^7.1.6", - "html-minifier": "^4.0.0", - "prettier": "^2.2.1", - "prettier-plugin-svelte": "^2.2.0", - "svelte": "^3.35.0", - "svelte-preprocess": "^4.6.9", - "vite": "^2.1.2", - "vite-plugin-windicss": "^0.9.2" - } -} diff --git a/app/index.html b/index.html similarity index 100% rename from app/index.html rename to index.html diff --git a/app/order.js b/order.js similarity index 100% rename from app/order.js rename to order.js diff --git a/package.json b/package.json index a39a03e..35bd951 100644 --- a/package.json +++ b/package.json @@ -1,48 +1,22 @@ { "name": "@lfk/scanclient", "version": "0.0.0", - "description": "minimal electron application", - "main": "main.js", "scripts": { - "dev": "cd app && yarn dev", - "electron:start": "cd app && yarn build && cd .. && electron-forge start", - "electron:package": "cd app && yarn build && cd .. && electron-forge package", - "format": "cd app && yarn format" + "dev": "vite", + "build": "vite build", + "format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte" }, "devDependencies": { - "@electron-forge/cli": "^6.0.0-beta.54", - "@electron-forge/maker-deb": "^6.0.0-beta.54", - "@electron-forge/maker-rpm": "^6.0.0-beta.54", - "@electron-forge/maker-squirrel": "^6.0.0-beta.54", - "@electron-forge/maker-zip": "^6.0.0-beta.54", - "electron-nightly": "14.0.0-nightly.20210318" - }, - "dependencies": { - "electron-squirrel-startup": "^1.0.0", - "svelte-i18n": "^3.3.7" - }, - "config": { - "forge": { - "packagerConfig": {}, - "makers": [ - { - "name": "@electron-forge/maker-zip", - "platforms": [ - "darwin" - ], - "config": { - "name": "lfk__scanclient" - } - }, - { - "name": "@electron-forge/maker-deb", - "config": {} - }, - { - "name": "@electron-forge/maker-rpm", - "config": {} - } - ] - } + "@svitejs/vite-plugin-svelte": "^0.11.1", + "@tsconfig/svelte": "^1.0.10", + "@types/html-minifier": "^4.0.0", + "axios": "^0.21.1", + "html-minifier": "^4.0.0", + "prettier": "^2.2.1", + "prettier-plugin-svelte": "^2.2.0", + "svelte": "^3.35.0", + "svelte-preprocess": "^4.6.9", + "vite": "^2.1.2", + "vite-plugin-windicss": "^0.9.2" } } diff --git a/app/public/env.js b/public/env.js similarity index 100% rename from app/public/env.js rename to public/env.js diff --git a/app/public/env.sample.js b/public/env.sample.js similarity index 100% rename from app/public/env.sample.js rename to public/env.sample.js diff --git a/app/public/favicon.png b/public/favicon.png similarity index 100% rename from app/public/favicon.png rename to public/favicon.png diff --git a/app/src/App.svelte b/src/App.svelte similarity index 100% rename from app/src/App.svelte rename to src/App.svelte diff --git a/app/src/Login.svelte b/src/Login.svelte similarity index 100% rename from app/src/Login.svelte rename to src/Login.svelte diff --git a/app/src/Scanner.svelte b/src/Scanner.svelte similarity index 100% rename from app/src/Scanner.svelte rename to src/Scanner.svelte diff --git a/app/src/Settings.svelte b/src/Settings.svelte similarity index 100% rename from app/src/Settings.svelte rename to src/Settings.svelte diff --git a/app/src/locales/de.json b/src/locales/de.json similarity index 100% rename from app/src/locales/de.json rename to src/locales/de.json diff --git a/app/src/locales/en.json b/src/locales/en.json similarity index 100% rename from app/src/locales/en.json rename to src/locales/en.json diff --git a/app/src/main.js b/src/main.js similarity index 100% rename from app/src/main.js rename to src/main.js diff --git a/app/src/store.js b/src/store.js similarity index 100% rename from app/src/store.js rename to src/store.js diff --git a/app/tailwind.config.js b/tailwind.config.js similarity index 100% rename from app/tailwind.config.js rename to tailwind.config.js diff --git a/app/vite.config.ts b/vite.config.ts similarity index 100% rename from app/vite.config.ts rename to vite.config.ts