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

Add multiple positions per term per officer #996

Merged
merged 5 commits into from
Dec 7, 2023
Merged

Conversation

EthanThatOneKid
Copy link
Owner

@EthanThatOneKid EthanThatOneKid commented Dec 6, 2023

Background

Our data is structured such that each office may only have a single position per term (semester).

Dependencies

Changes

  • Update "Open Source Software Team" tiers in src/lib/public/board/data/tiers.json file and src/lib/public/board/data/teams.json file.
  • Fix getMembers in src/lib/public/board/utils.ts file.

Intends to resolve #995.

EthanThatOneKid and others added 2 commits December 6, 2023 00:26
commit c52c09a
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 00:25:55 2023 -0800

    add gamedev team section

    - introduce rumble animation.

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit b8459c8
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 00:10:10 2023 -0800

    add special events team section

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit 11d201c
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:52:37 2023 -0800

    add splash of color to team title elements

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit ca0f0f5
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:45:06 2023 -0800

    update tiers of marketing officers/historians

commit 1ed6cfe
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:36:58 2023 -0800

    refactor `Members` component props

commit 96c0f84
Merge: 77c2f6b 3f6bd73
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:12:26 2023 -0800

    Merge branch 'main' into switching-terms

commit 77c2f6b
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:06:43 2023 -0800

    Update package-lock.json

commit b2c8cd8
Merge: 27ab1e7 3ee4672
Author: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:02:13 2023 -0800

    Merge branch 'main' into switching-terms

commit 27ab1e7
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:29:01 2023 -0800

    Game Dev and Nodebuds toggle based on term

commit fcfbad9
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:15:29 2023 -0800

    As #1 Matt fan, I updated Matt's discord username

commit 2e88798
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:05:48 2023 -0800

    cleaned up conditions

commit 1fae3f3
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 22:51:35 2023 -0800

    Changed Dev and Algo logos, added oldLogoSrc to every team

commit 78d9d8b
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 21:05:16 2023 -0800

    formatted, added alt text

commit 60a07fd
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 21:02:54 2023 -0800

    Changed Design logo to Create logo when switching terms

commit 37aec5f
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 20:33:48 2023 -0800

    Changed pop-up animation to portrait-rotate animation
Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>
Copy link

netlify bot commented Dec 6, 2023

Deploy Preview for acmcsuf ready!

Name Link
🔨 Latest commit 9bfc76d
🔍 Latest deploy log https://app.netlify.com/sites/acmcsuf/deploys/657137f45bd88800086a686c
😎 Deploy Preview https://deploy-preview-996--acmcsuf.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@EthanThatOneKid EthanThatOneKid marked this pull request as ready for review December 7, 2023 02:08
Copy link
Collaborator

@karnikaavelumani karnikaavelumani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you for the hard work!

@EthanThatOneKid EthanThatOneKid merged commit 37ed29f into main Dec 7, 2023
5 checks passed
@EthanThatOneKid EthanThatOneKid deleted the fix/995 branch December 8, 2023 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make position.tier to position.tiers
2 participants