Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Cones & Stones #37

Open
wants to merge 266 commits into
base: main
Choose a base branch
from
Open

Cones & Stones #37

wants to merge 266 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 30, 2024

  1. Merge branch 'main' of https://github.com/JohannaBN/cones-and-stones

    @ericamechler
    ericamechler committed May 30, 2024
    Configuration menu
    Copy the full SHA
    904be59 View commit details
    Browse the repository at this point in the history

  2. changed a couple of section-names and added SingleProduct-page and Ca… 

    …tegory-page
    @ericamechler
    ericamechler committed May 30, 2024
    Configuration menu
    Copy the full SHA
    00242e8 View commit details
    Browse the repository at this point in the history

  3. changed structure and put header & footer in app as sections

    @ericamechler
    ericamechler committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a0922a8 View commit details
    Browse the repository at this point in the history

  4. added routes for /, /products, /ptofuvyd/category/:category and /prod… 

    …ucts/:productId
    @ericamechler
    ericamechler committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a56b3e9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #5 from JohannaBN/routes 

    added routes for /, /products, /ptofuvyd/category/:category and /prod…
    @ericamechler
    ericamechler authored May 30, 2024
    Configuration menu
    Copy the full SHA
    a0e648a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. changed the structure a bit again, added common-folder and reusable-c… 

    …omponents etc
    @ericamechler
    ericamechler committed May 31, 2024
    Configuration menu
    Copy the full SHA
    bb2a0d7 View commit details
    Browse the repository at this point in the history

  2. Moved middleware to check if bug with service unawailable is fixed.

    @JohannaBN
    JohannaBN committed May 31, 2024
    Configuration menu
    Copy the full SHA
    e990a2c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from JohannaBN/error-handling 

    Moved middleware to check if bug with service unawailable is fixed.
    @JohannaBN
    JohannaBN authored May 31, 2024
    Configuration menu
    Copy the full SHA
    bec6892 View commit details
    Browse the repository at this point in the history

  4. fixed the routes for the navlinks- they are now hard-coded based on t… 

    …he categories we have now
    @ericamechler
    ericamechler committed May 31, 2024
    Configuration menu
    Copy the full SHA
    e9bb3e7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7 from JohannaBN/routes2 

    fixed the routes for the navlinks- they are now hard-coded based on t…
    @ericamechler
    ericamechler authored May 31, 2024
    Configuration menu
    Copy the full SHA
    09490ba View commit details
    Browse the repository at this point in the history

  6. Import logo and icons to assets folder and add them to the header

    @FridaMari
    FridaMari committed May 31, 2024
    Configuration menu
    Copy the full SHA
    fdbbde4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #8 from JohannaBN/header-structure 

    Import logo and icons to assets folder and add them to the header
    @FridaMari
    FridaMari authored May 31, 2024
    Configuration menu
    Copy the full SHA
    68b98ec View commit details
    Browse the repository at this point in the history

  8. moved assets to public-folder, because of common practice for better … 

    …performance etc. Created image-component that I then reused for both the icons in the header and also in the hero-image. Fixed so that the link to all products work and styled the hero a little
    @ericamechler
    ericamechler committed May 31, 2024
    Configuration menu
    Copy the full SHA
    b8d25ff View commit details
    Browse the repository at this point in the history

  9. Merge pull request #9 from JohannaBN/hero-component 

    moved assets to public-folder, because of common practice for better …
    @ericamechler
    ericamechler authored May 31, 2024
    Configuration menu
    Copy the full SHA
    9228a7a View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Apply some styling to header

    @FridaMari
    FridaMari committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    838f7f0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from JohannaBN/header 

    Apply some styling to header
    @FridaMari
    FridaMari authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    1c67c40 View commit details
    Browse the repository at this point in the history

  3. Add elements to single product page

    @FridaMari
    FridaMari committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    1d48b59 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Made test to see if API-error is fixed. Removed middleware.

    @JohannaBN
    JohannaBN committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    30c4852 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from JohannaBN/middleware-test 

    Made test to see if API-error is fixed. Removed middleware.
    @JohannaBN
    JohannaBN authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2c024be View commit details
    Browse the repository at this point in the history

  3. Added product fetch in AllProducts.jsx and created ProductCard compon… 

    …ent.
    @JohannaBN
    JohannaBN committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    cffc7e2 View commit details
    Browse the repository at this point in the history

  4. Fetch successfull and products showing in ProductCard and mapped to s… 

    …how in AllProducts.
    @JohannaBN
    JohannaBN committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4937c3c View commit details
    Browse the repository at this point in the history

  5. added button-component and implemented in hero component, also added … 

    …some styling to hero-component
    @ericamechler
    ericamechler committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    bdfe7a4 View commit details
    Browse the repository at this point in the history

  6. Change h5 to p in SPP

    @FridaMari
    FridaMari committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2a3abbf View commit details
    Browse the repository at this point in the history

  7. Merge pull request #12 from JohannaBN/button-component 

    added button-component and implemented in hero component, also added …
    @ericamechler
    ericamechler authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c1f5a46 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #13 from JohannaBN/single-product 

    Single product
    @FridaMari
    FridaMari authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c821d8e View commit details
    Browse the repository at this point in the history

  9. Added Link to image, text and price at AllProducts to route to SingeP… 

    …roduct.
    @JohannaBN
    JohannaBN committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9e1a4ce View commit details
    Browse the repository at this point in the history

  10. Added styling.

    @JohannaBN
    JohannaBN committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    38bc1d6 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #14 from JohannaBN/all-products-fetch 

    All products fetch
    @JohannaBN
    JohannaBN authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    0f391d3 View commit details
    Browse the repository at this point in the history

  12. Import fonts to index.html, define font styling and add css variables… 

    … to index.css
    @FridaMari
    FridaMari committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9467bac View commit details
    Browse the repository at this point in the history

  13. Merge pull request #15 from JohannaBN/fonts 

    Import fonts to index.html, define font styling and add css variables
    @FridaMari
    FridaMari authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    5037cc0 View commit details
    Browse the repository at this point in the history

  14. Add media queries to header so that hamburger menu disappears at larg… 

    …er screens, and categories appear instead.
    @FridaMari
    FridaMari committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c8028eb View commit details
    Browse the repository at this point in the history

  15. fixed deliverystatements and css for hero-image

    @ericamechler
    ericamechler committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2b64769 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #16 from JohannaBN/trust-indicators 

    fixed deliverystatements and css for hero-image
    @ericamechler
    ericamechler authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4b250bf View commit details
    Browse the repository at this point in the history

  17. category page-fetch

    @ericamechler
    ericamechler committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2045ec9 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #17 from JohannaBN/category-page 

    category page-fetch
    @ericamechler
    ericamechler authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    5d9dbb1 View commit details
    Browse the repository at this point in the history

  19. fixed so css is same for category-page as for product-list within all… 

    …products.css
    @ericamechler
    ericamechler committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    a79df4e View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Fetch single product by id

    @FridaMari
    FridaMari committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    c8a15a4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into spp-fetch

    @FridaMari
    FridaMari committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    beb7114 View commit details
    Browse the repository at this point in the history

  3. Fixed issue with missing key props.

    @JohannaBN
    JohannaBN committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    eb58088 View commit details
    Browse the repository at this point in the history

  4. Successfully fetch product data and display on SPP

    @FridaMari
    FridaMari committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2c03cbc View commit details
    Browse the repository at this point in the history

  5. Merge pull request #18 from JohannaBN/spp-fetch 

    Spp fetch
    @FridaMari
    FridaMari authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    0692446 View commit details
    Browse the repository at this point in the history

  6. Working on issue with timeout method.

    @JohannaBN
    JohannaBN committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3d5fd85 View commit details
    Browse the repository at this point in the history

  7. Removed timeout function that didn't work as expected.

    @JohannaBN
    JohannaBN committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    d71c038 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #19 from JohannaBN/refactor-fetch 

    Refactor fetch
    @JohannaBN
    JohannaBN authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    ca3ac0e View commit details
    Browse the repository at this point in the history

  9. worked on category-icons and making them reusable & styled the shop b… 

    …y category-segment as well as some more styling for the delivery-statements
    @ericamechler
    ericamechler committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    d4a57f0 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #20 from JohannaBN/category-icons 

    worked on category-icons and making them reusable & styled the shop b…
    @ericamechler
    ericamechler authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    53fdf4a View commit details
    Browse the repository at this point in the history

  11. Added slick-carousel.

    @JohannaBN
    JohannaBN committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3b547e5 View commit details
    Browse the repository at this point in the history

  12. fixed the category-buttons for all-products page and category-pages

    @ericamechler
    ericamechler committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    ef0e276 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #21 from JohannaBN/product-showcase 

    Added slick-carousel.
    @JohannaBN
    JohannaBN authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    cef5a0b View commit details
    Browse the repository at this point in the history

  14. Merge pull request #22 from JohannaBN/category-icons2 

    fixed the category-buttons for all-products page and category-pages
    @ericamechler
    ericamechler authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    e77de7d View commit details
    Browse the repository at this point in the history

  15. removed styling from home-component, then the react-scroll works

    @ericamechler
    ericamechler committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    518ac22 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #23 from JohannaBN/test 

    removed styling from home-component, then the react-scroll works
    @ericamechler
    ericamechler authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    35b87f7 View commit details
    Browse the repository at this point in the history

  17. fixed the h1 for mobile like we talked about, also fixed the logos so… 

    … they can be seen in mobile
    @ericamechler
    ericamechler committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    b2e3f28 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #24 from JohannaBN/small-fixes 

    fixed the h1 for mobile like we talked about, also fixed the logos so…
    @ericamechler
    ericamechler authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    6a0ddc7 View commit details
    Browse the repository at this point in the history

  19. Refactor DeliveryStatements compontent to get background color by props

    @FridaMari
    FridaMari committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3e2c64c View commit details
    Browse the repository at this point in the history

  20. Refactor DeliveryStatements component to get fontsize by props

    @FridaMari
    FridaMari committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    fcaea36 View commit details
    Browse the repository at this point in the history

  21. Style buttons on SPP

    @FridaMari
    FridaMari committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2f10a55 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'main' into spp-css

    @FridaMari
    FridaMari authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    728d683 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #25 from JohannaBN/spp-css 

    Spp css
    @FridaMari
    FridaMari authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    d7d8708 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. fixed bug within delivery-statment code. A small change from prop say… 

    …ing deliverystatement instead of deliverystatements so it matches the code
    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0379c49 View commit details
    Browse the repository at this point in the history

  2. Replaced image that didn't match in the carousel.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ff63e25 View commit details
    Browse the repository at this point in the history

  3. Move button css from index.css to Button.css

    @FridaMari
    FridaMari committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0097f32 View commit details
    Browse the repository at this point in the history

  4. Added some settings for slider.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    675e4d6 View commit details
    Browse the repository at this point in the history

  5. Changed values for media queries.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    64de3d0 View commit details
    Browse the repository at this point in the history

  6. Updated images with alt-tags with product name props.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    575c311 View commit details
    Browse the repository at this point in the history

  7. added banner-image to component and styled it a bit- will probably be… 

    … changed later
    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ddc1f97 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #26 from JohannaBN/banner 

    added banner-image to component and styled it a bit- will probably be…
    @ericamechler
    ericamechler authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9334fd7 View commit details
    Browse the repository at this point in the history

  9. Refactored return and replaces a href to use nav link.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    4a9f171 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #27 from JohannaBN/showcase-improvments 

    Showcase improvments
    @JohannaBN
    JohannaBN authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    65a3d0f View commit details
    Browse the repository at this point in the history

  11. Change font style on buttons and icons

    @FridaMari
    FridaMari committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    355386a View commit details
    Browse the repository at this point in the history

  12. Merge pull request #28 from JohannaBN/button-css 

    Button css
    @FridaMari
    FridaMari authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a7c5379 View commit details
    Browse the repository at this point in the history

  13. added main to structure (matching header & footer) & switching names … 

    …to ex. hero-container to keep consistency
    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    7ef582b View commit details
    Browse the repository at this point in the history

  14. Co-authored-by: Frida Svensson <[email protected]>

    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    f22f22c View commit details
    Browse the repository at this point in the history

  15. Merge pull request #29 from JohannaBN/footer 

    Footer
    @ericamechler
    ericamechler authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    c69a154 View commit details
    Browse the repository at this point in the history

  16. Small changes since last commit

    @FridaMari
    FridaMari committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    46144ad View commit details
    Browse the repository at this point in the history

  17. Merge branch 'main' into button-css

    @FridaMari
    FridaMari authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    751cc08 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #30 from JohannaBN/button-css 

    Small changes since last commit
    @FridaMari
    FridaMari authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    33dd7ad View commit details
    Browse the repository at this point in the history

  19. Put Image component togheter with its css file inside a folder

    @FridaMari
    FridaMari committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    6e74e01 View commit details
    Browse the repository at this point in the history

  20. Refacored code to include image component instead of img.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    c071dbc View commit details
    Browse the repository at this point in the history

  21. Change paths on some imports

    @FridaMari
    FridaMari committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    b6ef477 View commit details
    Browse the repository at this point in the history

  22. Changed path to new path for Image import.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2d9315b View commit details
    Browse the repository at this point in the history

  23. Merge pull request #31 from JohannaBN/image-component 

    Change paths on some imports
    @FridaMari
    FridaMari authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    c5a6b4e View commit details
    Browse the repository at this point in the history

  24. Merge pull request #32 from JohannaBN/add-image-component 

    Add image component
    @JohannaBN
    JohannaBN authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    e75417b View commit details
    Browse the repository at this point in the history

  25. Refactor code on image component

    @FridaMari
    FridaMari committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    d49d5b5 View commit details
    Browse the repository at this point in the history

  26. removed toUppercase in code since it is in css

    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a355861 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'main' of https://github.com/JohannaBN/cones-and-stones

    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    711f059 View commit details
    Browse the repository at this point in the history

  28. Changed name on component, changed imports and added image component … 

    …to NewArrivalsSection.
    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ad16dc9 View commit details
    Browse the repository at this point in the history

  29. Added grid and media queries on new-arrivals-container.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    c766f5d View commit details
    Browse the repository at this point in the history

  30. Merge pull request #33 from JohannaBN/new-arrivals 

    New arrivals
    @JohannaBN
    JohannaBN authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    b14edec View commit details
    Browse the repository at this point in the history

  31. Added button.

    @JohannaBN
    JohannaBN committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    cddbf29 View commit details
    Browse the repository at this point in the history

  32. fixing structure with sections where there should be sections. Fixing… 

    … bug for all icons, cleaning up code and introducing a variant for the deliverystatements. also uppercase for deliverystatements-text etc
    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    8959ef6 View commit details
    Browse the repository at this point in the history

  33. Merge pull request #34 from JohannaBN/smallcss-fix 

    fixing structure with sections where there should be sections. Fixing…
    @ericamechler
    ericamechler authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    6865cdf View commit details
    Browse the repository at this point in the history

  34. versaler i header

    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    d4f7465 View commit details
    Browse the repository at this point in the history

  35. changed so hamburger-menu is for mobile & desktop

    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    62a07fa View commit details
    Browse the repository at this point in the history

  36. created footer with toggle-function

    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    6b868c2 View commit details
    Browse the repository at this point in the history

  37. Merge pull request #35 from JohannaBN/footer2 

    created footer with toggle-function
    @ericamechler
    ericamechler authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    d1fe3bd View commit details
    Browse the repository at this point in the history

  38. imported footer-logo to footer

    @ericamechler
    ericamechler committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    f7cadb3 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Added button to new arrivals section. Also added styling and position… 

    …ing to place the button on the images.
    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    6ba6e04 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #36 from JohannaBN/new-arrivals-button 

    New arrivals button
    @JohannaBN
    JohannaBN authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    8afd9db View commit details
    Browse the repository at this point in the history

  3. Change category links in nav to h5

    @FridaMari
    FridaMari committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    a0d1867 View commit details
    Browse the repository at this point in the history

  4. Removed unused icons and added styling for mobile and tablet.

    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    06556c0 View commit details
    Browse the repository at this point in the history

  5. Update fontsize on mobile screens

    @FridaMari
    FridaMari committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    79adac6 View commit details
    Browse the repository at this point in the history

  6. Refactored code to use flex instead of grid. Added order property to … 

    …swith position on logo and nav-categories on desktop. Also added margins for better design.
    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    05cd54f View commit details
    Browse the repository at this point in the history

  7. Remove larger fontsize on category icons on bigger screens

    @FridaMari
    FridaMari committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e8f831b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #37 from JohannaBN/header-styling 

    Header styling
    @JohannaBN
    JohannaBN authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    d3017c6 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into font-fix

    @FridaMari
    FridaMari authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    4a0b757 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #38 from JohannaBN/font-fix 

    Font fix
    @FridaMari
    FridaMari authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c68e0f7 View commit details
    Browse the repository at this point in the history

  11. Replaced cart icon with new icon and adjusted styling to make it look… 

    … good.
    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    4fe24e8 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #39 from JohannaBN/cart-icon-update 

    Replaced cart icon with new icon and adjusted styling to make it look…
    @JohannaBN
    JohannaBN authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    f8b0f63 View commit details
    Browse the repository at this point in the history

  13. Added hamburger menu with sliding function.

    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    ef6fc97 View commit details
    Browse the repository at this point in the history

  14. Added custom icon and styling to hamburger menu icon.

    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    32e2a24 View commit details
    Browse the repository at this point in the history

  15. Added positioning for mobile and tablet and display: none for desktop.

    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    69b2966 View commit details
    Browse the repository at this point in the history

  16. Added correct headings and links.

    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e4402c4 View commit details
    Browse the repository at this point in the history

  17. Removed unused code.

    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    d828f59 View commit details
    Browse the repository at this point in the history

  18. Made som minor changes in styling.

    @JohannaBN
    JohannaBN committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    2031662 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'main' into hamburger-menu

    @JohannaBN
    JohannaBN authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    6002e0c View commit details
    Browse the repository at this point in the history

  20. Merge pull request #40 from JohannaBN/hamburger-menu 

    Hamburger menu
    @JohannaBN
    JohannaBN authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c433493 View commit details
    Browse the repository at this point in the history

  21. worked on footer-styling and changed padding for several elements

    @ericamechler
    ericamechler committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    bfe9389 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #41 from JohannaBN/footer3 

    worked on footer-styling and changed padding for several elements
    @ericamechler
    ericamechler authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    7c3fd29 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Fixed issue with slide menu opening when clicking anywhere on the site.

    @JohannaBN
    JohannaBN committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    c123ed8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #42 from JohannaBN/menu-slide-fix 

    Fixed issue with slide menu opening when clicking anywhere on the site.
    @JohannaBN
    JohannaBN authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    f88c9c7 View commit details
    Browse the repository at this point in the history

  3. Added custom cross image in menu slider.

    @JohannaBN
    JohannaBN committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    4cc3c20 View commit details
    Browse the repository at this point in the history

  4. Created function to use isOpen state to show menu icon if menu is clo… 

    …sed and to show only cross icon if menu isopen.
    @JohannaBN
    JohannaBN committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    a7f33fb View commit details
    Browse the repository at this point in the history

  5. Fixed issue with cross icon not being removed on desktop by adding di… 

    …splay: none.
    @JohannaBN
    JohannaBN committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    9bf52e1 View commit details
    Browse the repository at this point in the history

  6. fixed footer-bug and styled large screen

    @ericamechler
    ericamechler committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    490d700 View commit details
    Browse the repository at this point in the history

  7. added som padding-right to footer-logo

    @ericamechler
    ericamechler committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    17230b4 View commit details
    Browse the repository at this point in the history

  8. fixed function so that whenever a link in the footer is clicked, the … 

    …user is scrolled to the top of the page
    @ericamechler
    ericamechler committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    d3d4a5a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #43 from JohannaBN/footer-bugs 

    Footer bugs
    @ericamechler
    ericamechler authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    9f8dcfa View commit details
    Browse the repository at this point in the history

  10. Updated styling in header.

    @JohannaBN
    JohannaBN committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    4b862f1 View commit details
    Browse the repository at this point in the history

  11. Updated positioning on cross icon.

    @JohannaBN
    JohannaBN committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    c4fcc07 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #44 from JohannaBN/slide-menu-closing 

    Slide menu closing
    @JohannaBN
    JohannaBN authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    076affb View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Tryout font-size 10 in SPP

    @FridaMari
    FridaMari committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    438f644 View commit details
    Browse the repository at this point in the history

  2. Change back fonts on SPP and update class in index.css for extra smal… 

    …l texts
    @FridaMari
    FridaMari committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    960f74d View commit details
    Browse the repository at this point in the history

  3. Add hover and disabled states to buttons

    @FridaMari
    FridaMari committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    8d22f01 View commit details
    Browse the repository at this point in the history

  4. Add hover effects to category icons and underline offsat to links in … 

    …active mode
    @FridaMari
    FridaMari committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    cce0bc9 View commit details
    Browse the repository at this point in the history

  5. Add hover state to size buttons

    @FridaMari
    FridaMari committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    dbb8844 View commit details
    Browse the repository at this point in the history

  6. Add scaling as hover on product cards and give all hover effects a tr… 

    …ansition
    @FridaMari
    FridaMari committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    af1703b View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. Add media queries to SPP and add toggle to details text

    @FridaMari
    FridaMari committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    6b109bc View commit details
    Browse the repository at this point in the history

  2. Make alt-tag dynamic on product image in SPP

    @FridaMari
    FridaMari committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    4de0dbb View commit details
    Browse the repository at this point in the history

  3. Add ability to select size on SPP

    @FridaMari
    FridaMari committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    1aa4b40 View commit details
    Browse the repository at this point in the history

  4. Change label on add to cart button when no size is selected

    @FridaMari
    FridaMari committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    dac625d View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. added UseCartStore and filled it with states for cart, addToCart, rem… 

    …oveFromCart, decreaseQuantity, clearCart, getTotalItems and getTotalPrice
    @ericamechler
    ericamechler committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    58eb080 View commit details
    Browse the repository at this point in the history

  2. added addToCart to singleproduct-page and a handle addToCart-function

    @ericamechler
    ericamechler committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    eebfe5f View commit details
    Browse the repository at this point in the history

  3. filled cart.jsx with cart items & details regarding them + quantity e… 

    …tc. Fixed the bug with adding to cart
    @ericamechler
    ericamechler committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    1619548 View commit details
    Browse the repository at this point in the history

  4. added handleIncrease, handleDecrease, handleRemove etc & the icons

    @ericamechler
    ericamechler committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    b69f480 View commit details
    Browse the repository at this point in the history

  5. filled cart with components & got the handleIncrease etc working

    @ericamechler
    ericamechler committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    88a6c4f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #45 from JohannaBN/global-state 

    Global state
    @ericamechler
    ericamechler authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    edf0e29 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. changed filename of UseCartStore to useCartStore and imported them again

    @ericamechler
    ericamechler committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    c0842b6 View commit details
    Browse the repository at this point in the history

  2. tried fixing useCartStore

    @ericamechler
    ericamechler committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    70cfbf6 View commit details
    Browse the repository at this point in the history

  3. created a new Store called useBagStore to try solve issues with deploy

    @ericamechler
    ericamechler committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    740bf3c View commit details
    Browse the repository at this point in the history

  4. got the clear-cart-function working and added a button with a new var… 

    …iant and styled it a bit
    @ericamechler
    ericamechler committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    29ce34b View commit details
    Browse the repository at this point in the history

  5. Configured backend server-file and added endpoint for stripe checkout… 

    … session.
    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    289f59e View commit details
    Browse the repository at this point in the history

  6. implemented localStorage in useBagStore

    @ericamechler
    ericamechler committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    1787ea4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #46 from JohannaBN/cart-fixes 

    Cart fixes
    @ericamechler
    ericamechler authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9c4e9e8 View commit details
    Browse the repository at this point in the history

  8. Added .env-file.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a6f7143 View commit details
    Browse the repository at this point in the history

  9. Updated frontend button code to handle checkout request.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    13b8b12 View commit details
    Browse the repository at this point in the history

  10. Updated localhost url to deployed urls.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    b4388da View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into checkout

    @JohannaBN
    JohannaBN authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    bfdadc5 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #47 from JohannaBN/checkout 

    Checkout
    @JohannaBN
    JohannaBN authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    f5f5a77 View commit details
    Browse the repository at this point in the history

  13. Updated env.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9f3180f View commit details
    Browse the repository at this point in the history

  14. Merge pull request #48 from JohannaBN/env-update 

    Updated env.
    @JohannaBN
    JohannaBN authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    f43c3e1 View commit details
    Browse the repository at this point in the history

  15. Corrected Stripe post url.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    4f40c5f View commit details
    Browse the repository at this point in the history

  16. Merge pull request #49 from JohannaBN/stripe-post 

    Corrected Stripe post url.
    @JohannaBN
    JohannaBN authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9a1e9ba View commit details
    Browse the repository at this point in the history

  17. Create Loader component

    @FridaMari
    FridaMari committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    60bbaa4 View commit details
    Browse the repository at this point in the history

  18. Display Loader when loading state is set to true

    @FridaMari
    FridaMari committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    e4bc18a View commit details
    Browse the repository at this point in the history

  19. Merge pull request #50 from JohannaBN/loader 

    Loader
    @FridaMari
    FridaMari authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    e32d76e View commit details
    Browse the repository at this point in the history

  20. Updated process.env for Google cloud.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    cb8f643 View commit details
    Browse the repository at this point in the history

  21. Updated process.env for netlify deploy.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    6176c82 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #51 from JohannaBN/env-import 

    Env import
    @JohannaBN
    JohannaBN authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    34825e3 View commit details
    Browse the repository at this point in the history

  23. Updated URLs.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    6b675dc View commit details
    Browse the repository at this point in the history

  24. Fixed typo in process.env.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    53d991b View commit details
    Browse the repository at this point in the history

  25. Merge pull request #52 from JohannaBN/meta.env2 

    Meta.env2
    @JohannaBN
    JohannaBN authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    2553f71 View commit details
    Browse the repository at this point in the history

  26. Make not found page work as expected

    @FridaMari
    FridaMari committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    4e80645 View commit details
    Browse the repository at this point in the history

  27. Refactor code so that when error occurs, redirect to Not found page

    @FridaMari
    FridaMari committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    caad520 View commit details
    Browse the repository at this point in the history

  28. Add styling to not found page

    @FridaMari
    FridaMari committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a5b893f View commit details
    Browse the repository at this point in the history

  29. Change name on hero-button to shop-button

    @FridaMari
    FridaMari committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a57f836 View commit details
    Browse the repository at this point in the history

  30. Style loader

    @FridaMari
    FridaMari committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    7c44a39 View commit details
    Browse the repository at this point in the history

  31. Checkout fixed.

    @JohannaBN
    JohannaBN committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    74ea31d View commit details
    Browse the repository at this point in the history

  32. Merge pull request #53 from JohannaBN/stripe-fix 

    Checkout fixed.
    @JohannaBN
    JohannaBN authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    aa61fcd View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Merge branch 'main' into notfound-page

    @FridaMari
    FridaMari authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    9a242ed View commit details
    Browse the repository at this point in the history

  2. Merge pull request #54 from JohannaBN/notfound-page 

    Notfound page
    @FridaMari
    FridaMari authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    ef58ad2 View commit details
    Browse the repository at this point in the history

  3. Change name on shop-button also in hover state, and add clear-cart bu… 

    …tton to hover state
    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    04c2baf View commit details
    Browse the repository at this point in the history

  4. Add some padding to cart-css

    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    0cc45d5 View commit details
    Browse the repository at this point in the history

  5. Removed products details from checkout.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    3e2af41 View commit details
    Browse the repository at this point in the history

  6. Added more payment options in checkout.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    7205c2e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #55 from JohannaBN/checkout-details 

    Checkout details
    @JohannaBN
    JohannaBN authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4f5628f View commit details
    Browse the repository at this point in the history

  8. Give logo a bit more padding on desktop view. Center cart-count insid… 

    …e shoppingbag.
    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    1b25ec0 View commit details
    Browse the repository at this point in the history

  9. Created file and stylesheet for order comfirmation page. And created … 

    …route to /success.
    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    330c8e0 View commit details
    Browse the repository at this point in the history

  10. Change styling in slider-menu from em to px

    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    7219b6e View commit details
    Browse the repository at this point in the history

  11. Merge pull request #56 from JohannaBN/styling-header 

    Styling header
    @FridaMari
    FridaMari authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    602f360 View commit details
    Browse the repository at this point in the history

  12. Added content and styling for order confirmation page.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    211c62d View commit details
    Browse the repository at this point in the history

  13. Merge pull request #57 from JohannaBN/orderconfirmation 

    Orderconfirmation
    @JohannaBN
    JohannaBN authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    51b1ba7 View commit details
    Browse the repository at this point in the history

  14. Put h1 in hero-text wrapper and update some styling so that it looks … 

    …better on all screens
    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    f0355b5 View commit details
    Browse the repository at this point in the history

  15. Updated cancel_url to redirect to /cart for better UI.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    2560845 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #58 from JohannaBN/cancel 

    Updated cancel_url to redirect to /cart for better UI.
    @JohannaBN
    JohannaBN authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    6303776 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #59 from JohannaBN/styling-hero 

    Put h1 in hero-text wrapper and update some styling so that it looks …
    @FridaMari
    FridaMari authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    e1a9006 View commit details
    Browse the repository at this point in the history

  18. Updated styling for mobile. Added margins and gap.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    01684f0 View commit details
    Browse the repository at this point in the history

  19. Updated styling for tablet - margin and padding.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    0a3f51b View commit details
    Browse the repository at this point in the history

  20. Create separate elements in banner instead of having a fixed image

    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    984eae6 View commit details
    Browse the repository at this point in the history

  21. Updated styling for desktop - added width 100% on product-card.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    7d4669c View commit details
    Browse the repository at this point in the history

  22. Removed unused code.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    ed4e225 View commit details
    Browse the repository at this point in the history

  23. Updated hover effects for tablet and mobile.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    49db905 View commit details
    Browse the repository at this point in the history

  24. fixed cart-design

    @ericamechler
    ericamechler committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    492417f View commit details
    Browse the repository at this point in the history

  25. Merge pull request #60 from JohannaBN/cart-css 

    Cart css
    @ericamechler
    ericamechler authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    1a78bc4 View commit details
    Browse the repository at this point in the history

  26. Updated classnames for category page to use styling for all-products … 

    …page.
    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    088cb78 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #61 from JohannaBN/all-products-styling 

    All products styling
    @JohannaBN
    JohannaBN authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    d68869a View commit details
    Browse the repository at this point in the history

  28. Updated title.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    f06af60 View commit details
    Browse the repository at this point in the history

  29. Added logo as favicon.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    a0be21f View commit details
    Browse the repository at this point in the history

  30. Cleaned up code a bit.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4cdce61 View commit details
    Browse the repository at this point in the history

  31. Removed unused icons.

    @JohannaBN
    JohannaBN committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    8131d7c View commit details
    Browse the repository at this point in the history

  32. Merge pull request #62 from JohannaBN/minor-updates 

    Minor updates
    @JohannaBN
    JohannaBN authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    a84bfb8 View commit details
    Browse the repository at this point in the history

  33. Fix banner layout for alla screen sizes

    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    0c14496 View commit details
    Browse the repository at this point in the history

  34. Create bubble-row

    @FridaMari
    FridaMari committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    5075c8a View commit details
    Browse the repository at this point in the history

  35. Merge pull request #63 from JohannaBN/banner-fix 

    Banner fix
    @FridaMari
    FridaMari authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4a19e44 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Change path on favicon in html

    @FridaMari
    FridaMari committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    9d8468f View commit details
    Browse the repository at this point in the history

  2. Fix margins around banner and remove border bottom on desktop footer

    @FridaMari
    FridaMari committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    2a511d4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #64 from JohannaBN/banner-margin 

    Fix margins around banner and remove border bottom on desktop footer
    @FridaMari
    FridaMari authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    02575bb View commit details
    Browse the repository at this point in the history

  4. Addded media queries for extra large screens. Added maxwidth and marg… 

    …in 0 auto to center content.
    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c963765 View commit details
    Browse the repository at this point in the history

  5. fixed empty-cart look

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    b89aac3 View commit details
    Browse the repository at this point in the history

  6. removed extra text in footer that talked about an about-page

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    35d2181 View commit details
    Browse the repository at this point in the history

  7. removed border-bottom & margin-bottom on 1024 screen in footer

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    89052f1 View commit details
    Browse the repository at this point in the history

  8. Updated gap.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    deeab7f View commit details
    Browse the repository at this point in the history

  9. Added margin and media queries for extra large screens.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    3417dc7 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into margin-correction

    @JohannaBN
    JohannaBN authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    0b42d83 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #65 from JohannaBN/margin-correction 

    Margin correction
    @JohannaBN
    JohannaBN authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    f5fc8c4 View commit details
    Browse the repository at this point in the history

  12. Fixed bug with text not center on very small screens on size buttons.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7ff2322 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #66 from JohannaBN/bug/size-button-text 

    Fixed bug with text not center on very small screens on size buttons.
    @JohannaBN
    JohannaBN authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7d5a0b5 View commit details
    Browse the repository at this point in the history

  14. fixed so cart clears when confirmation-page is reached

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    f08edd3 View commit details
    Browse the repository at this point in the history

  15. fixed confirmation-message

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    0181046 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'main' into cart-bugs

    @ericamechler
    ericamechler authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a13c6d4 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #67 from JohannaBN/cart-bugs 

    Cart bugs
    @ericamechler
    ericamechler authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    9b9ced0 View commit details
    Browse the repository at this point in the history

  18. Remove max-width from toggle component and place it on the footer ins… 

    …tead
    @FridaMari
    FridaMari committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a5b780d View commit details
    Browse the repository at this point in the history

  19. Merge pull request #68 from JohannaBN/details-text 

    Remove max-width from toggle component and place it on the footer ins…
    @FridaMari
    FridaMari authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a07e983 View commit details
    Browse the repository at this point in the history

  20. Updated colours on p for better accessibility.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    0f242df View commit details
    Browse the repository at this point in the history

  21. Updated for better accessibility.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    839ec6f View commit details
    Browse the repository at this point in the history

  22. Give variable colors better contrast

    @FridaMari
    FridaMari committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    021cfe2 View commit details
    Browse the repository at this point in the history

  23. Second try to update colors

    @FridaMari
    FridaMari committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    e2a2280 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #69 from JohannaBN/color-fix 

    Second try to update colors
    @FridaMari
    FridaMari authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    6436bef View commit details
    Browse the repository at this point in the history

  25. removed classname hero-h4 which was not used

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    786a03d View commit details
    Browse the repository at this point in the history

  26. Merge pull request #70 from JohannaBN/heading-structure 

    removed classname hero-h4 which was not used
    @ericamechler
    ericamechler authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    07b486b View commit details
    Browse the repository at this point in the history

  27. Change color on banner text

    @FridaMari
    FridaMari committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4c7b398 View commit details
    Browse the repository at this point in the history

  28. Removed unused ul.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    f8fcce9 View commit details
    Browse the repository at this point in the history

  29. removed category/:id because we don't use it

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    bc2a55a View commit details
    Browse the repository at this point in the history

  30. Merge pull request #71 from JohannaBN/clean-up 

    removed category/:id because we don't use it
    @ericamechler
    ericamechler authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c85e86e View commit details
    Browse the repository at this point in the history

  31. Made slide arrow buttons bigger for better accessibility.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    0f6c10c View commit details
    Browse the repository at this point in the history

  32. Changed arrow size in slider for better accessibility.

    @JohannaBN
    JohannaBN committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7899ae4 View commit details
    Browse the repository at this point in the history

  33. Merge pull request #72 from JohannaBN/slide-arrows 

    Slide arrows
    @JohannaBN
    JohannaBN authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    d5cb57c View commit details
    Browse the repository at this point in the history

  34. Make arrow in productshowcase bigger for accessibility reasons

    @FridaMari
    FridaMari committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    d4c4f43 View commit details
    Browse the repository at this point in the history

  35. updated readme

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    767b460 View commit details
    Browse the repository at this point in the history

  36. updated readme again

    @ericamechler
    ericamechler committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    903faea View commit details
    Browse the repository at this point in the history