lfk/frontend
2
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'dev' into feature/11-tracks-management
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
# Conflicts:
#	src/locales/en.json
This commit is contained in:
Philipp Dormann 2021-01-04 19:40:53 +01:00
commit ff91995337
6 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.svelte
View File

@ -2,11 +2,11 @@
// import TailwindStyles from "./TailwindStyles.svelte"; // import TailwindStyles from "./TailwindStyles.svelte";
import { Route, router } from "tinro"; import { Route, router } from "tinro";
router.subscribe((routeInfo) => { router.subscribe((routeInfo) => {
console.log(routeInfo.path); // console.log(routeInfo.path);
window.scrollTo(0, 0); window.scrollTo(0, 0);
}); });
console.log($router.path); // console.log($router.path);
console.log(config); // console.log(config);
if (config.prefersHashRouting) { if (config.prefersHashRouting) {
if (config.prefersHashRouting === true) { if (config.prefersHashRouting === true) {
router.useHashNavigation(); router.useHashNavigation();

4
src/components/FileUpload.svelte
View File

@ -6,10 +6,10 @@
// the name to use for the internal file input // the name to use for the internal file input
let name = "filepond"; let name = "filepond";
function handleInit() { function handleInit() {
console.log("FilePond has initialised"); // console.log("FilePond has initialised");
} }
function handleAddFile(err, fileItem) { function handleAddFile(err, fileItem) {
console.log("A file has been added", fileItem); // console.log("A file has been added", fileItem);
} }
</script> </script>

9
src/components/StatCards.svelte
View File

@ -2,19 +2,16 @@
import { StatsService } from "@odit/lfk-client-js"; import { StatsService } from "@odit/lfk-client-js";
import { _ } from "svelte-i18n"; import { _ } from "svelte-i18n";
const stats_promise = StatsService.statsControllerGet(); const stats_promise = StatsService.statsControllerGet();
stats_promise.then((res) => {
console.log(res);
});
</script> </script>
<!-- --> <!-- -->
<h1>Allgemeine Statistiken</h1> <h1>{$_('general-stats')}</h1>
{#await stats_promise} {#await stats_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"
role="alert"> role="alert">
<p class="font-bold">stats are being loaded...</p> <p class="font-bold">{$_('stats-are-being-loaded')}</p>
<p class="text-sm">This might take a moment 👀</p> <p class="text-sm">{$_('this-might-take-a-moment')}</p>
</div> </div>
{:then stats} {:then stats}
<div <div

3
src/locales/de.json
View File

@ -42,5 +42,6 @@
"credits": "", "credits": "",
"runners": "Läufer", "runners": "Läufer",
"total-distance": "gelaufene Strecke", "total-distance": "gelaufene Strecke",
"dashboard-greeting": "Willkommen" "dashboard-greeting": "Willkommen",
"general-stats": "Allgemeine Statistiken"
} }

145
src/locales/en.json
View File

@ -1,73 +1,76 @@
{ {
"forgot_password?": "Forgot your password?", "forgot_password?": "Forgot your password?",
"register": "Register", "register": "Register",
"log_in": "Log in", "log_in": "Log in",
"password": "Password", "password": "Password",
"log_in_to_your_account": "Log in to your account", "log_in_to_your_account": "Log in to your account",
"welcome_wavinghand": "Welcome 👋", "welcome_wavinghand": "Welcome 👋",
"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",
"your_profile": "Your Profile", "your_profile": "Your Profile",
"email_address_or_username": "Email / username", "email_address_or_username": "Email / username",
"tracks": "Tracks", "tracks": "Tracks",
"signout": "Sign out", "signout": "Sign out",
"hallo": "hello", "hallo": "hello",
"404message": "Sorry, the page you are looking for could not be found.", "404message": "Sorry, the page you are looking for could not be found.",
"404title": "Error 404", "404title": "Error 404",
"goback": "Go Home", "goback": "Go Home",
"application_name": "Lauf für Kaya! - Admin", "application_name": "Lauf für Kaya! - Admin",
"reset-my-password": "Reset my password", "reset-my-password": "Reset my password",
"cannot-reset-your-password-directly": "Bummer. We unfortunately cannot reset your password directly. Please send us a mail and confirm your identity", "cannot-reset-your-password-directly": "Bummer. We unfortunately cannot reset your password directly. Please send us a mail and confirm your identity",
"send-a-mail-to-lfk-odit-services": "send a mail to lfk@odit.services", "send-a-mail-to-lfk-odit-services": "send a mail to lfk@odit.services",
"dont-have-your-email-connected": "Don't have your email connected?", "dont-have-your-email-connected": "Don't have your email connected?",
"dont-panic-were-resetting-it": "Don't panic, we're resetting it ✌", "dont-panic-were-resetting-it": "Don't panic, we're resetting it ✌",
"e-mail-adress": "E-Mail Adress", "e-mail-adress": "E-Mail Adress",
"mail-validation-in-progress": "mail validation in progress...", "mail-validation-in-progress": "mail validation in progress...",
"invalid-mail-reset": "the provided email is invalid", "invalid-mail-reset": "the provided email is invalid",
"runners": "Runners", "runners": "Runners",
"total-scans": "total scans", "total-scans": "total scans",
"total-donations": "total donations", "total-donations": "total donations",
"total-distance": "total distance", "total-distance": "total distance",
"datatable": { "datatable": {
"search": "🔍 Search...", "search": "🔍 Search...",
"sort_column_ascending": "Sort column ascending", "sort_column_ascending": "Sort column ascending",
"sort_column_descending": "Sort column descending", "sort_column_descending": "Sort column descending",
"previous": "Previous", "previous": "Previous",
"next": "Next", "next": "Next",
"page": "Page", "page": "Page",
"showing": "Showing", "showing": "Showing",
"records": "Records", "records": "Records",
"of": "of", "of": "of",
"to": "to", "to": "to",
"loading": "Loading...", "loading": "Loading...",
"no_matching_records_found": "No matching records found", "no_matching_records_found": "No matching records found",
"an_error_happened_while_fetching_the_data": "An error happened while fetching the data" "an_error_happened_while_fetching_the_data": "An error happened while fetching the data"
}, },
"about": "About", "about": "About",
"by": "by", "by": "by",
"lfk-is-os": "The \"Lauf für Kaya!\" Frontend is (like all other projects for the \"LfK!\" Also) an open source project.", "lfk-is-os": "The \"Lauf für Kaya!\" Frontend is (like all other projects for the \"LfK!\" Also) an open source project.",
"oss_credit_description": "We use a lot of open source software on these projects, and would like to thank the following projects and contributors who help make open source great!", "oss_credit_description": "We use a lot of open source software on these projects, and would like to thank the following projects and contributors who help make open source great!",
"credits": "Credits", "credits": "Credits",
"count_organizations": "# Organizations", "count_organizations": "# Organizations",
"count_teams": "# Teams", "count_teams": "# Teams",
"general_promise_error": "😢 Error", "general_promise_error": "😢 Error",
"add-your-first-track": "Add your first track", "add-your-first-track": "Add your first track",
"no-tracks-added-yet": "there are no tracks added yet.", "no-tracks-added-yet": "there are no tracks added yet.",
"track-length-in-m": "Track Length in m", "track-length-in-m": "Track Length in m",
"track-name": "Track name", "track-name": "Track name",
"please-provide-the-required-information-to-add-a-new-track": "Please provide the required information to add a new track.", "please-provide-the-required-information-to-add-a-new-track": "Please provide the required information to add a new track.",
"create-a-new-track": "Create a new Track", "create-a-new-track": "Create a new Track",
"dashboard-greeting": "hello there", "dashboard-greeting": "hello there",
"dashboard-title": "Dashboard", "dashboard-title": "Dashboard",
"track-added": "Track added", "track-added": "Track added",
"track-is-being-added": "Track is being added...", "track-is-being-added": "Track is being added...",
"logout": "Logout", "logout": "Logout",
"changelog": "Changelog", "changelog": "Changelog",
"orgs": "Orgs", "orgs": "Orgs",
"users": "Users", "users": "Users",
"teams": "Teams", "teams": "Teams",
"faq": "FAQ", "faq": "FAQ",
"minimum-lap-time-in-s": "Minimum lap time in s", "minimum-lap-time-in-s": "Minimum lap time in s",
"action": "Action" "action": "Action",
"this-might-take-a-moment": "This might take a moment 👀",
"stats-are-being-loaded": "stats are being loaded...",
"general-stats": "General Stats"
} }

2
src/store.js
View File

@ -22,7 +22,7 @@ const store = () => {
state.access_token = access_token; state.access_token = access_token;
state.jwtinfo = jwtinfo; state.jwtinfo = jwtinfo;
state.isLoggedIn = true; state.isLoggedIn = true;
console.log('login performed'); // console.log('login performed');
return state; return state;
}); });
}, },