From 6c8fc99d5a602cb0a38dc0bdbe906e228a6a7cc7 Mon Sep 17 00:00:00 2001 From: shpuld Date: Thu, 9 Mar 2017 01:09:23 +0200 Subject: Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses. --- src/services/style_setter/style_setter.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/services') diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 7129852d..59d5a7de 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -45,6 +45,7 @@ const setStyle = (href, commit) => { styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max') styleSheet.insertRule(`body { color: ${colors['base05']}`, 'index-max') styleSheet.insertRule(`.base05-border { border-color: ${colors['base05']}`, 'index-max') + styleSheet.insertRule(`.base03-border { border-color: ${colors['base03']}`, 'index-max') body.style.display = 'initial' } cssEl.addEventListener('load', setDynamic) -- cgit v1.2.3-70-g09d2 From e064d2da4de67ad42268f8eea0efd20646b3cb16 Mon Sep 17 00:00:00 2001 From: wakarimasen Date: Thu, 9 Mar 2017 13:38:32 +0100 Subject: Use one error variable for all timelines --- src/components/timeline/timeline.js | 3 +++ src/components/timeline/timeline.vue | 6 +++--- src/modules/statuses.js | 21 +++++++++------------ .../timeline_fetcher/timeline_fetcher.service.js | 13 ++----------- 4 files changed, 17 insertions(+), 26 deletions(-) (limited to 'src/services') diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index b4e80fe1..d5a9adcc 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -8,6 +8,9 @@ const Timeline = { 'timelineName', 'title' ], + computed: { + timelineError () { return this.$store.state.statuses.error } + }, components: { Status, StatusOrConversation diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index ac074f3c..b1ff327b 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -4,13 +4,13 @@
{{title}}
- - - diff --git a/src/modules/statuses.js b/src/modules/statuses.js index e4528520..051ec71b 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -8,6 +8,7 @@ export const defaultState = { maxId: 0, notifications: [], favorites: new Set(), + error: false, timelines: { mentions: { statuses: [], @@ -18,8 +19,7 @@ export const defaultState = { newStatusCount: 0, maxId: 0, minVisibleId: 0, - loading: false, - error: false + loading: false }, public: { statuses: [], @@ -30,8 +30,7 @@ export const defaultState = { newStatusCount: 0, maxId: 0, minVisibleId: 0, - loading: false, - error: false + loading: false }, publicAndExternal: { statuses: [], @@ -42,8 +41,7 @@ export const defaultState = { newStatusCount: 0, maxId: 0, minVisibleId: 0, - loading: false, - error: false + loading: false }, friends: { statuses: [], @@ -54,8 +52,7 @@ export const defaultState = { newStatusCount: 0, maxId: 0, minVisibleId: 0, - loading: false, - error: false + loading: false } } } @@ -298,8 +295,8 @@ export const mutations = { const newStatus = state.allStatusesObject[id] newStatus.nsfw = nsfw }, - setError (state, { timeline, value }) { - state.timelines[timeline].error = value + setError (state, { value }) { + state.error = value }, markNotificationsAsSeen (state, notifications) { each(notifications, (notification) => { @@ -314,8 +311,8 @@ const statuses = { addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false }) { commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser }) }, - setError ({ rootState, commit }, { timeline, value }) { - commit('setError', { timeline, value }) + setError ({ rootState, commit }, { value }) { + commit('setError', { value }) }, deleteStatus ({ rootState, commit }, status) { commit('setDeleted', { status }) diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index e684a170..24aef069 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -5,7 +5,7 @@ import apiService from '../api/api.service.js' const update = ({store, statuses, timeline, showImmediately}) => { const ccTimeline = camelCase(timeline) - setError({store, timeline, value: false}) + store.dispatch('setError', { value: false }) store.dispatch('addNewStatuses', { timeline: ccTimeline, @@ -14,15 +14,6 @@ const update = ({store, statuses, timeline, showImmediately}) => { }) } -const setError = ({store, timeline, value}) => { - const ccTimeline = camelCase(timeline) - - store.dispatch('setError', { - timeline: ccTimeline, - value - }) -} - const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false}) => { const args = { timeline, credentials } const rootState = store.rootState || store.state @@ -36,7 +27,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false return apiService.fetchTimeline(args) .then((statuses) => update({store, statuses, timeline, showImmediately}), - () => setError({store, timeline, value: true})) + () => store.dispatch('setError', { value: true })) } const startFetching = ({ timeline = 'friends', credentials, store }) => { -- cgit v1.2.3-70-g09d2 From bfd530aaea75ab228d3ccc531de790cef2ddf332 Mon Sep 17 00:00:00 2001 From: wakarimasen Date: Thu, 9 Mar 2017 18:20:16 +0100 Subject: Let timeline component fetch mentions --- src/components/mentions/mentions.js | 13 ------------- src/services/api/api.service.js | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'src/services') diff --git a/src/components/mentions/mentions.js b/src/components/mentions/mentions.js index 46a1c63e..841d5aa4 100644 --- a/src/components/mentions/mentions.js +++ b/src/components/mentions/mentions.js @@ -2,25 +2,12 @@ import Timeline from '../timeline/timeline.vue' const Mentions = { computed: { - username () { - return this.$route.params.username - }, timeline () { return this.$store.state.statuses.timelines.mentions } }, components: { Timeline - }, - created () { - this.$store.state.api.backendInteractor.fetchMentions({username: this.username}) - .then((mentions) => { - this.$store.dispatch('addNewStatuses', { - statuses: mentions, - timeline: 'mentions', - showImmediately: true - }) - }) } } diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index f172f769..86ae7f70 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -100,6 +100,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false}) => const timelineUrls = { public: PUBLIC_TIMELINE_URL, friends: FRIENDS_TIMELINE_URL, + mentions: MENTIONS_URL, 'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL } -- cgit v1.2.3-70-g09d2 From d669c37f13409bf3ab57ccdf100c5ef860861e36 Mon Sep 17 00:00:00 2001 From: wakarimasen Date: Thu, 9 Mar 2017 18:21:42 +0100 Subject: Remove unused fetchMentions() --- src/services/api/api.service.js | 7 ------- .../backend_interactor_service/backend_interactor_service.js | 5 ----- 2 files changed, 12 deletions(-) (limited to 'src/services') diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 86ae7f70..4dfc0a02 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -62,12 +62,6 @@ const fetchAllFollowing = ({username, credentials}) => { .then((data) => data.json()) } -const fetchMentions = ({username, sinceId = 0, credentials}) => { - let url = `${MENTIONS_URL}?since_id=${sinceId}&screen_name=${username}` - return fetch(url, { headers: authHeaders(credentials) }) - .then((data) => data.json()) -} - const fetchConversation = ({id, credentials}) => { let url = `${CONVERSATION_URL}/${id}.json?count=100` return fetch(url, { headers: authHeaders(credentials) }) @@ -193,7 +187,6 @@ const apiService = { fetchTimeline, fetchConversation, fetchStatus, - fetchMentions, fetchFriends, followUser, unfollowUser, diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js index d379e602..bc68d02c 100644 --- a/src/services/backend_interactor_service/backend_interactor_service.js +++ b/src/services/backend_interactor_service/backend_interactor_service.js @@ -10,10 +10,6 @@ const backendInteractorService = (credentials) => { return apiService.fetchConversation({id, credentials}) } - const fetchMentions = ({sinceId, username}) => { - return apiService.fetchMentions({sinceId, username, credentials}) - } - const fetchFriends = () => { return apiService.fetchFriends({credentials}) } @@ -43,7 +39,6 @@ const backendInteractorService = (credentials) => { const backendInteractorServiceInstance = { fetchStatus, fetchConversation, - fetchMentions, fetchFriends, followUser, unfollowUser, -- cgit v1.2.3-70-g09d2