Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/-focus-mode-(#110
Browse files Browse the repository at this point in the history
)
  • Loading branch information
Undeadlol1 committed Nov 22, 2020
2 parents 34b0459 + 5ac7ce4 commit 3566fcc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Flow TODO is a unimportant tasks organizer.
Flow TODO is an app for procrastinators.

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
15 changes: 12 additions & 3 deletions src/components/ui/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@ const StyledListText = withStyles({
},
})(ListItemText);

const Sidebar: React.FC<{
function Sidebar({
isLoggedIn,
isOpen,
}: {
isOpen: boolean;
isLoggedIn: boolean;
}> = ({ isLoggedIn, isOpen }) => {
}) {
const cx = useStyles();
const history = useHistory();
const t = useTypedTranslate();
Expand Down Expand Up @@ -141,6 +144,12 @@ const Sidebar: React.FC<{
<StyledListText primary={t('feedback')} />
</ListItem>
</MailTo>
<ListItem button onClick={redirectAndCloseSidebar('/focus')}>
<ListItemIcon>
<FocusIcon />
</ListItemIcon>
<StyledListText primary={sidebarTranslator('focus_mode')} />
</ListItem>
<ListItem button onClick={logoutOrRedirect}>
<ListItemIcon>
{isLoggedIn ? <AccountBoxIcon /> : <ExitIcon />}
Expand All @@ -152,6 +161,6 @@ const Sidebar: React.FC<{
</List>
</Drawer>
);
};
}

export default memo(Sidebar);
2 changes: 1 addition & 1 deletion src/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,6 @@ export default {
pick_or_create_a_task : "Pick or create a task"
},
sidebar: {
focus_mode: 'Focus Mode',
focus_mode: 'Focus Mode (WIP)',
}
};
2 changes: 1 addition & 1 deletion src/locales/ru.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,6 @@ export default {
pick_or_create_a_task : "Выберите или создайте задачу",
},
sidebar: {
focus_mode: 'Режим Фокусировки',
focus_mode: 'Режим Фокусировки (не доделано)',
}
};

0 comments on commit 3566fcc

Please sign in to comment.