Compare commits

...

20 Commits

Author SHA1 Message Date
Roger Braun 9c68acaa48 Add updateAvatar back in. 2017-08-21 17:05:12 +02:00
Roger Braun 43320cff9d Merge branch 'develop' into feature/pleroma-be 2017-08-21 17:02:50 +02:00
Roger Braun d3d58c25e7 Merge branch 'develop' into feature/pleroma-be 2017-07-29 19:10:40 +02:00
Roger Braun 5ce010cacf Merge branch 'develop' into feature/pleroma-be 2017-07-29 18:54:28 +02:00
Roger Braun 496bca9e7a Merge branch 'develop' into feature/pleroma-be 2017-07-28 11:21:09 +02:00
Roger Braun c7e477ebb6 Throttle getReplies so it isn't called that often. 2017-07-28 11:19:56 +02:00
Roger Braun 22469d80e7 Add MRN updating api. 2017-07-02 15:30:24 +02:00
Roger Braun f74ca19d14 Try logging in with the existing cookie. 2017-07-02 13:07:35 +02:00
Roger Braun fd4468a57f Merge branch 'develop' into feature/pleroma-be 2017-07-02 12:44:55 +02:00
Roger Braun e874e2dc7d Merge remote-tracking branch 'origin/develop' into feature/pleroma-be 2017-06-24 19:59:05 +02:00
Roger Braun 444513694a Merge branch 'develop' into feature/pleroma-be 2017-06-18 19:20:23 +02:00
Roger Braun f18445967f Merge branch 'feature/pleroma-be' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/pleroma-be 2017-06-16 09:30:35 +02:00
Roger Braun 93d6f424a0 Fix linter error. 2017-06-12 17:38:43 +02:00
Roger Braun 05ff878467 Merge branch 'develop' into feature/pleroma-be 2017-06-12 17:35:44 +02:00
Roger Braun 00b884ae0b Merge branch 'feature/user-timelines-second-try' into feature/pleroma-be 2017-06-12 17:08:47 +02:00
Roger Braun 21f7e8e1f0 Merge branch 'develop' into feature/pleroma-be 2017-06-07 20:42:21 +02:00
Roger Braun a26debded1 Merge branch 'develop' into feature/pleroma-be 2017-06-05 13:06:02 +02:00
Roger Braun 0265e83e06 Merge branch 'develop' into feature/pleroma-be 2017-06-04 10:24:16 +02:00
Roger Braun a0d258f75b Merge branch 'develop' into feature/pleroma-be 2017-06-01 17:55:39 +02:00
Roger Braun 3c20069902 Merge branch 'feature/registration' into feature/pleroma-be 2017-05-12 19:03:39 +02:00
6 changed files with 25 additions and 7 deletions

View File

@ -23,7 +23,7 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/api': {
target: 'https://social.heldscal.la/',
target: 'https://pleroma.soykaf.com/',
changeOrigin: true,
cookieDomainRewrite: 'localhost'
}

View File

@ -51,6 +51,9 @@ export default function createPersistedState ({
merge({}, store.state, savedState)
)
}
if (store.state.users.lastLoginName) {
store.dispatch('loginUser', {username: store.state.users.lastLoginName, password: 'xxx'})
}
loaded = true
} catch (e) {
console.log("Couldn't load state")

View File

@ -38,8 +38,7 @@ const persistedStateOptions = {
'config.autoLoad',
'config.hoverPreview',
'config.muteWords',
'statuses.notifications',
'users.users'
'users.lastLoginName'
]
}

View File

@ -24,10 +24,12 @@ export const mutations = {
set(user, 'muted', muted)
},
setCurrentUser (state, user) {
state.lastLoginName = user.screen_name
state.currentUser = merge(state.currentUser || {}, user)
},
clearCurrentUser (state) {
state.currentUser = false
state.lastLoginName = false
},
beginLogin (state) {
state.loggingIn = true
@ -44,6 +46,7 @@ export const mutations = {
}
export const defaultState = {
lastLoginName: false,
currentUser: false,
loggingIn: false,
users: [],

View File

@ -24,6 +24,7 @@ const BANNER_UPDATE_URL = '/api/account/update_profile_banner.json'
const PROFILE_UPDATE_URL = '/api/account/update_profile.json'
const EXTERNAL_PROFILE_URL = '/api/externalprofile/show.json'
const QVITTER_USER_TIMELINE_URL = '/api/qvitter/statuses/user_timeline.json'
const MRN_URL = '/api/account/most_recent_notification.json'
// const USER_URL = '/api/users/show.json'
import { each, map } from 'lodash'
@ -34,6 +35,7 @@ const oldfetch = window.fetch
let fetch = (url, options) => {
const baseUrl = ''
const fullUrl = baseUrl + url
options.credentials = 'include'
return oldfetch(fullUrl, options)
}
@ -179,6 +181,14 @@ const unfollowUser = ({id, credentials}) => {
}).then((data) => data.json())
}
const updateMRN = ({id, credentials}) => {
let url = `${MRN_URL}?id=${id}`
return fetch(url, {
headers: authHeaders(credentials),
method: 'POST'
}).then((data) => data.json())
}
const fetchFriends = ({credentials}) => {
return fetch(FRIENDS_URL, { headers: authHeaders(credentials) })
.then((data) => data.json())
@ -337,12 +347,13 @@ const apiService = {
fetchAllFollowing,
setUserMute,
fetchMutes,
externalProfile,
register,
updateAvatar,
updateMRN,
updateBg,
updateProfile,
updateBanner,
externalProfile
updateBanner
}
export default apiService

View File

@ -43,6 +43,7 @@ const backendInteractorService = (credentials) => {
const updateProfile = ({params}) => apiService.updateProfile({credentials, params})
const externalProfile = (profileUrl) => apiService.externalProfile(profileUrl)
const updateMRN = ({id}) => apiService.updateMRN({credentials, id})
const backendInteractorServiceInstance = {
fetchStatus,
@ -55,12 +56,13 @@ const backendInteractorService = (credentials) => {
startFetching,
setUserMute,
fetchMutes,
externalProfile,
register,
updateMRN,
updateAvatar,
updateBg,
updateBanner,
updateProfile,
externalProfile
updateProfile
}
return backendInteractorServiceInstance