diff --git a/package-lock.json b/package-lock.json index 6193eab..b68accf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "@tailwindcss/typography": "^0.5.10", "cross-env": "^7.0.3", "postcss-simple-vars": "^7.0.1", + "tailwind-scrollbar": "^3.1.0", "tailwindcss": "^3.4.1" } }, @@ -1287,6 +1288,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tailwind-scrollbar": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tailwind-scrollbar/-/tailwind-scrollbar-3.1.0.tgz", + "integrity": "sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==", + "dev": true, + "engines": { + "node": ">=12.13.0" + }, + "peerDependencies": { + "tailwindcss": "3.x" + } + }, "node_modules/tailwindcss": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz", diff --git a/package.json b/package.json index ac6537b..33f3302 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "@tailwindcss/typography": "^0.5.10", "cross-env": "^7.0.3", "postcss-simple-vars": "^7.0.1", + "tailwind-scrollbar": "^3.1.0", "tailwindcss": "^3.4.1" } } diff --git a/tunictracker/tracker/forms.py b/tunictracker/tracker/forms.py index 21f0762..87f5cc8 100644 --- a/tunictracker/tracker/forms.py +++ b/tunictracker/tracker/forms.py @@ -3,12 +3,11 @@ from json import loads class ServerAddressForm(forms.Form): - # with open('tracker/static/tracker/data/listen_address.json', 'r') as address: - # read_address = loads(address.read()) - # if (read_address['address']['user'] != ""): - # server_address = read_address['address']['user'] - # else: - # server_address = read_address['address']['default'] server_address_form = forms.URLField( - max_length=1312, initial="http://localhost:8000/spoiler", empty_value="http://localhost:8000/spoiler", label="") + max_length=1312, initial="http://localhost:8000/", empty_value="http://localhost:8000/", label="") server_address_form.widget.attrs["class"] = "w-full text-sm rounded-md border-2 border-bluelight-dark bg-[#242424]/10" + + +class BackendFilepathForm(forms.Form): + backend_filepath_form = forms.CharField() + backend_filepath_form.widget.attrs["class"] = "w-full text-sm rounded-md border-2 border-bluelight-dark bg-[#242424]/10" diff --git a/tunictracker/tracker/static/tracker/assets/refresh.js b/tunictracker/tracker/static/tracker/assets/refresh.js index 4767b30..f46b7bc 100644 --- a/tunictracker/tracker/static/tracker/assets/refresh.js +++ b/tunictracker/tracker/static/tracker/assets/refresh.js @@ -20,25 +20,58 @@ window.onload = () => { ); }; +async function get_updated_filepath() { + fetch(`${document.URL}get/settings`) + .then((response) => response.json()) + .then( + (data) => { + backend_filepath = JSON.parse(JSON.stringify(data)); + fetch(`${server_address}settings`, { + method: "post", + headers: { "Content-type": "application/json" }, + body: JSON.stringify({ + secretLegend: backend_filepath, + address: ":8000", + }), + }); + }, + (error) => { + console.log(error); + } + ); +} + +// This won't work properly. For now, the user will need to input themselves. +// async function get_filepath() { +// try { +// const filepath_selection = await window.showDirectoryPicker(); +// console.log(filepath_selection); +// } catch { +// console.log("Browser does not support showDirectoryPicker()"); +// } +// } + async function get_updated_server_address() { - try { - fetch(`${document.URL}get/address`) - .then((response) => response.json()) - .then( - (data) => { - server_address = JSON.parse(JSON.stringify(data)); - }, - (error) => { - console.log(error); - } - ); - } catch { - console.log("Are you sure the front end is up?"); - } + fetch(`${document.URL}get/address`) + .then( + (response) => response.json(), + (error) => { + console.log("Are you sure the front end is up?"); + } + ) + .then( + (data) => { + server_address = JSON.parse(JSON.stringify(data)); + get_updated_filepath(); + }, + (error) => { + console.log(error); + } + ); } async function refresh_elements(cross_codes) { - fetch(server_address) + fetch(`${server_address}spoiler`) .then((response) => response.json()) .then( (data) => { diff --git a/tunictracker/tracker/templates/index.html b/tunictracker/tracker/templates/index.html index 2047c78..7e835cb 100644 --- a/tunictracker/tracker/templates/index.html +++ b/tunictracker/tracker/templates/index.html @@ -2,7 +2,7 @@
-