dannc/ich-lerne-deutsch
1
0
Fork 0
mirror of https://github.com/Dannecron/ich-lerne-deutsch.git synced 2025-12-25 12:52:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix linter, fix files by linter rules.

Browse Source 
Fix backup file.
This commit is contained in:
dannc
2019-03-17 11:20:24 +07:00
parent 056e31d218
commit b611c49904
35 changed files with 957 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.eslintrc.js
View File

@@ -3,10 +3,16 @@ module.exports = {
env: {
node: true
},
'extends': [
parserOptions: {
parser: 'babel-eslint',
sourceType: 'module',
},
plugins: [
'vue'
],
extends: [
'plugin:vue/essential',
'eslint:recommended',
'airbnb'
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
@@ -19,9 +25,15 @@ module.exports = {
'functions': 'never',
'arrays': 'always-multiline',
'objects': 'always-multiline'
}]
}],
'import/extensions': false,
},
parserOptions: {
parser: 'babel-eslint'
}
}
settings: {
'import/resolver': {
node: {
extensions: ['.js', '.jsx', '.vue'],
},
},
},
};

33
data/back-up.json
View File

@@ -57,16 +57,6 @@
"id": "bsdasdad123",
"title": "kapitel 1",
"youtubeId": "bsdasdad1"
},
{
"id": "bsdasdad124",
"title": "kapitel 2",
"youtubeId": "bsdasdad2"
},
{
"id": "bsdasdad125",
"title": "kapitel 3",
"youtubeId": "bsdasdad3"
}
],
"description": "Третья глава первой книги о Гарри Поттере",
@@ -151,7 +141,7 @@
},
"articlePartId": "k2",
"youtubeId": "hHW1oY26kxQ",
"articleTitle": "Harry Potter und Stein der Weisen - 2",
"articleTitle": "Harry Potter und Stein der Weisen - 1",
"__collections__": {}
},
"hp1k3": {
@@ -170,7 +160,26 @@
"words": {},
"articlePartId": "k3",
"youtubeId": "hHW1oY26kxQ",
"articleTitle": "Harry Potter und Stein der Weisen - 3",
"articleTitle": "Harry Potter und Stein der Weisen - 1",
"__collections__": {}
},
"hp2k1": {
"content": [
{
"sentences": [
{
"origText": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
"transText": "Бла21-бла-бла"
}
]
}
],
"articleId": "hp2",
"partTitle": "kapitel 1",
"words": {},
"articlePartId": "k1",
"youtubeId": "hHW1oY26kxQ",
"articleTitle": "Harry Potter und Stein der Weisen - 2",
"__collections__": {}
}
}

3
package.json
View File

@@ -28,7 +28,8 @@
"@vue/cli-service": "^3.4.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.8.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-vue": "^5.0.0",
"stylus": "^0.54.5",

10
src/App.vue
View File

@@ -11,13 +11,13 @@
</template>
<script>
import AppHeader from '@/components/AppHeader';
import AppFooter from '@/components/AppFooter';
import AppHeader from '@/components/AppHeader';
import AppFooter from '@/components/AppFooter';
export default {
export default {
components: {
AppHeader,
AppFooter,
}
};
},
};
</script>

4
src/components/AppFooter.vue
View File

@@ -10,9 +10,9 @@
<script>
export default {
export default {
computed: {
year: () => new Date().getFullYear(),
},
};
};
</script>

21
src/components/AppHeader.vue
View File

@@ -13,7 +13,8 @@
<v-list-tile-title v-text="item.title"></v-list-tile-title>
</v-list-tile-content>
</v-list-tile>
<v-list-tile @click.prevent="signOut" v-if="isUserAuthentificated">
<v-list-tile @click.prevent="signOut" v-if="isUserAuthenticated">
<v-list-tile-action>
<v-icon left v-html="'exit_to_app'"></v-icon>
</v-list-tile-action>
@@ -24,7 +25,7 @@
</v-list>
</v-navigation-drawer>
<v-toolbar app dark class="primary">
<v-toolbar-side-icon @click.stop="drawer = !drawer;" class="hidden-md-and-up"></v-toolbar-side-icon>
<v-toolbar-side-icon @click.stop="drawer = !drawer" class="hidden-md-and-up"></v-toolbar-side-icon>
<router-link to="/" tag="span" style="cursor: pointer;">
<v-toolbar-title v-text="'Dannc Ich Lerne Deutsch'"></v-toolbar-title>
</router-link>
@@ -32,9 +33,9 @@
<v-toolbar-items class="hidden-sm-and-down">
<v-btn v-for="(item, i) in menuItems" flat :key="`menuitem-${i}`" :to="item.route">
<v-icon left v-html="item.icon"></v-icon>
{{item.title}}
{{ item.title }}
</v-btn>
<v-btn flat @click.prevent="signOut" v-if="isUserAuthentificated">
<v-btn flat @click.prevent="signOut" v-if="isUserAuthenticated">
<v-icon left v-html="'exit_to_app'"></v-icon>
Выйти
</v-btn>
@@ -44,7 +45,7 @@
</template>
<script>
export default {
export default {
data() {
return {
drawer: false,
@@ -60,14 +61,14 @@
},
changeLocation(to) {
this.$router.push(to);
}
},
},
computed: {
isUserAuthentificated() {
return this.$store.getters.isUserAuthentificated;
isUserAuthenticated() {
return this.$store.getters.isUserAuthenticated;
},
menuItems() {
if (this.isUserAuthentificated) {
if (this.isUserAuthenticated) {
return [
{
icon: 'visibility',
@@ -106,7 +107,7 @@
];
},
},
};
};
</script>
<style scoped>

32
src/components/Article/Details.vue
View File

@@ -36,13 +36,25 @@
<v-layout row>
<v-flex xs12>
<v-card-actions>
<!-- <v-rating v-model="article.rating" color="yellow" readonly dense half-increments></v-rating>
<!-- <v-rating
v-model="article.rating"
color="yellow"
readonly
dense
half-increments
>
</v-rating>
<div class="ml-1">
<span>{{ article.rating }}</span>
<span>({{ article.ratingsCount }})</span>
</div> -->
<v-spacer></v-spacer>
<v-btn v-if="!expandDetails" class="primary" flat :to="{ name: 'article', params: { articleId: article.id } }">
<v-btn
v-if="!expandDetails"
:to="{ name: 'article', params: { articleId: article.id } }"
class="primary"
flat
>
Открыть
</v-btn>
<v-btn v-if="expandDetails && canAddArticle(article.id)"
@@ -64,11 +76,11 @@
</template>
<script>
import { mapGetters } from 'vuex';
import YoutubeButton from '@/components/Article/YoutubeButton';
import { getArticleLevel, declOfNum } from '@/utils';
import { mapGetters } from 'vuex';
import YoutubeButton from '@/components/Article/YoutubeButton';
import { getArticleLevel, declOfNum } from '@/utils';
export default {
export default {
props: {
article: {
type: Object,
@@ -85,7 +97,7 @@
const partsCountWord = declOfNum(partsCount, ['часть', 'части', 'частей']);
return `${partsCount} ${partsCountWord}`;
},
...mapGetters(['isUserAuthentificated', 'getProcessing', 'userData']),
...mapGetters(['isUserAuthenticated', 'getProcessing', 'userData']),
},
methods: {
getArticleLevel,
@@ -94,7 +106,7 @@
},
canAddArticle(articleId) {
const article = this.getUserDataArticle(articleId);
return this.isUserAuthentificated && !this.getProcessing && !article;
return this.isUserAuthenticated && !this.getProcessing && !article;
},
addArticle(articleId) {
this.$store.dispatch('addUserArticle', articleId);
@@ -102,10 +114,10 @@
getArticleAddedAt(articleId) {
const article = this.getUserDataArticle(articleId);
return article.addedAt;
}
},
},
components: {
YoutubeButton,
},
};
};
</script>

40
src/components/Article/Part/Content.vue
View File

@@ -38,12 +38,20 @@
<v-tab-item :key="'german'">
<div v-for="(paragraph, i) in part.content" :key="`paragraph1-${i}`">
<span>&nbsp;&nbsp;</span>
<span v-for="(sentence, y) in paragraph.sentences" :key="`paragraph1-sentence${y}`" :style="textStyle">
<span
v-for="(sentence, y) in paragraph.sentences"
:key="`paragraph1-sentence${y}`"
:style="textStyle"
>
<span>
{{ sentence.origText }}
</span>
<v-icon :size="fontSize" @click.prevent="toggleVisibility(i, y)">help</v-icon>
<span class="success--text" style="font-weight:bold;" v-if="getVisibilityFlag(i, y).value">
<span
v-if="getVisibilityFlag(i, y).value"
class="success--text"
style="font-weight:bold;"
>
{{ sentence.transText }}
</span>
</span>
@@ -55,7 +63,11 @@
<v-layout row wrap v-for="(paragraph, i) in part.content" :key="`paragraph2-${i}`">
<v-flex xs6>
<span>&nbsp;&nbsp;</span>
<span v-for="(sentence, y) in paragraph.sentences" :key="`paragraph2-sentence-orig${y}`" :style="textStyle">
<span
v-for="(sentence, y) in paragraph.sentences"
:key="`paragraph2-sentence-orig${y}`"
:style="textStyle"
>
<span>
{{ sentence.origText }}
</span>
@@ -64,7 +76,11 @@
<v-flex xs6>
<span>&nbsp;&nbsp;</span>
<span v-for="(sentence, y) in paragraph.sentences" :key="`paragraph2-sentence-trans${y}`" :style="textStyle">
<span
v-for="(sentence, y) in paragraph.sentences"
:key="`paragraph2-sentence-trans${y}`"
:style="textStyle"
>
<span>
{{ sentence.transText }}
</span>
@@ -80,7 +96,7 @@
</template>
<script>
export default {
export default {
props: {
part: {
type: Object,
@@ -89,13 +105,13 @@
},
data: () => ({
tabMode: 'german',
visibillityKeys: [],
visibilityKeys: [],
fontSize: 18,
}),
created() {
for (let i = 0; i < this.part.content.length; i++) {
for (let y = 0; y < this.part.content[i].sentences.length; y++) {
this.visibillityKeys.push({
this.visibilityKeys.push({
key: `${i}${y}`,
value: false,
});
@@ -125,16 +141,12 @@
},
methods: {
getVisibilityFlag(i, y) {
return this.visibillityKeys.find(v => v.key === `${i}${y}`);
return this.visibilityKeys.find(v => v.key === `${i}${y}`);
},
toggleVisibility(i, y) {
let flag = this.getVisibilityFlag(i, y);
flag.value = !flag.value;
},
}
};
},
};
</script>
<style>
</style>

10
src/components/Article/Part/ListItem.vue
View File

@@ -25,9 +25,9 @@
</template>
<script>
import { mapGetters } from 'vuex';
import { mapGetters } from 'vuex';
export default {
export default {
props: {
part: {
type: Object,
@@ -39,7 +39,7 @@
},
},
computed: {
...mapGetters(['isUserAuthentificated', 'getProcessing', 'userData']),
...mapGetters(['isUserAuthenticated', 'getProcessing', 'userData']),
currentUserArticle() {
return this.userData.articles[this.articleId];
},
@@ -48,7 +48,7 @@
return article ? article.parts[this.part.id] : null;
},
isUserArticleAdded() {
return this.isUserAuthentificated && !this.getProcessing && !!this.currentUserArticle;
return this.isUserAuthenticated && !this.getProcessing && !!this.currentUserArticle;
},
finishedAt() {
const { currentUserArticlePart } = this;
@@ -57,6 +57,6 @@
},
methods: {
},
};
};
</script>

8
src/components/Article/Word/Card.vue
View File

@@ -38,10 +38,10 @@
</template>
<script>
import { mapGetters } from 'vuex';
import { getFullOriginalWord, WORD_TYPES } from '@/utils';
import { mapGetters } from 'vuex';
import { getFullOriginalWord, WORD_TYPES } from '@/utils';
export default {
export default {
props: {
wordEntity: {
type: Object,
@@ -86,5 +86,5 @@
this.$store.dispatch('addUserWord', entity);
},
},
};
};
</script>

6
src/components/Article/Words.vue
View File

@@ -21,9 +21,9 @@
</template>
<script>
import WordCard from '@/components/Article/Word/Card';
import WordCard from '@/components/Article/Word/Card';
export default {
export default {
props: {
data: {
type: Object,
@@ -50,6 +50,6 @@
components: {
WordCard,
},
}
};
</script>

4
src/components/Article/YoutubeButton.vue
View File

@@ -6,6 +6,6 @@
</template>
<script>
export default {
};
export default {
};
</script>

14
src/components/ArticlesList.vue
View File

@@ -23,9 +23,9 @@
<script>
import ListItem from '@/components/Article/Details';
import ListItem from '@/components/Article/Details';
export default {
export default {
data: () => ({
levels: ['A1', 'A2', 'B1', 'B2', 'C1', 'C2'],
searchTerm: null,
@@ -37,7 +37,7 @@
},
filteredArticles() {
const { articles, searchTerm, levelTerm } = this;
let filteredArticles = articles
let filteredArticles = articles;
if (searchTerm) {
filteredArticles = filteredArticles.filter(article =>
@@ -47,7 +47,9 @@
}
if (levelTerm.length) {
filteredArticles = filteredArticles.filter(article => levelTerm.filter(val => article.level.indexOf(val) !== -1).length > 0)
filteredArticles = filteredArticles.filter(
article => levelTerm.filter(val => article.level.indexOf(val) !== -1).length > 0
);
}
return filteredArticles;
@@ -55,6 +57,6 @@
},
components: {
ListItem,
}
};
},
};
</script>

16
src/components/User/ProfileData.vue
View File

@@ -63,7 +63,7 @@
</v-radio-group>
<v-text-field
v-if="changeType == 'changeName'"
v-if="changeType === 'changeName'"
prepend-icon="person"
v-model="newName"
name="newName"
@@ -75,7 +75,7 @@
</v-text-field>
<v-text-field
v-if="changeType == 'changeEmail'"
v-if="changeType === 'changeEmail'"
prepend-icon="email"
v-model="newEmail"
name="newLogin"
@@ -87,7 +87,7 @@
</v-text-field>
<v-text-field
v-if="changeType == 'changePassword'"
v-if="changeType === 'changePassword'"
prepend-icon="lock"
v-model="newPassword"
name="newPassword"
@@ -119,10 +119,10 @@
</template>
<script>
import { mapGetters } from 'vuex';
import { emailRules, passwordRules, nameRules, EVENTS } from "@/utils";
import { mapGetters } from 'vuex';
import { emailRules, passwordRules, nameRules, EVENTS } from "@/utils";
export default {
export default {
data: () => ({
email: null,
password: null,
@@ -136,7 +136,7 @@
emailRules,
passwordRules,
nameRules
nameRules,
}),
computed: {
...mapGetters(['userName', 'userEmail', 'getProcessing', 'getError']),
@@ -170,5 +170,5 @@
beforeDestroy() {
this.$bus.$off(EVENTS.USER.DATA_CHANGED);
},
};
};
</script>

2
src/config/firebase.example.js
View File

@@ -4,5 +4,5 @@ export default {
databaseURL: "https://test.firebaseio.com",
projectId: "test",
storageBucket: "test.appspot.com",
messagingSenderId: "test"
messagingSenderId: "test",
};

2
src/main.js
View File

@@ -44,5 +44,5 @@ new Vue({
});
this.$store.dispatch('loadArticles');
}
},
}).$mount('#app');

10
src/router.js
View File

@@ -7,7 +7,7 @@ import Home from '@/views/Home';
Vue.use(Router);
function AuthMiddleware(from, to, next) {
if (Store.getters.isUserAuthentificated) {
if (Store.getters.isUserAuthenticated) {
next();
} else {
next('/sign_in');
@@ -19,7 +19,7 @@ export default new Router({
{
path: '/',
name: 'home',
component: Home
component: Home,
},
{
path: '/articles',
@@ -30,13 +30,13 @@ export default new Router({
path: '/articles/:articleId',
name: 'article',
props: true,
component: () => import(/* webpackChunkName: "articles/article" */ '@/views/Article')
component: () => import(/* webpackChunkName: "articles/article" */ '@/views/Article'),
},
{
path: '/articles/:articleId/part/:partId',
name: 'articlePart',
props: true,
component: () => import(/* webpackChunkName: "articles/article_part" */ '@/views/ArticlePart')
component: () => import(/* webpackChunkName: "articles/article_part" */ '@/views/ArticlePart'),
},
{
path: '/words',
@@ -62,7 +62,7 @@ export default new Router({
{
path: '*',
component: NotFound,
}
},
],
mode: 'history',
});

10
src/store/user.js
View File

@@ -6,7 +6,7 @@ import { EventBus, EVENTS } from '@/utils';
export default {
state: {
user: {
isAuthentificated: false,
isAuthenticated: false,
uid: null,
email: null,
name: null,
@@ -14,12 +14,12 @@ export default {
},
mutations: {
setUser(state, { uid, email }) {
state.user.isAuthentificated = true;
state.user.isAuthenticated = true;
state.user.uid = uid;
state.user.email = email;
},
unSetUser(state) {
state.user.isAuthentificated = false;
state.user.isAuthenticated = false;
state.user.uid = null;
},
setUserName(state, name) {
@@ -27,7 +27,7 @@ export default {
},
setUserEmail(state, email) {
Vue.set(state.user, 'email', email);
}
},
},
actions: {
async signUp({ commit }, payload) {
@@ -123,7 +123,7 @@ export default {
},
},
getters: {
isUserAuthentificated: state => state.user.isAuthentificated,
isUserAuthenticated: state => state.user.isAuthenticated,
userId: state => state.user.uid,
userName: state => state.user.name,
userEmail: state => state.user.email,

4
src/store/userData.js
View File

@@ -44,7 +44,7 @@ export default {
await userDataRef.set({
articles: {
[articleId]: article,
}
},
}, { merge: true })
.then(() => commit('addUserArticle', { articleId, article }))
.catch(e => window.console.error(e));
@@ -67,7 +67,7 @@ export default {
await userDataRef.set({
words: {
[key]: word,
}
},
}, { merge: true })
.then(() => commit('addUserWord', { wordKey: key, word }))
.catch(e => window.console.error(e));

2
src/utils/eventBus.js
View File

@@ -22,4 +22,4 @@ export const setUpEventBus = () => {
},
},
});
}
};

10
src/utils/helpers/formRules.js
View File

@@ -1,13 +1,13 @@
export const emailRules = [
(value) => !!value || 'Пожалуйста, введите email',
(value) => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(value) || 'Неправильный email',
value => !!value || 'Пожалуйста, введите email',
value => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(value) || 'Неправильный email',
];
export const passwordRules = [
(value) => !!value || 'Пожалуйста введите пароль',
(value) => (value && value.length >= 6) || 'Пароль слишком короткий - минимум 6 символов',
value => !!value || 'Пожалуйста введите пароль',
value => (value && value.length >= 6) || 'Пароль слишком короткий - минимум 6 символов',
];
export const nameRules = [
(value) => !!value || 'Пожалуйста введите ваше имя',
value => !!value || 'Пожалуйста введите ваше имя',
];

1
src/utils/index.js
View File

@@ -8,4 +8,3 @@ export const declOfNum = (number, titles) => {
const cases = [2, 0, 1, 1, 1, 2];
return titles[(number % 100 > 4 && number % 100 < 20) ? 2 : cases[(number % 10 < 5) ? number % 10 : 5]];
};

10
src/views/Article.vue
View File

@@ -13,10 +13,10 @@
<script>
import ArticleDetails from '@/components/Article/Details';
import ArticlePartsListItem from '@/components/Article/Part/ListItem';
import ArticleDetails from '@/components/Article/Details';
import ArticlePartsListItem from '@/components/Article/Part/ListItem';
export default {
export default {
props: {
articleId: {
type: String,
@@ -25,12 +25,12 @@
},
computed: {
article() {
return this.$store.getters.getArticles.find(article => article.id == this.articleId);
return this.$store.getters.getArticles.find(article => article.id === this.articleId);
},
},
components: {
ArticleDetails,
ArticlePartsListItem,
},
};
};
</script>

34
src/views/ArticlePart.vue
View File

@@ -58,11 +58,11 @@
</template>
<script>
import Vue from 'vue';
import BookPartContent from '@/components/Article/Part/Content';
import BookPartWords from '@/components/Article/Words';
import Vue from 'vue';
import BookPartContent from '@/components/Article/Part/Content';
import BookPartWords from '@/components/Article/Words';
export default {
export default {
props: {
articleId: {
type: String,
@@ -73,10 +73,11 @@
required: true,
},
},
components: {
BookPartContent,
BookPartWords,
},
data: () => ({
part: null,
finishDialog: false,
rating: 0,
}),
computed: {
currentUserArticle() {
const articles = this.$store.getters.userData.articles;
@@ -115,13 +116,8 @@
rating: this.rating,
});
this.finishDialog = false;
}
},
data: () => ({
part: null,
finishDialog: false,
rating: 0,
}),
},
created() {
const { articleId, partId } = this;
Vue.$db.collection('articleParts')
@@ -131,7 +127,7 @@
.then((querySnapshot) => {
const snapDocs = querySnapshot.docs;
if (snapDocs.length > 0) {
this.part = Object.assign({}, snapDocs[0].data());
this.part = { ...snapDocs[0].data() };
}
})
.then(() => {
@@ -141,6 +137,10 @@
});
})
.catch(e => window.console.error(e));
}
};
},
components: {
BookPartContent,
BookPartWords,
},
};
</script>

6
src/views/Articles.vue
View File

@@ -6,10 +6,10 @@
<script>
import ArticlesList from '@/components/ArticlesList';
export default {
import ArticlesList from '@/components/ArticlesList';
export default {
components: {
ArticlesList,
},
};
};
</script>

6
src/views/Errors/NotFound.vue
View File

@@ -1,4 +1,3 @@
<template>
<div>
<v-alert
@@ -13,10 +12,7 @@
</template>
<script>
export default {
name: 'notFound',
components: {
}
}
};
</script>

5
src/views/Home.vue
View File

@@ -5,10 +5,7 @@
</template>
<script>
export default {
name: 'home',
components: {
}
}
};
</script>

6
src/views/Profile.vue
View File

@@ -28,9 +28,9 @@
<script>
import UserProfileData from '@/components/User/ProfileData';
import UserProfileData from '@/components/User/ProfileData';
export default {
export default {
beforeMount() {
this.$store.commit('clearError');
},
@@ -40,5 +40,5 @@
components: {
UserProfileData,
},
};
};
</script>

21
src/views/SignIn.vue
View File

@@ -42,7 +42,14 @@
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="primary" type="submit" form="sign-in-form" :disabled="isProcessing || !isValid">Войти</v-btn>
<v-btn
color="primary"
type="submit"
form="sign-in-form"
:disabled="isProcessing || !isValid"
>
Войти
</v-btn>
</v-card-actions>
</v-card>
</v-flex>
@@ -52,9 +59,9 @@
</template>
<script>
import { emailRules, passwordRules } from '@/utils';
import { emailRules, passwordRules } from '@/utils';
export default {
export default {
beforeMount() {
this.$store.commit('clearError');
},
@@ -73,12 +80,12 @@
isProcessing() {
return this.$store.getters.getProcessing;
},
isUserAuthentificated() {
return this.$store.getters.isUserAuthentificated;
isUserAuthenticated() {
return this.$store.getters.isUserAuthenticated;
},
},
watch: {
isUserAuthentificated(val) {
isUserAuthenticated(val) {
if (val === true) {
this.$router.push('/');
}
@@ -90,5 +97,5 @@
this.$store.dispatch('signIn', { email, password });
},
},
}
};
</script>

23
src/views/SignUp.vue
View File

@@ -53,7 +53,14 @@
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn type="submit" color="primary" form="sign-up-form" :disabled="isProcessing || !isValid">Зарегистрироваться</v-btn>
<v-btn
type="submit"
color="primary"
form="sign-up-form"
:disabled="isProcessing || !isValid"
>
Зарегистрироваться
</v-btn>
</v-card-actions>
</v-card>
</v-flex>
@@ -63,9 +70,9 @@
</template>
<script>
import { emailRules, passwordRules, nameRules } from '@/utils';
import { emailRules, passwordRules, nameRules } from '@/utils';
export default {
export default {
beforeMount() {
this.$store.commit('clearError');
},
@@ -86,12 +93,12 @@
isProcessing() {
return this.$store.getters.getProcessing;
},
isUserAuthentificated() {
return this.$store.getters.isUserAuthentificated;
}
isUserAuthenticated() {
return this.$store.getters.isUserAuthenticated;
},
},
watch: {
isUserAuthentificated(val) {
isUserAuthenticated(val) {
if (val === true) {
this.$router.push('/');
}
@@ -103,5 +110,5 @@
this.$store.dispatch('signUp', { email, password, name });
},
},
}
};
</script>

5
src/views/Words.vue
View File

@@ -6,7 +6,6 @@
<script>
export default {
}
export default {
};
</script>

9
webpack.config.js Normal file
View File

@@ -0,0 +1,9 @@
const path = require('path');
module.exports = {
resolve: {
alias: {
'@': path.resolve(__dirname, 'src'),
},
},
};

104
yarn.lock
View File

@@ -2306,6 +2306,11 @@ constants-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
contains-path@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
content-disposition@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
@@ -2687,7 +2692,7 @@ debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
dependencies:
ms "^2.1.1"
debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2868,6 +2873,14 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"
doctrine@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
dependencies:
esutils "^2.0.2"
isarray "^1.0.0"
doctrine@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -3055,7 +3068,7 @@ errno@^0.1.3, errno@~0.1.7:
dependencies:
prr "~1.0.1"
error-ex@^1.3.1:
error-ex@^1.2.0, error-ex@^1.3.1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -3109,14 +3122,13 @@ eslint-config-airbnb-base@^13.1.0:
object.assign "^4.1.0"
object.entries "^1.0.4"
eslint-config-airbnb@^17.1.0:
version "17.1.0"
resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz#3964ed4bc198240315ff52030bf8636f42bc4732"
integrity sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw==
eslint-import-resolver-node@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
dependencies:
eslint-config-airbnb-base "^13.1.0"
object.assign "^4.1.0"
object.entries "^1.0.4"
debug "^2.6.9"
resolve "^1.5.0"
eslint-loader@^2.1.1:
version "2.1.2"
@@ -3129,6 +3141,30 @@ eslint-loader@^2.1.1:
object-hash "^1.1.4"
rimraf "^2.6.1"
eslint-module-utils@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
dependencies:
debug "^2.6.8"
pkg-dir "^2.0.0"
eslint-plugin-import@^2.16.0:
version "2.16.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz#97ac3e75d0791c4fac0e15ef388510217be7f66f"
integrity sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==
dependencies:
contains-path "^0.1.0"
debug "^2.6.9"
doctrine "1.5.0"
eslint-import-resolver-node "^0.3.2"
eslint-module-utils "^2.3.0"
has "^1.0.3"
lodash "^4.17.11"
minimatch "^3.0.4"
read-pkg-up "^2.0.0"
resolve "^1.9.0"
eslint-plugin-jsx-a11y@^6.2.1:
version "6.2.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz#4ebba9f339b600ff415ae4166e3e2e008831cf0c"
@@ -3671,7 +3707,7 @@ find-up@^1.0.0:
path-exists "^2.0.0"
pinkie-promise "^2.0.0"
find-up@^2.1.0:
find-up@^2.0.0, find-up@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -4945,6 +4981,16 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"
load-json-file@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
dependencies:
graceful-fs "^4.1.2"
parse-json "^2.2.0"
pify "^2.0.0"
strip-bom "^3.0.0"
loader-fs-cache@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz#56e0bf08bd9708b26a765b68509840c8dec9fdbc"
@@ -5905,6 +5951,13 @@ parse-asn1@^5.0.0:
pbkdf2 "^3.0.3"
safe-buffer "^5.1.1"
parse-json@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
dependencies:
error-ex "^1.2.0"
parse-json@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -5970,6 +6023,13 @@ path-to-regexp@0.1.7:
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
path-type@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
dependencies:
pify "^2.0.0"
path-type@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -6596,6 +6656,23 @@ rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
read-pkg-up@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
dependencies:
find-up "^2.0.0"
read-pkg "^2.0.0"
read-pkg@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
dependencies:
load-json-file "^2.0.0"
normalize-package-data "^2.3.2"
path-type "^2.0.0"
read-pkg@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
@@ -6870,7 +6947,7 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1:
resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
version "1.10.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
@@ -7494,6 +7571,11 @@ strip-ansi@^5.0.0:
dependencies:
ansi-regex "^4.0.0"
strip-bom@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
strip-eof@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"