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

Registration in different communities II

Browse Source
This commit is contained in:
ogerly 2021-09-29 18:11:03 +02:00
parent 173dac51b1
commit defabccf86
11 changed files with 128 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/public/json-example/communitys.json
View File

@ -1,7 +1,7 @@
{ {
"community": [ "community": [
{"id": 1, "name": "Community 1", "location": "Ort 1", "description":"description 1 description 1 description 1 description 1 description 1 description 1 description 1 ", "url": "http://localhost:3000/vue/"}, {"id": 1, "name": "Gradido Entwicklung", "url": "http://localhost:3000/vue/", "description":"Die lokale Entwicklungsumgebung von Gradido.", "registerUrl": "http://localhost:3000/vue/register"},
{"id": 2, "name": "Community 2", "location": "Ort 2", "description":"description 2 description 2 description 2 description 2 description 2 description 2 description 2 ", "url": "https://stage1.gradido.net/vue/"}, {"id": 2, "name": "Gradido Staging", "url": "https://stage1.gradido.net/vue/", "description":"Der Testserver der Gradido Akademie.", "registerUrl": "https://stage1.gradido.net/vue/register"},
{"id": 3, "name": "Community 3", "location": "Ort 3", "description":"description 3 description 3 description 3 description 3 description 3 description 3 description 3 ", "url": "https://gdd1.gradido.net/vue/"} {"id": 3, "name": "Gradido-Akademie", "url": "https://gdd1.gradido.com/vue/", "description":"Freies Institut für Wirtschaftsbionik.", "registerUrl": "https://gdd1.gradido.com/vue/register"}
] ]
} }

4
frontend/src/components/LanguageSwitchSelect.vue
View File

@ -14,8 +14,8 @@ export default {
return { return {
selected: null, selected: null,
options: [ options: [
{ value: 'de', text: this.$t('languages.de') }, { value: 'de', text: this.$t('settings.language.de') },
{ value: 'en', text: this.$t('languages.en') }, { value: 'en', text: this.$t('settings.language.en') },
], ],
} }
}, },

4
frontend/src/locales/de.json
View File

@ -12,9 +12,9 @@
"submit": "Einreichen" "submit": "Einreichen"
} }
}, },
"continue-to-registration": "weiter zur Registrierung", "continue-to-registration": "Weiter zur Registrierung",
"current-community": "Aktuelle Gemeinschaft", "current-community": "Aktuelle Gemeinschaft",
"other-communities": "weitere Gemeinschaften", "other-communities": "Weitere Gemeinschaften",
"switch-to-this-community": "zu dieser Gemeinschaft wechseln" "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
}, },
"decay": { "decay": {

10
frontend/src/store/store.js
View File

@ -68,13 +68,11 @@ export const store = new Vuex.Store({
description: '', description: '',
token: null, token: null,
newsletterState: null, newsletterState: null,
community_name: 'Community 1',
community: { community: {
name: 'Community 1', name: 'Gradido Entwicklung',
name2: 'Community 1', url: 'http://localhost:3000/vue/',
location: 'Ort 1', registerUrl: 'http://localhost:3000/vue/register',
description: description: 'Die lokale Entwicklungsumgebung von Gradido.',
'description 1 description 1 description 1 description 1 description 1 description 1',
}, },
}, },
getters: {}, getters: {},

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

@ -32,7 +32,7 @@
</b-col> </b-col>
</b-row> </b-row>
<div class="text-center py-lg-4"> <div class="text-center py-lg-4">
<router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link> <b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
</div> </div>
</b-container> </b-container>
</div> </div>

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

@ -19,14 +19,13 @@
<b-card no-body class="border-0 mb-0" style="background-color: #ebebeba3 !important"> <b-card no-body class="border-0 mb-0" style="background-color: #ebebeba3 !important">
<b-card-body class="p-4"> <b-card-body class="p-4">
<div class="text-center text-muted mb-4"> <div class="text-center text-muted mb-4">
<small>{{ $t('login') }}</small> <b>{{ $store.state.community.name }}</b>
</div> <p class="text-lead">
<div class="text-center text-muted mb-4"> {{ $store.state.community.description }}
{{ $store.state.community_name }} </p>
</div> {{ $t('login') }}
<div class="text-center text-muted mb-4">
{{ $store.state.community.description }}
</div> </div>
<validation-observer ref="observer" v-slot="{ handleSubmit }"> <validation-observer ref="observer" v-slot="{ handleSubmit }">
<b-form @submit.stop.prevent="handleSubmit(onSubmit)"> <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
<input-email v-model="form.email"></input-email> <input-email v-model="form.email"></input-email>
@ -44,15 +43,19 @@
</b-card-body> </b-card-body>
</b-card> </b-card>
<b-row class="mt-3"> <b-row class="mt-3">
<b-col cols="6"> <b-col cols="6" class="text-center text-sm-left col-12 col-sm-6 pb-5">
<router-link to="/password"> <b-button variant="outline-secondary" to="/password">
{{ $t('settings.password.forgot_pwd') }} {{ $t('settings.password.forgot_pwd') }}
</router-link> </b-button>
</b-col> </b-col>
<b-col cols="6" class="text-right" v-show="allowRegister"> <b-col
<router-link to="/regist-community"> cols="6"
class="text-center text-sm-right col-12 col-sm-6"
v-show="allowRegister"
>
<b-button variant="outline-secondary" to="/regist-community">
{{ $t('site.login.new_wallet') }} {{ $t('site.login.new_wallet') }}
</router-link> </b-button>
</b-col> </b-col>
</b-row> </b-row>
</b-col> </b-col>

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

@ -1,24 +1,5 @@
<template> <template>
<div id="registerform"> <div id="registerform">
<div class="justify-content-center container">
<b-card
bg-variant="info"
text-variant=""
:header="$store.state.community_name"
class="text-center"
>
<b-card-text>
{{ $store.state.community.description }}, Location:
{{ $store.state.community.location }}
</b-card-text>
</b-card>
</div>
<div class="text-center py-lg-4">
<router-link to="/select-community" class="mt-3">
{{ $t('community.choose-another-aommunity') }}
</router-link>
</div>
<!-- Header --> <!-- Header -->
<div class="header p-4"> <div class="header p-4">
<b-container class="container"> <b-container class="container">
@ -29,6 +10,14 @@
<p class="text-lead">{{ $t('site.signup.subtitle') }}</p> <p class="text-lead">{{ $t('site.signup.subtitle') }}</p>
</b-col> </b-col>
</b-row> </b-row>
<b-row class="justify-content-center pb-3">
<b-col xl="5" lg="6" md="8" class="px-2">
<b>{{ $store.state.community.name }}</b>
<p class="text-lead">
{{ $store.state.community.description }}
</p>
</b-col>
</b-row>
</div> </div>
</b-container> </b-container>
</div> </div>
@ -139,9 +128,7 @@
<div class="text-center"> <div class="text-center">
<div class="text-center"> <div class="text-center">
<b-button class="ml-2 test-button-back" to="/login"> <b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
{{ $t('back') }}
</b-button>
<b-button <b-button
:disabled="!(namesFilled && emailFilled && form.agree && languageFilled)" :disabled="!(namesFilled && emailFilled && form.agree && languageFilled)"
@ -159,6 +146,11 @@
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container>
<div class="text-center pt-4">
<b-button variant="outline-secondary" to="/select-community">
{{ $t('community.choose-another-aommunity') }}
</b-button>
</div>
</div> </div>
</template> </template>
<script> <script>

68
frontend/src/views/Pages/RegisterCommunity.vue
View File

@ -1,35 +1,45 @@
<template> <template>
<div id="register-select-community"> <div id="register-select-community">
<b-container class="container text-center"> <!-- Header -->
<div class="justify-content-center container"> <div class="p-3">
<b-card <b-container>
bg-variant="info" <div class="text-center mb-7 header">
text-variant="" <b-row class="justify-content-center">
:header="$store.state.community_name" <b-col xl="5" lg="6" md="8" class="px-2">
class="text-center" <h1>{{ $store.state.community.name }}</h1>
> <p class="text-lead">
<b-card-text> {{ $store.state.community.description }},
{{ $store.state.community.description }}, Location: <br />
{{ $store.state.community.location }} Location:
</b-card-text> {{ $store.state.community.url }}
<b-button size="sm" to="/register"> </p>
{{ $t('community.continue-to-registration') }} </b-col>
</b-button> </b-row>
</b-card> <b-row>
</div> <b-col class="text-center">
<b-button variant="outline-secondary" to="/register">
{{ $t('community.continue-to-registration') }}
</b-button>
</b-col>
</b-row>
<hr /> <hr />
<div class="text-center py-lg-4"> <b-row>
<router-link to="/select-community" class="mt-3"> <b-col class="text-center">
{{ $t('community.choose-another-aommunity') }} <b-button variant="outline-secondary" to="/select-community">
</router-link> {{ $t('community.choose-another-aommunity') }}
</div> </b-button>
</b-col>
<hr /> </b-row>
<div class="text-center py-lg-4"> <hr />
<router-link to="/login" class="mt-3">{{ $t('back') }}</router-link> <b-row>
</div> <b-col class="text-center">
</b-container> <b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
</b-col>
</b-row>
</div>
</b-container>
</div>
</div> </div>
</template> </template>
<script> <script>

69
frontend/src/views/Pages/RegisterSelectCommunity.vue
View File

@ -1,44 +1,49 @@
<template> <template>
<div id="register-select-community"> <div id="register-select-community">
<b-container class="justify-content-center text-center"> <b-container class="text-center">
<div class="mb-4">{{ $t('community.current-community') }}</div> <div class="pb-3">{{ $t('community.current-community') }}</div>
<div v-for="community in communitys.community" :key="community.id" class="pb-3"> <div v-for="community in communitys.community" :key="community.name">
<b-card <b-card
v-show="community.name === $store.state.community_name" v-show="community.name === $store.state.community.name"
bg-variant="success" class="border-0 mb-0"
text-variant="" bg-variant="primary"
:header="community.name"
> >
<b-card-text> <b>{{ community.name }}</b>
{{ $store.state.community.description }}, Location: <br />
{{ $store.state.community.location }} {{ $store.state.community.description }}
</b-card-text> <br />
<b-button size="sm" to="/register"> <b-button variant="outline-secondary" to="/register">
{{ $t('community.continue-to-registration') }} {{ $t('community.continue-to-registration') }}
</b-button> </b-button>
</b-card> </b-card>
</div> </div>
<hr /> <hr />
<div>{{ $t('community.other-communities') }}</div> <div>{{ $t('community.other-communities') }}</div>
<div v-for="community in communitys.community" :key="community.id" class="pb-5">
<b-card <div v-for="community in communitys.community" :key="community.id" class="pb-3">
v-show="community.name != $store.state.community_name" <b-card v-show="community.name != $store.state.community.name" bg-variant="secondary">
bg-variant="info" <b>{{ community.name }}</b>
text-variant="" <br />
:header="community.name" {{ community.description }}
> <br />
<b-card-text>beschreibung für community 1, Location:</b-card-text> Location:
<b-button size="sm" :href="community.url"> <b>
<small>
<b-link :href="community.url">{{ community.url }}</b-link>
</small>
</b>
<br />
<b-button variant="outline-secondary" :href="community.url">
{{ $t('community.switch-to-this-community') }} {{ $t('community.switch-to-this-community') }}
</b-button> </b-button>
</b-card> </b-card>
</div> </div>
<hr />
<div class="text-center py-lg-4"> <div class="text-center py-lg-4">
<router-link to="/login" class="mt-3">{{ $t('back') }}</router-link> <b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
</div> </div>
</b-container> </b-container>
</div> </div>
@ -55,4 +60,20 @@ export default {
}, },
} }
</script> </script>
<style></style> <style>
.alert-light {
color: #424543;
background-color: #bac1c84a;
border-color: #ffffff00;
}
.bg-primary {
background-color: #5e72e41f !important;
}
.bg-secondary {
background-color: #525f7f0f !important;
}
.card-footer {
background-color: #ffffff5e !important;
}
</style>

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

@ -40,7 +40,7 @@
</b-row> </b-row>
<b-row> <b-row>
<b-col class="text-center py-lg-4"> <b-col class="text-center py-lg-4">
<router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link> <b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container>

2
frontend/src/views/Pages/UserProfile/UserCard_Language.vue
View File

@ -106,7 +106,7 @@ export default {
}, },
buildTagFromLanguageString() { buildTagFromLanguageString() {
return 'languages.' + this.$store.state.language return 'settings.language.' + this.$store.state.language
}, },
}, },
} }