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

Feature/ntgl 820 create friend group modal #822

Draft
wants to merge 99 commits into
base: dev
Choose a base branch
from
Draft

Feature/ntgl 820 create friend group modal #822

wants to merge 99 commits into from

Commits on Apr 24, 2024

  1. implemented friend group modal

    Jasmine Tran committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    a1eb47a View commit details
    Browse the repository at this point in the history

  2. customized chip selected

    Jasmine Tran committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    19d360f View commit details
    Browse the repository at this point in the history

  3. added tooltip for tags on selected friends

    Jasmine Tran committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    449997b View commit details
    Browse the repository at this point in the history

  4. removed close button styling

    Jasmine Tran committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    5268de7 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. clean up code and fixed darkmode appearance

    Jasmine Tran committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    ca04727 View commit details
    Browse the repository at this point in the history

  2. fixed lint issues

    Jasmine Tran committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    2e7971f View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. added new package: react-draggable-list and created a basic draggable… 

    … list with circles
    Jasmine Tran committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    9765940 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. displayed group image and group name in a tooltip

    Jasmine Tran committed May 1, 2024
    Configuration menu
    Copy the full SHA
    a399e34 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. changed group image to take in a image address instead of file upload

    Jasmine Tran committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1e54dc1 View commit details
    Browse the repository at this point in the history

  2. removed pointer over image circle

    Jasmine Tran committed May 2, 2024
    Configuration menu
    Copy the full SHA
    81f6d4c View commit details
    Browse the repository at this point in the history

  3. created a new folder: sidebar/addGroupDialgo and decomposed AddGroupD… 

    …ialog into its components
    Jasmine Tran committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d318452 View commit details
    Browse the repository at this point in the history

  4. removed inline styling cuz ray is a butt about it

    Jasmine Tran committed May 2, 2024
    Configuration menu
    Copy the full SHA
    575007f View commit details
    Browse the repository at this point in the history

  5. added background colour to sidebar

    Jasmine Tran committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c08e1e9 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. oidc tests

    @Rayahhhmed
    Rayahhhmed committed May 10, 2024
    Configuration menu
    Copy the full SHA
    9d89faa View commit details
    Browse the repository at this point in the history

  2. added nestjs support with auto timetabling

    @Rayahhhmed
    Rayahhhmed committed May 10, 2024
    Configuration menu
    Copy the full SHA
    1407cb1 View commit details
    Browse the repository at this point in the history

  3. added nestjs support with auto timetabling

    @Rayahhhmed
    Rayahhhmed committed May 10, 2024
    Configuration menu
    Copy the full SHA
    5c53bc6 View commit details
    Browse the repository at this point in the history

  4. removing controller test files for main app

    @Rayahhhmed
    Rayahhhmed committed May 10, 2024
    Configuration menu
    Copy the full SHA
    ae0e8c7 View commit details
    Browse the repository at this point in the history

  5. testing out no frozen lockfile for docker image

    @Rayahhhmed
    Rayahhhmed committed May 10, 2024
    Configuration menu
    Copy the full SHA
    0a926a7 View commit details
    Browse the repository at this point in the history

  6. Update ci.yml

    @Rayahhhmed
    Rayahhhmed committed May 10, 2024
    Configuration menu
    Copy the full SHA
    f6c15dd View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. added the old endpoints: Auth user, prisma and user as well as the pr… 

    …otobuf auto endpoints
    @Rayahhhmed
    Rayahhhmed committed May 11, 2024
    Configuration menu
    Copy the full SHA
    9af7d36 View commit details
    Browse the repository at this point in the history

  2. TLS error potentially caused by UNSW IT not renewing cert

    @Rayahhhmed
    Rayahhhmed committed May 11, 2024
    Configuration menu
    Copy the full SHA
    bc0b681 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. updating dockerignore to ignore extra bloat and gitignore to ignore m… 

    …igrations for prisma.
    @Rayahhhmed
    Rayahhhmed committed May 12, 2024
    Configuration menu
    Copy the full SHA
    d45b109 View commit details
    Browse the repository at this point in the history

  2. Updated format for files

    @Rayahhhmed
    Rayahhhmed committed May 12, 2024
    Configuration menu
    Copy the full SHA
    18a4de6 View commit details
    Browse the repository at this point in the history

  3. Prisma migration removed for now

    @Rayahhhmed
    Rayahhhmed committed May 12, 2024
    Configuration menu
    Copy the full SHA
    7e18c5c View commit details
    Browse the repository at this point in the history

  4. added example env files

    @Rayahhhmed
    Rayahhhmed committed May 12, 2024
    Configuration menu
    Copy the full SHA
    18f3808 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Add PUT user/profile endpoint, and complete PUT user settings endpoint

    @M7s7
    M7s7 committed May 13, 2024
    Configuration menu
    Copy the full SHA
    adebb6a View commit details
    Browse the repository at this point in the history

  2. Complete POST timetable endpoint

    @M7s7
    M7s7 committed May 13, 2024
    Configuration menu
    Copy the full SHA
    b8e1215 View commit details
    Browse the repository at this point in the history

  3. Edit timetable endpoint completed (not tested though lol - will do la… 

    …ter):
    @M7s7
    M7s7 committed May 13, 2024
    Configuration menu
    Copy the full SHA
    04f65d2 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. GET profile endpoint fixed and completed

    @M7s7
    M7s7 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    a5bf4d1 View commit details
    Browse the repository at this point in the history

  2. Complete GET settings endpoint

    @M7s7
    M7s7 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    82b890b View commit details
    Browse the repository at this point in the history

  3. GET timetable is working now

    @M7s7
    M7s7 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    95c0fb8 View commit details
    Browse the repository at this point in the history

  4. Delete timetable endpoint completed

    @M7s7
    M7s7 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    68ace61 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. added better mapping for sql name convention

    @Rayahhhmed
    Rayahhhmed committed May 19, 2024
    Configuration menu
    Copy the full SHA
    28ede1b View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Add friend/unfriend endpoints

    @M7s7
    M7s7 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    5ed1842 View commit details
    Browse the repository at this point in the history

  2. Add friends get req

    @M7s7
    M7s7 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    d8ac30e View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Friend request endpoints completed

    @M7s7
    M7s7 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f392753 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. resolved merge conflicts

    Jasmine Tran committed May 24, 2024
    Configuration menu
    Copy the full SHA
    2324ca3 View commit details
    Browse the repository at this point in the history

  2. added a toggle for choosing private or public group

    Jasmine Tran committed May 24, 2024
    Configuration menu
    Copy the full SHA
    22951f6 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. fixed styling of group privacy to a select menu

    Jasmine Tran committed May 25, 2024
    Configuration menu
    Copy the full SHA
    8f8be4d View commit details
    Browse the repository at this point in the history

  2. added groups endpoints

    @Rayahhhmed
    Rayahhhmed committed May 25, 2024
    Configuration menu
    Copy the full SHA
    48c1a93 View commit details
    Browse the repository at this point in the history

  3. added all the endpoints

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

Commits on May 26, 2024

  1. group post merged

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    ad72ad0 View commit details
    Browse the repository at this point in the history

  2. added seed script

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    1d239c9 View commit details
    Browse the repository at this point in the history

  3. added seed script

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    c22f262 View commit details
    Browse the repository at this point in the history

  4. adding some minor changes with source copying

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    6cb13d7 View commit details
    Browse the repository at this point in the history

  5. seed file was causing crashes

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    0f3b5e7 View commit details
    Browse the repository at this point in the history

  6. testing out types

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    6d92dc0 View commit details
    Browse the repository at this point in the history

  7. adding ci prisma gen

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    5d1cf20 View commit details
    Browse the repository at this point in the history

  8. fixed merge conflicts

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    fececcc View commit details
    Browse the repository at this point in the history

  9. added server config

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    cba92de View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feature/NTGL-820-create-friend-group-modal' into ntgl-g… 

    …roup-creation
    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    748af31 View commit details
    Browse the repository at this point in the history

  11. can call BE for groups

    @Rayahhhmed
    Rayahhhmed committed May 26, 2024
    Configuration menu
    Copy the full SHA
    8b710b2 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Resolve for promise return creation of groups added

    @Rayahhhmed
    Rayahhhmed committed May 27, 2024
    Configuration menu
    Copy the full SHA
    a0c2cf4 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. removed the extra files

    @Rayahhhmed
    Rayahhhmed committed May 28, 2024
    Configuration menu
    Copy the full SHA
    01c6297 View commit details
    Browse the repository at this point in the history

  2. added the group dialog file again

    @Rayahhhmed
    Rayahhhmed committed May 28, 2024
    Configuration menu
    Copy the full SHA
    af4432f View commit details
    Browse the repository at this point in the history

  3. testing new deletions

    @Rayahhhmed
    Rayahhhmed committed May 28, 2024
    Configuration menu
    Copy the full SHA
    3aafd26 View commit details
    Browse the repository at this point in the history

  4. moved prisma stuff to its own separate folder

    @Rayahhhmed
    Rayahhhmed committed May 28, 2024
    Configuration menu
    Copy the full SHA
    e6d1a48 View commit details
    Browse the repository at this point in the history

  5. changed around server files

    @Rayahhhmed
    Rayahhhmed committed May 28, 2024
    Configuration menu
    Copy the full SHA
    d3f5a66 View commit details
    Browse the repository at this point in the history

  6. cleaned up service

    @Rayahhhmed
    Rayahhhmed committed May 28, 2024
    Configuration menu
    Copy the full SHA
    446b15c View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'dev' into feature/NTGL-820-create-friend-group-modal

    Jasmine Tran committed May 30, 2024
    Configuration menu
    Copy the full SHA
    97127aa View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. new models

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

  2. Merge branch 'ntgl-group-creation' into feature/NTGL-820-create-frien… 

    …d-group-modal
    Jasmine Tran committed May 31, 2024
    Configuration menu
    Copy the full SHA
    57d7a32 View commit details
    Browse the repository at this point in the history

  3. merged rays backend and displaying group side bar

    Jasmine Tran committed May 31, 2024
    Configuration menu
    Copy the full SHA
    c9e5a73 View commit details
    Browse the repository at this point in the history

  4. placeholder for getGroups function when a new group is created

    Jasmine Tran committed May 31, 2024
    Configuration menu
    Copy the full SHA
    d3dd5b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. added notangles logo as the default image for creating a new group

    Jasmine Tran committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    209e91b View commit details
    Browse the repository at this point in the history

  2. fixed handleclose for resetting group image

    Jasmine Tran committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    ca1d37b View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. disabled create button when input is invalid and display red error af… 

    …ter user has interacted with the inputs
    Jasmine Tran committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    d8ee887 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. refactored group object

    Jasmine Tran committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    ea62310 View commit details
    Browse the repository at this point in the history

  2. fixed closing modal and resetting object

    Jasmine Tran committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    8400e05 View commit details
    Browse the repository at this point in the history

  3. resolved merge conflicts

    Jasmine Tran committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    7ea238c View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. TEMPORARY hard coded side bar

    Jasmine Tran committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    dc3cdfe View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. added context menu to friends sidebar

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

  2. fixed style and removed cursor style

    @nikkichins
    nikkichins committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    93c2ea4 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. groups sidebar

    Jasmine Tran committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    1012c68 View commit details
    Browse the repository at this point in the history

  2. resolved merge

    Jasmine Tran committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    b9bf79c View commit details
    Browse the repository at this point in the history

  3. changed group interface

    Jasmine Tran committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    db4a012 View commit details
    Browse the repository at this point in the history

  4. fixed group object

    Jasmine Tran committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    429af68 View commit details
    Browse the repository at this point in the history

  5. added delete group call to BE

    Jasmine Tran committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    45b2646 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. added styling to icons sidebar

    @nikkichins
    nikkichins committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    f9c5c0f View commit details
    Browse the repository at this point in the history

  2. added lock file

    @nikkichins
    nikkichins committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    6bc9312 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into feature/NTGL-820-create-friend-group-modal

    @nikkichins
    nikkichins committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    138b768 View commit details
    Browse the repository at this point in the history

  4. dialog changed

    Jasmine Tran committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    34d034c View commit details
    Browse the repository at this point in the history

  5. merged

    Jasmine Tran committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    4b9c5b0 View commit details
    Browse the repository at this point in the history

  6. adding controllers for group

    Jasmine Tran committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    280148d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/NTGL-820-create-friend-group-modal' of github.c… 

    …om:devsoc-unsw/notangles into feature/NTGL-820-create-friend-group-modal
    Jasmine Tran committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    4edcca9 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. merging main

    Jasmine Tran committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    605e47e View commit details
    Browse the repository at this point in the history

  2. merging main

    Jasmine Tran committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    37be2b9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into feature/NTGL-820-create-friend-group-modal

    Jasmine Tran committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    2fc85e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. backend route to getting groups of users

    Jasmine Tran committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    87b6894 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. fixed groupAdminsIDs set in the FE

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    34f08db View commit details
    Browse the repository at this point in the history

  2. group members work

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    d28f056 View commit details
    Browse the repository at this point in the history

  3. added admins

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    75cdfc1 View commit details
    Browse the repository at this point in the history

  4. user field is updated when group is created

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    75cba03 View commit details
    Browse the repository at this point in the history

  5. can finally see the groups!!

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    1c86c0a View commit details
    Browse the repository at this point in the history

  6. do not add group creator as a group member

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    aee9241 View commit details
    Browse the repository at this point in the history

  7. styled sidebar

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    704ec75 View commit details
    Browse the repository at this point in the history

  8. display default notangles logo

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    95fbb91 View commit details
    Browse the repository at this point in the history

  9. can delete groups

    Jasmine Tran committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    12468a3 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. edit group basic functionalities

    Jasmine Tran committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    7b17d09 View commit details
    Browse the repository at this point in the history