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.

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

Merch Store #73

Merged
merged 114 commits into from
Jul 29, 2024
Merged

Merch Store #73

merged 114 commits into from
Jul 29, 2024

Commits on Apr 10, 2024

  1. wip

    PenTest-duck committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    74491c3 View commit details
    Browse the repository at this point in the history
  2. constants folder

    PenTest-duck committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    119e2c4 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Configuration menu
    Copy the full SHA
    952a710 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c0ca2b7 View commit details
    Browse the repository at this point in the history
  3. fix eslintrc typo

    PenTest-duck committed May 11, 2024
    Configuration menu
    Copy the full SHA
    8f71c02 View commit details
    Browse the repository at this point in the history
  4. migrate merch store

    PenTest-duck committed May 11, 2024
    Configuration menu
    Copy the full SHA
    c1942df View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9c0b028 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. Configuration menu
    Copy the full SHA
    9890def View commit details
    Browse the repository at this point in the history
  2. add ts type check

    PenTest-duck committed May 26, 2024
    Configuration menu
    Copy the full SHA
    3503add View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    45e598b View commit details
    Browse the repository at this point in the history
  4. even better deploy.yml

    PenTest-duck committed May 26, 2024
    Configuration menu
    Copy the full SHA
    62d9055 View commit details
    Browse the repository at this point in the history
  5. revert

    PenTest-duck committed May 26, 2024
    Configuration menu
    Copy the full SHA
    d25468e View commit details
    Browse the repository at this point in the history
  6. fix

    PenTest-duck committed May 26, 2024
    Configuration menu
    Copy the full SHA
    f6523ca View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    cb75a47 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Configuration menu
    Copy the full SHA
    34cff91 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    68ad66a View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Configuration menu
    Copy the full SHA
    f23d970 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7e91d73 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d2102c7 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. ts strict mode true

    PenTest-duck committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ad8e6a4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b1e45db View commit details
    Browse the repository at this point in the history
  3. fix type errors

    PenTest-duck committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    f896aed View commit details
    Browse the repository at this point in the history
  4. Merge branch 'migration-to-typescript' of github.com:coopsoc/website …

    …into merch-store-product-gallery
    PenTest-duck committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    8c2d208 View commit details
    Browse the repository at this point in the history
  5. Resize font

    BlackNinja1369 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    01a939e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e59c83c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    02cad27 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Configuration menu
    Copy the full SHA
    5cb6562 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Configuration menu
    Copy the full SHA
    f1e7cff View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. apply PR feedback

    stricter eslint + relative import + interface cleanup
    PenTest-duck committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    cc8c60b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6009c56 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'migration-to-typescript' of github.com:coopsoc/website …

    …into merch-store-product-gallery
    PenTest-duck committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    1783255 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    63071ed View commit details
    Browse the repository at this point in the history
  5. wip - merch page

    PenTest-duck committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    8026618 View commit details
    Browse the repository at this point in the history
  6. Make cart recieve data as a map

    description: The map in form of key=product_id and value=amount
    BlackNinja1369 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    a021172 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6f743cc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4c69d7d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7fa8927 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8735843 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    74a1ee3 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Configuration menu
    Copy the full SHA
    e49e546 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2d3292f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f604411 View commit details
    Browse the repository at this point in the history
  4. Add checkout return page MVP

    scorpiontornado authored and lhvy committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    057c787 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    84dcba6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2938d38 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d8308c0 View commit details
    Browse the repository at this point in the history
  8. Install Stripe libraries

    lhvy committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    cf1865f View commit details
    Browse the repository at this point in the history
  9. Upgrade dependencies

    lhvy committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    1cda46e View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    45b3881 View commit details
    Browse the repository at this point in the history
  11. WIP NextJS upgrade

    lhvy committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    d3b093c View commit details
    Browse the repository at this point in the history
  12. Add Stripe library

    lhvy committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    e0cd437 View commit details
    Browse the repository at this point in the history
  13. Migrate Bootstrap 4 to 5

    lhvy committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    d20d77e View commit details
    Browse the repository at this point in the history
  14. Refactor checkout function

    lhvy committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    12a01ec View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    ff73030 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    29bca50 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Minor UI changes

    scorpiontornado committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    8a755d4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32e22fa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5a66489 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a121e27 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4ae8ea7 View commit details
    Browse the repository at this point in the history
  6. Navbar/IndexHeader style/mobile changes, migrate bootstrap4 margin/pa…

    …dding l/r (left/right) to s/e (start/end)
    
    The following find/replace regex came in handy (without the backslashes) - find: \([" .-])mr-\ replace: \$1me-\
    scorpiontornado committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    8874fd5 View commit details
    Browse the repository at this point in the history
  7. save to localstorage

    PenTest-duck committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    bd5175d View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Configuration menu
    Copy the full SHA
    9f3fbed View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Configuration menu
    Copy the full SHA
    ebc50ba View commit details
    Browse the repository at this point in the history
  2. Integrate gallery with cart

    Make cart page pull cart data from local storage and display it.
    BlackNinja1369 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    bc14169 View commit details
    Browse the repository at this point in the history
  3. pass all linting errors

    PenTest-duck committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    80cec91 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. Configuration menu
    Copy the full SHA
    dcf9806 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1ded2b9 View commit details
    Browse the repository at this point in the history
  3. fix eslint error

    PenTest-duck committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    d109032 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Configuration menu
    Copy the full SHA
    37b2ca7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7a02dda View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9f6c845 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    df96504 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b3642b1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2b57186 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Improve return page

    scorpiontornado committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    ef02d0e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    110d2a4 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Configuration menu
    Copy the full SHA
    fc8860d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Configuration menu
    Copy the full SHA
    cf55aee View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9957d33 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04e1760 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c7e4fe9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0a38d5a View commit details
    Browse the repository at this point in the history
  6. Fix adding variants to cart

    lhvy committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    385705d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    cb5d1ac View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ab66fbf View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9d5d2c8 View commit details
    Browse the repository at this point in the history
  10. Remove extra type dep

    lhvy committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    b103b81 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5f5021b View commit details
    Browse the repository at this point in the history
  12. Move dev deps to dev

    lhvy committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    818149e View commit details
    Browse the repository at this point in the history
  13. Add custom build script for DO

    lhvy committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    41c524f View commit details
    Browse the repository at this point in the history
  14. Add image optimisation

    lhvy committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    a276688 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Configuration menu
    Copy the full SHA
    c8ca46c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    36924c6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ae4efb6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    af426b2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    965492e View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. Compress merch images

    lhvy committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    2e349f9 View commit details
    Browse the repository at this point in the history
  2. Fix checkout

    lhvy committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    efba866 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4c47a68 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4d54c70 View commit details
    Browse the repository at this point in the history
  5. Require only active products

    lhvy committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    b0edff0 View commit details
    Browse the repository at this point in the history
  6. Revert "Temporarily remove /merch from navbar"

    This reverts commit 4d54c70.
    lhvy committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    04a9620 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    909d2fc View commit details
    Browse the repository at this point in the history
  8. WIP mobile layout

    scorpiontornado committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    e579dfc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    45756b7 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6b85c07 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0095983 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Configuration menu
    Copy the full SHA
    149335a View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Remove merch 2024 (#77)

    * Rename old merch components folder to merch_2023
    
    * Add merch conditional rendering (WIP)
    
    * Add function for merch is active or not
    
    * Move merch types to data/types.ts
    
    * Make cents mandatory for Price, change getAllPrices to return a map and use it in getAllProductsAndVariants
    
    * Refactor merch.tsx getServerSideProps now that cents is guaranteed to be a member of Price
    
    * Move 2024 MerchCard to its own file in components
    
    * Fix imports for merch.tsx
    
    * Fix cart.tsx import
    
    * Fix pagination issue causing some sweaters (e.g. grey M/L) to show price $0 on cart
    
    * Fix import
    
    * Add merch closed messages to all relevant pages
    scorpiontornado authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    5d1647d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3d9c32d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8f7090f View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Configuration menu
    Copy the full SHA
    33aa68a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    935f10b View commit details
    Browse the repository at this point in the history