From 9ec5708464da032e4620ff41c574264725759c16 Mon Sep 17 00:00:00 2001 From: dannc Date: Sun, 24 Feb 2019 11:44:37 +0700 Subject: [PATCH] Add article part page content. Some small refactoring --- src/components/AppFooter.vue | 5 +- src/components/AppHeader.vue | 2 +- src/components/Article/Part/Content.vue | 140 ++++++++++++++++++++++++ src/components/Article/Words.vue | 52 +++++++++ src/components/ArticlesList.vue | 13 +-- src/main.js | 2 + src/store/articles.js | 46 +++++++- src/views/ArticlePart.vue | 13 ++- 8 files changed, 257 insertions(+), 16 deletions(-) create mode 100644 src/components/Article/Part/Content.vue create mode 100644 src/components/Article/Words.vue diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue index 859c848..209f007 100644 --- a/src/components/AppFooter.vue +++ b/src/components/AppFooter.vue @@ -2,7 +2,7 @@
- Ich Lerne Deutsch ©2018 + Ich Lerne Deutsch ©2018-{{ year }}
@@ -11,5 +11,8 @@ diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue index 7818532..4e049b2 100644 --- a/src/components/AppHeader.vue +++ b/src/components/AppHeader.vue @@ -90,7 +90,7 @@ route: '/sign_up', }, ]; - } + }, }, }; diff --git a/src/components/Article/Part/Content.vue b/src/components/Article/Part/Content.vue new file mode 100644 index 0000000..ae72d72 --- /dev/null +++ b/src/components/Article/Part/Content.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/src/components/Article/Words.vue b/src/components/Article/Words.vue new file mode 100644 index 0000000..f2a55c3 --- /dev/null +++ b/src/components/Article/Words.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/components/ArticlesList.vue b/src/components/ArticlesList.vue index d868ca9..feddb0d 100644 --- a/src/components/ArticlesList.vue +++ b/src/components/ArticlesList.vue @@ -26,14 +26,11 @@ import ListItem from '@/components/Article/Details'; export default { - data() { - return { - levels: ['A1', 'A2', 'B1', 'B2', 'C1', 'C2'], - - searchTerm: null, - levelTerm: [], - }; - }, + data: () => ({ + levels: ['A1', 'A2', 'B1', 'B2', 'C1', 'C2'], + searchTerm: null, + levelTerm: [], + }), computed: { articles() { return this.$store.getters.getArticles; diff --git a/src/main.js b/src/main.js index c009ee9..5da7a96 100644 --- a/src/main.js +++ b/src/main.js @@ -2,6 +2,7 @@ import Vue from 'vue'; import Vuetify from 'vuetify'; import firebase from 'firebase/app'; import VuetifyConfirm from 'vuetify-confirm'; +import VueYouTubeEmbed from 'vue-youtube-embed'; import 'firebase/auth'; import 'vuetify/dist/vuetify.min.css'; @@ -21,6 +22,7 @@ Vue.use(VuetifyConfirm, { buttonFalseText: 'Нет', width: 400, }); +Vue.use(VueYouTubeEmbed); new Vue({ router, diff --git a/src/store/articles.js b/src/store/articles.js index dbc82ff..fc672f3 100644 --- a/src/store/articles.js +++ b/src/store/articles.js @@ -95,15 +95,39 @@ export default { articlePartId: 'asdasdad123', articleTitle: 'Harry Potter und Stein der Weisen - 1', partTitle: 'kapitel 1', - youtubeId: 'asdasdad1', + youtubeId: 'hHW1oY26kxQ', content: [ { sentences: [ { - origText: 'Bla', + origText: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', transText: 'Бла', }, - ] + { + origText: 'Praesent ligula odio, interdum pretium ligula eu, vehicula consequat nulla. Etiam a massa iaculis, aliquet metus sit amet, varius odio', + transText: 'Бла2', + }, + { + origText: 'Suspendisse quis mi eget nisl accumsan molestie in vel lorem. Duis ipsum massa, pharetra nec arcu sed, mattis ultricies neque.', + transText: 'Бла3', + }, + { + origText: 'Sed lacinia sed justo sit amet porttitor. Etiam nec nisi nibh. Donec dolor lacus, volutpat in pellentesque vel, accumsan ac nisi.', + transText: 'Бла4', + }, + ], + }, + { + sentences: [ + { + origText: 'Etiam magna dui, pulvinar quis finibus malesuada, vulputate non sem. In hendrerit dui sem, a cursus ipsum interdum non.', + transText: 'Фу1', + }, + { + origText: 'Curabitur porta sagittis lacus.', + transText: 'Фу2', + }, + ], } ], words: [ @@ -111,6 +135,22 @@ export default { origWord: 'Hallo', transWord: 'Привет', }, + { + origWord: 'Hallo', + transWord: 'Привет', + }, + { + origWord: 'Hallo', + transWord: 'Привет', + }, + { + origWord: 'Hallo', + transWord: 'Привет', + }, + { + origWord: 'Hallo', + transWord: 'Привет', + }, ], }, ], diff --git a/src/views/ArticlePart.vue b/src/views/ArticlePart.vue index b8b0101..8c72f08 100644 --- a/src/views/ArticlePart.vue +++ b/src/views/ArticlePart.vue @@ -2,16 +2,19 @@ - + - +