From 0a01a2bdf0b4a643f2b86e823c5d2cec8d1431b9 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Mon, 28 Nov 2022 12:08:18 +0000 Subject: [PATCH 01/28] Add post expiry inputs --- index.html | 1 + src/components/settings_modal/tabs/profile_tab.js | 7 +++++-- .../settings_modal/tabs/profile_tab.scss | 4 ++++ src/components/settings_modal/tabs/profile_tab.vue | 14 ++++++++++++++ src/i18n/en.json | 2 ++ .../entity_normalizer/entity_normalizer.service.js | 1 + 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 5581c894..5f8735ea 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,7 @@ + diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js index b69cf2f1..c29e8d2a 100644 --- a/src/components/settings_modal/tabs/profile_tab.js +++ b/src/components/settings_modal/tabs/profile_tab.js @@ -43,7 +43,9 @@ const ProfileTab = { bannerPreview: null, background: null, backgroundPreview: null, - emailLanguage: this.$store.state.users.currentUser.language || '' + emailLanguage: this.$store.state.users.currentUser.language || '', + newPostTTLDays: this.$store.state.users.currentUser.status_ttl_days, + expirePosts: this.$store.state.users.currentUser.status_ttl_days !== null, } }, components: { @@ -123,7 +125,8 @@ const ProfileTab = { display_name: this.newName, fields_attributes: this.newFields.filter(el => el != null), bot: this.bot, - show_role: this.showRole + show_role: this.showRole, + status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1 /* eslint-enable camelcase */ } diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss index 201f1a76..8b9a35e1 100644 --- a/src/components/settings_modal/tabs/profile_tab.scss +++ b/src/components/settings_modal/tabs/profile_tab.scss @@ -4,6 +4,10 @@ margin: 0; } + .expire-posts-days { + margin-left: 1em; + } + .visibility-tray { padding-top: 5px; } diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index 642d54ca..8748b685 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -89,6 +89,20 @@ {{ $t('settings.bot') }}

+

+ + {{ $t('settings.expire_posts_enabled') }} + + +

{ output.bot = data.bot if (data.akkoma) { output.instance = data.akkoma.instance + output.status_ttl_days = data.akkoma.status_ttl_days } if (data.pleroma) { From c669701762fe5c470269ed58f70fab0f6489202b Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Tue, 29 Nov 2022 18:04:33 -0300 Subject: [PATCH 02/28] add a left margin on search bar --- src/components/search_bar/search_bar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue index 222f57ba..831c47ae 100644 --- a/src/components/search_bar/search_bar.vue +++ b/src/components/search_bar/search_bar.vue @@ -73,6 +73,7 @@ .search-bar-input { flex: 1 0 auto; + margin-left: 0.5em; } .cancel-search { From 6af1df8befc31af5e55ca90a1d84bc57ab7a71b2 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Fri, 2 Dec 2022 11:27:24 +0000 Subject: [PATCH 03/28] Add logo files --- config/index.js | 5 +++ static/logo-512.png | Bin 0 -> 18688 bytes static/logo.svg | 103 ++++++++++++++------------------------------ 3 files changed, 38 insertions(+), 70 deletions(-) create mode 100755 static/logo-512.png mode change 100644 => 100755 static/logo.svg diff --git a/config/index.js b/config/index.js index 443c4a67..4a21e718 100644 --- a/config/index.js +++ b/config/index.js @@ -38,6 +38,11 @@ module.exports = { assetsSubDirectory: 'static', assetsPublicPath: '/', proxyTable: { + '/manifest.json': { + target, + changeOrigin: true, + cookieDomainRewrite: 'localhost' + }, '/api': { target, changeOrigin: true, diff --git a/static/logo-512.png b/static/logo-512.png new file mode 100755 index 0000000000000000000000000000000000000000..02d36e7ab91556da3572e2cf2879e61ec3bc79f7 GIT binary patch literal 18688 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 TF}&OabR2`HtDnm{r-UW|@S{GM literal 0 HcmV?d00001 diff --git a/static/logo.svg b/static/logo.svg old mode 100644 new mode 100755 index 68e647e6..01ddbadb --- a/static/logo.svg +++ b/static/logo.svg @@ -1,71 +1,34 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + - + + + + + + + + + + \ No newline at end of file From e132814478344eb096ee5fbdb75913b6eab97022 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Fri, 2 Dec 2022 11:56:15 +0000 Subject: [PATCH 04/28] Register serviceworker --- src/main.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main.js b/src/main.js index e4a793f6..a7d9da83 100644 --- a/src/main.js +++ b/src/main.js @@ -51,6 +51,17 @@ const persistedStateOptions = { }; (async () => { + if ('serviceWorker' in navigator) { + // declaring scope manually + navigator.serviceWorker.register('/sw.js', {scope: '/'}).then((registration) => { + console.log('Service worker registration succeeded:', registration); + }, /*catch*/ (error) => { + console.error(`Service worker registration failed: ${error}`); + }); + } else { + console.error('Service workers are not supported.'); + } + let storageError = false const plugins = [pushNotifications] try { From f8f5e1c89b924996a56f015a1a2b722c87f5fb23 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Fri, 2 Dec 2022 11:57:45 +0000 Subject: [PATCH 05/28] fix SW path --- src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index a7d9da83..1fec81a2 100644 --- a/src/main.js +++ b/src/main.js @@ -53,7 +53,7 @@ const persistedStateOptions = { (async () => { if ('serviceWorker' in navigator) { // declaring scope manually - navigator.serviceWorker.register('/sw.js', {scope: '/'}).then((registration) => { + navigator.serviceWorker.register('/sw-pleroma.js', {scope: '/'}).then((registration) => { console.log('Service worker registration succeeded:', registration); }, /*catch*/ (error) => { console.error(`Service worker registration failed: ${error}`); From a3e490edcd3ac676af0703326f79eb6a14d133b5 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Fri, 2 Dec 2022 12:00:30 +0000 Subject: [PATCH 06/28] use cutout of 512 logo --- static/logo-512.png | Bin 18688 -> 18994 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/static/logo-512.png b/static/logo-512.png index 02d36e7ab91556da3572e2cf2879e61ec3bc79f7..c8397e35a1a2a240f419a202efb5677160e534e0 100755 GIT binary patch literal 18994 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 Q34A^j7n2zMOBAp8Z@K~PkN^Mx literal 18688 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 TF}&OabR2`HtDnm{r-UW|@S{GM From 337a30fe01f854c7dd7ff2501619316ff1303a80 Mon Sep 17 00:00:00 2001 From: astra akari Date: Sat, 3 Dec 2022 07:12:55 +0000 Subject: [PATCH 07/28] remove whitespace between scope selector icons when i originally wrote this, for reasons unclear to the present me, i used literal whitespaces to space out the icons on the scope selector this causes strange inconsistencies in spacing depending on the font being used akkoma also did not include the whitespace when adding the local-only scope, resulting in even weirder spacing this corrects all of that by removing the whitespaces and using css instead --- src/components/scope_selector/scope_selector.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue index 6dbf7cb4..64c34fb1 100644 --- a/src/components/scope_selector/scope_selector.vue +++ b/src/components/scope_selector/scope_selector.vue @@ -16,7 +16,6 @@ class="fa-scale-110 fa-old-padding" /> - {{ ' ' }} - {{ ' ' }} - {{ ' ' }} + +

+ +
{ + commit('setTag', { name: tagName, data: tag }) + return tag + }) + }, + followTag (store, tagName) { + return store.rootState.api.backendInteractor.followHashtag({ tag: tagName }) + .then((resp) => { + store.commit('setTag', { name: tagName, data: resp }) + return resp + }) + }, + unfollowTag ({ rootState, commit }, tag) { + return rootState.api.backendInteractor.unfollowHashtag({ tag }) + .then((resp) => { + commit('setTag', { name: tag, data: resp }) + return resp + }) + } + } +} + +export default tags diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index aeb43661..9e6f39f2 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -108,6 +108,9 @@ const PLEROMA_EDIT_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}` const AKKOMA_SETTING_PROFILE_URL = (name) => `/api/v1/akkoma/frontend_settings/pleroma-fe/${name}` const AKKOMA_SETTING_PROFILE_LIST = `/api/v1/akkoma/frontend_settings/pleroma-fe` +const MASTODON_TAG_URL = (name) => `/api/v1/tags/${name}` +const MASTODON_FOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/follow` +const MASTODON_UNFOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/unfollow` const oldfetch = window.fetch @@ -1549,6 +1552,29 @@ const listSettingsProfiles = ({ credentials }) => { }) } +const getHashtag = ({ tag, credentials }) => { + return promisedRequest({ + url: MASTODON_TAG_URL(tag), + credentials + }) +} + +const followHashtag = ({ tag, credentials }) => { + return promisedRequest({ + url: MASTODON_FOLLOW_TAG_URL(tag), + method: 'POST', + credentials + }) +} + +const unfollowHashtag = ({ tag, credentials }) => { + return promisedRequest({ + url: MASTODON_UNFOLLOW_TAG_URL(tag), + method: 'POST', + credentials + }) +} + export const getMastodonSocketURI = ({ credentials, stream, args = {} }) => { return Object.entries({ ...(credentials @@ -1784,7 +1810,10 @@ const apiService = { getReports, updateReportStates, addNoteToReport, - deleteNoteFromReport + deleteNoteFromReport, + getHashtag, + followHashtag, + unfollowHashtag } export default apiService From b68e968bf971bed7fe7c9e6e48c5c4df97ac47ab Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Tue, 6 Dec 2022 15:26:16 +0000 Subject: [PATCH 09/28] Add ability to include custom CSS --- index.html | 1 + static/custom.css | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 static/custom.css diff --git a/index.html b/index.html index 5f8735ea..79613dd2 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,7 @@ + diff --git a/static/custom.css b/static/custom.css new file mode 100644 index 00000000..93f380f0 --- /dev/null +++ b/static/custom.css @@ -0,0 +1,4 @@ +/* THIS IS A PLACEHOLDER FILE + place a css file at $static_dir/static/custom.css + to apply custom styles to your frontend +*/ From 17e574b173cab2ab3f426e9f7ae49cce9081fac8 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Tue, 6 Dec 2022 15:55:39 +0000 Subject: [PATCH 10/28] Move theme apply/reset to new row Fixes #225 --- .../settings_modal/settings_modal.scss | 4 +++ .../settings_modal/settings_modal.vue | 13 ++++---- .../tabs/theme_tab/theme_tab.scss | 5 ++-- .../tabs/theme_tab/theme_tab.vue | 30 ++++++++++--------- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss index 70b63360..15dae7fd 100644 --- a/src/components/settings_modal/settings_modal.scss +++ b/src/components/settings_modal/settings_modal.scss @@ -76,6 +76,10 @@ position: absolute; right: 20px; padding-right: 10px; + + @media all and (max-width: 800px) { + display: none; + } } } } diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue index 03c9978e..7cd493e4 100644 --- a/src/components/settings_modal/settings_modal.vue +++ b/src/components/settings_modal/settings_modal.vue @@ -44,6 +44,10 @@
+
-