From 1e109c5b94ca06bfdf53b41dcebadb09985f7d63 Mon Sep 17 00:00:00 2001 From: Airop Date: Sun, 5 Apr 2020 12:31:52 +0200 Subject: [PATCH 01/64] add Navdrawer.vue --- src/App.vue | 5 +++- src/components/Navdrawer.vue | 47 ++++++++++++++++++++++++++++++++++++ src/components/Toolbar.vue | 26 ++++++++++++++------ src/store/store.js | 12 ++++++++- 4 files changed, 81 insertions(+), 9 deletions(-) create mode 100644 src/components/Navdrawer.vue diff --git a/src/App.vue b/src/App.vue index 274fdbd..2b571ef 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,6 +2,8 @@ + + @@ -10,10 +12,11 @@ diff --git a/src/components/Navdrawer.vue b/src/components/Navdrawer.vue new file mode 100644 index 0000000..1f69f39 --- /dev/null +++ b/src/components/Navdrawer.vue @@ -0,0 +1,47 @@ + + + diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue index d8f62e5..9049b91 100644 --- a/src/components/Toolbar.vue +++ b/src/components/Toolbar.vue @@ -1,6 +1,6 @@ - + {{ item.title }} @@ -49,6 +49,7 @@ export default { items: [{ title: " DE", locale: 'de', flag: "de" }, { title: " ENG", locale: 'en', flag: "gb" }], langs: ['de', 'en'], description: 'toolbar.description', + flag: 'fl.current_flag' }; }, methods: { diff --git a/src/locales/de.json b/src/locales/de.json index 6ca3e17..6bf74a1 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -9,5 +9,8 @@ "home": "Hauptseite", "help": "Hilfe", "contact": "Kontakt" + }, + "fl": { + "current_flag": "de" } } diff --git a/src/locales/en.json b/src/locales/en.json index d866d76..14fc9e7 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -9,5 +9,8 @@ "home": "Home", "help": "Help", "contact": "Contact" + }, + "fl": { + "current_flag": "gb" } } diff --git a/src/store/store.js b/src/store/store.js index 0507c0c..31c733a 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -9,7 +9,7 @@ const state = { videoLectures: [], loading: false, drawer: false, - dropdown: false + dropdown: false, }; const mutations = { From 206769824174aff387ada8cea4edb05ac3468d80 Mon Sep 17 00:00:00 2001 From: Airop Date: Thu, 7 May 2020 15:16:07 +0200 Subject: [PATCH 14/64] -moved vue.use(flagIcon) to main.js --- src/main.js | 3 +++ src/store/store.js | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.js b/src/main.js index 54c6ff2..c392e0f 100644 --- a/src/main.js +++ b/src/main.js @@ -5,6 +5,9 @@ import store from './store/store'; import vuetify from './plugins/vuetify'; import '@babel/polyfill'; import i18n from './i18n'; +import FlagIcon from 'vue-flag-icon'; + +Vue.use(FlagIcon); Vue.config.productionTip = false; diff --git a/src/store/store.js b/src/store/store.js index 31c733a..c7511ef 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -1,9 +1,7 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import FlagIcon from 'vue-flag-icon'; Vue.use(Vuex); -Vue.use(FlagIcon); const state = { videoLectures: [], From b978dbfe99cbb43d26edd23c70e06ecb1c42ab07 Mon Sep 17 00:00:00 2001 From: emrearkan Date: Sun, 10 May 2020 10:41:08 +0200 Subject: [PATCH 15/64] move hyphens css class --- src/components/LectureCard.vue | 18 +++++++++++------- src/components/Lectures.vue | 6 +----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/LectureCard.vue b/src/components/LectureCard.vue index e85cb94..e904837 100644 --- a/src/components/LectureCard.vue +++ b/src/components/LectureCard.vue @@ -30,12 +30,12 @@ v-if="!flipped" > - - - {{ videoLecture.description.value }} - - - + + + {{ videoLecture.description.value }} + + + @@ -85,4 +85,8 @@ export default { }; - + diff --git a/src/components/Lectures.vue b/src/components/Lectures.vue index dab25ae..d04052f 100644 --- a/src/components/Lectures.vue +++ b/src/components/Lectures.vue @@ -34,8 +34,4 @@ export default { }; - + From 6cd87da5a5cac20472ddcfacf88036a972558df5 Mon Sep 17 00:00:00 2001 From: Airop Date: Sun, 10 May 2020 10:42:13 +0200 Subject: [PATCH 16/64] -removed circular loading circle --- src/views/Home.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/views/Home.vue b/src/views/Home.vue index bc70e42..c6f6ded 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,11 +1,6 @@ From 29968f75b8f41f2302cf3b642ea51f004f4912fd Mon Sep 17 00:00:00 2001 From: emrearkan Date: Thu, 14 May 2020 14:59:58 +0200 Subject: [PATCH 17/64] fix conditional-rendering move vue-flag-icon to i18n.js reformat code --- src/components/Lectures.vue | 5 ++--- src/components/NavDrawer.vue | 8 ++++++-- src/components/THBImage.vue | 2 +- src/components/Toolbar.vue | 24 +++++++++++++++++------- src/views/Home.vue | 2 +- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/components/Lectures.vue b/src/components/Lectures.vue index dab25ae..57eb6f6 100644 --- a/src/components/Lectures.vue +++ b/src/components/Lectures.vue @@ -10,8 +10,7 @@ v-for="videoLecture in getVideoLectures" :key="videoLecture.label.value" > - - + @@ -30,7 +29,7 @@ export default { getVideoLectures() { return this.$store.getters.getVideoLectures; } - }, + } }; diff --git a/src/components/NavDrawer.vue b/src/components/NavDrawer.vue index 6ed7109..337f77b 100644 --- a/src/components/NavDrawer.vue +++ b/src/components/NavDrawer.vue @@ -8,7 +8,7 @@ - {{ $t(item.title)}} + {{ $t(item.title) }} @@ -23,7 +23,11 @@ export default { links: [ { icon: 'mdi-view-dashboard', title: 'navbar.home', route: '/' }, { icon: 'mdi-view-dashboard', title: 'navbar.help', route: '/help' }, - { icon: 'mdi-view-dashboard', title: 'navbar.contact', route: '/contact' } + { + icon: 'mdi-view-dashboard', + title: 'navbar.contact', + route: '/contact' + } ] }; } diff --git a/src/components/THBImage.vue b/src/components/THBImage.vue index c42d11f..228cd1e 100644 --- a/src/components/THBImage.vue +++ b/src/components/THBImage.vue @@ -8,7 +8,7 @@

Video lectures

- {{ $t('page.description')}} + {{ $t('page.description') }}

diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue index f1d8a24..484394a 100644 --- a/src/components/Toolbar.vue +++ b/src/components/Toolbar.vue @@ -16,15 +16,22 @@ - {{ $t(description)}} + {{ $t(description) }} - - {{ item.title }} + + + + {{ item.title }} + @@ -46,7 +53,10 @@ export default { data() { return { appTitle: 'lectures@THB', - items: [{ title: " DE", locale: 'de', flag: "de" }, { title: " ENG", locale: 'en', flag: "gb" }], + items: [ + { title: ' DE', locale: 'de', flag: 'de' }, + { title: ' ENG', locale: 'en', flag: 'gb' } + ], langs: ['de', 'en'], description: 'toolbar.description', flag: 'fl.current_flag' @@ -59,8 +69,8 @@ export default { negateDropdown() { store.dispatch('negateDropdown'); }, - setLocale(locale){ - this.$i18n.locale = locale + setLocale(locale) { + this.$i18n.locale = locale; } } }; diff --git a/src/views/Home.vue b/src/views/Home.vue index c6f6ded..10f4efc 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,7 +1,7 @@ From 18956ec55554e31dac4d5947cb025cf473ca8a8e Mon Sep 17 00:00:00 2001 From: emrearkan Date: Thu, 14 May 2020 14:59:58 +0200 Subject: [PATCH 18/64] reformat code --- src/components/Lectures.vue | 5 ++--- src/components/NavDrawer.vue | 8 ++++++-- src/components/THBImage.vue | 2 +- src/components/Toolbar.vue | 24 +++++++++++++++++------- src/views/Home.vue | 2 +- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/components/Lectures.vue b/src/components/Lectures.vue index dab25ae..57eb6f6 100644 --- a/src/components/Lectures.vue +++ b/src/components/Lectures.vue @@ -10,8 +10,7 @@ v-for="videoLecture in getVideoLectures" :key="videoLecture.label.value" > - - + @@ -30,7 +29,7 @@ export default { getVideoLectures() { return this.$store.getters.getVideoLectures; } - }, + } }; diff --git a/src/components/NavDrawer.vue b/src/components/NavDrawer.vue index 6ed7109..337f77b 100644 --- a/src/components/NavDrawer.vue +++ b/src/components/NavDrawer.vue @@ -8,7 +8,7 @@ - {{ $t(item.title)}} + {{ $t(item.title) }} @@ -23,7 +23,11 @@ export default { links: [ { icon: 'mdi-view-dashboard', title: 'navbar.home', route: '/' }, { icon: 'mdi-view-dashboard', title: 'navbar.help', route: '/help' }, - { icon: 'mdi-view-dashboard', title: 'navbar.contact', route: '/contact' } + { + icon: 'mdi-view-dashboard', + title: 'navbar.contact', + route: '/contact' + } ] }; } diff --git a/src/components/THBImage.vue b/src/components/THBImage.vue index c42d11f..228cd1e 100644 --- a/src/components/THBImage.vue +++ b/src/components/THBImage.vue @@ -8,7 +8,7 @@

Video lectures

- {{ $t('page.description')}} + {{ $t('page.description') }}

diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue index f1d8a24..5e15f9f 100644 --- a/src/components/Toolbar.vue +++ b/src/components/Toolbar.vue @@ -16,15 +16,22 @@ - {{ $t(description)}} + {{ $t(description) }} - - {{ item.title }} + + + + {{ item.title }} + @@ -46,7 +53,10 @@ export default { data() { return { appTitle: 'lectures@THB', - items: [{ title: " DE", locale: 'de', flag: "de" }, { title: " ENG", locale: 'en', flag: "gb" }], + items: [ + { title: ' DE', locale: 'de', flag: 'de' }, + { title: ' EN', locale: 'en', flag: 'gb' } + ], langs: ['de', 'en'], description: 'toolbar.description', flag: 'fl.current_flag' @@ -59,8 +69,8 @@ export default { negateDropdown() { store.dispatch('negateDropdown'); }, - setLocale(locale){ - this.$i18n.locale = locale + setLocale(locale) { + this.$i18n.locale = locale; } } }; diff --git a/src/views/Home.vue b/src/views/Home.vue index c6f6ded..10f4efc 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,7 +1,7 @@ From 049b49df9a7d41857c3a198cacb6677243cb9268 Mon Sep 17 00:00:00 2001 From: emrearkan Date: Thu, 14 May 2020 15:01:47 +0200 Subject: [PATCH 19/64] fix conditional-rendering move vue-flag-icon to i18n.js --- src/i18n.js | 6 ++++-- src/main.js | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/i18n.js b/src/i18n.js index 8f973c6..8ad5e82 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -1,7 +1,9 @@ import Vue from 'vue'; import VueI18n from 'vue-i18n'; +import FlagIcon from 'vue-flag-icon'; Vue.use(VueI18n); +Vue.use(FlagIcon); function loadLocaleMessages() { const locales = require.context( @@ -21,7 +23,7 @@ function loadLocaleMessages() { } export default new VueI18n({ - locale: navigator.language.split("-")[0], - fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'de', + locale: navigator.language.split('-')[0], + fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en', messages: loadLocaleMessages() }); diff --git a/src/main.js b/src/main.js index c392e0f..54c6ff2 100644 --- a/src/main.js +++ b/src/main.js @@ -5,9 +5,6 @@ import store from './store/store'; import vuetify from './plugins/vuetify'; import '@babel/polyfill'; import i18n from './i18n'; -import FlagIcon from 'vue-flag-icon'; - -Vue.use(FlagIcon); Vue.config.productionTip = false; From 2805fcad1b07feb6d7a6b83e28036b2d444da67a Mon Sep 17 00:00:00 2001 From: Airop Date: Thu, 14 May 2020 16:32:37 +0200 Subject: [PATCH 20/64] -changed hover card background color + text color -disabled hover effect on lecture cards --- src/components/LectureCard.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/LectureCard.vue b/src/components/LectureCard.vue index e85cb94..f5f8e7f 100644 --- a/src/components/LectureCard.vue +++ b/src/components/LectureCard.vue @@ -1,7 +1,7 @@