From 8f3926a096cafb6d61054cb5918cbe7de9f5bf3c Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 23 Dec 2017 11:31:43 +0200 Subject: Detect backend. --- src/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main.js b/src/main.js index 1540c218..2dd6aed1 100644 --- a/src/main.js +++ b/src/main.js @@ -137,8 +137,11 @@ window.fetch('/api/pleroma/emoji.json') return { shortcode: key, image_url: values[key] } }) store.dispatch('setOption', { name: 'emoji', value: emoji }) + store.dispatch('setOption', { name: 'pleromaBackend', value: true }) }, - (failure) => {} + (failure) => { + store.dispatch('setOption', { name: 'pleromaBackend', value: false }) + } ), (error) => console.log(error) ) -- cgit v1.2.3-70-g09d2 From a058941aedcfe6a3e14e245b7270477a7a6e69be Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 23 Dec 2017 16:44:22 +0200 Subject: Add follow import to user settings. --- src/components/user_settings/user_settings.js | 31 +++++++++++++++++++++- src/components/user_settings/user_settings.vue | 17 ++++++++++++ src/i18n/messages.js | 6 ++++- src/services/api/api.service.js | 13 ++++++++- .../backend_interactor_service.js | 4 ++- 5 files changed, 67 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index fd20a6ad..25ee1f35 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -5,7 +5,10 @@ const UserSettings = { return { newname: this.$store.state.users.currentUser.name, newbio: this.$store.state.users.currentUser.description, - uploading: [ false, false, false ], + followList: null, + followImportError: false, + followsImported: false, + uploading: [ false, false, false, false ], previews: [ null, null, null ] } }, @@ -15,6 +18,9 @@ const UserSettings = { computed: { user () { return this.$store.state.users.currentUser + }, + pleromaBackend () { + return this.$store.state.config.pleromaBackend } }, methods: { @@ -117,6 +123,29 @@ const UserSettings = { } this.uploading[2] = false }) + }, + importFollows () { + this.uploading[3] = true + const followList = this.followList + this.$store.state.api.backendInteractor.followImport({params: followList}) + .then((status) => { + if (status) { + this.followsImported = true + } else { + this.followImportError = true + } + this.uploading[3] = false + }) + }, + followListChange () { + // eslint-disable-next-line no-undef + let formData = new FormData() + formData.append('list', this.$refs.followlist.files[0]) + this.followList = formData + }, + dismissImported () { + this.followsImported = false + this.followImportError = false } } } diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index 515fd253..da78cdc2 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -49,6 +49,23 @@ +
+

{{$t('settings.follow_import')}}

+

{{$t('settings.import_followers_from_a_csv_file')}}

+
+ +
+ + +
+ +

{{$t('settings.follows_imported')}}

+
+
+ +

{{$t('settings.follow_import_error')}}

+
+
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 4c5be151..360f9eb8 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -242,7 +242,11 @@ const en = { nsfw_clickthrough: 'Enable clickthrough NSFW attachment hiding', autoload: 'Enable automatic loading when scrolled to the bottom', streaming: 'Enable automatic streaming of new posts when scrolled to the top', - reply_link_preview: 'Enable reply-link preview on mouse hover' + reply_link_preview: 'Enable reply-link preview on mouse hover', + follow_import: 'Follow import', + import_followers_from_a_csv_file: 'Import followers from a csv file', + follows_imported: 'Follows imported! Processing them will take a while.', + follow_import_error: 'Error importing followers' }, notifications: { notifications: 'Notifications', diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 5b078bc8..1f5b3ad2 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -29,6 +29,7 @@ const QVITTER_USER_TIMELINE_URL = '/api/qvitter/statuses/user_timeline.json' const BLOCKING_URL = '/api/blocks/create.json' const UNBLOCKING_URL = '/api/blocks/destroy.json' const USER_URL = '/api/users/show.json' +const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import' import { each, map } from 'lodash' import 'whatwg-fetch' @@ -362,6 +363,15 @@ const uploadMedia = ({formData, credentials}) => { .then((text) => (new DOMParser()).parseFromString(text, 'application/xml')) } +const followImport = ({params, credentials}) => { + return fetch(FOLLOW_IMPORT_URL, { + body: params, + method: 'POST', + headers: authHeaders(credentials) + }) + .then((response) => response.ok) +} + const fetchMutes = ({credentials}) => { const url = '/api/qvitter/mutes.json' @@ -396,7 +406,8 @@ const apiService = { updateBg, updateProfile, updateBanner, - externalProfile + externalProfile, + followImport } export default apiService diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js index ddaae3b2..52b8286b 100644 --- a/src/services/backend_interactor_service/backend_interactor_service.js +++ b/src/services/backend_interactor_service/backend_interactor_service.js @@ -59,6 +59,7 @@ const backendInteractorService = (credentials) => { const updateProfile = ({params}) => apiService.updateProfile({credentials, params}) const externalProfile = (profileUrl) => apiService.externalProfile({profileUrl, credentials}) + const followImport = ({params}) => apiService.followImport({params, credentials}) const backendInteractorServiceInstance = { fetchStatus, @@ -80,7 +81,8 @@ const backendInteractorService = (credentials) => { updateBg, updateBanner, updateProfile, - externalProfile + externalProfile, + followImport } return backendInteractorServiceInstance -- cgit v1.2.3-70-g09d2 From 235c1c26519a74c9482e916f0d4af992c47ebfc4 Mon Sep 17 00:00:00 2001 From: Sebastian Huebner Date: Wed, 3 Jan 2018 11:40:30 +0100 Subject: update ger translation --- src/i18n/messages.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 360f9eb8..f0953a10 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -58,7 +58,11 @@ const de = { nsfw_clickthrough: 'Aktiviere ausblendbares Overlay für als NSFW markierte Anhänge', autoload: 'Aktiviere automatisches Laden von älteren Beiträgen beim scrollen', streaming: 'Aktiviere automatisches Laden (Streaming) von neuen Beiträgen', - reply_link_preview: 'Aktiviere reply-link Vorschau bei Maus-Hover' + reply_link_preview: 'Aktiviere reply-link Vorschau bei Maus-Hover', + follow_import: 'Folgeliste importieren', + import_followers_from_a_csv_file: 'Importiere Kontakte, denen du folgen möchtest, aus einer CSV-Datei', + follows_imported: 'Folgeliste importiert! Die Bearbeitung kann eine Zeit lang dauern.', + follow_import_error: 'Fehler beim importieren der Folgeliste' }, notifications: { notifications: 'Benachrichtigungen', -- cgit v1.2.3-70-g09d2 From 92289e545a62bd28ea336c5d712a05445e0e20ab Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Fri, 26 Jan 2018 15:11:34 +0100 Subject: Move chat to sidebar. --- package.json | 1 + src/App.js | 7 ++-- src/App.vue | 1 + src/components/chat/chat.js | 21 ------------ src/components/chat/chat.vue | 59 -------------------------------- src/components/chat_panel/chat_panel.js | 21 ++++++++++++ src/components/chat_panel/chat_panel.vue | 58 +++++++++++++++++++++++++++++++ src/components/nav_panel/nav_panel.vue | 5 --- src/main.js | 7 ++-- yarn.lock | 8 ++++- 10 files changed, 97 insertions(+), 91 deletions(-) delete mode 100644 src/components/chat/chat.js delete mode 100644 src/components/chat/chat.vue create mode 100644 src/components/chat_panel/chat_panel.js create mode 100644 src/components/chat_panel/chat_panel.vue (limited to 'src') diff --git a/package.json b/package.json index 4e98647b..3a807a6c 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "sanitize-html": "^1.13.0", "sass-loader": "^4.0.2", "vue": "^2.3.4", + "vue-chat-scroll": "^1.2.1", "vue-i18n": "^7.3.2", "vue-router": "^2.5.3", "vue-template-compiler": "^2.3.4", diff --git a/src/App.js b/src/App.js index 1da3ff7c..0636c47d 100644 --- a/src/App.js +++ b/src/App.js @@ -2,6 +2,7 @@ import UserPanel from './components/user_panel/user_panel.vue' import NavPanel from './components/nav_panel/nav_panel.vue' import Notifications from './components/notifications/notifications.vue' import UserFinder from './components/user_finder/user_finder.vue' +import ChatPanel from './components/chat_panel/chat_panel.vue' export default { name: 'app', @@ -9,7 +10,8 @@ export default { UserPanel, NavPanel, Notifications, - UserFinder + UserFinder, + ChatPanel }, data: () => ({ mobileActivePanel: 'timeline' @@ -21,7 +23,8 @@ export default { }, logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } }, style () { return { 'background-image': `url(${this.background})` } }, - sitename () { return this.$store.state.config.name } + sitename () { return this.$store.state.config.name }, + chat () { return this.$store.state.chat.channel } }, methods: { activatePanel (panelName) { diff --git a/src/App.vue b/src/App.vue index 74a18dc7..ec403519 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,6 +23,7 @@
+
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js deleted file mode 100644 index ef326d4a..00000000 --- a/src/components/chat/chat.js +++ /dev/null @@ -1,21 +0,0 @@ -const chat = { - data () { - return { - currentMessage: '', - channel: null - } - }, - computed: { - messages () { - return this.$store.state.chat.messages - } - }, - methods: { - submit (message) { - this.$store.state.chat.channel.push('new_msg', {text: message}, 10000) - this.currentMessage = '' - } - } -} - -export default chat diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue deleted file mode 100644 index 6c1e2c38..00000000 --- a/src/components/chat/chat.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js new file mode 100644 index 00000000..b146c5d9 --- /dev/null +++ b/src/components/chat_panel/chat_panel.js @@ -0,0 +1,21 @@ +const chatPanel = { + data () { + return { + currentMessage: '', + channel: null + } + }, + computed: { + messages () { + return this.$store.state.chat.messages + } + }, + methods: { + submit (message) { + this.$store.state.chat.channel.push('new_msg', {text: message}, 10000) + this.currentMessage = '' + } + } +} + +export default chatPanel diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue new file mode 100644 index 00000000..ec379db5 --- /dev/null +++ b/src/components/chat_panel/chat_panel.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index ccc772a8..aea841e9 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -7,11 +7,6 @@ {{ $t("nav.timeline") }} -
  • - - {{ $t("nav.chat") }} - -
  • {{ $t("nav.mentions") }} diff --git a/src/main.js b/src/main.js index 2dd6aed1..de74511b 100644 --- a/src/main.js +++ b/src/main.js @@ -12,7 +12,6 @@ import UserProfile from './components/user_profile/user_profile.vue' import Settings from './components/settings/settings.vue' import Registration from './components/registration/registration.vue' import UserSettings from './components/user_settings/user_settings.vue' -import Chat from './components/chat/chat.vue' import statusesModule from './modules/statuses.js' import usersModule from './modules/users.js' @@ -27,6 +26,8 @@ import createPersistedState from './lib/persisted_state.js' import messages from './i18n/messages.js' +import VueChatScroll from 'vue-chat-scroll' + const currentLocale = (window.navigator.language || 'en').split('-')[0] Vue.use(Vuex) @@ -39,6 +40,7 @@ Vue.use(VueTimeago, { } }) Vue.use(VueI18n) +Vue.use(VueChatScroll) const persistedStateOptions = { paths: [ @@ -97,8 +99,7 @@ window.fetch('/static/config.json') { name: 'mentions', path: '/:username/mentions', component: Mentions }, { name: 'settings', path: '/settings', component: Settings }, { name: 'registration', path: '/registration', component: Registration }, - { name: 'user-settings', path: '/user-settings', component: UserSettings }, - { name: 'chat', path: '/chat', component: Chat } + { name: 'user-settings', path: '/user-settings', component: UserSettings } ] const router = new VueRouter({ diff --git a/yarn.lock b/yarn.lock index 3fcd29ab..13a7b1e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5696,6 +5696,12 @@ void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" +vue-chat-scroll@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/vue-chat-scroll/-/vue-chat-scroll-1.2.1.tgz#54f123004b887d91f2f7fb69b9bebdf6f61ea9b4" + dependencies: + vue "^2.1.10" + vue-hot-reload-api@^2.0.1: version "2.0.9" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.0.9.tgz#2e8cfbfc8e531eea57d8c1f0bd761047c7e11b56" @@ -5747,7 +5753,7 @@ vue-timeago@^3.1.2: version "3.2.0" resolved "https://registry.yarnpkg.com/vue-timeago/-/vue-timeago-3.2.0.tgz#73fd0635de6ea4ecfbbce035b2e44035d806fba1" -vue@^2.3.4: +vue@^2.1.10, vue@^2.3.4: version "2.3.4" resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.4.tgz#5ec3b87a191da8090bbef56b7cfabd4158038171" -- cgit v1.2.3-70-g09d2