fix: my add-ons tab, remove unused code

2026-07-26 10:11:15 +02:00 · 2022-08-05 12:04:13 +01:00
parent 9f9f6d3644
commit c143f38a94
11 changed files with 6 additions and 249 deletions
--- 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,
--- 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';
--- a/src/components/modals/main/scss/settings/modules/_reminder.scss
+++ b/src/components/modals/main/scss/settings/modules/_reminder.scss
@@ -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);
-      }
-    }
-  }
-}
--- 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 <Date />;
      case 'message':
        return <Message />;
-      case 'reminder':
-        return <Reminder />;
      default:
        return null;
    }
--- a/src/components/modals/main/settings/sections/Reminder.jsx
+++ b/src/components/modals/main/settings/sections/Reminder.jsx
@@ -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 (
-      <>
-        <Header
-          title="Reminder"
-          setting="reminder"
-          category="reminder"
-          element=".reminder"
-          zoomSetting="zoomReminder"
-          switch={true}
-        />
-        <SettingsItem final={true} title="Add reminder" subtitle="Add reminder">
-          <button onClick={() => this.addReminder()}>Add reminder</button>
-        </SettingsItem>
-        <div className="reminderSettingsHolder">
-          <div className="reminderSetting">
-            <div>
-              <div className="colorPicker">
-                <input
-                  type="color"
-                  name="colour"
-                  className="colour"
-                  onChange={(event) => this.updateColour(event)}
-                  value={this.state.colour}
-                ></input>
-                <label htmlFor={'colour'} className="customBackgroundHex">
-                  {this.state.colour}
-                </label>
-              </div>
-              <span className="link">
-                <MdRemoveCircleOutline /> Remove
-              </span>
-            </div>
-            <div>
-              <span className="title">
-                <input type="text" id="lname" placeholder="Name" />
-              </span>
-              <input type="date" required />
-            </div>
-          </div>
-        </div>
-      </>
-    );
-  }
-}
--- 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) {
      <div label={getMessage('modals.main.settings.sections.date.title')} name="date">
        <Date />
      </div>
-      {/*<div label="Reminder" name="reminder">
-        <Reminder />
-  </div>*/}
      <div label={getMessage('modals.main.settings.sections.message.title')} name="message">
        <Message />
      </div>
@@ -67,9 +62,6 @@ export default function Settings(props) {
      <div label={getMessage('modals.main.settings.sections.weather.title')} name="weather">
        <Weather />
      </div>
-      {/*<div label={getMessage('modals.main.settings.sections.order.title')} name="order">
-        <Order />
-</div>*/}
      <div label={getMessage('modals.main.settings.sections.appearance.title')} name="appearance">
        <Appearance />
      </div>
--- 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 = <Weather />;
      divider = true;
      break;
-    case 'Reminder':
-      icon = <Reminder />;
-      break;
-
    case getMessage('modals.main.settings.sections.appearance.title'):
      icon = <Appearance />;
      break;
--- 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') ? <Quote /> : null,
      date: this.enabled('date') ? <Date /> : null,
      quicklinks: this.enabled('quicklinksenabled') && this.online ? <QuickLinks /> : null,
-      message: this.enabled('message') ? <Message /> : null,
-      reminder: this.enabled('reminder') ? <Reminder /> : null,
+      message: this.enabled('message') ? <Message /> : null
    };
  }

@@ -83,8 +81,7 @@ export default class Widgets extends PureComponent {
      <QuickLinks />,
      <Quote />,
      <Date />,
-      <Message />,
-      <Reminder />,
+      <Message />
    ];

    if (this.state.order) {
--- a/src/components/widgets/reminder/Reminder.jsx
+++ b/src/components/widgets/reminder/Reminder.jsx
@@ -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 (
-      <div className="reminder">
-        <div
-          className="identifier"
-          style={{
-            backgroundColor: localStorage.getItem('reminderColour') || 'orange',
-          }}
-        >
-          <MdWork />
-        </div>
-        <div className="content">
-          <span className="title">Reminder</span>
-          <span className="subtitle">Time</span>
-        </div>
-        <div className="icons">
-          <Tooltip title="Remove">
-            <MdClose />
-          </Tooltip>
-          <Tooltip title="Snooze">
-            <MdSnooze />
-          </Tooltip>
-        </div>
-      </div>
-    );
-  }
-}
--- a/src/components/widgets/reminder/reminder.scss
+++ b/src/components/widgets/reminder/reminder.scss
@@ -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);
-    }
-  }
-}
--- 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",