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

Merge branch 'master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation

Browse Source
This commit is contained in:
clauspeterhuebner 2023-02-15 00:02:56 +01:00 committed by GitHub
commit 97334c6daa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/LinkInformations/RedeemLoggedOut.vue
View File

@ -3,20 +3,20 @@
<redeem-information v-bind="linkData" :isContributionLink="isContributionLink" /> <redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
<b-jumbotron> <b-jumbotron>
<div class="mb-6"> <div class="mb-2">
<h2>{{ $t('gdd_per_link.redeem') }}</h2> <h2>{{ $t('gdd_per_link.redeem') }}</h2>
</div> </div>
<b-row> <b-row>
<b-col col sm="12" md="6"> <b-col sm="12" md="6">
<p>{{ $t('gdd_per_link.no-account') }}</p> <p>{{ $t('gdd_per_link.no-account') }}</p>
<b-button variant="primary" :to="register"> <b-button variant="primary" :to="register">
{{ $t('gdd_per_link.to-register') }} {{ $t('gdd_per_link.to-register') }}
</b-button> </b-button>
</b-col> </b-col>
<b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0"> <b-col sm="12" md="6" class="mt-4 mt-lg-0">
<p>{{ $t('gdd_per_link.has-account') }}</p> <p>{{ $t('gdd_per_link.has-account') }}</p>
<b-button variant="info" :to="login">{{ $t('gdd_per_link.to-login') }}</b-button> <b-button variant="gradido" :to="login">{{ $t('gdd_per_link.to-login') }}</b-button>
</b-col> </b-col>
</b-row> </b-row>
</b-jumbotron> </b-jumbotron>

2
frontend/src/components/LinkInformations/RedeemValid.vue
View File

@ -3,7 +3,7 @@
<redeem-information v-bind="linkData" :isContributionLink="isContributionLink" /> <redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
<b-jumbotron> <b-jumbotron>
<div class="mb-3 text-center"> <div class="mb-3 text-center">
<b-button variant="primary" @click="$emit('mutation-link', linkData.amount)" size="lg"> <b-button variant="gradido" @click="$emit('mutation-link', linkData.amount)" size="lg">
{{ $t('gdd_per_link.redeem') }} {{ $t('gdd_per_link.redeem') }}
</b-button> </b-button>
</div> </div>

12
frontend/src/pages/Login.vue
View File

@ -23,15 +23,17 @@
</b-col> </b-col>
</b-row> </b-row>
<b-row> <b-row>
<b-col class="d-flex justify-content-end"> <b-col class="d-flex justify-content-end mb-4 mb-lg-0">
<router-link to="/forgot-password" class="mt-3"> <router-link to="/forgot-password">
{{ $t('settings.password.forgot_pwd') }} {{ $t('settings.password.forgot_pwd') }}
</router-link> </router-link>
</b-col> </b-col>
</b-row> </b-row>
<div class="mt-5"> <b-row>
<b-button type="submit" variant="gradido">{{ $t('login') }}</b-button> <b-col cols="12" lg="4">
</div> <b-button type="submit" variant="gradido" block>{{ $t('login') }}</b-button>
</b-col>
</b-row>
</b-form> </b-form>
</validation-observer> </validation-observer>
</b-container> </b-container>

43
frontend/src/pages/Register.vue
View File

@ -68,25 +68,30 @@
></input-email> ></input-email>
</b-col> </b-col>
</b-row> </b-row>
<div class="my-4"> <b-row>
<b-form-checkbox <b-col cols="12" class="my-4">
id="registerCheckbox" <b-form-checkbox
v-model="form.agree" id="registerCheckbox"
:name="$t('site.signup.agree')" v-model="form.agree"
> :name="$t('site.signup.agree')"
<!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html --> >
<span class="text-muted" v-html="$t('site.signup.agree')"></span> <!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
</b-form-checkbox> <span class="text-muted" v-html="$t('site.signup.agree')"></span>
</div> </b-form-checkbox>
<div> </b-col>
<b-button </b-row>
type="submit" <b-row>
:disabled="disabled" <b-col cols="12" lg="5">
:variant="disabled ? 'gradido-disable' : 'gradido'" <b-button
> block
{{ $t('signup') }} type="submit"
</b-button> :disabled="disabled"
</div> :variant="disabled ? 'gradido-disable' : 'gradido'"
>
{{ $t('signup') }}
</b-button>
</b-col>
</b-row>
</b-form> </b-form>
</validation-observer> </validation-observer>
</b-container> </b-container>

4
frontend/src/pages/TransactionLink.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="show-transaction-link-informations"> <div class="show-transaction-link-informations">
<b-container class="mt-4"> <div class="mt-4">
<transaction-link-item :type="itemType"> <transaction-link-item :type="itemType">
<template #LOGGED_OUT> <template #LOGGED_OUT>
<redeem-logged-out :linkData="linkData" :isContributionLink="isContributionLink" /> <redeem-logged-out :linkData="linkData" :isContributionLink="isContributionLink" />
@ -22,7 +22,7 @@
<redeemed-text-box :text="redeemedBoxText" /> <redeemed-text-box :text="redeemedBoxText" />
</template> </template>
</transaction-link-item> </transaction-link-item>
</b-container> </div>
</div> </div>
</template> </template>
<script> <script>