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

merge auth into main #39

Merged
merged 28 commits into from
Jan 23, 2024
Merged

merge auth into main #39

merged 28 commits into from
Jan 23, 2024

Commits on Nov 18, 2023

  1. created catalog table

    Kristen Yee authored and Kristen Yee committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    d560285 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. Configuration menu
    Copy the full SHA
    8b92d59 View commit details
    Browse the repository at this point in the history
  2. fixed enum name

    arralia committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    a499026 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1155340 View commit details
    Browse the repository at this point in the history
  4. added create table users statement

    Cheryl Chen authored and Cheryl Chen committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    0e83312 View commit details
    Browse the repository at this point in the history
  5. added drop table if exists

    Cheryl Chen authored and Cheryl Chen committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    e2e0b73 View commit details
    Browse the repository at this point in the history
  6. updated drop table statement

    Kristen Yee authored and Kristen Yee committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    19035e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

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

Commits on Nov 21, 2023

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

Commits on Nov 22, 2023

  1. Configuration menu
    Copy the full SHA
    589e537 View commit details
    Browse the repository at this point in the history
  2. fix typo

    leeaj8-uci committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    9f350b0 View commit details
    Browse the repository at this point in the history
  3. try moving env variables

    leeaj8-uci committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    559dab7 View commit details
    Browse the repository at this point in the history
  4. Revert changes

    leeaj8-uci committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    f810b9d View commit details
    Browse the repository at this point in the history
  5. Merge pull request #14 from ctc-uci/8-create-catalog-table

    created catalog table
    ThatMegamind authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    34eff36 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #15 from ctc-uci/7-create-published-schedule-table

    7 - created the published schedule table
    ThatMegamind authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    80ac134 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #16 from ctc-uci/9-create-user-table

    9 - created user table
    ThatMegamind authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    fe99a58 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #17 from ctc-uci/10-make-crud-sql-queries-for-publ…

    …ished-schedule-table
    
    Make CRUD SQL queries for Published Schedule Table
    ThatMegamind authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    5ad36f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Merge pull request #18 from ctc-uci/11-make-crud-sql-queries-for-cata…

    …log-table
    
    Added catalog CRUD queries
    ThatMegamind authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    32a94b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2023

  1. Make CRUD SQL queries for Users Table (#25)

    * Added UPDATE and DELETE queries for user table
    
    * added Get, Get pending accounts, and Post
    
    * implemented changes from pr feedback
    
    ---------
    
    Co-authored-by: Sean Fong <[email protected]>
    Co-authored-by: Philip Jian <[email protected]>
    3 people authored Nov 25, 2023
    Configuration menu
    Copy the full SHA
    c042554 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Configuration menu
    Copy the full SHA
    57cc996 View commit details
    Browse the repository at this point in the history
  2. added connection to db

    michellelin1 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    8c703e9 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. 23-make-backend-routes-for-users (#26)

    * Create a pull trequest for branch 23-make-backend-routes-for-users
    
    * Co-authored-by: cherhchen <[email protected]>
    
    * Finished backend routes
    
    Co-authored-by: cherhchen <[email protected]>
    
    * Refactor users.js for minor updates and delete users.sql
    
    Co-authored-by: cherhchen <[email protected]>
    
    ---------
    
    Co-authored-by: Ethan Ho <[email protected]>
    Co-authored-by: cherhchen <[email protected]>
    3 people authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    15d3d25 View commit details
    Browse the repository at this point in the history
  2. Make backend routes for Catelog (#27)

    * created catalog.js, made progress
    
    * added :id to the router functions, changed delete query
    
    * Completed code for routes. Running into db.query is not a function error
    
    * Completed Routes for Catelog
    
    * removed comments, fixed yarn lock
    
    * removed console logs
    
    * fixed ?
    
    Co-authored-by: liannejl <[email protected]>
    
    ---------
    
    Co-authored-by: Alyssia Tan <[email protected]>
    Co-authored-by: liannejl <[email protected]>
    Co-authored-by: liannejl <[email protected]>
    4 people authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    a2965f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. Set up the nodeMailer route and the transporter (#28)

    * nodeMailer.js setup
    
    * Added nodeMailer.js code and transporter.js that is called within nodeMailer
    
    * Updated package.json to include nodeMailer dependency, added endpoint for emailRouter in app.js, set cors credentials to true so it doesn't block req
    
    ---------
    
    Co-authored-by: subinqkim <[email protected]>
    ctc-devops and SubinQKim authored Dec 30, 2023
    Configuration menu
    Copy the full SHA
    e6e02f1 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. Make Backend Routes for Published Schedule (#29)

    * Modified GET queries with joins on catalog table
    
    * created publishSchedule.js file
    
    * Mounted published schedule route on app.js
    
    * Added GET and POST route controller functions for published schedule
    
    * put and delete, not yet complete
    
    * updated publishedSchedule.js
    
    * updated to use numeric syntax for sql queries
    
    * small fixes in ppublishedSchedule.js
    
    * pull request feedback
    
    * pull request feedback cont.
    
    * fixed misc bugs
    
    ---------
    
    Co-authored-by: Sean Fong <[email protected]>
    Co-authored-by: Philip Jian <[email protected]>
    Co-authored-by: michellelin1 <[email protected]>
    Co-authored-by: ThatMegamind <[email protected]>
    5 people authored Jan 3, 2024
    Configuration menu
    Copy the full SHA
    699f437 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Minor DB Updates (#32)

    * Create a pull trequest for branch 31-minor-db-updates
    
    * updated db model and queries
    
    ---------
    
    Co-authored-by: michellelin1 <[email protected]>
    ctc-devops and michellelin1 authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    39cccb0 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Protected routes have token refresh method, all CRUD methods work wit…

    …h the user database and firebase console (#37)
    
    * protected routes have method to refresh token, all CRUD Methods work with the database and firebase console.
    
    * took out console logs
    
    * removed test code
    
    ---------
    
    Co-authored-by: subinqkim <[email protected]>
    Co-authored-by: michellelin1 <[email protected]>
    3 people authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    1e5863b View commit details
    Browse the repository at this point in the history
  2. merged main into dev

    michellelin1 committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    50abe67 View commit details
    Browse the repository at this point in the history