42CTF/website
42CTF
/
website
13
5
Fork 10
Code Issues 10 Pull Requests 1 Projects 9 Releases Wiki Activity

Podium added and working, logo and website of campuses added in campus model #76

Merged
Danhia merged 4 commits from ix/website:main into main 2022-08-27 10:47:47 +02:00
Conversation 0 Commits 4 Files Changed 9 +154 -55
ix commented 2022-08-19 15:46:01 +02:00
Member
Copy Link

The podium is good, but campuses need to have a logo with a greater width than height, like the 42angouleme one or 42lyon ( or 42ctf logo 8) ).

The podium is good, but campuses need to have a logo with a greater width than height, like the 42angouleme one or 42lyon ( or 42ctf logo 8) ).
ix added 1 commit 2022-08-19 15:46:02 +02:00
ix requested review from Danhia 2022-08-19 15:46:13 +02:00
ix added 1 commit 2022-08-19 15:51:16 +02:00
Danhia requested changes 2022-08-21 13:50:17 +02:00
src/accounts/migrations/0014_auto_20220818_1744.py
@ -0,0 +10,4 @@
]
operations = [
migrations.AlterField(
Danhia commented 2022-08-21 13:50:11 +02:00
Owner
Copy Link

Maybe you could merge this migration with the last one ?

Maybe you could merge this migration with the last one ?
ix commented 2022-08-22 20:50:27 +02:00
Author
Member
Copy Link

C'est à dire ?

C'est à dire ?
Danhia commented 2022-08-23 19:54:08 +02:00
Owner
Copy Link

T'as une migration de création de champs, et une migration de modification de ces même champs, donc tu pourrais juste créer les champs directement avec les bons attributs

T'as une migration de création de champs, et une migration de modification de ces même champs, donc tu pourrais juste créer les champs directement avec les bons attributs
Danhia commented 2022-08-27 10:46:28 +02:00
Owner
Copy Link

So apparently there is a feature in Django to squash migrations so we can worry about it later.
I will merge this PR as I currently really want to have the pretty scoreboard in production.

So apparently there is a feature in Django to [squash migrations](https://docs.djangoproject.com/en/dev/topics/migrations/#squashing-migrations) so we can worry about it later. I will merge this PR as I currently really want to have the pretty scoreboard in production.
Danhia marked this conversation as resolved
src/scoreboard/templates/scoreboard/network.html
@ -18,0 +33,4 @@
<br>
{{ top3.2.0 }}
</p>
</div>
Danhia commented 2022-08-21 13:47:43 +02:00
Owner
Copy Link

Did you hardcode the campuses logo for the podium ?

Did you hardcode the campuses logo for the podium ?
ix marked this conversation as resolved
ix added 1 commit 2022-08-21 20:37:32 +02:00
ix requested review from Danhia 2022-08-21 21:01:26 +02:00
Danhia approved these changes 2022-08-27 10:47:26 +02:00
Danhia left a comment
Owner
Copy Link

Let's go to preprod !

Let's go to preprod !
Danhia added 1 commit 2022-08-27 10:47:35 +02:00
Danhia merged commit 9ac003ea3c into main 2022-08-27 10:47:47 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Danhia
Labels
Clear labels   
bug

Something isn't working

  
documentation

Improvements or additions to documentation

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
translations

Translations problem

  
wontfix

This will not be worked on

No Label
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
translations
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: 42CTF/website#76
No description provided.
Delete Branch "ix/website:main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?