diff --git a/capacitor.config.json b/capacitor.config.json index 3ecb51b..05e195d 100644 --- a/capacitor.config.json +++ b/capacitor.config.json @@ -9,5 +9,8 @@ "launchShowDuration": 0 } }, + "server": { + "url": "http://192.168.86.26:3000" + }, "cordova": {} } diff --git a/components/pages/Home.jsx b/components/pages/Feed.jsx similarity index 57% rename from components/pages/Home.jsx rename to components/pages/Feed.jsx index 6af204e..b4fd0e2 100644 --- a/components/pages/Home.jsx +++ b/components/pages/Feed.jsx @@ -3,8 +3,8 @@ import Card from '../ui/Card'; import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent } from '@ionic/react'; import { homeItems } from '../../store'; -const HomeCard = ({ title, type, text, author, image }) => ( - +const FeedCard = ({ title, type, text, author, authorAvatar, image }) => ( +
@@ -12,6 +12,10 @@ const HomeCard = ({ title, type, text, author, image }) => (

{type}

{title}

{text}

+
+ +

{author}

+
); @@ -20,12 +24,17 @@ const Home = () => ( - Inbox + Feed - + + + + Feed + + {homeItems.map((i, index) => ( - + ))} diff --git a/components/pages/Tabs.jsx b/components/pages/Tabs.jsx index 77c183a..2fc37b3 100644 --- a/components/pages/Tabs.jsx +++ b/components/pages/Tabs.jsx @@ -1,17 +1,9 @@ import { Redirect, Route } from 'react-router-dom'; -import { - IonApp, - IonRouterOutlet, - IonTabs, - IonTabBar, - IonTabButton, - IonIcon, - IonLabel, -} from '@ionic/react'; +import { IonRouterOutlet, IonTabs, IonTabBar, IonTabButton, IonIcon, IonLabel } from '@ionic/react'; import { IonReactRouter } from '@ionic/react-router'; -import { ellipse, square, triangle } from 'ionicons/icons'; +import { cog, flash, list } from 'ionicons/icons'; -import Home from './Home'; +import Home from './Feed'; import Lists from './Lists'; import Settings from './Settings'; @@ -20,23 +12,23 @@ const Tabs = () => { - + - } exact={true} /> + } exact={true} /> - - - Tab 1 + + + Feed - - Tab 2 + + Lists - - Tab 3 + + Settings diff --git a/ios/App/App/capacitor.config.json b/ios/App/App/capacitor.config.json index 3ecb51b..05e195d 100644 --- a/ios/App/App/capacitor.config.json +++ b/ios/App/App/capacitor.config.json @@ -9,5 +9,8 @@ "launchShowDuration": 0 } }, + "server": { + "url": "http://192.168.86.26:3000" + }, "cordova": {} } diff --git a/public/img/faces/image-1.png b/public/img/faces/image-1.png deleted file mode 100644 index 655f3ee..0000000 Binary files a/public/img/faces/image-1.png and /dev/null differ diff --git a/public/img/faces/image-10.png b/public/img/faces/image-10.png deleted file mode 100644 index 9857da7..0000000 Binary files a/public/img/faces/image-10.png and /dev/null differ diff --git a/public/img/faces/image-11.png b/public/img/faces/image-11.png deleted file mode 100644 index 9aabe8b..0000000 Binary files a/public/img/faces/image-11.png and /dev/null differ diff --git a/public/img/faces/image-12.png b/public/img/faces/image-12.png deleted file mode 100644 index 56ad994..0000000 Binary files a/public/img/faces/image-12.png and /dev/null differ diff --git a/public/img/faces/image-13.png b/public/img/faces/image-13.png deleted file mode 100644 index 667fb8b..0000000 Binary files a/public/img/faces/image-13.png and /dev/null differ diff --git a/public/img/faces/image-14.png b/public/img/faces/image-14.png deleted file mode 100644 index 857c21a..0000000 Binary files a/public/img/faces/image-14.png and /dev/null differ diff --git a/public/img/faces/image-15.png b/public/img/faces/image-15.png deleted file mode 100644 index ea45b13..0000000 Binary files a/public/img/faces/image-15.png and /dev/null differ diff --git a/public/img/faces/image-16.png b/public/img/faces/image-16.png deleted file mode 100644 index 7aa97f9..0000000 Binary files a/public/img/faces/image-16.png and /dev/null differ diff --git a/public/img/faces/image-17.png b/public/img/faces/image-17.png deleted file mode 100644 index a90248b..0000000 Binary files a/public/img/faces/image-17.png and /dev/null differ diff --git a/public/img/faces/image-18.png b/public/img/faces/image-18.png deleted file mode 100644 index 3600f01..0000000 Binary files a/public/img/faces/image-18.png and /dev/null differ diff --git a/public/img/faces/image-19.png b/public/img/faces/image-19.png deleted file mode 100644 index 3ed71d7..0000000 Binary files a/public/img/faces/image-19.png and /dev/null differ diff --git a/public/img/faces/image-2.png b/public/img/faces/image-2.png deleted file mode 100644 index 9f3c22b..0000000 Binary files a/public/img/faces/image-2.png and /dev/null differ diff --git a/public/img/faces/image-20.png b/public/img/faces/image-20.png deleted file mode 100644 index 823f1fe..0000000 Binary files a/public/img/faces/image-20.png and /dev/null differ diff --git a/public/img/faces/image-21.png b/public/img/faces/image-21.png deleted file mode 100644 index d700f7f..0000000 Binary files a/public/img/faces/image-21.png and /dev/null differ diff --git a/public/img/faces/image-22.png b/public/img/faces/image-22.png deleted file mode 100644 index 21b6fda..0000000 Binary files a/public/img/faces/image-22.png and /dev/null differ diff --git a/public/img/faces/image-23.png b/public/img/faces/image-23.png deleted file mode 100644 index 90735fc..0000000 Binary files a/public/img/faces/image-23.png and /dev/null differ diff --git a/public/img/faces/image-24.png b/public/img/faces/image-24.png deleted file mode 100644 index 88065f9..0000000 Binary files a/public/img/faces/image-24.png and /dev/null differ diff --git a/public/img/faces/image-25.png b/public/img/faces/image-25.png deleted file mode 100644 index 0b148c4..0000000 Binary files a/public/img/faces/image-25.png and /dev/null differ diff --git a/public/img/faces/image-26.png b/public/img/faces/image-26.png deleted file mode 100644 index 35a9ab4..0000000 Binary files a/public/img/faces/image-26.png and /dev/null differ diff --git a/public/img/faces/image-27.png b/public/img/faces/image-27.png deleted file mode 100644 index 2532068..0000000 Binary files a/public/img/faces/image-27.png and /dev/null differ diff --git a/public/img/faces/image-28.png b/public/img/faces/image-28.png deleted file mode 100644 index f12729f..0000000 Binary files a/public/img/faces/image-28.png and /dev/null differ diff --git a/public/img/faces/image-29.png b/public/img/faces/image-29.png deleted file mode 100644 index d27915b..0000000 Binary files a/public/img/faces/image-29.png and /dev/null differ diff --git a/public/img/faces/image-3.png b/public/img/faces/image-3.png deleted file mode 100644 index 43a14fd..0000000 Binary files a/public/img/faces/image-3.png and /dev/null differ diff --git a/public/img/faces/image-30.png b/public/img/faces/image-30.png deleted file mode 100644 index 2ca4564..0000000 Binary files a/public/img/faces/image-30.png and /dev/null differ diff --git a/public/img/faces/image-31.png b/public/img/faces/image-31.png deleted file mode 100644 index da1ee9a..0000000 Binary files a/public/img/faces/image-31.png and /dev/null differ diff --git a/public/img/faces/image-32.png b/public/img/faces/image-32.png deleted file mode 100644 index 1dd3c80..0000000 Binary files a/public/img/faces/image-32.png and /dev/null differ diff --git a/public/img/faces/image-33.png b/public/img/faces/image-33.png deleted file mode 100644 index 0f41c0a..0000000 Binary files a/public/img/faces/image-33.png and /dev/null differ diff --git a/public/img/faces/image-34.png b/public/img/faces/image-34.png deleted file mode 100644 index 39940d3..0000000 Binary files a/public/img/faces/image-34.png and /dev/null differ diff --git a/public/img/faces/image-35.png b/public/img/faces/image-35.png deleted file mode 100644 index dbee485..0000000 Binary files a/public/img/faces/image-35.png and /dev/null differ diff --git a/public/img/faces/image-36.png b/public/img/faces/image-36.png deleted file mode 100644 index 0bef76e..0000000 Binary files a/public/img/faces/image-36.png and /dev/null differ diff --git a/public/img/faces/image-37.png b/public/img/faces/image-37.png deleted file mode 100644 index 3bc567f..0000000 Binary files a/public/img/faces/image-37.png and /dev/null differ diff --git a/public/img/faces/image-38.png b/public/img/faces/image-38.png deleted file mode 100644 index 493f8db..0000000 Binary files a/public/img/faces/image-38.png and /dev/null differ diff --git a/public/img/faces/image-39.png b/public/img/faces/image-39.png deleted file mode 100644 index ef6ff30..0000000 Binary files a/public/img/faces/image-39.png and /dev/null differ diff --git a/public/img/faces/image-4.png b/public/img/faces/image-4.png deleted file mode 100644 index 9756eab..0000000 Binary files a/public/img/faces/image-4.png and /dev/null differ diff --git a/public/img/faces/image-40.png b/public/img/faces/image-40.png deleted file mode 100644 index cbf6346..0000000 Binary files a/public/img/faces/image-40.png and /dev/null differ diff --git a/public/img/faces/image-41.png b/public/img/faces/image-41.png deleted file mode 100644 index 6ad94eb..0000000 Binary files a/public/img/faces/image-41.png and /dev/null differ diff --git a/public/img/faces/image-42.png b/public/img/faces/image-42.png deleted file mode 100644 index 28f3868..0000000 Binary files a/public/img/faces/image-42.png and /dev/null differ diff --git a/public/img/faces/image-43.png b/public/img/faces/image-43.png deleted file mode 100644 index 88252d7..0000000 Binary files a/public/img/faces/image-43.png and /dev/null differ diff --git a/public/img/faces/image-44.png b/public/img/faces/image-44.png deleted file mode 100644 index 3f5bce0..0000000 Binary files a/public/img/faces/image-44.png and /dev/null differ diff --git a/public/img/faces/image-45.png b/public/img/faces/image-45.png deleted file mode 100644 index 4e689f7..0000000 Binary files a/public/img/faces/image-45.png and /dev/null differ diff --git a/public/img/faces/image-46.png b/public/img/faces/image-46.png deleted file mode 100644 index 83cac2f..0000000 Binary files a/public/img/faces/image-46.png and /dev/null differ diff --git a/public/img/faces/image-47.png b/public/img/faces/image-47.png deleted file mode 100644 index cd06c97..0000000 Binary files a/public/img/faces/image-47.png and /dev/null differ diff --git a/public/img/faces/image-48.png b/public/img/faces/image-48.png deleted file mode 100644 index b901a3a..0000000 Binary files a/public/img/faces/image-48.png and /dev/null differ diff --git a/public/img/faces/image-49.png b/public/img/faces/image-49.png deleted file mode 100644 index a377c40..0000000 Binary files a/public/img/faces/image-49.png and /dev/null differ diff --git a/public/img/faces/image-5.png b/public/img/faces/image-5.png deleted file mode 100644 index e76e51c..0000000 Binary files a/public/img/faces/image-5.png and /dev/null differ diff --git a/public/img/faces/image-50.png b/public/img/faces/image-50.png deleted file mode 100644 index df42cfc..0000000 Binary files a/public/img/faces/image-50.png and /dev/null differ diff --git a/public/img/faces/image-51.png b/public/img/faces/image-51.png deleted file mode 100644 index 04af974..0000000 Binary files a/public/img/faces/image-51.png and /dev/null differ diff --git a/public/img/faces/image-52.png b/public/img/faces/image-52.png deleted file mode 100644 index 294f9cb..0000000 Binary files a/public/img/faces/image-52.png and /dev/null differ diff --git a/public/img/faces/image-53.png b/public/img/faces/image-53.png deleted file mode 100644 index e3a0283..0000000 Binary files a/public/img/faces/image-53.png and /dev/null differ diff --git a/public/img/faces/image-54.png b/public/img/faces/image-54.png deleted file mode 100644 index 30d5de4..0000000 Binary files a/public/img/faces/image-54.png and /dev/null differ diff --git a/public/img/faces/image-55.png b/public/img/faces/image-55.png deleted file mode 100644 index e1a4758..0000000 Binary files a/public/img/faces/image-55.png and /dev/null differ diff --git a/public/img/faces/image-56.png b/public/img/faces/image-56.png deleted file mode 100644 index b43a77d..0000000 Binary files a/public/img/faces/image-56.png and /dev/null differ diff --git a/public/img/faces/image-57.png b/public/img/faces/image-57.png deleted file mode 100644 index 3ad1b93..0000000 Binary files a/public/img/faces/image-57.png and /dev/null differ diff --git a/public/img/faces/image-58.png b/public/img/faces/image-58.png deleted file mode 100644 index bda44c7..0000000 Binary files a/public/img/faces/image-58.png and /dev/null differ diff --git a/public/img/faces/image-59.png b/public/img/faces/image-59.png deleted file mode 100644 index 31cdbb7..0000000 Binary files a/public/img/faces/image-59.png and /dev/null differ diff --git a/public/img/faces/image-6.png b/public/img/faces/image-6.png deleted file mode 100644 index 2bb7a1f..0000000 Binary files a/public/img/faces/image-6.png and /dev/null differ diff --git a/public/img/faces/image-60.png b/public/img/faces/image-60.png deleted file mode 100644 index e7745a2..0000000 Binary files a/public/img/faces/image-60.png and /dev/null differ diff --git a/public/img/faces/image-61.png b/public/img/faces/image-61.png deleted file mode 100644 index 9f280f5..0000000 Binary files a/public/img/faces/image-61.png and /dev/null differ diff --git a/public/img/faces/image-62.png b/public/img/faces/image-62.png deleted file mode 100644 index 28f182e..0000000 Binary files a/public/img/faces/image-62.png and /dev/null differ diff --git a/public/img/faces/image-63.png b/public/img/faces/image-63.png deleted file mode 100644 index a7c5d93..0000000 Binary files a/public/img/faces/image-63.png and /dev/null differ diff --git a/public/img/faces/image-64.png b/public/img/faces/image-64.png deleted file mode 100644 index e72e58f..0000000 Binary files a/public/img/faces/image-64.png and /dev/null differ diff --git a/public/img/faces/image-65.png b/public/img/faces/image-65.png deleted file mode 100644 index 6165416..0000000 Binary files a/public/img/faces/image-65.png and /dev/null differ diff --git a/public/img/faces/image-66.png b/public/img/faces/image-66.png deleted file mode 100644 index 905cecd..0000000 Binary files a/public/img/faces/image-66.png and /dev/null differ diff --git a/public/img/faces/image-7.png b/public/img/faces/image-7.png deleted file mode 100644 index 5e555c8..0000000 Binary files a/public/img/faces/image-7.png and /dev/null differ diff --git a/public/img/faces/image-8.png b/public/img/faces/image-8.png deleted file mode 100644 index b202d7c..0000000 Binary files a/public/img/faces/image-8.png and /dev/null differ diff --git a/public/img/faces/image-9.png b/public/img/faces/image-9.png deleted file mode 100644 index a38624d..0000000 Binary files a/public/img/faces/image-9.png and /dev/null differ diff --git a/public/img/max.jpg b/public/img/max.jpg new file mode 100644 index 0000000..396f701 Binary files /dev/null and b/public/img/max.jpg differ diff --git a/store/index.js b/store/index.js index 6e75940..d58fed0 100644 --- a/store/index.js +++ b/store/index.js @@ -3,33 +3,36 @@ import { Store as PullStateStore } from 'pullstate'; import { lists } from '../mock'; export const images = [ - 'https://images.unsplash.com/photo-1608091526083-86ae8489ae5c?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=2100&q=80', - 'https://images.unsplash.com/photo-1608050072262-7b26ba63fb46?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=2100&q=80', - 'https://images.unsplash.com/photo-1607975218223-94f82613e833?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=934&q=80', - 'https://images.unsplash.com/photo-1608108707326-215150457c9f?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=2100&q=80', - 'https://images.unsplash.com/photo-1608057681073-9399f209e773?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=934&q=80', + 'https://images.unsplash.com/photo-1610235554447-41505d7962f8?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=882&q=80', + 'https://images.unsplash.com/photo-1610212594948-370947a3ba0b?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=934&q=80', + 'https://images.unsplash.com/photo-1610155180433-9994da6a323b?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=1000&q=80', ]; export const homeItems = [ { - title: 'Welcome', + title: 'Exploring Maui', type: 'Blog', - text: 'Welcome to the app!', - author: 'Max', + text: 'We just got back from a trip to Maui, and we had a great time...', + author: 'Max Lynch', + authorAvatar: '/img/max.jpg', image: images[0], }, { - title: 'How to get started', - type: 'Article', - text: 'Getting started with the app is easy! Just follow these 100 steps', - author: 'Max', + title: 'Arctic Adventures', + type: 'Blog', + text: + 'Last month we took a trek to the Arctic Circle. The isolation was just what we needed after...', + author: 'Max Lynch', + authorAvatar: '/img/max.jpg', image: images[1], }, { - title: 'Need help?', - type: 'Support', - text: "We're here to help. Available between the hours of 3am and 3:01am every day", - author: 'Max', + title: 'Frolicking in the Faroe Islands', + type: 'Blog', + text: + 'The Faroe Islands are a North Atlantic archipelago located 320 kilometres (200 mi) north-northwest of Scotland...', + author: 'Max Lynch', + authorAvatar: '/img/max.jpg', image: images[2], }, ];