From c143f38a9489fc611763bc1c46d5859c8f658511 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Fri, 5 Aug 2022 12:04:13 +0100 Subject: [PATCH] fix: my add-ons tab, remove unused code --- .../modals/main/marketplace/Items.jsx | 2 +- .../modals/main/scss/settings/_main.scss | 1 - .../main/scss/settings/modules/_reminder.scss | 71 ---------------- .../main/settings/sections/Overview.jsx | 8 +- .../main/settings/sections/Reminder.jsx | 81 ------------------- src/components/modals/main/tabs/Settings.jsx | 8 -- .../modals/main/tabs/backend/Tab.jsx | 4 - src/components/widgets/Widgets.jsx | 7 +- src/components/widgets/reminder/Reminder.jsx | 34 -------- src/components/widgets/reminder/reminder.scss | 37 --------- src/modules/default_settings.json | 2 +- 11 files changed, 6 insertions(+), 249 deletions(-) delete mode 100644 src/components/modals/main/scss/settings/modules/_reminder.scss delete mode 100644 src/components/modals/main/settings/sections/Reminder.jsx delete mode 100644 src/components/widgets/reminder/Reminder.jsx delete mode 100644 src/components/widgets/reminder/reminder.scss diff --git a/src/components/modals/main/marketplace/Items.jsx b/src/components/modals/main/marketplace/Items.jsx index cb7ea05a..b99b40df 100644 --- a/src/components/modals/main/marketplace/Items.jsx +++ b/src/components/modals/main/marketplace/Items.jsx @@ -5,7 +5,7 @@ import { MdAutoFixHigh, MdOutlineArrowForward, MdExpandMore } from 'react-icons/ export default function Items({ type, items, - collections, + collections = [], toggleFunction, collectionFunction, onCollection, diff --git a/src/components/modals/main/scss/settings/_main.scss b/src/components/modals/main/scss/settings/_main.scss index 5e41de81..d0893e55 100644 --- a/src/components/modals/main/scss/settings/_main.scss +++ b/src/components/modals/main/scss/settings/_main.scss @@ -1,7 +1,6 @@ @import 'modules/resetmodal'; @import 'scss/variables'; @import 'modules/material-ui'; -@import 'modules/reminder'; @import 'modules/tabs/about'; @import 'modules/tabs/changelog'; diff --git a/src/components/modals/main/scss/settings/modules/_reminder.scss b/src/components/modals/main/scss/settings/modules/_reminder.scss deleted file mode 100644 index 2a5aabff..00000000 --- a/src/components/modals/main/scss/settings/modules/_reminder.scss +++ /dev/null @@ -1,71 +0,0 @@ -@import '../../../../../../scss/variables'; - -.reminder-info { - position: absolute; - bottom: 0; - padding: 15px; - flex-flow: column; - gap: 10px; - margin: 5px; - @extend %tabText; - @include themed() { - color: t($color); - background: t($modal-sidebar); - box-shadow: 0 0 0 4px t($modal-sidebarActive); - border-radius: t($borderRadius); - } - button { - @include modal-button(standard); - } -} - -.reminderSettingsHolder { - display: flex; - flex-flow: column; - @include themed() { - input[type='text'] { - width: 260px; - background: t($modal-sidebar); - border: 3px solid t($modal-sidebarActive); - color: t($color); - padding: 15px 20px; - border-radius: 4px; - display: flex !important; - cursor: pointer; - - &::-webkit-calendar-picker-indicator { - cursor: pointer; - } - } - .reminderSetting { - border-radius: t($borderRadius); - display: flex; - flex-flow: row; - justify-content: space-between; - align-items: center; - padding: 15px; - .link { - display: flex; - align-items: center; - gap: 20px; - } - div { - display: flex; - flex-flow: column; - gap: 10px; - align-items: center; - } - background: t($modal-sidebar); - .colorPicker { - align-items: center; - padding: 10px 15px 10px 15px; - border-radius: 100px; - display: flex; - flex-flow: row; - gap: 25px; - background: t($modal-sidebarActive); - box-shadow: 0 0 0 1px t($modal-sidebar); - } - } - } -} diff --git a/src/components/modals/main/settings/sections/Overview.jsx b/src/components/modals/main/settings/sections/Overview.jsx index c4ca2dc6..86de6700 100644 --- a/src/components/modals/main/settings/sections/Overview.jsx +++ b/src/components/modals/main/settings/sections/Overview.jsx @@ -10,7 +10,6 @@ import Quote from '../../../../widgets/quote/Quote'; import QuickLinks from '../../../../widgets/quicklinks/QuickLinks'; import Date from '../../../../widgets/time/Date'; import Message from '../../../../widgets/message/Message'; -import Reminder from '../../../../widgets/reminder/Reminder'; import EventBus from 'modules/helpers/eventbus'; @@ -21,8 +20,7 @@ const widget_name = { quicklinks: getMessage('modals.main.settings.sections.quicklinks.title'), quote: getMessage('modals.main.settings.sections.quote.title'), date: getMessage('modals.main.settings.sections.date.title'), - message: getMessage('modals.main.settings.sections.message.title'), - reminder: 'reminder', + message: getMessage('modals.main.settings.sections.message.title') }; const SortableItem = sortableElement(({ value }) => ( @@ -61,7 +59,7 @@ export default class OrderSettings extends PureComponent { reset = () => { localStorage.setItem( 'order', - JSON.stringify(['greeting', 'time', 'quicklinks', 'quote', 'date', 'message', 'reminder']), + JSON.stringify(['greeting', 'time', 'quicklinks', 'quote', 'date', 'message']), ); this.setState({ @@ -94,8 +92,6 @@ export default class OrderSettings extends PureComponent { return ; case 'message': return ; - case 'reminder': - return ; default: return null; } diff --git a/src/components/modals/main/settings/sections/Reminder.jsx b/src/components/modals/main/settings/sections/Reminder.jsx deleted file mode 100644 index bbb081c2..00000000 --- a/src/components/modals/main/settings/sections/Reminder.jsx +++ /dev/null @@ -1,81 +0,0 @@ -import variables from 'modules/variables'; -import { PureComponent } from 'react'; -import Header from '../Header'; -import { MdRemoveCircleOutline } from 'react-icons/md'; -import SettingsItem from '../SettingsItem'; - -export default class ReminderSettings extends PureComponent { - constructor() { - super(); - this.state = { - colour: localStorage.getItem('reminderColour') || '#ffa500', - reminder: JSON.parse(localStorage.getItem('reminder')) || [ - { - value: '', - done: false, - }, - ], - }; - } - - updateColour(event) { - const colour = event.target.value; - this.setState({ colour }); - localStorage.setItem('reminderColour', colour); - } - - addReminder() { - let reminderTitle = this.state.todo; - reminderTitle.push({ - value: '', - done: false, - }); - this.updateReminderState(reminderTitle); - } - - render() { - const getMessage = (text) => variables.language.getMessage(variables.languagecode, text); - return ( - <> -
- - - -
-
-
-
- this.updateColour(event)} - value={this.state.colour} - > - -
- - Remove - -
-
- - - - -
-
-
- - ); - } -} diff --git a/src/components/modals/main/tabs/Settings.jsx b/src/components/modals/main/tabs/Settings.jsx index 791120e5..44bc604f 100644 --- a/src/components/modals/main/tabs/Settings.jsx +++ b/src/components/modals/main/tabs/Settings.jsx @@ -8,12 +8,10 @@ import Time from '../settings/sections/Time'; import QuickLinks from '../settings/sections/QuickLinks'; import Quote from '../settings/sections/Quote'; import Date from '../settings/sections/Date'; -import Reminder from '../settings/sections/Reminder'; import Message from '../settings/sections/Message'; import Background from '../settings/sections/background/Background'; import Search from '../settings/sections/Search'; import Weather from '../settings/sections/Weather'; -import Order from '../settings/sections/Order'; import Appearance from '../settings/sections/Appearance'; import Language from '../settings/sections/Language'; import Advanced from '../settings/sections/advanced/Advanced'; @@ -52,9 +50,6 @@ export default function Settings(props) {
- {/*
- -
*/}
@@ -67,9 +62,6 @@ export default function Settings(props) {
- {/*
- -
*/}
diff --git a/src/components/modals/main/tabs/backend/Tab.jsx b/src/components/modals/main/tabs/backend/Tab.jsx index 9ea04e1c..147599d3 100644 --- a/src/components/modals/main/tabs/backend/Tab.jsx +++ b/src/components/modals/main/tabs/backend/Tab.jsx @@ -96,10 +96,6 @@ function Tab({ label, currentTab, onClick, navbarTab }) { icon = ; divider = true; break; - case 'Reminder': - icon = ; - break; - case getMessage('modals.main.settings.sections.appearance.title'): icon = ; break; diff --git a/src/components/widgets/Widgets.jsx b/src/components/widgets/Widgets.jsx index ba1098e7..c7fa4681 100644 --- a/src/components/widgets/Widgets.jsx +++ b/src/components/widgets/Widgets.jsx @@ -7,7 +7,6 @@ import Search from './search/Search'; import QuickLinks from './quicklinks/QuickLinks'; import Date from './time/Date'; import Message from './message/Message'; -import Reminder from './reminder/Reminder'; import EventBus from 'modules/helpers/eventbus'; @@ -33,8 +32,7 @@ export default class Widgets extends PureComponent { quote: this.enabled('quote') ? : null, date: this.enabled('date') ? : null, quicklinks: this.enabled('quicklinksenabled') && this.online ? : null, - message: this.enabled('message') ? : null, - reminder: this.enabled('reminder') ? : null, + message: this.enabled('message') ? : null }; } @@ -83,8 +81,7 @@ export default class Widgets extends PureComponent { , , , - , - , + ]; if (this.state.order) { diff --git a/src/components/widgets/reminder/Reminder.jsx b/src/components/widgets/reminder/Reminder.jsx deleted file mode 100644 index 989f963a..00000000 --- a/src/components/widgets/reminder/Reminder.jsx +++ /dev/null @@ -1,34 +0,0 @@ -import { PureComponent } from 'react'; - -import './reminder.scss'; -import Tooltip from '../../helpers/tooltip/Tooltip'; -import { MdClose, MdSnooze, MdWork } from 'react-icons/md'; - -export default class Reminder extends PureComponent { - render() { - return ( -
-
- -
-
- Reminder - Time -
-
- - - - - - -
-
- ); - } -} diff --git a/src/components/widgets/reminder/reminder.scss b/src/components/widgets/reminder/reminder.scss deleted file mode 100644 index c342afbf..00000000 --- a/src/components/widgets/reminder/reminder.scss +++ /dev/null @@ -1,37 +0,0 @@ -@import 'scss/variables'; - -.reminder { - @extend %basic; - display: flex; - justify-content: flex-start; - align-items: center; - gap: 10px; - height: 60px; - text-align: left; - - .identifier { - color: #fff; - height: 60px; - width: 60px; - border-radius: 12px 0 0 12px; - display: flex; - justify-content: center; - align-items: center; - } - - .content { - display: flex; - flex-flow: column; - padding: 10px; - } - - .icons { - display: flex; - gap: 10px; - padding: 10px; - - svg { - @include basicIconButton(10px, 0.9rem, ui); - } - } -} diff --git a/src/modules/default_settings.json b/src/modules/default_settings.json index 61463bbd..a7bf33b5 100644 --- a/src/modules/default_settings.json +++ b/src/modules/default_settings.json @@ -125,7 +125,7 @@ }, { "name": "order", - "value": "[\"greeting\", \"time\", \"quicklinks\", \"quote\", \"date\", \"message\", \"reminder\"]" + "value": "[\"greeting\", \"time\", \"quicklinks\", \"quote\", \"date\", \"message\"]" }, { "name": "theme",