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

Enowars5 #34

Merged
merged 11 commits into from
Jul 9, 2021
Merged

Enowars5 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
015f5d7
remove unecessary files
DanielHabenicht Jul 8, 2021
6ccd6ed
add attack info
DanielHabenicht Jul 8, 2021
cb59144
Merge branch 'enowars:enowars5' into enowars5
DanielHabenicht Jul 8, 2021
e4a3819
use scoreboad files locally
DanielHabenicht Jul 9, 2021
a954b0c
add nologo graphic
DanielHabenicht Jul 9, 2021
737152f
add buttons
DanielHabenicht Jul 9, 2021
8f0cf9f
add readme
DanielHabenicht Jul 9, 2021
3f79e77
add comments
DanielHabenicht Jul 9, 2021
3a290e7
remove seed actions for now
DanielHabenicht Jul 9, 2021
f6466ff
add check in link
DanielHabenicht Jul 9, 2021
7cf7c55
Merge branch 'enowars5' into enowars5
DanielHabenicht Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions EnoLandingPageBackend/ClientApp/src/app/modules/app-navigation/app-navigation.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,18 @@
CTF Registration closing in 
<ng-container *ngTemplateOutlet="countdown"></ng-container>&nbsp;
<a
*ngIf="!(authenticated$ | async)"
[href]="'/api/account/login?redirectUri=' + currentUrl"
>Register Now!</a
>
</ng-container>
<ng-container *ngIf="ctfCheckinOpen$ | async">
CTF CheckIn closing in&nbsp;
<ng-container *ngTemplateOutlet="countdown"></ng-container>
.&nbsp; Check in now!
.&nbsp;
<a
[href]="'/api/account/login?redirectUri=' + currentUrl"
>Check in now!</a
>
</ng-container>
<ng-container
*ngIf="
Expand Down
9 changes: 5 additions & 4 deletions EnoLandingPageBackend/Database/LandingPageDatabaseInitalizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ public class LandingPageDatabaseInitializer
{
public static async Task Seed(LandingPageDatabase context)
{
if (!(await context.GetTeams(new System.Threading.CancellationToken())).Any())
{
await context.GetOrUpdateLandingPageTeam(1, "testTeam", null, null, null, new System.Threading.CancellationToken());
}
// Comment in after enowars5 is over
// if (!(await context.GetTeams(new System.Threading.CancellationToken())).Any())
// {
// await context.GetOrUpdateLandingPageTeam(1, "testTeam", null, null, null, new System.Threading.CancellationToken());
// }
}
}
}