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

T3 turbo #74

Merged
merged 189 commits into from
Feb 2, 2024
Merged

T3 turbo #74

merged 189 commits into from
Feb 2, 2024

Commits on Apr 11, 2023

  1. Create README.md

    @bjsilva1
    bjsilva1 authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    9e1fd37 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @bjsilva1
    bjsilva1 authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    6ac1965 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @bjsilva1
    bjsilva1 authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    758b63f View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Make the website adjustable based on the screen sizes.

    @KatyH820
    KatyH820 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    e91fee1 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Merge pull request #3 from icssc/adjust-screensize 

    Make the website adjustable based on the screen sizes
    @bjsilva1
    bjsilva1 authored Apr 17, 2023
    Configuration menu
    Copy the full SHA
    7b47b38 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Update README.md

    @bjsilva1
    bjsilva1 authored Apr 18, 2023
    Configuration menu
    Copy the full SHA
    4923d8c View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @bjsilva1
    bjsilva1 authored Apr 18, 2023
    Configuration menu
    Copy the full SHA
    b3ac497 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Make the website swipeable in phone screen using 'react-swipeable-views'

    @KatyH820
    KatyH820 committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    5cf2110 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Merge pull request #4 from icssc/adjust-screensize 

    Make the website swipeable in phone screen using 'react-swipeable-views'
    @bjsilva1
    bjsilva1 authored Apr 25, 2023
    Configuration menu
    Copy the full SHA
    dbbb379 View commit details
    Browse the repository at this point in the history

  2. Update package

    @KatyH820
    KatyH820 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    761f659 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from icssc/adjust-screensize 

    Update package
    @KatyH820
    KatyH820 authored Apr 25, 2023
    Configuration menu
    Copy the full SHA
    496e578 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2023

  1. add:deploy workflow

    @KatyH820
    KatyH820 committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    bb972cd View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Update README.md

    @bjsilva1
    bjsilva1 authored May 2, 2023
    Configuration menu
    Copy the full SHA
    19f5795 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2023

  1. Set up caching for node

    @KatyH820
    KatyH820 committed May 6, 2023
    Configuration menu
    Copy the full SHA
    78adf6d View commit details
    Browse the repository at this point in the history

  2. fix indentation

    @KatyH820
    KatyH820 committed May 6, 2023
    Configuration menu
    Copy the full SHA
    d582ec1 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2023

  1. try to fix error on line 21

    @KatyH820
    KatyH820 committed May 7, 2023
    Configuration menu
    Copy the full SHA
    4319eb1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from icssc/deployweb 

    add:deploy workflow
    @KatyH820
    KatyH820 authored May 7, 2023
    Configuration menu
    Copy the full SHA
    48914e9 View commit details
    Browse the repository at this point in the history

  3. Revert "add:deploy workflow"

    @KatyH820
    KatyH820 authored May 7, 2023
    Configuration menu
    Copy the full SHA
    b5a8169 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #10 from icssc/revert-8-deployweb 

    Revert "add:deploy workflow".
    @KatyH820
    KatyH820 authored May 7, 2023
    Configuration menu
    Copy the full SHA
    a5248ff View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Added expo app folder

    @bjsilva1
    bjsilva1 committed May 9, 2023
    Configuration menu
    Copy the full SHA
    b642a87 View commit details
    Browse the repository at this point in the history

  2. Adding rewrite changes from rewrite-react-native branch

    @bjsilva1
    bjsilva1 committed May 9, 2023
    Configuration menu
    Copy the full SHA
    a15f6eb View commit details
    Browse the repository at this point in the history

  3. Fixed mobile app format

    @bjsilva1
    bjsilva1 committed May 9, 2023
    Configuration menu
    Copy the full SHA
    443f185 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from icssc/fix-expo-error

    @EricPedley
    EricPedley authored May 9, 2023
    Configuration menu
    Copy the full SHA
    15447ce View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. I downgrade the React version for the website to React 17 because the… 

    …re are dependency conflicts with React 18. I also change the main.tsx to work with react 17.
    @KatyH820
    KatyH820 committed May 12, 2023
    Configuration menu
    Copy the full SHA
    2a541bd View commit details
    Browse the repository at this point in the history

Commits on May 13, 2023

  1. Added a modal to display nutrition info for each item

    @bjsilva1
    bjsilva1 committed May 13, 2023
    Configuration menu
    Copy the full SHA
    a639304 View commit details
    Browse the repository at this point in the history

  2. Added type annotations on React props

    @bjsilva1
    bjsilva1 committed May 13, 2023
    Configuration menu
    Copy the full SHA
    9a4b725 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2023

  1. Added color palette file to make changing color easier

    @bjsilva1
    bjsilva1 committed May 14, 2023
    Configuration menu
    Copy the full SHA
    7008a65 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12 from icssc/fixdependency 

    Downgrade the React version for the website to React 17
    @bjsilva1
    bjsilva1 authored May 14, 2023
    Configuration menu
    Copy the full SHA
    1146c9f View commit details
    Browse the repository at this point in the history

  3. Revert "Downgrade the React version for the website to React 17"

    @bjsilva1
    bjsilva1 authored May 14, 2023
    Configuration menu
    Copy the full SHA
    03df7a3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #13 from icssc/revert-12-fixdependency 

    Revert "Downgrade the React version for the website to React 17"
    @bjsilva1
    bjsilva1 authored May 14, 2023
    Configuration menu
    Copy the full SHA
    28e0bc4 View commit details
    Browse the repository at this point in the history

  5. Downgraded Expo and React-Native to match the downgraded React 17 ver… 

    …sion
    @bjsilva1
    bjsilva1 committed May 14, 2023
    Configuration menu
    Copy the full SHA
    465cb37 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'fixdependency' of github.com:icssc/ZotMeal into show-nu… 

    …trition-info
    @bjsilva1
    bjsilva1 committed May 14, 2023
    Configuration menu
    Copy the full SHA
    48653cd View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Nutrition info is viewable for each item and each station

    @bjsilva1
    bjsilva1 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    d5f283f View commit details
    Browse the repository at this point in the history

  2. Added image assets to shared folder

    @bjsilva1
    bjsilva1 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    4545c8e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fixdependency

    @bjsilva1
    bjsilva1 authored May 16, 2023
    Configuration menu
    Copy the full SHA
    e8f9ee2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #15 from icssc/fixdependency 

    Downgraded React-Native to match the downgraded React 17
    @bjsilva1
    bjsilva1 authored May 16, 2023
    Configuration menu
    Copy the full SHA
    df39721 View commit details
    Browse the repository at this point in the history

  5. Reverted attempt to add nutrition badge images

    @bjsilva1
    bjsilva1 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    d8bd6d6 View commit details
    Browse the repository at this point in the history

  6. Change build script and main.tsc

    @KatyH820
    KatyH820 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    1250d04 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #17 from icssc/fixpackage 

    Change build script and main.tsc
    @KatyH820
    KatyH820 authored May 16, 2023
    Configuration menu
    Copy the full SHA
    5d32c8b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' of github.com:icssc/ZotMeal into show-nutrition-info

    @bjsilva1
    bjsilva1 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    aabb8f3 View commit details
    Browse the repository at this point in the history

  9. Merged to main

    @bjsilva1
    bjsilva1 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    9e1e03b View commit details
    Browse the repository at this point in the history

  10. Merge pull request #16 from icssc/show-nutrition-info 

    Added nutrition info modal
    @bjsilva1
    bjsilva1 authored May 16, 2023
    Configuration menu
    Copy the full SHA
    0ace89c View commit details
    Browse the repository at this point in the history

  11. Update README.md

    @bjsilva1
    bjsilva1 authored May 16, 2023
    Configuration menu
    Copy the full SHA
    153e70e View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. set up netlify functions

    @KatyH820
    KatyH820 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    b250eda View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

  1. Fixed css to make website take up the whole page

    @bjsilva1
    bjsilva1 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    200e092 View commit details
    Browse the repository at this point in the history

  2. Added the header information bar above the location title

    @bjsilva1
    bjsilva1 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    4af8a91 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Added schedule and location directions

    @bjsilva1
    bjsilva1 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    b39365b View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @bjsilva1
    bjsilva1 authored May 23, 2023
    Configuration menu
    Copy the full SHA
    5c2a0f8 View commit details
    Browse the repository at this point in the history

  3. Re-arranged the shared folder contents to make file structure more cl… 

    …ear. Renamed typedef file
    @bjsilva1
    bjsilva1 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    9b0e76d View commit details
    Browse the repository at this point in the history

  4. Refactored start time and end time displays on schedule

    @bjsilva1
    bjsilva1 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    3fb4e01 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge pull request #20 from icssc/location-header 

    Location header
    @bjsilva1
    bjsilva1 authored May 24, 2023
    Configuration menu
    Copy the full SHA
    5a70a0d View commit details
    Browse the repository at this point in the history

Commits on May 28, 2023

  1. - Moved the images and fonts back into the components folder 

    - Addded a favicon to the website head
    @bjsilva1
    bjsilva1 committed May 28, 2023
    Configuration menu
    Copy the full SHA
    7c02e16 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from icssc/favicon 

    Favicon!
    @bjsilva1
    bjsilva1 authored May 28, 2023
    Configuration menu
    Copy the full SHA
    b5fbba3 View commit details
    Browse the repository at this point in the history

  3. - Added upvote and downvote buttons to each station next to the more … 

    …details button

- Also added the location images on the header
    @bjsilva1
    bjsilva1 committed May 28, 2023
    Configuration menu
    Copy the full SHA
    c01ce41 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. - Added images to LocationHeader buttons (Schedule,Pricing, and Direc… 

    …tions)
    Bryan Silva committed May 29, 2023
    Configuration menu
    Copy the full SHA
    e78bb02 View commit details
    Browse the repository at this point in the history

  2. - Added nutrition badge images on item details

    Bryan Silva committed May 29, 2023
    Configuration menu
    Copy the full SHA
    22df2ca View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. add netlify toml file with custom build ignore

    @EricPedley
    EricPedley committed May 30, 2023
    Configuration menu
    Copy the full SHA
    9cc2233 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27 from icssc/fix-netlify-previews

    @EricPedley
    EricPedley authored May 30, 2023
    Configuration menu
    Copy the full SHA
    94f5a2a View commit details
    Browse the repository at this point in the history

  3. - Added PWA plugin

    @bjsilva1
    bjsilva1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    6ef0efb View commit details
    Browse the repository at this point in the history

  4. - Moved the components symlink into the public folder to allow vite t… 

    …o load the image assets into the build
    @bjsilva1
    bjsilva1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    cf596e7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upvote-downvote' of github.com:icssc/ZotMeal into websi… 

    …te-pwa
    @bjsilva1
    bjsilva1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    2a28bdd View commit details
    Browse the repository at this point in the history

  6. - Added PWA

    @bjsilva1
    bjsilva1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    f9203db View commit details
    Browse the repository at this point in the history

  7. - No longer can view scripts on the web browser

    @bjsilva1
    bjsilva1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    c862c1e View commit details
    Browse the repository at this point in the history

  8. - Woops forgot about the upvotes and downvotes

    @bjsilva1
    bjsilva1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    eb1edf1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #24 from icssc/upvote-downvote 

    Added upvote and downvote buttons and banner images
    @bjsilva1
    bjsilva1 authored May 30, 2023
    Configuration menu
    Copy the full SHA
    36b4c74 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2023

  1. add a feedback icon that link to the feedback form

    @KatyH820
    KatyH820 committed Jun 4, 2023
    Configuration menu
    Copy the full SHA
    64f8a17 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #33 from icssc/feedback 

    add a feedback icon that link to the feedback form
    @bjsilva1
    bjsilva1 authored Jun 4, 2023
    Configuration menu
    Copy the full SHA
    a129770 View commit details
    Browse the repository at this point in the history

  3. merged from main

    @bjsilva1
    bjsilva1 committed Jun 4, 2023
    Configuration menu
    Copy the full SHA
    05274a5 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Added PWA and necessary settings

    @bjsilva1
    bjsilva1 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    e53ae9a View commit details
    Browse the repository at this point in the history

  2. Changed color?

    @bjsilva1
    bjsilva1 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    17fc1e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. modify netlify.toml so that it canwork with PWA

    @KatyH820
    KatyH820 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    02a7f84 View commit details
    Browse the repository at this point in the history

  2. function that adds menu api call function

    Nathan Ng committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    4321ec4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #34 from icssc/website-pwa 

    Added PWA
    @KatyH820
    KatyH820 authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bb1b82e View commit details
    Browse the repository at this point in the history

  4. hiding ds_store

    Nathan Ng committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    4644246 View commit details
    Browse the repository at this point in the history

  5. removed ds_store

    Nathan Ng committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    a27df48 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #36 from icssc/menufunction 

    function that adds menu api call function
    @KatyH820
    KatyH820 authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    cd0facd View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. - Refactored directions button into separate file

    Bryan Silva committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    c51292b View commit details
    Browse the repository at this point in the history

  2. Fixed issue with location not displaying closed 

    - When there is an error loading, it defaults to displaying as closed
- If the current meal does not exist, display as closed
    Bryan Silva committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    d3f082a View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Merge pull request #40 from icssc/fix-open-closed 

    Fixed the Open/Closed restaurant issue
    @KatyH820
    KatyH820 authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    0b7e2ad View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. Fixed swipeable view bug 

    - Added media query to disable swipeable view when widescreen
- Added event listener to properly handle changing screen sizes when on second screen
    Bryan Silva committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    75f792d View commit details
    Browse the repository at this point in the history

  2. Added back api call instead of using local file

    Bryan Silva committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    62d21d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge pull request #43 from icssc/fix-swipeable-views 

    Fix SwipeableViews bug
    @bjsilva1
    bjsilva1 authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    b52d5c0 View commit details
    Browse the repository at this point in the history

  2. Changed how the error message is displayed

    Bryan Silva committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    3572eb4 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge pull request #44 from icssc/error-message 

    Changed how the error message is displayed
    @KatyH820
    KatyH820 authored Aug 8, 2023
    Configuration menu
    Copy the full SHA
    7894933 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2023

  1. fetch menu data with netlify serverless function and update error mes… 

    …sage
    @KatyH820
    KatyH820 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    eecc535 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #45 from icssc/migrate-backend 

    fetch menu data with netlify serverless function and update error mes…
    @KatyH820
    KatyH820 authored Sep 9, 2023
    Configuration menu
    Copy the full SHA
    82ac510 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @KatyH820
    KatyH820 authored Sep 9, 2023
    Configuration menu
    Copy the full SHA
    29de3d0 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @KatyH820
    KatyH820 authored Sep 9, 2023
    Configuration menu
    Copy the full SHA
    172fe07 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. bug fix

    @KatyH820
    KatyH820 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    53ab1be View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Merge pull request #47 from icssc/migrate-backend 

    bug fix
    @KatyH820
    KatyH820 authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    0910903 View commit details
    Browse the repository at this point in the history

  2. Reorganized file structure

    @bjsilva1
    bjsilva1 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    a0fb0cc View commit details
    Browse the repository at this point in the history

  3. Moved backend files

    @bjsilva1
    bjsilva1 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    1c8e1f9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #48 from icssc/file-structure 

    Moved backend files
    @bjsilva1
    bjsilva1 authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    a0617eb View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. add .netlify to gitignore

    @KatyH820
    KatyH820 committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    d2f9a38 View commit details
    Browse the repository at this point in the history

  2. get the schedule, menu by station(formatted), item data(nutritions, i… 

    …cons,name, description), and price using serverless
    @KatyH820
    KatyH820 committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    ea510be View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Merge pull request #49 from icssc/migrate-backend 

    Looks good 👍 
Migrate backend (Rewrite endpoint for getting the menu,schedule, and other datas )
    @bjsilva1
    bjsilva1 authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    f920d51 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Updated node packages

    @bjsilva1
    bjsilva1 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    e4bf785 View commit details
    Browse the repository at this point in the history

  2. Worked on header swiper

    @bjsilva1
    bjsilva1 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    89425a1 View commit details
    Browse the repository at this point in the history

  3. Added native-wind to project

    @bjsilva1
    bjsilva1 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    00ad816 View commit details
    Browse the repository at this point in the history

  4. Added tailwind and arrow icons

    @bjsilva1
    bjsilva1 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    a9333d7 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2023

  1. make schedule another function

    @KatyH820
    KatyH820 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    e7d6517 View commit details
    Browse the repository at this point in the history

  2. remove unused import

    @KatyH820
    KatyH820 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    7cd7389 View commit details
    Browse the repository at this point in the history

  3. make price into another function

    @KatyH820
    KatyH820 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    edc39a1 View commit details
    Browse the repository at this point in the history

  4. fixed the pricing error message

    @KatyH820
    KatyH820 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    345732f View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge pull request #55 from icssc/migrate-backend 

    Looks good, even includes latenight now, which is something I did not realize. Good job 👍
    @bjsilva1
    bjsilva1 authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    8c56a81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:icssc/ZotMeal into revisit-packages

    @bjsilva1
    bjsilva1 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    58f7be1 View commit details
    Browse the repository at this point in the history

  3. Reworked swipeviews to work with buttons

    @bjsilva1
    bjsilva1 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    93cac61 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Merge pull request #56 from icssc/revisit-packages 

    Ok I checked, this does not solve the issue with the Expo app not loading :((. Nothing is broken tho, I will merge if that is okay?
    @bjsilva1
    bjsilva1 authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    d621791 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. chore: remove lock files

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    3bcbdc5 View commit details
    Browse the repository at this point in the history

  2. chore: remove jetbrains .idea folder and adjust gitignore

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    deb9027 View commit details
    Browse the repository at this point in the history

  3. chore: remove symlinks

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    a5254df View commit details
    Browse the repository at this point in the history

  4. chore: move all legacy apps into apps directory

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    9991041 View commit details
    Browse the repository at this point in the history

  5. chore: remove remaining files in root

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    5ff10ea View commit details
    Browse the repository at this point in the history

  6. feat: pnpm-workspace setup

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    7a8183d View commit details
    Browse the repository at this point in the history

  7. chore: add npm and node version configs

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    5944392 View commit details
    Browse the repository at this point in the history

  8. chore: install packages

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    b2311b8 View commit details
    Browse the repository at this point in the history

  9. feat: mvp zotmeal app

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    f05272d View commit details
    Browse the repository at this point in the history

  10. fix: removed bad dependecies from project root

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    fae8b02 View commit details
    Browse the repository at this point in the history

  11. refactor: move shared to packages

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    2a0fbe2 View commit details
    Browse the repository at this point in the history

  12. feat: ui package

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    f9973e3 View commit details
    Browse the repository at this point in the history

  13. feat: app router

    @ap0nia
    ap0nia committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    6707b10 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. feat: mvp with nativewind

    @ap0nia
    ap0nia committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    1f93d31 View commit details
    Browse the repository at this point in the history

  2. feat: quick readme

    @ap0nia
    ap0nia committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8b24639 View commit details
    Browse the repository at this point in the history

  3. fix: invisible readme text

    @ap0nia
    ap0nia committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    6452ed4 View commit details
    Browse the repository at this point in the history

  4. chore: remove gradients that don't actually do anything

    @ap0nia
    ap0nia committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    0550d14 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

  1. link netlify backend

    @KatyH820
    KatyH820 committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    e762843 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. added build scripts

    @KatyH820
    KatyH820 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    d3a27ed View commit details
    Browse the repository at this point in the history

  2. added netlify-cli to the package.json to bypass the error we get in b… 

    …uild
    @KatyH820
    KatyH820 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    0bcd8f3 View commit details
    Browse the repository at this point in the history

  3. fixed pnpm-lock.yaml file outdated error during build

    @KatyH820
    KatyH820 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    495b014 View commit details
    Browse the repository at this point in the history

  4. chore: pin correct dependencies and updated readme

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    dc0b505 View commit details
    Browse the repository at this point in the history

  5. try build with different command

    @KatyH820
    KatyH820 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    d5bd280 View commit details
    Browse the repository at this point in the history

  6. fix: need to install uuid

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    7fa3b0d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'rework' of github.com:icssc/ZotMeal into rework

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    3408251 View commit details
    Browse the repository at this point in the history

  8. feat: mvp header banner

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    077ed9c View commit details
    Browse the repository at this point in the history

  9. feat: header

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    62fa475 View commit details
    Browse the repository at this point in the history

  10. feat: banner and theme store

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    e96326e View commit details
    Browse the repository at this point in the history

  11. feat: prettier and editor configs

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    a14227f View commit details
    Browse the repository at this point in the history

  12. chore: fix editorconfig

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    9e4e6c1 View commit details
    Browse the repository at this point in the history

  13. feat: mvp header and banner

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    b22fb67 View commit details
    Browse the repository at this point in the history

  14. feat: default index

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    ebb0f3c View commit details
    Browse the repository at this point in the history

  15. feat: current data example

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    d6adcc0 View commit details
    Browse the repository at this point in the history

  16. feat: mvp

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    cb2ec60 View commit details
    Browse the repository at this point in the history

  17. feat: different menus

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    047a861 View commit details
    Browse the repository at this point in the history

  18. chore: add todo item

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    93310bd View commit details
    Browse the repository at this point in the history

  19. feat: icons in navbar

    @ap0nia
    ap0nia committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    2acbb40 View commit details
    Browse the repository at this point in the history

  20. remove build

    @KatyH820
    KatyH820 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    3fb9619 View commit details
    Browse the repository at this point in the history

  21. include instruction for backend in README.md

    @KatyH820
    KatyH820 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    424d1de View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. fix: try pinning reanimated

    @ap0nia
    ap0nia committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    98669e2 View commit details
    Browse the repository at this point in the history

  2. fix: ok maybe the pin isn't needed

    @ap0nia
    ap0nia committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    bf3ac6a View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Merge pull request #61 from icssc/rework 

    looks good, we can start to merge UI and backend over 👍
    @bjsilva1
    bjsilva1 authored Dec 15, 2023
    Configuration menu
    Copy the full SHA
    7f2531f View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. feat: add scripts to start child repo dev servers from root

    @dlustre
    dlustre committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    8c18364 View commit details
    Browse the repository at this point in the history

  2. fix: just have one script for web and mobile

    @dlustre
    dlustre committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    f572dff View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. fix: update import for App component

    @dlustre
    dlustre committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    9fa1e83 View commit details
    Browse the repository at this point in the history

  2. refactor: extract Item component from index

    @dlustre
    dlustre committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    6eb8092 View commit details
    Browse the repository at this point in the history

  3. feat: add an mvp menu component 

    currently opens a modal of item details upon pressing. the component is in the app dir temporarily for simplicity
    @dlustre
    dlustre committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    11c2dbd View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. feat: add mvp 'view all' button functionality

    @dlustre
    dlustre committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    0ed73e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. feat: add borderColor to themeStore

    @dlustre
    dlustre committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    60e41f5 View commit details
    Browse the repository at this point in the history

  2. fix: update type declarations to match api response 

    also renamed from zotmeal.types.ts to zotmeal.d.ts
    @dlustre
    dlustre committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    ee76121 View commit details
    Browse the repository at this point in the history

  3. fix: update path

    @dlustre
    dlustre committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    4a87e8f View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Merge pull request #68 from icssc/adapt-ui 

    Looks good 👍
    @bjsilva1
    bjsilva1 authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    8a70fec View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Moved legacy app folders into a new directory labelled legacy

    @bjsilva1
    bjsilva1 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    ce6d1d0 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Merge pull request #72 from icssc/legacy-folder 

    Legacy Folder Restructure
    @anmho
    anmho authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    dd44d18 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. t3 + lambda setup

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    768ee42 View commit details
    Browse the repository at this point in the history

  2. t3 + lambda setup

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    eedab63 View commit details
    Browse the repository at this point in the history

  3. Added prisma package

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    72c3046 View commit details
    Browse the repository at this point in the history

  4. Added prisma package

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    a237556 View commit details
    Browse the repository at this point in the history

  5. .github

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    8f7ab99 View commit details
    Browse the repository at this point in the history

  6. .github

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    885fa06 View commit details
    Browse the repository at this point in the history

  7. fixed expo perm bug but prisma not working with vercel edge function … 

    …runtime
    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3c32b48 View commit details
    Browse the repository at this point in the history

  8. fixed expo perm bug but prisma not working with vercel edge function … 

    …runtime
    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f013e6a View commit details
    Browse the repository at this point in the history

  9. got lambda + trpc but prisma rust engine bug with amd64 vs x86 runtime

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    9fdeb70 View commit details
    Browse the repository at this point in the history

  10. got lambda + trpc but prisma rust engine bug with amd64 vs x86 runtime

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    2ea6e24 View commit details
    Browse the repository at this point in the history

  11. oops extension

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    7f55f7f View commit details
    Browse the repository at this point in the history

  12. oops extension

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3d09734 View commit details
    Browse the repository at this point in the history

  13. Serverless framework + tRPC Monorepo 🔥

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    cf4df69 View commit details
    Browse the repository at this point in the history

  14. Serverless framework + tRPC Monorepo 🔥

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    e3bb575 View commit details
    Browse the repository at this point in the history

  15. changed api import name

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    5ebf71f View commit details
    Browse the repository at this point in the history

  16. changed api import name

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    1f49fc7 View commit details
    Browse the repository at this point in the history

  17. Fixed linting problems

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f0d58ea View commit details
    Browse the repository at this point in the history

  18. Fixed linting problems

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    5f20bf1 View commit details
    Browse the repository at this point in the history

  19. fixed format and linting

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f94e7f4 View commit details
    Browse the repository at this point in the history

  20. fixed format and linting

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    8ad91ec View commit details
    Browse the repository at this point in the history

  21. trying to fix linting problem thats only in ci

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f108ef9 View commit details
    Browse the repository at this point in the history

  22. trying to fix linting problem thats only in ci

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    069e231 View commit details
    Browse the repository at this point in the history

  23. updating lock

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    bfd6ffc View commit details
    Browse the repository at this point in the history

  24. updating lock

    @anmho
    anmho committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    47ddc1f View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Data model rough

    @anmho
    anmho committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    25b4a1a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into t3-turbo 

    overwriting the main branch
    @anmho
    anmho committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    24a3a69 View commit details
    Browse the repository at this point in the history

  3. merged

    @anmho
    anmho committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    6821bb4 View commit details
    Browse the repository at this point in the history