rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: disable v4 feature checks

Browse Source
This commit is contained in:
Mo Bitar
2021-11-09 16:41:12 -06:00
parent f029e32dff
commit 4b21083229
8 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/preferences/PreferencesMenu.ts
View File

@@ -35,12 +35,12 @@ interface SelectableMenuItem extends PreferencesMenuItem {
const PREFERENCES_MENU_ITEMS: PreferencesMenuItem[] = [
{ id: 'account', label: 'Account', icon: 'user' },
{ id: 'general', label: 'General', icon: 'settings' },
// { id: 'appearance', label: 'Appearance', icon: 'themes' },
{ id: 'appearance', label: 'Appearance', icon: 'themes' },
{ id: 'security', label: 'Security', icon: 'security' },
{ id: 'listed', label: 'Listed', icon: 'listed' },
// { id: 'shortcuts', label: 'Shortcuts', icon: 'keyboard' },
// { id: 'accessibility', label: 'Accessibility', icon: 'accessibility' },
// { id: 'get-free-month', label: 'Get a free month', icon: 'star' },
{ id: 'shortcuts', label: 'Shortcuts', icon: 'keyboard' },
{ id: 'accessibility', label: 'Accessibility', icon: 'accessibility' },
{ id: 'get-free-month', label: 'Get a free month', icon: 'star' },
{ id: 'help-feedback', label: 'Help & feedback', icon: 'help' },
];

4
app/assets/javascripts/preferences/panes/AccountPreferences.tsx
View File

@@ -23,7 +23,7 @@ export const AccountPreferences = observer(
return (
<PreferencesPane>
<Authentication application={application} appState={appState} />
{appState.enableUnfinishedFeatures && <SubscriptionWrapper application={application} />}
<SubscriptionWrapper application={application} />
<SignOutWrapper application={application} appState={appState} />
</PreferencesPane>
);
@@ -33,7 +33,7 @@ export const AccountPreferences = observer(
<PreferencesPane>
<Credentials application={application} appState={appState} />
<Sync application={application} />
{appState.enableUnfinishedFeatures && <SubscriptionWrapper application={application} />}
<SubscriptionWrapper application={application} />
<SignOutWrapper application={application} appState={appState} />
</PreferencesPane>
);

4
app/assets/javascripts/preferences/panes/Extensions.tsx
View File

@@ -65,7 +65,9 @@ export const Extensions: FunctionComponent<{
};
const visibleExtensions = extensions
.filter(extension => !['modal', 'rooms'].includes(extension.area));
.filter((extension) => {
return extension.package_info != undefined && !['modal', 'rooms'].includes(extension.area);
});
return (
<div>

13
app/assets/javascripts/preferences/panes/HelpFeedback.tsx
View File

@@ -80,16 +80,21 @@ export const HelpAndFeedback: FunctionComponent = () => (
</PreferencesGroup>
<PreferencesGroup>
<PreferencesSegment>
<Title>Slack group</Title>
<Title>Community groups</Title>
<Text>
Want to meet other passionate note-takers and privacy enthusiasts?
Want to share your feedback with us? Join the Standard Notes Slack
group for discussions on security, themes, editors and more.
Want to share your feedback with us? Join the Standard Notes community
groups for discussions on security, themes, editors and more.
</Text>
<LinkButton
className="mt-3"
link="https://standardnotes.com/slack"
label="Join our Slack group"
label="Join our Slack"
/>
<LinkButton
className="mt-3"
link="https://standardnotes.com/discord"
label="Join our Discord"
/>
</PreferencesSegment>
</PreferencesGroup>

18
app/assets/javascripts/preferences/panes/account/Credentials.tsx
View File

@@ -33,16 +33,14 @@ export const Credentials: FunctionComponent<Props> = observer(({ application, ap
<Text>
You're signed in as <span className='font-bold'>{user?.email}</span>
</Text>
{appState.enableUnfinishedFeatures && (
<Button
className='min-w-20 mt-3'
type='normal'
label='Change email'
onClick={() => {
setIsChangeEmailDialogOpen(true);
}}
/>
)}
<Button
className='min-w-20 mt-3'
type='normal'
label='Change email'
onClick={() => {
setIsChangeEmailDialogOpen(true);
}}
/>
<HorizontalSeparator classes='mt-5 mb-3' />
<div className={'text-input mt-2'}>
Password

3
app/assets/javascripts/preferences/panes/extensions-segments/ExtensionItem.tsx
View File

@@ -101,11 +101,8 @@ export const ExtensionItem: FunctionComponent<ExtensionItemProps> =
};
const localInstallable = extension.package_info.download_url;
const isExternal = !extension.package_info.identifier.startsWith('org.standardnotes.');
const installedVersion = extension.package_info.version;
const isToggleable = [ComponentArea.EditorStack, ComponentArea.TagsList].includes(extension.area);
return (

6
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "standard-notes-web",
"version": "3.8.25",
"version": "3.9.0",
"license": "AGPL-3.0-or-later",
"repository": {
"type": "git",
@@ -70,9 +70,9 @@
"@reach/checkbox": "^0.16.0",
"@reach/dialog": "^0.16.2",
"@reach/listbox": "^0.16.2",
"@standardnotes/features": "1.8.0",
"@standardnotes/features": "1.8.1",
"@standardnotes/sncrypto-web": "1.5.3",
"@standardnotes/snjs": "2.17.1",
"@standardnotes/snjs": "2.17.2",
"mobx": "^6.3.5",
"mobx-react-lite": "^3.2.1",
"preact": "^10.5.15",

18
yarn.lock
View File

@@ -2166,10 +2166,10 @@
dependencies:
"@standardnotes/auth" "^3.8.1"
"@standardnotes/features@1.8.0", "@standardnotes/features@^1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.8.0.tgz#1414350108714e376c57600b74437b9ae58cf343"
integrity sha512-gkBM82kEeKj4tve25WFsvPMb7MLqK2C3HcjKxk4RfoGouLAGjnSAVqs4AKZsDqdOrDZr5cAv55Uychr5qZMJTw==
"@standardnotes/features@1.8.1", "@standardnotes/features@^1.8.1":
version "1.8.1"
resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.8.1.tgz#addea86a8a4288a0046bc674a8e76f1bac3c2f89"
integrity sha512-yDbMLu9SnwR4cmjsIMgpxBOK9kIbWVQ7WezfJ5MN0FAwD2IbfKCMaWBMUJStCtSqkKE4dkL3BC+sIxik/4RwdQ==
dependencies:
"@standardnotes/common" "^1.2.1"
@@ -2192,15 +2192,15 @@
buffer "^6.0.3"
libsodium-wrappers "^0.7.9"
"@standardnotes/snjs@2.17.1":
version "2.17.1"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.17.1.tgz#bb2761bd3f6f750c2497deb9ead8b85f3723ec1d"
integrity sha512-RPIZAG2cuxhwKhUA5bujw0Dzsb8k2xTrFRQtvTPdRAS+isqJid0nWjHyv3gfC8XsMmDp5J3Kurg+5sz77liQfQ==
"@standardnotes/snjs@2.17.2":
version "2.17.2"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.17.2.tgz#69a54769291495fe0f4062892a7defaf6b22c0ed"
integrity sha512-JSvCwfcDqphWiGSUD5rAbQSMBAd0nmuzeCTnEU2Ee916/nxpNXuiovPPx2xbnxh1hNgBa6cY4nbUsw6szuhCMA==
dependencies:
"@standardnotes/auth" "^3.8.1"
"@standardnotes/common" "^1.2.1"
"@standardnotes/domain-events" "^2.5.1"
"@standardnotes/features" "^1.8.0"
"@standardnotes/features" "^1.8.1"
"@standardnotes/settings" "^1.2.1"
"@standardnotes/sncrypto-common" "^1.5.2"