From da491f3278214fd56e3485d0ac162e92bf1b89ae Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 29 Dec 2022 15:17:35 +0000 Subject: [PATCH 01/14] add verification of links --- src/components/user_profile/user_profile.js | 6 ++++-- src/components/user_profile/user_profile.vue | 14 ++++++++++++++ src/i18n/en.json | 3 ++- .../entity_normalizer/entity_normalizer.service.js | 7 +++++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 42c5ec9e..8fba1a28 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -10,11 +10,13 @@ import withLoadMore from '../../hocs/with_load_more/with_load_more' import { debounce } from 'lodash' import { library } from '@fortawesome/fontawesome-svg-core' import { - faCircleNotch + faCircleNotch, + faCircleCheck } from '@fortawesome/free-solid-svg-icons' library.add( - faCircleNotch + faCircleNotch, + faCircleCheck ) const FollowerList = withLoadMore({ diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index d16483e2..4e0d0b0f 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -37,6 +37,15 @@ :html="field.value" :emoji="user.emoji" /> + + + @@ -225,6 +234,11 @@ padding: 0.5em 1.5em; box-sizing: border-box; } + + .user-profile-field-validated { + margin-left: 1rem; + color: green; + } } } diff --git a/src/i18n/en.json b/src/i18n/en.json index 32785561..6fbac399 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1183,7 +1183,8 @@ "user_profile": { "profile_does_not_exist": "Sorry, this profile does not exist.", "profile_loading_error": "Sorry, there was an error loading this profile.", - "timeline_title": "User timeline" + "timeline_title": "User timeline", + "field_validated": "Link Verified" }, "user_reporting": { "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:", diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index df6c03b5..eb85418e 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -68,13 +68,16 @@ export const parseUser = (data) => { output.fields_html = data.fields.map(field => { return { name: escape(field.name), - value: field.value + value: field.value, + verified_at: field.verified_at } }) + console.log(output.fields_html) output.fields_text = data.fields.map(field => { return { name: unescape(field.name.replace(/<[^>]*>/g, '')), - value: unescape(field.value.replace(/<[^>]*>/g, '')) + value: unescape(field.value.replace(/<[^>]*>/g, '')), + verified_at: field.verified_at } }) From bb243168b378a931be78c642030c9e89a0b8197b Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 29 Dec 2022 15:18:13 +0000 Subject: [PATCH 02/14] Revert "Merge pull request 'Don't show timeline links if disabled and logged out' (#250) from sfr/pleroma-fe:fix/hide-timelines into develop" This reverts commit 0b5793c1e0fc3d311ffb54784299442f2fa45967, reversing changes made to 72ef2e7454d654ceb34fc736c3f8080536b80b40. --- src/components/desktop_nav/desktop_nav.js | 4 ---- src/components/desktop_nav/desktop_nav.vue | 2 -- src/components/timeline_menu/timeline_menu_content.js | 3 +-- src/components/timeline_menu/timeline_menu_content.vue | 4 ++-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js index 2fb8a5ac..f4900c38 100644 --- a/src/components/desktop_nav/desktop_nav.js +++ b/src/components/desktop_nav/desktop_nav.js @@ -98,15 +98,11 @@ export default { logoLeft () { return this.$store.state.instance.logoLeft }, currentUser () { return this.$store.state.users.currentUser }, privateMode () { return this.$store.state.instance.private }, - federating () { return this.$store.state.instance.federating }, shouldConfirmLogout () { return this.$store.getters.mergedConfig.modalOnLogout }, showBubbleTimeline () { return this.$store.state.instance.localBubbleInstances.length > 0 - }, - restrictedTimelines () { - return this.$store.state.instance.restrict_unauthenticated.timelines } }, methods: { diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue index a52989a5..92d3fa5b 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -44,7 +44,6 @@ /> @@ -68,7 +67,6 @@ /> diff --git a/src/components/timeline_menu/timeline_menu_content.js b/src/components/timeline_menu/timeline_menu_content.js index 25bd30d9..df15030b 100644 --- a/src/components/timeline_menu/timeline_menu_content.js +++ b/src/components/timeline_menu/timeline_menu_content.js @@ -24,8 +24,7 @@ const TimelineMenuContent = { currentUser: state => state.users.currentUser, privateMode: state => state.instance.private, federating: state => state.instance.federating, - showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0), - restrictedTimelines: state => state.instance.restrict_unauthenticated.timelines + showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0) }) } } diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue index 220b0278..27aece22 100644 --- a/src/components/timeline_menu/timeline_menu_content.vue +++ b/src/components/timeline_menu/timeline_menu_content.vue @@ -32,7 +32,7 @@ >{{ $t("nav.bubble_timeline") }} -
  • +
  • {{ $t("nav.public_tl") }}
    • -
  • +
  • Date: Thu, 29 Dec 2022 15:22:06 +0000 Subject: [PATCH 03/14] update readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9be1c3bd..6c2c9376 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,22 @@ -# Pleroma-FE +# Akkoma-FE ![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet) -This is a fork of Pleroma-FE from the Pleroma project, with support for new Akkoma features such as: +This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkoma features such as: - MFM support via [marked-mfm](https://akkoma.dev/sfr/marked-mfm) - Custom emoji reactions # For Translators -The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Pleroma-FE. +The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE. Alternatively, edit/create `src/i18n/$LANGUAGE_CODE.json` (where `$LANGUAGE_CODE` is the [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language), then add your language to [src/i18n/messages.js](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/i18n/messages.js) if it doesn't already exist there. -Pleroma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js. +Akkoma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js. # FOR ADMINS -To use Pleroma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Pleroma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc. +To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Akkoma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc. ## Build Setup From 5a4315384ee84ec5cdaffc2010648b410268eaf5 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 29 Dec 2022 15:25:03 +0000 Subject: [PATCH 04/14] force CI build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c2c9376..43e177b4 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,4 @@ Edit config.json for configuration. ### Login methods -```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. +```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. From 9cd62fe08ddce8759620a1d15a6d934a0305c447 Mon Sep 17 00:00:00 2001 From: Sol Fisher Romanoff Date: Fri, 30 Dec 2022 01:03:31 +0200 Subject: [PATCH 05/14] Remove stray debug log --- src/services/entity_normalizer/entity_normalizer.service.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index eb85418e..5d129556 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -72,7 +72,6 @@ export const parseUser = (data) => { verified_at: field.verified_at } }) - console.log(output.fields_html) output.fields_text = data.fields.map(field => { return { name: unescape(field.name.replace(/<[^>]*>/g, '')), From 014f8b0dd274cd4fc185335679f3aab0c3acb17d Mon Sep 17 00:00:00 2001 From: Norm Date: Fri, 30 Dec 2022 03:01:17 +0000 Subject: [PATCH 06/14] Make minimum width for 3-column layout 1280px (#255) (#256) 1280px is a pretty common screen width for several resolutions (1280x720, 1280x800, 1280x1024, etc.). Since it is only 20px less than the current 1300px minimum, this shouldn't be a big issue to lower the minimum screen width for the 3-column layout to 1280px. Closes: https://akkoma.dev/AkkomaGang/pleroma-fe/issues/255 Co-authored-by: Francis Dinh Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/256 Co-authored-by: Norm Co-committed-by: Norm --- src/components/emoji_picker/emoji_picker.scss | 2 +- src/modules/interface.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss index 119da7c4..82fc831c 100644 --- a/src/components/emoji_picker/emoji_picker.scss +++ b/src/components/emoji_picker/emoji_picker.scss @@ -18,7 +18,7 @@ overflow: hidden; left: -70%; max-width: 100%; - @media (min-width: 800px) and (max-width: 1300px) { + @media (min-width: 800px) and (max-width: 1280px) { left: -50%; min-width: 50%; max-width: 130%; diff --git a/src/modules/interface.js b/src/modules/interface.js index ae1a31c3..33528c0d 100644 --- a/src/modules/interface.js +++ b/src/modules/interface.js @@ -186,7 +186,7 @@ const interfaceMod = { if (thirdColumnMode === 'none' || !rootState.users.currentUser) { commit('setLayoutType', normalOrMobile) } else { - const wideLayout = width >= 1300 + const wideLayout = width >= 1280 commit('setLayoutType', wideLayout ? 'wide' : normalOrMobile) } }, From 2e5001e5de164be825fc065e0425725e4fe81219 Mon Sep 17 00:00:00 2001 From: Beefox Date: Fri, 30 Dec 2022 03:04:15 +0000 Subject: [PATCH 07/14] Allow follow(er) lists to be acessible by account owner even if follower counts are disabled (#246) Currently, if a user has their follower/follow counts hidden, they cannot access their own list of followers/follows. This makes no real sense and means that they cannot modify those lists without disabling their privacy options. This fix simply allows those tabs to be accessed no matter if the counts are hidden or not. Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/246 Co-authored-by: Beefox Co-committed-by: Beefox --- src/components/user_profile/user_profile.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 4e0d0b0f..87bbf679 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -104,10 +104,9 @@ v-if="followsTabVisible" key="followees" :label="$t('user_card.followees')" - :disabled="!user.friends_count" > -