Skip to content

Conversation

@AnCichocka
Copy link
Collaborator

@AnCichocka AnCichocka commented Dec 14, 2024

  • refactor all edition sections besides photos

@AnCichocka
Copy link
Collaborator Author

@Szyntos please check all awards with tooltips values (if they are correct), on student profile, edition chest section

@AnCichocka AnCichocka marked this pull request as ready for review December 17, 2024 21:02
@AnCichocka AnCichocka requested a review from Szyntos December 17, 2024 22:07
Copy link
Owner

@Szyntos Szyntos left a comment

Choose a reason for hiding this comment

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

^^

@AnCichocka AnCichocka merged commit c0f6360 into main Dec 17, 2024
Szyntos added a commit that referenced this pull request Dec 18, 2024
* xategory section

* add level sets

* fix level section

* add award cards

* add student

* fix award

* add groups

* add some card styles to utils

* add grade to animal tooltip

* adjust award tooltips

* add props to animal card

* add info to student card

* add info to group card

* add missing chests section

* add grading checks

* improve chest card

* wrap empty string in custom test

* update grading checks

* fix margin problem

* add edition navar

* fix points

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Szyntos added a commit that referenced this pull request Dec 21, 2024
* Added {

* docker-compose change

* Centralized dotenvs

* Added secrets-free firebaseConfig.ts

* added export of env vars

* moved devcontainer

* Fox

* Fox

* Fix

* fuix

* fuix

* fuix

* Fix

* Fix

* Fixes

* Fix

* Fix

* Fix

* Fix

* amd

* Fix

* arm

* amd

* amd

* remove platform

* both on amd

* Fixed posturl

* publicIP

* publicIP

* publicIP

* publicIP

* fix

* Fix

* DO_INSERT_FILES

* backend fix

* Fixed local

* demo script

* Working bypass

* added persistent storage for files

* deployment

* Better handling of data

* [0] New UI (#207)

* [0] Automatic Deployment (#206)

* Added {

* docker-compose change

* Centralized dotenvs

* Added secrets-free firebaseConfig.ts

* added export of env vars

* moved devcontainer

* Fox

* Fox

* Fix

* fuix

* fuix

* fuix

* Fix

* Fix

* Fixes

* Fix

* Fix

* Fix

* Fix

* amd

* Fix

* arm

* amd

* amd

* remove platform

* both on amd

* Fixed posturl

* publicIP

* publicIP

* publicIP

* publicIP

* fix

* Fix

* DO_INSERT_FILES

* backend fix

* Fixed local

* demo script

* Working bypass

* added persistent storage for files

* deployment

* Better handling of data

* [FE] Meeting UI adjustments (#205)

* use real data

* display time without seconds

* add levels to progress bar

* delete unnecessary undefines

* add categories permission to user

* add border to categories menu

* change styling of filter buttons

* center checkboxes

* add student name to hall of fame, make paddings on cards consistent

* add check section

* apply dark mode

* fix subcategory bug

* export

* add teacher hall of fame screen

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* Fix merge

* Translations and stuff (#215)

* tokens-shape (#210)

* tokens-shape

* fix gitignore

* [FE] group screen ui (#211)

* fix height of table

* fix headers names

* fix table

* Fix file upload (#213)

* Change frontend to polish (#199)

* change components to polish ;_;

* frontend to polish done

* frontend repair

* merge

* More translations

---------

Co-authored-by: Szymon Nowak-Trzos <szymtos@gmail.com>

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Co-authored-by: Julia Smerdel <97158770+Jullija@users.noreply.github.com>

* [FE] Coordinatior UI (#212) (#218)

* xategory section

* add level sets

* fix level section

* add award cards

* add student

* fix award

* add groups

* add some card styles to utils

* add grade to animal tooltip

* adjust award tooltips

* add props to animal card

* add info to student card

* add info to group card

* add missing chests section

* add grading checks

* improve chest card

* wrap empty string in custom test

* update grading checks

* fix margin problem

* add edition navar

* fix points

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* translations and fixes (#230)

* Fixed Change Group (#229)

* Category COlors (#227)

* Translated backend (#225)

* delete cache (#220)

* [FE-302 FE-312 FE-324] small fixes (#228)

* add is active to edition card

* move logout icon to end of the navbar

* do not display chests quantity when there are no chests

* fix students searcher

* chenge text on users section searcher

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* Merge

* Fix init-data

* Add deactivation

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Co-authored-by: Julia Smerdel <97158770+Jullija@users.noreply.github.com>
Co-authored-by: AnCichocka <annacichocka.poczta@gmail.com>
Szyntos added a commit that referenced this pull request Dec 22, 2024
* Added {

* docker-compose change

* Centralized dotenvs

* Added secrets-free firebaseConfig.ts

* added export of env vars

* moved devcontainer

* Fox

* Fox

* Fix

* fuix

* fuix

* fuix

* Fix

* Fix

* Fixes

* Fix

* Fix

* Fix

* Fix

* amd

* Fix

* arm

* amd

* amd

* remove platform

* both on amd

* Fixed posturl

* publicIP

* publicIP

* publicIP

* publicIP

* fix

* Fix

* DO_INSERT_FILES

* backend fix

* Fixed local

* demo script

* Working bypass

* added persistent storage for files

* deployment

* Better handling of data

* [0] New UI (#207)

* [0] Automatic Deployment (#206)

* Added {

* docker-compose change

* Centralized dotenvs

* Added secrets-free firebaseConfig.ts

* added export of env vars

* moved devcontainer

* Fox

* Fox

* Fix

* fuix

* fuix

* fuix

* Fix

* Fix

* Fixes

* Fix

* Fix

* Fix

* Fix

* amd

* Fix

* arm

* amd

* amd

* remove platform

* both on amd

* Fixed posturl

* publicIP

* publicIP

* publicIP

* publicIP

* fix

* Fix

* DO_INSERT_FILES

* backend fix

* Fixed local

* demo script

* Working bypass

* added persistent storage for files

* deployment

* Better handling of data

* [FE] Meeting UI adjustments (#205)

* use real data

* display time without seconds

* add levels to progress bar

* delete unnecessary undefines

* add categories permission to user

* add border to categories menu

* change styling of filter buttons

* center checkboxes

* add student name to hall of fame, make paddings on cards consistent

* add check section

* apply dark mode

* fix subcategory bug

* export

* add teacher hall of fame screen

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* Fix merge

* Translations and stuff (#215)

* tokens-shape (#210)

* tokens-shape

* fix gitignore

* [FE] group screen ui (#211)

* fix height of table

* fix headers names

* fix table

* Fix file upload (#213)

* Change frontend to polish (#199)

* change components to polish ;_;

* frontend to polish done

* frontend repair

* merge

* More translations

---------

Co-authored-by: Szymon Nowak-Trzos <szymtos@gmail.com>

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Co-authored-by: Julia Smerdel <97158770+Jullija@users.noreply.github.com>

* [FE] Coordinatior UI (#212) (#218)

* xategory section

* add level sets

* fix level section

* add award cards

* add student

* fix award

* add groups

* add some card styles to utils

* add grade to animal tooltip

* adjust award tooltips

* add props to animal card

* add info to student card

* add info to group card

* add missing chests section

* add grading checks

* improve chest card

* wrap empty string in custom test

* update grading checks

* fix margin problem

* add edition navar

* fix points

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* translations and fixes (#230)

* Fixed Change Group (#229)

* Category COlors (#227)

* Translated backend (#225)

* delete cache (#220)

* [FE-302 FE-312 FE-324] small fixes (#228)

* add is active to edition card

* move logout icon to end of the navbar

* do not display chests quantity when there are no chests

* fix students searcher

* chenge text on users section searcher

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* Merge

* Fix init-data

* Add deactivation

* Fix timezones

* deploy.sh executable

* Fix timezones2

* Better subcats

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Co-authored-by: Julia Smerdel <97158770+Jullija@users.noreply.github.com>
Co-authored-by: AnCichocka <annacichocka.poczta@gmail.com>
Szyntos added a commit that referenced this pull request Dec 22, 2024
* Added teacherId to HoF (#237)

* [0] Another Release fixes (#238)

* Added {

* docker-compose change

* Centralized dotenvs

* Added secrets-free firebaseConfig.ts

* added export of env vars

* moved devcontainer

* Fox

* Fox

* Fix

* fuix

* fuix

* fuix

* Fix

* Fix

* Fixes

* Fix

* Fix

* Fix

* Fix

* amd

* Fix

* arm

* amd

* amd

* remove platform

* both on amd

* Fixed posturl

* publicIP

* publicIP

* publicIP

* publicIP

* fix

* Fix

* DO_INSERT_FILES

* backend fix

* Fixed local

* demo script

* Working bypass

* added persistent storage for files

* deployment

* Better handling of data

* [0] New UI (#207)

* [0] Automatic Deployment (#206)

* Added {

* docker-compose change

* Centralized dotenvs

* Added secrets-free firebaseConfig.ts

* added export of env vars

* moved devcontainer

* Fox

* Fox

* Fix

* fuix

* fuix

* fuix

* Fix

* Fix

* Fixes

* Fix

* Fix

* Fix

* Fix

* amd

* Fix

* arm

* amd

* amd

* remove platform

* both on amd

* Fixed posturl

* publicIP

* publicIP

* publicIP

* publicIP

* fix

* Fix

* DO_INSERT_FILES

* backend fix

* Fixed local

* demo script

* Working bypass

* added persistent storage for files

* deployment

* Better handling of data

* [FE] Meeting UI adjustments (#205)

* use real data

* display time without seconds

* add levels to progress bar

* delete unnecessary undefines

* add categories permission to user

* add border to categories menu

* change styling of filter buttons

* center checkboxes

* add student name to hall of fame, make paddings on cards consistent

* add check section

* apply dark mode

* fix subcategory bug

* export

* add teacher hall of fame screen

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* Fix merge

* Translations and stuff (#215)

* tokens-shape (#210)

* tokens-shape

* fix gitignore

* [FE] group screen ui (#211)

* fix height of table

* fix headers names

* fix table

* Fix file upload (#213)

* Change frontend to polish (#199)

* change components to polish ;_;

* frontend to polish done

* frontend repair

* merge

* More translations

---------

Co-authored-by: Szymon Nowak-Trzos <szymtos@gmail.com>

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Co-authored-by: Julia Smerdel <97158770+Jullija@users.noreply.github.com>

* [FE] Coordinatior UI (#212) (#218)

* xategory section

* add level sets

* fix level section

* add award cards

* add student

* fix award

* add groups

* add some card styles to utils

* add grade to animal tooltip

* adjust award tooltips

* add props to animal card

* add info to student card

* add info to group card

* add missing chests section

* add grading checks

* improve chest card

* wrap empty string in custom test

* update grading checks

* fix margin problem

* add edition navar

* fix points

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* translations and fixes (#230)

* Fixed Change Group (#229)

* Category COlors (#227)

* Translated backend (#225)

* delete cache (#220)

* [FE-302 FE-312 FE-324] small fixes (#228)

* add is active to edition card

* move logout icon to end of the navbar

* do not display chests quantity when there are no chests

* fix students searcher

* chenge text on users section searcher

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>

* Merge

* Fix init-data

* Add deactivation

* Fix timezones

* deploy.sh executable

* Fix timezones2

* Better subcats

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Co-authored-by: Julia Smerdel <97158770+Jullija@users.noreply.github.com>
Co-authored-by: AnCichocka <annacichocka.poczta@gmail.com>

* [288] Added stats (#195)

* Added stats

* add modal tmp

* student done

* merge main

* add statistics for teacher and coordinator

* add highlight

* add generated name

* change filter item

* fix error

* fix

* add card styles

* mui slider colors

---------

Co-authored-by: AnCichocka <annacichocka.poczta@gmail.com>

---------

Co-authored-by: Anna Cichocka <115690306+AnCichocka@users.noreply.github.com>
Co-authored-by: Julia Smerdel <97158770+Jullija@users.noreply.github.com>
Co-authored-by: AnCichocka <annacichocka.poczta@gmail.com>
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