From 5c218c64abc3e54fcc00ba996a9b4749d3340c75 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 3 Jan 2021 18:04:03 +0100 Subject: [PATCH 1/3] improved sidebar icons --- src/components/Dashboard.svelte | 51 ++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/src/components/Dashboard.svelte b/src/components/Dashboard.svelte index 1a23b650..d3c367d7 100644 --- a/src/components/Dashboard.svelte +++ b/src/components/Dashboard.svelte @@ -78,14 +78,14 @@ class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900" href="/users/"> - + width="24" + height="24" + xmlns="http://www.w3.org/2000/svg" + viewBox="0 0 640 512"> Users Runners + + + Teams + - - + Tracks + height="24" + xmlns="http://www.w3.org/2000/svg" + viewBox="0 0 24 24"> + d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2a9.985 9.985 0 0 1 8 4h-2.71a8 8 0 1 0 .001 12h2.71A9.985 9.985 0 0 1 12 22zm7-6v-3h-8v-2h8V8l5 4-5 4z" /> Logout From 3f961dd3bd559968626ee9cacb2b4fb00f776a64 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 3 Jan 2021 18:14:31 +0100 Subject: [PATCH 2/3] general page cleanups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit let's go, devspeed ๐Ÿš€ --- src/App.svelte | 86 +++------------------------------ src/components/OrgDetail.svelte | 83 +++++++++++++++++++++++++++++++ src/components/Orgs.svelte | 24 ++++----- src/components/Runners.svelte | 25 +++------- src/components/Teams.svelte | 10 ++++ src/components/Users.svelte | 25 +++------- 6 files changed, 121 insertions(+), 132 deletions(-) create mode 100644 src/components/OrgDetail.svelte create mode 100644 src/components/Teams.svelte diff --git a/src/App.svelte b/src/App.svelte index 07772e8c..9211b0ac 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -43,7 +43,9 @@ import Runners from "./components/Runners.svelte"; import Footer from "./components/Footer.svelte"; import Tracks from "./components/Tracks.svelte"; -import TracksOverview from "./components/TracksOverview.svelte"; + import TracksOverview from "./components/TracksOverview.svelte"; + import OrgDetail from "./components/OrgDetail.svelte"; +import Teams from "./components/Teams.svelte"; store.init(); // if ("serviceWorker" in navigator) { @@ -87,89 +89,15 @@ import TracksOverview from "./components/TracksOverview.svelte"; + + + -
-

Portfolio introduction

- -
-
-
-
- -
-
-
+ diff --git a/src/components/OrgDetail.svelte b/src/components/OrgDetail.svelte new file mode 100644 index 00000000..682a880e --- /dev/null +++ b/src/components/OrgDetail.svelte @@ -0,0 +1,83 @@ + + +
+ + Orgs + +

+ configure the tracks/ min-max lap times +

+
+
+ +
+
+
diff --git a/src/components/Orgs.svelte b/src/components/Orgs.svelte index 1c0959b4..44584276 100644 --- a/src/components/Orgs.svelte +++ b/src/components/Orgs.svelte @@ -2,18 +2,12 @@ import { _ } from "svelte-i18n"; -
-
-
-
Orgs
-
-

- bla -

- {$_('goback')} -
-
-
+
+ + Orgs + +

+ configure the tracks/ min-max lap times +

+ +
diff --git a/src/components/Runners.svelte b/src/components/Runners.svelte index c1e4c925..57556db1 100644 --- a/src/components/Runners.svelte +++ b/src/components/Runners.svelte @@ -2,22 +2,9 @@ import { _ } from "svelte-i18n"; - -
-
-
-
- Runners -
-
-

- bla -

- {$_('goback')} -
-
-
- +
+ + {$_('runners')} + +

lรคuft bei ihnen

+
diff --git a/src/components/Teams.svelte b/src/components/Teams.svelte new file mode 100644 index 00000000..7dfd5f28 --- /dev/null +++ b/src/components/Teams.svelte @@ -0,0 +1,10 @@ + + +
+ + {$_('teams')} + +

everything is more fun together ๐Ÿƒโ€โ™‚๏ธ๐Ÿƒโ€โ™€๏ธ๐Ÿƒโ€โ™‚๏ธ

+
diff --git a/src/components/Users.svelte b/src/components/Users.svelte index 1b347fcc..3cb89bb0 100644 --- a/src/components/Users.svelte +++ b/src/components/Users.svelte @@ -2,22 +2,9 @@ import { _ } from "svelte-i18n"; - -
-
-
-
- Users -
-
-

- bla -

- {$_('goback')} -
-
-
- +
+ + {$_('users')} + +

admin users

+
From 84430854df8581b43eb48a153b52030cb1b384f1 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 3 Jan 2021 18:14:40 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8C=8D=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dashboard.svelte | 20 ++++++++++---------- src/locales/de.json | 3 ++- src/locales/en.json | 9 +++++++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/components/Dashboard.svelte b/src/components/Dashboard.svelte index d3c367d7..53aa3334 100644 --- a/src/components/Dashboard.svelte +++ b/src/components/Dashboard.svelte @@ -56,7 +56,7 @@ - Dashboard + {$_('dashboard-title')} - Orgs + {$_('orgs')} - Users + {$_('users')} - Runners + {$_('runners')} - Teams + {$_('teams')} - Tracks + {$_('tracks')} - Changelog + {$_('changelog')} - Settings + {$_('settings')} - About + {$_('about')} - Logout + {$_('logout')} diff --git a/src/locales/de.json b/src/locales/de.json index 0807ef1c..263c7b83 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -41,5 +41,6 @@ "total-donations": "Spendensumme", "credits": "", "runners": "Lรคufer", - "total-distance": "gelaufene Strecke" + "total-distance": "gelaufene Strecke", + "dashboard-greeting": "Willkommen" } diff --git a/src/locales/en.json b/src/locales/en.json index dcba74eb..41d81cb2 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -25,7 +25,7 @@ "e-mail-adress": "E-Mail Adress", "mail-validation-in-progress": "mail validation in progress...", "invalid-mail-reset": "the provided email is invalid", - "runners": "runners", + "runners": "Runners", "total-scans": "total scans", "total-donations": "total donations", "total-distance": "total distance", @@ -61,5 +61,10 @@ "dashboard-greeting": "hello there", "dashboard-title": "Dashboard", "track-added": "Track added", - "track-is-being-added": "Track is being added..." + "track-is-being-added": "Track is being added...", + "logout": "Logout", + "changelog": "Changelog", + "orgs": "Orgs", + "users": "Users", + "teams": "Teams" }