-
Notifications
You must be signed in to change notification settings - Fork 29
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
Cones & Stones #37
Open
JohannaBN
wants to merge
266
commits into
Technigo:main
Choose a base branch
from
JohannaBN:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Cones & Stones #37
Changes from all commits
Commits
Show all changes
266 commits
Select commit
Hold shift + click to select a range
904be59
Merge branch 'main' of https://github.com/JohannaBN/cones-and-stones
ericamechler 00242e8
changed a couple of section-names and added SingleProduct-page and Ca…
ericamechler a0922a8
changed structure and put header & footer in app as sections
ericamechler a56b3e9
added routes for /, /products, /ptofuvyd/category/:category and /prod…
ericamechler a0e648a
Merge pull request #5 from JohannaBN/routes
ericamechler bb2a0d7
changed the structure a bit again, added common-folder and reusable-c…
ericamechler e990a2c
Moved middleware to check if bug with service unawailable is fixed.
JohannaBN bec6892
Merge pull request #6 from JohannaBN/error-handling
JohannaBN e9bb3e7
fixed the routes for the navlinks- they are now hard-coded based on t…
ericamechler 09490ba
Merge pull request #7 from JohannaBN/routes2
ericamechler fdbbde4
Import logo and icons to assets folder and add them to the header
FridaMari 68b98ec
Merge pull request #8 from JohannaBN/header-structure
FridaMari b8d25ff
moved assets to public-folder, because of common practice for better …
ericamechler 9228a7a
Merge pull request #9 from JohannaBN/hero-component
ericamechler 838f7f0
Apply some styling to header
FridaMari 1c67c40
Merge pull request #10 from JohannaBN/header
FridaMari 1d48b59
Add elements to single product page
FridaMari 30c4852
Made test to see if API-error is fixed. Removed middleware.
JohannaBN 2c024be
Merge pull request #11 from JohannaBN/middleware-test
JohannaBN cffc7e2
Added product fetch in AllProducts.jsx and created ProductCard compon…
JohannaBN 4937c3c
Fetch successfull and products showing in ProductCard and mapped to s…
JohannaBN bdfe7a4
added button-component and implemented in hero component, also added …
ericamechler 2a3abbf
Change h5 to p in SPP
FridaMari c1f5a46
Merge pull request #12 from JohannaBN/button-component
ericamechler c821d8e
Merge pull request #13 from JohannaBN/single-product
FridaMari 9e1a4ce
Added Link to image, text and price at AllProducts to route to SingeP…
JohannaBN 38bc1d6
Added styling.
JohannaBN 0f391d3
Merge pull request #14 from JohannaBN/all-products-fetch
JohannaBN 9467bac
Import fonts to index.html, define font styling and add css variables…
FridaMari 5037cc0
Merge pull request #15 from JohannaBN/fonts
FridaMari c8028eb
Add media queries to header so that hamburger menu disappears at larg…
FridaMari 2b64769
fixed deliverystatements and css for hero-image
ericamechler 4b250bf
Merge pull request #16 from JohannaBN/trust-indicators
ericamechler 2045ec9
category page-fetch
ericamechler 5d9dbb1
Merge pull request #17 from JohannaBN/category-page
ericamechler a79df4e
fixed so css is same for category-page as for product-list within all…
ericamechler c8a15a4
Fetch single product by id
FridaMari beb7114
Merge branch 'main' into spp-fetch
FridaMari eb58088
Fixed issue with missing key props.
JohannaBN 2c03cbc
Successfully fetch product data and display on SPP
FridaMari 0692446
Merge pull request #18 from JohannaBN/spp-fetch
FridaMari 3d5fd85
Working on issue with timeout method.
JohannaBN d71c038
Removed timeout function that didn't work as expected.
JohannaBN ca3ac0e
Merge pull request #19 from JohannaBN/refactor-fetch
JohannaBN d4a57f0
worked on category-icons and making them reusable & styled the shop b…
ericamechler 53fdf4a
Merge pull request #20 from JohannaBN/category-icons
ericamechler 3b547e5
Added slick-carousel.
JohannaBN ef0e276
fixed the category-buttons for all-products page and category-pages
ericamechler cef5a0b
Merge pull request #21 from JohannaBN/product-showcase
JohannaBN e77de7d
Merge pull request #22 from JohannaBN/category-icons2
ericamechler 518ac22
removed styling from home-component, then the react-scroll works
ericamechler 35b87f7
Merge pull request #23 from JohannaBN/test
ericamechler b2e3f28
fixed the h1 for mobile like we talked about, also fixed the logos so…
ericamechler 6a0ddc7
Merge pull request #24 from JohannaBN/small-fixes
ericamechler 3e2c64c
Refactor DeliveryStatements compontent to get background color by props
FridaMari fcaea36
Refactor DeliveryStatements component to get fontsize by props
FridaMari 2f10a55
Style buttons on SPP
FridaMari 728d683
Merge branch 'main' into spp-css
FridaMari d7d8708
Merge pull request #25 from JohannaBN/spp-css
FridaMari 0379c49
fixed bug within delivery-statment code. A small change from prop say…
ericamechler ff63e25
Replaced image that didn't match in the carousel.
JohannaBN 0097f32
Move button css from index.css to Button.css
FridaMari 675e4d6
Added some settings for slider.
JohannaBN 64de3d0
Changed values for media queries.
JohannaBN 575c311
Updated images with alt-tags with product name props.
JohannaBN ddc1f97
added banner-image to component and styled it a bit- will probably be…
ericamechler 9334fd7
Merge pull request #26 from JohannaBN/banner
ericamechler 4a9f171
Refactored return and replaces a href to use nav link.
JohannaBN 65a3d0f
Merge pull request #27 from JohannaBN/showcase-improvments
JohannaBN 355386a
Change font style on buttons and icons
FridaMari a7c5379
Merge pull request #28 from JohannaBN/button-css
FridaMari 7ef582b
added main to structure (matching header & footer) & switching names …
ericamechler f22f22c
Co-authored-by: Frida Svensson <[email protected]>
ericamechler c69a154
Merge pull request #29 from JohannaBN/footer
ericamechler 46144ad
Small changes since last commit
FridaMari 751cc08
Merge branch 'main' into button-css
FridaMari 33dd7ad
Merge pull request #30 from JohannaBN/button-css
FridaMari 6e74e01
Put Image component togheter with its css file inside a folder
FridaMari c071dbc
Refacored code to include image component instead of img.
JohannaBN b6ef477
Change paths on some imports
FridaMari 2d9315b
Changed path to new path for Image import.
JohannaBN c5a6b4e
Merge pull request #31 from JohannaBN/image-component
FridaMari e75417b
Merge pull request #32 from JohannaBN/add-image-component
JohannaBN d49d5b5
Refactor code on image component
FridaMari a355861
removed toUppercase in code since it is in css
ericamechler 711f059
Merge branch 'main' of https://github.com/JohannaBN/cones-and-stones
ericamechler ad16dc9
Changed name on component, changed imports and added image component …
JohannaBN c766f5d
Added grid and media queries on new-arrivals-container.
JohannaBN b14edec
Merge pull request #33 from JohannaBN/new-arrivals
JohannaBN cddbf29
Added button.
JohannaBN 8959ef6
fixing structure with sections where there should be sections. Fixing…
ericamechler 6865cdf
Merge pull request #34 from JohannaBN/smallcss-fix
ericamechler d4f7465
versaler i header
ericamechler 62a07fa
changed so hamburger-menu is for mobile & desktop
ericamechler 6b868c2
created footer with toggle-function
ericamechler d1fe3bd
Merge pull request #35 from JohannaBN/footer2
ericamechler f7cadb3
imported footer-logo to footer
ericamechler 6ba6e04
Added button to new arrivals section. Also added styling and position…
JohannaBN 8afd9db
Merge pull request #36 from JohannaBN/new-arrivals-button
JohannaBN a0d1867
Change category links in nav to h5
FridaMari 06556c0
Removed unused icons and added styling for mobile and tablet.
JohannaBN 79adac6
Update fontsize on mobile screens
FridaMari 05cd54f
Refactored code to use flex instead of grid. Added order property to …
JohannaBN e8f831b
Remove larger fontsize on category icons on bigger screens
FridaMari d3017c6
Merge pull request #37 from JohannaBN/header-styling
JohannaBN 4a0b757
Merge branch 'main' into font-fix
FridaMari c68e0f7
Merge pull request #38 from JohannaBN/font-fix
FridaMari 4fe24e8
Replaced cart icon with new icon and adjusted styling to make it look…
JohannaBN f8b0f63
Merge pull request #39 from JohannaBN/cart-icon-update
JohannaBN ef6fc97
Added hamburger menu with sliding function.
JohannaBN 32e2a24
Added custom icon and styling to hamburger menu icon.
JohannaBN 69b2966
Added positioning for mobile and tablet and display: none for desktop.
JohannaBN e4402c4
Added correct headings and links.
JohannaBN d828f59
Removed unused code.
JohannaBN 2031662
Made som minor changes in styling.
JohannaBN 6002e0c
Merge branch 'main' into hamburger-menu
JohannaBN c433493
Merge pull request #40 from JohannaBN/hamburger-menu
JohannaBN bfe9389
worked on footer-styling and changed padding for several elements
ericamechler 7c3fd29
Merge pull request #41 from JohannaBN/footer3
ericamechler c123ed8
Fixed issue with slide menu opening when clicking anywhere on the site.
JohannaBN f88c9c7
Merge pull request #42 from JohannaBN/menu-slide-fix
JohannaBN 4cc3c20
Added custom cross image in menu slider.
JohannaBN a7f33fb
Created function to use isOpen state to show menu icon if menu is clo…
JohannaBN 9bf52e1
Fixed issue with cross icon not being removed on desktop by adding di…
JohannaBN 490d700
fixed footer-bug and styled large screen
ericamechler 17230b4
added som padding-right to footer-logo
ericamechler d3d4a5a
fixed function so that whenever a link in the footer is clicked, the …
ericamechler 9f8dcfa
Merge pull request #43 from JohannaBN/footer-bugs
ericamechler 4b862f1
Updated styling in header.
JohannaBN c4fcc07
Updated positioning on cross icon.
JohannaBN 076affb
Merge pull request #44 from JohannaBN/slide-menu-closing
JohannaBN 438f644
Tryout font-size 10 in SPP
FridaMari 960f74d
Change back fonts on SPP and update class in index.css for extra smal…
FridaMari 8d22f01
Add hover and disabled states to buttons
FridaMari cce0bc9
Add hover effects to category icons and underline offsat to links in …
FridaMari dbb8844
Add hover state to size buttons
FridaMari af1703b
Add scaling as hover on product cards and give all hover effects a tr…
FridaMari 6b109bc
Add media queries to SPP and add toggle to details text
FridaMari 4de0dbb
Make alt-tag dynamic on product image in SPP
FridaMari 1aa4b40
Add ability to select size on SPP
FridaMari dac625d
Change label on add to cart button when no size is selected
FridaMari 58eb080
added UseCartStore and filled it with states for cart, addToCart, rem…
ericamechler eebfe5f
added addToCart to singleproduct-page and a handle addToCart-function
ericamechler 1619548
filled cart.jsx with cart items & details regarding them + quantity …
ericamechler b69f480
added handleIncrease, handleDecrease, handleRemove etc & the icons
ericamechler 88a6c4f
filled cart with components & got the handleIncrease etc working
ericamechler edf0e29
Merge pull request #45 from JohannaBN/global-state
ericamechler c0842b6
changed filename of UseCartStore to useCartStore and imported them again
ericamechler 70cfbf6
tried fixing useCartStore
ericamechler 740bf3c
created a new Store called useBagStore to try solve issues with deploy
ericamechler 29ce34b
got the clear-cart-function working and added a button with a new var…
ericamechler 289f59e
Configured backend server-file and added endpoint for stripe checkout…
JohannaBN 1787ea4
implemented localStorage in useBagStore
ericamechler 9c4e9e8
Merge pull request #46 from JohannaBN/cart-fixes
ericamechler a6f7143
Added .env-file.
JohannaBN 13b8b12
Updated frontend button code to handle checkout request.
JohannaBN b4388da
Updated localhost url to deployed urls.
JohannaBN bfdadc5
Merge branch 'main' into checkout
JohannaBN f5f5a77
Merge pull request #47 from JohannaBN/checkout
JohannaBN 9f3180f
Updated env.
JohannaBN f43c3e1
Merge pull request #48 from JohannaBN/env-update
JohannaBN 4f40c5f
Corrected Stripe post url.
JohannaBN 9a1e9ba
Merge pull request #49 from JohannaBN/stripe-post
JohannaBN 60bbaa4
Create Loader component
FridaMari e4bc18a
Display Loader when loading state is set to true
FridaMari e32d76e
Merge pull request #50 from JohannaBN/loader
FridaMari cb8f643
Updated process.env for Google cloud.
JohannaBN 6176c82
Updated process.env for netlify deploy.
JohannaBN 34825e3
Merge pull request #51 from JohannaBN/env-import
JohannaBN 6b675dc
Updated URLs.
JohannaBN 53d991b
Fixed typo in process.env.
JohannaBN 2553f71
Merge pull request #52 from JohannaBN/meta.env2
JohannaBN 4e80645
Make not found page work as expected
FridaMari caad520
Refactor code so that when error occurs, redirect to Not found page
FridaMari a5b893f
Add styling to not found page
FridaMari a57f836
Change name on hero-button to shop-button
FridaMari 7c44a39
Style loader
FridaMari 74ea31d
Checkout fixed.
JohannaBN aa61fcd
Merge pull request #53 from JohannaBN/stripe-fix
JohannaBN 9a242ed
Merge branch 'main' into notfound-page
FridaMari ef58ad2
Merge pull request #54 from JohannaBN/notfound-page
FridaMari 04c2baf
Change name on shop-button also in hover state, and add clear-cart bu…
FridaMari 0cc45d5
Add some padding to cart-css
FridaMari 3e2af41
Removed products details from checkout.
JohannaBN 7205c2e
Added more payment options in checkout.
JohannaBN 4f5628f
Merge pull request #55 from JohannaBN/checkout-details
JohannaBN 1b25ec0
Give logo a bit more padding on desktop view. Center cart-count insid…
FridaMari 330c8e0
Created file and stylesheet for order comfirmation page. And created …
JohannaBN 7219b6e
Change styling in slider-menu from em to px
FridaMari 602f360
Merge pull request #56 from JohannaBN/styling-header
FridaMari 211c62d
Added content and styling for order confirmation page.
JohannaBN 51b1ba7
Merge pull request #57 from JohannaBN/orderconfirmation
JohannaBN f0355b5
Put h1 in hero-text wrapper and update some styling so that it looks …
FridaMari 2560845
Updated cancel_url to redirect to /cart for better UI.
JohannaBN 6303776
Merge pull request #58 from JohannaBN/cancel
JohannaBN e1a9006
Merge pull request #59 from JohannaBN/styling-hero
FridaMari 01684f0
Updated styling for mobile. Added margins and gap.
JohannaBN 0a3f51b
Updated styling for tablet - margin and padding.
JohannaBN 984eae6
Create separate elements in banner instead of having a fixed image
FridaMari 7d4669c
Updated styling for desktop - added width 100% on product-card.
JohannaBN ed4e225
Removed unused code.
JohannaBN 49db905
Updated hover effects for tablet and mobile.
JohannaBN 492417f
fixed cart-design
ericamechler 1a78bc4
Merge pull request #60 from JohannaBN/cart-css
ericamechler 088cb78
Updated classnames for category page to use styling for all-products …
JohannaBN d68869a
Merge pull request #61 from JohannaBN/all-products-styling
JohannaBN f06af60
Updated title.
JohannaBN a0be21f
Added logo as favicon.
JohannaBN 4cdce61
Cleaned up code a bit.
JohannaBN 8131d7c
Removed unused icons.
JohannaBN a84bfb8
Merge pull request #62 from JohannaBN/minor-updates
JohannaBN 0c14496
Fix banner layout for alla screen sizes
FridaMari 5075c8a
Create bubble-row
FridaMari 4a19e44
Merge pull request #63 from JohannaBN/banner-fix
FridaMari 9d8468f
Change path on favicon in html
FridaMari 2a511d4
Fix margins around banner and remove border bottom on desktop footer
FridaMari 02575bb
Merge pull request #64 from JohannaBN/banner-margin
FridaMari c963765
Addded media queries for extra large screens. Added maxwidth and marg…
JohannaBN b89aac3
fixed empty-cart look
ericamechler 35d2181
removed extra text in footer that talked about an about-page
ericamechler 89052f1
removed border-bottom & margin-bottom on 1024 screen in footer
ericamechler deeab7f
Updated gap.
JohannaBN 3417dc7
Added margin and media queries for extra large screens.
JohannaBN 0b42d83
Merge branch 'main' into margin-correction
JohannaBN f5fc8c4
Merge pull request #65 from JohannaBN/margin-correction
JohannaBN 7ff2322
Fixed bug with text not center on very small screens on size buttons.
JohannaBN 7d5a0b5
Merge pull request #66 from JohannaBN/bug/size-button-text
JohannaBN f08edd3
fixed so cart clears when confirmation-page is reached
ericamechler 0181046
fixed confirmation-message
ericamechler a13c6d4
Merge branch 'main' into cart-bugs
ericamechler 9b9ced0
Merge pull request #67 from JohannaBN/cart-bugs
ericamechler a5b780d
Remove max-width from toggle component and place it on the footer ins…
FridaMari a07e983
Merge pull request #68 from JohannaBN/details-text
FridaMari 0f242df
Updated colours on p for better accessibility.
JohannaBN 839ec6f
Updated for better accessibility.
JohannaBN 021cfe2
Give variable colors better contrast
FridaMari e2a2280
Second try to update colors
FridaMari 6436bef
Merge pull request #69 from JohannaBN/color-fix
FridaMari 786a03d
removed classname hero-h4 which was not used
ericamechler 07b486b
Merge pull request #70 from JohannaBN/heading-structure
ericamechler 4c7b398
Change color on banner text
FridaMari f8fcce9
Removed unused ul.
JohannaBN bc2a55a
removed category/:id because we don't use it
ericamechler c85e86e
Merge pull request #71 from JohannaBN/clean-up
ericamechler 0f6c10c
Made slide arrow buttons bigger for better accessibility.
JohannaBN 7899ae4
Changed arrow size in slider for better accessibility.
JohannaBN d5cb57c
Merge pull request #72 from JohannaBN/slide-arrows
JohannaBN d4c4f43
Make arrow in productshowcase bigger for accessibility reasons
FridaMari 767b460
updated readme
ericamechler 903faea
updated readme again
ericamechler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,43 @@ | ||
# Final Project | ||
# CONES & STONES - e-commerce store | ||
|
||
Replace this readme with your own information about your project. | ||
## Table of Contents | ||
|
||
Start by briefly describing the assignment in a sentence or two. Keep it short and to the point. | ||
- [Project Description](#project-description) | ||
- [Technologies](#technologies) | ||
- [How to Install & Run the Project](#how-to-install--run-the-project) | ||
- [How to Use the Project](#how-to-use-the-project) | ||
- [Future ToDo](#future-todo) | ||
- [Authors](#authors) | ||
- [See it live](#see-it-live) | ||
|
||
## The problem | ||
## Project Description: | ||
|
||
Describe how you approached to problem, and what tools and techniques you used to solve it. How did you plan? What technologies did you use? If you had more time, what would be next? | ||
We have created a kids' clothes e-commerce store with a clean landing page that showcases products from a database, with detailed product views and a functional cart/checkout system integrated with Stripe for test payments. | ||
|
||
## View it live | ||
### Technologies | ||
|
||
Every project should be deployed somewhere. Be sure to include the link to the deployed project so that the viewer can click around and see what it's all about. | ||
The store is developed with React JS & Vite for us to achieve a fast & optimized web app. For building robust APIs we used Express. The database is built using MongoDB for scalable and flexible data storage. Stripe Test API is integrated for secure and scalable payment processing, which was a bit of a challenge for us, since it was our first time implementing a third party solution. Lastly, for image storage, we used cloudinary. | ||
|
||
## How to Install & Run the Project | ||
|
||
1. Install the required dependencies using `npm install`. | ||
2. Start the development server using `npm run dev`. | ||
|
||
## How to Use the Project | ||
|
||
To explore our kids' clothes e-commerce store, navigate through the product categories using the menu or click on all products in hero. Add items to your cart by clicking "Add to Cart" on the product page, then proceed to checkout where you can simulate a payment using Stripe's test mode. | ||
|
||
## Future ToDo | ||
|
||
To develop the app further, we would like to add user registration/login, enabeling adding products to favorites, more inspirational pages as well as filtering- and sorting possibilities. | ||
|
||
## Authors | ||
|
||
- [Erica Mechler](https://github.com/ericamechler)- [LinkedIn](https://www.linkedin.com/in/erica-mechler-a39b73a8/) | ||
- [Frida Svensson](https://github.com/FridaMari)- [LinkedIn](https://www.linkedin.com/in/frida-svensson-649019295/) | ||
- [Johanna Billingskog Nyberg](https://github.com/JohannaBN)- [LinkedIn](https://www.linkedin.com/in/johanna-billingskog-nyberg-b28b4738/) | ||
|
||
## See it live | ||
|
||
[Backend](https://cones-and-stones-ppnudpghiq-lz.a.run.app/) | ||
[Frontend](https://cones-and-stones.netlify.app/) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
VITE_STRIPE_SECRET_KEY=sk_test_xxx | ||
VITE_CLIENT_URL=http://localhost:8080 | ||
MONGO_URL=mongodb://localhost/Cones&Stones |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
VITE_STRIPE_PUBLISHABLE_KEY=pk_test_xxx | ||
VITE_BACKEND_URL=http://localhost:8080 |
This file was deleted.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
very good you added such file! 👏