Merge pull request #50 from SamR1/move-to-vue-3

Move to vue 3
SamR1 · Aug 6, 2023 · 0621448 · 0621448
2 parents 240e276 + cfd86f0
commit 0621448
Show file tree

Hide file tree

Showing 105 changed files with 4,706 additions and 10,202 deletions.
diff --git a/.github/workflows/.tests-javascript.yml b/.github/workflows/.tests-javascript.yml
@@ -18,10 +18,13 @@ jobs:
         working-directory: ${{env.working-directory}}
         run: |
           npm install --global yarn
-          yarn install --ignore-engines
+          yarn install
       - name: Lint
         working-directory: ${{env.working-directory}}
         run: yarn lint
+      - name: Type check
+        working-directory: ${{env.working-directory}}
+        run: yarn type-check
       - name: Build
         working-directory: ${{env.working-directory}}
         run: yarn build
diff --git a/Makefile b/Makefile
@@ -12,7 +12,11 @@ bandit:
 build-client:
 	cd rdltr_front && $(NPM) run build
 
-check-python: bandit lint-python type-check test
+check-all: check-front check-python
+
+check-front: lint-front type-check-front
+
+check-python: bandit lint-python type-check-python test
 
 clean:
 	rm -fr .pytest_cache
@@ -46,7 +50,7 @@ install: install-python install-front
 
 install-front:
 	# NPM_ARGS="--ignore-engines", if errors with Node latest version
-	cd rdltr_front && $(NPM) install --prod $(NPM_ARGS)
+	cd rdltr_front && $(NPM) install $(NPM_ARGS)
 
 install-python:
 	test -d $(VENV) || $(PYTHON_VERSION) -m venv $(VENV)
@@ -63,9 +67,6 @@ lint-python:
 	echo 'Running flake8...'
 	$(FLAKE8) $(FLASK_APP)
 
-lint-python-fix:
-	$(BLACK) $(FLASK_APP)
-
 migrate-db:
 	$(FLASK) db migrate
 
@@ -77,7 +78,7 @@ serve:
 	$(MAKE) P="serve-python serve-front" make-p
 
 serve-front:
-	cd rdltr_front && $(NPM) serve
+	cd rdltr_front && $(NPM) dev
 
 serve-python:
 	echo 'Running on http://$(HOST):$(PORT)'
@@ -89,7 +90,12 @@ test:
 test-ui:
 	$(PYTEST) $(FLASK_APP)/tests/ui_tests --driver firefox $(PYTEST_ARGS)
 
-type-check:
+type-check-all: type-check-python type-check-front
+
+type-check-front:
+	cd rdltr_front && $(NPM) type-check
+
+type-check-python:
 	echo 'Running mypy...'
 	$(MYPY) $(FLASK_APP)
 

diff --git a/rdltr/dist/static/favicon.ico → rdltr/dist/favicon.ico b/rdltr/dist/static/favicon.ico → rdltr/dist/favicon.ico
diff --git a/rdltr/dist/index.html b/rdltr/dist/index.html
@@ -1 +1,27 @@
-<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/static/favicon.ico"><link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous"><title>rdltr</title><link href="/static/css/app.e091cf9b.css" rel="preload" as="style"><link href="/static/css/chunk-vendors.c9dd58f2.css" rel="preload" as="style"><link href="/static/js/app.94e9768f.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.ebb17dff.js" rel="preload" as="script"><link href="/static/css/chunk-vendors.c9dd58f2.css" rel="stylesheet"><link href="/static/css/app.e091cf9b.css" rel="stylesheet"></head><body><div id="app"></div><script src="/static/js/chunk-vendors.ebb17dff.js"></script><script src="/static/js/app.94e9768f.js"></script></body></html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link
+      rel="stylesheet"
+      href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
+      integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
+      crossorigin="anonymous"
+    >
+    <link
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css"
+      integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY="
+      crossorigin="anonymous"
+    >
+    <title>rdltr</title>
+    <script type="module" crossorigin src="/static/index-f434d684.js"></script>
+    <link rel="stylesheet" href="/static/index-ed5776f1.css">
+  </head>
+  <body>
+    <div id="app"></div>
+
+  </body>
+</html>
diff --git a/rdltr/dist/static/css/app.e091cf9b.css b/rdltr/dist/static/css/app.e091cf9b.css