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 master #253

Merged
merged 14 commits into from
Nov 2, 2024
Merged

Merge master #253

merged 14 commits into from
Nov 2, 2024

Conversation

Suboyyy
Copy link
Contributor

@Suboyyy Suboyyy commented Oct 10, 2024

Merge master

TODO

  • inverser images restricted et invite (dev & prod)
  • Ajouter façon de sélectionner une image de profil disponible sur l'upload avec le "single custom"
  • changer couleur font
  • décaler hauteur nom+prénom
  • enlever variables environnement inutiles
  • vérifier utilité du field commissionRole en mode "single custom"

Changes

  • DiscordID in the superSearch
  • Adding some test
  • Full Custom Badges
  • Badge images in a volume

Suboyyy and others added 7 commits October 3, 2024 22:08
* feat: adding test for createCart (user)

* Update createCart.test.ts

* fix: seems to be good

* fix: respo ssl not full access

* feat: vieux are invite

* fix: invite does not exist in this branche

---------

Co-authored-by: Antoine D <[email protected]>
* feat: create majority filter (#238)

Co-authored-by: Antoine D <[email protected]>
Co-authored-by: Remi-pcn <[email protected]>

* fix: plus d'info sensible quand on cherche /api/teams/:teamID

* fix: changed filter

* fix: badge in descending order

---------

Co-authored-by: Antoine D <[email protected]>
Co-authored-by: Antoine D <[email protected]>
* feat: custom badge don't anymore call database (fullcustom), badges don't match with permissions

* feat: change environments variables, badge image must be in base64

* feat: all images are now in .env

* fix: removed badge background from files

* fix: add default images

* fix: badgePermission type can be invite

* fix: badge base64 webp support

* fix: remove all async (lint)

* fix: env working for tests

* feat: vieux are now invite

* fix: env test on ci

* fix: lint

* fix: modify single custom badge test

* fix: lint

---------

Co-authored-by: Antoine D <[email protected]>
Co-authored-by: Noé Landré <[email protected]>
Co-authored-by: Antoine D <[email protected]>
* fix: refactor badge.ts to use volume system for image loading

* fix: lint

* fix: update env

---------

Co-authored-by: Antoine D <[email protected]>
src/utils/env.ts Outdated Show resolved Hide resolved
tests/admin/badges/generateBadges.test.ts Outdated Show resolved Hide resolved
src/utils/badge.ts Outdated Show resolved Hide resolved
src/utils/badge.ts Outdated Show resolved Hide resolved
Copy link

codecov bot commented Oct 11, 2024

Codecov Report

Attention: Patch coverage is 91.17647% with 3 lines in your changes missing coverage. Please review.

Project coverage is 95.11%. Comparing base (a9bc61c) to head (5c28a74).
Report is 17 commits behind head on master.

Files with missing lines Patch % Lines
src/utils/badge.ts 89.65% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #253      +/-   ##
==========================================
+ Coverage   94.91%   95.11%   +0.20%     
==========================================
  Files         121      121              
  Lines        2812     2825      +13     
  Branches      426      425       -1     
==========================================
+ Hits         2669     2687      +18     
+ Misses        107      106       -1     
+ Partials       36       32       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Suboyyy and others added 2 commits October 11, 2024 12:49
* refactor: remove unused badge environment variables

* refactor: remove unused commissionRole field in generateBadges.test.ts

* fix: update text color in generateBadge function

* fix: adjust vertical positioning of last name in generateBadge function

* feat: add image field to BadgeField interface

---------

Co-authored-by: Antoine D <[email protected]>
* refactor: remove unused badge environment variables

* refactor: remove unused commissionRole field in generateBadges.test.ts

* fix: update text color in generateBadge function

* fix: adjust vertical positioning of last name in generateBadge function

* feat: add image field to BadgeField interface

* feat: add badges to gitignore

* fix: text color depending of the badge color (daltonian friendly)

* fix: it's better like that

---------

Co-authored-by: Antoine D <[email protected]>
Remi-pcn
Remi-pcn previously approved these changes Oct 12, 2024
tests/admin/badges/generateBadges.test.ts Show resolved Hide resolved
* feat: orga place on badges (Orgas and single custom generation only)

* feat: first-aid logo if firstaid perm + place in database

* fix: lint

* feat: tests?

---------

Co-authored-by: Antoine D <[email protected]>
@Suboyyy Suboyyy requested a review from tuturd October 31, 2024 21:50
tuturd
tuturd previously approved these changes Oct 31, 2024
@Suboyyy Suboyyy merged commit 6474f52 into master Nov 2, 2024
11 checks passed
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.

3 participants