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 '2131-crud-for-messages' of https://github.com/gradido/gradido into 2131-crud-for-messages

Browse Source
This commit is contained in:
elweyn 2022-08-25 09:52:41 +02:00
commit f6ba34f73b
11 changed files with 15 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
frontend/public/img/template/gold_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 MiB

133
frontend/src/components/Auth/AuthMobileStart.vue
View File

@ -1,133 +0,0 @@
<template>
<div
class="mobil-start-box position-fixed h-100 d-inline d-sm-inline d-md-inline d-lg-none zindex1000"
>
<div class="position-absolute h1 text-white zindex1000 w-100 text-center mt-8">
{{ $t('auth.left.gratitude') }}
</div>
<div class="position-absolute h2 text-white zindex1000 w-100 text-center mt-9">
{{ $t('auth.left.oneGratitude') }}
</div>
<img
src="/img/template/Blaetter.png"
class="sheet-img position-absolute d-block d-lg-none zindex1000"
/>
<b-img
id="img0"
class="position-absolute zindex1000"
src="/img/template/logo-header.png"
alt="start background image"
></b-img>
<b-img
fluid
id="img1"
class="position-absolute h-100 w-100 overflow-hidden zindex100"
src="/img/template/gold_03.png"
alt="start background image"
></b-img>
<b-img
id="img2"
class="position-absolute zindex100"
src="/img/template/gradido_background_header.png"
alt="start background image"
></b-img>
<b-img
id="img3"
class="position-relative zindex10"
src="/img/template/Foto_01.jpg"
alt="start background image"
></b-img>
<div class="mobil-start-box-text position-fixed w-100 text-center zindex1000">
<b-button variant="gradido" to="/register" @click="$emit('set-mobile-start', false)">
{{ $t('signup') }}
</b-button>
<div class="mt-3 h3 text-white">
{{ $t('auth.left.hasAccount') }}
<b-link
to="/login"
class="text-gradido gradido-global-color-blue"
@click="$emit('set-mobile-start', false)"
>
{{ $t('auth.left.hereLogin') }}
</b-link>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'AuthMobileStart',
props: {
mobileStart: { type: Boolean, default: false },
},
}
</script>
<style>
.mobil-start-box-text {
bottom: 65px;
}
/* logo */
.mobil-start-box #img0 {
width: 200px;
}
/* background logo */
.mobil-start-box #img2 {
width: 230px;
}
/* background maske */
@media screen and (max-width: 1024px) {
.mobil-start-box #img3 {
width: 100%;
top: -100px;
}
}
@media screen and (max-width: 991px) {
.mobil-start-box #img3 {
width: 100%;
top: -148px;
}
}
@media screen and (max-height: 740px) {
.mobil-start-box #img3 {
width: 115%;
}
}
@media screen and (max-width: 650px) {
.mobil-start-box #img3 {
width: 115%;
top: 66px;
}
}
@media screen and (max-width: 450px) {
.mobil-start-box #img3 {
width: 160%;
left: -71px;
top: 35px;
min-width: 360px;
}
}
@media screen and (max-width: 310px) {
.mobil-start-box #img3 {
width: 145%;
left: -94px;
top: 24px;
min-width: 360px;
}
}
@media screen and (max-height: 700px) {
.mobil-start-box #img3 {
top: -104px;
}
}
</style>

19
frontend/src/components/Auth/AuthNavbar.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="auth-header position-sticky">
<b-navbar toggleable="lg" class="pr-4">
<b-navbar-brand>
<b-navbar :toggleable="false" class="pr-4">
<b-navbar-brand class="d-none d-lg-block">
<b-img
class="imgLogo position-absolute ml--3 mt-lg--2 mt-3 p-2 zindex1000"
:src="logo"
@ -16,13 +16,8 @@
></b-img>
</b-navbar-brand>
<b-img class="sheet-img position-absolute d-block d-lg-none zindex1000" :src="sheet"></b-img>
<b-navbar-toggle target="nav-collapse" class="zindex1000"></b-navbar-toggle>
<b-collapse id="nav-collapse" is-nav class="ml-5">
<b-navbar-nav class="ml-auto" right>
<b-nav-item :href="`https://gradido.net/${$i18n.locale}`" target="_blank">
{{ $t('auth.navbar.aboutGradido') }}
</b-nav-item>
<b-navbar-nav class="ml-auto d-none d-lg-flex" right>
<b-nav-item to="/register" class="authNavbar ml-lg-5">{{ $t('signup') }}</b-nav-item>
<span class="d-none d-lg-block mt-1">{{ $t('math.pipe') }}</span>
<b-nav-item to="/login" class="authNavbar">{{ $t('signin') }}</b-nav-item>
@ -49,18 +44,10 @@ export default {
color: #0e79bc !important;
}
.navbar-toggler {
font-size: 2.25rem;
}
.authNavbar > .router-link-exact-active {
color: #383838 !important;
}
button.navbar-toggler > span.navbar-toggler-icon {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(4, 112, 6, 1)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
.auth-header {
font-family: 'Open Sans', sans-serif !important;
}

8
frontend/src/components/Auth/AuthNavbarSmall.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="navbar-small">
<b-navbar>
<b-navbar class="navi">
<b-navbar-nav>
<b-nav-item to="/register" class="authNavbar">{{ $t('signup') }}</b-nav-item>
<span class="mt-1">{{ $t('math.pipe') }}</span>
@ -15,3 +15,9 @@ export default {
name: 'AuthNavbarSmall',
}
</script>
<style scoped>
.navi {
margin-left: 0px;
padding-left: 0px;
}
</style>

14
frontend/src/layouts/AuthLayout.spec.js
View File

@ -36,20 +36,6 @@ describe('AuthLayout', () => {
wrapper = Wrapper()
})
describe('Mobile Version Start', () => {
beforeEach(() => {
wrapper.findComponent({ name: 'AuthMobileStart' }).vm.$emit('set-mobile-start', true)
})
it('has Component AuthMobileStart', () => {
expect(wrapper.findComponent({ name: 'AuthMobileStart' }).exists()).toBe(true)
})
it('has Component AuthNavbarSmall', () => {
expect(wrapper.findComponent({ name: 'AuthNavbarSmall' }).exists()).toBe(true)
})
})
describe('Desktop Version Start', () => {
beforeEach(() => {
wrapper.vm.mobileStart = false

22
frontend/src/layouts/AuthLayout.vue
View File

@ -1,10 +1,5 @@
<template>
<div class="auth-template">
<auth-mobile-start
v-if="mobileStart"
class="d-inline d-lg-none zindex10000"
@set-mobile-start="setMobileStart"
/>
<div class="h-100 align-middle">
<auth-navbar class="zindex10" />
@ -20,11 +15,11 @@
</b-link>
</div>
</div>
<b-row class="justify-content-md-center">
<b-col sm="12" md="8" offset-lg="6" lg="6" class="zindex1000">
<div class="right-content-box ml-3 ml-sm-4 mr-3 mr-sm-4">
<b-row class="justify-content-md-center justify-content-lg-end">
<b-col sm="12" md="8" lg="6" class="zindex1000">
<div class="ml-3 ml-sm-4 mr-3 mr-sm-4">
<b-row class="d-none d-md-block d-lg-none">
<b-col class="mb--4 d-flex justify-content-end">
<b-col class="mb--4">
<auth-navbar-small />
</b-col>
</b-row>
@ -74,20 +69,18 @@
</b-col>
</b-row>
<b-card-body class="">
<router-view @set-mobile-start="setMobileStart"></router-view>
<router-view></router-view>
</b-card-body>
</b-card>
</div>
<auth-footer v-if="!$route.meta.hideFooter" class="pr-5 mb-5"></auth-footer>
</b-col>
</b-row>
<!-- <auth-layout-gdd />-->
</div>
</div>
</template>
<script>
import AuthMobileStart from '@/components/Auth/AuthMobileStart.vue'
import AuthNavbar from '@/components/Auth/AuthNavbar.vue'
import AuthNavbarSmall from '@/components/Auth/AuthNavbarSmall.vue'
import AuthCarousel from '@/components/Auth/AuthCarousel.vue'
@ -98,7 +91,6 @@ import CONFIG from '@/config'
export default {
name: 'AuthLayout',
components: {
AuthMobileStart,
AuthNavbar,
AuthNavbarSmall,
AuthCarousel,
@ -107,14 +99,10 @@ export default {
},
data() {
return {
mobileStart: true,
communityName: CONFIG.COMMUNITY_NAME,
}
},
methods: {
setMobileStart(boolean) {
this.mobileStart = boolean
},
setTextSize(size) {
this.$refs.pageFontSize.style.fontSize = size + 'rem'
},

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

@ -9,15 +9,10 @@
"dignity": "Würde",
"donation": "Gabe",
"gratitude": "Dankbarkeit",
"hasAccount": "Du hast schon einen Account?",
"hereLogin": "Hier Anmelden",
"learnMore": "Erfahre mehr …",
"oneDignity": "Wir schenken einander und danken mit Gradido.",
"oneDonation": "Du bist ein Geschenk für die Gemeinschaft. 1000 Dank, weil du bei uns bist.",
"oneGratitude": "Für einander, für alle Menschen, für die Natur."
},
"navbar": {
"aboutGradido": "Über Gradido"
}
},
"back": "Zurück",

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

@ -9,15 +9,10 @@
"dignity": "Dignity",
"donation": "Donation",
"gratitude": "Gratitude",
"hasAccount": "You already have an account?",
"hereLogin": "Log in here",
"learnMore": "Learn more …",
"oneDignity": "We gift to each other and give thanks with Gradido.",
"oneDonation": "You are a gift for the community. 1000 thanks because you are with us.",
"oneGratitude": "For each other, for all people, for nature."
},
"navbar": {
"aboutGradido": "About Gradido"
}
},
"back": "Back",

5
frontend/src/locales/es.json
View File

@ -9,15 +9,10 @@
"dignity": "Dignidad",
"donation": "Donación",
"gratitude": "Gratitud",
"hasAccount": "Ya estas registrado?",
"hereLogin": "Regístrate aquí",
"learnMore": "Infórmate aquí …",
"oneDignity": "Damos los unos a los otros y agradecemos con Gradido.",
"oneDonation": "Eres un regalo para la comunidad. 1000 gracias por estar con nosotros.",
"oneGratitude": "Por los demás, por toda la humanidad, por la naturaleza."
},
"navbar": {
"aboutGradido": "Sobre Gradido"
}
},
"back": "Volver",

5
frontend/src/locales/fr.json
View File

@ -9,15 +9,10 @@
"dignity": "Dignité",
"donation": "Donation",
"gratitude": "Gratitude",
"hasAccount": "Avez-vous déjà un compte?",
"hereLogin": "Connectez-vous ici",
"learnMore": "Pour plus de détails …",
"oneDignity": "Nous nous donnons mutuellement et rendons grâce avec Gradido.",
"oneDonation": "Vous êtes précieux pour la communauté. 1000 mercis d’être parmi nous.",
"oneGratitude": "Les uns pour les autres, pour tout le monde, pour la nature."
},
"navbar": {
"aboutGradido": "À propos de Gradido"
}
},
"back": "Retour",

5
frontend/src/locales/nl.json
View File

@ -9,15 +9,10 @@
"dignity": "Waardigheid",
"donation": "Gift",
"gratitude": "Dankbaarheid",
"hasAccount": "Je hebt al een rekening?",
"hereLogin": "Hier aanmelden",
"learnMore": "Meer ervaren …",
"oneDignity": "We geven aan elkaar en bedanken met Gradido.",
"oneDonation": "Jij bent een geschenk voor de gemeenschap. 1000 dank dat je bij ons bent.",
"oneGratitude": "Voor elkaar, voor alle mensen, voor de natuur."
},
"navbar": {
"aboutGradido": "Over Gradido"
}
},
"back": "Terug",