From e3614e77a39db9d79366abd8d4c8da5297b4aa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= Date: Thu, 15 Jun 2023 19:08:55 +0200 Subject: [PATCH] feat: tweaks for nuxt data fetch --- backend/.env | 2 +- backend/app.py | 3 +-- default.conf | 15 +++++++++++++++ frontend/pages/index.vue | 18 ++++++++++++++++-- 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 default.conf diff --git a/backend/.env b/backend/.env index 2ae2826..fe2bc93 100644 --- a/backend/.env +++ b/backend/.env @@ -1,3 +1,3 @@ FLASK_APP=app -FLASK_RUN_PORT=54321 +FLASK_RUN_PORT=5000 FLASK_DEBUG=True diff --git a/backend/app.py b/backend/app.py index 86cf907..9328cc7 100644 --- a/backend/app.py +++ b/backend/app.py @@ -4,7 +4,7 @@ from flask_cors import CORS # from werkzeug.security import generate_password_hash, check_password_hash -locale.setlocale(locale.LC_ALL, "cs_CZ.utf8") +# locale.setlocale(locale.LC_ALL, "cs_CZ.utf8") app = Flask(__name__) CORS(app) @@ -64,7 +64,6 @@ def get(self, nick, IP): # print(f"{nick}: Create at {self[nick].ctime}. Use at {self[nick].atime}.") return r - @app.route("/", methods=["GET"]) def index(): return send_from_directory(".", "index.html") diff --git a/default.conf b/default.conf new file mode 100644 index 0000000..4b41ab1 --- /dev/null +++ b/default.conf @@ -0,0 +1,15 @@ + + +server { + server_name domena.cz + + location ~ /api { + #flask API + proxy_pass http://localhost:8080; + } + + location / { + root /frontend/public; + try_files $uri $uri/ /index.html; + } +} \ No newline at end of file diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue index 5136f56..b589b9a 100644 --- a/frontend/pages/index.vue +++ b/frontend/pages/index.vue @@ -51,6 +51,11 @@ table {

Table of nicks

+
+    pending: {{ loadedData.pending }}
+    err: {{ loadedData.error }}
+  
+ @@ -130,13 +135,21 @@ const sorting= reactive({ }) // data -const { data: table } = await useFetch('http://localhost:54321/status'); +// const { data: table } = await useFetch('http://localhost:54321/status'); //table.value = bagr.value //console.log(table.value) /*const response = await useFetch('http://localhost:54321/status');*/ /*console.log(response)*/ + +const loadedData = useFetch('http://127.0.0.1:5000/status'); + const table2 = computed( () => { + const table = loadedData.data + + if (loadedData.data.value == null) + return []; + let tab = []; const nick_re = nick.value == '' ? new RegExp(/.*/) : new RegExp(nick.value,"i"); @@ -260,7 +273,8 @@ const refreshing = ref(false) const refreshAll = async () => { refreshing.value = true try { - await refreshNuxtData() + await loadedData.refresh() + // await refreshNuxtData() } finally { refreshing.value = false