Skip to content

Commit 2d4476f

Browse files
authored
Merge pull request #106 from BinaryStudioAcademy/feature/upgrade_frontend_dependencies
Upgrade front-end dependencies
2 parents cdd58c8 + abe55ee commit 2d4476f

File tree

9 files changed

+3402
-3170
lines changed

9 files changed

+3402
-3170
lines changed

frontend/package.json

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,29 @@
99
"now-build": "vue-cli-service build"
1010
},
1111
"dependencies": {
12-
"@fortawesome/fontawesome-svg-core": "^1.2.17",
13-
"@fortawesome/free-brands-svg-icons": "^5.8.1",
14-
"@fortawesome/free-solid-svg-icons": "^5.8.1",
15-
"@fortawesome/vue-fontawesome": "^0.1.6",
16-
"axios": "^0.18.1",
17-
"buefy": "^0.7.4",
18-
"core-js": "^2.6.5",
19-
"moment": "^2.24.0",
20-
"pusher-js": "^4.4.0",
21-
"vue": "^2.6.6",
22-
"vue-infinite-loading": "^2.4.4",
23-
"vue-router": "^3.0.1",
24-
"vuex": "^3.0.1"
12+
"@fortawesome/fontawesome-svg-core": "^1.2.28",
13+
"@fortawesome/free-brands-svg-icons": "^5.13.0",
14+
"@fortawesome/free-solid-svg-icons": "^5.13.0",
15+
"@fortawesome/vue-fontawesome": "^0.1.9",
16+
"axios": "^0.19.2",
17+
"buefy": "^0.8.18",
18+
"moment": "^2.25.3",
19+
"pusher-js": "^6.0.3",
20+
"vue": "^2.6.11",
21+
"vue-infinite-loading": "^2.4.5",
22+
"vue-router": "^3.1.6",
23+
"vuex": "^3.4.0"
2524
},
2625
"devDependencies": {
27-
"@vue/cli-plugin-babel": "^3.5.0",
28-
"@vue/cli-plugin-eslint": "^3.5.0",
29-
"@vue/cli-service": "^3.5.0",
30-
"@vue/eslint-config-airbnb": "^4.0.0",
31-
"babel-eslint": "^10.0.1",
32-
"eslint": "^5.8.0",
33-
"eslint-plugin-vue": "^5.0.0",
34-
"fibers": "^3.1.1",
35-
"sass": "^1.17.2",
36-
"sass-loader": "^7.1.0",
37-
"vue-template-compiler": "^2.5.21"
26+
"@vue/cli-plugin-babel": "^4.3.1",
27+
"@vue/cli-plugin-eslint": "^4.3.1",
28+
"@vue/cli-service": "^4.3.1",
29+
"@vue/eslint-config-airbnb": "^5.0.2",
30+
"babel-eslint": "^10.1.0",
31+
"eslint": "^7.0.0",
32+
"eslint-plugin-vue": "^6.2.2",
33+
"sass": "^1.26.5",
34+
"sass-loader": "^8.0.2",
35+
"vue-template-compiler": "^2.6.11"
3836
}
3937
}

frontend/src/components/view/feed/FeedContainer.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
<script>
2626
import { mapGetters, mapActions } from 'vuex';
27-
import TweetPreviewList from '../../common/TweetPreviewList.vue';
28-
import NewTweetForm from './NewTweetForm.vue';
27+
import TweetPreviewList from '@/components/common/TweetPreviewList.vue';
2928
import { pusher } from '@/services/Pusher';
3029
import { SET_TWEET } from '@/store/modules/tweet/mutationTypes';
3130
import showStatusToast from '@/components/mixin/showStatusToast';
31+
import NewTweetForm from './NewTweetForm.vue';
3232
3333
export default {
3434
name: 'FeedContainer',

frontend/src/store/modules/auth/actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import api from '@/api/Api';
12
import { USER_LOGIN, SET_AUTHENTICATED_USER, USER_LOGOUT } from './mutationTypes';
23
import { SET_LOADING } from '../../mutationTypes';
3-
import api from '@/api/Api';
44

55
export default {
66
async signIn({ commit }, { email, password }) {

frontend/src/store/modules/auth/mutations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { USER_LOGIN, USER_LOGOUT, SET_AUTHENTICATED_USER } from './mutationTypes';
21
import Storage from '@/services/Storage';
32
import { emptyUser, userMapper } from '@/services/Normalizer';
43
import { updateSocketAuthToken, removeSocketAuthToken } from '@/services/Pusher';
4+
import { USER_LOGIN, USER_LOGOUT, SET_AUTHENTICATED_USER } from './mutationTypes';
55

66
export default {
77
[USER_LOGIN]: (state, { accessToken, tokenType }) => {

frontend/src/store/modules/comment/actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import api from '@/api/Api';
2+
import { commentMapper } from '@/services/Normalizer';
23
import { SET_LOADING } from '../../mutationTypes';
34
import { SET_COMMENTS, ADD_COMMENT } from './mutationTypes';
45
import { INCREMENT_COMMENTS_COUNT } from '../tweet/mutationTypes';
5-
import { commentMapper } from '@/services/Normalizer';
66

77
export default {
88
async fetchComments({ commit }, tweetId) {

frontend/src/store/modules/comment/mutations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { SET_COMMENTS, ADD_COMMENT } from './mutationTypes';
21
import { commentMapper } from '@/services/Normalizer';
2+
import { SET_COMMENTS, ADD_COMMENT } from './mutationTypes';
33

44
export default {
55
[SET_COMMENTS]: (state, comments) => {

frontend/src/store/modules/tweet/actions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import api from '@/api/Api';
2+
import { tweetMapper } from '@/services/Normalizer';
13
import {
24
SET_TWEETS,
35
SET_TWEET_IMAGE,
@@ -7,8 +9,6 @@ import {
79
DISLIKE_TWEET
810
} from './mutationTypes';
911
import { SET_LOADING } from '../../mutationTypes';
10-
import api from '@/api/Api';
11-
import { tweetMapper } from '@/services/Normalizer';
1212

1313
export default {
1414
async fetchTweets({ commit }, { page }) {

frontend/src/store/modules/tweet/mutations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { tweetMapper } from '@/services/Normalizer';
12
import {
23
SET_TWEETS,
34
SET_TWEET_IMAGE,
@@ -7,7 +8,6 @@ import {
78
LIKE_TWEET,
89
DISLIKE_TWEET
910
} from './mutationTypes';
10-
import { tweetMapper } from '@/services/Normalizer';
1111

1212
export default {
1313
[SET_TWEETS]: (state, tweets) => {

0 commit comments

Comments
 (0)