diff --git a/.gitignore b/.gitignore index 28a54b5..853fe5d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,12 @@ service/OliveTin service/OliveTin.armhf service/OliveTin.exe service/reports +service/gen releases/ dist/ installation-id.txt tmp/ -webui/ -webui.dev/node_modules -webui.dev/.parcel-cache -custom-webui +frontend/dist/ +frontend/node_modules +custom-frontend +integration-tests/screenshots/ diff --git a/Makefile b/Makefile index c6c988d..e9fe088 100644 --- a/Makefile +++ b/Makefile @@ -47,16 +47,8 @@ devrun: compile devcontainer: compile podman-image podman-container -webui-codestyle: - $(MAKE) -wC webui.dev codestyle - webui-dist: - $(call delete-files,webui) - $(call delete-files,webui.dev/dist) - cd webui.dev && npm install - cd webui.dev && npx parcel build --public-url "." - python -c "import shutil;shutil.move('webui.dev/dist', 'webui')" - python -c "import shutil;import glob;[shutil.copy(f, 'webui') for f in glob.glob('webui.dev/*.png')]" + $(MAKE) -wC frontend dist clean: $(call delete-files,dist) diff --git a/config.yaml b/config.yaml index 3c739c1..a73b402 100644 --- a/config.yaml +++ b/config.yaml @@ -11,6 +11,9 @@ logLevel: "INFO" # Checking for updates https://docs.olivetin.app/reference/updateChecks.html checkForUpdates: false +authLocalUsers: + enabled: true + # Actions are commands that are executed by OliveTin, and normally show up as # buttons on the WebUI. # diff --git a/webui.dev/.eslintrc.json b/frontend/.eslintrc.json similarity index 100% rename from webui.dev/.eslintrc.json rename to frontend/.eslintrc.json diff --git a/frontend/.npmrc b/frontend/.npmrc new file mode 100644 index 0000000..b215581 --- /dev/null +++ b/frontend/.npmrc @@ -0,0 +1 @@ +fund=false diff --git a/webui.dev/.stylelintrc.json b/frontend/.stylelintrc.json similarity index 100% rename from webui.dev/.stylelintrc.json rename to frontend/.stylelintrc.json diff --git a/frontend/Makefile b/frontend/Makefile new file mode 100644 index 0000000..dea9f4f --- /dev/null +++ b/frontend/Makefile @@ -0,0 +1,21 @@ +define delete-files + python -c "import shutil;shutil.rmtree('$(1)', ignore_errors=True)" +endef + +codestyle: + npm install + npx eslint --fix main.js js/* + npx stylelint style.css + +clean: + $(call delete-files,dist) + +deps: + npm install + +build: + npx vite build + +dist: deps clean build + +.PHONY: codestyle diff --git a/webui.dev/OliveTinLogo-120px.png b/frontend/OliveTinLogo-120px.png similarity index 100% rename from webui.dev/OliveTinLogo-120px.png rename to frontend/OliveTinLogo-120px.png diff --git a/webui.dev/OliveTinLogo-180px.png b/frontend/OliveTinLogo-180px.png similarity index 100% rename from webui.dev/OliveTinLogo-180px.png rename to frontend/OliveTinLogo-180px.png diff --git a/webui.dev/OliveTinLogo-57px.png b/frontend/OliveTinLogo-57px.png similarity index 100% rename from webui.dev/OliveTinLogo-57px.png rename to frontend/OliveTinLogo-57px.png diff --git a/webui.dev/OliveTinLogo.png b/frontend/OliveTinLogo.png similarity index 100% rename from webui.dev/OliveTinLogo.png rename to frontend/OliveTinLogo.png diff --git a/webui.dev/OliveTinLogo.svg b/frontend/OliveTinLogo.svg similarity index 100% rename from webui.dev/OliveTinLogo.svg rename to frontend/OliveTinLogo.svg diff --git a/webui.dev/index.html b/frontend/index.html similarity index 54% rename from webui.dev/index.html rename to frontend/index.html index 7031e98..d55fb77 100644 --- a/webui.dev/index.html +++ b/frontend/index.html @@ -22,79 +22,11 @@ -
- - -

OliveTin

- - - -
- - -   - -
-
+
- - - - -
- - @@ -175,16 +91,16 @@

Local Login

-