From 99bbfdda4bfbb09c7d7ca06f8522585a2a9cbcf0 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Sat, 9 Jan 2021 12:19:08 -0600 Subject: [PATCH] Tab routing --- components/pages/Lists.jsx | 36 +++++++++++++++--------- components/pages/Settings.jsx | 6 ++-- components/ui/Tab.jsx | 30 -------------------- components/ui/TabBar.jsx | 13 --------- components/ui/Toggle.jsx | 5 ---- package-lock.json | 53 ----------------------------------- package.json | 6 +--- 7 files changed, 26 insertions(+), 123 deletions(-) delete mode 100644 components/ui/Tab.jsx delete mode 100644 components/ui/TabBar.jsx delete mode 100644 components/ui/Toggle.jsx diff --git a/components/pages/Lists.jsx b/components/pages/Lists.jsx index d8400c2..f2f29ff 100644 --- a/components/pages/Lists.jsx +++ b/components/pages/Lists.jsx @@ -4,17 +4,22 @@ import Store from '../../store'; import * as selectors from '../../store/selectors'; import VirtualScroll from '../ui/VirtualScroll'; -import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent } from '@ionic/react'; +import { + IonPage, + IonHeader, + IonToolbar, + IonTitle, + IonContent, + IonList, + IonItem, + IonLabel, +} from '@ionic/react'; +import { useEffect, useState } from 'react'; const ListEntry = ({ list, ...props }) => ( - - - {list.name} - - + + {list.name} + ); const AllLists = ({ onSelect }) => { @@ -30,7 +35,7 @@ const AllLists = ({ onSelect }) => { ); }; -const Lists = ({ selected, ...props }) => { +const Lists = () => { return ( @@ -38,10 +43,13 @@ const Lists = ({ selected, ...props }) => { Lists - - - - + + + + Lists + + + ); diff --git a/components/pages/Settings.jsx b/components/pages/Settings.jsx index 0f2b55e..6af0832 100644 --- a/components/pages/Settings.jsx +++ b/components/pages/Settings.jsx @@ -1,6 +1,8 @@ import Store from '../../store'; import * as selectors from '../../store/selectors'; +import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent, IonList } from '@ionic/react'; + const Settings = () => { const enableNotifications = Store.useState(); const settings = Store.useState(selectors.getSettings); @@ -13,9 +15,7 @@ const Settings = () => { - - - + ); diff --git a/components/ui/Tab.jsx b/components/ui/Tab.jsx deleted file mode 100644 index 904feb0..0000000 --- a/components/ui/Tab.jsx +++ /dev/null @@ -1,30 +0,0 @@ -import classNames from 'classnames'; -import Icon from './Icon'; -import Link from '../../components/Link'; -import { useEffect, useState } from 'react'; - -const Tab = ({ title, href, icon, selected, selectedIcon, onClick }) => { - return ( - - - {icon && ( - - )} - - - - ); -}; - -export default Tab; diff --git a/components/ui/TabBar.jsx b/components/ui/TabBar.jsx deleted file mode 100644 index a33673c..0000000 --- a/components/ui/TabBar.jsx +++ /dev/null @@ -1,13 +0,0 @@ -const TabBar = ({ children }) => ( - -); - -export default TabBar; diff --git a/components/ui/Toggle.jsx b/components/ui/Toggle.jsx deleted file mode 100644 index cef2b36..0000000 --- a/components/ui/Toggle.jsx +++ /dev/null @@ -1,5 +0,0 @@ -import ReactToggle from 'react-toggle'; - -const Toggle = props => ; - -export default Toggle; diff --git a/package-lock.json b/package-lock.json index ec7f40f..b39cd3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1663,12 +1663,6 @@ } } }, - "csstype": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.5.tgz", - "integrity": "sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==", - "dev": true - }, "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -1829,16 +1823,6 @@ } } }, - "dom-helpers": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz", - "integrity": "sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==", - "dev": true, - "requires": { - "@babel/runtime": "^7.8.7", - "csstype": "^3.0.2" - } - }, "dom-serializer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.0.1.tgz", @@ -4588,37 +4572,6 @@ "tiny-warning": "^1.0.0" } }, - "react-spring": { - "version": "8.0.27", - "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz", - "integrity": "sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==", - "dev": true, - "requires": { - "@babel/runtime": "^7.3.1", - "prop-types": "^15.5.8" - } - }, - "react-toggle": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.1.1.tgz", - "integrity": "sha512-+wXlMcSpg8SmnIXauMaZiKpR+r2wp2gMUteroejp2UTSqGTVvZLN+m9EhMzFARBKEw7KpQOwzCyfzeHeAndQGw==", - "dev": true, - "requires": { - "classnames": "^2.2.5" - } - }, - "react-transition-group": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", - "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", - "dev": true, - "requires": { - "@babel/runtime": "^7.5.5", - "dom-helpers": "^5.0.1", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2" - } - }, "react-use-gesture": { "version": "9.0.0-beta.11", "resolved": "https://registry.npmjs.org/react-use-gesture/-/react-use-gesture-9.0.0-beta.11.tgz", @@ -6355,12 +6308,6 @@ "errno": "~0.1.7" } }, - "wouter": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/wouter/-/wouter-2.7.0.tgz", - "integrity": "sha512-+0KbaxtM8pcLZWH22oaatq1Rbtce+0KXnrGCjy/GSFPNs3pTyyL6nQoiPga+96LqO8SPnC8wy15jD7Ix/tZm1A==", - "dev": true - }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/package.json b/package.json index 9cb74f1..5a26163 100644 --- a/package.json +++ b/package.json @@ -29,11 +29,7 @@ "ionicons": "^5.2.3", "prettier": "^2.2.1", "pullstate": "^1.20.5", - "react-spring": "^8.0.27", - "react-toggle": "^4.1.1", - "react-transition-group": "^4.4.1", "react-use-gesture": "^9.0.0-beta.11", - "reselect": "^4.0.0", - "wouter": "^2.7.0" + "reselect": "^4.0.0" } }