From 2b4a5956e075d8de811e3bc5596ccaac966e67ea Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 27 Jul 2020 17:43:36 +0200 Subject: [PATCH 1/2] Remove links to PleromaFE --- .../glitch/features/getting_started_misc/index.js | 1 - app/javascript/flavours/glitch/util/backend_links.js | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/javascript/flavours/glitch/features/getting_started_misc/index.js b/app/javascript/flavours/glitch/features/getting_started_misc/index.js index 570fe78bf..ba9d92f86 100644 --- a/app/javascript/flavours/glitch/features/getting_started_misc/index.js +++ b/app/javascript/flavours/glitch/features/getting_started_misc/index.js @@ -59,7 +59,6 @@ class gettingStartedMisc extends ImmutablePureComponent { - diff --git a/app/javascript/flavours/glitch/util/backend_links.js b/app/javascript/flavours/glitch/util/backend_links.js index 7c9290a1b..869668040 100644 --- a/app/javascript/flavours/glitch/util/backend_links.js +++ b/app/javascript/flavours/glitch/util/backend_links.js @@ -1,7 +1,7 @@ -export const preferencesLink = '/settings'; -export const profileLink = '/user-settings'; -export const signOutLink = '/auth/sign_out'; -export const termsLink = '/terms'; +export const preferencesLink = undefined; // '/settings/preferences'; +export const profileLink = undefined; // '/settings/profile'; +export const signOutLink = undefined; // '/auth/sign_out'; +export const termsLink = undefined; // '/terms'; export const accountAdminLink = (id) => `/pleroma/admin/#/users/${id}/`; export const statusAdminLink = (account_id, status_id) => `/pleroma/admin/#/users/${account_id}/`; export const filterEditLink = undefined; // (id) => `/filters/${id}/edit`; From a62d84e898e81689e0f3a5e141fb0e4ed6f355a8 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 27 Jul 2020 17:37:10 +0200 Subject: [PATCH 2/2] Onboarding Modal: Adapt for Pleroma --- .../glitch/features/ui/components/onboarding_modal.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js index 935c26be6..b23c797bb 100644 --- a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js @@ -29,8 +29,8 @@ const PageOne = ({ acct, domain }) => (

-

@{acct}@{domain} }} />

+

{acct}@{domain} }} />

); @@ -131,8 +131,6 @@ const PageSix = ({ admin, domain }) => { adminSection = (

@{admin.get('acct')} }} /> -
- }} />

); } @@ -141,9 +139,8 @@ const PageSix = ({ admin, domain }) => {

{adminSection} -

fork, Mastodon: Mastodon, github: GitHub }} />

-

}} />

-

+

Pleroma's Gitlab }} />

+

}} />

); };