removed unused stuff from the store

ref #1
This commit is contained in:
Nicolai Ort 2021-04-07 20:37:59 +02:00
parent abdc510305
commit cb559da57c
4 changed files with 28 additions and 18 deletions

View File

@ -1,5 +1,11 @@
<script> <script>
import { apikey, api_endpoint, lang, page, clear, laptime_track } from "./store.js"; import {
apikey,
api_endpoint,
lang,
clear,
laptime_track,
} from "./store.js";
import { addMessages, init } from "svelte-i18n"; import { addMessages, init } from "svelte-i18n";
import en from "./locales/en.json"; import en from "./locales/en.json";
import de from "./locales/de.json"; import de from "./locales/de.json";
@ -11,8 +17,12 @@
import Beamershow from "./Beamershow.svelte"; import Beamershow from "./Beamershow.svelte";
import Login from "./Login.svelte"; import Login from "./Login.svelte";
import Settings from "./Settings.svelte"; import Settings from "./Settings.svelte";
$: is_configured = $apikey && $apikey !== "null" && $apikey !== "" && $laptime_track != 0 && $laptime_track != null; $: is_configured =
$: settings_open = $page === "settings"; $apikey &&
$apikey !== "null" &&
$apikey !== "" &&
$laptime_track != 0 &&
$laptime_track != null;
init({ init({
fallbackLocale: "en-US", fallbackLocale: "en-US",
initialLocale: $lang, initialLocale: $lang,

View File

@ -2,7 +2,11 @@
import axios from "axios"; import axios from "axios";
import { _ } from "svelte-i18n"; import { _ } from "svelte-i18n";
import { fade, slide } from "svelte/transition"; import { fade, slide } from "svelte/transition";
import { apikey, api_endpoint, laptime_track, page, stationinfo } from "./store.js"; import {
apikey,
api_endpoint,
laptime_track
} from "./store.js";
function init(el) { function init(el) {
el.focus(); el.focus();
} }
@ -73,7 +77,8 @@
axios axios
.request({ .request({
method: "GET", method: "GET",
url: $api_endpoint + "api/stats/runners/laptime?track="+$laptime_track, url:
$api_endpoint + "api/stats/runners/laptime?track=" + $laptime_track,
headers: { Authorization: "Bearer " + $apikey }, headers: { Authorization: "Bearer " + $apikey },
}) })
.then(function ({ data }) { .then(function ({ data }) {

View File

@ -1,5 +1,10 @@
<script> <script>
import { apikey, lang, stationinfo, api_endpoint, laptime_track } from "./store.js"; import {
apikey,
lang,
api_endpoint,
laptime_track,
} from "./store.js";
import isURL from "validator/lib/isURL"; import isURL from "validator/lib/isURL";
import isUUID from "validator/lib/isUUID"; import isUUID from "validator/lib/isUUID";
import axios from "axios"; import axios from "axios";
@ -77,7 +82,6 @@
error = false; error = false;
errormessage = ""; errormessage = "";
apikey.set(token); apikey.set(token);
stationinfo.set(JSON.stringify(response.data));
}) })
.catch(function (e) { .catch(function (e) {
error = true; error = true;
@ -118,7 +122,7 @@
class="flex flex-col pt-3 md:pt-8" class="flex flex-col pt-3 md:pt-8"
onsubmit="event.preventDefault();" onsubmit="event.preventDefault();"
on:submit={() => { on:submit={() => {
laptime_track.set(track); laptime_track.set(track);
}} }}
> >
<div class="flex flex-col pt-4"> <div class="flex flex-col pt-4">

View File

@ -10,21 +10,11 @@ export const apikey = writable(stored_apikey);
apikey.subscribe((value) => { apikey.subscribe((value) => {
localStorage.setItem('apikey', value); localStorage.setItem('apikey', value);
}); });
const stored_stationinfo = localStorage.getItem('stationinfo');
export const stationinfo = writable(stored_stationinfo);
stationinfo.subscribe((value) => {
localStorage.setItem('stationinfo', value);
});
const stored_laptime_track = localStorage.getItem('laptime_track'); const stored_laptime_track = localStorage.getItem('laptime_track');
export const laptime_track = writable(stored_laptime_track); export const laptime_track = writable(stored_laptime_track);
laptime_track.subscribe((value) => { laptime_track.subscribe((value) => {
localStorage.setItem('laptime_track', value); localStorage.setItem('laptime_track', value);
}); });
const stored_page = localStorage.getItem('page');
export const page = writable(stored_page);
page.subscribe((value) => {
localStorage.setItem('page', value);
});
const stored_lang = localStorage.getItem('lang') === 'null' ? navigator.language : localStorage.getItem('lang'); const stored_lang = localStorage.getItem('lang') === 'null' ? navigator.language : localStorage.getItem('lang');
export const lang = writable(stored_lang); export const lang = writable(stored_lang);
lang.subscribe((value) => { lang.subscribe((value) => {
@ -34,5 +24,6 @@ lang.subscribe((value) => {
export function clear(){ export function clear(){
api_endpoint.set(null) api_endpoint.set(null)
apikey.set(null); apikey.set(null);
laptime_track.set(null)
localStorage.clear(); localStorage.clear();
} }