From f13ba14ce05f6228f038d5f05ec78a4de1afa1f1 Mon Sep 17 00:00:00 2001 From: Satyakam Singhal Date: Sun, 24 May 2020 18:53:03 +0530 Subject: [PATCH 1/7] folder structure updated many lint errors post ad form added minor css changes header removed from home page for now left out changes: - make a separate container inside app for all what was done -correct grid --- Timeline.md | 18 --- package-lock.json | 45 ++++++- public/images/bicycle.jfif | Bin 0 -> 9818 bytes public/images/book.jfif | Bin 0 -> 8764 bytes public/images/cycle.jfif | Bin 0 -> 6671 bytes public/images/laptop.jfif | Bin 0 -> 7385 bytes public/images/matteress.jfif | Bin 0 -> 4467 bytes public/images/mobile.jfif | Bin 0 -> 8610 bytes src/App.tsx | 16 ++- .../{ => CategoryCard}/CategoryCard.css | 0 .../{ => CategoryCard}/CategoryCard.tsx | 9 +- src/components/HeaderCard/HeaderCard.css | 25 ++++ .../{ => HeaderCard}/HeaderCard.tsx | 23 ++-- src/components/ItemCard.tsx | 19 --- src/components/ItemCard/ItemCard.tsx | 21 +++ src/components/ItemDetail/ItemDetail.tsx | 98 ++++++++++++++ src/components/ItemList/ItemList.tsx | 102 +++++++++++++++ src/components/PostAd/PostAd.css | 4 + src/components/PostAd/PostAd.tsx | 120 ++++++++++++++++++ .../{ => RegisterForm}/RegisterForm.css | 0 .../{ => RegisterForm}/RegisterForm.tsx | 2 - src/components/SearchBar.css | 3 - src/components/SearchBar/SearchBar.css | 4 + src/components/{ => SearchBar}/SearchBar.tsx | 3 +- src/pages/{ => Health}/Health.tsx | 0 src/pages/{ => categories}/categories.tsx | 10 +- src/pages/{ => chats}/chats.tsx | 10 +- src/pages/home.tsx | 58 --------- src/pages/{ => home}/home.css | 0 src/pages/home/home.tsx | 78 ++++++++++++ src/pages/myaccount.tsx | 41 ------ src/pages/{ => myaccount}/myaccount.css | 0 src/pages/myaccount/myaccount.tsx | 42 ++++++ 33 files changed, 563 insertions(+), 188 deletions(-) delete mode 100755 Timeline.md create mode 100644 public/images/bicycle.jfif create mode 100644 public/images/book.jfif create mode 100644 public/images/cycle.jfif create mode 100644 public/images/laptop.jfif create mode 100644 public/images/matteress.jfif create mode 100644 public/images/mobile.jfif rename src/components/{ => CategoryCard}/CategoryCard.css (100%) rename src/components/{ => CategoryCard}/CategoryCard.tsx (95%) create mode 100644 src/components/HeaderCard/HeaderCard.css rename src/components/{ => HeaderCard}/HeaderCard.tsx (54%) delete mode 100644 src/components/ItemCard.tsx create mode 100644 src/components/ItemCard/ItemCard.tsx create mode 100644 src/components/ItemDetail/ItemDetail.tsx create mode 100644 src/components/ItemList/ItemList.tsx create mode 100644 src/components/PostAd/PostAd.css create mode 100644 src/components/PostAd/PostAd.tsx rename src/components/{ => RegisterForm}/RegisterForm.css (100%) rename src/components/{ => RegisterForm}/RegisterForm.tsx (98%) delete mode 100644 src/components/SearchBar.css create mode 100644 src/components/SearchBar/SearchBar.css rename src/components/{ => SearchBar}/SearchBar.tsx (83%) rename src/pages/{ => Health}/Health.tsx (100%) rename src/pages/{ => categories}/categories.tsx (59%) rename src/pages/{ => chats}/chats.tsx (58%) delete mode 100644 src/pages/home.tsx rename src/pages/{ => home}/home.css (100%) create mode 100644 src/pages/home/home.tsx delete mode 100644 src/pages/myaccount.tsx rename src/pages/{ => myaccount}/myaccount.css (100%) create mode 100644 src/pages/myaccount/myaccount.tsx diff --git a/Timeline.md b/Timeline.md deleted file mode 100755 index d68e1de..0000000 --- a/Timeline.md +++ /dev/null @@ -1,18 +0,0 @@ -Proposed Project TimeLine -Starts : May 11, 2020 -Week 1: -Frontend - UI layout for Home Page, - UI layout for Login Page, - UI layout for Sign up Page -Week 2: -Frontend - UI layout for Category browsing, - UI layout for Item Detail Page, -Week 3: -Frontend - UI layout for Contact Page, - UI layout for Profile Page, - UI layout for Chats Page, - UI layout complete - diff --git a/package-lock.json b/package-lock.json index 7de2f67..5263932 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2925,6 +2925,15 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -5845,6 +5854,12 @@ "schema-utils": "^2.5.0" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "filesize": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz", @@ -6648,9 +6663,9 @@ "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=" }, "http-proxy": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", - "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "requires": { "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", @@ -7425,7 +7440,11 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } } } }, @@ -8540,6 +8559,12 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "nan": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -13364,7 +13389,11 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0", @@ -13670,7 +13699,11 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "get-caller-file": { "version": "1.0.3", diff --git a/public/images/bicycle.jfif b/public/images/bicycle.jfif new file mode 100644 index 0000000000000000000000000000000000000000..a676c9ff09dbf1772734994dd04413b7ea38906c GIT binary patch literal 9818 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 Fe*xt5Yw*{az(9zcc;NbxPc>fyUZVeCzAR{JW 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 literal 0 HcmV?d00001 diff --git a/public/images/cycle.jfif b/public/images/cycle.jfif new file mode 100644 index 0000000000000000000000000000000000000000..cb0d4c02386fe49e93fff073c48acfcff2507b76 GIT binary patch literal 6671 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 literal 0 HcmV?d00001 diff --git a/public/images/laptop.jfif b/public/images/laptop.jfif new file mode 100644 index 0000000000000000000000000000000000000000..60196464252d6fc96bb82f9630f3bcd5f18c0510 GIT binary patch literal 7385 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 literal 0 HcmV?d00001 diff --git a/public/images/matteress.jfif b/public/images/matteress.jfif new file mode 100644 index 0000000000000000000000000000000000000000..5a43d2ac9a95112d86689de604e0140cb00e4908 GIT binary patch literal 4467 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 kMpw2z8`4kk${aTfS=C@03IxiFgn~kJ30*W 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 dqXbhv? ( @@ -53,6 +56,7 @@ const App: React.FC = () => ( + } diff --git a/src/components/CategoryCard.css b/src/components/CategoryCard/CategoryCard.css similarity index 100% rename from src/components/CategoryCard.css rename to src/components/CategoryCard/CategoryCard.css diff --git a/src/components/CategoryCard.tsx b/src/components/CategoryCard/CategoryCard.tsx similarity index 95% rename from src/components/CategoryCard.tsx rename to src/components/CategoryCard/CategoryCard.tsx index 766b2ee..87e4853 100644 --- a/src/components/CategoryCard.tsx +++ b/src/components/CategoryCard/CategoryCard.tsx @@ -1,12 +1,5 @@ import React from 'react'; -import { - IonGrid, - IonRow, - IonCol, - IonIcon, - IonContent, - IonLabel, -} from '@ionic/react'; +import { IonGrid, IonRow, IonCol, IonIcon, IonLabel } from '@ionic/react'; import { laptopOutline, bicycleOutline, diff --git a/src/components/HeaderCard/HeaderCard.css b/src/components/HeaderCard/HeaderCard.css new file mode 100644 index 0000000..b02d93c --- /dev/null +++ b/src/components/HeaderCard/HeaderCard.css @@ -0,0 +1,25 @@ +.heading { + font-size: 8vw; + text-align:center; +} + +.sub-heading { + + + font-size: 8vw; + text-align:center; +} +.sub-title { + text-align: center; +} + +.reg-btn { + + width: 200px; + text-align: center; + margin-left: auto; + margin-right: auto; + display: flex; + align-items: center; + justify-content: center; +} diff --git a/src/components/HeaderCard.tsx b/src/components/HeaderCard/HeaderCard.tsx similarity index 54% rename from src/components/HeaderCard.tsx rename to src/components/HeaderCard/HeaderCard.tsx index 7357f66..31302a8 100644 --- a/src/components/HeaderCard.tsx +++ b/src/components/HeaderCard/HeaderCard.tsx @@ -1,34 +1,37 @@ import React from 'react'; import { IonCardHeader, - IonCardSubtitle, IonCardTitle, IonCardContent, IonCard, IonButton, } from '@ionic/react'; +import './HeaderCard.css'; +import SearchBar from '../SearchBar/SearchBar'; const HeaderCard: React.FC = () => { return ( - IIT DELHI - Marketplace + Welcome To + + IITD Marketplace + - + Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, we got you covered ! + - + Sign in to start + + + Login + ); diff --git a/src/components/ItemCard.tsx b/src/components/ItemCard.tsx deleted file mode 100644 index 88999a9..0000000 --- a/src/components/ItemCard.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import { IonItem, IonLabel, IonThumbnail } from '@ionic/react'; - -const ItemCard: React.FC = () => { - return ( - - - Hero thunderbird -

Rs.2500

-

Zanskar

- - - - - - ); -}; - -export default ItemCard; diff --git a/src/components/ItemCard/ItemCard.tsx b/src/components/ItemCard/ItemCard.tsx new file mode 100644 index 0000000..ea1b11b --- /dev/null +++ b/src/components/ItemCard/ItemCard.tsx @@ -0,0 +1,21 @@ +import React from 'react'; +import { IonCard, IonCardHeader, IonCardSubtitle } from '@ionic/react'; + +class ItemCard extends React.Component { + render() { + const { item } = this.props; + return ( +
+ + + + {item.name} Rs.{' '} + {item.price} + + +
+ ); + } +} + +export default ItemCard; diff --git a/src/components/ItemDetail/ItemDetail.tsx b/src/components/ItemDetail/ItemDetail.tsx new file mode 100644 index 0000000..343d313 --- /dev/null +++ b/src/components/ItemDetail/ItemDetail.tsx @@ -0,0 +1,98 @@ +import React from 'react'; +import { + IonContent, + IonHeader, + IonPage, + IonChip, + IonToolbar, + IonCard, + IonCardHeader, + IonCardSubtitle, + IonCardTitle, + IonCardContent, + IonIcon, + IonLabel, + IonButton, + IonText, +} from '@ionic/react'; +import { locationOutline } from 'ionicons/icons'; + +const ItemDetail: React.FC = () => { + return ( + + + + + + + Asus Tuf GT505 + + Rs. 40000 + + + + + + + + + Electronics + + + Laptops + + + + + + + Seller Details + + + N. Satwik + +

+ {' '} + {' '} + Zanskar House +

+ + + Chat With Seller + + + + + + + Product Details + + +
    +
  • 4 months old
    • +
  • 8 GB RAM, 512 GB SSD, i5 9th gen
    • +
  • RGB keyboard
    • +
  • ...
    • +
  • ...
    • +
+ + + + + + Reviews + + + + + + ); +}; + +export default ItemDetail; diff --git a/src/components/ItemList/ItemList.tsx b/src/components/ItemList/ItemList.tsx new file mode 100644 index 0000000..fb78066 --- /dev/null +++ b/src/components/ItemList/ItemList.tsx @@ -0,0 +1,102 @@ +import React from 'react'; +import { IonCol, IonRow } from '@ionic/react'; +import ItemCard from '../ItemCard/ItemCard'; + +class ItemList extends React.Component { + state = { + items: [ + { + id: 1, + name: 'Asus Laptop', + price: 40000, + category: 'laptop', + image: '/images/laptop.jfif', + }, + { + id: 2, + name: 'Macbook Air', + price: 60000, + category: 'laptop', + image: '/images/laptop.jfif', + }, + { + id: 3, + name: 'Hero Thunderbird', + price: 4000, + category: 'bicycle', + image: '/images/bicycle.jfif', + }, + { + id: 4, + name: 'Decathlon BTWX 100', + price: 5000, + category: 'bicycle', + image: '/images/bicycle.jfif', + }, + { + id: 5, + name: 'Samsung S10e', + price: 25000, + category: 'mobile', + image: '/images/mobile.jfif', + }, + { + id: 6, + name: 'Vivo V15', + price: 14000, + category: 'mobile', + image: '/images/mobile.jfif', + }, + { + id: 7, + name: 'Kurl On memory foam ', + price: 2000, + category: 'matteress', + image: '/images/matteress.jfif', + }, + { + id: 8, + name: 'SleepX', + price: 1500, + category: 'matteress', + image: '/images/matteress.jfif', + }, + { + id: 9, + name: 'Order of the phoenix', + price: 300, + category: 'book', + image: '/images/book.jfif', + }, + { + id: 10, + name: 'Differential Equation - Kreyzig', + price: 200, + category: 'book', + image: '/images/book.jfif', + }, + ], + }; + + render() { + const itemList = this.state.items.map((item) => { + if (this.props.category === 'all') { + return ( + + + + ); + } + if (this.props.category === item.category) { + return ( + + + + ); + } + }); + + return {itemList}; + } +} +export default ItemList; diff --git a/src/components/PostAd/PostAd.css b/src/components/PostAd/PostAd.css new file mode 100644 index 0000000..e2b81f0 --- /dev/null +++ b/src/components/PostAd/PostAd.css @@ -0,0 +1,4 @@ +.regbuttons { + align-content: center; + width:20%; +} \ No newline at end of file diff --git a/src/components/PostAd/PostAd.tsx b/src/components/PostAd/PostAd.tsx new file mode 100644 index 0000000..18fcf5c --- /dev/null +++ b/src/components/PostAd/PostAd.tsx @@ -0,0 +1,120 @@ +import React, { useState } from 'react'; +// eslint-disable-next-line @typescript-eslint/no-unused-vars +import './PostAd.css'; + +import { + IonTitle, + IonToolbar, + IonSelect, + IonSelectOption, + IonInput, + IonItem, + IonLabel, + IonList, + IonButton, +} from '@ionic/react'; + +const PostAd: React.FC = () => { + const [name, setName] = useState(); + const [date, setDate] = useState(); + const [condition, setCondition] = useState(); + const [price, setPrice] = useState(); + const [category, setCategory] = useState(); + const [description, setDescription] = useState(); + + return ( +
+ + Post Your Ad + +
+ + + + Name of The Product + + setName(e.detail.value!)} + required + /> + + + + Tentative Date of Purchase + + setDate(e.detail.value!)} + required + /> + + + + Condition + + setCondition(e.detail.value!)} + required + /> + + + + + Category + + setCategory(e.detail.value)} + > + Laptops + Mobile + Books + Cycle + Miscallaneous + + + + + Asking Price + + setPrice(e.detail.value!)} + required + /> + + + + Description + + setDescription(e.detail.value!)} + required + /> + + + + + +
+
+ + Post + +
+
+ ); +}; + +export default PostAd; diff --git a/src/components/RegisterForm.css b/src/components/RegisterForm/RegisterForm.css similarity index 100% rename from src/components/RegisterForm.css rename to src/components/RegisterForm/RegisterForm.css diff --git a/src/components/RegisterForm.tsx b/src/components/RegisterForm/RegisterForm.tsx similarity index 98% rename from src/components/RegisterForm.tsx rename to src/components/RegisterForm/RegisterForm.tsx index 5f7e6b7..3acef6f 100644 --- a/src/components/RegisterForm.tsx +++ b/src/components/RegisterForm/RegisterForm.tsx @@ -1,6 +1,5 @@ import React, { useState } from 'react'; import { - IonHeader, IonTitle, IonToolbar, IonSelect, @@ -10,7 +9,6 @@ import { IonLabel, IonList, IonButton, - IonBackButton, } from '@ionic/react'; import './RegisterForm.css'; diff --git a/src/components/SearchBar.css b/src/components/SearchBar.css deleted file mode 100644 index a93a59e..0000000 --- a/src/components/SearchBar.css +++ /dev/null @@ -1,3 +0,0 @@ -ion-toolbar{ - padding-top: 2em; -} diff --git a/src/components/SearchBar/SearchBar.css b/src/components/SearchBar/SearchBar.css new file mode 100644 index 0000000..21e968a --- /dev/null +++ b/src/components/SearchBar/SearchBar.css @@ -0,0 +1,4 @@ +.search { + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx similarity index 83% rename from src/components/SearchBar.tsx rename to src/components/SearchBar/SearchBar.tsx index ba9e7e2..5fb7944 100644 --- a/src/components/SearchBar.tsx +++ b/src/components/SearchBar/SearchBar.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { IonHeader, IonToolbar, IonSearchbar } from '@ionic/react'; +import { IonToolbar, IonSearchbar } from '@ionic/react'; import './SearchBar.css'; const SearchBar: React.FC = () => { @@ -7,6 +7,7 @@ const SearchBar: React.FC = () => { return ( setSearchText(e.detail.value!)} placeholder="Search for laptops, cycles..." diff --git a/src/pages/Health.tsx b/src/pages/Health/Health.tsx similarity index 100% rename from src/pages/Health.tsx rename to src/pages/Health/Health.tsx diff --git a/src/pages/categories.tsx b/src/pages/categories/categories.tsx similarity index 59% rename from src/pages/categories.tsx rename to src/pages/categories/categories.tsx index fe7c4e2..2edc736 100644 --- a/src/pages/categories.tsx +++ b/src/pages/categories/categories.tsx @@ -1,12 +1,6 @@ import React from 'react'; -import { - IonContent, - IonHeader, - IonPage, - IonTitle, - IonToolbar, -} from '@ionic/react'; -import CategoryCard from '../components/CategoryCard'; +import { IonContent, IonPage } from '@ionic/react'; +import CategoryCard from '../../components/CategoryCard/CategoryCard'; const categories: React.FC = () => { return ( diff --git a/src/pages/chats.tsx b/src/pages/chats/chats.tsx similarity index 58% rename from src/pages/chats.tsx rename to src/pages/chats/chats.tsx index 0e8352b..9f74612 100644 --- a/src/pages/chats.tsx +++ b/src/pages/chats/chats.tsx @@ -1,12 +1,6 @@ import React from 'react'; -import { - IonContent, - IonHeader, - IonPage, - IonTitle, - IonToolbar, -} from '@ionic/react'; -import HeaderCard from '../components/HeaderCard'; +import { IonContent, IonPage } from '@ionic/react'; +import HeaderCard from '../../components/HeaderCard/HeaderCard'; const chats: React.FC = () => { return ( diff --git a/src/pages/home.tsx b/src/pages/home.tsx deleted file mode 100644 index d132796..0000000 --- a/src/pages/home.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import React from 'react'; -import { - IonContent, - IonLabel, - IonSearchbar, - IonHeader, - IonPage, - IonFab, - IonFabButton, - IonIcon, - IonToolbar, - IonFabList, - IonGrid, - IonRow, - IonFooter, -} from '@ionic/react'; -import { - add, - createOutline, - laptopOutline, - phonePortraitOutline, - bicycleOutline, - libraryOutline, - tabletLandscapeOutline, - appsOutline, -} from 'ionicons/icons'; -import './home.css'; -import SearchBar from '../components/SearchBar'; -import HeaderCard from '../components/HeaderCard'; -import ItemCard from '../components/ItemCard'; -import CategoryCard from '../components/CategoryCard'; - -const home: React.FC = () => { - return ( - - - - - - - - - - - - - - - - Post an Ad - - - - - ); -}; - -export default home; diff --git a/src/pages/home.css b/src/pages/home/home.css similarity index 100% rename from src/pages/home.css rename to src/pages/home/home.css diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx new file mode 100644 index 0000000..bef5148 --- /dev/null +++ b/src/pages/home/home.tsx @@ -0,0 +1,78 @@ +import React from 'react'; +import { + IonContent, + IonLabel, + IonSegment, + IonSegmentButton, + IonPage, + IonFab, + IonFabButton, + IonIcon, + IonToolbar, + IonFabList, +} from '@ionic/react'; +import { add, createOutline } from 'ionicons/icons'; +import './home.css'; +import HeaderCard from '../../components/HeaderCard/HeaderCard'; +import ItemList from '../../components/ItemList/ItemList'; +// import CategoryCard from '../../components/CategoryCard/CategoryCard'; + +class Home extends React.Component { + // eslint-disable-next-line react/destructuring-assignment + // eslint-disable-next-line react/state-in-constructor + state = { + category: 'all', + }; + + render() { + return ( + + + + + + + this.setState({ category: e.detail.value }) + } + color="primary" + > + + All + + + Laptops + + + Mobiles + + + Bicycles + + + Books + + + + + + + + + + + Post an Ad + + + + + ); + } +} + +export default Home; diff --git a/src/pages/myaccount.tsx b/src/pages/myaccount.tsx deleted file mode 100644 index 930de32..0000000 --- a/src/pages/myaccount.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from 'react'; -import { - IonContent, - IonButton, - IonIcon, - IonHeader, - IonPage, - IonItem, - IonLabel, - IonThumbnail, - IonToolbar, -} from '@ionic/react'; -import './myaccount.css'; -import HeaderCard from '../components/HeaderCard'; - -const myaccount: React.FC = () => { - return ( - - - -

-
- - Guest User - - - - -
-
-
- - - - - - - ); -}; - -export default myaccount; diff --git a/src/pages/myaccount.css b/src/pages/myaccount/myaccount.css similarity index 100% rename from src/pages/myaccount.css rename to src/pages/myaccount/myaccount.css diff --git a/src/pages/myaccount/myaccount.tsx b/src/pages/myaccount/myaccount.tsx new file mode 100644 index 0000000..e081787 --- /dev/null +++ b/src/pages/myaccount/myaccount.tsx @@ -0,0 +1,42 @@ +import React from 'react'; +import { + IonContent, + IonHeader, + IonPage, + IonItem, + IonLabel, + IonThumbnail, + IonToolbar, +} from '@ionic/react'; +import './myaccount.css'; +import HeaderCard from '../../components/HeaderCard/HeaderCard'; + +const myaccount: React.FC = () => { + return ( + + + +

+
+ + Guest User + + + + +
+
+
+ + + + + + + ); +}; + +export default myaccount; From a2e99c7121f0bf7f4b75f1e4ef64ef3f55b3d1f4 Mon Sep 17 00:00:00 2001 From: Satyakam Singhal Date: Sun, 24 May 2020 19:01:26 +0530 Subject: [PATCH 2/7] timeline --- Timeline.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 Timeline.md diff --git a/Timeline.md b/Timeline.md new file mode 100755 index 0000000..5bdfdbb --- /dev/null +++ b/Timeline.md @@ -0,0 +1,27 @@ +# Proposed Project TimeLine + +### Starts : May 11, 2020 +**** +#### Week 1: +##### Frontend +- [x] UI layout for Home Page, +- [x] UI layout for Login Page, +- [x] UI layout for Sign up Page + +**** + +#### Week 2: +##### Frontend +- [x] UI layout for Category browsing, +- [x] UI layout for Item Detail Page, + + +**** + +#### Week 3: +##### Frontend +- [ ] UI layout for Contact Page, +- [ ] UI layout for Profile Page, +- [ ] UI layout for Chats Page, +- [ ] UI layout complete + From 5aa0dca8b7524437c2bbea5eef684d7b15ee704f Mon Sep 17 00:00:00 2001 From: Satyakam Singhal Date: Tue, 26 May 2020 18:03:15 +0530 Subject: [PATCH 3/7] changes by om --- package-lock.json | 48 +++++++++++++++++ package.json | 3 ++ src/App.tsx | 2 + src/components/ItemCard/ItemCard.tsx | 2 +- src/components/ItemList/ItemList.tsx | 81 ++-------------------------- src/index.tsx | 9 +++- src/pages/home/home.tsx | 14 +++-- src/reducers/authReducer.tsx | 7 +++ src/reducers/itemReducer.tsx | 80 +++++++++++++++++++++++++++ src/reducers/rootReducer.tsx | 11 ++++ tsconfig.json | 3 +- 11 files changed, 178 insertions(+), 82 deletions(-) create mode 100644 src/reducers/authReducer.tsx create mode 100644 src/reducers/itemReducer.tsx create mode 100644 src/reducers/rootReducer.tsx diff --git a/package-lock.json b/package-lock.json index 5263932..9b1449f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1631,6 +1631,16 @@ "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz", "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==" }, + "@types/hoist-non-react-statics": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "dev": true, + "requires": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, "@types/istanbul-lib-coverage": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", @@ -1708,6 +1718,18 @@ "@types/react": "*" } }, + "@types/react-redux": { + "version": "7.1.9", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.9.tgz", + "integrity": "sha512-mpC0jqxhP4mhmOl3P4ipRsgTgbNofMRXJb08Ms6gekViLj61v1hOZEKWDCyWsdONr6EjEA6ZHXC446wdywDe0w==", + "dev": true, + "requires": { + "@types/hoist-non-react-statics": "^3.3.0", + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0", + "redux": "^4.0.0" + } + }, "@types/react-router": { "version": "5.1.7", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.7.tgz", @@ -10988,6 +11010,18 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "react-redux": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.0.tgz", + "integrity": "sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==", + "requires": { + "@babel/runtime": "^7.5.5", + "hoist-non-react-statics": "^3.3.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.7.2", + "react-is": "^16.9.0" + } + }, "react-router": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz", @@ -11198,6 +11232,15 @@ "strip-indent": "^3.0.0" } }, + "redux": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz", + "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==", + "requires": { + "loose-envify": "^1.4.0", + "symbol-observable": "^1.2.0" + } + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -12655,6 +12698,11 @@ "util.promisify": "~1.0.0" } }, + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", diff --git a/package.json b/package.json index acf6dd3..6f72d61 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,11 @@ "ionicons": "^5.0.0", "react": "^16.13.0", "react-dom": "^16.13.0", + "react-redux": "^7.2.0", "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "react-scripts": "3.4.1", + "redux": "^4.0.5", "typescript": "3.8.3" }, "scripts": { @@ -52,6 +54,7 @@ }, "devDependencies": { "@capacitor/cli": "2.1.0", + "@types/react-redux": "^7.1.9", "eslint-config-airbnb-typescript-prettier": "^2.1.1", "prettier": "^2.0.5" }, diff --git a/src/App.tsx b/src/App.tsx index 07696fe..a9ed7f0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -23,6 +23,7 @@ import MyAccount from './pages/myaccount/myaccount'; /* new imports */ import RegisterForm from './components/RegisterForm/RegisterForm'; import Health from './pages/Health/Health'; +import ItemDetail from './components/ItemDetail/ItemDetail' import PostAd from './components/PostAd/PostAd'; /* Core CSS required for Ionic components to work properly */ @@ -57,6 +58,7 @@ const App: React.FC = () => ( + } diff --git a/src/components/ItemCard/ItemCard.tsx b/src/components/ItemCard/ItemCard.tsx index ea1b11b..6fd075d 100644 --- a/src/components/ItemCard/ItemCard.tsx +++ b/src/components/ItemCard/ItemCard.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { IonCard, IonCardHeader, IonCardSubtitle } from '@ionic/react'; -class ItemCard extends React.Component { +class ItemCard extends React.Component { render() { const { item } = this.props; return ( diff --git a/src/components/ItemList/ItemList.tsx b/src/components/ItemList/ItemList.tsx index fb78066..e15020b 100644 --- a/src/components/ItemList/ItemList.tsx +++ b/src/components/ItemList/ItemList.tsx @@ -1,85 +1,14 @@ import React from 'react'; import { IonCol, IonRow } from '@ionic/react'; import ItemCard from '../ItemCard/ItemCard'; +import categories from '../../pages/categories/categories'; -class ItemList extends React.Component { - state = { - items: [ - { - id: 1, - name: 'Asus Laptop', - price: 40000, - category: 'laptop', - image: '/images/laptop.jfif', - }, - { - id: 2, - name: 'Macbook Air', - price: 60000, - category: 'laptop', - image: '/images/laptop.jfif', - }, - { - id: 3, - name: 'Hero Thunderbird', - price: 4000, - category: 'bicycle', - image: '/images/bicycle.jfif', - }, - { - id: 4, - name: 'Decathlon BTWX 100', - price: 5000, - category: 'bicycle', - image: '/images/bicycle.jfif', - }, - { - id: 5, - name: 'Samsung S10e', - price: 25000, - category: 'mobile', - image: '/images/mobile.jfif', - }, - { - id: 6, - name: 'Vivo V15', - price: 14000, - category: 'mobile', - image: '/images/mobile.jfif', - }, - { - id: 7, - name: 'Kurl On memory foam ', - price: 2000, - category: 'matteress', - image: '/images/matteress.jfif', - }, - { - id: 8, - name: 'SleepX', - price: 1500, - category: 'matteress', - image: '/images/matteress.jfif', - }, - { - id: 9, - name: 'Order of the phoenix', - price: 300, - category: 'book', - image: '/images/book.jfif', - }, - { - id: 10, - name: 'Differential Equation - Kreyzig', - price: 200, - category: 'book', - image: '/images/book.jfif', - }, - ], - }; + +class ItemList extends React.Component{ render() { - const itemList = this.state.items.map((item) => { + + const itemList = this.props.items.map((item) => { if (this.props.category === 'all') { return ( diff --git a/src/index.tsx b/src/index.tsx index b597a44..6364994 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,4 +2,11 @@ import React from 'react'; import ReactDOM from 'react-dom'; import App from './App'; -ReactDOM.render(, document.getElementById('root')); +import { createStore } from 'redux' +import rootReducer from './reducers/rootReducer' + +import { Provider } from 'react-redux' + +const store = createStore(rootReducer); + +ReactDOM.render(, document.getElementById('root')); diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index bef5148..b71fc85 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -17,7 +17,9 @@ import HeaderCard from '../../components/HeaderCard/HeaderCard'; import ItemList from '../../components/ItemList/ItemList'; // import CategoryCard from '../../components/CategoryCard/CategoryCard'; -class Home extends React.Component { +import { connect } from 'react-redux' + +class Home extends React.Component { // eslint-disable-next-line react/destructuring-assignment // eslint-disable-next-line react/state-in-constructor state = { @@ -55,7 +57,7 @@ class Home extends React.Component { - + @@ -75,4 +77,10 @@ class Home extends React.Component { } } -export default Home; +const mapStatetoProps = (state: { item: { items: any; }; }) => { + return { + items : state.item.items + } +} + +export default connect(mapStatetoProps)(Home); diff --git a/src/reducers/authReducer.tsx b/src/reducers/authReducer.tsx new file mode 100644 index 0000000..0ae0bc9 --- /dev/null +++ b/src/reducers/authReducer.tsx @@ -0,0 +1,7 @@ +const initState = {} + +const authReducer = (state = initState,action={}) => { + return state +} + +export default authReducer \ No newline at end of file diff --git a/src/reducers/itemReducer.tsx b/src/reducers/itemReducer.tsx new file mode 100644 index 0000000..8e09c7e --- /dev/null +++ b/src/reducers/itemReducer.tsx @@ -0,0 +1,80 @@ +const initState = { + items: [ + { + id: 1, + name: 'Asus Laptop', + price: 40000, + category: 'laptop', + image: '/images/laptop.jfif', + }, + { + id: 2, + name: 'Macbook Air', + price: 60000, + category: 'laptop', + image: '/images/laptop.jfif', + }, + { + id: 3, + name: 'Hero Thunderbird', + price: 4000, + category: 'bicycle', + image: '/images/bicycle.jfif', + }, + { + id: 4, + name: 'Decathlon BTWX 100', + price: 5000, + category: 'bicycle', + image: '/images/bicycle.jfif', + }, + { + id: 5, + name: 'Samsung S10e', + price: 25000, + category: 'mobile', + image: '/images/mobile.jfif', + }, + { + id: 6, + name: 'Vivo V15', + price: 14000, + category: 'mobile', + image: '/images/mobile.jfif', + }, + { + id: 7, + name: 'Kurl On memory foam ', + price: 2000, + category: 'matteress', + image: '/images/matteress.jfif', + }, + { + id: 8, + name: 'SleepX', + price: 1500, + category: 'matteress', + image: '/images/matteress.jfif', + }, + { + id: 9, + name: 'Order of the phoenix', + price: 300, + category: 'book', + image: '/images/book.jfif', + }, + { + id: 10, + name: 'Differential Equation - Kreyzig', + price: 200, + category: 'book', + image: '/images/book.jfif', + }, + ], +} + +const itemReducer = (state = initState,action) => { + return state +} + +export default itemReducer \ No newline at end of file diff --git a/src/reducers/rootReducer.tsx b/src/reducers/rootReducer.tsx new file mode 100644 index 0000000..57fd7ec --- /dev/null +++ b/src/reducers/rootReducer.tsx @@ -0,0 +1,11 @@ +import authReducer from './authReducer' +import itemReducer from './itemReducer' + +import { combineReducers } from 'redux' + +const rootReducer = combineReducers ({ + auth : authReducer, + item : itemReducer +}) + +export default rootReducer; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index f2850b7..4dc65a1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,8 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react" + "jsx": "react", + "noImplicitAny": false }, "include": [ "src" From 2870cd7ce7ce5bdf6346f13afe0379ce77cd3c98 Mon Sep 17 00:00:00 2001 From: Satyakam Singhal Date: Tue, 26 May 2020 23:20:55 +0530 Subject: [PATCH 4/7] myaccount / minor changes in header fixed all lint errors --- package-lock.json | 5 + package.json | 1 + src/App.tsx | 6 +- src/components/HeaderCard/HeaderCard.css | 7 +- src/components/HeaderCard/HeaderCard.tsx | 16 +-- src/components/ItemList/ItemList.tsx | 5 +- src/pages/home/home.css | 4 + src/pages/home/home.tsx | 35 +++++-- src/pages/myaccount/myaccount.css | 18 +++- src/pages/myaccount/myaccount.tsx | 125 +++++++++++++++++++---- 10 files changed, 170 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b1449f..01f0af9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1065,6 +1065,11 @@ "tslib": "^1.9.0" } }, + "@capacitor/ios": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-2.1.0.tgz", + "integrity": "sha512-KE5hGQiv86Ply/WvT5OvrRBcbM+XdqbGkfp03hK8TG8tYNvJw4mXT3+bH5QsOVOI23o4LVzRWtwPmDyxCw+Pyw==" + }, "@cnakazawa/watch": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", diff --git a/package.json b/package.json index 6f72d61..06d3ae0 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "dependencies": { "@capacitor/core": "2.1.0", + "@capacitor/ios": "^2.1.0", "@ionic/react": "^5.0.7", "@ionic/react-router": "^5.0.7", "@testing-library/jest-dom": "^4.2.4", diff --git a/src/App.tsx b/src/App.tsx index a9ed7f0..d8e829c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -23,8 +23,7 @@ import MyAccount from './pages/myaccount/myaccount'; /* new imports */ import RegisterForm from './components/RegisterForm/RegisterForm'; import Health from './pages/Health/Health'; -import ItemDetail from './components/ItemDetail/ItemDetail' - +import ItemDetail from './components/ItemDetail/ItemDetail'; import PostAd from './components/PostAd/PostAd'; /* Core CSS required for Ionic components to work properly */ import '@ionic/react/css/core.css'; @@ -45,7 +44,6 @@ import '@ionic/react/css/display.css'; /* Theme variables */ import './theme/variables.css'; - const App: React.FC = () => ( @@ -55,7 +53,7 @@ const App: React.FC = () => ( - + diff --git a/src/components/HeaderCard/HeaderCard.css b/src/components/HeaderCard/HeaderCard.css index b02d93c..2424873 100644 --- a/src/components/HeaderCard/HeaderCard.css +++ b/src/components/HeaderCard/HeaderCard.css @@ -17,9 +17,10 @@ width: 200px; text-align: center; - margin-left: auto; - margin-right: auto; - display: flex; + display: inline-block; align-items: center; justify-content: center; } +.wrapper { + text-align: center; +} diff --git a/src/components/HeaderCard/HeaderCard.tsx b/src/components/HeaderCard/HeaderCard.tsx index 31302a8..ce2adb3 100644 --- a/src/components/HeaderCard/HeaderCard.tsx +++ b/src/components/HeaderCard/HeaderCard.tsx @@ -7,7 +7,6 @@ import { IonButton, } from '@ionic/react'; import './HeaderCard.css'; -import SearchBar from '../SearchBar/SearchBar'; const HeaderCard: React.FC = () => { return ( @@ -23,15 +22,16 @@ const HeaderCard: React.FC = () => { Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, we got you covered ! - - - Sign in to start - +
+ + Sign in to start + - - Login - + + Login + +
); diff --git a/src/components/ItemList/ItemList.tsx b/src/components/ItemList/ItemList.tsx index e15020b..b2966bc 100644 --- a/src/components/ItemList/ItemList.tsx +++ b/src/components/ItemList/ItemList.tsx @@ -3,11 +3,8 @@ import { IonCol, IonRow } from '@ionic/react'; import ItemCard from '../ItemCard/ItemCard'; import categories from '../../pages/categories/categories'; - - -class ItemList extends React.Component{ +class ItemList extends React.Component { render() { - const itemList = this.props.items.map((item) => { if (this.props.category === 'all') { return ( diff --git a/src/pages/home/home.css b/src/pages/home/home.css index 34bc0a9..33a94d1 100644 --- a/src/pages/home/home.css +++ b/src/pages/home/home.css @@ -17,4 +17,8 @@ ion-col{ ion-header{ padding-top:2em; + } + + .title { + font-size:1px; } \ No newline at end of file diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index b71fc85..04d71b2 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -10,16 +10,20 @@ import { IonIcon, IonToolbar, IonFabList, + IonHeader, + IonTitle, + IonCol, + IonRow, } from '@ionic/react'; import { add, createOutline } from 'ionicons/icons'; import './home.css'; +import { connect } from 'react-redux'; import HeaderCard from '../../components/HeaderCard/HeaderCard'; import ItemList from '../../components/ItemList/ItemList'; +import SearchBar from '../../components/SearchBar/SearchBar'; // import CategoryCard from '../../components/CategoryCard/CategoryCard'; -import { connect } from 'react-redux' - -class Home extends React.Component { +class Home extends React.Component { // eslint-disable-next-line react/destructuring-assignment // eslint-disable-next-line react/state-in-constructor state = { @@ -30,6 +34,18 @@ class Home extends React.Component { return ( + + + + + Home + + + + + + + @@ -57,7 +73,10 @@ class Home extends React.Component { - + @@ -77,10 +96,10 @@ class Home extends React.Component { } } -const mapStatetoProps = (state: { item: { items: any; }; }) => { +const mapStatetoProps = (state: { item: { items: any } }) => { return { - items : state.item.items - } -} + items: state.item.items, + }; +}; export default connect(mapStatetoProps)(Home); diff --git a/src/pages/myaccount/myaccount.css b/src/pages/myaccount/myaccount.css index 0afcaf6..1d4c784 100644 --- a/src/pages/myaccount/myaccount.css +++ b/src/pages/myaccount/myaccount.css @@ -1,6 +1,16 @@ +.effect { + border: 1px solid #ccc; + padding: 7px 14px; + transition: 0.4s; + background: transparent; + color:black; +} +.avatar { + height:100px; + width:100px; + position: relative; + display: block; + margin-left: auto; + margin-right: auto; -.buttons{ - text-align: center; - padding:2em; - padding-top:6em; } \ No newline at end of file diff --git a/src/pages/myaccount/myaccount.tsx b/src/pages/myaccount/myaccount.tsx index e081787..b4e86d0 100644 --- a/src/pages/myaccount/myaccount.tsx +++ b/src/pages/myaccount/myaccount.tsx @@ -2,41 +2,124 @@ import React from 'react'; import { IonContent, IonHeader, - IonPage, + IonButton, IonItem, IonLabel, - IonThumbnail, IonToolbar, + IonTitle, + IonGrid, + IonRow, + IonCol, + IonInput, + IonSegment, + IonSegmentButton, + IonPage, } from '@ionic/react'; import './myaccount.css'; -import HeaderCard from '../../components/HeaderCard/HeaderCard'; -const myaccount: React.FC = () => { +const Myaccount: React.FC = () => { return ( - + -

-
- - Guest User - - - - -
-
-
+ Profile - +
+ + + +
+ + + + Profile + + + Buy/Sell History + + + + + + +
+ Name +
+ +
+ +
+ + +
+ Entry No. +
+
+ +
+ + + +
+ Phone No. +
+
+ +
+ + +
+ Hostel +
+ +
+ +
+ + + +
+ Email +
+
+ +
+ + + Update + + + + + Get on Appstore + + + Get on Appstore + + + + + Contact For Help + + + ); }; -export default myaccount; +export default Myaccount; From 3c26c25a3bcf5d9c12adddcd2dbc4e0a967b1322 Mon Sep 17 00:00:00 2001 From: Satyakam Singhal Date: Sun, 31 May 2020 17:28:17 +0530 Subject: [PATCH 5/7] profile --- package-lock.json | 264 ++++++++++++++++++- package.json | 7 +- src/App.test.tsx | 14 +- src/App.tsx | 170 ++++++------ src/axios-ins.tsx | 7 + src/components/CategoryCard/CategoryCard.css | 15 +- src/components/CategoryCard/CategoryCard.tsx | 153 +++++------ src/components/HeaderCard/HeaderCard.css | 1 + src/components/HeaderCard/HeaderCard.tsx | 70 ++--- src/components/ItemCard/ItemCard.tsx | 33 ++- src/components/ItemDetail/ItemDetail.tsx | 172 ++++++------ src/components/ItemList/ItemList.tsx | 48 ++-- src/components/PostAd/PostAd.css | 4 + src/components/PostAd/PostAd.tsx | 233 ++++++++-------- src/components/RegisterForm/RegisterForm.tsx | 160 +++++------ src/components/SearchBar/SearchBar.css | 7 +- src/components/SearchBar/SearchBar.tsx | 29 +- src/index.tsx | 23 +- src/pages/Health/Health.tsx | 11 +- src/pages/categories/categories.tsx | 39 ++- src/pages/chats/chats.tsx | 38 ++- src/pages/home/home.css | 4 - src/pages/home/home.tsx | 192 +++++++------- src/pages/home/home2.css | 40 +++ src/pages/home/home2.tsx | 150 +++++++++++ src/pages/myaccount/myaccount.css | 6 +- src/pages/myaccount/myaccount.tsx | 230 ++++++++-------- src/pages/register/register.tsx | 16 ++ src/reducers/authReducer.tsx | 7 - src/reducers/itemReducer.tsx | 80 ------ src/reducers/rootReducer.tsx | 11 - src/serviceWorker.ts | 216 ++++++++------- src/setupTests.ts | 2 +- src/store/actions/actionTypes.tsx | 51 ++++ src/store/actions/auth.tsx | 44 ++++ src/store/actions/chat.tsx | 13 + src/store/actions/index.tsx | 2 + src/store/actions/item.tsx | 146 ++++++++++ src/store/actions/misc.tsx | 79 ++++++ src/store/actions/review.tsx | 151 +++++++++++ src/store/reducers/auth.tsx | 7 + src/store/reducers/index.tsx | 11 + src/store/reducers/item.tsx | 80 ++++++ 43 files changed, 2029 insertions(+), 1007 deletions(-) create mode 100644 src/axios-ins.tsx create mode 100644 src/pages/home/home2.css create mode 100644 src/pages/home/home2.tsx create mode 100644 src/pages/register/register.tsx delete mode 100644 src/reducers/authReducer.tsx delete mode 100644 src/reducers/itemReducer.tsx delete mode 100644 src/reducers/rootReducer.tsx create mode 100644 src/store/actions/actionTypes.tsx create mode 100644 src/store/actions/auth.tsx create mode 100644 src/store/actions/chat.tsx create mode 100644 src/store/actions/index.tsx create mode 100644 src/store/actions/item.tsx create mode 100644 src/store/actions/misc.tsx create mode 100644 src/store/actions/review.tsx create mode 100644 src/store/reducers/auth.tsx create mode 100644 src/store/reducers/index.tsx create mode 100644 src/store/reducers/item.tsx diff --git a/package-lock.json b/package-lock.json index 01f0af9..c859a29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1065,11 +1065,6 @@ "tslib": "^1.9.0" } }, - "@capacitor/ios": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-2.1.0.tgz", - "integrity": "sha512-KE5hGQiv86Ply/WvT5OvrRBcbM+XdqbGkfp03hK8TG8tYNvJw4mXT3+bH5QsOVOI23o4LVzRWtwPmDyxCw+Pyw==" - }, "@cnakazawa/watch": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", @@ -1754,6 +1749,12 @@ "@types/react-router": "*" } }, + "@types/socket.io-client": { + "version": "1.4.33", + "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz", + "integrity": "sha512-m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ==", + "dev": true + }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", @@ -2185,6 +2186,11 @@ } } }, + "after": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", + "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" + }, "aggregate-error": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", @@ -2346,6 +2352,11 @@ "es-abstract": "^1.17.0-next.1" } }, + "arraybuffer.slice": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", + "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==" + }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -2461,6 +2472,37 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "axobject-query": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.2.tgz", @@ -2864,6 +2906,11 @@ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" }, + "backo2": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", + "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=" + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -2924,6 +2971,11 @@ } } }, + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=" + }, "base64-js": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", @@ -2942,6 +2994,14 @@ "tweetnacl": "^0.14.3" } }, + "better-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", + "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", + "requires": { + "callsite": "1.0.0" + } + }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -2961,6 +3021,11 @@ "file-uri-to-path": "1.0.0" } }, + "blob": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", + "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -3298,6 +3363,11 @@ "caller-callsite": "^2.0.0" } }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=" + }, "callsites": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", @@ -3635,11 +3705,21 @@ "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", "dev": true }, + "component-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", + "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=" + }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, + "component-inherit": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", + "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=" + }, "compose-function": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz", @@ -4675,6 +4755,46 @@ "once": "^1.4.0" } }, + "engine.io-client": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.2.tgz", + "integrity": "sha512-AWjc1Xg06a6UPFOBAzJf48W1UR/qKYmv/ubgSCumo9GXgvL/xGIvo05dXoBL+2NTLMipDI7in8xK61C17L25xg==", + "requires": { + "component-emitter": "~1.3.0", + "component-inherit": "0.0.3", + "debug": "~4.1.0", + "engine.io-parser": "~2.2.0", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "~6.1.0", + "xmlhttprequest-ssl": "~1.5.4", + "yeast": "0.1.2" + }, + "dependencies": { + "ws": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", + "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", + "requires": { + "async-limiter": "~1.0.0" + } + } + } + }, + "engine.io-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz", + "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==", + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "~0.0.7", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.5", + "has-binary2": "~1.0.2" + } + }, "enhanced-resolve": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", @@ -6411,6 +6531,26 @@ } } }, + "has-binary2": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", + "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", + "requires": { + "isarray": "2.0.1" + }, + "dependencies": { + "isarray": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" + } + } + }, + "has-cors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", + "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=" + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -6818,6 +6958,11 @@ "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + }, "infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", @@ -8840,6 +8985,11 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-component": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", + "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=" + }, "object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", @@ -9232,6 +9382,22 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==" }, + "parseqs": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", + "requires": { + "better-assert": "~1.0.0" + } + }, + "parseuri": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", + "requires": { + "better-assert": "~1.0.0" + } + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -10663,6 +10829,11 @@ "whatwg-fetch": "^3.0.0" } }, + "react-axios": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/react-axios/-/react-axios-2.0.3.tgz", + "integrity": "sha512-63kY2iupdRgbvPq9G8xmM0NWUnt2Q5YmpotMoLQsxKOzKXKZg2Lo6CzF/bcZvtmv3WnfjBU6Bg8nZQO28eIAZw==" + }, "react-dev-utils": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz", @@ -11246,6 +11417,11 @@ "symbol-observable": "^1.2.0" } }, + "redux-thunk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz", + "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -12147,6 +12323,69 @@ "kind-of": "^3.2.0" } }, + "socket.io-client": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz", + "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==", + "requires": { + "backo2": "1.0.2", + "base64-arraybuffer": "0.1.5", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "~4.1.0", + "engine.io-client": "~3.4.0", + "has-binary2": "~1.0.2", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "socket.io-parser": "~3.3.0", + "to-array": "0.1.4" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + } + } + }, + "socket.io-parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz", + "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", + "requires": { + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "isarray": "2.0.1" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "isarray": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "sockjs": { "version": "0.3.19", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", @@ -12975,6 +13214,11 @@ "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" }, + "to-array": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", + "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=" + }, "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", @@ -14335,6 +14579,11 @@ "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==", "dev": true }, + "xmlhttprequest-ssl": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", + "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" + }, "xregexp": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz", @@ -14446,6 +14695,11 @@ "camelcase": "^5.0.0", "decamelize": "^1.2.0" } + }, + "yeast": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", + "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" } } } diff --git a/package.json b/package.json index 06d3ae0..2a9aee4 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "private": true, "dependencies": { "@capacitor/core": "2.1.0", - "@capacitor/ios": "^2.1.0", "@ionic/react": "^5.0.7", "@ionic/react-router": "^5.0.7", "@testing-library/jest-dom": "^4.2.4", @@ -16,14 +15,19 @@ "@types/react-dom": "^16.9.4", "@types/react-router": "^5.1.4", "@types/react-router-dom": "^5.1.3", + "axios": "^0.19.2", "ionicons": "^5.0.0", + "querystring": "^0.2.0", "react": "^16.13.0", + "react-axios": "^2.0.3", "react-dom": "^16.13.0", "react-redux": "^7.2.0", "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "react-scripts": "3.4.1", "redux": "^4.0.5", + "redux-thunk": "^2.3.0", + "socket.io-client": "^2.3.0", "typescript": "3.8.3" }, "scripts": { @@ -56,6 +60,7 @@ "devDependencies": { "@capacitor/cli": "2.1.0", "@types/react-redux": "^7.1.9", + "@types/socket.io-client": "^1.4.33", "eslint-config-airbnb-typescript-prettier": "^2.1.1", "prettier": "^2.0.5" }, diff --git a/src/App.test.tsx b/src/App.test.tsx index 25e68dc..ae51219 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import { render } from '@testing-library/react'; -import App from './App'; +import React from "react"; +import { render } from "@testing-library/react"; +import App from "./App"; // eslint-disable-next-line no-undef -test('renders without crashing', () => { - const { baseElement } = render(); - // eslint-disable-next-line no-undef - expect(baseElement).toBeDefined(); +test("renders without crashing", () => { + const { baseElement } = render(); + // eslint-disable-next-line no-undef + expect(baseElement).toBeDefined(); }); diff --git a/src/App.tsx b/src/App.tsx index d8e829c..1b58861 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,89 +1,109 @@ -import React from 'react'; -import { Redirect, Route } from 'react-router-dom'; +import React from "react"; +import { Redirect, Route } from "react-router-dom"; +import axios from "axios"; +import qs from "querystring"; +import { connect } from "react-redux"; import { - IonApp, - IonIcon, - IonLabel, - IonRouterOutlet, - IonTabBar, - IonTabButton, - IonTabs, -} from '@ionic/react'; -import { IonReactRouter } from '@ionic/react-router'; + IonApp, + IonIcon, + IonLabel, + IonRouterOutlet, + IonTabBar, + IonTabButton, + IonTabs, +} from "@ionic/react"; +import { IonReactRouter } from "@ionic/react-router"; import { - chatboxOutline, - gridOutline, - homeOutline, - personOutline, -} from 'ionicons/icons'; -import Home from './pages/home/home'; -import Categories from './pages/categories/categories'; -import Chats from './pages/chats/chats'; -import MyAccount from './pages/myaccount/myaccount'; + chatboxOutline, + gridOutline, + homeOutline, + personOutline, +} from "ionicons/icons"; +import Home from "./pages/home/home"; +import Categories from "./pages/categories/categories"; +import Chats from "./pages/chats/chats"; +import MyAccount from "./pages/myaccount/myaccount"; /* new imports */ -import RegisterForm from './components/RegisterForm/RegisterForm'; -import Health from './pages/Health/Health'; -import ItemDetail from './components/ItemDetail/ItemDetail'; -import PostAd from './components/PostAd/PostAd'; +import Register from "./pages/register/register"; +import Health from "./pages/Health/Health"; +import ItemDetail from "./components/ItemDetail/ItemDetail"; +import PostAd from "./components/PostAd/PostAd"; /* Core CSS required for Ionic components to work properly */ -import '@ionic/react/css/core.css'; +import "@ionic/react/css/core.css"; /* Basic CSS for apps built with Ionic */ -import '@ionic/react/css/normalize.css'; -import '@ionic/react/css/structure.css'; -import '@ionic/react/css/typography.css'; +import "@ionic/react/css/normalize.css"; +import "@ionic/react/css/structure.css"; +import "@ionic/react/css/typography.css"; /* Optional CSS utils that can be commented out */ -import '@ionic/react/css/padding.css'; -import '@ionic/react/css/float-elements.css'; -import '@ionic/react/css/text-alignment.css'; -import '@ionic/react/css/text-transformation.css'; -import '@ionic/react/css/flex-utils.css'; -import '@ionic/react/css/display.css'; +import "@ionic/react/css/padding.css"; +import "@ionic/react/css/float-elements.css"; +import "@ionic/react/css/text-alignment.css"; +import "@ionic/react/css/text-transformation.css"; +import "@ionic/react/css/flex-utils.css"; +import "@ionic/react/css/display.css"; /* Theme variables */ -import './theme/variables.css'; +import "./theme/variables.css"; +import { authSuccess } from "./store/actions/index"; -const App: React.FC = () => ( - +class App extends React.Component { + componentDidMount() { + const eventUser = new EventSource("http://localhost:5000/streamUser"); + eventUser.onmessage = (e) => this.props.changeUser(e.data); + const data = { + username: "ssh", + password: "12345", + }; + axios + .post("http://localhost:5000/login", qs.stringify(data)) + .then((res) => console.log(res)) + .catch((err) => console.log(err.response)); + } + render() { + return ( + - - - - - - - - - - - } - exact - /> - - - - - Home - - - - Categories - - - - Chats - - - - My Account - - - + + + + + + + + + + + + + + + + Home + + + + Categories + + + + Chats + + + + My Account + + + - -); + + ); + } +} -export default App; +const mapDispatchToProps = (dispatch) => ({ + changeUser: (data) => dispatch(authSuccess(data)), +}); + +export default connect(null, mapDispatchToProps)(App); diff --git a/src/axios-ins.tsx b/src/axios-ins.tsx new file mode 100644 index 0000000..c11f0c5 --- /dev/null +++ b/src/axios-ins.tsx @@ -0,0 +1,7 @@ +import axios from "axios"; + +const instance = axios.create({ + baseURL: "http://localhost:5000", +}); + +export default instance; diff --git a/src/components/CategoryCard/CategoryCard.css b/src/components/CategoryCard/CategoryCard.css index 1447294..c946b1c 100644 --- a/src/components/CategoryCard/CategoryCard.css +++ b/src/components/CategoryCard/CategoryCard.css @@ -1,11 +1,8 @@ -.col{ - font-size:12px; - text-align: center; - border-radius:15px; - padding:4px; - padding-top:20px; - padding-bottom: 20px; - margin:12px; - border:solid 1px lightgrey; + + +ion-chip{ + padding:30px 0px 30px 25px; + width: 160px; + margin-bottom: 10px; } diff --git a/src/components/CategoryCard/CategoryCard.tsx b/src/components/CategoryCard/CategoryCard.tsx index 87e4853..21a3f2e 100644 --- a/src/components/CategoryCard/CategoryCard.tsx +++ b/src/components/CategoryCard/CategoryCard.tsx @@ -1,80 +1,85 @@ -import React from 'react'; -import { IonGrid, IonRow, IonCol, IonIcon, IonLabel } from '@ionic/react'; +import React from "react"; import { - laptopOutline, - bicycleOutline, - phonePortraitOutline, - tabletLandscapeOutline, - libraryOutline, - constructOutline, -} from 'ionicons/icons'; -import './CategoryCard.css'; + IonGrid, + IonRow, + IonCol, + IonIcon, + IonLabel, + IonText, + IonChip, +} from "@ionic/react"; +import { + bicycle, + laptopOutline, + phonePortraitOutline, + tabletLandscapeOutline, + bookOutline, + constructOutline, +} from "ionicons/icons"; +import "./CategoryCard.css"; const CategoryCard: React.FC = () => ( - - - - -
- Laptops - - - -
- Bicycles - - - -
- Mobiles - - - -
- Mattresses - - - -
- Books - - - -
- Miscellaneous - - - + + + + + + +
Laptops
+ + + + + + + + +
Bicycles
+ + + + + + + + + + +
Phones
+ + + + + + + + +
Matteresses
+ + + + + + + + + + +
Books
+ + + + + + + + +
Misc.
+ + + + + ); export default CategoryCard; diff --git a/src/components/HeaderCard/HeaderCard.css b/src/components/HeaderCard/HeaderCard.css index 2424873..400d777 100644 --- a/src/components/HeaderCard/HeaderCard.css +++ b/src/components/HeaderCard/HeaderCard.css @@ -20,6 +20,7 @@ display: inline-block; align-items: center; justify-content: center; + padding-left: 10px; } .wrapper { text-align: center; diff --git a/src/components/HeaderCard/HeaderCard.tsx b/src/components/HeaderCard/HeaderCard.tsx index ce2adb3..57466af 100644 --- a/src/components/HeaderCard/HeaderCard.tsx +++ b/src/components/HeaderCard/HeaderCard.tsx @@ -1,40 +1,42 @@ -import React from 'react'; +import React from "react"; import { - IonCardHeader, - IonCardTitle, - IonCardContent, - IonCard, - IonButton, -} from '@ionic/react'; -import './HeaderCard.css'; + IonCardHeader, + IonCardTitle, + IonCardContent, + IonCard, + IonButton, +} from "@ionic/react"; +import "./HeaderCard.css"; +import SearchBar from "../SearchBar/SearchBar"; +import { RouteComponentProps } from "react-router-dom"; -const HeaderCard: React.FC = () => { - return ( - - - Welcome To - - IITD Marketplace - - +const HeaderCard: React.FC = (props) => { + const clicked = (route: string) => { + props.history.push(route); + }; + return ( + + + Welcome To + IITD Marketplace + + + Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, we got + you covered ! + + +
+ + Sign in to start + - - Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, - we got you covered ! - - -
- - Sign in to start - - - - Login - -
- - - ); + + Login + +
+ + + ); }; export default HeaderCard; diff --git a/src/components/ItemCard/ItemCard.tsx b/src/components/ItemCard/ItemCard.tsx index 6fd075d..34a68c8 100644 --- a/src/components/ItemCard/ItemCard.tsx +++ b/src/components/ItemCard/ItemCard.tsx @@ -1,21 +1,20 @@ -import React from 'react'; -import { IonCard, IonCardHeader, IonCardSubtitle } from '@ionic/react'; +import React from "react"; +import { IonCard, IonCardHeader, IonCardSubtitle } from "@ionic/react"; -class ItemCard extends React.Component { - render() { - const { item } = this.props; - return ( -
- - - - {item.name} Rs.{' '} - {item.price} - - -
- ); - } +class ItemCard extends React.Component { + render() { + const { item } = this.props; + return ( +
+ + cardImg + + {item.name} Rs. {item.price} + + +
+ ); + } } export default ItemCard; diff --git a/src/components/ItemDetail/ItemDetail.tsx b/src/components/ItemDetail/ItemDetail.tsx index 343d313..b0ee839 100644 --- a/src/components/ItemDetail/ItemDetail.tsx +++ b/src/components/ItemDetail/ItemDetail.tsx @@ -1,98 +1,86 @@ -import React from 'react'; +import React from "react"; import { - IonContent, - IonHeader, - IonPage, - IonChip, - IonToolbar, - IonCard, - IonCardHeader, - IonCardSubtitle, - IonCardTitle, - IonCardContent, - IonIcon, - IonLabel, - IonButton, - IonText, -} from '@ionic/react'; -import { locationOutline } from 'ionicons/icons'; + IonContent, + IonHeader, + IonPage, + IonChip, + IonToolbar, + IonCard, + IonCardHeader, + IonCardSubtitle, + IonCardTitle, + IonCardContent, + IonIcon, + IonLabel, + IonButton, + IonText, +} from "@ionic/react"; +import { locationOutline } from "ionicons/icons"; const ItemDetail: React.FC = () => { - return ( - - - - - - - Asus Tuf GT505 - - Rs. 40000 - - - - - - - - - Electronics - - - Laptops - - - - - - - Seller Details - - - N. Satwik - -

- {' '} - {' '} - Zanskar House -

- - - Chat With Seller - - - - - - - Product Details - - -
    -
  • 4 months old
    • -
  • 8 GB RAM, 512 GB SSD, i5 9th gen
    • -
  • RGB keyboard
    • -
  • ...
    • -
  • ...
    • -
- - - - - - Reviews - - - - - - ); + return ( + + + + + + Asus Tuf GT505 + + Rs. 40000 + + + + + + + + Electronics + + + Laptops + + + + + + Seller Details + + + N. Satwik + +

+ {" "} + Zanskar House +

+ + + Chat With Seller + + + + + + Product Details + + +
    +
  • 4 months old
    • +
  • 8 GB RAM, 512 GB SSD, i5 9th gen
    • +
  • RGB keyboard
    • +
  • ...
    • +
  • ...
    • +
+ + + + + Reviews + + + + + + ); }; export default ItemDetail; diff --git a/src/components/ItemList/ItemList.tsx b/src/components/ItemList/ItemList.tsx index b2966bc..7f1b7a5 100644 --- a/src/components/ItemList/ItemList.tsx +++ b/src/components/ItemList/ItemList.tsx @@ -1,28 +1,30 @@ -import React from 'react'; -import { IonCol, IonRow } from '@ionic/react'; -import ItemCard from '../ItemCard/ItemCard'; -import categories from '../../pages/categories/categories'; +import React from "react"; +import { IonCol, IonRow } from "@ionic/react"; +import ItemCard from "../ItemCard/ItemCard"; +// import categories from '../../pages/categories/categories'; class ItemList extends React.Component { - render() { - const itemList = this.props.items.map((item) => { - if (this.props.category === 'all') { - return ( - - - - ); - } - if (this.props.category === item.category) { - return ( - - - - ); - } - }); + render() { + const itemList = this.props.items.map((item) => { + if (this.props.category === "all") { + return ( + + + + ); + } + if (this.props.category === item.category) { + return ( + + + + ); + } else { + return null; + } + }); - return {itemList}; - } + return {itemList}; + } } export default ItemList; diff --git a/src/components/PostAd/PostAd.css b/src/components/PostAd/PostAd.css index e2b81f0..849da90 100644 --- a/src/components/PostAd/PostAd.css +++ b/src/components/PostAd/PostAd.css @@ -1,4 +1,8 @@ .regbuttons { align-content: center; width:20%; +} +.btn { + text-align: center; + } \ No newline at end of file diff --git a/src/components/PostAd/PostAd.tsx b/src/components/PostAd/PostAd.tsx index 18fcf5c..0a00b53 100644 --- a/src/components/PostAd/PostAd.tsx +++ b/src/components/PostAd/PostAd.tsx @@ -1,120 +1,133 @@ -import React, { useState } from 'react'; +import React, { useState } from "react"; // eslint-disable-next-line @typescript-eslint/no-unused-vars -import './PostAd.css'; - +import "./PostAd.css"; +import { RouteComponentProps } from "react-router"; import { - IonTitle, - IonToolbar, - IonSelect, - IonSelectOption, - IonInput, - IonItem, - IonLabel, - IonList, - IonButton, -} from '@ionic/react'; + IonTitle, + IonToolbar, + IonSelect, + IonSelectOption, + IonInput, + IonItem, + IonLabel, + IonList, + IonButton, + IonPage, + IonContent, + IonHeader, + IonButtons, + IonBackButton, +} from "@ionic/react"; -const PostAd: React.FC = () => { - const [name, setName] = useState(); - const [date, setDate] = useState(); - const [condition, setCondition] = useState(); - const [price, setPrice] = useState(); - const [category, setCategory] = useState(); - const [description, setDescription] = useState(); +const PostAd: React.FC = () => { + const [name, setName] = useState(); + const [date, setDate] = useState(); + const [condition, setCondition] = useState(); + const [price, setPrice] = useState(); + const [category, setCategory] = useState(); + const [description, setDescription] = useState(); - return ( -
+ return ( + + + + - Post Your Ad + + + + Post Your Ad -
- - - - Name of The Product - - setName(e.detail.value!)} - required - /> - - - - Tentative Date of Purchase - - setDate(e.detail.value!)} - required - /> - - - - Condition - - setCondition(e.detail.value!)} - required - /> - - - - - Category - - setCategory(e.detail.value)} - > - Laptops - Mobile - Books - Cycle - Miscallaneous - - - - - Asking Price - - setPrice(e.detail.value!)} - required - /> - - - - Description - - setDescription(e.detail.value!)} - required - /> - - - - - -
-
- - Post - -
+ + +
+ + + + Name of The Product + + setName(e.detail.value!)} + required + /> + + + + Tentative Date of Purchase + + setDate(e.detail.value!)} + required + /> + + + + Condition + + setCondition(e.detail.value!)} + required + /> + + + + Category + + setCategory(e.detail.value)} + > + Laptops + Mobile + Books + Cycle + Miscallaneous + + + + + Asking Price + + setPrice(e.detail.value!)} + required + /> + + + + Description + + setDescription(e.detail.value!)} + required + /> + + + + + +
+
+ + Post +
- ); + + + ); }; export default PostAd; diff --git a/src/components/RegisterForm/RegisterForm.tsx b/src/components/RegisterForm/RegisterForm.tsx index 3acef6f..2eaf6c2 100644 --- a/src/components/RegisterForm/RegisterForm.tsx +++ b/src/components/RegisterForm/RegisterForm.tsx @@ -1,87 +1,87 @@ -import React, { useState } from 'react'; +import React, { useState } from "react"; import { - IonTitle, - IonToolbar, - IonSelect, - IonSelectOption, - IonInput, - IonItem, - IonLabel, - IonList, - IonButton, -} from '@ionic/react'; -import './RegisterForm.css'; + IonTitle, + IonToolbar, + IonSelect, + IonSelectOption, + IonInput, + IonItem, + IonLabel, + IonList, + IonButton, +} from "@ionic/react"; +import "./RegisterForm.css"; const RegisterForm: React.FC = () => { - const [uname, setUname] = useState(); - const [pass, setPass] = useState(); - const [entryno, setEntryno] = useState(); - const [hostel, setHostel] = useState(); + const [uname, setUname] = useState(); + const [pass, setPass] = useState(); + const [entryno, setEntryno] = useState(); + const [hostel, setHostel] = useState(); - return ( -
- - Join us today ! - -
- - - - Username - - setUname(e.detail.value!)} - required - /> - - - - Password - - setPass(e.detail.value!)} - required - /> - - - - Entry Number - - setEntryno(e.detail.value!)} - required - /> - - - - Hostel - - setHostel(e.detail.value)} - > - Aravalli - Girnar - Jwalamukhi - Himadri - Zanskar - - - -
-
- - Register - -
-
- ); + return ( +
+ + Join us today ! + +
+ + + + Username + + setUname(e.detail.value!)} + required + /> + + + + Password + + setPass(e.detail.value!)} + required + /> + + + + Entry Number + + setEntryno(e.detail.value!)} + required + /> + + + + Hostel + + setHostel(e.detail.value)} + > + Aravalli + Girnar + Jwalamukhi + Himadri + Zanskar + + + +
+
+ + Register + +
+
+ ); }; export default RegisterForm; diff --git a/src/components/SearchBar/SearchBar.css b/src/components/SearchBar/SearchBar.css index 21e968a..d19a6e1 100644 --- a/src/components/SearchBar/SearchBar.css +++ b/src/components/SearchBar/SearchBar.css @@ -1,4 +1,3 @@ -.search { - margin: 0; - padding: 0; -} \ No newline at end of file +.searchbar{ + +} diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx index 5fb7944..671aa17 100644 --- a/src/components/SearchBar/SearchBar.tsx +++ b/src/components/SearchBar/SearchBar.tsx @@ -1,19 +1,20 @@ -import React, { useState } from 'react'; -import { IonToolbar, IonSearchbar } from '@ionic/react'; -import './SearchBar.css'; +import React, { useState } from "react"; +import { IonToolbar, IonSearchbar } from "@ionic/react"; +import "./SearchBar.css"; const SearchBar: React.FC = () => { - const [searchText, setSearchText] = useState(''); - return ( - - setSearchText(e.detail.value!)} - placeholder="Search for laptops, cycles..." - /> - - ); + const [searchText, setSearchText] = useState(""); + return ( + + setSearchText(e.detail.value!)} + placeholder="Search" + /> + + ); }; export default SearchBar; diff --git a/src/index.tsx b/src/index.tsx index 6364994..f075bbf 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,12 +1,17 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './App'; +import React from "react"; +import ReactDOM from "react-dom"; +import App from "./App"; -import { createStore } from 'redux' -import rootReducer from './reducers/rootReducer' +import { createStore, applyMiddleware } from "redux"; +import rootReducer from "./store/reducers"; +import thunk from "redux-thunk"; +import { Provider } from "react-redux"; -import { Provider } from 'react-redux' +const store = createStore(rootReducer, applyMiddleware(thunk)); -const store = createStore(rootReducer); - -ReactDOM.render(, document.getElementById('root')); +ReactDOM.render( + + + , + document.getElementById("root") +); diff --git a/src/pages/Health/Health.tsx b/src/pages/Health/Health.tsx index d0ec7ea..3526d85 100644 --- a/src/pages/Health/Health.tsx +++ b/src/pages/Health/Health.tsx @@ -1,8 +1,13 @@ -import React from 'react'; -import { withRouter } from 'react-router-dom'; +import React from "react"; +import { withRouter } from "react-router-dom"; +import { IonPage } from "@ionic/react"; const Health: React.FC = () => { - return

Ok, Healthy!

; + return ( + +

Ok, Healthy!

+ + ); }; export default withRouter(Health); diff --git a/src/pages/categories/categories.tsx b/src/pages/categories/categories.tsx index 2edc736..b4d0390 100644 --- a/src/pages/categories/categories.tsx +++ b/src/pages/categories/categories.tsx @@ -1,15 +1,32 @@ -import React from 'react'; -import { IonContent, IonPage } from '@ionic/react'; -import CategoryCard from '../../components/CategoryCard/CategoryCard'; +import React from "react"; +import { + IonContent, + IonPage, + IonHeader, + IonToolbar, + IonButtons, + IonBackButton, + IonTitle, +} from "@ionic/react"; +import CategoryCard from "../../components/CategoryCard/CategoryCard"; +import { RouteComponentProps } from "react-router"; -const categories: React.FC = () => { - return ( - - - - - - ); +const categories: React.FC = (props) => { + return ( + + + + + + + Categories + + + + + + + ); }; export default categories; diff --git a/src/pages/chats/chats.tsx b/src/pages/chats/chats.tsx index 9f74612..e9705cb 100644 --- a/src/pages/chats/chats.tsx +++ b/src/pages/chats/chats.tsx @@ -1,15 +1,31 @@ -import React from 'react'; -import { IonContent, IonPage } from '@ionic/react'; -import HeaderCard from '../../components/HeaderCard/HeaderCard'; +import React from "react"; +import { + IonContent, + IonPage, + IonHeader, + IonToolbar, + IonButtons, + IonBackButton, + IonTitle, +} from "@ionic/react"; +import HeaderCard from "../../components/HeaderCard/HeaderCard"; +import { RouteComponentProps } from "react-router"; -const chats: React.FC = () => { - return ( - - - - - - ); +const chats: React.FC = (props) => { + return ( + + + + + + + + Chats + + + + + ); }; export default chats; diff --git a/src/pages/home/home.css b/src/pages/home/home.css index 33a94d1..34bc0a9 100644 --- a/src/pages/home/home.css +++ b/src/pages/home/home.css @@ -17,8 +17,4 @@ ion-col{ ion-header{ padding-top:2em; - } - - .title { - font-size:1px; } \ No newline at end of file diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index 04d71b2..a9c502f 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -1,105 +1,101 @@ -import React from 'react'; +import React from "react"; import { - IonContent, - IonLabel, - IonSegment, - IonSegmentButton, - IonPage, - IonFab, - IonFabButton, - IonIcon, - IonToolbar, - IonFabList, - IonHeader, - IonTitle, - IonCol, - IonRow, -} from '@ionic/react'; -import { add, createOutline } from 'ionicons/icons'; -import './home.css'; -import { connect } from 'react-redux'; -import HeaderCard from '../../components/HeaderCard/HeaderCard'; -import ItemList from '../../components/ItemList/ItemList'; -import SearchBar from '../../components/SearchBar/SearchBar'; -// import CategoryCard from '../../components/CategoryCard/CategoryCard'; + IonContent, + IonLabel, + IonSegment, + IonSegmentButton, + IonPage, + IonFab, + IonFabButton, + IonIcon, + IonToolbar, + IonFabList, + IonHeader, + IonRow, + IonCol, + IonButtons, + IonBackButton, + IonTitle, +} from "@ionic/react"; +import { add, createOutline } from "ionicons/icons"; +import "./home.css"; +import HeaderCard from "../../components/HeaderCard/HeaderCard"; +import ItemList from "../../components/ItemList/ItemList"; +import { connect } from "react-redux"; +import { RouteComponentProps } from "react-router"; +import SearchBar from "../../components/SearchBar/SearchBar"; -class Home extends React.Component { - // eslint-disable-next-line react/destructuring-assignment - // eslint-disable-next-line react/state-in-constructor - state = { - category: 'all', - }; - - render() { - return ( - - - - - - - Home - - - - - - - - - - - - this.setState({ category: e.detail.value }) - } - color="primary" - > - - All - - - Laptops - - - Mobiles - - - Bicycles - - - Books - - - - - - - - - - - Post an Ad - - - - - ); - } +class Home extends React.Component { + // eslint-disable-next-line react/destructuring-assignment + // eslint-disable-next-line react/state-in-constructor + state = { + category: "all", + }; + render() { + return ( + + + + + + + + + + + + + + + + + this.setState({ category: e.detail.value })} + color="primary" + > + + All + + + Laptops + + + Mobiles + + + Bicycles + + + Books + + + + + + + + + + this.props.history.push("/postad")} + > + + {/* Post an Ad */} + + + + + + ); + } } -const mapStatetoProps = (state: { item: { items: any } }) => { - return { - items: state.item.items, - }; +const mapStatetoProps = (state: any) => { + return { + items: state.item.items, + }; }; export default connect(mapStatetoProps)(Home); diff --git a/src/pages/home/home2.css b/src/pages/home/home2.css new file mode 100644 index 0000000..110cbe8 --- /dev/null +++ b/src/pages/home/home2.css @@ -0,0 +1,40 @@ +.wishlist-btn{ + font-size: 26px; +} + +.notification-btn{ + font-size: 26px; + +} + +.card{ + padding:40px 0px 10px 10px; + opacity: 0.9; +} + +.card-icon{ + margin-bottom:25px; + font-size:45px; +} + +.card-text{ + font-weight: 450; + font-size:18px; + padding-left:5px; +} + +ion-card { + margin-top:10px !important; + margin-bottom:10px !important; + margin-left:10px !important ; + margin-right: 10px !important; +} + +ion-col{ + padding:0; +} + +ion-row{ + margin-left:10px; + margin-right:10px; +} diff --git a/src/pages/home/home2.tsx b/src/pages/home/home2.tsx new file mode 100644 index 0000000..ebef08e --- /dev/null +++ b/src/pages/home/home2.tsx @@ -0,0 +1,150 @@ +import React from "react"; +import { + IonContent, + IonLabel, + IonSegment, + IonSegmentButton, + IonPage, + IonFab, + IonFabButton, + IonIcon, + IonToolbar, + IonFabList, + IonHeader, + IonText, + IonRow, + IonCol, + IonCard, +} from "@ionic/react"; +import { + add, + notificationsOutline, + personCircle, + heart, + heartOutline, + heartHalf, + checkmarkCircle, + lockClosed, + analytics, + ribbon, + ribbonOutline, +} from "ionicons/icons"; +import "./home2.css"; +import HeaderCard from "../../components/HeaderCard/HeaderCard"; +import ItemList from "../../components/ItemList/ItemList"; + +import { connect } from "react-redux"; +import { RouteComponentProps } from "react-router"; + +import SearchBar from "../../components/SearchBar/SearchBar"; +import CategoryCard from "../../components/CategoryCard/CategoryCard"; + +class Home extends React.Component { + // eslint-disable-next-line react/destructuring-assignment + // eslint-disable-next-line react/state-in-constructor + state = { + category: "all", + }; + render() { + return ( + + + + + + + + + + + + + + + + +
+ Safe + + + + + +
+ Secure + + + + + + + +
+ Dynamic + + + + + +
+ Friendly + + + +
+ + + +

Choose a category

+ + + + + + + this.props.history.push("/postad")} + /> + + + + + ); + } +} + +const mapStatetoProps = (state: any) => { + return { + items: state.item.items, + }; +}; + +export default connect(mapStatetoProps)(Home); diff --git a/src/pages/myaccount/myaccount.css b/src/pages/myaccount/myaccount.css index 1d4c784..b583f12 100644 --- a/src/pages/myaccount/myaccount.css +++ b/src/pages/myaccount/myaccount.css @@ -1,7 +1,7 @@ .effect { border: 1px solid #ccc; padding: 7px 14px; - transition: 0.4s; + background: transparent; color:black; } @@ -13,4 +13,8 @@ margin-left: auto; margin-right: auto; +} + +.colgap { + padding-bottom: 30px ; } \ No newline at end of file diff --git a/src/pages/myaccount/myaccount.tsx b/src/pages/myaccount/myaccount.tsx index b4e86d0..6d938e4 100644 --- a/src/pages/myaccount/myaccount.tsx +++ b/src/pages/myaccount/myaccount.tsx @@ -1,125 +1,123 @@ -import React from 'react'; +import React from "react"; import { - IonContent, - IonHeader, - IonButton, - IonItem, - IonLabel, - IonToolbar, - IonTitle, - IonGrid, - IonRow, - IonCol, - IonInput, - IonSegment, - IonSegmentButton, - IonPage, -} from '@ionic/react'; -import './myaccount.css'; + IonContent, + IonHeader, + IonButton, + IonItem, + IonLabel, + IonToolbar, + IonTitle, + IonGrid, + IonRow, + IonCol, + IonInput, + IonSegment, + IonSegmentButton, + IonPage, + IonBackButton, + IonButtons, +} from "@ionic/react"; +import "./myaccount.css"; const Myaccount: React.FC = () => { - return ( - - - - Profile - - - -
- - - -
- - - - Profile - - - Buy/Sell History - - - - - - -
- Name -
+ return ( + + + + + + + Profile + + + +
+ + + +
+ + + + Profile + + + Buy/Sell History + + + + + + +
+ Name +
-
- -
- - -
- Entry No. -
-
- -
- +
+ +
+ + +
+ Entry No. +
+
+ +
+ - -
- Phone No. -
-
- -
- - -
- Hostel -
+ +
+ Phone No. +
+
+ +
+ + +
+ Email +
-
- -
- - - -
- Email -
-
- -
- - - Update - - - - - Get on Appstore - - - Get on Appstore - - - - - Contact For Help - - - - - - ); +
+ +
+ + + +
+ Hostel +
+
+ +
+ + + + Update Info + + + + + Get on PlayStore + + + Get on AppStore + + + + + Contact For Help + + + + + + ); }; export default Myaccount; diff --git a/src/pages/register/register.tsx b/src/pages/register/register.tsx new file mode 100644 index 0000000..15c1387 --- /dev/null +++ b/src/pages/register/register.tsx @@ -0,0 +1,16 @@ +import React from "react"; +import RegisterForm from "../../components/RegisterForm/RegisterForm"; +import { IonPage } from "@ionic/react"; +import { RouteComponentProps } from "react-router"; + +class Register extends React.Component { + state = { + isSignUp: true, + }; + render() { + let register = ; + return {register}; + } +} + +export default Register; diff --git a/src/reducers/authReducer.tsx b/src/reducers/authReducer.tsx deleted file mode 100644 index 0ae0bc9..0000000 --- a/src/reducers/authReducer.tsx +++ /dev/null @@ -1,7 +0,0 @@ -const initState = {} - -const authReducer = (state = initState,action={}) => { - return state -} - -export default authReducer \ No newline at end of file diff --git a/src/reducers/itemReducer.tsx b/src/reducers/itemReducer.tsx deleted file mode 100644 index 8e09c7e..0000000 --- a/src/reducers/itemReducer.tsx +++ /dev/null @@ -1,80 +0,0 @@ -const initState = { - items: [ - { - id: 1, - name: 'Asus Laptop', - price: 40000, - category: 'laptop', - image: '/images/laptop.jfif', - }, - { - id: 2, - name: 'Macbook Air', - price: 60000, - category: 'laptop', - image: '/images/laptop.jfif', - }, - { - id: 3, - name: 'Hero Thunderbird', - price: 4000, - category: 'bicycle', - image: '/images/bicycle.jfif', - }, - { - id: 4, - name: 'Decathlon BTWX 100', - price: 5000, - category: 'bicycle', - image: '/images/bicycle.jfif', - }, - { - id: 5, - name: 'Samsung S10e', - price: 25000, - category: 'mobile', - image: '/images/mobile.jfif', - }, - { - id: 6, - name: 'Vivo V15', - price: 14000, - category: 'mobile', - image: '/images/mobile.jfif', - }, - { - id: 7, - name: 'Kurl On memory foam ', - price: 2000, - category: 'matteress', - image: '/images/matteress.jfif', - }, - { - id: 8, - name: 'SleepX', - price: 1500, - category: 'matteress', - image: '/images/matteress.jfif', - }, - { - id: 9, - name: 'Order of the phoenix', - price: 300, - category: 'book', - image: '/images/book.jfif', - }, - { - id: 10, - name: 'Differential Equation - Kreyzig', - price: 200, - category: 'book', - image: '/images/book.jfif', - }, - ], -} - -const itemReducer = (state = initState,action) => { - return state -} - -export default itemReducer \ No newline at end of file diff --git a/src/reducers/rootReducer.tsx b/src/reducers/rootReducer.tsx deleted file mode 100644 index 57fd7ec..0000000 --- a/src/reducers/rootReducer.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import authReducer from './authReducer' -import itemReducer from './itemReducer' - -import { combineReducers } from 'redux' - -const rootReducer = combineReducers ({ - auth : authReducer, - item : itemReducer -}) - -export default rootReducer; \ No newline at end of file diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts index 35e67cb..73c4506 100644 --- a/src/serviceWorker.ts +++ b/src/serviceWorker.ts @@ -11,136 +11,132 @@ // opt-in, read https://bit.ly/CRA-PWA const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.0/8 are considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) + window.location.hostname === "localhost" || + // [::1] is the IPv6 localhost address. + window.location.hostname === "[::1]" || + // 127.0.0.0/8 are considered localhost for IPv4. + window.location.hostname.match( + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ + ) ); type Config = { - onSuccess?: (registration: ServiceWorkerRegistration) => void; - onUpdate?: (registration: ServiceWorkerRegistration) => void; + onSuccess?: (registration: ServiceWorkerRegistration) => void; + onUpdate?: (registration: ServiceWorkerRegistration) => void; }; export function register(config?: Config) { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL( - process.env.PUBLIC_URL!, - window.location.href - ); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 - return; - } + if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL(process.env.PUBLIC_URL!, window.location.href); + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebook/create-react-app/issues/2374 + return; + } - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + window.addEventListener("load", () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - if (isLocalhost) { - // This is running on localhost. Let's check if a service worker still exists or not. - checkValidServiceWorker(swUrl, config); + if (isLocalhost) { + // This is running on localhost. Let's check if a service worker still exists or not. + checkValidServiceWorker(swUrl, config); - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://bit.ly/CRA-PWA' - ); - }); - } else { - // Is not localhost. Just register service worker - registerValidSW(swUrl, config); - } + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + "This web app is being served cache-first by a service " + + "worker. To learn more, visit https://bit.ly/CRA-PWA" + ); }); - } + } else { + // Is not localhost. Just register service worker + registerValidSW(swUrl, config); + } + }); + } } function registerValidSW(swUrl: string, config?: Config) { - navigator.serviceWorker - .register(swUrl) - .then((registration) => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker == null) { - return; - } - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the updated precached content has been fetched, - // but the previous service worker will still serve the older - // content until all client tabs are closed. - console.log( - 'New content is available and will be used when all ' + - 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' - ); + navigator.serviceWorker + .register(swUrl) + .then((registration) => { + registration.onupdatefound = () => { + const installingWorker = registration.installing; + if (installingWorker == null) { + return; + } + installingWorker.onstatechange = () => { + if (installingWorker.state === "installed") { + if (navigator.serviceWorker.controller) { + // At this point, the updated precached content has been fetched, + // but the previous service worker will still serve the older + // content until all client tabs are closed. + console.log( + "New content is available and will be used when all " + + "tabs for this page are closed. See https://bit.ly/CRA-PWA." + ); - // Execute callback - if (config && config.onUpdate) { - config.onUpdate(registration); - } - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); + // Execute callback + if (config && config.onUpdate) { + config.onUpdate(registration); + } + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log("Content is cached for offline use."); - // Execute callback - if (config && config.onSuccess) { - config.onSuccess(registration); - } - } - } - }; - }; - }) - .catch((error) => { - console.error('Error during service worker registration:', error); - }); + // Execute callback + if (config && config.onSuccess) { + config.onSuccess(registration); + } + } + } + }; + }; + }) + .catch((error) => { + console.error("Error during service worker registration:", error); + }); } function checkValidServiceWorker(swUrl: string, config?: Config) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl, { - headers: { 'Service-Worker': 'script' }, - }) - .then((response) => { - // Ensure service worker exists, and that we really are getting a JS file. - const contentType = response.headers.get('content-type'); - if ( - response.status === 404 || - (contentType != null && - contentType.indexOf('javascript') === -1) - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then((registration) => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl, config); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl, { + headers: { "Service-Worker": "script" }, + }) + .then((response) => { + // Ensure service worker exists, and that we really are getting a JS file. + const contentType = response.headers.get("content-type"); + if ( + response.status === 404 || + (contentType != null && contentType.indexOf("javascript") === -1) + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then((registration) => { + registration.unregister().then(() => { + window.location.reload(); + }); }); + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl, config); + } + }) + .catch(() => { + console.log( + "No internet connection found. App is running in offline mode." + ); + }); } export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready.then((registration) => { - registration.unregister(); - }); - } + if ("serviceWorker" in navigator) { + navigator.serviceWorker.ready.then((registration) => { + registration.unregister(); + }); + } } diff --git a/src/setupTests.ts b/src/setupTests.ts index 74b1a27..5fdf001 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -2,4 +2,4 @@ // allows you to do things like: // expect(element).toHaveTextContent(/react/i) // learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom/extend-expect'; +import "@testing-library/jest-dom/extend-expect"; diff --git a/src/store/actions/actionTypes.tsx b/src/store/actions/actionTypes.tsx new file mode 100644 index 0000000..7210a39 --- /dev/null +++ b/src/store/actions/actionTypes.tsx @@ -0,0 +1,51 @@ +export const MISC_FOLLOW = "MISC_FOLLOW"; +export const MISC_UNFOLLOW = "MISC_UNFOLLOW"; +export const MISC_NOTIFS = "MISC_NOTIFS"; +export const MISC_REPORT = "MISC_REPORT"; +export const MISC_START = "MISC_START"; +export const MISC_FAIL = "MISC_FAIL"; + +export const AUTH_SUCCESS = "AUTH_SUCCESS"; +export const AUTH_FAIL = "AUTH_FAIL"; +export const AUTH_START = "AUTH_START"; +export const AUTH_LOGOUT = "AUTH_LOGOUT"; + +export const ITEM_START = "ITEM_START"; +export const ITEM_SUCCESS = "ITEM_SUCCESS"; +export const ITEM_FAIL = "ITEM_FAIL"; + +export const ITEM_POST_START = "ITEM_POST_START"; +export const ITEM_POST_SUCCESS = "ITEM_POST_SUCCESS"; + +export const ITEM_EDIT_START = "ITEM_EDIT_START"; +export const ITEM_EDIT_SUCCESS = "ITEM_EDIT_SUCCESS"; + +export const ITEM_DEL_START = "ITEM_DEL_START"; +export const ITEM_DEL_SUCCESS = "ITEM_DEL_SUCCESS"; + +export const ITEM_SELLINI_START = "ITEM_SELLINI_START"; +export const ITEM_SELLINI_SUCCESS = "ITEM_SELLINI_SUCCESS"; + +export const ITEM_SELLFIN_START = "ITEM_SELLFIN_START"; +export const ITEM_SELLFIN_SUCCESS = "ITEM_SELLFIN_SUCCESS"; + +export const ITEM_REPORT_SUCCESS = "ITEM_REPORT_SUCCESS"; + +export const REVIEW_START = "REVIEW_START"; +export const REVIEW_SUCCESS = "REVIEW_SUCCESS"; +export const REVIEW_FAIL = "REVIEW_FAIL"; + +export const REVIEW_POST_START = "REVIEW_POST_START"; +export const REVIEW_POST_SUCCESS = "REVIEW_POST_SUCCESS"; + +export const REVIEW_EDIT_START = "REVIEW_EDIT_START"; +export const REVIEW_EDIT_SUCCESS = "REVIEW_EDIT_SUCCESS"; + +export const REVIEW_DEL_START = "REVIEW_DEL_START"; +export const REVIEW_DEL_SUCCESS = "REVIEW_DEL_SUCCESS"; + +export const REVIEW_UPVOTE_SUCCESS = "REVIEW_UPVOTE_SUCCESS"; +export const REVIEW_DOWNVOTE_SUCCESS = "REVIEW_DOWNVOTE_SUCCESS"; + +export const REVIEW_REPORT_SUCCESS = "REVIEW_REPORT_SUCCESS"; +export const REVIEW_RESOLVE_SUCCESS = "REVIEW_RESOLVE_SUCCESS"; diff --git a/src/store/actions/auth.tsx b/src/store/actions/auth.tsx new file mode 100644 index 0000000..88ea84d --- /dev/null +++ b/src/store/actions/auth.tsx @@ -0,0 +1,44 @@ +import * as actionTypes from "./actionTypes"; +import axios from "../../axios-ins"; +import qs from "querystring"; + +export const authStart = () => ({ + type: actionTypes.AUTH_START, +}); + +export const authSuccess = (data) => ({ + type: actionTypes.AUTH_SUCCESS, + data: data, +}); + +export const authFail = (err) => ({ + type: actionTypes.AUTH_FAIL, + data: err, +}); + +export const auth = (data, isSignUp: boolean) => (dispatch) => { + dispatch(authStart()); + let url = "/login"; + if (isSignUp) { + url = "/register"; + } + axios + .post(url, qs.stringify(data)) + .then((res) => { + dispatch(authSuccess(res.data)); + }) + .catch((err) => { + dispatch(authFail(err)); + }); +}; + +export const authLogout = () => (dispatch) => { + axios + .get("/logout") + .then((res) => { + dispatch({ type: actionTypes.AUTH_LOGOUT }); + }) + .catch((err) => { + dispatch(authFail(err)); + }); +}; diff --git a/src/store/actions/chat.tsx b/src/store/actions/chat.tsx new file mode 100644 index 0000000..5614d52 --- /dev/null +++ b/src/store/actions/chat.tsx @@ -0,0 +1,13 @@ +import io from "socket.io-client"; + +export const mountChat = () => (dispatch) => { + const socket = io("http://localhost:5000/chat"); + let stack: Record; + let username: string; + socket.on("connect", () => { + socket.emit("setUserData", username); + }); + socket.on("onlineStack", (sta: Record) => { + stack = sta; + }); +}; diff --git a/src/store/actions/index.tsx b/src/store/actions/index.tsx new file mode 100644 index 0000000..f644ee6 --- /dev/null +++ b/src/store/actions/index.tsx @@ -0,0 +1,2 @@ +export { authSuccess } from "./auth"; +export {} from "./item"; diff --git a/src/store/actions/item.tsx b/src/store/actions/item.tsx new file mode 100644 index 0000000..3091911 --- /dev/null +++ b/src/store/actions/item.tsx @@ -0,0 +1,146 @@ +import axios from "../../axios-ins"; +import * as actionTypes from "./actionTypes"; +import qs from "querystring"; + +export const getItemStart = () => ({ + type: actionTypes.ITEM_START, +}); + +export const getItemSuccess = (data) => ({ + type: actionTypes.ITEM_SUCCESS, + data: data, +}); + +export const postItemStart = () => ({ + type: actionTypes.ITEM_POST_START, +}); + +export const postItemSuccess = (data) => ({ + type: actionTypes.ITEM_POST_SUCCESS, + data: data, +}); + +export const itemFail = (err) => ({ + type: actionTypes.ITEM_FAIL, + err: err, +}); + +export const editItemStart = () => ({ + type: actionTypes.ITEM_EDIT_START, +}); + +export const editItemSuccess = (data) => ({ + type: actionTypes.ITEM_EDIT_SUCCESS, + data: data, +}); + +export const delItemStart = () => ({ + type: actionTypes.ITEM_DEL_START, +}); + +export const delItemSuccess = () => ({ + type: actionTypes.ITEM_DEL_SUCCESS, +}); + +export const sellIniItemStart = () => ({ + type: actionTypes.ITEM_SELLINI_START, +}); + +export const sellIniItemSuccess = () => ({ + type: actionTypes.ITEM_SELLINI_SUCCESS, +}); + +export const sellFinItemStart = () => ({ + type: actionTypes.ITEM_SELLFIN_START, +}); + +export const sellFinItemSuccess = () => ({ + type: actionTypes.ITEM_SELLFIN_SUCCESS, +}); + +export const reportItemSuccess = () => ({ + type: actionTypes.ITEM_REPORT_SUCCESS, +}); + +export const getItem = () => (dispatch) => { + dispatch(getItemStart()); + axios + .get("/item") + .then((res) => { + dispatch(getItemSuccess(res.data)); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const postItem = (data) => (dispatch) => { + dispatch(postItemStart()); + axios + .post("/item", qs.stringify(data)) + .then((res) => { + dispatch(postItemSuccess(res.data)); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const editItem = (data, id) => (dispatch) => { + dispatch(editItemStart()); + axios + .put("/item/" + id, qs.stringify(data)) + .then((res) => { + dispatch(editItemSuccess(res.data)); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const delItem = (id) => (dispatch) => { + dispatch(delItemStart()); + axios + .delete("/item/" + id) + .then((res) => { + dispatch(delItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const selliniItem = (id, data) => (dispatch) => { + dispatch(sellIniItemStart()); + axios + .patch("/item/" + id + "/sellIni", qs.stringify(data)) + .then((res) => { + dispatch(sellIniItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const sellfniItem = (id, data) => (dispatch) => { + dispatch(sellFinItemStart()); + axios + .patch("/item/" + id + "/sellFin", qs.stringify(data)) + .then((res) => { + dispatch(sellFinItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const reportItem = (id) => (dispatch) => { + axios + .patch("/item/" + id + "/report") + .then((res) => { + dispatch(reportItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; diff --git a/src/store/actions/misc.tsx b/src/store/actions/misc.tsx new file mode 100644 index 0000000..681db76 --- /dev/null +++ b/src/store/actions/misc.tsx @@ -0,0 +1,79 @@ +import axios from "axios"; +import * as actionTypes from "./actionTypes"; + +export const miscStart = () => ({ + type: actionTypes.MISC_START, +}); + +export const miscFail = (err) => ({ + type: actionTypes.MISC_FAIL, + err: err, +}); + +export const miscFollow = (category) => ({ + type: actionTypes.MISC_FOLLOW, + cat: category, +}); + +export const miscUnfollow = (category) => ({ + type: actionTypes.MISC_UNFOLLOW, + cat: category, +}); + +export const miscNotifs = (notifs) => ({ + type: actionTypes.MISC_NOTIFS, + notifs: notifs, +}); + +export const miscReport = (rep) => ({ + type: actionTypes.MISC_REPORT, + report: rep, +}); + +export const follow = (cat) => (dispatch) => { + dispatch(miscStart()); + axios + .patch("/follow/" + cat) + .then((res) => { + miscFollow(cat); + }) + .catch((err) => { + miscFail(err); + }); +}; + +export const unfollow = (cat) => (dispatch) => { + dispatch(miscStart()); + axios + .patch("/unfollow/" + cat) + .then((res) => { + miscUnfollow(cat); + }) + .catch((err) => { + miscFail(err); + }); +}; + +export const notifs = () => (dispatch) => { + dispatch(miscStart()); + axios + .get("/notifications") + .then((res) => { + dispatch(miscNotifs(res.data)); + }) + .catch((err) => { + dispatch(miscFail(err)); + }); +}; + +export const report = () => (dispatch) => { + dispatch(miscStart()); + axios + .get("/report") + .then((res) => { + dispatch(miscReport(res.data)); + }) + .catch((err) => { + dispatch(miscFail(err)); + }); +}; diff --git a/src/store/actions/review.tsx b/src/store/actions/review.tsx new file mode 100644 index 0000000..1b9a31b --- /dev/null +++ b/src/store/actions/review.tsx @@ -0,0 +1,151 @@ +import axios from "../../axios-ins"; +import qs from "querystring"; +import * as actionTypes from "./actionTypes"; + +export const getReviewStart = () => ({ + type: actionTypes.REVIEW_START, +}); + +export const getReviewSuccess = (data) => ({ + type: actionTypes.REVIEW_SUCCESS, + data: data, +}); + +export const postReviewStart = () => ({ + type: actionTypes.REVIEW_POST_START, +}); + +export const postReviewSuccess = (data) => ({ + type: actionTypes.REVIEW_POST_SUCCESS, + data: data, +}); + +export const reviewFail = (err) => ({ + type: actionTypes.REVIEW_FAIL, + err: err, +}); + +export const editReviewStart = () => ({ + type: actionTypes.REVIEW_EDIT_START, +}); + +export const editReviewSuccess = (data) => ({ + type: actionTypes.REVIEW_EDIT_SUCCESS, + data: data, +}); + +export const delReviewStart = () => ({ + type: actionTypes.REVIEW_DEL_START, +}); + +export const delReviewSuccess = () => ({ + type: actionTypes.REVIEW_DEL_SUCCESS, +}); + +export const upvoteReviewSuccess = () => ({ + type: actionTypes.REVIEW_UPVOTE_SUCCESS, +}); + +export const downvoteReviewSuccess = () => ({ + type: actionTypes.REVIEW_DOWNVOTE_SUCCESS, +}); + +export const reportReviewSuccess = () => ({ + type: actionTypes.REVIEW_REPORT_SUCCESS, +}); + +export const resolveReviewSuccess = () => ({ + type: actionTypes.REVIEW_RESOLVE_SUCCESS, +}); + +export const getReview = (id) => (dispatch) => { + dispatch(getReviewStart()); + axios + .get("/users/" + id + "/reviews/") + .then((res) => { + dispatch(getReviewSuccess(res.data)); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const postReview = (data, id) => (dispatch) => { + dispatch(postReviewStart()); + axios + .post("/users/" + id + "/reviews/", qs.stringify(data)) + .then((res) => { + dispatch(postReviewSuccess(res.data)); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const editReview = (data, id, reviewId) => (dispatch) => { + dispatch(editReviewStart()); + axios + .put("/users/" + id + "/reviews/" + reviewId, qs.stringify(data)) + .then((res) => { + dispatch(editReviewSuccess(res.data)); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const delReview = (id, reviewId) => (dispatch) => { + dispatch(delReviewStart()); + axios + .delete("/users/" + id + "/reviews/" + reviewId) + .then((res) => { + dispatch(delReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const upvoteReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/upvote") + .then((res) => { + dispatch(upvoteReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const downvoteReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/downvote") + .then((res) => { + dispatch(downvoteReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const reportReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/report") + .then((res) => { + dispatch(reportReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const resolveReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/resolve") + .then((res) => { + dispatch(resolveReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; diff --git a/src/store/reducers/auth.tsx b/src/store/reducers/auth.tsx new file mode 100644 index 0000000..44f672d --- /dev/null +++ b/src/store/reducers/auth.tsx @@ -0,0 +1,7 @@ +const initState = {}; + +const authReducer = (state = initState, action = {}) => { + return state; +}; + +export default authReducer; diff --git a/src/store/reducers/index.tsx b/src/store/reducers/index.tsx new file mode 100644 index 0000000..c682e0e --- /dev/null +++ b/src/store/reducers/index.tsx @@ -0,0 +1,11 @@ +import authReducer from "./auth"; +import itemReducer from "./item"; + +import { combineReducers } from "redux"; + +const rootReducer = combineReducers({ + auth: authReducer, + item: itemReducer, +}); + +export default rootReducer; diff --git a/src/store/reducers/item.tsx b/src/store/reducers/item.tsx new file mode 100644 index 0000000..9db8373 --- /dev/null +++ b/src/store/reducers/item.tsx @@ -0,0 +1,80 @@ +const initState = { + items: [ + { + id: 1, + name: "Asus Laptop", + price: 40000, + category: "laptop", + image: "/images/laptop.jfif", + }, + { + id: 2, + name: "Macbook Air", + price: 60000, + category: "laptop", + image: "/images/laptop.jfif", + }, + { + id: 3, + name: "Hero Thunderbird", + price: 4000, + category: "bicycle", + image: "/images/bicycle.jfif", + }, + { + id: 4, + name: "Decathlon BTWX 100", + price: 5000, + category: "bicycle", + image: "/images/bicycle.jfif", + }, + { + id: 5, + name: "Samsung S10e", + price: 25000, + category: "mobile", + image: "/images/mobile.jfif", + }, + { + id: 6, + name: "Vivo V15", + price: 14000, + category: "mobile", + image: "/images/mobile.jfif", + }, + { + id: 7, + name: "Kurl On memory foam ", + price: 2000, + category: "matteress", + image: "/images/matteress.jfif", + }, + { + id: 8, + name: "SleepX", + price: 1500, + category: "matteress", + image: "/images/matteress.jfif", + }, + { + id: 9, + name: "Order of the phoenix", + price: 300, + category: "book", + image: "/images/book.jfif", + }, + { + id: 10, + name: "Differential Equation - Kreyzig", + price: 200, + category: "book", + image: "/images/book.jfif", + }, + ], +}; + +const itemReducer = (state = initState, action) => { + return state; +}; + +export default itemReducer; From 08037696e1d2131128b143f02b03700de0547b67 Mon Sep 17 00:00:00 2001 From: Satyakam Singhal Date: Sun, 31 May 2020 17:36:20 +0530 Subject: [PATCH 6/7] lint errors --- package-lock.json | 5 - package.json | 1 - src/App.test.tsx | 14 +- src/App.tsx | 187 +++++++------- src/axios-ins.tsx | 8 +- src/components/CategoryCard/CategoryCard.tsx | 136 +++++------ src/components/HeaderCard/HeaderCard.css | 8 +- src/components/HeaderCard/HeaderCard.tsx | 72 +++--- src/components/ItemCard/ItemCard.tsx | 33 +-- src/components/ItemDetail/ItemDetail.tsx | 167 +++++++------ src/components/ItemList/ItemList.tsx | 53 ++-- src/components/PostAd/PostAd.css | 5 +- src/components/PostAd/PostAd.tsx | 244 +++++++++---------- src/components/RegisterForm/RegisterForm.tsx | 160 ++++++------ src/components/SearchBar/SearchBar.css | 4 +- src/components/SearchBar/SearchBar.tsx | 29 ++- src/index.tsx | 21 +- src/pages/Health/Health.tsx | 16 +- src/pages/categories/categories.tsx | 38 +-- src/pages/chats/chats.tsx | 37 +-- src/pages/home/home.tsx | 173 ++++++------- src/pages/home/home2.tsx | 221 +++++++---------- src/pages/myaccount/myaccount.css | 22 +- src/pages/myaccount/myaccount.tsx | 158 +++--------- src/pages/register/register.tsx | 28 ++- src/serviceWorker.ts | 216 ++++++++-------- src/setupTests.ts | 2 +- src/store/actions/actionTypes.tsx | 77 +++--- src/store/actions/auth.tsx | 70 +++--- src/store/actions/chat.tsx | 20 +- src/store/actions/index.tsx | 4 +- src/store/actions/item.tsx | 229 +++++++++-------- src/store/actions/misc.tsx | 122 +++++----- src/store/actions/review.tsx | 242 +++++++++--------- src/store/reducers/auth.tsx | 10 +- src/store/reducers/index.tsx | 16 +- src/store/reducers/item.tsx | 154 ++++++------ 37 files changed, 1388 insertions(+), 1614 deletions(-) diff --git a/package-lock.json b/package-lock.json index c859a29..0c5799c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10829,11 +10829,6 @@ "whatwg-fetch": "^3.0.0" } }, - "react-axios": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/react-axios/-/react-axios-2.0.3.tgz", - "integrity": "sha512-63kY2iupdRgbvPq9G8xmM0NWUnt2Q5YmpotMoLQsxKOzKXKZg2Lo6CzF/bcZvtmv3WnfjBU6Bg8nZQO28eIAZw==" - }, "react-dev-utils": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz", diff --git a/package.json b/package.json index 2a9aee4..6792182 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "ionicons": "^5.0.0", "querystring": "^0.2.0", "react": "^16.13.0", - "react-axios": "^2.0.3", "react-dom": "^16.13.0", "react-redux": "^7.2.0", "react-router": "^5.1.2", diff --git a/src/App.test.tsx b/src/App.test.tsx index ae51219..25e68dc 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -1,10 +1,10 @@ -import React from "react"; -import { render } from "@testing-library/react"; -import App from "./App"; +import React from 'react'; +import { render } from '@testing-library/react'; +import App from './App'; // eslint-disable-next-line no-undef -test("renders without crashing", () => { - const { baseElement } = render(); - // eslint-disable-next-line no-undef - expect(baseElement).toBeDefined(); +test('renders without crashing', () => { + const { baseElement } = render(); + // eslint-disable-next-line no-undef + expect(baseElement).toBeDefined(); }); diff --git a/src/App.tsx b/src/App.tsx index 1b58861..0985b5d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,109 +1,110 @@ -import React from "react"; -import { Redirect, Route } from "react-router-dom"; -import axios from "axios"; -import qs from "querystring"; -import { connect } from "react-redux"; +import React from 'react'; +import { Redirect, Route } from 'react-router-dom'; +import axios from 'axios'; +import qs from 'querystring' +import {connect} from 'react-redux' import { - IonApp, - IonIcon, - IonLabel, - IonRouterOutlet, - IonTabBar, - IonTabButton, - IonTabs, -} from "@ionic/react"; -import { IonReactRouter } from "@ionic/react-router"; + IonApp, + IonIcon, + IonLabel, + IonRouterOutlet, + IonTabBar, + IonTabButton, + IonTabs, +} from '@ionic/react'; +import { IonReactRouter } from '@ionic/react-router'; import { - chatboxOutline, - gridOutline, - homeOutline, - personOutline, -} from "ionicons/icons"; -import Home from "./pages/home/home"; -import Categories from "./pages/categories/categories"; -import Chats from "./pages/chats/chats"; -import MyAccount from "./pages/myaccount/myaccount"; + chatboxOutline, + gridOutline, + homeOutline, + personOutline, +} from 'ionicons/icons'; +import Home from './pages/home/home'; +import Categories from './pages/categories/categories'; +import Chats from './pages/chats/chats'; +import MyAccount from './pages/myaccount/myaccount'; /* new imports */ -import Register from "./pages/register/register"; -import Health from "./pages/Health/Health"; -import ItemDetail from "./components/ItemDetail/ItemDetail"; -import PostAd from "./components/PostAd/PostAd"; +import Register from './pages/register/register'; +import Health from './pages/Health/Health'; +import ItemDetail from './components/ItemDetail/ItemDetail'; + +import PostAd from './components/PostAd/PostAd'; /* Core CSS required for Ionic components to work properly */ -import "@ionic/react/css/core.css"; +import '@ionic/react/css/core.css'; /* Basic CSS for apps built with Ionic */ -import "@ionic/react/css/normalize.css"; -import "@ionic/react/css/structure.css"; -import "@ionic/react/css/typography.css"; +import '@ionic/react/css/normalize.css'; +import '@ionic/react/css/structure.css'; +import '@ionic/react/css/typography.css'; /* Optional CSS utils that can be commented out */ -import "@ionic/react/css/padding.css"; -import "@ionic/react/css/float-elements.css"; -import "@ionic/react/css/text-alignment.css"; -import "@ionic/react/css/text-transformation.css"; -import "@ionic/react/css/flex-utils.css"; -import "@ionic/react/css/display.css"; +import '@ionic/react/css/padding.css'; +import '@ionic/react/css/float-elements.css'; +import '@ionic/react/css/text-alignment.css'; +import '@ionic/react/css/text-transformation.css'; +import '@ionic/react/css/flex-utils.css'; +import '@ionic/react/css/display.css'; /* Theme variables */ -import "./theme/variables.css"; -import { authSuccess } from "./store/actions/index"; +import './theme/variables.css'; +import {authSuccess} from './store/actions/index' class App extends React.Component { - componentDidMount() { - const eventUser = new EventSource("http://localhost:5000/streamUser"); - eventUser.onmessage = (e) => this.props.changeUser(e.data); - const data = { - username: "ssh", - password: "12345", - }; - axios - .post("http://localhost:5000/login", qs.stringify(data)) - .then((res) => console.log(res)) - .catch((err) => console.log(err.response)); - } - render() { - return ( - - - - - - - - - - - - - - - - - - Home - - - - Categories - - - - Chats - - - - My Account - - - - - - ); - } + componentDidMount() { + const eventUser = new EventSource('http://localhost:5000/streamUser'); + eventUser.onmessage = e => this.props.changeUser(e.data) + const data = { + username: 'ssh', + password: '12345' + } + axios + .post('http://localhost:5000/login', qs.stringify(data)) + .then((res) => console.log(res)) + .catch((err) => console.log(err.response)); + } + render() { + return ( + + + + + + + + + + + + + + + + + + Home + + + + Categories + + + + Chats + + + + My Account + + + + + + ); + } } -const mapDispatchToProps = (dispatch) => ({ - changeUser: (data) => dispatch(authSuccess(data)), -}); +const mapDispatchToProps = dispatch => ({ + changeUser : (data) => dispatch(authSuccess(data)) +}) export default connect(null, mapDispatchToProps)(App); diff --git a/src/axios-ins.tsx b/src/axios-ins.tsx index c11f0c5..7d45821 100644 --- a/src/axios-ins.tsx +++ b/src/axios-ins.tsx @@ -1,7 +1,7 @@ -import axios from "axios"; +import axios from 'axios' const instance = axios.create({ - baseURL: "http://localhost:5000", -}); + baseURL: 'http://localhost:5000' +}) -export default instance; +export default instance; \ No newline at end of file diff --git a/src/components/CategoryCard/CategoryCard.tsx b/src/components/CategoryCard/CategoryCard.tsx index 21a3f2e..589dbc5 100644 --- a/src/components/CategoryCard/CategoryCard.tsx +++ b/src/components/CategoryCard/CategoryCard.tsx @@ -1,85 +1,71 @@ -import React from "react"; -import { - IonGrid, - IonRow, - IonCol, - IonIcon, - IonLabel, - IonText, - IonChip, -} from "@ionic/react"; -import { - bicycle, - laptopOutline, - phonePortraitOutline, - tabletLandscapeOutline, - bookOutline, - constructOutline, -} from "ionicons/icons"; -import "./CategoryCard.css"; +import React from 'react'; +import { IonGrid, IonRow, IonCol, IonIcon, IonLabel, IonText,IonChip } from '@ionic/react'; +import { bicycle, laptopOutline, phonePortraitOutline, tabletLandscapeOutline, bookOutline, constructOutline} from 'ionicons/icons'; +import './CategoryCard.css'; + const CategoryCard: React.FC = () => ( - - - - - - -
Laptops
- - - + + + + + + + +
Laptops
 + + + + + + +
Bicycles
 + + + + + + + + + + +
Phones
 + + + + + + +
Matteresses
 + + + + + + + + + + +
Books
 + + - - - - -
Bicycles
- - - - + + + +
Misc.
 + + - - - - - -
Phones
- - - + - - - - -
Matteresses
- - - - + - - - - - -
Books
- - - + + - - - - -
Misc.
- - - - - ); export default CategoryCard; diff --git a/src/components/HeaderCard/HeaderCard.css b/src/components/HeaderCard/HeaderCard.css index 400d777..b02d93c 100644 --- a/src/components/HeaderCard/HeaderCard.css +++ b/src/components/HeaderCard/HeaderCard.css @@ -17,11 +17,9 @@ width: 200px; text-align: center; - display: inline-block; + margin-left: auto; + margin-right: auto; + display: flex; align-items: center; justify-content: center; - padding-left: 10px; -} -.wrapper { - text-align: center; } diff --git a/src/components/HeaderCard/HeaderCard.tsx b/src/components/HeaderCard/HeaderCard.tsx index 57466af..f42f089 100644 --- a/src/components/HeaderCard/HeaderCard.tsx +++ b/src/components/HeaderCard/HeaderCard.tsx @@ -1,42 +1,42 @@ -import React from "react"; +import React from 'react'; import { - IonCardHeader, - IonCardTitle, - IonCardContent, - IonCard, - IonButton, -} from "@ionic/react"; -import "./HeaderCard.css"; -import SearchBar from "../SearchBar/SearchBar"; -import { RouteComponentProps } from "react-router-dom"; + IonCardHeader, + IonCardTitle, + IonCardContent, + IonCard, + IonButton, +} from '@ionic/react'; +import './HeaderCard.css'; +import SearchBar from '../SearchBar/SearchBar'; +import { RouteComponentProps } from 'react-router-dom' const HeaderCard: React.FC = (props) => { - const clicked = (route: string) => { - props.history.push(route); - }; - return ( - - - Welcome To - IITD Marketplace - - - Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, we got - you covered ! - - -
- - Sign in to start - - - - Login - -
- - - ); + const clicked = (route: string) => { + props.history.push(route); + } + return ( + + + Welcome To + + IITD Marketplace + + + + Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, + we got you covered ! + + + + clicked("/register")}> + Sign in to start + + clicked('/login')}> + Login + + + + ); }; export default HeaderCard; diff --git a/src/components/ItemCard/ItemCard.tsx b/src/components/ItemCard/ItemCard.tsx index 34a68c8..f0dc75f 100644 --- a/src/components/ItemCard/ItemCard.tsx +++ b/src/components/ItemCard/ItemCard.tsx @@ -1,20 +1,21 @@ -import React from "react"; -import { IonCard, IonCardHeader, IonCardSubtitle } from "@ionic/react"; +import React from 'react'; +import { IonCard, IonCardHeader, IonCardSubtitle } from '@ionic/react'; -class ItemCard extends React.Component { - render() { - const { item } = this.props; - return ( -
- - cardImg - - {item.name} Rs. {item.price} - - -
- ); - } +class ItemCard extends React.Component { + render() { + const { item } = this.props; + return ( +
+ + cardImg + + {item.name} Rs.{' '} + {item.price} + + +
+ ); + } } export default ItemCard; diff --git a/src/components/ItemDetail/ItemDetail.tsx b/src/components/ItemDetail/ItemDetail.tsx index b0ee839..0c66406 100644 --- a/src/components/ItemDetail/ItemDetail.tsx +++ b/src/components/ItemDetail/ItemDetail.tsx @@ -1,86 +1,93 @@ -import React from "react"; +import React from 'react'; import { - IonContent, - IonHeader, - IonPage, - IonChip, - IonToolbar, - IonCard, - IonCardHeader, - IonCardSubtitle, - IonCardTitle, - IonCardContent, - IonIcon, - IonLabel, - IonButton, - IonText, -} from "@ionic/react"; -import { locationOutline } from "ionicons/icons"; + IonContent, + IonHeader, + IonPage, + IonChip, + IonToolbar, + IonCard, + IonCardHeader, + IonCardSubtitle, + IonCardTitle, + IonCardContent, + IonIcon, + IonLabel, + IonButton, + IonText, +} from '@ionic/react'; +import { locationOutline } from 'ionicons/icons'; const ItemDetail: React.FC = () => { - return ( - - - - - - Asus Tuf GT505 - - Rs. 40000 - - - - - - - - Electronics - - - Laptops - - - - - - Seller Details - - - N. Satwik - -

- {" "} - Zanskar House -

- - - Chat With Seller - - - - - - Product Details - - -
    -
  • 4 months old
    • -
  • 8 GB RAM, 512 GB SSD, i5 9th gen
    • -
  • RGB keyboard
    • -
  • ...
    • -
  • ...
    • -
- - - - - Reviews - - - - - - ); + return ( + + + + + + Asus Tuf GT505 + + Rs. 40000 + + + + + + + + Electronics + + + Laptops + + + + + + Seller Details + + + N. Satwik + +

+ {' '} + {' '} + Zanskar House +

+ + + Chat With Seller + + + + + + Product Details + + +
    +
  • 4 months old
    • +
  • 8 GB RAM, 512 GB SSD, i5 9th gen
    • +
  • RGB keyboard
    • +
  • ...
    • +
  • ...
    • +
+ + + + + Reviews + + + + + + ); }; export default ItemDetail; diff --git a/src/components/ItemList/ItemList.tsx b/src/components/ItemList/ItemList.tsx index 7f1b7a5..af70ac4 100644 --- a/src/components/ItemList/ItemList.tsx +++ b/src/components/ItemList/ItemList.tsx @@ -1,30 +1,33 @@ -import React from "react"; -import { IonCol, IonRow } from "@ionic/react"; -import ItemCard from "../ItemCard/ItemCard"; +import React from 'react'; +import { IonCol, IonRow } from '@ionic/react'; +import ItemCard from '../ItemCard/ItemCard'; // import categories from '../../pages/categories/categories'; -class ItemList extends React.Component { - render() { - const itemList = this.props.items.map((item) => { - if (this.props.category === "all") { - return ( - - - - ); - } - if (this.props.category === item.category) { - return ( - - - - ); - } else { - return null; - } - }); - return {itemList}; - } + +class ItemList extends React.Component{ + render() { + + const itemList = this.props.items.map((item) => { + if (this.props.category === 'all') { + return ( + + + + ); + } + if (this.props.category === item.category) { + return ( + + + + ); + } else { + return null; + } + }); + + return {itemList}; + } } export default ItemList; diff --git a/src/components/PostAd/PostAd.css b/src/components/PostAd/PostAd.css index 849da90..deeebdd 100644 --- a/src/components/PostAd/PostAd.css +++ b/src/components/PostAd/PostAd.css @@ -2,7 +2,4 @@ align-content: center; width:20%; } -.btn { - text-align: center; - -} \ No newline at end of file + \ No newline at end of file diff --git a/src/components/PostAd/PostAd.tsx b/src/components/PostAd/PostAd.tsx index 0a00b53..3ade72d 100644 --- a/src/components/PostAd/PostAd.tsx +++ b/src/components/PostAd/PostAd.tsx @@ -1,133 +1,127 @@ -import React, { useState } from "react"; +import React, { useState } from 'react'; // eslint-disable-next-line @typescript-eslint/no-unused-vars -import "./PostAd.css"; -import { RouteComponentProps } from "react-router"; +import './PostAd.css'; +import { RouteComponentProps } from 'react-router'; import { - IonTitle, - IonToolbar, - IonSelect, - IonSelectOption, - IonInput, - IonItem, - IonLabel, - IonList, - IonButton, - IonPage, - IonContent, - IonHeader, - IonButtons, - IonBackButton, -} from "@ionic/react"; + IonTitle, + IonToolbar, + IonSelect, + IonSelectOption, + IonInput, + IonItem, + IonLabel, + IonList, + IonButton, + IonPage, + IonContent, +} from '@ionic/react'; const PostAd: React.FC = () => { - const [name, setName] = useState(); - const [date, setDate] = useState(); - const [condition, setCondition] = useState(); - const [price, setPrice] = useState(); - const [category, setCategory] = useState(); - const [description, setDescription] = useState(); + const [name, setName] = useState(); + const [date, setDate] = useState(); + const [condition, setCondition] = useState(); + const [price, setPrice] = useState(); + const [category, setCategory] = useState(); + const [description, setDescription] = useState(); - return ( - - - - - - - - - Post Your Ad - - - -
- - - - Name of The Product - - setName(e.detail.value!)} - required - /> - - - - Tentative Date of Purchase - - setDate(e.detail.value!)} - required - /> - - - - Condition - - setCondition(e.detail.value!)} - required - /> - - - - Category - - setCategory(e.detail.value)} - > - Laptops - Mobile - Books - Cycle - Miscallaneous - - - - - Asking Price - - setPrice(e.detail.value!)} - required - /> - - - - Description - - setDescription(e.detail.value!)} - required - /> - - - - - -
-
- - Post - -
- - - ); + return ( + + + + Post Your Ad + +
+ + + + Name of The Product + + setName(e.detail.value!)} + required + /> + + + + Tentative Date of Purchase + + setDate(e.detail.value!)} + required + /> + + + + Condition + + + setCondition(e.detail.value!) + } + required + /> + + + + Category + + setCategory(e.detail.value)} + > + Laptops + Mobile + Books + Cycle + Miscallaneous + + + + + Asking Price + + setPrice(e.detail.value!)} + required + /> + + + + Description + + + setDescription(e.detail.value!) + } + required + /> + + + + + +
+
+ + Post + +
+ + + ); }; export default PostAd; diff --git a/src/components/RegisterForm/RegisterForm.tsx b/src/components/RegisterForm/RegisterForm.tsx index 2eaf6c2..3acef6f 100644 --- a/src/components/RegisterForm/RegisterForm.tsx +++ b/src/components/RegisterForm/RegisterForm.tsx @@ -1,87 +1,87 @@ -import React, { useState } from "react"; +import React, { useState } from 'react'; import { - IonTitle, - IonToolbar, - IonSelect, - IonSelectOption, - IonInput, - IonItem, - IonLabel, - IonList, - IonButton, -} from "@ionic/react"; -import "./RegisterForm.css"; + IonTitle, + IonToolbar, + IonSelect, + IonSelectOption, + IonInput, + IonItem, + IonLabel, + IonList, + IonButton, +} from '@ionic/react'; +import './RegisterForm.css'; const RegisterForm: React.FC = () => { - const [uname, setUname] = useState(); - const [pass, setPass] = useState(); - const [entryno, setEntryno] = useState(); - const [hostel, setHostel] = useState(); + const [uname, setUname] = useState(); + const [pass, setPass] = useState(); + const [entryno, setEntryno] = useState(); + const [hostel, setHostel] = useState(); - return ( -
- - Join us today ! - -
- - - - Username - - setUname(e.detail.value!)} - required - /> - - - - Password - - setPass(e.detail.value!)} - required - /> - - - - Entry Number - - setEntryno(e.detail.value!)} - required - /> - - - - Hostel - - setHostel(e.detail.value)} - > - Aravalli - Girnar - Jwalamukhi - Himadri - Zanskar - - - -
-
- - Register - -
-
- ); + return ( +
+ + Join us today ! + +
+ + + + Username + + setUname(e.detail.value!)} + required + /> + + + + Password + + setPass(e.detail.value!)} + required + /> + + + + Entry Number + + setEntryno(e.detail.value!)} + required + /> + + + + Hostel + + setHostel(e.detail.value)} + > + Aravalli + Girnar + Jwalamukhi + Himadri + Zanskar + + + +
+
+ + Register + +
+
+ ); }; export default RegisterForm; diff --git a/src/components/SearchBar/SearchBar.css b/src/components/SearchBar/SearchBar.css index d19a6e1..b896f4a 100644 --- a/src/components/SearchBar/SearchBar.css +++ b/src/components/SearchBar/SearchBar.css @@ -1,3 +1,3 @@ .searchbar{ - -} + align-self: start; +} \ No newline at end of file diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx index 671aa17..3638167 100644 --- a/src/components/SearchBar/SearchBar.tsx +++ b/src/components/SearchBar/SearchBar.tsx @@ -1,20 +1,19 @@ -import React, { useState } from "react"; -import { IonToolbar, IonSearchbar } from "@ionic/react"; -import "./SearchBar.css"; +import React, { useState } from 'react'; +import { IonToolbar, IonSearchbar } from '@ionic/react'; +import './SearchBar.css'; const SearchBar: React.FC = () => { - const [searchText, setSearchText] = useState(""); - return ( - - setSearchText(e.detail.value!)} - placeholder="Search" - /> - - ); + const [searchText, setSearchText] = useState(''); + return ( + + setSearchText(e.detail.value!)} + placeholder="Search" + /> + + ); }; export default SearchBar; diff --git a/src/index.tsx b/src/index.tsx index f075bbf..427ebae 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,17 +1,12 @@ -import React from "react"; -import ReactDOM from "react-dom"; -import App from "./App"; +import React from 'react'; +import ReactDOM from 'react-dom'; +import App from './App'; -import { createStore, applyMiddleware } from "redux"; -import rootReducer from "./store/reducers"; -import thunk from "redux-thunk"; -import { Provider } from "react-redux"; +import { createStore, applyMiddleware } from 'redux' +import rootReducer from './store/reducers' +import thunk from 'redux-thunk' +import { Provider } from 'react-redux' const store = createStore(rootReducer, applyMiddleware(thunk)); -ReactDOM.render( - - - , - document.getElementById("root") -); +ReactDOM.render(, document.getElementById('root')); diff --git a/src/pages/Health/Health.tsx b/src/pages/Health/Health.tsx index 3526d85..8368aaf 100644 --- a/src/pages/Health/Health.tsx +++ b/src/pages/Health/Health.tsx @@ -1,13 +1,13 @@ -import React from "react"; -import { withRouter } from "react-router-dom"; -import { IonPage } from "@ionic/react"; +import React from 'react'; +import { withRouter } from 'react-router-dom'; +import { IonPage } from '@ionic/react'; const Health: React.FC = () => { - return ( - -

Ok, Healthy!

- - ); + return ( + +

Ok, Healthy!

+ + ); }; export default withRouter(Health); diff --git a/src/pages/categories/categories.tsx b/src/pages/categories/categories.tsx index b4d0390..51d005e 100644 --- a/src/pages/categories/categories.tsx +++ b/src/pages/categories/categories.tsx @@ -1,32 +1,16 @@ -import React from "react"; -import { - IonContent, - IonPage, - IonHeader, - IonToolbar, - IonButtons, - IonBackButton, - IonTitle, -} from "@ionic/react"; -import CategoryCard from "../../components/CategoryCard/CategoryCard"; -import { RouteComponentProps } from "react-router"; +import React from 'react'; +import { IonContent, IonPage } from '@ionic/react'; +import CategoryCard from '../../components/CategoryCard/CategoryCard'; +import { RouteComponentProps } from 'react-router'; const categories: React.FC = (props) => { - return ( - - - - - - - Categories - - - - - - - ); + return ( + + + + + + ); }; export default categories; diff --git a/src/pages/chats/chats.tsx b/src/pages/chats/chats.tsx index e9705cb..f34d0d6 100644 --- a/src/pages/chats/chats.tsx +++ b/src/pages/chats/chats.tsx @@ -1,31 +1,16 @@ -import React from "react"; -import { - IonContent, - IonPage, - IonHeader, - IonToolbar, - IonButtons, - IonBackButton, - IonTitle, -} from "@ionic/react"; -import HeaderCard from "../../components/HeaderCard/HeaderCard"; -import { RouteComponentProps } from "react-router"; +import React from 'react'; +import { IonContent, IonPage } from '@ionic/react'; +import HeaderCard from '../../components/HeaderCard/HeaderCard'; +import { RouteComponentProps } from 'react-router'; const chats: React.FC = (props) => { - return ( - - - - - - - - Chats - - - - - ); + return ( + + + + + + ); }; export default chats; diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index a9c502f..0aa358c 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -1,101 +1,90 @@ -import React from "react"; +import React from 'react'; import { - IonContent, - IonLabel, - IonSegment, - IonSegmentButton, - IonPage, - IonFab, - IonFabButton, - IonIcon, - IonToolbar, - IonFabList, - IonHeader, - IonRow, - IonCol, - IonButtons, - IonBackButton, - IonTitle, -} from "@ionic/react"; -import { add, createOutline } from "ionicons/icons"; -import "./home.css"; -import HeaderCard from "../../components/HeaderCard/HeaderCard"; -import ItemList from "../../components/ItemList/ItemList"; -import { connect } from "react-redux"; -import { RouteComponentProps } from "react-router"; -import SearchBar from "../../components/SearchBar/SearchBar"; + IonContent, + IonLabel, + IonSegment, + IonSegmentButton, + IonPage, + IonFab, + IonFabButton, + IonIcon, + IonToolbar, + IonFabList, +} from '@ionic/react'; +import { add, createOutline } from 'ionicons/icons'; +import './home.css'; +import HeaderCard from '../../components/HeaderCard/HeaderCard'; +import ItemList from '../../components/ItemList/ItemList'; +// import CategoryCard from '../../components/CategoryCard/CategoryCard'; + +import { connect } from 'react-redux'; +import { RouteComponentProps } from 'react-router'; class Home extends React.Component { - // eslint-disable-next-line react/destructuring-assignment - // eslint-disable-next-line react/state-in-constructor - state = { - category: "all", - }; - render() { - return ( - - - - - - - - - - - - - - - - - this.setState({ category: e.detail.value })} - color="primary" - > - - All - - - Laptops - - - Mobiles - - - Bicycles - - - Books - - - - - - - - - - this.props.history.push("/postad")} - > - - {/* Post an Ad */} - - - - - - ); - } + // eslint-disable-next-line react/destructuring-assignment + // eslint-disable-next-line react/state-in-constructor + state = { + category: 'all', + }; + render() { + return ( + + + + + + this.setState({ category: e.detail.value }) + } + color="primary" + > + + All + + + Laptops + + + Mobiles + + + Bicycles + + + Books + + + + + + + + + + this.props.history.push('/postad')}> + + {/* Post an Ad */} + + + + + + ); + } } const mapStatetoProps = (state: any) => { - return { - items: state.item.items, - }; + return { + items: state.item.items, + }; }; export default connect(mapStatetoProps)(Home); diff --git a/src/pages/home/home2.tsx b/src/pages/home/home2.tsx index ebef08e..5c796ac 100644 --- a/src/pages/home/home2.tsx +++ b/src/pages/home/home2.tsx @@ -1,150 +1,95 @@ -import React from "react"; -import { - IonContent, - IonLabel, - IonSegment, - IonSegmentButton, - IonPage, - IonFab, - IonFabButton, - IonIcon, - IonToolbar, - IonFabList, - IonHeader, - IonText, - IonRow, - IonCol, - IonCard, -} from "@ionic/react"; -import { - add, - notificationsOutline, - personCircle, - heart, - heartOutline, - heartHalf, - checkmarkCircle, - lockClosed, - analytics, - ribbon, - ribbonOutline, -} from "ionicons/icons"; -import "./home2.css"; -import HeaderCard from "../../components/HeaderCard/HeaderCard"; -import ItemList from "../../components/ItemList/ItemList"; +import React from 'react'; +import { IonContent, IonLabel,IonSegment, IonSegmentButton, IonPage, IonFab, IonFabButton, IonIcon, IonToolbar, IonFabList, IonHeader, IonText, IonRow, IonCol, IonCard, } from '@ionic/react'; +import { add, notificationsOutline, personCircle, heart, heartOutline, heartHalf, checkmarkCircle, lockClosed, analytics, ribbon, ribbonOutline } from 'ionicons/icons'; +import './home2.css'; +import HeaderCard from '../../components/HeaderCard/HeaderCard'; +import ItemList from '../../components/ItemList/ItemList'; -import { connect } from "react-redux"; -import { RouteComponentProps } from "react-router"; -import SearchBar from "../../components/SearchBar/SearchBar"; -import CategoryCard from "../../components/CategoryCard/CategoryCard"; +import { connect } from 'react-redux'; +import { RouteComponentProps } from 'react-router'; + +import SearchBar from '../../components/SearchBar/SearchBar' +import CategoryCard from '../../components/CategoryCard/CategoryCard'; + class Home extends React.Component { - // eslint-disable-next-line react/destructuring-assignment - // eslint-disable-next-line react/state-in-constructor - state = { - category: "all", - }; - render() { - return ( - - - - - - - - - - - - - - - - -
- Safe - - - - - -
- Secure - - - - - - - -
- Dynamic - - - - - -
- Friendly - - - -
+ // eslint-disable-next-line react/destructuring-assignment + // eslint-disable-next-line react/state-in-constructor + state = { + category: 'all', + }; + render() { + return ( + + + + + + + + + + + + + + + + +
+ Safe + + + + +
+ Secure + + + + + + +
+ Dynamic + + + + +
+ Friendly + + + +
+ + +

Choose a category

 + + + + + + + + this.props.history.push('/postad')} /> + + + + - - -

Choose a category

- - - - - - this.props.history.push("/postad")} - /> - - - - - ); - } + + + ); + } } const mapStatetoProps = (state: any) => { - return { - items: state.item.items, - }; + return { + items: state.item.items, + }; }; export default connect(mapStatetoProps)(Home); diff --git a/src/pages/myaccount/myaccount.css b/src/pages/myaccount/myaccount.css index b583f12..0afcaf6 100644 --- a/src/pages/myaccount/myaccount.css +++ b/src/pages/myaccount/myaccount.css @@ -1,20 +1,6 @@ -.effect { - border: 1px solid #ccc; - padding: 7px 14px; - - background: transparent; - color:black; -} -.avatar { - height:100px; - width:100px; - position: relative; - display: block; - margin-left: auto; - margin-right: auto; -} - -.colgap { - padding-bottom: 30px ; +.buttons{ + text-align: center; + padding:2em; + padding-top:6em; } \ No newline at end of file diff --git a/src/pages/myaccount/myaccount.tsx b/src/pages/myaccount/myaccount.tsx index 6d938e4..2b41383 100644 --- a/src/pages/myaccount/myaccount.tsx +++ b/src/pages/myaccount/myaccount.tsx @@ -1,123 +1,43 @@ -import React from "react"; +import React from 'react'; import { - IonContent, - IonHeader, - IonButton, - IonItem, - IonLabel, - IonToolbar, - IonTitle, - IonGrid, - IonRow, - IonCol, - IonInput, - IonSegment, - IonSegmentButton, - IonPage, - IonBackButton, - IonButtons, -} from "@ionic/react"; -import "./myaccount.css"; + IonContent, + IonHeader, + IonPage, + IonItem, + IonLabel, + IonThumbnail, + IonToolbar, +} from '@ionic/react'; +import './myaccount.css'; +import HeaderCard from '../../components/HeaderCard/HeaderCard'; +import { RouteComponentProps } from 'react-router'; -const Myaccount: React.FC = () => { - return ( - - - - - - - Profile - - - -
- - - -
- - - - Profile - - - Buy/Sell History - - - - - - -
- Name -
- -
- -
- - -
- Entry No. -
-
- -
- - - -
- Phone No. -
-
- -
- - -
- Email -
- -
- -
- - - -
- Hostel -
-
- -
- - - - Update Info - - - - - Get on PlayStore - - - Get on AppStore - - - - - Contact For Help - - - - - - ); +const myaccount: React.FC = (props) => { + return ( + + + +

+
+ + Guest User + + + + +
+
+
+ + + + + + + ); }; -export default Myaccount; +export default myaccount; diff --git a/src/pages/register/register.tsx b/src/pages/register/register.tsx index 15c1387..c919f8b 100644 --- a/src/pages/register/register.tsx +++ b/src/pages/register/register.tsx @@ -1,16 +1,20 @@ -import React from "react"; -import RegisterForm from "../../components/RegisterForm/RegisterForm"; -import { IonPage } from "@ionic/react"; -import { RouteComponentProps } from "react-router"; +import React from 'react' +import RegisterForm from '../../components/RegisterForm/RegisterForm' +import {IonPage} from '@ionic/react' +import {RouteComponentProps} from 'react-router' class Register extends React.Component { - state = { - isSignUp: true, - }; - render() { - let register = ; - return {register}; - } + state = { + isSignUp: true + } + render() { + let register = + return ( + + {register} + + ) + } } -export default Register; +export default Register; \ No newline at end of file diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts index 73c4506..35e67cb 100644 --- a/src/serviceWorker.ts +++ b/src/serviceWorker.ts @@ -11,132 +11,136 @@ // opt-in, read https://bit.ly/CRA-PWA const isLocalhost = Boolean( - window.location.hostname === "localhost" || - // [::1] is the IPv6 localhost address. - window.location.hostname === "[::1]" || - // 127.0.0.0/8 are considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) + window.location.hostname === 'localhost' || + // [::1] is the IPv6 localhost address. + window.location.hostname === '[::1]' || + // 127.0.0.0/8 are considered localhost for IPv4. + window.location.hostname.match( + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ + ) ); type Config = { - onSuccess?: (registration: ServiceWorkerRegistration) => void; - onUpdate?: (registration: ServiceWorkerRegistration) => void; + onSuccess?: (registration: ServiceWorkerRegistration) => void; + onUpdate?: (registration: ServiceWorkerRegistration) => void; }; export function register(config?: Config) { - if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL!, window.location.href); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 - return; - } + if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL( + process.env.PUBLIC_URL!, + window.location.href + ); + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebook/create-react-app/issues/2374 + return; + } - window.addEventListener("load", () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + window.addEventListener('load', () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - if (isLocalhost) { - // This is running on localhost. Let's check if a service worker still exists or not. - checkValidServiceWorker(swUrl, config); + if (isLocalhost) { + // This is running on localhost. Let's check if a service worker still exists or not. + checkValidServiceWorker(swUrl, config); - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - "This web app is being served cache-first by a service " + - "worker. To learn more, visit https://bit.ly/CRA-PWA" - ); + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + 'This web app is being served cache-first by a service ' + + 'worker. To learn more, visit https://bit.ly/CRA-PWA' + ); + }); + } else { + // Is not localhost. Just register service worker + registerValidSW(swUrl, config); + } }); - } else { - // Is not localhost. Just register service worker - registerValidSW(swUrl, config); - } - }); - } + } } function registerValidSW(swUrl: string, config?: Config) { - navigator.serviceWorker - .register(swUrl) - .then((registration) => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker == null) { - return; - } - installingWorker.onstatechange = () => { - if (installingWorker.state === "installed") { - if (navigator.serviceWorker.controller) { - // At this point, the updated precached content has been fetched, - // but the previous service worker will still serve the older - // content until all client tabs are closed. - console.log( - "New content is available and will be used when all " + - "tabs for this page are closed. See https://bit.ly/CRA-PWA." - ); + navigator.serviceWorker + .register(swUrl) + .then((registration) => { + registration.onupdatefound = () => { + const installingWorker = registration.installing; + if (installingWorker == null) { + return; + } + installingWorker.onstatechange = () => { + if (installingWorker.state === 'installed') { + if (navigator.serviceWorker.controller) { + // At this point, the updated precached content has been fetched, + // but the previous service worker will still serve the older + // content until all client tabs are closed. + console.log( + 'New content is available and will be used when all ' + + 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' + ); - // Execute callback - if (config && config.onUpdate) { - config.onUpdate(registration); - } - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log("Content is cached for offline use."); + // Execute callback + if (config && config.onUpdate) { + config.onUpdate(registration); + } + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log('Content is cached for offline use.'); - // Execute callback - if (config && config.onSuccess) { - config.onSuccess(registration); - } - } - } - }; - }; - }) - .catch((error) => { - console.error("Error during service worker registration:", error); - }); + // Execute callback + if (config && config.onSuccess) { + config.onSuccess(registration); + } + } + } + }; + }; + }) + .catch((error) => { + console.error('Error during service worker registration:', error); + }); } function checkValidServiceWorker(swUrl: string, config?: Config) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl, { - headers: { "Service-Worker": "script" }, - }) - .then((response) => { - // Ensure service worker exists, and that we really are getting a JS file. - const contentType = response.headers.get("content-type"); - if ( - response.status === 404 || - (contentType != null && contentType.indexOf("javascript") === -1) - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then((registration) => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl, config); - } + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl, { + headers: { 'Service-Worker': 'script' }, }) - .catch(() => { - console.log( - "No internet connection found. App is running in offline mode." - ); - }); + .then((response) => { + // Ensure service worker exists, and that we really are getting a JS file. + const contentType = response.headers.get('content-type'); + if ( + response.status === 404 || + (contentType != null && + contentType.indexOf('javascript') === -1) + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then((registration) => { + registration.unregister().then(() => { + window.location.reload(); + }); + }); + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl, config); + } + }) + .catch(() => { + console.log( + 'No internet connection found. App is running in offline mode.' + ); + }); } export function unregister() { - if ("serviceWorker" in navigator) { - navigator.serviceWorker.ready.then((registration) => { - registration.unregister(); - }); - } + if ('serviceWorker' in navigator) { + navigator.serviceWorker.ready.then((registration) => { + registration.unregister(); + }); + } } diff --git a/src/setupTests.ts b/src/setupTests.ts index 5fdf001..74b1a27 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -2,4 +2,4 @@ // allows you to do things like: // expect(element).toHaveTextContent(/react/i) // learn more: https://github.com/testing-library/jest-dom -import "@testing-library/jest-dom/extend-expect"; +import '@testing-library/jest-dom/extend-expect'; diff --git a/src/store/actions/actionTypes.tsx b/src/store/actions/actionTypes.tsx index 7210a39..dd03c21 100644 --- a/src/store/actions/actionTypes.tsx +++ b/src/store/actions/actionTypes.tsx @@ -1,51 +1,54 @@ -export const MISC_FOLLOW = "MISC_FOLLOW"; -export const MISC_UNFOLLOW = "MISC_UNFOLLOW"; -export const MISC_NOTIFS = "MISC_NOTIFS"; -export const MISC_REPORT = "MISC_REPORT"; -export const MISC_START = "MISC_START"; -export const MISC_FAIL = "MISC_FAIL"; +export const MISC_FOLLOW = 'MISC_FOLLOW' +export const MISC_UNFOLLOW = 'MISC_UNFOLLOW' +export const MISC_NOTIFS = 'MISC_NOTIFS' +export const MISC_REPORT = 'MISC_REPORT' +export const MISC_START = 'MISC_START' +export const MISC_FAIL = 'MISC_FAIL' -export const AUTH_SUCCESS = "AUTH_SUCCESS"; -export const AUTH_FAIL = "AUTH_FAIL"; -export const AUTH_START = "AUTH_START"; -export const AUTH_LOGOUT = "AUTH_LOGOUT"; -export const ITEM_START = "ITEM_START"; -export const ITEM_SUCCESS = "ITEM_SUCCESS"; -export const ITEM_FAIL = "ITEM_FAIL"; +export const AUTH_SUCCESS = 'AUTH_SUCCESS' +export const AUTH_FAIL = 'AUTH_FAIL' +export const AUTH_START = 'AUTH_START' +export const AUTH_LOGOUT = 'AUTH_LOGOUT' -export const ITEM_POST_START = "ITEM_POST_START"; -export const ITEM_POST_SUCCESS = "ITEM_POST_SUCCESS"; -export const ITEM_EDIT_START = "ITEM_EDIT_START"; -export const ITEM_EDIT_SUCCESS = "ITEM_EDIT_SUCCESS"; +export const ITEM_START = 'ITEM_START' +export const ITEM_SUCCESS = 'ITEM_SUCCESS' +export const ITEM_FAIL = 'ITEM_FAIL' -export const ITEM_DEL_START = "ITEM_DEL_START"; -export const ITEM_DEL_SUCCESS = "ITEM_DEL_SUCCESS"; +export const ITEM_POST_START = 'ITEM_POST_START' +export const ITEM_POST_SUCCESS = 'ITEM_POST_SUCCESS' -export const ITEM_SELLINI_START = "ITEM_SELLINI_START"; -export const ITEM_SELLINI_SUCCESS = "ITEM_SELLINI_SUCCESS"; +export const ITEM_EDIT_START = 'ITEM_EDIT_START' +export const ITEM_EDIT_SUCCESS = 'ITEM_EDIT_SUCCESS' -export const ITEM_SELLFIN_START = "ITEM_SELLFIN_START"; -export const ITEM_SELLFIN_SUCCESS = "ITEM_SELLFIN_SUCCESS"; +export const ITEM_DEL_START = 'ITEM_DEL_START' +export const ITEM_DEL_SUCCESS = 'ITEM_DEL_SUCCESS' -export const ITEM_REPORT_SUCCESS = "ITEM_REPORT_SUCCESS"; +export const ITEM_SELLINI_START = 'ITEM_SELLINI_START' +export const ITEM_SELLINI_SUCCESS = 'ITEM_SELLINI_SUCCESS' -export const REVIEW_START = "REVIEW_START"; -export const REVIEW_SUCCESS = "REVIEW_SUCCESS"; -export const REVIEW_FAIL = "REVIEW_FAIL"; +export const ITEM_SELLFIN_START = 'ITEM_SELLFIN_START' +export const ITEM_SELLFIN_SUCCESS = 'ITEM_SELLFIN_SUCCESS' -export const REVIEW_POST_START = "REVIEW_POST_START"; -export const REVIEW_POST_SUCCESS = "REVIEW_POST_SUCCESS"; +export const ITEM_REPORT_SUCCESS = 'ITEM_REPORT_SUCCESS' -export const REVIEW_EDIT_START = "REVIEW_EDIT_START"; -export const REVIEW_EDIT_SUCCESS = "REVIEW_EDIT_SUCCESS"; -export const REVIEW_DEL_START = "REVIEW_DEL_START"; -export const REVIEW_DEL_SUCCESS = "REVIEW_DEL_SUCCESS"; +export const REVIEW_START = 'REVIEW_START' +export const REVIEW_SUCCESS = 'REVIEW_SUCCESS' +export const REVIEW_FAIL = 'REVIEW_FAIL' -export const REVIEW_UPVOTE_SUCCESS = "REVIEW_UPVOTE_SUCCESS"; -export const REVIEW_DOWNVOTE_SUCCESS = "REVIEW_DOWNVOTE_SUCCESS"; +export const REVIEW_POST_START = 'REVIEW_POST_START' +export const REVIEW_POST_SUCCESS = 'REVIEW_POST_SUCCESS' -export const REVIEW_REPORT_SUCCESS = "REVIEW_REPORT_SUCCESS"; -export const REVIEW_RESOLVE_SUCCESS = "REVIEW_RESOLVE_SUCCESS"; +export const REVIEW_EDIT_START = 'REVIEW_EDIT_START' +export const REVIEW_EDIT_SUCCESS = 'REVIEW_EDIT_SUCCESS' + +export const REVIEW_DEL_START = 'REVIEW_DEL_START' +export const REVIEW_DEL_SUCCESS = 'REVIEW_DEL_SUCCESS' + +export const REVIEW_UPVOTE_SUCCESS = 'REVIEW_UPVOTE_SUCCESS' +export const REVIEW_DOWNVOTE_SUCCESS = 'REVIEW_DOWNVOTE_SUCCESS' + +export const REVIEW_REPORT_SUCCESS = 'REVIEW_REPORT_SUCCESS' +export const REVIEW_RESOLVE_SUCCESS = 'REVIEW_RESOLVE_SUCCESS' \ No newline at end of file diff --git a/src/store/actions/auth.tsx b/src/store/actions/auth.tsx index 88ea84d..fd49354 100644 --- a/src/store/actions/auth.tsx +++ b/src/store/actions/auth.tsx @@ -1,44 +1,42 @@ -import * as actionTypes from "./actionTypes"; -import axios from "../../axios-ins"; -import qs from "querystring"; +import * as actionTypes from './actionTypes'; +import axios from '../../axios-ins' +import qs from 'querystring' export const authStart = () => ({ - type: actionTypes.AUTH_START, -}); + type: actionTypes.AUTH_START +}) export const authSuccess = (data) => ({ - type: actionTypes.AUTH_SUCCESS, - data: data, -}); + type: actionTypes.AUTH_SUCCESS, + data: data +}) export const authFail = (err) => ({ - type: actionTypes.AUTH_FAIL, - data: err, -}); + type: actionTypes.AUTH_FAIL, + data: err +}) -export const auth = (data, isSignUp: boolean) => (dispatch) => { - dispatch(authStart()); - let url = "/login"; - if (isSignUp) { - url = "/register"; - } - axios - .post(url, qs.stringify(data)) - .then((res) => { - dispatch(authSuccess(res.data)); - }) - .catch((err) => { - dispatch(authFail(err)); - }); -}; +export const auth = (data, isSignUp: boolean) => dispatch => { + dispatch(authStart()) + let url = '/login' + if (isSignUp) { + url = '/register' + } + axios.post(url, qs.stringify(data)) + .then(res => { + dispatch(authSuccess(res.data)) + }) + .catch(err => { + dispatch(authFail(err)) + }) +} -export const authLogout = () => (dispatch) => { - axios - .get("/logout") - .then((res) => { - dispatch({ type: actionTypes.AUTH_LOGOUT }); - }) - .catch((err) => { - dispatch(authFail(err)); - }); -}; +export const authLogout = () => dispatch => { + axios.get('/logout') + .then(res => { + dispatch({type: actionTypes.AUTH_LOGOUT}) + }) + .catch(err => { + dispatch(authFail(err)) + }) +} diff --git a/src/store/actions/chat.tsx b/src/store/actions/chat.tsx index 5614d52..c84c944 100644 --- a/src/store/actions/chat.tsx +++ b/src/store/actions/chat.tsx @@ -1,13 +1,13 @@ -import io from "socket.io-client"; +import io from 'socket.io-client'; export const mountChat = () => (dispatch) => { - const socket = io("http://localhost:5000/chat"); - let stack: Record; - let username: string; - socket.on("connect", () => { - socket.emit("setUserData", username); - }); - socket.on("onlineStack", (sta: Record) => { - stack = sta; - }); + const socket = io('http://localhost:5000/chat'); + let stack: Record; + let username: string; + socket.on('connect', () => { + socket.emit('setUserData', username); + }); + socket.on('onlineStack', (sta: Record) => { + stack = sta; + }) }; diff --git a/src/store/actions/index.tsx b/src/store/actions/index.tsx index f644ee6..d865232 100644 --- a/src/store/actions/index.tsx +++ b/src/store/actions/index.tsx @@ -1,2 +1,2 @@ -export { authSuccess } from "./auth"; -export {} from "./item"; +export {authSuccess} from './auth' +export {} from './item' \ No newline at end of file diff --git a/src/store/actions/item.tsx b/src/store/actions/item.tsx index 3091911..ffa2bd6 100644 --- a/src/store/actions/item.tsx +++ b/src/store/actions/item.tsx @@ -1,146 +1,139 @@ -import axios from "../../axios-ins"; -import * as actionTypes from "./actionTypes"; -import qs from "querystring"; +import axios from '../../axios-ins'; +import * as actionTypes from './actionTypes' +import qs from 'querystring' export const getItemStart = () => ({ - type: actionTypes.ITEM_START, -}); + type: actionTypes.ITEM_START +}) export const getItemSuccess = (data) => ({ - type: actionTypes.ITEM_SUCCESS, - data: data, -}); + type: actionTypes.ITEM_SUCCESS, + data: data +}) export const postItemStart = () => ({ - type: actionTypes.ITEM_POST_START, -}); + type: actionTypes.ITEM_POST_START +}) export const postItemSuccess = (data) => ({ - type: actionTypes.ITEM_POST_SUCCESS, - data: data, -}); + type: actionTypes.ITEM_POST_SUCCESS, + data: data +}) export const itemFail = (err) => ({ - type: actionTypes.ITEM_FAIL, - err: err, -}); + type: actionTypes.ITEM_FAIL, + err: err +}) export const editItemStart = () => ({ - type: actionTypes.ITEM_EDIT_START, -}); + type: actionTypes.ITEM_EDIT_START +}) export const editItemSuccess = (data) => ({ - type: actionTypes.ITEM_EDIT_SUCCESS, - data: data, -}); + type: actionTypes.ITEM_EDIT_SUCCESS, + data: data +}) export const delItemStart = () => ({ - type: actionTypes.ITEM_DEL_START, -}); + type: actionTypes.ITEM_DEL_START +}) export const delItemSuccess = () => ({ - type: actionTypes.ITEM_DEL_SUCCESS, -}); + type: actionTypes.ITEM_DEL_SUCCESS +}) export const sellIniItemStart = () => ({ - type: actionTypes.ITEM_SELLINI_START, -}); + type: actionTypes.ITEM_SELLINI_START +}) export const sellIniItemSuccess = () => ({ - type: actionTypes.ITEM_SELLINI_SUCCESS, -}); + type: actionTypes.ITEM_SELLINI_SUCCESS +}) export const sellFinItemStart = () => ({ - type: actionTypes.ITEM_SELLFIN_START, -}); + type: actionTypes.ITEM_SELLFIN_START +}) export const sellFinItemSuccess = () => ({ - type: actionTypes.ITEM_SELLFIN_SUCCESS, -}); + type: actionTypes.ITEM_SELLFIN_SUCCESS +}) export const reportItemSuccess = () => ({ - type: actionTypes.ITEM_REPORT_SUCCESS, -}); - -export const getItem = () => (dispatch) => { - dispatch(getItemStart()); - axios - .get("/item") - .then((res) => { - dispatch(getItemSuccess(res.data)); - }) - .catch((err) => { - dispatch(itemFail(err)); - }); -}; - -export const postItem = (data) => (dispatch) => { - dispatch(postItemStart()); - axios - .post("/item", qs.stringify(data)) - .then((res) => { - dispatch(postItemSuccess(res.data)); - }) - .catch((err) => { - dispatch(itemFail(err)); - }); -}; - -export const editItem = (data, id) => (dispatch) => { - dispatch(editItemStart()); - axios - .put("/item/" + id, qs.stringify(data)) - .then((res) => { - dispatch(editItemSuccess(res.data)); - }) - .catch((err) => { - dispatch(itemFail(err)); - }); -}; - -export const delItem = (id) => (dispatch) => { - dispatch(delItemStart()); - axios - .delete("/item/" + id) - .then((res) => { - dispatch(delItemSuccess()); - }) - .catch((err) => { - dispatch(itemFail(err)); - }); -}; - -export const selliniItem = (id, data) => (dispatch) => { - dispatch(sellIniItemStart()); - axios - .patch("/item/" + id + "/sellIni", qs.stringify(data)) - .then((res) => { - dispatch(sellIniItemSuccess()); - }) - .catch((err) => { - dispatch(itemFail(err)); - }); -}; - -export const sellfniItem = (id, data) => (dispatch) => { - dispatch(sellFinItemStart()); - axios - .patch("/item/" + id + "/sellFin", qs.stringify(data)) - .then((res) => { - dispatch(sellFinItemSuccess()); - }) - .catch((err) => { - dispatch(itemFail(err)); - }); -}; - -export const reportItem = (id) => (dispatch) => { - axios - .patch("/item/" + id + "/report") - .then((res) => { - dispatch(reportItemSuccess()); - }) - .catch((err) => { - dispatch(itemFail(err)); - }); -}; + type: actionTypes.ITEM_REPORT_SUCCESS +}) + +export const getItem = () => dispatch => { + dispatch(getItemStart()) + axios.get('/item') + .then(res => { + dispatch(getItemSuccess(res.data)) + }) + .catch(err => { + dispatch(itemFail(err)) + }) +} + +export const postItem = (data) => dispatch => { + dispatch(postItemStart()) + axios.post('/item', qs.stringify(data)) + .then(res => { + dispatch(postItemSuccess(res.data)) + }) + .catch(err => { + dispatch(itemFail(err)) + }) +} + +export const editItem = (data, id) => dispatch => { + dispatch(editItemStart()) + axios.put('/item/'+ id, qs.stringify(data)) + .then(res => { + dispatch(editItemSuccess(res.data)) + }) + .catch(err => { + dispatch(itemFail(err)) + }) +} + +export const delItem = (id) => dispatch => { + dispatch(delItemStart()) + axios.delete('/item/'+ id) + .then(res => { + dispatch(delItemSuccess()) + }) + .catch(err => { + dispatch(itemFail(err)) + }) +} + +export const selliniItem = (id, data) => dispatch => { + dispatch(sellIniItemStart()) + axios.patch('/item/'+ id + '/sellIni', qs.stringify(data)) + .then(res => { + dispatch(sellIniItemSuccess()) + }) + .catch(err => { + dispatch(itemFail(err)) + }) +} + +export const sellfniItem = (id, data) => dispatch => { + dispatch(sellFinItemStart()) + axios.patch('/item/'+ id + '/sellFin', qs.stringify(data)) + .then(res => { + dispatch(sellFinItemSuccess()) + }) + .catch(err => { + dispatch(itemFail(err)) + }) +} + +export const reportItem = (id) => dispatch => { + axios.patch('/item/'+ id + '/report') + .then(res => { + dispatch(reportItemSuccess()) + }) + .catch(err => { + dispatch(itemFail(err)) + }) +} diff --git a/src/store/actions/misc.tsx b/src/store/actions/misc.tsx index 681db76..ca0ee12 100644 --- a/src/store/actions/misc.tsx +++ b/src/store/actions/misc.tsx @@ -1,79 +1,75 @@ -import axios from "axios"; -import * as actionTypes from "./actionTypes"; +import axios from 'axios'; +import * as actionTypes from './actionTypes'; export const miscStart = () => ({ - type: actionTypes.MISC_START, -}); + type: actionTypes.MISC_START +}) export const miscFail = (err) => ({ - type: actionTypes.MISC_FAIL, - err: err, -}); + type: actionTypes.MISC_FAIL, + err: err +}) export const miscFollow = (category) => ({ - type: actionTypes.MISC_FOLLOW, - cat: category, -}); + type: actionTypes.MISC_FOLLOW, + cat: category +}) export const miscUnfollow = (category) => ({ - type: actionTypes.MISC_UNFOLLOW, - cat: category, -}); + type: actionTypes.MISC_UNFOLLOW, + cat: category +}) export const miscNotifs = (notifs) => ({ - type: actionTypes.MISC_NOTIFS, - notifs: notifs, -}); + type: actionTypes.MISC_NOTIFS, + notifs: notifs +}) export const miscReport = (rep) => ({ - type: actionTypes.MISC_REPORT, - report: rep, -}); + type: actionTypes.MISC_REPORT, + report: rep +}) -export const follow = (cat) => (dispatch) => { - dispatch(miscStart()); - axios - .patch("/follow/" + cat) - .then((res) => { - miscFollow(cat); - }) - .catch((err) => { - miscFail(err); - }); -}; +export const follow = (cat) => dispatch => { + dispatch(miscStart()) + axios.patch('/follow/' + cat) + .then(res => { + miscFollow(cat) + }) + .catch(err => { + miscFail(err) + }) +} -export const unfollow = (cat) => (dispatch) => { - dispatch(miscStart()); - axios - .patch("/unfollow/" + cat) - .then((res) => { - miscUnfollow(cat); - }) - .catch((err) => { - miscFail(err); - }); -}; +export const unfollow = (cat) => dispatch => { + dispatch(miscStart()) + axios.patch('/unfollow/' + cat) + .then(res => { + miscUnfollow(cat) + }) + .catch(err => { + miscFail(err) + }) +} -export const notifs = () => (dispatch) => { - dispatch(miscStart()); - axios - .get("/notifications") - .then((res) => { - dispatch(miscNotifs(res.data)); - }) - .catch((err) => { - dispatch(miscFail(err)); - }); -}; +export const notifs = () => dispatch => { + dispatch(miscStart()) + axios.get('/notifications') + .then(res => { + dispatch(miscNotifs(res.data)) + }) + .catch(err => { + dispatch(miscFail(err)) + }) +} -export const report = () => (dispatch) => { - dispatch(miscStart()); - axios - .get("/report") - .then((res) => { - dispatch(miscReport(res.data)); - }) - .catch((err) => { - dispatch(miscFail(err)); - }); -}; +export const report = () => dispatch => { + dispatch(miscStart()) + axios.get('/report') + .then(res => { + dispatch(miscReport(res.data)) + }) + .catch(err => { + dispatch(miscFail(err)) + }) +} \ No newline at end of file diff --git a/src/store/actions/review.tsx b/src/store/actions/review.tsx index 1b9a31b..317be3e 100644 --- a/src/store/actions/review.tsx +++ b/src/store/actions/review.tsx @@ -1,151 +1,143 @@ -import axios from "../../axios-ins"; -import qs from "querystring"; -import * as actionTypes from "./actionTypes"; +import axios from '../../axios-ins' +import qs from 'querystring' +import * as actionTypes from './actionTypes' export const getReviewStart = () => ({ - type: actionTypes.REVIEW_START, -}); + type: actionTypes.REVIEW_START +}) export const getReviewSuccess = (data) => ({ - type: actionTypes.REVIEW_SUCCESS, - data: data, -}); + type: actionTypes.REVIEW_SUCCESS, + data: data +}) export const postReviewStart = () => ({ - type: actionTypes.REVIEW_POST_START, -}); + type: actionTypes.REVIEW_POST_START +}) export const postReviewSuccess = (data) => ({ - type: actionTypes.REVIEW_POST_SUCCESS, - data: data, -}); + type: actionTypes.REVIEW_POST_SUCCESS, + data: data +}) export const reviewFail = (err) => ({ - type: actionTypes.REVIEW_FAIL, - err: err, -}); + type: actionTypes.REVIEW_FAIL, + err: err +}) export const editReviewStart = () => ({ - type: actionTypes.REVIEW_EDIT_START, -}); + type: actionTypes.REVIEW_EDIT_START +}) export const editReviewSuccess = (data) => ({ - type: actionTypes.REVIEW_EDIT_SUCCESS, - data: data, -}); + type: actionTypes.REVIEW_EDIT_SUCCESS, + data: data +}) export const delReviewStart = () => ({ - type: actionTypes.REVIEW_DEL_START, -}); + type: actionTypes.REVIEW_DEL_START +}) export const delReviewSuccess = () => ({ - type: actionTypes.REVIEW_DEL_SUCCESS, -}); + type: actionTypes.REVIEW_DEL_SUCCESS +}) export const upvoteReviewSuccess = () => ({ - type: actionTypes.REVIEW_UPVOTE_SUCCESS, -}); + type: actionTypes.REVIEW_UPVOTE_SUCCESS +}) export const downvoteReviewSuccess = () => ({ - type: actionTypes.REVIEW_DOWNVOTE_SUCCESS, -}); + type: actionTypes.REVIEW_DOWNVOTE_SUCCESS +}) export const reportReviewSuccess = () => ({ - type: actionTypes.REVIEW_REPORT_SUCCESS, -}); + type: actionTypes.REVIEW_REPORT_SUCCESS +}) export const resolveReviewSuccess = () => ({ - type: actionTypes.REVIEW_RESOLVE_SUCCESS, -}); - -export const getReview = (id) => (dispatch) => { - dispatch(getReviewStart()); - axios - .get("/users/" + id + "/reviews/") - .then((res) => { - dispatch(getReviewSuccess(res.data)); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; - -export const postReview = (data, id) => (dispatch) => { - dispatch(postReviewStart()); - axios - .post("/users/" + id + "/reviews/", qs.stringify(data)) - .then((res) => { - dispatch(postReviewSuccess(res.data)); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; - -export const editReview = (data, id, reviewId) => (dispatch) => { - dispatch(editReviewStart()); - axios - .put("/users/" + id + "/reviews/" + reviewId, qs.stringify(data)) - .then((res) => { - dispatch(editReviewSuccess(res.data)); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; - -export const delReview = (id, reviewId) => (dispatch) => { - dispatch(delReviewStart()); - axios - .delete("/users/" + id + "/reviews/" + reviewId) - .then((res) => { - dispatch(delReviewSuccess()); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; - -export const upvoteReview = (id, reviewId) => (dispatch) => { - axios - .patch("/users/" + id + "/reviews/" + reviewId + "/upvote") - .then((res) => { - dispatch(upvoteReviewSuccess()); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; - -export const downvoteReview = (id, reviewId) => (dispatch) => { - axios - .patch("/users/" + id + "/reviews/" + reviewId + "/downvote") - .then((res) => { - dispatch(downvoteReviewSuccess()); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; - -export const reportReview = (id, reviewId) => (dispatch) => { - axios - .patch("/users/" + id + "/reviews/" + reviewId + "/report") - .then((res) => { - dispatch(reportReviewSuccess()); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; - -export const resolveReview = (id, reviewId) => (dispatch) => { - axios - .patch("/users/" + id + "/reviews/" + reviewId + "/resolve") - .then((res) => { - dispatch(resolveReviewSuccess()); - }) - .catch((err) => { - dispatch(reviewFail(err)); - }); -}; + type: actionTypes.REVIEW_RESOLVE_SUCCESS +}) + +export const getReview = (id) => dispatch => { + dispatch(getReviewStart()) + axios.get('/users/' + id + '/reviews/') + .then(res => { + dispatch(getReviewSuccess(res.data)) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} + +export const postReview = (data, id) => dispatch => { + dispatch(postReviewStart()) + axios.post('/users/' + id + '/reviews/', qs.stringify(data)) + .then(res => { + dispatch(postReviewSuccess(res.data)) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} + +export const editReview = (data, id, reviewId) => dispatch => { + dispatch(editReviewStart()) + axios.put('/users/' + id + '/reviews/'+ reviewId, qs.stringify(data)) + .then(res => { + dispatch(editReviewSuccess(res.data)) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} + +export const delReview = (id, reviewId) => dispatch => { + dispatch(delReviewStart()) + axios.delete('/users/' + id + '/reviews/'+ reviewId) + .then(res => { + dispatch(delReviewSuccess()) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} + +export const upvoteReview = (id, reviewId) => dispatch => { + axios.patch('/users/' + id + '/reviews/'+ reviewId + '/upvote') + .then(res => { + dispatch(upvoteReviewSuccess()) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} + +export const downvoteReview = (id, reviewId) => dispatch => { + axios.patch('/users/' + id + '/reviews/'+ reviewId + '/downvote') + .then(res => { + dispatch(downvoteReviewSuccess()) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} + +export const reportReview = (id, reviewId) => dispatch => { + axios.patch('/users/' + id + '/reviews/'+ reviewId + '/report') + .then(res => { + dispatch(reportReviewSuccess()) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} + +export const resolveReview = (id, reviewId) => dispatch => { + axios.patch('/users/' + id + '/reviews/'+ reviewId + '/resolve') + .then(res => { + dispatch(resolveReviewSuccess()) + }) + .catch(err => { + dispatch(reviewFail(err)) + }) +} \ No newline at end of file diff --git a/src/store/reducers/auth.tsx b/src/store/reducers/auth.tsx index 44f672d..0ae0bc9 100644 --- a/src/store/reducers/auth.tsx +++ b/src/store/reducers/auth.tsx @@ -1,7 +1,7 @@ -const initState = {}; +const initState = {} -const authReducer = (state = initState, action = {}) => { - return state; -}; +const authReducer = (state = initState,action={}) => { + return state +} -export default authReducer; +export default authReducer \ No newline at end of file diff --git a/src/store/reducers/index.tsx b/src/store/reducers/index.tsx index c682e0e..39344fd 100644 --- a/src/store/reducers/index.tsx +++ b/src/store/reducers/index.tsx @@ -1,11 +1,11 @@ -import authReducer from "./auth"; -import itemReducer from "./item"; +import authReducer from './auth' +import itemReducer from './item' -import { combineReducers } from "redux"; +import { combineReducers } from 'redux' -const rootReducer = combineReducers({ - auth: authReducer, - item: itemReducer, -}); +const rootReducer = combineReducers ({ + auth : authReducer, + item : itemReducer +}) -export default rootReducer; +export default rootReducer; \ No newline at end of file diff --git a/src/store/reducers/item.tsx b/src/store/reducers/item.tsx index 9db8373..8e09c7e 100644 --- a/src/store/reducers/item.tsx +++ b/src/store/reducers/item.tsx @@ -1,80 +1,80 @@ const initState = { - items: [ - { - id: 1, - name: "Asus Laptop", - price: 40000, - category: "laptop", - image: "/images/laptop.jfif", - }, - { - id: 2, - name: "Macbook Air", - price: 60000, - category: "laptop", - image: "/images/laptop.jfif", - }, - { - id: 3, - name: "Hero Thunderbird", - price: 4000, - category: "bicycle", - image: "/images/bicycle.jfif", - }, - { - id: 4, - name: "Decathlon BTWX 100", - price: 5000, - category: "bicycle", - image: "/images/bicycle.jfif", - }, - { - id: 5, - name: "Samsung S10e", - price: 25000, - category: "mobile", - image: "/images/mobile.jfif", - }, - { - id: 6, - name: "Vivo V15", - price: 14000, - category: "mobile", - image: "/images/mobile.jfif", - }, - { - id: 7, - name: "Kurl On memory foam ", - price: 2000, - category: "matteress", - image: "/images/matteress.jfif", - }, - { - id: 8, - name: "SleepX", - price: 1500, - category: "matteress", - image: "/images/matteress.jfif", - }, - { - id: 9, - name: "Order of the phoenix", - price: 300, - category: "book", - image: "/images/book.jfif", - }, - { - id: 10, - name: "Differential Equation - Kreyzig", - price: 200, - category: "book", - image: "/images/book.jfif", - }, - ], -}; + items: [ + { + id: 1, + name: 'Asus Laptop', + price: 40000, + category: 'laptop', + image: '/images/laptop.jfif', + }, + { + id: 2, + name: 'Macbook Air', + price: 60000, + category: 'laptop', + image: '/images/laptop.jfif', + }, + { + id: 3, + name: 'Hero Thunderbird', + price: 4000, + category: 'bicycle', + image: '/images/bicycle.jfif', + }, + { + id: 4, + name: 'Decathlon BTWX 100', + price: 5000, + category: 'bicycle', + image: '/images/bicycle.jfif', + }, + { + id: 5, + name: 'Samsung S10e', + price: 25000, + category: 'mobile', + image: '/images/mobile.jfif', + }, + { + id: 6, + name: 'Vivo V15', + price: 14000, + category: 'mobile', + image: '/images/mobile.jfif', + }, + { + id: 7, + name: 'Kurl On memory foam ', + price: 2000, + category: 'matteress', + image: '/images/matteress.jfif', + }, + { + id: 8, + name: 'SleepX', + price: 1500, + category: 'matteress', + image: '/images/matteress.jfif', + }, + { + id: 9, + name: 'Order of the phoenix', + price: 300, + category: 'book', + image: '/images/book.jfif', + }, + { + id: 10, + name: 'Differential Equation - Kreyzig', + price: 200, + category: 'book', + image: '/images/book.jfif', + }, + ], +} -const itemReducer = (state = initState, action) => { - return state; -}; +const itemReducer = (state = initState,action) => { + return state +} -export default itemReducer; +export default itemReducer \ No newline at end of file From 4d097cd14f6ff1c251f2dcc011ad89c6b2ff2a78 Mon Sep 17 00:00:00 2001 From: Satyakam Singhal Date: Sun, 31 May 2020 17:38:27 +0530 Subject: [PATCH 7/7] profile added --- package-lock.json | 5 + package.json | 1 + src/App.test.tsx | 14 +- src/App.tsx | 187 +++++++------- src/axios-ins.tsx | 8 +- src/components/CategoryCard/CategoryCard.tsx | 135 +++++----- src/components/HeaderCard/HeaderCard.css | 8 +- src/components/HeaderCard/HeaderCard.tsx | 71 +++--- src/components/ItemCard/ItemCard.tsx | 33 ++- src/components/ItemDetail/ItemDetail.tsx | 167 ++++++------- src/components/ItemList/ItemList.tsx | 53 ++-- src/components/PostAd/PostAd.css | 5 +- src/components/PostAd/PostAd.tsx | 244 ++++++++++--------- src/components/RegisterForm/RegisterForm.tsx | 160 ++++++------ src/components/SearchBar/SearchBar.css | 4 +- src/components/SearchBar/SearchBar.tsx | 29 +-- src/index.tsx | 21 +- src/pages/Health/Health.tsx | 16 +- src/pages/categories/categories.tsx | 38 ++- src/pages/chats/chats.tsx | 36 ++- src/pages/home/home.tsx | 172 +++++++------ src/pages/home/home2.tsx | 212 +++++++++------- src/pages/myaccount/myaccount.css | 22 +- src/pages/myaccount/myaccount.tsx | 158 +++++++++--- src/pages/register/register.tsx | 28 +-- src/serviceWorker.ts | 216 ++++++++-------- src/setupTests.ts | 2 +- src/store/actions/actionTypes.tsx | 77 +++--- src/store/actions/auth.tsx | 70 +++--- src/store/actions/chat.tsx | 20 +- src/store/actions/index.tsx | 4 +- src/store/actions/item.tsx | 229 ++++++++--------- src/store/actions/misc.tsx | 122 +++++----- src/store/actions/review.tsx | 242 +++++++++--------- src/store/reducers/auth.tsx | 10 +- src/store/reducers/index.tsx | 16 +- src/store/reducers/item.tsx | 154 ++++++------ 37 files changed, 1601 insertions(+), 1388 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c5799c..c859a29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10829,6 +10829,11 @@ "whatwg-fetch": "^3.0.0" } }, + "react-axios": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/react-axios/-/react-axios-2.0.3.tgz", + "integrity": "sha512-63kY2iupdRgbvPq9G8xmM0NWUnt2Q5YmpotMoLQsxKOzKXKZg2Lo6CzF/bcZvtmv3WnfjBU6Bg8nZQO28eIAZw==" + }, "react-dev-utils": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz", diff --git a/package.json b/package.json index 6792182..2a9aee4 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "ionicons": "^5.0.0", "querystring": "^0.2.0", "react": "^16.13.0", + "react-axios": "^2.0.3", "react-dom": "^16.13.0", "react-redux": "^7.2.0", "react-router": "^5.1.2", diff --git a/src/App.test.tsx b/src/App.test.tsx index 25e68dc..ae51219 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import { render } from '@testing-library/react'; -import App from './App'; +import React from "react"; +import { render } from "@testing-library/react"; +import App from "./App"; // eslint-disable-next-line no-undef -test('renders without crashing', () => { - const { baseElement } = render(); - // eslint-disable-next-line no-undef - expect(baseElement).toBeDefined(); +test("renders without crashing", () => { + const { baseElement } = render(); + // eslint-disable-next-line no-undef + expect(baseElement).toBeDefined(); }); diff --git a/src/App.tsx b/src/App.tsx index 0985b5d..1b58861 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,110 +1,109 @@ -import React from 'react'; -import { Redirect, Route } from 'react-router-dom'; -import axios from 'axios'; -import qs from 'querystring' -import {connect} from 'react-redux' +import React from "react"; +import { Redirect, Route } from "react-router-dom"; +import axios from "axios"; +import qs from "querystring"; +import { connect } from "react-redux"; import { - IonApp, - IonIcon, - IonLabel, - IonRouterOutlet, - IonTabBar, - IonTabButton, - IonTabs, -} from '@ionic/react'; -import { IonReactRouter } from '@ionic/react-router'; + IonApp, + IonIcon, + IonLabel, + IonRouterOutlet, + IonTabBar, + IonTabButton, + IonTabs, +} from "@ionic/react"; +import { IonReactRouter } from "@ionic/react-router"; import { - chatboxOutline, - gridOutline, - homeOutline, - personOutline, -} from 'ionicons/icons'; -import Home from './pages/home/home'; -import Categories from './pages/categories/categories'; -import Chats from './pages/chats/chats'; -import MyAccount from './pages/myaccount/myaccount'; + chatboxOutline, + gridOutline, + homeOutline, + personOutline, +} from "ionicons/icons"; +import Home from "./pages/home/home"; +import Categories from "./pages/categories/categories"; +import Chats from "./pages/chats/chats"; +import MyAccount from "./pages/myaccount/myaccount"; /* new imports */ -import Register from './pages/register/register'; -import Health from './pages/Health/Health'; -import ItemDetail from './components/ItemDetail/ItemDetail'; - -import PostAd from './components/PostAd/PostAd'; +import Register from "./pages/register/register"; +import Health from "./pages/Health/Health"; +import ItemDetail from "./components/ItemDetail/ItemDetail"; +import PostAd from "./components/PostAd/PostAd"; /* Core CSS required for Ionic components to work properly */ -import '@ionic/react/css/core.css'; +import "@ionic/react/css/core.css"; /* Basic CSS for apps built with Ionic */ -import '@ionic/react/css/normalize.css'; -import '@ionic/react/css/structure.css'; -import '@ionic/react/css/typography.css'; +import "@ionic/react/css/normalize.css"; +import "@ionic/react/css/structure.css"; +import "@ionic/react/css/typography.css"; /* Optional CSS utils that can be commented out */ -import '@ionic/react/css/padding.css'; -import '@ionic/react/css/float-elements.css'; -import '@ionic/react/css/text-alignment.css'; -import '@ionic/react/css/text-transformation.css'; -import '@ionic/react/css/flex-utils.css'; -import '@ionic/react/css/display.css'; +import "@ionic/react/css/padding.css"; +import "@ionic/react/css/float-elements.css"; +import "@ionic/react/css/text-alignment.css"; +import "@ionic/react/css/text-transformation.css"; +import "@ionic/react/css/flex-utils.css"; +import "@ionic/react/css/display.css"; /* Theme variables */ -import './theme/variables.css'; -import {authSuccess} from './store/actions/index' +import "./theme/variables.css"; +import { authSuccess } from "./store/actions/index"; class App extends React.Component { - componentDidMount() { - const eventUser = new EventSource('http://localhost:5000/streamUser'); - eventUser.onmessage = e => this.props.changeUser(e.data) - const data = { - username: 'ssh', - password: '12345' - } - axios - .post('http://localhost:5000/login', qs.stringify(data)) - .then((res) => console.log(res)) - .catch((err) => console.log(err.response)); - } - render() { - return ( - - - - - - - - - - - - - - - - - - Home - - - - Categories - - - - Chats - - - - My Account - - - - - - ); - } + componentDidMount() { + const eventUser = new EventSource("http://localhost:5000/streamUser"); + eventUser.onmessage = (e) => this.props.changeUser(e.data); + const data = { + username: "ssh", + password: "12345", + }; + axios + .post("http://localhost:5000/login", qs.stringify(data)) + .then((res) => console.log(res)) + .catch((err) => console.log(err.response)); + } + render() { + return ( + + + + + + + + + + + + + + + + + + Home + + + + Categories + + + + Chats + + + + My Account + + + + + + ); + } } -const mapDispatchToProps = dispatch => ({ - changeUser : (data) => dispatch(authSuccess(data)) -}) +const mapDispatchToProps = (dispatch) => ({ + changeUser: (data) => dispatch(authSuccess(data)), +}); export default connect(null, mapDispatchToProps)(App); diff --git a/src/axios-ins.tsx b/src/axios-ins.tsx index 7d45821..c11f0c5 100644 --- a/src/axios-ins.tsx +++ b/src/axios-ins.tsx @@ -1,7 +1,7 @@ -import axios from 'axios' +import axios from "axios"; const instance = axios.create({ - baseURL: 'http://localhost:5000' -}) + baseURL: "http://localhost:5000", +}); -export default instance; \ No newline at end of file +export default instance; diff --git a/src/components/CategoryCard/CategoryCard.tsx b/src/components/CategoryCard/CategoryCard.tsx index 589dbc5..9a08f76 100644 --- a/src/components/CategoryCard/CategoryCard.tsx +++ b/src/components/CategoryCard/CategoryCard.tsx @@ -1,71 +1,84 @@ -import React from 'react'; -import { IonGrid, IonRow, IonCol, IonIcon, IonLabel, IonText,IonChip } from '@ionic/react'; -import { bicycle, laptopOutline, phonePortraitOutline, tabletLandscapeOutline, bookOutline, constructOutline} from 'ionicons/icons'; -import './CategoryCard.css'; - +import React from "react"; +import { + IonGrid, + IonRow, + IonCol, + IonIcon, + IonText, + IonChip, +} from "@ionic/react"; +import { + bicycle, + laptopOutline, + phonePortraitOutline, + tabletLandscapeOutline, + bookOutline, + constructOutline, +} from "ionicons/icons"; +import "./CategoryCard.css"; const CategoryCard: React.FC = () => ( - - - - - - - -
Laptops
 - - - - - - -
Bicycles
 - - - - - - - - - - -
Phones
 - - - - - - -
Matteresses
 - - - - - - - - - - -
Books
 - - + + + + + + +
Laptops
+ + + - - - -
Misc.
 - - + + + + +
Bicycles
+ + + + - + + + + + +
Phones
+ + + - + + + + +
Matteresses
+ + + + - - + + + + + +
Books
+ + + + + + + +
Misc.
+ + + + + ); export default CategoryCard; diff --git a/src/components/HeaderCard/HeaderCard.css b/src/components/HeaderCard/HeaderCard.css index b02d93c..400d777 100644 --- a/src/components/HeaderCard/HeaderCard.css +++ b/src/components/HeaderCard/HeaderCard.css @@ -17,9 +17,11 @@ width: 200px; text-align: center; - margin-left: auto; - margin-right: auto; - display: flex; + display: inline-block; align-items: center; justify-content: center; + padding-left: 10px; +} +.wrapper { + text-align: center; } diff --git a/src/components/HeaderCard/HeaderCard.tsx b/src/components/HeaderCard/HeaderCard.tsx index f42f089..f2f2bc8 100644 --- a/src/components/HeaderCard/HeaderCard.tsx +++ b/src/components/HeaderCard/HeaderCard.tsx @@ -1,42 +1,41 @@ -import React from 'react'; +import React from "react"; import { - IonCardHeader, - IonCardTitle, - IonCardContent, - IonCard, - IonButton, -} from '@ionic/react'; -import './HeaderCard.css'; -import SearchBar from '../SearchBar/SearchBar'; -import { RouteComponentProps } from 'react-router-dom' + IonCardHeader, + IonCardTitle, + IonCardContent, + IonCard, + IonButton, +} from "@ionic/react"; +import "./HeaderCard.css"; +import { RouteComponentProps } from "react-router-dom"; const HeaderCard: React.FC = (props) => { - const clicked = (route: string) => { - props.history.push(route); - } - return ( - - - Welcome To - - IITD Marketplace - - - - Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, - we got you covered ! - - - - clicked("/register")}> - Sign in to start - - clicked('/login')}> - Login - - - - ); + const clicked = (route: string) => { + props.history.push(route); + }; + return ( + + + Welcome To + IITD Marketplace + + + Wanna buy, sell, rent items among IIT Delhi peeps? Dont worry, we got + you covered ! + + +
+ + Sign in to start + + + + Login + +
+ + + ); }; export default HeaderCard; diff --git a/src/components/ItemCard/ItemCard.tsx b/src/components/ItemCard/ItemCard.tsx index f0dc75f..34a68c8 100644 --- a/src/components/ItemCard/ItemCard.tsx +++ b/src/components/ItemCard/ItemCard.tsx @@ -1,21 +1,20 @@ -import React from 'react'; -import { IonCard, IonCardHeader, IonCardSubtitle } from '@ionic/react'; +import React from "react"; +import { IonCard, IonCardHeader, IonCardSubtitle } from "@ionic/react"; -class ItemCard extends React.Component { - render() { - const { item } = this.props; - return ( -
- - cardImg - - {item.name} Rs.{' '} - {item.price} - - -
- ); - } +class ItemCard extends React.Component { + render() { + const { item } = this.props; + return ( +
+ + cardImg + + {item.name} Rs. {item.price} + + +
+ ); + } } export default ItemCard; diff --git a/src/components/ItemDetail/ItemDetail.tsx b/src/components/ItemDetail/ItemDetail.tsx index 0c66406..b0ee839 100644 --- a/src/components/ItemDetail/ItemDetail.tsx +++ b/src/components/ItemDetail/ItemDetail.tsx @@ -1,93 +1,86 @@ -import React from 'react'; +import React from "react"; import { - IonContent, - IonHeader, - IonPage, - IonChip, - IonToolbar, - IonCard, - IonCardHeader, - IonCardSubtitle, - IonCardTitle, - IonCardContent, - IonIcon, - IonLabel, - IonButton, - IonText, -} from '@ionic/react'; -import { locationOutline } from 'ionicons/icons'; + IonContent, + IonHeader, + IonPage, + IonChip, + IonToolbar, + IonCard, + IonCardHeader, + IonCardSubtitle, + IonCardTitle, + IonCardContent, + IonIcon, + IonLabel, + IonButton, + IonText, +} from "@ionic/react"; +import { locationOutline } from "ionicons/icons"; const ItemDetail: React.FC = () => { - return ( - - - - - - Asus Tuf GT505 - - Rs. 40000 - - - - - - - - Electronics - - - Laptops - - - - - - Seller Details - - - N. Satwik - -

- {' '} - {' '} - Zanskar House -

- - - Chat With Seller - - - - - - Product Details - - -
    -
  • 4 months old
    • -
  • 8 GB RAM, 512 GB SSD, i5 9th gen
    • -
  • RGB keyboard
    • -
  • ...
    • -
  • ...
    • -
- - - - - Reviews - - - - - - ); + return ( + + + + + + Asus Tuf GT505 + + Rs. 40000 + + + + + + + + Electronics + + + Laptops + + + + + + Seller Details + + + N. Satwik + +

+ {" "} + Zanskar House +

+ + + Chat With Seller + + + + + + Product Details + + +
    +
  • 4 months old
    • +
  • 8 GB RAM, 512 GB SSD, i5 9th gen
    • +
  • RGB keyboard
    • +
  • ...
    • +
  • ...
    • +
+ + + + + Reviews + + + + + + ); }; export default ItemDetail; diff --git a/src/components/ItemList/ItemList.tsx b/src/components/ItemList/ItemList.tsx index af70ac4..7f1b7a5 100644 --- a/src/components/ItemList/ItemList.tsx +++ b/src/components/ItemList/ItemList.tsx @@ -1,33 +1,30 @@ -import React from 'react'; -import { IonCol, IonRow } from '@ionic/react'; -import ItemCard from '../ItemCard/ItemCard'; +import React from "react"; +import { IonCol, IonRow } from "@ionic/react"; +import ItemCard from "../ItemCard/ItemCard"; // import categories from '../../pages/categories/categories'; +class ItemList extends React.Component { + render() { + const itemList = this.props.items.map((item) => { + if (this.props.category === "all") { + return ( + + + + ); + } + if (this.props.category === item.category) { + return ( + + + + ); + } else { + return null; + } + }); - -class ItemList extends React.Component{ - render() { - - const itemList = this.props.items.map((item) => { - if (this.props.category === 'all') { - return ( - - - - ); - } - if (this.props.category === item.category) { - return ( - - - - ); - } else { - return null; - } - }); - - return {itemList}; - } + return {itemList}; + } } export default ItemList; diff --git a/src/components/PostAd/PostAd.css b/src/components/PostAd/PostAd.css index deeebdd..849da90 100644 --- a/src/components/PostAd/PostAd.css +++ b/src/components/PostAd/PostAd.css @@ -2,4 +2,7 @@ align-content: center; width:20%; } - \ No newline at end of file +.btn { + text-align: center; + +} \ No newline at end of file diff --git a/src/components/PostAd/PostAd.tsx b/src/components/PostAd/PostAd.tsx index 3ade72d..0a00b53 100644 --- a/src/components/PostAd/PostAd.tsx +++ b/src/components/PostAd/PostAd.tsx @@ -1,127 +1,133 @@ -import React, { useState } from 'react'; +import React, { useState } from "react"; // eslint-disable-next-line @typescript-eslint/no-unused-vars -import './PostAd.css'; -import { RouteComponentProps } from 'react-router'; +import "./PostAd.css"; +import { RouteComponentProps } from "react-router"; import { - IonTitle, - IonToolbar, - IonSelect, - IonSelectOption, - IonInput, - IonItem, - IonLabel, - IonList, - IonButton, - IonPage, - IonContent, -} from '@ionic/react'; + IonTitle, + IonToolbar, + IonSelect, + IonSelectOption, + IonInput, + IonItem, + IonLabel, + IonList, + IonButton, + IonPage, + IonContent, + IonHeader, + IonButtons, + IonBackButton, +} from "@ionic/react"; const PostAd: React.FC = () => { - const [name, setName] = useState(); - const [date, setDate] = useState(); - const [condition, setCondition] = useState(); - const [price, setPrice] = useState(); - const [category, setCategory] = useState(); - const [description, setDescription] = useState(); + const [name, setName] = useState(); + const [date, setDate] = useState(); + const [condition, setCondition] = useState(); + const [price, setPrice] = useState(); + const [category, setCategory] = useState(); + const [description, setDescription] = useState(); - return ( - - - - Post Your Ad - -
- - - - Name of The Product - - setName(e.detail.value!)} - required - /> - - - - Tentative Date of Purchase - - setDate(e.detail.value!)} - required - /> - - - - Condition - - - setCondition(e.detail.value!) - } - required - /> - - - - Category - - setCategory(e.detail.value)} - > - Laptops - Mobile - Books - Cycle - Miscallaneous - - - - - Asking Price - - setPrice(e.detail.value!)} - required - /> - - - - Description - - - setDescription(e.detail.value!) - } - required - /> - - - - - -
-
- - Post - -
- - - ); + return ( + + + + + + + + + Post Your Ad + + + +
+ + + + Name of The Product + + setName(e.detail.value!)} + required + /> + + + + Tentative Date of Purchase + + setDate(e.detail.value!)} + required + /> + + + + Condition + + setCondition(e.detail.value!)} + required + /> + + + + Category + + setCategory(e.detail.value)} + > + Laptops + Mobile + Books + Cycle + Miscallaneous + + + + + Asking Price + + setPrice(e.detail.value!)} + required + /> + + + + Description + + setDescription(e.detail.value!)} + required + /> + + + + + +
+
+ + Post + +
+ + + ); }; export default PostAd; diff --git a/src/components/RegisterForm/RegisterForm.tsx b/src/components/RegisterForm/RegisterForm.tsx index 3acef6f..2eaf6c2 100644 --- a/src/components/RegisterForm/RegisterForm.tsx +++ b/src/components/RegisterForm/RegisterForm.tsx @@ -1,87 +1,87 @@ -import React, { useState } from 'react'; +import React, { useState } from "react"; import { - IonTitle, - IonToolbar, - IonSelect, - IonSelectOption, - IonInput, - IonItem, - IonLabel, - IonList, - IonButton, -} from '@ionic/react'; -import './RegisterForm.css'; + IonTitle, + IonToolbar, + IonSelect, + IonSelectOption, + IonInput, + IonItem, + IonLabel, + IonList, + IonButton, +} from "@ionic/react"; +import "./RegisterForm.css"; const RegisterForm: React.FC = () => { - const [uname, setUname] = useState(); - const [pass, setPass] = useState(); - const [entryno, setEntryno] = useState(); - const [hostel, setHostel] = useState(); + const [uname, setUname] = useState(); + const [pass, setPass] = useState(); + const [entryno, setEntryno] = useState(); + const [hostel, setHostel] = useState(); - return ( -
- - Join us today ! - -
- - - - Username - - setUname(e.detail.value!)} - required - /> - - - - Password - - setPass(e.detail.value!)} - required - /> - - - - Entry Number - - setEntryno(e.detail.value!)} - required - /> - - - - Hostel - - setHostel(e.detail.value)} - > - Aravalli - Girnar - Jwalamukhi - Himadri - Zanskar - - - -
-
- - Register - -
-
- ); + return ( +
+ + Join us today ! + +
+ + + + Username + + setUname(e.detail.value!)} + required + /> + + + + Password + + setPass(e.detail.value!)} + required + /> + + + + Entry Number + + setEntryno(e.detail.value!)} + required + /> + + + + Hostel + + setHostel(e.detail.value)} + > + Aravalli + Girnar + Jwalamukhi + Himadri + Zanskar + + + +
+
+ + Register + +
+
+ ); }; export default RegisterForm; diff --git a/src/components/SearchBar/SearchBar.css b/src/components/SearchBar/SearchBar.css index b896f4a..d19a6e1 100644 --- a/src/components/SearchBar/SearchBar.css +++ b/src/components/SearchBar/SearchBar.css @@ -1,3 +1,3 @@ .searchbar{ - align-self: start; -} \ No newline at end of file + +} diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx index 3638167..671aa17 100644 --- a/src/components/SearchBar/SearchBar.tsx +++ b/src/components/SearchBar/SearchBar.tsx @@ -1,19 +1,20 @@ -import React, { useState } from 'react'; -import { IonToolbar, IonSearchbar } from '@ionic/react'; -import './SearchBar.css'; +import React, { useState } from "react"; +import { IonToolbar, IonSearchbar } from "@ionic/react"; +import "./SearchBar.css"; const SearchBar: React.FC = () => { - const [searchText, setSearchText] = useState(''); - return ( - - setSearchText(e.detail.value!)} - placeholder="Search" - /> - - ); + const [searchText, setSearchText] = useState(""); + return ( + + setSearchText(e.detail.value!)} + placeholder="Search" + /> + + ); }; export default SearchBar; diff --git a/src/index.tsx b/src/index.tsx index 427ebae..f075bbf 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,12 +1,17 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './App'; +import React from "react"; +import ReactDOM from "react-dom"; +import App from "./App"; -import { createStore, applyMiddleware } from 'redux' -import rootReducer from './store/reducers' -import thunk from 'redux-thunk' -import { Provider } from 'react-redux' +import { createStore, applyMiddleware } from "redux"; +import rootReducer from "./store/reducers"; +import thunk from "redux-thunk"; +import { Provider } from "react-redux"; const store = createStore(rootReducer, applyMiddleware(thunk)); -ReactDOM.render(, document.getElementById('root')); +ReactDOM.render( + + + , + document.getElementById("root") +); diff --git a/src/pages/Health/Health.tsx b/src/pages/Health/Health.tsx index 8368aaf..3526d85 100644 --- a/src/pages/Health/Health.tsx +++ b/src/pages/Health/Health.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import { withRouter } from 'react-router-dom'; -import { IonPage } from '@ionic/react'; +import React from "react"; +import { withRouter } from "react-router-dom"; +import { IonPage } from "@ionic/react"; const Health: React.FC = () => { - return ( - -

Ok, Healthy!

- - ); + return ( + +

Ok, Healthy!

+ + ); }; export default withRouter(Health); diff --git a/src/pages/categories/categories.tsx b/src/pages/categories/categories.tsx index 51d005e..726034a 100644 --- a/src/pages/categories/categories.tsx +++ b/src/pages/categories/categories.tsx @@ -1,16 +1,32 @@ -import React from 'react'; -import { IonContent, IonPage } from '@ionic/react'; -import CategoryCard from '../../components/CategoryCard/CategoryCard'; -import { RouteComponentProps } from 'react-router'; +import React from "react"; +import { + IonContent, + IonPage, + IonHeader, + IonToolbar, + IonButtons, + IonBackButton, + IonTitle, +} from "@ionic/react"; +import CategoryCard from "../../components/CategoryCard/CategoryCard"; +import { RouteComponentProps } from "react-router"; const categories: React.FC = (props) => { - return ( - - - - - - ); + return ( + + + + + + + Categories + + + + + + + ); }; export default categories; diff --git a/src/pages/chats/chats.tsx b/src/pages/chats/chats.tsx index f34d0d6..c9b1d97 100644 --- a/src/pages/chats/chats.tsx +++ b/src/pages/chats/chats.tsx @@ -1,16 +1,30 @@ -import React from 'react'; -import { IonContent, IonPage } from '@ionic/react'; -import HeaderCard from '../../components/HeaderCard/HeaderCard'; -import { RouteComponentProps } from 'react-router'; +import React from "react"; +import { + IonContent, + IonPage, + IonHeader, + IonToolbar, + IonButtons, + IonBackButton, + IonTitle, +} from "@ionic/react"; +import { RouteComponentProps } from "react-router"; const chats: React.FC = (props) => { - return ( - - - - - - ); + return ( + + + + + + + + Chats + + + + + ); }; export default chats; diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index 0aa358c..a37b8d3 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -1,90 +1,100 @@ -import React from 'react'; +import React from "react"; import { - IonContent, - IonLabel, - IonSegment, - IonSegmentButton, - IonPage, - IonFab, - IonFabButton, - IonIcon, - IonToolbar, - IonFabList, -} from '@ionic/react'; -import { add, createOutline } from 'ionicons/icons'; -import './home.css'; -import HeaderCard from '../../components/HeaderCard/HeaderCard'; -import ItemList from '../../components/ItemList/ItemList'; -// import CategoryCard from '../../components/CategoryCard/CategoryCard'; - -import { connect } from 'react-redux'; -import { RouteComponentProps } from 'react-router'; + IonContent, + IonLabel, + IonSegment, + IonSegmentButton, + IonPage, + IonFab, + IonFabButton, + IonIcon, + IonToolbar, + IonFabList, + IonHeader, + IonRow, + IonCol, + IonButtons, + IonBackButton, +} from "@ionic/react"; +import { add, createOutline } from "ionicons/icons"; +import "./home.css"; +import HeaderCard from "../../components/HeaderCard/HeaderCard"; +import ItemList from "../../components/ItemList/ItemList"; +import { connect } from "react-redux"; +import { RouteComponentProps } from "react-router"; +import SearchBar from "../../components/SearchBar/SearchBar"; class Home extends React.Component { - // eslint-disable-next-line react/destructuring-assignment - // eslint-disable-next-line react/state-in-constructor - state = { - category: 'all', - }; - render() { - return ( - - - - - - this.setState({ category: e.detail.value }) - } - color="primary" - > - - All - - - Laptops - - - Mobiles - - - Bicycles - - - Books - - - - - - - - - - this.props.history.push('/postad')}> - - {/* Post an Ad */} - - - - - - ); - } + // eslint-disable-next-line react/destructuring-assignment + // eslint-disable-next-line react/state-in-constructor + state = { + category: "all", + }; + render() { + return ( + + + + + + + + + + + + + + + + + this.setState({ category: e.detail.value })} + color="primary" + > + + All + + + Laptops + + + Mobiles + + + Bicycles + + + Books + + + + + + + + + + this.props.history.push("/postad")} + > + + {/* Post an Ad */} + + + + + + ); + } } const mapStatetoProps = (state: any) => { - return { - items: state.item.items, - }; + return { + items: state.item.items, + }; }; export default connect(mapStatetoProps)(Home); diff --git a/src/pages/home/home2.tsx b/src/pages/home/home2.tsx index 5c796ac..a54592f 100644 --- a/src/pages/home/home2.tsx +++ b/src/pages/home/home2.tsx @@ -1,95 +1,141 @@ -import React from 'react'; -import { IonContent, IonLabel,IonSegment, IonSegmentButton, IonPage, IonFab, IonFabButton, IonIcon, IonToolbar, IonFabList, IonHeader, IonText, IonRow, IonCol, IonCard, } from '@ionic/react'; -import { add, notificationsOutline, personCircle, heart, heartOutline, heartHalf, checkmarkCircle, lockClosed, analytics, ribbon, ribbonOutline } from 'ionicons/icons'; -import './home2.css'; -import HeaderCard from '../../components/HeaderCard/HeaderCard'; -import ItemList from '../../components/ItemList/ItemList'; +import React from "react"; +import { + IonContent, + IonPage, + IonFab, + IonFabButton, + IonIcon, + IonToolbar, + IonHeader, + IonText, + IonRow, + IonCol, + IonCard, +} from "@ionic/react"; +import { + add, + notificationsOutline, + personCircle, + heartHalf, + checkmarkCircle, + lockClosed, + analytics, + ribbonOutline, +} from "ionicons/icons"; +import "./home2.css"; +import { connect } from "react-redux"; +import { RouteComponentProps } from "react-router"; -import { connect } from 'react-redux'; -import { RouteComponentProps } from 'react-router'; - -import SearchBar from '../../components/SearchBar/SearchBar' -import CategoryCard from '../../components/CategoryCard/CategoryCard'; - +import SearchBar from "../../components/SearchBar/SearchBar"; +import CategoryCard from "../../components/CategoryCard/CategoryCard"; class Home extends React.Component { - // eslint-disable-next-line react/destructuring-assignment - // eslint-disable-next-line react/state-in-constructor - state = { - category: 'all', - }; - render() { - return ( - - - - - - - - - - - - - - - - -
- Safe - - - - -
- Secure - - - - - - -
- Dynamic - - - - -
- Friendly - - - -
- - -

Choose a category

 - - - - - - - - this.props.history.push('/postad')} /> - - - - + // eslint-disable-next-line react/destructuring-assignment + // eslint-disable-next-line react/state-in-constructor + state = { + category: "all", + }; + render() { + return ( + + + + + + + + + + + + + + + + +
+ Safe + + + + + +
+ Secure + + + + + + + +
+ Dynamic + + + + + +
+ Friendly + + + +
+ + +

Choose a category

+ + + - - - ); - } + + + this.props.history.push("/postad")} + /> + + + + + ); + } } const mapStatetoProps = (state: any) => { - return { - items: state.item.items, - }; + return { + items: state.item.items, + }; }; export default connect(mapStatetoProps)(Home); diff --git a/src/pages/myaccount/myaccount.css b/src/pages/myaccount/myaccount.css index 0afcaf6..b583f12 100644 --- a/src/pages/myaccount/myaccount.css +++ b/src/pages/myaccount/myaccount.css @@ -1,6 +1,20 @@ +.effect { + border: 1px solid #ccc; + padding: 7px 14px; + + background: transparent; + color:black; +} +.avatar { + height:100px; + width:100px; + position: relative; + display: block; + margin-left: auto; + margin-right: auto; -.buttons{ - text-align: center; - padding:2em; - padding-top:6em; +} + +.colgap { + padding-bottom: 30px ; } \ No newline at end of file diff --git a/src/pages/myaccount/myaccount.tsx b/src/pages/myaccount/myaccount.tsx index 2b41383..e86bd9a 100644 --- a/src/pages/myaccount/myaccount.tsx +++ b/src/pages/myaccount/myaccount.tsx @@ -1,43 +1,123 @@ -import React from 'react'; +import React from "react"; import { - IonContent, - IonHeader, - IonPage, - IonItem, - IonLabel, - IonThumbnail, - IonToolbar, -} from '@ionic/react'; -import './myaccount.css'; -import HeaderCard from '../../components/HeaderCard/HeaderCard'; -import { RouteComponentProps } from 'react-router'; + IonContent, + IonHeader, + IonButton, + IonItem, + IonLabel, + IonToolbar, + IonTitle, + IonGrid, + IonRow, + IonCol, + IonInput, + IonSegment, + IonSegmentButton, + IonPage, + IonBackButton, + IonButtons, +} from "@ionic/react"; +import "./myaccount.css"; -const myaccount: React.FC = (props) => { - return ( - - - -

-
- - Guest User - - - - -
-
-
- - - - - - - ); +const Myaccount: React.FC = () => { + return ( + + + + + + + Profile + + + +
+ + + +
+ + + + Profile + + + Buy/Sell History + + + + + + +
+ Name +
+ +
+ +
+ + +
+ Entry No. +
+
+ +
+ + + +
+ Phone No. +
+
+ +
+ + +
+ Email +
+ +
+ +
+ + + +
+ Hostel +
+
+ +
+ + + + Update Info + + + + + Get on PlayStore + + + Get on AppStore + + + + + Contact For Help + + + + + + ); }; -export default myaccount; +export default Myaccount; diff --git a/src/pages/register/register.tsx b/src/pages/register/register.tsx index c919f8b..15c1387 100644 --- a/src/pages/register/register.tsx +++ b/src/pages/register/register.tsx @@ -1,20 +1,16 @@ -import React from 'react' -import RegisterForm from '../../components/RegisterForm/RegisterForm' -import {IonPage} from '@ionic/react' -import {RouteComponentProps} from 'react-router' +import React from "react"; +import RegisterForm from "../../components/RegisterForm/RegisterForm"; +import { IonPage } from "@ionic/react"; +import { RouteComponentProps } from "react-router"; class Register extends React.Component { - state = { - isSignUp: true - } - render() { - let register = - return ( - - {register} - - ) - } + state = { + isSignUp: true, + }; + render() { + let register = ; + return {register}; + } } -export default Register; \ No newline at end of file +export default Register; diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts index 35e67cb..73c4506 100644 --- a/src/serviceWorker.ts +++ b/src/serviceWorker.ts @@ -11,136 +11,132 @@ // opt-in, read https://bit.ly/CRA-PWA const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.0/8 are considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) + window.location.hostname === "localhost" || + // [::1] is the IPv6 localhost address. + window.location.hostname === "[::1]" || + // 127.0.0.0/8 are considered localhost for IPv4. + window.location.hostname.match( + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ + ) ); type Config = { - onSuccess?: (registration: ServiceWorkerRegistration) => void; - onUpdate?: (registration: ServiceWorkerRegistration) => void; + onSuccess?: (registration: ServiceWorkerRegistration) => void; + onUpdate?: (registration: ServiceWorkerRegistration) => void; }; export function register(config?: Config) { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL( - process.env.PUBLIC_URL!, - window.location.href - ); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 - return; - } + if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL(process.env.PUBLIC_URL!, window.location.href); + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebook/create-react-app/issues/2374 + return; + } - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + window.addEventListener("load", () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - if (isLocalhost) { - // This is running on localhost. Let's check if a service worker still exists or not. - checkValidServiceWorker(swUrl, config); + if (isLocalhost) { + // This is running on localhost. Let's check if a service worker still exists or not. + checkValidServiceWorker(swUrl, config); - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://bit.ly/CRA-PWA' - ); - }); - } else { - // Is not localhost. Just register service worker - registerValidSW(swUrl, config); - } + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + "This web app is being served cache-first by a service " + + "worker. To learn more, visit https://bit.ly/CRA-PWA" + ); }); - } + } else { + // Is not localhost. Just register service worker + registerValidSW(swUrl, config); + } + }); + } } function registerValidSW(swUrl: string, config?: Config) { - navigator.serviceWorker - .register(swUrl) - .then((registration) => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker == null) { - return; - } - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the updated precached content has been fetched, - // but the previous service worker will still serve the older - // content until all client tabs are closed. - console.log( - 'New content is available and will be used when all ' + - 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' - ); + navigator.serviceWorker + .register(swUrl) + .then((registration) => { + registration.onupdatefound = () => { + const installingWorker = registration.installing; + if (installingWorker == null) { + return; + } + installingWorker.onstatechange = () => { + if (installingWorker.state === "installed") { + if (navigator.serviceWorker.controller) { + // At this point, the updated precached content has been fetched, + // but the previous service worker will still serve the older + // content until all client tabs are closed. + console.log( + "New content is available and will be used when all " + + "tabs for this page are closed. See https://bit.ly/CRA-PWA." + ); - // Execute callback - if (config && config.onUpdate) { - config.onUpdate(registration); - } - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); + // Execute callback + if (config && config.onUpdate) { + config.onUpdate(registration); + } + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log("Content is cached for offline use."); - // Execute callback - if (config && config.onSuccess) { - config.onSuccess(registration); - } - } - } - }; - }; - }) - .catch((error) => { - console.error('Error during service worker registration:', error); - }); + // Execute callback + if (config && config.onSuccess) { + config.onSuccess(registration); + } + } + } + }; + }; + }) + .catch((error) => { + console.error("Error during service worker registration:", error); + }); } function checkValidServiceWorker(swUrl: string, config?: Config) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl, { - headers: { 'Service-Worker': 'script' }, - }) - .then((response) => { - // Ensure service worker exists, and that we really are getting a JS file. - const contentType = response.headers.get('content-type'); - if ( - response.status === 404 || - (contentType != null && - contentType.indexOf('javascript') === -1) - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then((registration) => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl, config); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl, { + headers: { "Service-Worker": "script" }, + }) + .then((response) => { + // Ensure service worker exists, and that we really are getting a JS file. + const contentType = response.headers.get("content-type"); + if ( + response.status === 404 || + (contentType != null && contentType.indexOf("javascript") === -1) + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then((registration) => { + registration.unregister().then(() => { + window.location.reload(); + }); }); + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl, config); + } + }) + .catch(() => { + console.log( + "No internet connection found. App is running in offline mode." + ); + }); } export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready.then((registration) => { - registration.unregister(); - }); - } + if ("serviceWorker" in navigator) { + navigator.serviceWorker.ready.then((registration) => { + registration.unregister(); + }); + } } diff --git a/src/setupTests.ts b/src/setupTests.ts index 74b1a27..5fdf001 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -2,4 +2,4 @@ // allows you to do things like: // expect(element).toHaveTextContent(/react/i) // learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom/extend-expect'; +import "@testing-library/jest-dom/extend-expect"; diff --git a/src/store/actions/actionTypes.tsx b/src/store/actions/actionTypes.tsx index dd03c21..7210a39 100644 --- a/src/store/actions/actionTypes.tsx +++ b/src/store/actions/actionTypes.tsx @@ -1,54 +1,51 @@ -export const MISC_FOLLOW = 'MISC_FOLLOW' -export const MISC_UNFOLLOW = 'MISC_UNFOLLOW' -export const MISC_NOTIFS = 'MISC_NOTIFS' -export const MISC_REPORT = 'MISC_REPORT' -export const MISC_START = 'MISC_START' -export const MISC_FAIL = 'MISC_FAIL' +export const MISC_FOLLOW = "MISC_FOLLOW"; +export const MISC_UNFOLLOW = "MISC_UNFOLLOW"; +export const MISC_NOTIFS = "MISC_NOTIFS"; +export const MISC_REPORT = "MISC_REPORT"; +export const MISC_START = "MISC_START"; +export const MISC_FAIL = "MISC_FAIL"; +export const AUTH_SUCCESS = "AUTH_SUCCESS"; +export const AUTH_FAIL = "AUTH_FAIL"; +export const AUTH_START = "AUTH_START"; +export const AUTH_LOGOUT = "AUTH_LOGOUT"; -export const AUTH_SUCCESS = 'AUTH_SUCCESS' -export const AUTH_FAIL = 'AUTH_FAIL' -export const AUTH_START = 'AUTH_START' -export const AUTH_LOGOUT = 'AUTH_LOGOUT' +export const ITEM_START = "ITEM_START"; +export const ITEM_SUCCESS = "ITEM_SUCCESS"; +export const ITEM_FAIL = "ITEM_FAIL"; +export const ITEM_POST_START = "ITEM_POST_START"; +export const ITEM_POST_SUCCESS = "ITEM_POST_SUCCESS"; -export const ITEM_START = 'ITEM_START' -export const ITEM_SUCCESS = 'ITEM_SUCCESS' -export const ITEM_FAIL = 'ITEM_FAIL' +export const ITEM_EDIT_START = "ITEM_EDIT_START"; +export const ITEM_EDIT_SUCCESS = "ITEM_EDIT_SUCCESS"; -export const ITEM_POST_START = 'ITEM_POST_START' -export const ITEM_POST_SUCCESS = 'ITEM_POST_SUCCESS' +export const ITEM_DEL_START = "ITEM_DEL_START"; +export const ITEM_DEL_SUCCESS = "ITEM_DEL_SUCCESS"; -export const ITEM_EDIT_START = 'ITEM_EDIT_START' -export const ITEM_EDIT_SUCCESS = 'ITEM_EDIT_SUCCESS' +export const ITEM_SELLINI_START = "ITEM_SELLINI_START"; +export const ITEM_SELLINI_SUCCESS = "ITEM_SELLINI_SUCCESS"; -export const ITEM_DEL_START = 'ITEM_DEL_START' -export const ITEM_DEL_SUCCESS = 'ITEM_DEL_SUCCESS' +export const ITEM_SELLFIN_START = "ITEM_SELLFIN_START"; +export const ITEM_SELLFIN_SUCCESS = "ITEM_SELLFIN_SUCCESS"; -export const ITEM_SELLINI_START = 'ITEM_SELLINI_START' -export const ITEM_SELLINI_SUCCESS = 'ITEM_SELLINI_SUCCESS' +export const ITEM_REPORT_SUCCESS = "ITEM_REPORT_SUCCESS"; -export const ITEM_SELLFIN_START = 'ITEM_SELLFIN_START' -export const ITEM_SELLFIN_SUCCESS = 'ITEM_SELLFIN_SUCCESS' +export const REVIEW_START = "REVIEW_START"; +export const REVIEW_SUCCESS = "REVIEW_SUCCESS"; +export const REVIEW_FAIL = "REVIEW_FAIL"; -export const ITEM_REPORT_SUCCESS = 'ITEM_REPORT_SUCCESS' +export const REVIEW_POST_START = "REVIEW_POST_START"; +export const REVIEW_POST_SUCCESS = "REVIEW_POST_SUCCESS"; +export const REVIEW_EDIT_START = "REVIEW_EDIT_START"; +export const REVIEW_EDIT_SUCCESS = "REVIEW_EDIT_SUCCESS"; -export const REVIEW_START = 'REVIEW_START' -export const REVIEW_SUCCESS = 'REVIEW_SUCCESS' -export const REVIEW_FAIL = 'REVIEW_FAIL' +export const REVIEW_DEL_START = "REVIEW_DEL_START"; +export const REVIEW_DEL_SUCCESS = "REVIEW_DEL_SUCCESS"; -export const REVIEW_POST_START = 'REVIEW_POST_START' -export const REVIEW_POST_SUCCESS = 'REVIEW_POST_SUCCESS' +export const REVIEW_UPVOTE_SUCCESS = "REVIEW_UPVOTE_SUCCESS"; +export const REVIEW_DOWNVOTE_SUCCESS = "REVIEW_DOWNVOTE_SUCCESS"; -export const REVIEW_EDIT_START = 'REVIEW_EDIT_START' -export const REVIEW_EDIT_SUCCESS = 'REVIEW_EDIT_SUCCESS' - -export const REVIEW_DEL_START = 'REVIEW_DEL_START' -export const REVIEW_DEL_SUCCESS = 'REVIEW_DEL_SUCCESS' - -export const REVIEW_UPVOTE_SUCCESS = 'REVIEW_UPVOTE_SUCCESS' -export const REVIEW_DOWNVOTE_SUCCESS = 'REVIEW_DOWNVOTE_SUCCESS' - -export const REVIEW_REPORT_SUCCESS = 'REVIEW_REPORT_SUCCESS' -export const REVIEW_RESOLVE_SUCCESS = 'REVIEW_RESOLVE_SUCCESS' \ No newline at end of file +export const REVIEW_REPORT_SUCCESS = "REVIEW_REPORT_SUCCESS"; +export const REVIEW_RESOLVE_SUCCESS = "REVIEW_RESOLVE_SUCCESS"; diff --git a/src/store/actions/auth.tsx b/src/store/actions/auth.tsx index fd49354..88ea84d 100644 --- a/src/store/actions/auth.tsx +++ b/src/store/actions/auth.tsx @@ -1,42 +1,44 @@ -import * as actionTypes from './actionTypes'; -import axios from '../../axios-ins' -import qs from 'querystring' +import * as actionTypes from "./actionTypes"; +import axios from "../../axios-ins"; +import qs from "querystring"; export const authStart = () => ({ - type: actionTypes.AUTH_START -}) + type: actionTypes.AUTH_START, +}); export const authSuccess = (data) => ({ - type: actionTypes.AUTH_SUCCESS, - data: data -}) + type: actionTypes.AUTH_SUCCESS, + data: data, +}); export const authFail = (err) => ({ - type: actionTypes.AUTH_FAIL, - data: err -}) + type: actionTypes.AUTH_FAIL, + data: err, +}); -export const auth = (data, isSignUp: boolean) => dispatch => { - dispatch(authStart()) - let url = '/login' - if (isSignUp) { - url = '/register' - } - axios.post(url, qs.stringify(data)) - .then(res => { - dispatch(authSuccess(res.data)) - }) - .catch(err => { - dispatch(authFail(err)) - }) -} +export const auth = (data, isSignUp: boolean) => (dispatch) => { + dispatch(authStart()); + let url = "/login"; + if (isSignUp) { + url = "/register"; + } + axios + .post(url, qs.stringify(data)) + .then((res) => { + dispatch(authSuccess(res.data)); + }) + .catch((err) => { + dispatch(authFail(err)); + }); +}; -export const authLogout = () => dispatch => { - axios.get('/logout') - .then(res => { - dispatch({type: actionTypes.AUTH_LOGOUT}) - }) - .catch(err => { - dispatch(authFail(err)) - }) -} +export const authLogout = () => (dispatch) => { + axios + .get("/logout") + .then((res) => { + dispatch({ type: actionTypes.AUTH_LOGOUT }); + }) + .catch((err) => { + dispatch(authFail(err)); + }); +}; diff --git a/src/store/actions/chat.tsx b/src/store/actions/chat.tsx index c84c944..5614d52 100644 --- a/src/store/actions/chat.tsx +++ b/src/store/actions/chat.tsx @@ -1,13 +1,13 @@ -import io from 'socket.io-client'; +import io from "socket.io-client"; export const mountChat = () => (dispatch) => { - const socket = io('http://localhost:5000/chat'); - let stack: Record; - let username: string; - socket.on('connect', () => { - socket.emit('setUserData', username); - }); - socket.on('onlineStack', (sta: Record) => { - stack = sta; - }) + const socket = io("http://localhost:5000/chat"); + let stack: Record; + let username: string; + socket.on("connect", () => { + socket.emit("setUserData", username); + }); + socket.on("onlineStack", (sta: Record) => { + stack = sta; + }); }; diff --git a/src/store/actions/index.tsx b/src/store/actions/index.tsx index d865232..f644ee6 100644 --- a/src/store/actions/index.tsx +++ b/src/store/actions/index.tsx @@ -1,2 +1,2 @@ -export {authSuccess} from './auth' -export {} from './item' \ No newline at end of file +export { authSuccess } from "./auth"; +export {} from "./item"; diff --git a/src/store/actions/item.tsx b/src/store/actions/item.tsx index ffa2bd6..3091911 100644 --- a/src/store/actions/item.tsx +++ b/src/store/actions/item.tsx @@ -1,139 +1,146 @@ -import axios from '../../axios-ins'; -import * as actionTypes from './actionTypes' -import qs from 'querystring' +import axios from "../../axios-ins"; +import * as actionTypes from "./actionTypes"; +import qs from "querystring"; export const getItemStart = () => ({ - type: actionTypes.ITEM_START -}) + type: actionTypes.ITEM_START, +}); export const getItemSuccess = (data) => ({ - type: actionTypes.ITEM_SUCCESS, - data: data -}) + type: actionTypes.ITEM_SUCCESS, + data: data, +}); export const postItemStart = () => ({ - type: actionTypes.ITEM_POST_START -}) + type: actionTypes.ITEM_POST_START, +}); export const postItemSuccess = (data) => ({ - type: actionTypes.ITEM_POST_SUCCESS, - data: data -}) + type: actionTypes.ITEM_POST_SUCCESS, + data: data, +}); export const itemFail = (err) => ({ - type: actionTypes.ITEM_FAIL, - err: err -}) + type: actionTypes.ITEM_FAIL, + err: err, +}); export const editItemStart = () => ({ - type: actionTypes.ITEM_EDIT_START -}) + type: actionTypes.ITEM_EDIT_START, +}); export const editItemSuccess = (data) => ({ - type: actionTypes.ITEM_EDIT_SUCCESS, - data: data -}) + type: actionTypes.ITEM_EDIT_SUCCESS, + data: data, +}); export const delItemStart = () => ({ - type: actionTypes.ITEM_DEL_START -}) + type: actionTypes.ITEM_DEL_START, +}); export const delItemSuccess = () => ({ - type: actionTypes.ITEM_DEL_SUCCESS -}) + type: actionTypes.ITEM_DEL_SUCCESS, +}); export const sellIniItemStart = () => ({ - type: actionTypes.ITEM_SELLINI_START -}) + type: actionTypes.ITEM_SELLINI_START, +}); export const sellIniItemSuccess = () => ({ - type: actionTypes.ITEM_SELLINI_SUCCESS -}) + type: actionTypes.ITEM_SELLINI_SUCCESS, +}); export const sellFinItemStart = () => ({ - type: actionTypes.ITEM_SELLFIN_START -}) + type: actionTypes.ITEM_SELLFIN_START, +}); export const sellFinItemSuccess = () => ({ - type: actionTypes.ITEM_SELLFIN_SUCCESS -}) + type: actionTypes.ITEM_SELLFIN_SUCCESS, +}); export const reportItemSuccess = () => ({ - type: actionTypes.ITEM_REPORT_SUCCESS -}) - -export const getItem = () => dispatch => { - dispatch(getItemStart()) - axios.get('/item') - .then(res => { - dispatch(getItemSuccess(res.data)) - }) - .catch(err => { - dispatch(itemFail(err)) - }) -} - -export const postItem = (data) => dispatch => { - dispatch(postItemStart()) - axios.post('/item', qs.stringify(data)) - .then(res => { - dispatch(postItemSuccess(res.data)) - }) - .catch(err => { - dispatch(itemFail(err)) - }) -} - -export const editItem = (data, id) => dispatch => { - dispatch(editItemStart()) - axios.put('/item/'+ id, qs.stringify(data)) - .then(res => { - dispatch(editItemSuccess(res.data)) - }) - .catch(err => { - dispatch(itemFail(err)) - }) -} - -export const delItem = (id) => dispatch => { - dispatch(delItemStart()) - axios.delete('/item/'+ id) - .then(res => { - dispatch(delItemSuccess()) - }) - .catch(err => { - dispatch(itemFail(err)) - }) -} - -export const selliniItem = (id, data) => dispatch => { - dispatch(sellIniItemStart()) - axios.patch('/item/'+ id + '/sellIni', qs.stringify(data)) - .then(res => { - dispatch(sellIniItemSuccess()) - }) - .catch(err => { - dispatch(itemFail(err)) - }) -} - -export const sellfniItem = (id, data) => dispatch => { - dispatch(sellFinItemStart()) - axios.patch('/item/'+ id + '/sellFin', qs.stringify(data)) - .then(res => { - dispatch(sellFinItemSuccess()) - }) - .catch(err => { - dispatch(itemFail(err)) - }) -} - -export const reportItem = (id) => dispatch => { - axios.patch('/item/'+ id + '/report') - .then(res => { - dispatch(reportItemSuccess()) - }) - .catch(err => { - dispatch(itemFail(err)) - }) -} + type: actionTypes.ITEM_REPORT_SUCCESS, +}); + +export const getItem = () => (dispatch) => { + dispatch(getItemStart()); + axios + .get("/item") + .then((res) => { + dispatch(getItemSuccess(res.data)); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const postItem = (data) => (dispatch) => { + dispatch(postItemStart()); + axios + .post("/item", qs.stringify(data)) + .then((res) => { + dispatch(postItemSuccess(res.data)); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const editItem = (data, id) => (dispatch) => { + dispatch(editItemStart()); + axios + .put("/item/" + id, qs.stringify(data)) + .then((res) => { + dispatch(editItemSuccess(res.data)); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const delItem = (id) => (dispatch) => { + dispatch(delItemStart()); + axios + .delete("/item/" + id) + .then((res) => { + dispatch(delItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const selliniItem = (id, data) => (dispatch) => { + dispatch(sellIniItemStart()); + axios + .patch("/item/" + id + "/sellIni", qs.stringify(data)) + .then((res) => { + dispatch(sellIniItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const sellfniItem = (id, data) => (dispatch) => { + dispatch(sellFinItemStart()); + axios + .patch("/item/" + id + "/sellFin", qs.stringify(data)) + .then((res) => { + dispatch(sellFinItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; + +export const reportItem = (id) => (dispatch) => { + axios + .patch("/item/" + id + "/report") + .then((res) => { + dispatch(reportItemSuccess()); + }) + .catch((err) => { + dispatch(itemFail(err)); + }); +}; diff --git a/src/store/actions/misc.tsx b/src/store/actions/misc.tsx index ca0ee12..681db76 100644 --- a/src/store/actions/misc.tsx +++ b/src/store/actions/misc.tsx @@ -1,75 +1,79 @@ -import axios from 'axios'; -import * as actionTypes from './actionTypes'; +import axios from "axios"; +import * as actionTypes from "./actionTypes"; export const miscStart = () => ({ - type: actionTypes.MISC_START -}) + type: actionTypes.MISC_START, +}); export const miscFail = (err) => ({ - type: actionTypes.MISC_FAIL, - err: err -}) + type: actionTypes.MISC_FAIL, + err: err, +}); export const miscFollow = (category) => ({ - type: actionTypes.MISC_FOLLOW, - cat: category -}) + type: actionTypes.MISC_FOLLOW, + cat: category, +}); export const miscUnfollow = (category) => ({ - type: actionTypes.MISC_UNFOLLOW, - cat: category -}) + type: actionTypes.MISC_UNFOLLOW, + cat: category, +}); export const miscNotifs = (notifs) => ({ - type: actionTypes.MISC_NOTIFS, - notifs: notifs -}) + type: actionTypes.MISC_NOTIFS, + notifs: notifs, +}); export const miscReport = (rep) => ({ - type: actionTypes.MISC_REPORT, - report: rep -}) + type: actionTypes.MISC_REPORT, + report: rep, +}); -export const follow = (cat) => dispatch => { - dispatch(miscStart()) - axios.patch('/follow/' + cat) - .then(res => { - miscFollow(cat) - }) - .catch(err => { - miscFail(err) - }) -} +export const follow = (cat) => (dispatch) => { + dispatch(miscStart()); + axios + .patch("/follow/" + cat) + .then((res) => { + miscFollow(cat); + }) + .catch((err) => { + miscFail(err); + }); +}; -export const unfollow = (cat) => dispatch => { - dispatch(miscStart()) - axios.patch('/unfollow/' + cat) - .then(res => { - miscUnfollow(cat) - }) - .catch(err => { - miscFail(err) - }) -} +export const unfollow = (cat) => (dispatch) => { + dispatch(miscStart()); + axios + .patch("/unfollow/" + cat) + .then((res) => { + miscUnfollow(cat); + }) + .catch((err) => { + miscFail(err); + }); +}; -export const notifs = () => dispatch => { - dispatch(miscStart()) - axios.get('/notifications') - .then(res => { - dispatch(miscNotifs(res.data)) - }) - .catch(err => { - dispatch(miscFail(err)) - }) -} +export const notifs = () => (dispatch) => { + dispatch(miscStart()); + axios + .get("/notifications") + .then((res) => { + dispatch(miscNotifs(res.data)); + }) + .catch((err) => { + dispatch(miscFail(err)); + }); +}; -export const report = () => dispatch => { - dispatch(miscStart()) - axios.get('/report') - .then(res => { - dispatch(miscReport(res.data)) - }) - .catch(err => { - dispatch(miscFail(err)) - }) -} \ No newline at end of file +export const report = () => (dispatch) => { + dispatch(miscStart()); + axios + .get("/report") + .then((res) => { + dispatch(miscReport(res.data)); + }) + .catch((err) => { + dispatch(miscFail(err)); + }); +}; diff --git a/src/store/actions/review.tsx b/src/store/actions/review.tsx index 317be3e..1b9a31b 100644 --- a/src/store/actions/review.tsx +++ b/src/store/actions/review.tsx @@ -1,143 +1,151 @@ -import axios from '../../axios-ins' -import qs from 'querystring' -import * as actionTypes from './actionTypes' +import axios from "../../axios-ins"; +import qs from "querystring"; +import * as actionTypes from "./actionTypes"; export const getReviewStart = () => ({ - type: actionTypes.REVIEW_START -}) + type: actionTypes.REVIEW_START, +}); export const getReviewSuccess = (data) => ({ - type: actionTypes.REVIEW_SUCCESS, - data: data -}) + type: actionTypes.REVIEW_SUCCESS, + data: data, +}); export const postReviewStart = () => ({ - type: actionTypes.REVIEW_POST_START -}) + type: actionTypes.REVIEW_POST_START, +}); export const postReviewSuccess = (data) => ({ - type: actionTypes.REVIEW_POST_SUCCESS, - data: data -}) + type: actionTypes.REVIEW_POST_SUCCESS, + data: data, +}); export const reviewFail = (err) => ({ - type: actionTypes.REVIEW_FAIL, - err: err -}) + type: actionTypes.REVIEW_FAIL, + err: err, +}); export const editReviewStart = () => ({ - type: actionTypes.REVIEW_EDIT_START -}) + type: actionTypes.REVIEW_EDIT_START, +}); export const editReviewSuccess = (data) => ({ - type: actionTypes.REVIEW_EDIT_SUCCESS, - data: data -}) + type: actionTypes.REVIEW_EDIT_SUCCESS, + data: data, +}); export const delReviewStart = () => ({ - type: actionTypes.REVIEW_DEL_START -}) + type: actionTypes.REVIEW_DEL_START, +}); export const delReviewSuccess = () => ({ - type: actionTypes.REVIEW_DEL_SUCCESS -}) + type: actionTypes.REVIEW_DEL_SUCCESS, +}); export const upvoteReviewSuccess = () => ({ - type: actionTypes.REVIEW_UPVOTE_SUCCESS -}) + type: actionTypes.REVIEW_UPVOTE_SUCCESS, +}); export const downvoteReviewSuccess = () => ({ - type: actionTypes.REVIEW_DOWNVOTE_SUCCESS -}) + type: actionTypes.REVIEW_DOWNVOTE_SUCCESS, +}); export const reportReviewSuccess = () => ({ - type: actionTypes.REVIEW_REPORT_SUCCESS -}) + type: actionTypes.REVIEW_REPORT_SUCCESS, +}); export const resolveReviewSuccess = () => ({ - type: actionTypes.REVIEW_RESOLVE_SUCCESS -}) - -export const getReview = (id) => dispatch => { - dispatch(getReviewStart()) - axios.get('/users/' + id + '/reviews/') - .then(res => { - dispatch(getReviewSuccess(res.data)) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} - -export const postReview = (data, id) => dispatch => { - dispatch(postReviewStart()) - axios.post('/users/' + id + '/reviews/', qs.stringify(data)) - .then(res => { - dispatch(postReviewSuccess(res.data)) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} - -export const editReview = (data, id, reviewId) => dispatch => { - dispatch(editReviewStart()) - axios.put('/users/' + id + '/reviews/'+ reviewId, qs.stringify(data)) - .then(res => { - dispatch(editReviewSuccess(res.data)) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} - -export const delReview = (id, reviewId) => dispatch => { - dispatch(delReviewStart()) - axios.delete('/users/' + id + '/reviews/'+ reviewId) - .then(res => { - dispatch(delReviewSuccess()) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} - -export const upvoteReview = (id, reviewId) => dispatch => { - axios.patch('/users/' + id + '/reviews/'+ reviewId + '/upvote') - .then(res => { - dispatch(upvoteReviewSuccess()) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} - -export const downvoteReview = (id, reviewId) => dispatch => { - axios.patch('/users/' + id + '/reviews/'+ reviewId + '/downvote') - .then(res => { - dispatch(downvoteReviewSuccess()) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} - -export const reportReview = (id, reviewId) => dispatch => { - axios.patch('/users/' + id + '/reviews/'+ reviewId + '/report') - .then(res => { - dispatch(reportReviewSuccess()) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} - -export const resolveReview = (id, reviewId) => dispatch => { - axios.patch('/users/' + id + '/reviews/'+ reviewId + '/resolve') - .then(res => { - dispatch(resolveReviewSuccess()) - }) - .catch(err => { - dispatch(reviewFail(err)) - }) -} \ No newline at end of file + type: actionTypes.REVIEW_RESOLVE_SUCCESS, +}); + +export const getReview = (id) => (dispatch) => { + dispatch(getReviewStart()); + axios + .get("/users/" + id + "/reviews/") + .then((res) => { + dispatch(getReviewSuccess(res.data)); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const postReview = (data, id) => (dispatch) => { + dispatch(postReviewStart()); + axios + .post("/users/" + id + "/reviews/", qs.stringify(data)) + .then((res) => { + dispatch(postReviewSuccess(res.data)); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const editReview = (data, id, reviewId) => (dispatch) => { + dispatch(editReviewStart()); + axios + .put("/users/" + id + "/reviews/" + reviewId, qs.stringify(data)) + .then((res) => { + dispatch(editReviewSuccess(res.data)); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const delReview = (id, reviewId) => (dispatch) => { + dispatch(delReviewStart()); + axios + .delete("/users/" + id + "/reviews/" + reviewId) + .then((res) => { + dispatch(delReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const upvoteReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/upvote") + .then((res) => { + dispatch(upvoteReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const downvoteReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/downvote") + .then((res) => { + dispatch(downvoteReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const reportReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/report") + .then((res) => { + dispatch(reportReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; + +export const resolveReview = (id, reviewId) => (dispatch) => { + axios + .patch("/users/" + id + "/reviews/" + reviewId + "/resolve") + .then((res) => { + dispatch(resolveReviewSuccess()); + }) + .catch((err) => { + dispatch(reviewFail(err)); + }); +}; diff --git a/src/store/reducers/auth.tsx b/src/store/reducers/auth.tsx index 0ae0bc9..44f672d 100644 --- a/src/store/reducers/auth.tsx +++ b/src/store/reducers/auth.tsx @@ -1,7 +1,7 @@ -const initState = {} +const initState = {}; -const authReducer = (state = initState,action={}) => { - return state -} +const authReducer = (state = initState, action = {}) => { + return state; +}; -export default authReducer \ No newline at end of file +export default authReducer; diff --git a/src/store/reducers/index.tsx b/src/store/reducers/index.tsx index 39344fd..c682e0e 100644 --- a/src/store/reducers/index.tsx +++ b/src/store/reducers/index.tsx @@ -1,11 +1,11 @@ -import authReducer from './auth' -import itemReducer from './item' +import authReducer from "./auth"; +import itemReducer from "./item"; -import { combineReducers } from 'redux' +import { combineReducers } from "redux"; -const rootReducer = combineReducers ({ - auth : authReducer, - item : itemReducer -}) +const rootReducer = combineReducers({ + auth: authReducer, + item: itemReducer, +}); -export default rootReducer; \ No newline at end of file +export default rootReducer; diff --git a/src/store/reducers/item.tsx b/src/store/reducers/item.tsx index 8e09c7e..9db8373 100644 --- a/src/store/reducers/item.tsx +++ b/src/store/reducers/item.tsx @@ -1,80 +1,80 @@ const initState = { - items: [ - { - id: 1, - name: 'Asus Laptop', - price: 40000, - category: 'laptop', - image: '/images/laptop.jfif', - }, - { - id: 2, - name: 'Macbook Air', - price: 60000, - category: 'laptop', - image: '/images/laptop.jfif', - }, - { - id: 3, - name: 'Hero Thunderbird', - price: 4000, - category: 'bicycle', - image: '/images/bicycle.jfif', - }, - { - id: 4, - name: 'Decathlon BTWX 100', - price: 5000, - category: 'bicycle', - image: '/images/bicycle.jfif', - }, - { - id: 5, - name: 'Samsung S10e', - price: 25000, - category: 'mobile', - image: '/images/mobile.jfif', - }, - { - id: 6, - name: 'Vivo V15', - price: 14000, - category: 'mobile', - image: '/images/mobile.jfif', - }, - { - id: 7, - name: 'Kurl On memory foam ', - price: 2000, - category: 'matteress', - image: '/images/matteress.jfif', - }, - { - id: 8, - name: 'SleepX', - price: 1500, - category: 'matteress', - image: '/images/matteress.jfif', - }, - { - id: 9, - name: 'Order of the phoenix', - price: 300, - category: 'book', - image: '/images/book.jfif', - }, - { - id: 10, - name: 'Differential Equation - Kreyzig', - price: 200, - category: 'book', - image: '/images/book.jfif', - }, - ], -} + items: [ + { + id: 1, + name: "Asus Laptop", + price: 40000, + category: "laptop", + image: "/images/laptop.jfif", + }, + { + id: 2, + name: "Macbook Air", + price: 60000, + category: "laptop", + image: "/images/laptop.jfif", + }, + { + id: 3, + name: "Hero Thunderbird", + price: 4000, + category: "bicycle", + image: "/images/bicycle.jfif", + }, + { + id: 4, + name: "Decathlon BTWX 100", + price: 5000, + category: "bicycle", + image: "/images/bicycle.jfif", + }, + { + id: 5, + name: "Samsung S10e", + price: 25000, + category: "mobile", + image: "/images/mobile.jfif", + }, + { + id: 6, + name: "Vivo V15", + price: 14000, + category: "mobile", + image: "/images/mobile.jfif", + }, + { + id: 7, + name: "Kurl On memory foam ", + price: 2000, + category: "matteress", + image: "/images/matteress.jfif", + }, + { + id: 8, + name: "SleepX", + price: 1500, + category: "matteress", + image: "/images/matteress.jfif", + }, + { + id: 9, + name: "Order of the phoenix", + price: 300, + category: "book", + image: "/images/book.jfif", + }, + { + id: 10, + name: "Differential Equation - Kreyzig", + price: 200, + category: "book", + image: "/images/book.jfif", + }, + ], +}; -const itemReducer = (state = initState,action) => { - return state -} +const itemReducer = (state = initState, action) => { + return state; +}; -export default itemReducer \ No newline at end of file +export default itemReducer;