4 Commits

3 changed files with 52 additions and 25 deletions

View File

@@ -2,8 +2,18 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC. All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [v0.1.6](https://git.odit.services/lfk/scanclient/compare/0.1.5...v0.1.6) #### [v0.2.0](https://git.odit.services/lfk/scanclient/compare/0.1.6...v0.2.0)
- Merge pull request 'add 'rst' to Login component' (#20) from feature/18-add-rst-login into dev [`#18`](https://git.odit.services/lfk/scanclient/issues/18)
- Merge pull request 'replace unsplash with kaya_bg' (#19) from feature/17-remote-background-image into dev [`#17`](https://git.odit.services/lfk/scanclient/issues/17)
- add 'rst' to Login component [`e6d8861`](https://git.odit.services/lfk/scanclient/commit/e6d8861340f6998234d8b2446b918ab01738cf63)
- replace unsplash with kaya_bg [`37c384a`](https://git.odit.services/lfk/scanclient/commit/37c384aa3688a66bc31673048e718fc04bc7bf0d)
#### [0.1.6](https://git.odit.services/lfk/scanclient/compare/0.1.5...0.1.6)
> 13 April 2021
- 🚀Bumped version to 0.1.6 [`cd1b3aa`](https://git.odit.services/lfk/scanclient/commit/cd1b3aafc7587541eddd088a9d446ad50b719f56)
- Updated readme [`64f2ddf`](https://git.odit.services/lfk/scanclient/commit/64f2ddf70b5e3ace8557ff1cfd346fb52a251afd) - Updated readme [`64f2ddf`](https://git.odit.services/lfk/scanclient/commit/64f2ddf70b5e3ace8557ff1cfd346fb52a251afd)
#### [0.1.5](https://git.odit.services/lfk/scanclient/compare/0.1.4...0.1.5) #### [0.1.5](https://git.odit.services/lfk/scanclient/compare/0.1.4...0.1.5)

View File

@@ -1,6 +1,6 @@
{ {
"name": "@lfk/scanclient", "name": "@lfk/scanclient",
"version": "0.1.6", "version": "0.2.0",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vite build",

View File

@@ -1,7 +1,7 @@
<script> <script>
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 { apikey, lang, stationinfo, api_endpoint } from "./store.js"; import { apikey, lang, stationinfo, api_endpoint, page } from "./store.js";
import axios from "axios"; import axios from "axios";
import background from "./kaya_kids_background.jpg"; import background from "./kaya_kids_background.jpg";
import { _, locale } from "svelte-i18n"; import { _, locale } from "svelte-i18n";
@@ -10,9 +10,10 @@
$: error = false; $: error = false;
$: errormessage = ""; $: errormessage = "";
$: isTokenValid = $: isTokenValid =
token?.length === 44 && token === "rst" ||
token.split(".")[0].length === 7 && (token?.length === 44 &&
isUUID(token.split(".")[1]); token.split(".")[0].length === 7 &&
isUUID(token.split(".")[1]));
$: isEndpointValid = isURL(api_endpoint_input); $: isEndpointValid = isURL(api_endpoint_input);
</script> </script>
@@ -67,22 +68,30 @@
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={() => {
axios if (token === "rst") {
.request({ apikey.set("");
method: "GET", api_endpoint.set("");
url: $api_endpoint + "api/stations/me", page.set("");
headers: { Authorization: "Bearer " + token }, token = "";
}) api_endpoint_input = "";
.then(function (response) { } else {
error = false; axios
errormessage = ""; .request({
apikey.set(token); method: "GET",
stationinfo.set(JSON.stringify(response.data)); url: $api_endpoint + "api/stations/me",
}) headers: { Authorization: "Bearer " + token },
.catch(function (e) { })
error = true; .then(function (response) {
errormessage = e.response.data.short; error = false;
}); errormessage = "";
apikey.set(token);
stationinfo.set(JSON.stringify(response.data));
})
.catch(function (e) {
error = true;
errormessage = e.response.data.short;
});
}
}} }}
> >
<div class="flex flex-col pt-4"> <div class="flex flex-col pt-4">
@@ -118,10 +127,18 @@
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={() => {
if (api_endpoint_input.substr(-1) !== "/") { if (api_endpoint_input === "rst") {
api_endpoint_input = api_endpoint_input + "/"; apikey.set("");
api_endpoint.set("");
page.set("");
token = "";
api_endpoint_input = "";
} else {
if (api_endpoint_input.substr(-1) !== "/") {
api_endpoint_input = api_endpoint_input + "/";
}
api_endpoint.set(api_endpoint_input);
} }
api_endpoint.set(api_endpoint_input);
}} }}
> >
<div class="flex flex-col pt-4"> <div class="flex flex-col pt-4">