Repository navigation

importing librairies part 1 - #3

Open

MeriemBan wants to merge 252 commits into

decodejacques:masterfrom

MeriemBan:master

Open

importing librairies part 1#3
MeriemBan wants to merge 252 commits into
decodejacques:masterfrom
MeriemBan:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Aug 12, 2019
- importing libraries
  MeriemBan
  committed
  f3d1950
Commits on Aug 13, 2019
- backend_second_draft
  MeriemBan
  committed
  e83c9f8
- Update server.js
  MeriemBan
  authored
  d96bda5
- App component changed and server file
  MeriemBan
  committed
  fcea403
- react router dom package
  MeriemBan
  committed
  3b5113b
- BrowserRouter added to App component
  MeriemBan
  committed
  279c5f2
- new component called Cart and username added to the signup
  MeriemBan
  committed
  30198bc
- you can use redux now
  MeriemBan
  committed
  8d647d3
- added a new component
  ZeynepSarigul
  committed
  4793de5
- App Cart and index files have been changed
  MeriemBan
  committed
  4abab2a
- changes on Cart component
  MeriemBan
  committed
  69161e8
- white background
  MeriemBan
  committed
  8eaac52
- NewItem changes
  MeriemBan
  committed
  97f3d4b
- I added signup.jsx and login.jsx
  linx1x
  committed
  45d8203
- cart page changes
  MeriemBan
  committed
  975b704
- Items component has been created
  MeriemBan
  committed
  b22e67a
- I updated the signup/login and created a pages folder inside src to put our components in
  linx1x
  committed
  95e2271
- css for signup and login
  MeriemBan
  committed
  2780a87
- new-item css added
  ZeynepSarigul
  committed
  cab91b2
- change css addItem
  ZeynepSarigul
  committed
  5125f2f
- app component changed to display signup and login pages
  MeriemBan
  committed
  d48a21f
Commits on Aug 14, 2019
- changes on Login and Signup
  MeriemBan
  committed
  ffceec0
- I changed the app.jsx and the server.js so that it would show something that we can work on. You can access to 3 different 'endpoint' : signup,login,newitems. The css is halfway there but I have to…
  linx1x
  committed
  530d8cf
- css added to newitem
  MeriemBan
  committed
  0f684a9
- Vince DONT TOUCH
  ZeynepSarigul
  committed
  c5af53e
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  9d0b8bc
- paths work now
  MeriemBan
  committed
  039dc71
- new change
  MeriemBan
  committed
  b5e4579
- I changed the login/signup so that the css would work on it, only need to fix the css files so that each component has his own css files to reduce the overlapping of style
  linx1x
  committed
  424db9d
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  6487c18
- Fixed the css for login/signup/new-item
  linx1x
  committed
  a132737
- login and signup changes
  MeriemBan
  committed
  6e253b9
- login changes
  MeriemBan
  committed
  c53690a
- login is working well
  MeriemBan
  committed
  9de9295
- new path for item details
  MeriemBan
  committed
  3c30c2c
- fixed newItem.jsx
  ZeynepSarigul
  committed
  bc31d78
- Items changed
  MeriemBan
  committed
  07cdfc5
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  8a747c1
- Items rendering stuff
  MeriemBan
  committed
  d5d1bc4
- Items
  MeriemBan
  committed
  c07721a
Commits on Aug 15, 2019
- Items and Item details
  MeriemBan
  committed
  144a5db
- Items is now ready
  MeriemBan
  committed
  b8aba0d
- I added the className in Item.jsx
  linx1x
  committed
  b4f00da
- image files added
  ZeynepSarigul
  committed
  045a5c3
- I added more classNames and I reorganized the the divs into 4 sections : wrapper, Navbar,filter and items.
  linx1x
  committed
  0e656f2
- images added
  ZeynepSarigul
  committed
  3f16663
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  9e39d81
- item details
  MeriemBan
  committed
  77b6d41
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  c08f11e
- item details
  MeriemBan
  committed
  9f1f150
- Items changed
  MeriemBan
  committed
  a10d123
- now ItemDetails displays the item
  MeriemBan
  committed
  c4e5090
- added navbar for now
  ZeynepSarigul
  committed
  6d23004
- put my css into item.css
  ZeynepSarigul
  committed
  0373535
- removed navbar from login/signup page
  ZeynepSarigul
  committed
  3acf110
- I added some css to items.css
  linx1x
  committed
  7041a66
- cart wip
  MeriemBan
  committed
  8285a82
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  d1c0516
- changed the place of searchbutton and filter
  ZeynepSarigul
  committed
  bfd6787
Commits on Aug 16, 2019
- items displayed in cart and removed after checkout
  MeriemBan
  committed
  3690c93
- changed searchbar
  ZeynepSarigul
  committed
  28b0304
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  1880baa
- scroll down fixed
  ZeynepSarigul
  committed
  a7af81e
- added a video to our main page
  ZeynepSarigul
  committed
  40adbd1
- fixed search bar
  linx1x
  committed
  dd03714
- changed video size
  ZeynepSarigul
  committed
  0392953
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  81da792
- changed size
  ZeynepSarigul
  committed
  95d0c9f
- item details has now the number of items in cart
  MeriemBan
  committed
  3311a23
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  84ad150
- fixed the autocomplete background color
  linx1x
  committed
  015a8fc
- I remove the for the login/signup that was in main.css and moved it in app.css
  linx1x
  committed
  0d7175d
- logout button fixed
  ZeynepSarigul
  committed
  3daaf72
- logout fixed
  ZeynepSarigul
  committed
  14c7f9c
- fixed a bug
  linx1x
  committed
  ebaae26
- changed autoplay to autoPlay in item.jsx line 111
  linx1x
  committed
  69988fe
- fixed the navbar z-index
  linx1x
  committed
  741ef9b
- Changed app.css item.css and items.jsx
  linx1x
  committed
  40836ca
- clearing cart and quantities added to the cart
  MeriemBan
  committed
  7f36448
- fixing conflicts
  MeriemBan
  committed
  04dd4dc
- typo
  MeriemBan
  committed
  fad5af1
- typo
  MeriemBan
  committed
  cac5665
- typo
  MeriemBan
  committed
  4074783
- removing the invisible character on App.jsx
  MeriemBan
  committed
  38d0a25
- className instead of class
  MeriemBan
  committed
  eff9602
- search bar styled
  ZeynepSarigul
  committed
  a1a76eb
- search bar changed
  ZeynepSarigul
  committed
  3576db1
- added an icon
  ZeynepSarigul
  committed
  b9d9ade
- server changes
  MeriemBan
  committed
  4697c3d
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  0af1647
Commits on Aug 17, 2019
- Items changed
  MeriemBan
  committed
  1a1047a
- typo and clear cart button changed
  MeriemBan
  committed
  6ed414a
- quantities are updated on items collection on add to cart action
  MeriemBan
  committed
  9afc45a
- remove item from cart
  MeriemBan
  committed
  390189d
- alert added when username or password are wrong when log in
  MeriemBan
  committed
  6a6ad66
- cart changes
  MeriemBan
  committed
  6e6403d
- add one to cart or remove one from cart
  MeriemBan
  committed
  450c03b
- remove from cart added
  MeriemBan
  committed
  a3aa500
- continue shopping button should redirect user to all-items
  MeriemBan
  committed
  6f81efb
- login without typing /login
  MeriemBan
  committed
  26ec40d
Commits on Aug 18, 2019
- now the user can like an item
  MeriemBan
  committed
  127b7a1
- fix to cart
  MeriemBan
  committed
  7934559
- I moved the css of the cart into a new file called Cart.css, and I started some baseground for the styling
  linx1x
  committed
  886d57a
- sold out is displayed now
  MeriemBan
  committed
  644a7b4
- cart
  MeriemBan
  committed
  0307fa6
- items
  MeriemBan
  committed
  47e5bae
- I changed the cart render structure and added some classNames and Id.
  linx1x
  committed
  c91befb
- fixed a conflict in cart.jsx
  linx1x
  committed
  45290be
- reviews added
  ZeynepSarigul
  committed
  ff534ba
- search button updted
  ZeynepSarigul
  committed
  f753589
- max and min filter fixed
  ZeynepSarigul
  committed
  dc9c218
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  8d51d63
- Almost Done with the cart, I need to place the CheckOut Button somewhere
  linx1x
  committed
  46ad726
- I placed the checkout button somewhere better
  linx1x
  committed
  e14ef46
Commits on Aug 19, 2019
- I changed the cart a little so it looks better
  linx1x
  committed
  022ae6f
- items
  MeriemBan
  committed
  515e0c1
- changed some css
  linx1x
  committed
  9b8f740
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  ed43683
- fixed version of cart.jsx
  linx1x
  committed
  44b8113
- button checkout on itemdetails is working now
  MeriemBan
  committed
  5a43b16
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  e97c2d7
- filter fixed
  ZeynepSarigul
  committed
  90b40db
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  25fe5aa
- filter fixed
  ZeynepSarigul
  committed
  3219215
- Added some css and a subtotal span that needs to be done
  linx1x
  committed
  d29303b
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  c4c4116
- testing loggedIn
  MeriemBan
  committed
  5d9dd69
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  cb6eee6
- after logout cart is cleared
  MeriemBan
  committed
  874e5ff
- reviews updated
  ZeynepSarigul
  committed
  ac0bac3
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  b9c3022
- server changed
  MeriemBan
  committed
  711c591
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  13158d0
- review
  MeriemBan
  committed
  9ca3e52
- review tests
  MeriemBan
  committed
  1f2cbc7
- Changed the stripe button to a custom one
  linx1x
  committed
  9f57f44
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  12db3bf
- Reviews are working
  ZeynepSarigul
  committed
  db0564c
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  540ee2f
- sub total wip
  MeriemBan
  committed
  99bba26
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  5d7f370
- subtotal and total in cart
  MeriemBan
  committed
  f3fd713
- change the stripe button
  linx1x
  committed
  b6066d3
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  880836e
- testing cart
  MeriemBan
  committed
  a292bdd
- testing cart
  MeriemBan
  committed
  8f74a60
- cart quantity and remove fixed
  MeriemBan
  committed
  4fe525a
- Changed the payment layout
  linx1x
  committed
  bd74432
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  4b49804
- now search item placeholder is hidden
  MeriemBan
  committed
  198cfdd
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  c01eedf
- Did some details in cart.jsx and cart.css
  linx1x
  committed
  af6d139
Commits on Aug 20, 2019
- reviews formatted
  MeriemBan
  committed
  0507282
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  aa64e4f
- reviews formatted
  MeriemBan
  committed
  b47a366
- pagination started
  MeriemBan
  committed
  8dff1ee
- did more changes to the cart.jsx and cart.css
  linx1x
  committed
  fec8b4b
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  1b0c8eb
- added some effect on payment button
  linx1x
  committed
  8d8d928
- new item-pics added
  ZeynepSarigul
  committed
  f79ce18
- changed item details page
  ZeynepSarigul
  committed
  c44b5f6
- pagination done
  MeriemBan
  committed
  75a39f0
- cleanup in the code
  MeriemBan
  committed
  5bcaa15
- comments removed
  MeriemBan
  committed
  62233c8
- fixed the checkou and the shopping bag
  linx1x
  committed
  e46664c
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  1179457
- shopping-cart icon added
  ZeynepSarigul
  committed
  5b569b3
- shopping cart icon added
  ZeynepSarigul
  committed
  767f623
- error fixed
  ZeynepSarigul
  committed
  d7d8e2d
- componentDidMount for items and cart
  MeriemBan
  committed
  3f51b44
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  0fbf651
- moved the shopping bag higher up
  linx1x
  committed
  0dd0a54
- reviews are displayed right away
  MeriemBan
  committed
  e03f5e2
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  b66d865
- removed item details button
  ZeynepSarigul
  committed
  c78e543
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  0ec42fd
- made changes in cart again..
  linx1x
  committed
  f213ded
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  124d181
- component did mount cart changed
  MeriemBan
  committed
  82790ba
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  1988629
- I changed the display of all-items so they're all siblings and position centered
  linx1x
  committed
  83314b4
- I fixed the wrapper position and the pagination is centered down now.
  linx1x
  committed
  1fad00b
- fixed for smaller screens
  linx1x
  committed
  401c782
Commits on Aug 21, 2019
- change the layout of all-items and the buttons css for the pageination
  linx1x
  committed
  8d156f0
- I changed signup and login css to black and white
  linx1x
  committed
  fda348b
- if not loggedIn redirect user to login page
  MeriemBan
  committed
  26c4067
- signup page redirect to / path after signup successful
  MeriemBan
  committed
  9a5737b
- signup update
  MeriemBan
  committed
  8e30e43
- I removed the reviews borders so that the user can write long reviews
  MeriemBan
  committed
  a4e05a2
- filters
  MeriemBan
  committed
  c58c738
- made navbar dynamic,changes backgroundcolor
  ZeynepSarigul
  committed
  68ee2aa
- navbar changes colors when scrolled down
  ZeynepSarigul
  committed
  9f77d52
- video has been fixed
  ZeynepSarigul
  committed
  94b8b73
- navbar blend
  linx1x
  committed
  b63214f
- checkout page to add shipping address
  MeriemBan
  committed
  8fa8f78
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  15a3153
- shipping details and payment done
  MeriemBan
  committed
  6993d89
- video added to the sell an item page
  ZeynepSarigul
  committed
  362b865
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  f6416ee
- changed the position of sold out
  linx1x
  committed
  544ca93
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  20de857
- signup login page background image inserted
  ZeynepSarigul
  committed
  96a0a4e
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  0e2d7ba
- pagination is back
  linx1x
  committed
  23c6e34
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  9bd6ff7
- in stock filter fixed
  MeriemBan
  committed
  2f42545
- conflicts fixed and in stock filter fixed
  MeriemBan
  committed
  48cee1d
- fixed the autocomplete in login/signup
  linx1x
  committed
  d65be91
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  2bac4ad
- Pagination is back, again
  linx1x
  committed
  7bfee88
- in stock filter fixed
  MeriemBan
  committed
  8d91965
- in stock filter fixed
  MeriemBan
  committed
  727f73c
- Items
  MeriemBan
  committed
  f466836
- pagination fix
  MeriemBan
  committed
  ec02df1
- pagination back 3rd time
  linx1x
  committed
  02ff786
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  feb75a1
- tests on checkout component
  MeriemBan
  committed
  ea0ece1
- I changed the newItems
  linx1x
  committed
  0dee0e7
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  5a51864
- items
  MeriemBan
  committed
  a756b42
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  3b6bfe6
- .. to access the css file that is in another file
  MeriemBan
  committed
  5071ec8
- I fixed the filter button
  linx1x
  committed
  df2d5b2
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  linx1x
  committed
  4fcdcc3
- item details page updated
  ZeynepSarigul
  committed
  46f4ace
- item details page updated
  ZeynepSarigul
  committed
  ff6f4c9
- item details page modified
  ZeynepSarigul
  committed
  947d02b
- Remove the border of the buttons in itemsdetails.css
  linx1x
  committed
  9bb1b60
- shipping form style change
  ZeynepSarigul
  committed
  df990ff
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  cf1bce5
Commits on Aug 22, 2019
- componentdidmount for items component
  MeriemBan
  committed
  909acbb
- changed item details page
  ZeynepSarigul
  committed
  7f8c860
- pictures updated
  ZeynepSarigul
  committed
  5f5a8a3
- uploads
  MeriemBan
  committed
  03be0e4
- review box modified
  ZeynepSarigul
  committed
  50f0a37
- Merge branch 'master' of https://github.com/MeriemBan/Alibay
  ZeynepSarigul
  committed
  bbc99fe
- itemdatails
  MeriemBan
  committed
  1ce3d2a
- Merge branch 'master' of github.com:MeriemBan/Alibay
  MeriemBan
  committed
  e22ca42
Commits on Sep 16, 2019
- Update README.md
  MeriemBan
  authored
  7dd0de6
- Update README.md
  MeriemBan
  authored
  982b2f7
- Update README.md
  MeriemBan
  authored
  cbff561
- Update README.md
  MeriemBan
  authored
  1890aa4
- Add files via upload
  MeriemBan
  authored
  5c0b4b2
- Update README.md
  MeriemBan
  authored
  e2e0d97
- Update README.md
  MeriemBan
  authored
  7e8fd41
- Update README.md
  MeriemBan
  authored
  0edb623
- Update README.md
  MeriemBan
  authored
  4ba3350
- Update README.md
  MeriemBan
  authored
  249bbc7
- Update README.md
  MeriemBan
  authored
  89788a1
- Update README.md
  MeriemBan
  authored
  a8efcde

Commits

Commits on Aug 12, 2019

Commits on Aug 13, 2019

Commits on Aug 14, 2019

Commits on Aug 15, 2019

Commits on Aug 16, 2019

Commits on Aug 17, 2019

Commits on Aug 18, 2019

Commits on Aug 19, 2019