Skip to content

Commit

Permalink
[Finishes #187355064] Users should be able to chat
Browse files Browse the repository at this point in the history
  • Loading branch information
lilika67 committed Jul 25, 2024
1 parent 78e9fe9 commit 95c1e20
Show file tree
Hide file tree
Showing 22 changed files with 865 additions and 41 deletions.
169 changes: 157 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@reduxjs/toolkit": "^2.2.5",
"@stripe/react-stripe-js": "^2.7.3",
"@types/axios": "^0.14.0",
"@types/jwt-decode": "^3.1.0",
"@types/react-router-dom": "^5.3.3",
"@types/redux-thunk": "^2.1.0",
"api-client": "^1.1.3",
Expand All @@ -35,6 +34,7 @@
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
"date-fns": "^3.6.0",
"dayjs": "^1.11.12",
"dotenv": "^16.4.5",
"https-browserify": "^1.0.0",
"jwt-decode": "^4.0.0",
Expand All @@ -56,6 +56,7 @@
"redux-thunk": "^3.1.0",
"sass": "^1.77.5",
"sass-loader": "^14.2.1",
"socket.io-client": "^4.7.5",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"style-loader": "^4.0.0",
Expand All @@ -82,6 +83,7 @@
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"@types/jwt-decode": "^2.2.1",
"@types/node": "^20.14.7",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
Expand Down
29 changes: 14 additions & 15 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react';
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
import Home from './views/Home';
import Login from './Pages/Login/Login';
import Signup from './Pages/Signup/Signup';
import IsVerified from './components/IsVerifiedModal/IsVerified';
import UserVerificationFailed from './components/IsVerifiedModal/UserVerificationFailed';
import ResetPassword from './Pages/resetPassword/ResetPassword';
import ResetPasswordPage from './Pages/resetPassword/ResetPasswordPage';
import WishlistPage from './components/wishlist/wishlistPage'
import React from "react";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
import Home from "./views/Home";
import Login from "./Pages/Login/Login";;
import Signup from "./Pages/Signup/Signup";
import IsVerified from "./components/IsVerifiedModal/IsVerified";
import UserVerificationFailed from "./components/IsVerifiedModal/UserVerificationFailed";
import ResetPassword from "./Pages/resetPassword/ResetPassword";
import ResetPasswordPage from "./Pages/resetPassword/ResetPasswordPage";
import WishlistPage from "./components/wishlist/wishlistPage";
import Header from "./components/userDashHeader/UserHeader";
import RecommendProduct from './components/productReco/productRecommand';
import RecommendProduct from "./components/productReco/productRecommand";
import BillingAddress from "./components/billingAddress/billingaddress";
import OtpVerification from './Pages/Login/OtpVerification';
import UserDash from "./views/userDash";
Expand Down Expand Up @@ -38,7 +38,7 @@ const App: React.FC = () => (
<Router>

<Routes>
<Route path="/" element={< Home/>} />
<Route path="/" element={<Home/>} />
<Route path="/:id" element={<Home />} />
<Route path="/login" element={<Login />} />
<Route path="/verify/:userId" element={<OtpVerification />} />
Expand Down Expand Up @@ -69,9 +69,8 @@ const App: React.FC = () => (
<Route path="/MyAccount/:id" element={<MyAccount />} />
<Route path="/updateprofile" element={<UpdateProfile />} />
<Route path="/updatebilling" element={<UpdateBilling />} />
<Route path='/adminDash/:id' element={<SampleAdmin/>} />
<Route path='/sellerDash/:id' element={<SampleSeller/>} />

<Route path="/adminDash/:id" element={<SampleAdmin />} />
<Route path="/sellerDash/:id" element={<SampleSeller />} />
</Routes>
</Router>
);
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Signup/Signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const Signup: React.FC = () => {
useEffect(() => {
if (isSucceeded) {
setFormData({
firstName: '',
firstName: "",
lastName: '',
email: '',
password: '',
Expand Down
1 change: 1 addition & 0 deletions src/components/AvailableProduct/product.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useDispatch, useSelector } from 'react-redux';
import { AppDispatch, RootState } from '../../redux/store';
import { addProductInCart, fetchProductsInCart } from '../../redux/slices/cartSlice';


interface ProductProps {
productId: string;
name: string;
Expand Down
Loading

0 comments on commit 95c1e20

Please sign in to comment.