Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add "sync" pane to preferences -> account tab #621

Merged
merged 3 commits into from
Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

# OS & IDE
.DS_Store
.idea

# Ignore bundler config.
/.bundle
Expand Down
10 changes: 7 additions & 3 deletions app/assets/javascripts/components/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FunctionComponent } from 'preact';

const baseClass = `rounded px-4 py-1.75 font-bold text-sm fit-content cursor-pointer`;
const baseClass = `rounded px-4 py-1.75 font-bold text-sm fit-content`;

const normalClass = `${baseClass} bg-default color-text border-solid border-gray-300 border-1 \
focus:bg-contrast hover:bg-contrast`;
Expand All @@ -12,15 +12,19 @@ export const Button: FunctionComponent<{
type: 'normal' | 'primary';
label: string;
onClick: () => void;
}> = ({ type, label, className = '', onClick }) => {
disabled?: boolean;
}> = ({ type, label, className = '', onClick, disabled = false }) => {
const buttonClass = type === 'primary' ? primaryClass : normalClass;
const cursorClass = disabled ? 'cursor-default' : 'cursor-pointer';

return (
<button
className={`${buttonClass} ${className}`}
className={`${buttonClass} ${cursorClass} ${className}`}
onClick={(e) => {
onClick();
e.preventDefault();
}}
disabled={disabled}
>
{label}
</button>
Expand Down
30 changes: 20 additions & 10 deletions app/assets/javascripts/preferences/PreferencesView.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import { RoundIconButton } from '@/components/RoundIconButton';
import { TitleBar, Title } from '@/components/TitleBar';
import { FunctionComponent } from 'preact';
import { HelpAndFeedback, Security } from './panes';
import { AccountPreferences, HelpAndFeedback, Security } from './panes';
import { observer } from 'mobx-react-lite';
import { PreferencesMenu } from './preferences-menu';
import { PreferencesMenuView } from './PreferencesMenuView';
import { WebApplication } from '@/ui_models/application';

const PaneSelector: FunctionComponent<{
prefs: PreferencesMenu;
}> = observer(({ prefs: menu }) => {
application: WebApplication;
}> = observer(({ prefs: menu, application }) => {
switch (menu.selectedPaneId) {
case 'general':
return null;
case 'account':
return null;
return <AccountPreferences application={application} />;
case 'appearance':
return null;
case 'security':
Expand All @@ -33,15 +35,19 @@ const PaneSelector: FunctionComponent<{

const PreferencesCanvas: FunctionComponent<{
preferences: PreferencesMenu;
}> = observer(({ preferences: prefs }) => (
application: WebApplication;
}> = observer(({ preferences: prefs, application }) => (
<div className="flex flex-row flex-grow min-h-0 justify-between">
<PreferencesMenuView menu={prefs}></PreferencesMenuView>
<PaneSelector prefs={prefs} />
<PaneSelector prefs={prefs} application={application} />
</div>
));

const PreferencesView: FunctionComponent<{ close: () => void }> = observer(
({ close }) => {
const PreferencesView: FunctionComponent<{
close: () => void;
application: WebApplication;
}> = observer(
({ close, application }) => {
const prefs = new PreferencesMenu();

return (
Expand All @@ -58,20 +64,24 @@ const PreferencesView: FunctionComponent<{ close: () => void }> = observer(
icon="close"
/>
</TitleBar>
<PreferencesCanvas preferences={prefs} />
<PreferencesCanvas preferences={prefs} application={application} />
</div>
);
}
);

export interface PreferencesWrapperProps {
appState: { preferences: { isOpen: boolean; closePreferences: () => void } };
application: WebApplication;
}

export const PreferencesViewWrapper: FunctionComponent<PreferencesWrapperProps> =
observer(({ appState }) => {
observer(({ appState, application }) => {
if (!appState.preferences.isOpen) return null;
return (
<PreferencesView close={() => appState.preferences.closePreferences()} />
<PreferencesView
application={application}
close={() => appState.preferences.closePreferences()}
/>
);
});
12 changes: 12 additions & 0 deletions app/assets/javascripts/preferences/panes/AccountPreferences.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Sync } from '@/preferences/panes/account';
import { PreferencesPane } from '@/preferences/components';
import { observer } from 'mobx-react-lite';
import { WebApplication } from '@/ui_models/application';

export const AccountPreferences = observer(({application}: {application: WebApplication}) => {
return (
<PreferencesPane>
<Sync application={application} />
</PreferencesPane>
);
});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you fix your IDE to add empty line at the end of file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems we don't have such rule in our .eslintrc file, I can add that rule so it will work for everyone.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfetto 👌

60 changes: 60 additions & 0 deletions app/assets/javascripts/preferences/panes/account/Sync.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { PreferencesGroup, PreferencesSegment, Text, Title } from '@/preferences/components';
import { Button } from '@/components/Button';
import { SyncQueueStrategy } from '@node_modules/@standardnotes/snjs';
import { STRING_GENERIC_SYNC_ERROR } from '@/strings';
import { useState } from '@node_modules/preact/hooks';
import { dateToLocalizedString } from '@/utils';
import { observer } from '@node_modules/mobx-react-lite';
import { WebApplication } from '@/ui_models/application';

type Props = {
application: WebApplication;
};

const Sync = observer(({ application }: Props) => {
const formatLastSyncDate = (lastUpdatedDate: Date) => {
return dateToLocalizedString(lastUpdatedDate);
};

const [isSyncingInProgress, setIsSyncingInProgress] = useState(false);
const [lastSyncDate, setLastSyncDate] = useState(formatLastSyncDate(application.getLastSyncDate() as Date));

const doSynchronization = async () => {
setIsSyncingInProgress(true);

const response = await application.sync({
queueStrategy: SyncQueueStrategy.ForceSpawnNew,
checkIntegrity: true
});
setIsSyncingInProgress(false);
if (response && response.error) {
application.alertService!.alert(STRING_GENERIC_SYNC_ERROR);
} else {
setLastSyncDate(formatLastSyncDate(application.getLastSyncDate() as Date));
}
};

return (
<PreferencesGroup>
<PreferencesSegment>
<div className='flex flex-row items-center'>
<div className='flex-grow flex flex-col'>
<Title>Sync</Title>
<Text>
Last synced <span className='font-bold'>on {lastSyncDate}</span>
</Text>
<Button
className='min-w-20 mt-3'
type='normal'
label='Sync now'
disabled={isSyncingInProgress}
onClick={doSynchronization}
/>
</div>
</div>
</PreferencesSegment>
</PreferencesGroup>
);
});

export default Sync;
1 change: 1 addition & 0 deletions app/assets/javascripts/preferences/panes/account/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as Sync } from './Sync';
1 change: 1 addition & 0 deletions app/assets/javascripts/preferences/panes/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from './HelpFeedback';
export * from './Security';
export * from './AccountPreferences';
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
)
preferences(
app-state='self.appState'
application='self.application'
)
challenge-modal(
ng-repeat="challenge in self.challenges track by challenge.id"
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/_ui.scss
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ $screen-md-max: ($screen-lg-min - 1) !default;
}
}

.cursor-default {
cursor: default;
}

.fill-current {
fill: currentColor;
}
Expand Down
14 changes: 10 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2016,6 +2016,11 @@
resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.1.1.tgz#834701c2e14d31eb204bff90457fa05e9183464a"
integrity sha512-E9zDYZ1gJkVZBEzd7a1L2haQ4GYeH1lUrY87UmDH1AMYUHW+c0SqZ71af1fBNqGzrx3EZSXk+Qzr7RyOa6N1Mw==

"@standardnotes/[email protected]":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.0.0.tgz#906af029b6e58241689ca37436982c37a888a418"
integrity sha512-PEQyP/p/TQLVcNYcbu9jEIWNRqBrFFG1Qyy8QIcvNUt5o4lpLZGEY1T+PJUsPSisnuKKNpQrgVLc9LjhUKpuYw==

"@standardnotes/sncrypto-common@^1.2.7", "@standardnotes/sncrypto-common@^1.2.9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.2.9.tgz#5212a959e4ec563584e42480bfd39ef129c3cbdf"
Expand All @@ -2029,12 +2034,13 @@
"@standardnotes/sncrypto-common" "^1.2.7"
libsodium-wrappers "^0.7.8"

"@standardnotes/[email protected].21":
version "2.7.21"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.21.tgz#db451e5facaf5fa41fa509eb1f304723929c3541"
integrity sha512-GhkGk1LJmD494COZkSOgyHaUnGnLWNLlSuCZMTwbw3dgkN5PjobbRhfDvEZaLqjwok+h9nkiQt3hugQ3h6Cy5w==
"@standardnotes/[email protected].23":
version "2.7.23"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.23.tgz#fedc9c025301dbe20ed2d598fb378e36f90ff64e"
integrity sha512-eoEwKlV2PZcJXFbCt6bgovu9nldVoT7DPoterTBo/NZ4odRILOwxLA1SAgL5H5FYPb9NHkwaaCt9uTdIqdNYhA==
dependencies:
"@standardnotes/auth" "3.1.1"
"@standardnotes/features" "1.0.0"
"@standardnotes/sncrypto-common" "^1.2.9"

"@svgr/babel-plugin-add-jsx-attribute@^5.4.0":
Expand Down