Skip to content

Commit

Permalink
WIP #6
Browse files Browse the repository at this point in the history 
Reworked languages integration and added some language keys
  • Loading branch information
Niklas Ehlen committed Feb 4, 2024
1 parent fe39901 commit 9bc5886
Show file tree
Hide file tree
Showing 14 changed files with 756 additions and 683 deletions.
122 changes: 73 additions & 49 deletions components/EvatyFooter.vue
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,84 @@
<script lang="ts">
import {defineComponent} from "vue";
<script setup lang="ts">
import {EvatyModal, EvatyButton} from "evaty-component-lib";
export default defineComponent({
name: 'evaty-footer',
});
const {setLocale} = useI18n();
let showModal = ref(false);
function changeLanguage(lang: string) {
setLocale(lang)
}
</script>
<template>
<div id="footer">
<div class="footer-spacer-line"></div>
<div class="footer-upper container flex justify-content-between">
<div class="left" style="max-width: 175px; width: 175px">
<img style="max-width: 100%" src="@/assets/images/logo/evaty-logo-full-color.svg" alt="">
</div>
<div class="right">
<div class="link-list">
<div class="footer-link-list-item">
<span class="footer-link-head">Nützliches</span>
<span class="footer-link"><a href="https://evaty-app.statuspage.io"
target="_blank">Status</a></span>
<span class="footer-link"><a href="https://hosts.evaty.net/login" rel="nofollow">Veranstalter-Login</a></span>
<span class="footer-link"><router-link to="/support">Support Center</router-link></span>
</div>
<div class="footer-link-list-item">
<span class="footer-link-head">HERUNTERLADEN</span>
<span class="footer-link"><a href="https://apps.apple.com/de/app/evaty/id1562916647"
target="_blank">IPhone</a></span>
<span class="footer-link">Android</span>
</div>
<div class="footer-link-list-item">
<span class="footer-link-head">Rechtliches</span>
<span class="footer-link"><router-link to="/imprint">Impressum</router-link></span>
<span class="footer-link"><router-link to="/privacy">Datenschutz</router-link></span>
<span class="footer-link"><router-link to="/terms">Nutzungsbedingungen</router-link></span>
</div>
</div>
</div>
<div id="footer">
<div class="footer-spacer-line"></div>
<div class="footer-upper container flex justify-content-between">
<div class="left" style="max-width: 175px; width: 175px">
<img style="max-width: 100%" src="@/assets/images/logo/evaty-logo-full-color.svg" alt="">
</div>
<div class="right">
<div class="link-list">
<div class="footer-link-list-item">
<span class="footer-link-head">Nützliches</span>
<span class="footer-link"><a href="https://evaty-app.statuspage.io"
target="_blank">Status</a></span>
<span class="footer-link"><a href="https://hosts.evaty.net/login"
rel="nofollow">Veranstalter-Login</a></span>
<span class="footer-link"><router-link to="/support">Support Center</router-link></span>
</div>
<div class="footer-link-list-item">
<span class="footer-link-head">HERUNTERLADEN</span>
<span class="footer-link"><a href="https://apps.apple.com/de/app/evaty/id1562916647"
target="_blank">IPhone</a></span>
<span class="footer-link">Android</span>
</div>
<div class="footer-link-list-item">
<span class="footer-link-head">Rechtliches</span>
<span class="footer-link"><router-link to="/imprint">Impressum</router-link></span>
<span class="footer-link"><router-link to="/privacy">Datenschutz</router-link></span>
<span class="footer-link"><router-link to="/terms">Nutzungsbedingungen</router-link></span>
</div>
</div>
<div class="footer-copy">
<div class="container">
<div class="left">
</div>
</div>
<div class="footer-copy">
<div class="container">
<div class="left">
<span class="copyright">
© 2019 - {{ new Date().getFullYear() }} Evaty
</span>
</div>
<div class="right">
<div class="socials">
<a href="https://www.tiktok.com/@evatyapp" target="_blank"><i
class="fa-brands fa-tiktok"></i></a>
<a href="https://www.instagram.com/evaty_app/" target="_blank"><i
class="fa-brands fa-instagram"></i></a>
<a href="https://www.threads.net/@evaty_app" target="_blank"><i
class="fa-brands fa-threads"></i></a>
</div>
<div class="language" @click="showModal=true">{{ $t("settings.account.language") }}: {{ $t("currentLang") }}</div>
<teleport to="body">
<evaty-modal :show="showModal">
<template #header>{{ $t('settings.account.language-title') }}</template>
<template #footer><br></template>
<template #body>
<div class="row">
<div class="col-6">
<evaty-button @click="changeLanguage('de-DE')">
Deutsch (DE)
</evaty-button>
</div>
<div class="col-6">
<evaty-button @click="changeLanguage('en-US')">
English (US)
</evaty-button>
</div>
</div>
<div class="right">
<div class="socials">
<a href="https://www.tiktok.com/@evatyapp" target="_blank"><i
class="fa-brands fa-tiktok"></i></a>
<a href="https://www.instagram.com/evaty_app/" target="_blank"><i
class="fa-brands fa-instagram"></i></a>
<a href="https://www.threads.net/@evaty_app" target="_blank"><i
class="fa-brands fa-threads"></i></a>
</div>
<span class="language">{{ $t("settings.account.language") }}: {{ $t("currentLang") }}</span>
</div>
</div>
</template>
</evaty-modal>
</teleport>
</div>
</div>
</div>
</div>
</template>
110 changes: 53 additions & 57 deletions components/EvatyNavigation.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,75 +3,71 @@
import {defineComponent} from "vue";
export default defineComponent({
name: 'evaty-navigation',
name: 'evaty-navigation',
})
</script>

<template>
<div class="navigation-wrapper">
<div class="navigation-container container">
<div class="container-left">
<div class="logo-container">
<nuxt-link to="/"><img src="@/assets/images/logo/evaty-logo-minimal-color.svg" alt=""></nuxt-link>
</div>
<div class="navigation-wrapper">
<div class="navigation-container container">
<div class="container-left">
<div class="logo-container">
<nuxt-link to="/"><img src="@/assets/images/logo/evaty-logo-minimal-color.svg" alt=""></nuxt-link>
</div>

<div class="menu-container d-none d-md-block">
<nav>
<nuxt-link to="/" :class="{ 'menu-link': true }">Home</nuxt-link>
<div class="dropdown">
<a :class="{ 'menu-link': true, 'dropbtn': true }">Kategorien</a>
<div class="dropdown-content">
<nuxt-link to="/category/concert" :class="{ 'menu-link': true }">
{{ $t("categorys.concert.label") }}
</nuxt-link>
<nuxt-link to="/category/festival" :class="{ 'menu-link': true }">
{{ $t("categorys.festival.label") }}
</nuxt-link>
<nuxt-link to="/category/adventure" :class="{ 'menu-link': true }">
{{ $t("categorys.adventure.label") }}
</nuxt-link>
<nuxt-link to="/category/fitness" :class="{ 'menu-link': true }">
{{ $t("categorys.fitness.label") }}
</nuxt-link>
<nuxt-link to="/category/club" :class="{ 'menu-link': true }">
{{ $t("categorys.club.label") }}
</nuxt-link>
<nuxt-link to="/category/fleamarket" :class="{ 'menu-link': true }">
{{ $t("categorys.market.fleamarket") }}
</nuxt-link>
</div>
</div>
<nuxt-link to="/host-yourself"
:class="{ 'menu-link': true }">Selber
veranstalten
</nuxt-link>
<nuxt-link to="/about" :class="{ 'menu-link': true }">Über uns
</nuxt-link>
</nav>
</div>
<div class="menu-container d-none d-md-block">
<nav>
<nuxt-link to="/" :class="{ 'menu-link': true }">{{ $t("layout.navigation.home") }}</nuxt-link>
<div class="dropdown">
<a :class="{ 'menu-link': true, 'dropbtn': true }">{{ $t("layout.navigation.category") }}</a>
<div class="dropdown-content">
<nuxt-link to="/category/concert" :class="{ 'menu-link': true }">
{{ $t("categorys.concert.label") }}
</nuxt-link>
<nuxt-link to="/category/festival" :class="{ 'menu-link': true }">
{{ $t("categorys.festival.label") }}
</nuxt-link>
<nuxt-link to="/category/adventure" :class="{ 'menu-link': true }">
{{ $t("categorys.adventure.label") }}
</nuxt-link>
<nuxt-link to="/category/fitness" :class="{ 'menu-link': true }">
{{ $t("categorys.fitness.label") }}
</nuxt-link>
<nuxt-link to="/category/club" :class="{ 'menu-link': true }">
{{ $t("categorys.club.label") }}
</nuxt-link>
<nuxt-link to="/category/fleamarket" :class="{ 'menu-link': true }">
{{ $t("categorys.market.fleamarket") }}
</nuxt-link>
</div>
</div>
<nuxt-link to="/host-yourself" :class="{ 'menu-link': true }">{{ $t("layout.navigation.host-yourself") }}</nuxt-link>
<nuxt-link to="/about" :class="{ 'menu-link': true }">{{ $t("layout.navigation.about") }}</nuxt-link>
</nav>
</div>
</div>

<div class="container-right d-md-flex">
<!-- <a href="/account" class="login-link d-none d-md-block"-->
<!-- v-if="$page.props.auth.user">{{ $page.props.auth.user.name }}</a>-->
<!-- <template v-else>-->
<!-- <nuxt-link to="/login" class="login-link d-none d-md-block">Anmelden</nuxt-link>-->
<!-- <nuxt-link to="/register" class="evaty-button btn-small btn-primary d-none d-md-block text-uppercase">Registrieren-->
<!-- </nuxt-link>-->
<!-- </template>-->
<div class="container-right d-md-flex">
<!-- <a href="/account" class="login-link d-none d-md-block"-->
<!-- v-if="$page.props.auth.user">{{ $page.props.auth.user.name }}</a>-->
<!-- <template v-else>-->
<!-- <nuxt-link to="/login" class="login-link d-none d-md-block">Anmelden</nuxt-link>-->
<!-- <nuxt-link to="/register" class="evaty-button btn-small btn-primary d-none d-md-block text-uppercase">Registrieren-->
<!-- </nuxt-link>-->
<!-- </template>-->

<!-- Hamburger Mobile Navigation-->
<a href="/" class="btn btn-light back-to-page d-none">Zurück zur Seite</a>
<div class="burger-menu d-block d-md-none">
<button class="hamburger hamburger--collapse" type="button">
<!-- Hamburger Mobile Navigation-->
<a href="/" class="btn btn-light back-to-page d-none">Zurück zur Seite</a>
<div class="burger-menu d-block d-md-none">
<button class="hamburger hamburger--collapse" type="button">
<span class="hamburger-box">
<span class="hamburger-inner"></span>
</span>
</button>
</div>
</div>
</button>
</div>
<div class="navigation-spacer-line"></div>
</div>
</div>
<div class="navigation-spacer-line"></div>
</div>
</template>

4 changes: 1 addition & 3 deletions components/EvatyTeaserDownload.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<div class="row pt-60 pb-60">
<div class="col-12 offset-md-6 col-md-5 offset-lg-7 col-lg-5 offset-xl-7 col-xl-5">
<div class="headline">
<h2><span class="primary text-gradient">Download</span> im,
Appstore
und bald Google Playstore
<h2 v-html="$t('components.download-teaser.text')">
</h2>
</div>
<div class="action d-flex align-items-center">
Expand Down
2 changes: 1 addition & 1 deletion components/evaty/event/Lineup.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h3>{{key}}</h3>
</div>
<div class="col-6 col-md-4 col-lg-2 pb-20" v-for="slot in date">
<evaty-image-card :src="slot.artist.profileImage?.url" href="j">
<evaty-image-card :src="slot.artist.profileImage?.url" :href="`/user/${slot.artist.id}`">
{{slot.artist.username}}
</evaty-image-card>
</div>
Expand Down
12 changes: 0 additions & 12 deletions i18n.config.ts
View file

This file was deleted.

Loading

0 comments on commit 9bc5886

Please sign in to comment.