From ccde207de8e76b652be66d0b181fd1319a9724dd Mon Sep 17 00:00:00 2001 From: Mo Date: Mon, 5 Dec 2022 17:20:47 -0600 Subject: [PATCH] chore: add deprecation notice on dot org site --- packages/ui-services/src/Route/RouteService.ts | 4 ++++ .../src/Route/RouteServiceInterface.ts | 1 + .../ApplicationView/ApplicationView.tsx | 2 ++ .../Components/ApplicationView/DotOrgNotice.tsx | 16 ++++++++++++++++ packages/web/tailwind.config.js | 2 ++ 5 files changed, 25 insertions(+) create mode 100644 packages/web/src/javascripts/Components/ApplicationView/DotOrgNotice.tsx diff --git a/packages/ui-services/src/Route/RouteService.ts b/packages/ui-services/src/Route/RouteService.ts index 652b7c8c3..98d1cd157 100644 --- a/packages/ui-services/src/Route/RouteService.ts +++ b/packages/ui-services/src/Route/RouteService.ts @@ -35,6 +35,10 @@ export class RouteService return new RouteParser(window.location.href) } + get isDotOrg(): boolean { + return window.location.host === 'app.standardnotes.org' + } + removeQueryParameterFromURL(param: RootQueryParam): void { const urlSearchParams = new URLSearchParams(window.location.search) urlSearchParams.delete(param) diff --git a/packages/ui-services/src/Route/RouteServiceInterface.ts b/packages/ui-services/src/Route/RouteServiceInterface.ts index 3b6ade3ff..9b5406eb2 100644 --- a/packages/ui-services/src/Route/RouteServiceInterface.ts +++ b/packages/ui-services/src/Route/RouteServiceInterface.ts @@ -5,4 +5,5 @@ export interface RouteServiceInterface { deinit(): void getRoute(): RouteParserInterface removeQueryParameterFromURL(param: RootQueryParam): void + get isDotOrg(): boolean } diff --git a/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx b/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx index 4531b022a..4949ce301 100644 --- a/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx +++ b/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx @@ -26,6 +26,7 @@ import DarkModeHandler from '../DarkModeHandler/DarkModeHandler' import ApplicationProvider from '../ApplicationProvider' import CommandProvider from '../CommandProvider' import PanesSystemComponent from '../Panes/PanesSystemComponent' +import DotOrgNotice from './DotOrgNotice' type Props = { application: WebApplication @@ -230,6 +231,7 @@ const ApplicationView: FunctionComponent = ({ application, mainApplicatio viewControllerManager={viewControllerManager} /> + {application.routeService.isDotOrg && } diff --git a/packages/web/src/javascripts/Components/ApplicationView/DotOrgNotice.tsx b/packages/web/src/javascripts/Components/ApplicationView/DotOrgNotice.tsx new file mode 100644 index 000000000..a55250e15 --- /dev/null +++ b/packages/web/src/javascripts/Components/ApplicationView/DotOrgNotice.tsx @@ -0,0 +1,16 @@ +import { FunctionComponent } from 'react' + +const DotOrgNotice: FunctionComponent = () => { + return ( +
+
+ app.standardnotes.org is no longer maintained. Please switch to{' '} + + app.standardnotes.com + +
+
+ ) +} + +export default DotOrgNotice diff --git a/packages/web/tailwind.config.js b/packages/web/tailwind.config.js index 17c07fd8b..6f0a6420d 100644 --- a/packages/web/tailwind.config.js +++ b/packages/web/tailwind.config.js @@ -15,6 +15,7 @@ module.exports = { 18: '4.5rem', 26: '6.5rem', 30: '7.5rem', + 50: '12.5rem', 70: '17.5rem', 87.5: '21.875rem', 125: '31.25rem', @@ -41,6 +42,7 @@ module.exports = { 30: '7.5rem', 40: '10rem', 42: '10.5rem', + 50: '12.5rem', 55: '13.75rem', 60: '15rem', 68: '17rem',