IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

dev-night-meeting

Browse Source
This commit is contained in:
ogerly 2021-03-23 09:48:36 +01:00
parent 10b86924f7
commit 04ed14775e
11 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/App.vue
View File

@ -54,6 +54,7 @@ export default {
}
</script>
<style>
.btn-primary pim{
background-color: #5A7B02;
border-color: #5e72e4;

2
frontend/src/components/SidebarPlugin/SideBar.vue
View File

@ -69,7 +69,7 @@
<hr class="my-3">
<ul class="navbar-nav mb-md-3">
<li class="nav-item">
<a class="nav-link text-lg bg-light" href="#!" @click="logout">
<a class="nav-link text-lg" href="#!" @click="logout">
{{ $t('logout') }}
</a>
</li>

2
frontend/src/locales/en.json
View File

@ -7,7 +7,7 @@
"imprint":"Legal notice",
"privacy_policy":"Privacy policy",
"back":"back",
"sent":"Sent",
"sent":"Send",
"transactions":"transactions",
"language":"Language",
"languages":{

5
frontend/src/views/KontoOverview/GddSent.vue
View File

@ -81,9 +81,6 @@
:max="$store.state.user.balance"
style="font-size: xx-large; padding-left:20px">
</b-form-input>
{{$store.state.user.balance}}
</b-input-group>
<b-col class="text-left pl-6">
<b-badge variant="primary">Nachricht für den Empfänger (optional)</b-badge>
@ -97,7 +94,7 @@
</b-input-group>
</div>
{{$refs.observer}}
<br>
<b-row>
<b-col></b-col>

3
frontend/src/views/KontoOverview/GddStatus.vue
View File

@ -12,7 +12,8 @@
<b-col xl="6" md="6">
<stats-card type="gradient-orange"
sub-title="balance_gdt"
class="mb-4">
class="mb-4"
style="font-size: -webkit-xxx-large">
{{ $n($store.state.user.balance_gdt) }} GDT
</stats-card>
</b-col>

8
frontend/src/views/Layout/ContentFooter.vue
View File

@ -11,15 +11,15 @@
<b-nav-item ref="https://gradido.net/" target="_blank">
Gradido
</b-nav-item>
<b-nav-item href="https://gradido.net/" target="_blank">
<b-nav-item href="https://gradido.net/de/impressum/" target="_blank">
{{$t('imprint')}}
</b-nav-item>
<b-nav-item href="https://gradido.net/" target="_blank">
<b-nav-item href="https://gradido.net/de/datenschutz/" target="_blank">
{{$t('privacy_policy')}}
</b-nav-item>
<b-nav-item href="#!" to="/explorer" >
<!--<b-nav-item href="#!" to="/explorer" >
GDD-Explorer
</b-nav-item>
</b-nav-item> -->
</b-nav>
</b-col>
</b-row>

6
frontend/src/views/Pages/Login.vue
View File

@ -45,7 +45,7 @@
v-model="model.password">
</base-input>
<b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox>
<!-- <b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox> -->
<div class="text-center">
<base-button type="primary" native-type="submit" class="my-4">{{ $t('site.login.signin')}}</base-button>
</div>
@ -73,8 +73,8 @@
return {
model: {
email: '',
password: '',
rememberMe: false
password: ''
// rememberMe: false
}
};
},

2
frontend/src/views/Pages/Register.vue
View File

@ -68,7 +68,7 @@
<b-col cols="12">
<base-input :rules="{ required: { allowFalse: false } }" name="Privacy Policy">
<b-form-checkbox v-model="model.agree">
<span class="text-muted"><a href="#!"> {{ $t('privacy_policy')}}</a> - {{ $t('site.signup.agree')}} </span>
<span class="text-muted"><a href="https://gradido.net/de/datenschutz/" target="_blank"> {{ $t('privacy_policy')}}</a> - {{ $t('site.signup.agree')}} </span>
</b-form-checkbox>
</base-input>
</b-col>

4
frontend/src/views/Pages/UserProfile/EditProfileForm.vue
View File

@ -2,10 +2,10 @@
<card>
<b-row align-v="center" slot="header" >
<b-col cols="8">
<h3 class="mb-0">Edit profile </h3>
</b-col>
<b-col cols="4" class="text-right">
<a href="#!" class="btn btn-sm btn-primary">Settings</a>
</b-col>
</b-row>

19
frontend/src/views/Pages/UserProfile/UserCard.vue
View File

@ -21,11 +21,11 @@
<b-col >
<div class="card-profile-stats d-flex justify-content-center mt-md-5">
<div>
<span class="heading">22</span>
<span class="heading">--</span>
<span class="description">Transactions</span>
</div>
<div>
<span class="heading">10</span>
<span class="heading">--</span>
<span class="description">Community</span>
</div>
<div>
@ -39,19 +39,8 @@
<h5 class="h3">
{{this.$store.state.email}}<span class="font-weight-light"></span>
</h5>
<div class="h5 font-weight-300">
<i class="ni location_pin mr-2"></i>Bucharest, Romania
</div>
<div class="h5 mt-4">
<i class="ni business_briefcase-24 mr-2"></i>Solution Manager - Creative Tim Officer
</div>
<div>
<i class="ni education_hat mr-2"></i>University of Computer Science
</div>
<hr class="my-4">
<p>Ryan — the name taken by Melbourne-raised, Brooklyn-based Nick Murphy — writes, performs and records all of his own music.</p>
<a href="#">Show more</a>
</div>
</b-card-body>
</b-card>

6
frontend/src/views/Pages/UserProfileCard.vue
View File

@ -2,11 +2,7 @@
<div>
<div class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header">
<b-container fluid>
<b-container fluid class="d-flex align-items-center">
<b-row >
<base-button><router-link to="/profileedit" > Edit Profil</router-link> </base-button>
</b-row>
</b-container>
</b-container>
</div>