Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4219103
testing git procedure with Daniel
rlly92 Jun 2, 2023
09c8ba1
hello from daniel
daniellimss Jun 2, 2023
41fbfb1
Merge branch 'main' into daniel-branch
rlly92 Jun 2, 2023
12df505
Merge pull request #1 from daniellimss/daniel-branch
rlly92 Jun 2, 2023
b79a2ca
testing 123
daniellimss Jun 2, 2023
05a06af
Merge pull request #2 from daniellimss/daniel-branch
rlly92 Jun 2, 2023
7194847
testing commit branch
rlly92 Jun 2, 2023
826014a
Merge pull request #3 from rlly92/reuben-branch
rlly92 Jun 2, 2023
5852263
2nd test
daniellimss Jun 2, 2023
b42b57e
Merge pull request #4 from daniellimss/daniel-branch
rlly92 Jun 2, 2023
b27e166
testing
daniellimss Jun 3, 2023
bf5bbc5
Merge pull request #5 from rlly92/daniel-branch
rlly92 Jun 3, 2023
889136b
2nd test
daniellimss Jun 3, 2023
b4e076a
Merge pull request #6 from rlly92/daniel-branch
rlly92 Jun 3, 2023
49641ab
basic outline of login form
daniellimss Jun 3, 2023
e834255
2nd test
daniellimss Jun 3, 2023
a7331fa
Merge pull request #7 from rlly92/daniel-branch
rlly92 Jun 3, 2023
c310777
installed Auth0
rlly92 Jun 3, 2023
df0204f
login page rectified
rlly92 Jun 3, 2023
f1aefad
login page has been constructed. Complete Auth0 setup to follow
rlly92 Jun 3, 2023
01dbf84
login page has been constructed. Complete Auth0 setup to follow
rlly92 Jun 3, 2023
fef50c5
created base for loginpage and userprofilepage. Authentication to be …
rlly92 Jun 3, 2023
3e5d584
created skeleton Listings and Carts components
daniellimss Jun 4, 2023
19af265
improved on FE Listings ver 01
daniellimss Jun 5, 2023
037100b
Merge pull request #8 from rlly92/daniel-branch
rlly92 Jun 5, 2023
02d9ec7
created skeleton ItemListing and few css files
daniellimss Jun 5, 2023
7847801
basic signupinfo page has been constructed. awaiting backend config
rlly92 Jun 5, 2023
b523f82
attempting user redirection to signupinfo page on sign up
rlly92 Jun 5, 2023
0a3b6b1
Merge branch 'main' into daniel-branch
rlly92 Jun 6, 2023
33acb7a
Merge pull request #10 from rlly92/daniel-branch
rlly92 Jun 6, 2023
777e51d
some minor comments
rlly92 Jun 6, 2023
c3c8908
centralized navbar, navbar appear on every page, test out cart input …
daniellimss Jun 6, 2023
ae3df57
new commit
daniellimss Jun 7, 2023
99cd62a
99% of authentication and login and signup routes and logic complete
rlly92 Jun 7, 2023
1bd20ee
Merge pull request #12 from rlly92/authentication-routing
rlly92 Jun 7, 2023
eb23b35
created Create Listing pg and modified Item Listing pg but unable to …
daniellimss Jun 7, 2023
f769d79
Merge branch 'main' into navbar-centralize
rlly92 Jun 7, 2023
5ac36db
Merge pull request #13 from rlly92/navbar-centralize
rlly92 Jun 7, 2023
b424f5d
some logic done for seller pathway
rlly92 Jun 8, 2023
3b02c45
successfully rendered listings using map and MUI components
daniellimss Jun 9, 2023
f46dff9
modified resolving conflict
daniellimss Jun 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.env.development.local
.env.test.local
.env.production.local
.env

npm-debug.log*
yarn-debug.log*
Expand Down
2,165 changes: 2,116 additions & 49 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,23 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"react": "^18.1.0",
"@auth0/auth0-react": "^2.1.0",
"@emotion/react": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@material-ui/icons": "^4.11.3",
"@mui/joy": "^5.0.0-alpha.82",
"@mui/material": "^5.13.3",
"@mui/styles": "^5.13.2",
"axios": "^1.4.0",
"bootstrap": "^5.1.3",
"dotenv": "^16.1.3",
"react": "^18.2.0",
"react-bootstrap": "^2.7.4",
"react-dom": "^18.1.0",
"react-scripts": "5.0.1"
"react-router-dom": "^6.11.2",
"react-scripts": "5.0.1",
"react-select": "^5.7.3",
"react-toastify": "^9.1.3"
},
"scripts": {
"start": "react-scripts start",
Expand Down
22 changes: 14 additions & 8 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
import React from "react";
import logo from "./logo.png";
import React, { createContext, useCallback, useEffect, useState } from "react";

import LoginPage from "./components/LoginPage";
import Listings from "./components/Listings";

import NavBar from "./components/NavBar";
import ItemListing from "./components/ItemListing";

import { BrowserRouter, Route, Routes, Navigate, Link } from "react-router-dom";

import { ToastContainer } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";

import "./App.css";

class App extends React.Component {
render() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
</header>
<LoginPage />
</div>
);
}
Expand Down
20 changes: 20 additions & 0 deletions src/components/Carts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React, { useState, useContext, useEffect } from "react";
import { useAuth0 } from "@auth0/auth0-react";

import { useNavigate } from "react-router-dom";
import { Link } from "react-router-dom";
import { UserContext } from "../App";
import { Button, Paper, Stack, TextField, Typography } from "@mui/material";
import { toast } from "react-toastify";
import NavBar from "./NavBar";

const Carts = () => {
return (
<>
<NavBar />
<div>Carts</div>
</>
)
}

export default Carts;
Empty file added src/components/CartsStyle.css
Empty file.
Loading