Compare commits

..

No commits in common. "94f578798818f7188ff83e6accb201a50aaa43a2" and "63bb34ef997bed202f3f208645e14861318e66ef" have entirely different histories.

6 changed files with 32 additions and 72 deletions

View File

@ -1,6 +1,5 @@
{
"i18n-ally.localesPaths": [
"src/locales"
],
"i18n-ally.keystyle": "nested"
]
}

View File

@ -1,16 +0,0 @@
const fs = require('fs');
// get all language files
const files = fs.readdirSync('./src/locales/');
files.forEach((f) => {
// read file as object
const unordered = JSON.parse(fs.readFileSync(`src/locales/${f}`));
// order object by keys alpabetically A-Z
const ordered = Object.keys(unordered).sort().reduce((obj, key) => {
obj[key] = unordered[key];
return obj;
}, {});
// format output as json for commit diff compatibility
const out = JSON.stringify(ordered, 0, 4);
// write output file
fs.writeFileSync(`src/locales/${f}`, out);
});

View File

@ -5,10 +5,12 @@
<h1
class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center"
>Lauf für Kaya! - Registrieren</h1>
<p class="mx-auto leading-relaxed text-base text-center">{{ $t('register.register_now') }}</p>
<p
class="mx-auto leading-relaxed text-base text-center"
>{{ $t('register.register_now') }}</p>
<div class="mt-4">
<label for="first_name" class="block font-medium">
{{ $t('vorname') }}
Vorname
<span class="font-bold">*</span>
</label>
<input
@ -16,22 +18,22 @@
name="firstname"
id="first_name"
autocomplete="off"
:placeholder="[[$t('vorname')]]"
placeholder="Vorname"
type="text"
class="dark:bg-gray-800 mt-1 focus:ring-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
/>
<label for="middle_name" class="block font-medium">{{ $t('mittelname') }}</label>
<label for="middle_name" class="block font-medium">Mittelname</label>
<input
v-model="userdetails.middlename"
name="middlename"
id="middle_name"
autocomplete="off"
:placeholder="[[$t('mittelname')]]"
placeholder="Mittelname"
type="text"
class="dark:bg-gray-800 mt-1 focus:ring-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
/>
<label for="last_name" class="block font-medium">
{{ $t('nachname') }}
Nachname
<span class="font-bold">*</span>
</label>
<input
@ -39,7 +41,7 @@
name="lastname"
id="last_name"
autocomplete="off"
:placeholder="[[$t('nachname')]]"
placeholder="Nachname"
type="text"
class="dark:bg-gray-800 mt-1 focus:ring-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
/>
@ -57,7 +59,7 @@
:class="{ 'border-red-500': (!isEmail(userdetails.mail)), 'border-gray-300': (isEmail(userdetails.mail)) }"
class="dark:bg-gray-800 mt-1 block w-full shadow-sm rounded-l-md sm:text-sm border bg-gray-50 text-gray-100 rounded-md p-2"
/>
<p class="text-sm">{{ $t('please_provide_valid_mail') }}</p>
<p class="text-sm">Bitte geben Sie eine gültige E-Mail Adresse an</p>
<div class="grid grid-cols-6 mt-6">
<div class="col-span-6"></div>
<div class="flex items-start col-span-6">
@ -71,40 +73,37 @@
/>
</div>
<div class="ml-3 text-sm">
<label
for="address_activated"
class="font-medium text-gray-400"
>{{ $t('provide_address') }}</label>
<label for="address_activated" class="font-medium text-gray-400">Adresse angeben?</label>
</div>
</div>
<div v-if="provide_address === true" class="col-span-6">
<div class="col-span-6">
<label for="street" class="block font-medium">{{ $t('strasse') }}</label>
<label for="street" class="block font-medium">Straße</label>
<input
type="text"
name="street"
:placeholder="[[$t('strasse')]]"
placeholder="Straße"
id="street"
autocomplete="street-address"
class="dark:bg-gray-800 mt-1 focus:ring-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
/>
</div>
<div class="col-span-6 sm:col-span-6 lg:col-span-2">
<label for="city" class="block font-medium">{{ $t('ort') }}</label>
<label for="city" class="block font-medium">Ort</label>
<input
type="text"
name="city"
:placeholder="[[$t('ort')]]"
placeholder="Ort"
id="city"
class="dark:bg-gray-800 mt-1 focus:ring-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
/>
</div>
<div class="col-span-6 sm:col-span-3 lg:col-span-2">
<label for="postal_code" class="block font-medium">{{ $t('plz') }}</label>
<label for="postal_code" class="block font-medium">PLZ</label>
<input
type="text"
name="postal_code"
:placeholder="[[$t('plz')]]"
placeholder="PLZ"
id="postal_code"
autocomplete="postal-code"
class="dark:bg-gray-800 mt-1 focus:ring-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
@ -135,7 +134,7 @@
:disabled="(agb_accepted === false)"
:class="{ 'opacity-50': (agb_accepted === false), 'cursor-not-allowed': (agb_accepted === false) }"
class="text-white block w-full text-center py-2 px-3 border border-gray-300 rounded-md p-1 bg-blue-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
>{{ $t('registrieren') }}</button>
>Registrieren</button>
</div>
</div>
<div class="mt-6">
@ -144,14 +143,14 @@
<div class="w-full border-t border-gray-300"></div>
</div>
<div class="relative flex justify-center text-sm">
<span class="px-2 bg-white dark:bg-gray-900">{{ $t('already_have_an_account') }}</span>
<span class="px-2 bg-white dark:bg-gray-900">Sie haben bereits einen Account?</span>
</div>
</div>
<div class="mt-6">
<a
href="./login"
class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md p-1 dark:bg-gray-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
>{{ $t('go_to_login') }}</a>
>Zum Login</a>
</div>
</div>
</div>

View File

@ -1,16 +1,5 @@
{
"already_have_an_account": "Sie haben bereits einen Account?",
"go_to_login": "Zum Login",
"mittelname": "Mittelname",
"nachname": "Nachname",
"ort": "Ort",
"please_provide_valid_mail": "Bitte geben Sie eine gültige E-Mail Adresse an",
"plz": "PLZ",
"provide_address": "Adresse angeben?",
"register": {
"register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren."
},
"registrieren": "Registrieren",
"strasse": "Straße",
"vorname": "Vorname"
"register": {
"register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren."
}
}

View File

@ -1,16 +1,5 @@
{
"already_have_an_account": "Already have an account?",
"go_to_login": "Go To Login",
"mittelname": "Middlename",
"nachname": "Lastname",
"ort": "City",
"please_provide_valid_mail": "Please provide a valid mail address.",
"plz": "zipcode",
"provide_address": "Provide a postal address?",
"register": {
"register_now": "Register now for Lauf für Kaya! 2021."
},
"registrieren": "Register Now",
"strasse": "Street/ Block",
"vorname": "Firstname"
"register": {
"register_now": "Register now for Lauf für Kaya! 2021."
}
}

View File

@ -1,5 +1,5 @@
import { createApp } from 'vue';
import { createWebHistory, createRouter } from 'vue-router';
import { createWebHistory, createWebHashHistory, createRouter } from 'vue-router';
import App from './App.vue';
import { createI18n } from 'vue-i18n';
import 'windi.css';
@ -11,9 +11,8 @@ const messages = {
en: keys_en,
de: keys_de
};
const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
const i18n = createI18n({
locale: browserlocale,
locale: 'de',
fallbackLocale: 'en',
messages
});
@ -24,6 +23,7 @@ const Register = import('./components/Register.vue');
const Profile = import('./components/Profile.vue');
//
const router = createRouter({
// history: createWebHashHistory(),
history: createWebHistory(),
routes: [
{ path: '/', component: Home },