Skip to content

Feature 4 checkout #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
d1ad2c2
Add package-lock.json to gitignore
kabir4691 Aug 27, 2020
3075c40
Add react router dom to package.json
kabir4691 Aug 27, 2020
2c11893
Add controller component with default page as 404 page
kabir4691 Aug 27, 2020
c33caa8
Add material-ui core and icons to package.json
kabir4691 Aug 27, 2020
e8d2a6e
Add header with app logo
kabir4691 Aug 28, 2020
55b7d70
Add search bar to header
kabir4691 Aug 28, 2020
d75d162
Add login button to header
kabir4691 Aug 28, 2020
0c0aefb
Add react-modal to package.json
kabir4691 Aug 28, 2020
ed1153e
Add modal for login
kabir4691 Aug 28, 2020
781c9f3
Add modal for signup
kabir4691 Aug 28, 2020
c354729
Clear all values and errors after modal is closed
kabir4691 Aug 28, 2020
b1802cd
Add snackbar at bottom left of screen to display messages to user
kabir4691 Aug 28, 2020
6506466
Add API implementation for signup
kabir4691 Aug 28, 2020
fe1c2c9
Add API implementation for login
kabir4691 Aug 28, 2020
df61f57
Add profile menu in case of logged in user
kabir4691 Aug 28, 2020
618fa35
Fix styling in search bar
kabir4691 Aug 28, 2020
827ce35
Merge pull request #2 from kabir4691/1-header-component
prhegde Aug 29, 2020
385ff36
Adding Home.css file to introduce styling components for Home page
prhegde Aug 29, 2020
2876f50
Adding Style component for the Restaurant Card in Home page
prhegde Aug 29, 2020
716eeef
Adding Style component for Card action area
prhegde Aug 29, 2020
e78238d
Introducing Home.jsx file with Component mount function
prhegde Aug 29, 2020
c2db834
Update Search Restaurant and Rendering functionalities for the home page
prhegde Aug 29, 2020
2ca8876
Adding style components for the entire Home page in home.jsx file
prhegde Aug 29, 2020
af9ebf0
Adding style component for container containing details of the restau…
Aug 30, 2020
b857184
Adding style component for container containing rating and cost
Aug 30, 2020
7b4421e
updating Details.css
Aug 30, 2020
bbfbb9c
Introducing Details.js
Aug 30, 2020
7517488
Adding style sheet for checkout
imranbm9 Aug 30, 2020
ff2372f
Adding style sheet menu item container
imranbm9 Aug 30, 2020
3539136
Adding style sheer for item summary
imranbm9 Aug 30, 2020
0de72c1
Adding style sheet for coupin container
imranbm9 Aug 30, 2020
8e8a322
Adding checkout js page
imranbm9 Aug 30, 2020
1e788d2
Adding button handlers
imranbm9 Aug 30, 2020
6f4d63e
Added getAddress functionality
imranbm9 Aug 30, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

package-lock.json
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"react": "^16.5.2",
"react-dom": "^16.5.2",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-modal": "^3.11.2",
"react-router-dom": "^5.2.0",
"react-scripts": "2.0.4"
},
"scripts": {
Expand Down
43 changes: 43 additions & 0 deletions src/common/header/Header.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
.app-header {
display: flex;
flex-flow: row wrap;
justify-content: space-between;
align-items: center;
background:#253239;
padding: 10px;
}

.search-container {
width: 300px;
margin: 5px 0;
}

.login-button-icon {
margin-right: 10px;
}

.modal-content {
padding: 0 30px;
text-align: center;
}

.dispNone {
display: none;
}

.dispBlock {
display: block;
}

.red {
color: red;
}

.profile-button-icon {
margin-right: 10px;
}

a {
text-decoration: none;
color: black
}
Loading