This commit is contained in:
Philipp Dormann 2020-12-19 15:38:43 +01:00
parent a80d3b060f
commit 8ff1c55ba4
8 changed files with 43 additions and 61 deletions

View File

@ -11,14 +11,16 @@
// //
import Login from "./components/Login.svelte"; import Login from "./components/Login.svelte";
import Dashboard from "./components/Dashboard.svelte"; import Dashboard from "./components/Dashboard.svelte";
import Profile from "./components/Profile.svelte"; import Tracks from "./components/Tracks.svelte";
// import Profile from "./components/Profile.svelte";
import store from "./store.js"; import store from "./store.js";
store.init(); store.init();
$: logged_in = $store.isLoggedIn; $: logged_in = $store.isLoggedIn;
</script> </script>
{#if logged_in === true} {#if logged_in === true}
<Dashboard /> <Tracks />
<!-- <Dashboard /> -->
<!-- <Profile /> --> <!-- <Profile /> -->
{:else} {:else}
<Login /> <Login />

View File

@ -1,5 +1,6 @@
<script> <script>
import StatCards from "./StatCards.svelte"; import { _ } from "svelte-i18n";
// import StatCards from "./StatCards.svelte";
import Table from "./Table.svelte"; import Table from "./Table.svelte";
import Pagination from "./Pagination.svelte"; import Pagination from "./Pagination.svelte";
import FormLayout from "./FormLayout.svelte"; import FormLayout from "./FormLayout.svelte";
@ -7,6 +8,7 @@
import BreadcrumbNav from "./BreadcrumbNav.svelte"; import BreadcrumbNav from "./BreadcrumbNav.svelte";
// //
let isProfileActionsVisible = false; let isProfileActionsVisible = false;
let mobile_menu_opened = false;
</script> </script>
<div> <div>
@ -141,7 +143,7 @@
<a <a
href="/logout" href="/logout"
class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
role="menuitem">$_('sign-out')</a> role="menuitem">$_('signout')</a>
</div> </div>
{/if} {/if}
</div> </div>
@ -150,6 +152,9 @@
<div class="-mr-2 flex md:hidden"> <div class="-mr-2 flex md:hidden">
<!-- Mobile menu button --> <!-- Mobile menu button -->
<button <button
on:click={() => {
mobile_menu_opened = !mobile_menu_opened;
}}
class="bg-gray-800 inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white"> class="bg-gray-800 inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white">
<span class="sr-only">Open main menu</span> <span class="sr-only">Open main menu</span>
<!-- <!--
@ -198,11 +203,10 @@
Open: "block", closed: "hidden" Open: "block", closed: "hidden"
--> -->
<div class="hidden md:hidden"> <div class="md:hidden" class:block={mobile_menu_opened === true} class:hidden={mobile_menu_opened === false}>
<div class="px-2 pt-2 pb-3 space-y-1 sm:px-3"> <div class="px-2 pt-2 pb-3 space-y-1 sm:px-3">
<!-- Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" -->
<a <a
href="#" href="/"
class="bg-gray-900 text-white block px-3 py-2 rounded-md text-base font-medium">Dashboard</a> class="bg-gray-900 text-white block px-3 py-2 rounded-md text-base font-medium">Dashboard</a>
<a <a
@ -268,37 +272,28 @@
<a <a
href="#" href="#"
class="block px-3 py-2 rounded-md text-base font-medium text-gray-400 hover:text-white hover:bg-gray-700">Sign class="block px-3 py-2 rounded-md text-base font-medium text-gray-400 hover:text-white hover:bg-gray-700">$_('signout')</a>
out</a>
</div> </div>
</div> </div>
</div> </div>
</nav> </nav>
<!-- <header class="bg-white shadow">
<header class="bg-white shadow">
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8"> <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
<h1 class="text-3xl leading-tight"> <h1 class="text-3xl leading-tight">
<span class="font-bold">Dashboard</span><span> - hello there 👋</span> <span class="font-bold">Dashboard</span><span> - hello there 👋</span>
</h1> </h1>
</div> </div>
</header> </header> -->
<div class="shadow px-6 pt-4 pb-1">
<BreadcrumbNav />
</div>
<main> <main>
<div class="max-w-7xl mx-auto py-6 sm:px-6 lg:px-8"> <div class="max-w-7xl mx-auto py-6 sm:px-6 lg:px-8">
<BreadcrumbNav/> <!-- <StatCards /> -->
<!-- --> <div class="mb-8"><Tracks /></div>
<StatCards />
<!-- -->
<div class="mb-8">
<Tracks />
</div>
<Pagination /> <Pagination />
<div class="mb-8"> <div class="mb-8"><Table /></div>
<Table /> <div class="mb-8"><FormLayout /></div>
</div>
<div class="mb-8">
<FormLayout />
</div>
</div> </div>
</main> </main>
</div> </div>

View File

@ -1,11 +1,11 @@
<script> <script>
import { _ } from "svelte-i18n"; import { _ } from "svelte-i18n";
import store from "../store.js"; import store from "../store.js";
store.init();
// //
import { OpenAPI, AuthService, TrackService } from "@odit/lfk-client-js"; import { OpenAPI, AuthService } from "@odit/lfk-client-js";
OpenAPI.BASE = "http://localhost:4010"; OpenAPI.BASE = "http://localhost:4010";
// //
store.init();
// //
import Toastify from "toastify-js"; import Toastify from "toastify-js";
import "toastify-js/src/toastify.css"; import "toastify-js/src/toastify.css";
@ -19,7 +19,7 @@
last_loginclick_processed = false; last_loginclick_processed = false;
Toastify({ Toastify({
text: $_("login_is_checked"), text: $_("login_is_checked"),
duration: 1500, duration: 500,
}).showToast(); }).showToast();
console.log(usersUsername); console.log(usersUsername);
console.log(usersPassword); console.log(usersPassword);
@ -34,14 +34,14 @@
store.login(result.access_token); store.login(result.access_token);
Toastify({ Toastify({
text: $_("welcome_wavinghand"), text: $_("welcome_wavinghand"),
duration: 1500, duration: 500,
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
}).showToast(); }).showToast();
}) })
.catch((err) => { .catch((err) => {
Toastify({ Toastify({
text: $_("error_on_login"), text: $_("error_on_login"),
duration: 1500, duration: 500,
backgroundColor: backgroundColor:
"linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)", "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
}).showToast(); }).showToast();

View File

@ -0,0 +1,5 @@
<script>
import { _, locale } from "svelte-i18n";
</script>
<div>$locale $_('hallo')</div>

View File

@ -1,22 +0,0 @@
<script>
import { OpenAPI, TrackService } from "@odit/lfk-client-js";
OpenAPI.BASE = "http://localhost:4010";
let tracks_promise = TrackService.trackControllerGetAll();
</script>
<h1>Tracks</h1>
{#await tracks_promise then tracks}
<h4>{tracks.length}</h4>
<hr />
{#if tracks.length % 2 == 0}
<ul>
{#each tracks as item}
<li>{item.distance}</li>
{/each}
</ul>
{:else}
{#each tracks as item}<span>{item.distance}</span><br />{/each}
{/if}
{:catch error}
ERORRRRR
{/await}

View File

@ -1,10 +1,11 @@
<script> <script>
import { OpenAPI, TrackService } from "@odit/lfk-client-js"; import { _ } from "svelte-i18n";
OpenAPI.BASE = "http://localhost:4010"; import store from "../store.js";
import { TrackService } from "@odit/lfk-client-js";
let tracks_promise = TrackService.trackControllerGetAll(); let tracks_promise = TrackService.trackControllerGetAll();
</script> </script>
<h1>Tracks</h1> <h1>$_("tracks")</h1>
{#await tracks_promise} {#await tracks_promise}
<div <div
class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2" class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
@ -14,7 +15,6 @@
</div> </div>
{:then tracks} {:then tracks}
{#if tracks.length > 0} {#if tracks.length > 0}
<!-- content here -->
<h4>{tracks.length}</h4> <h4>{tracks.length}</h4>
<hr /> <hr />
<ul> <ul>

View File

@ -6,8 +6,8 @@
"welcome_wavinghand": "Willkommen 👋", "welcome_wavinghand": "Willkommen 👋",
"error_on_login": "😢Fehler beim Login", "error_on_login": "😢Fehler beim Login",
"settings": "Einstellungen", "settings": "Einstellungen",
"sign-out": "Abmelden",
"your_profile": "Dein Profil", "your_profile": "Dein Profil",
"password": "Passwort", "password": "Passwort",
"email_address_or_username": "E-Mail-Addresse/ Benutzername" "email_address_or_username": "E-Mail-Addresse/ Benutzername",
"signout": "Abmelden"
} }

View File

@ -8,7 +8,9 @@
"login_is_checked": "Login is being checked...", "login_is_checked": "Login is being checked...",
"error_on_login": "Error on login", "error_on_login": "Error on login",
"settings": "Settings", "settings": "Settings",
"sign-out": "Sign out",
"your_profile": "Your Profile", "your_profile": "Your Profile",
"email_address_or_username": "Email / username" "email_address_or_username": "Email / username",
"tracks": "Tracks",
"signout": "Sign out",
"hallo": "hallo"
} }