Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
a399dca
feat: basic structure and routing added
haykbit Jun 4, 2021
3c756b8
feat: Checkout button functionality added
haykbit Jun 4, 2021
deda1bc
feat: Trying to get cartItems
sebastianeliasb Jun 4, 2021
04a2f9c
feat: Informatio form first-steps
sebastianeliasb Jun 4, 2021
a1525be
feat: new Summary component
sebastianeliasb Jun 4, 2021
f919680
feat: form fixes and cart added
sebastianeliasb Jun 4, 2021
903e4c4
feat: Shipping form created
haykbit Jun 4, 2021
8f2193d
feat: Payment folder and Form created
solaz0824 Jun 4, 2021
ea52631
Merge branch 'feat/create-shipping-form' into feat/create-form-component
haykbit Jun 4, 2021
1ba77e9
feat: merge create-form-component to create-payment-form
solaz0824 Jun 4, 2021
345afde
feat: first form finished
sebastianeliasb Jun 7, 2021
fcc9d2a
feat: Shipping form modified
haykbit Jun 7, 2021
29d664f
feat: Payment page bagic structure done
solaz0824 Jun 7, 2021
cecc574
Merge branch 'feat/create-form-component' of https://github.com/haykb…
haykbit Jun 7, 2021
05ce345
fixed: fixed router path step-3
haykbit Jun 7, 2021
c9d5a97
Merge branch 'feat/create-payment-form' into feat/create-form-component
haykbit Jun 7, 2021
cf06f86
feat: Shipping handeles added
haykbit Jun 7, 2021
6ea04f8
feat: CartSummary added to the component
haykbit Jun 7, 2021
7dfe34c
feat: implemented buttons correctly
sebastianeliasb Jun 7, 2021
c29fba2
feat: testing 3
haykbit Jun 7, 2021
186fe47
feat: testing 4
haykbit Jun 7, 2021
7eabdb0
feat: test.....
solaz0824 Jun 7, 2021
15b54e4
Merge branch 'feat/context' of https://github.com/haykbit/react-shopp…
solaz0824 Jun 7, 2021
e1653bc
feat: saveUser function implemented
sebastianeliasb Jun 7, 2021
9dc3b99
feat: confirmation information
sebastianeliasb Jun 7, 2021
1f8b4b6
feat: UserContext implemented
sebastianeliasb Jun 8, 2021
12aedeb
feat: confirmation page first steps
sebastianeliasb Jun 8, 2021
d2d3880
feat: cart context
solaz0824 Jun 8, 2021
dcbbd7f
Merge branch 'feat/context' of https://github.com/haykbit/react-shopp…
solaz0824 Jun 8, 2021
f6e3a7b
index deleted
sebastianeliasb Jun 8, 2021
d5d6358
feat: fixed merge problems
sebastianeliasb Jun 8, 2021
3439ded
feat: Input class added and payment form submit button added
solaz0824 Jun 9, 2021
22f7c67
feat: Progress bar structure created
haykbit Jun 9, 2021
9519875
feat: checkbox validation fixed
solaz0824 Jun 9, 2021
cb68a1c
feaat: confirmation page added product summary
sebastianeliasb Jun 9, 2021
e3635b8
Merge branch 'main' of https://github.com/haykbit/react-shopping-cart…
sebastianeliasb Jun 9, 2021
1a20243
feat: Passing Payment Data to OrderConfirmation Done
solaz0824 Jun 9, 2021
a449b94
Merge branch 'main' into feat/improvement-payment-page
solaz0824 Jun 9, 2021
0f8bed4
feat: small confrimation changes
sebastianeliasb Jun 9, 2021
56ebc97
feat: Working on Input success and Payment Confirmation
solaz0824 Jun 9, 2021
5b3f5b0
Merge branch 'feat/improvement-payment-page' into main
solaz0824 Jun 9, 2021
aee7d6c
style: Confirmation page first design
sebastianeliasb Jun 9, 2021
ed3f80c
Progress bar added
haykbit Jun 10, 2021
6857897
style: confirmation page finished
sebastianeliasb Jun 10, 2021
3efda15
Merging stepper branch
haykbit Jun 10, 2021
9588c23
Merging stepper branch
haykbit Jun 10, 2021
8915dd5
fix: fixed mergin errors
haykbit Jun 10, 2021
3c40f23
fix: Stepper exported to index
haykbit Jun 10, 2021
db964ec
feat: payment and credit card done
solaz0824 Jun 10, 2021
a1b773e
Merge branch 'main' into feat/improvement-payment-page
solaz0824 Jun 10, 2021
6616857
feat: removed unused file
solaz0824 Jun 10, 2021
e3c1264
Merge branch 'main' of https://github.com/haykbit/react-shopping-cart…
solaz0824 Jun 10, 2021
ddab270
feat: checkout button conditional disabled
haykbit Jun 10, 2021
ce1da01
Merge branch 'main' of https://github.com/haykbit/react-shopping-cart…
haykbit Jun 10, 2021
26905bd
feat: small details in text
sebastianeliasb Jun 10, 2021
a4c4480
feat: small details
sebastianeliasb Jun 10, 2021
ba0079b
merge
sebastianeliasb Jun 10, 2021
9192c3d
feat: button confirm deleted
haykbit Jun 10, 2021
74ce3c6
fix: cleaned code
haykbit Jun 10, 2021
ec69d50
fitx: Code cleaned
haykbit Jun 10, 2021
b86f2fe
Merge branch 'main' into dev
sebastianeliasb Jun 10, 2021
2fa6978
feat: responsive/font/button added
solaz0824 Jun 10, 2021
8891eee
feat: country prefix
sebastianeliasb Jun 10, 2021
fdad4a4
fix: code clean up
sebastianeliasb Jun 10, 2021
e06e896
feat: style issue fixed
solaz0824 Jun 10, 2021
9a60580
feat: Merge branch 'main' into feat/phone-number-countycode
solaz0824 Jun 10, 2021
2f0dde7
feat: validation check issue fixed
solaz0824 Jun 11, 2021
e1469c2
feat: removed unused files
solaz0824 Jun 11, 2021
c897aed
Update README.md
solaz0824 Jun 11, 2021
4aa3a87
Update README.md
solaz0824 Jun 11, 2021
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
8 changes: 7 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@ module.exports = {
},
],
rules: {
"prettier/prettier": "error",
"prettier/prettier": [
"error",

{
endOfLine: "auto",
},
],
"react/jsx-filename-extension": "off",
"import/prefer-default-export": "off",
"prefer-destructuring": "off",
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-)

<!-- ALL-CONTRIBUTORS-BADGE:END -->
<h1 align="center">Hi 👋, We are <br />Sebastian Brupbacher<br /> Hayk Petrosyan<br /> Eunyoung Kim</h1>
<h2 align="center">Shopping Wizard - React Project</h3>
<br />

<h3 align="left">Languages and Tools:</h3>
<br />
<p align="left"> <a href="https://getbootstrap.com" target="_blank"> <img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/bootstrap/bootstrap-plain-wordmark.svg" alt="bootstrap" width="40" height="40"/> </a> <a href="https://git-scm.com/" target="_blank"> <img src="https://www.vectorlogo.zone/logos/git-scm/git-scm-icon.svg" alt="git" width="40" height="40"/> </a> <a href="https://www.w3.org/html/" target="_blank"> <img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/html5/html5-original-wordmark.svg" alt="html5" width="40" height="40"/> </a> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript" target="_blank"> <img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/javascript/javascript-original.svg" alt="javascript" width="40" height="40"/> </a> <a href="https://reactjs.org/" target="_blank"> <img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/react/react-original-wordmark.svg" alt="react" width="40" height="40"/> </a> <a href="https://sass-lang.com" target="_blank"> <img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/sass/sass-original.svg" alt="sass" width="40" height="40"/> </a> </p>

<br />
<br />
<br />
<br />

# Assembler School: React Shopping Cart Context

Expand Down
57 changes: 57 additions & 0 deletions React-context-info.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#React Context
###Project Organization

1. Divide in little parts the website structure
2. Create tasks for each part
3. Create the basic pages and routes


**Pages**

Information / Delivery / Payment / Confirmation

### Information ( if user is not logged )
1. Title <br>
2. First Name ( required )
3. Last Name ( required )
4. Phone number ( required )
5. Email ( required )
6. Address 1 ( required )
7. Address 2 <br>
8. Zip Code ( required )
9. City ( required )
10. Country ( required )
11. State ( required )

### Delivery ( elseif user is logged )

1. Address 1 ( required )
2. Address 2 <br>
3. Zip Code ( required )
4. City ( required )
5. Country ( required )
6. State ( required )

Fake user for Delivery page

### Payment

1. Type of payment ( required )
2. Carholder name ( required )
3. Card number ( required )
4. Card expiry date ( required )
5. CVV code ( required )
6. Checkbox Policy ( required )

### Confirmation

1. Title
2. Message ( Hi [ name ] your order...
3. Order date / Order code / Payment / Address
4. Product img / name / company / QTY / Price
5. Subtotal
6. Shipping method
7. Taxes
8. Discount ?
9. Total
10. Message shipping confirmation
Loading