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

Sprint 1 - Shared Components and Layout #24

Merged
merged 25 commits into from
May 23, 2024
Merged

Sprint 1 - Shared Components and Layout #24

merged 25 commits into from
May 23, 2024

Commits on Feb 13, 2024

  1. initialize branch

    @gnimnix
    gnimnix committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    904fbf1 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. nav bar codes

    @rachelsitoh
    rachelsitoh committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    7d0f665 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. add react-router-dom to yarn packages list

    @gnimnix
    gnimnix committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    0cc8c0e View commit details
    Browse the repository at this point in the history

  2. import navbars to show on index page

    @gnimnix
    gnimnix committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    6a1076e View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. fixed and added navbar onto app.tsx

    @rachelsitoh
    rachelsitoh committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    4d5a05a View commit details
    Browse the repository at this point in the history

  2. changed to css modules

    @rachelsitoh
    rachelsitoh committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    3b2121f View commit details
    Browse the repository at this point in the history

  3. handle changing window size for desktop and mobile

    @rachelsitoh
    rachelsitoh committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    86683ae View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge remote-tracking branch 'origin/main' into epic/DEV-4-shared-com… 

    …ponents-and-layouts
    @gnimnix
    gnimnix committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    9a01dfb View commit details
    Browse the repository at this point in the history

  2. add trial code for layout container

    markgcera committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    725d90b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #42 from markgcera/layout 

    add trial code for layout container
    @markgcera
    markgcera authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    131a8e4 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. used clickaway hook to handle profile clickaway

    @rachelsitoh
    rachelsitoh committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    59f95ee View commit details
    Browse the repository at this point in the history

  2. Merge branch 'epic/DEV-4-shared-components-and-layouts' into feature/… 

    …TAS-12-nav-bar

# Conflicts:
#	package.json
#	public/fintech_logo.png
#	public/material-symbols_close.png
#	public/person_logo.png
#	src/assets/css/App.css
#	src/routes/shared/TestPage.tsx
#	yarn.lock
    @gnimnix
    gnimnix committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    814bddc View commit details
    Browse the repository at this point in the history

  3. added namespace for files

    @gnimnix
    gnimnix committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    b7b9e7b View commit details
    Browse the repository at this point in the history

  4. refactored code

    @gnimnix
    gnimnix committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    7363050 View commit details
    Browse the repository at this point in the history

  5. updated imports

    @gnimnix
    gnimnix committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    81512ac View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. changed to hover and resized profile logo

    @rachelsitoh
    rachelsitoh committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    a357435 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. update yarn packages and fixed syntax

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

  2. Merge pull request #26 from NUS-Fintech-Society/feature/TAS-12-nav-bar 

    nav bar codes
    @gnimnix
    gnimnix authored May 19, 2024
    Configuration menu
    Copy the full SHA
    2a04a85 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/epic/DEV-4-shared-c… 

    …omponents-and-layouts' into feature/TAS-13-Layout

# Conflicts:
#	src/routes/App.tsx
    @gnimnix
    gnimnix committed May 22, 2024
    Configuration menu
    Copy the full SHA
    67b6807 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #43 from NUS-Fintech-Society/feature/TAS-13-Layout 

    Feature/tas 13 layout
    @gnimnix
    gnimnix authored May 22, 2024
    Configuration menu
    Copy the full SHA
    30f32ce View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. updated packages

    @gnimnix
    gnimnix committed May 23, 2024
    Configuration menu
    Copy the full SHA
    8cbe95a View commit details
    Browse the repository at this point in the history

  2. typo

    @gnimnix
    gnimnix committed May 23, 2024
    Configuration menu
    Copy the full SHA
    5e1138d View commit details
    Browse the repository at this point in the history

  3. set default font family

    @gnimnix
    gnimnix committed May 23, 2024
    Configuration menu
    Copy the full SHA
    d307161 View commit details
    Browse the repository at this point in the history

  4. integrated layouts

    @gnimnix
    gnimnix committed May 23, 2024
    Configuration menu
    Copy the full SHA
    01f431f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #45 from NUS-Fintech-Society/fix/DEV-4-quickfix 

    Fix/dev 4 quickfix
    @gnimnix
    gnimnix authored May 23, 2024
    Configuration menu
    Copy the full SHA
    d7a1c5c View commit details
    Browse the repository at this point in the history