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

Merge branch 'dev' into feature/79-donation_management

Browse Source
This commit is contained in:
Nicolai Ort 2021-02-24 20:50:02 +01:00
commit e0f0fa9a2a
9 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/contacts/AddContactModal.svelte
View File

@ -228,10 +228,10 @@
<div class="col-span-6">
<label
for="lastname"
class="block text-sm font-medium text-gray-700">Last Name</label>
class="block text-sm font-medium text-gray-700">{$_('last-name')}</label>
<input
autocomplete="off"
placeholder="Last Name"
placeholder="{$_('last-name')}"
class:border-red-500={!isLastnameValid}
class:focus:border-red-500={!isLastnameValid}
class:focus:ring-red-500={!isLastnameValid}
@ -250,7 +250,7 @@
<div class="col-span-6">
<label
for="team"
class="block text-sm font-medium text-gray-700">{$_('team')}</label>
class="block text-sm font-medium text-gray-700">{$_('teams')}</label>
<select
name="team"
multiple
@ -334,7 +334,7 @@
class="block text-sm font-medium text-gray-700">{$_('address')}</label>
<input
autocomplete="off"
placeholder="Address"
placeholder="{$_('address')}"
class:border-red-500={!isAddress1Valid}
class:focus:border-red-500={!isAddress1Valid}
class:focus:ring-red-500={!isAddress1Valid}
@ -388,10 +388,10 @@
<div class="col-span-6">
<label
for="city"
class="block text-sm font-medium text-gray-700">City</label>
class="block text-sm font-medium text-gray-700">{$_('city')}</label>
<input
autocomplete="off"
placeholder="City"
placeholder="{$_('city')}"
class:border-red-500={!iscityvalid}
class:focus:border-red-500={!iscityvalid}
class:focus:ring-red-500={!iscityvalid}

4
src/components/donors/AddDonorModal.svelte
View File

@ -217,10 +217,10 @@
<div class="col-span-6">
<label
for="lastname"
class="block text-sm font-medium text-gray-700">Last Name</label>
class="block text-sm font-medium text-gray-700">{$_('last-name')}</label>
<input
autocomplete="off"
placeholder="Last Name"
placeholder="{$_('last-name')}"
class:border-red-500={!isLastnameValid}
class:focus:border-red-500={!isLastnameValid}
class:focus:ring-red-500={!isLastnameValid}

2
src/components/donors/DonorDetail.svelte
View File

@ -296,7 +296,7 @@
<div class="ml-3 text-sm">
<label
for="comments"
class="font-medium text-gray-700">Receipt needed (address)</label>
class="font-medium text-gray-700">{$_('receipt-needed')}</label>
</div>
</div>
{#if editable.address_checked === true}

26
src/components/orgs/AddOrgModal.svelte
View File

@ -167,17 +167,17 @@
<div class="ml-3 text-sm">
<label
for="comments"
class="font-medium text-gray-700">Address</label>
class="font-medium text-gray-700">{$_('address')}</label>
</div>
</div>
{#if address_checked === true}
<div class="col-span-6">
<label
for="address1"
class="block text-sm font-medium text-gray-700">Address</label>
class="block text-sm font-medium text-gray-700">{$_('address')}</label>
<input
autocomplete="off"
placeholder="Address"
placeholder="{$_('address')}"
class:border-red-500={!isAddress1Valid}
class:focus:border-red-500={!isAddress1Valid}
class:focus:ring-red-500={!isAddress1Valid}
@ -189,18 +189,17 @@
{#if !isAddress1Valid}
<span
class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
Address is required
{$_('address-is-required')}
</span>
{/if}
</div>
<div class="col-span-6">
<label
for="address2"
class="block text-sm font-medium text-gray-700">Apartment,
suite, etc.</label>
class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
<input
autocomplete="off"
placeholder="Apartment, suite, etc."
placeholder="{$_('apartment-suite-etc')}"
bind:value={address_input2_value}
bind:this={address_input2}
type="text"
@ -210,11 +209,10 @@
<div class="col-span-6">
<label
for="zipcode"
class="block text-sm font-medium text-gray-700">ZIP/ postal
code</label>
class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
<input
autocomplete="off"
placeholder="ZIP/ postal code"
placeholder="{$_('zip-postal-code')}"
class:border-red-500={!iszipcodevalid}
class:focus:border-red-500={!iszipcodevalid}
class:focus:ring-red-500={!iszipcodevalid}
@ -226,17 +224,17 @@
{#if !iszipcodevalid}
<span
class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
Valid zipcode/ postal code is required
{$_('valid-zipcode-postal-code-is-required')}
</span>
{/if}
</div>
<div class="col-span-6">
<label
for="city"
class="block text-sm font-medium text-gray-700">City</label>
class="block text-sm font-medium text-gray-700">{$_('city')}</label>
<input
autocomplete="off"
placeholder="City"
placeholder="{$_('city')}"
class:border-red-500={!iscityvalid}
class:focus:border-red-500={!iscityvalid}
class:focus:ring-red-500={!iscityvalid}
@ -248,7 +246,7 @@
{#if !iscityvalid}
<span
class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
Valid city is required
{$_('valid-city-is-required')}
</span>
{/if}
</div>

8
src/components/runners/AddRunnerModal.svelte
View File

@ -203,10 +203,10 @@
<div class="col-span-6">
<label
for="lastname"
class="block text-sm font-medium text-gray-700">Last Name</label>
class="block text-sm font-medium text-gray-700">{$_('last-name')}</label>
<input
autocomplete="off"
placeholder="Last Name"
placeholder="{$_('last-name')}"
class:border-red-500={!isLastnameValid}
class:focus:border-red-500={!isLastnameValid}
class:focus:ring-red-500={!isLastnameValid}
@ -245,10 +245,10 @@
<div class="col-span-6">
<label
for="phone"
class="block text-sm font-medium text-gray-700">Phone</label>
class="block text-sm font-medium text-gray-700">{$_('phone')}</label>
<input
autocomplete="off"
placeholder="Phone"
placeholder="{$_('phone')}"
class:border-red-500={!isPhoneValidOrEmpty}
class:focus:border-red-500={!isPhoneValidOrEmpty}
class:focus:ring-red-500={!isPhoneValidOrEmpty}

2
src/components/runners/Runners.svelte
View File

@ -27,7 +27,7 @@
}}
type="button"
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
{$_('laeufer-importieren')}
{$_('import-runners')}
</button>
{/if}
</span>

2
src/components/teams/TeamDetail.svelte
View File

@ -293,7 +293,7 @@
</select>
</div>
<div class="text-sm w-full">
<label for="org" class="font-medium text-gray-700">Parent Organization</label>
<label for="org" class="font-medium text-gray-700">{$_('organization')}</label>
<select
name="org"
bind:value={teamdata.parentGroup}

2
src/locales/de.json
View File

@ -51,7 +51,7 @@
"create": "Erstellen",
"create-a-new-contact": "Kontakt erstellen",
"create-a-new-donor": "Neue Sponsor:in erstellen",
"create-a-new-organization": "Neue Organisatio anlegen",
"create-a-new-organization": "Neue Organisation anlegen",
"create-a-new-runner": "Neue Läufer:in erstellen",
"create-a-new-team": "Erstelle ein neues Team",
"create-a-new-track": "Neuen Track erstellen",

2
src/store.js
View File

@ -28,7 +28,7 @@ const store = () => {
const jwtinfo = JSON.parse(atob(auth.access_token.split('.')[1]));
state.jwtinfo = jwtinfo;
localForage.setItem('logindata', auth);
}).catch(this.logout());
}).catch(()=>{this.logout();});
},
login(auth, jwtinfo) {
update((state) => {