Mobile fixes
All checks were successful
Build Website / Build NPM Project (push) Successful in 1m35s
Build Website / Tag Version (push) Successful in 47s
Build Website / Build Container (push) Successful in 3m2s

This commit is contained in:
2026-06-05 22:54:31 -04:00
parent 16ddd1c8a3
commit 72e27eaedc
5 changed files with 36 additions and 6 deletions

View File

@@ -35,13 +35,26 @@
</ng-container> </ng-container>
</mat-menu> </mat-menu>
</ng-container> </ng-container>
<button mat-button [matMenuTriggerFor]="menu2" class="navbar-button">
Members <mat-icon>expand_more</mat-icon>
</button>
<mat-menu #menu2="matMenu">
<ng-container *ngIf="momentum.isLoggedIn | async; else guestItems">
<button *ngIf="momentum.admin | async" mat-menu-item (click)="openAdmin()">Admin</button>
<button mat-menu-item (click)="momentum.api.auth.logout()">Logout</button>
</ng-container>
<ng-template #guestItems>
<button mat-menu-item (click)="momentum.api.auth.handleLogin()">Login</button>
<button mat-menu-item (click)="openItem({label:'Register', url:'/register'})">Register</button>
</ng-template>
</mat-menu>
</div> </div>
<!-- Mobile NavBar--> <!-- Mobile NavBar-->
<button *ngIf="hamburger" mat-icon-button class="text-start" [matMenuTriggerFor]="menu"> <button *ngIf="hamburger" mat-icon-button class="text-start" [matMenuTriggerFor]="menu">
<mat-icon>menu</mat-icon> <mat-icon>menu</mat-icon>
</button> </button>
<mat-menu #menu="matMenu"> <mat-menu #menu="matMenu">
<button mat-menu-item *ngFor="let item of links.topLevel" (click)="openItem(item)">> <button mat-menu-item *ngFor="let item of links.topLevel" (click)="openItem(item)">
{{item.label}} {{item.label}}
</button> </button>
<ng-container *ngFor="let group of links.other"> <ng-container *ngFor="let group of links.other">
@@ -55,6 +68,19 @@
</ng-container> </ng-container>
</mat-menu> </mat-menu>
</ng-container> </ng-container>
<button mat-menu-item [matMenuTriggerFor]="menu3" class="navbar-button">
Members
</button>
<mat-menu #menu3="matMenu">
<ng-container *ngIf="momentum.isLoggedIn | async; else guestItems">
<button *ngIf="momentum.admin | async" mat-menu-item (click)="openAdmin()">Admin</button>
<button mat-menu-item (click)="momentum.api.auth.logout()">Logout</button>
</ng-container>
<ng-template #guestItems>
<button mat-menu-item (click)="momentum.api.auth.handleLogin()">Login</button>
<button mat-menu-item (click)="openItem({label:'Register', url:'/register'})">Register</button>
</ng-template>
</mat-menu>
</mat-menu> </mat-menu>
</mat-toolbar-row> </mat-toolbar-row>
</mat-toolbar> </mat-toolbar>

View File

@@ -34,6 +34,10 @@ export class NavbarComponent implements AfterViewInit, OnDestroy {
if(this.sub) this.sub.unsubscribe(); if(this.sub) this.sub.unsubscribe();
} }
openAdmin() {
location.href = '/ui';
}
openItem(item: NavigationItem) { openItem(item: NavigationItem) {
// Full url // Full url
if(item.url.startsWith('http')) if(item.url.startsWith('http'))

View File

@@ -14,7 +14,6 @@ export const NAVIGATION: NavigationGroup = [
{label: 'About', url: '/about'}, {label: 'About', url: '/about'},
{label: 'Contact', url: '/', fragment: 'contact'}, {label: 'Contact', url: '/', fragment: 'contact'},
{label: 'Gallery', url: '/gallery'}, {label: 'Gallery', url: '/gallery'},
{label: 'Resources', url: '/info/resources'},
]]}, ]]},
// {label: 'Learn', children: [[ // {label: 'Learn', children: [[
// {label: 'Trajan', url: '/info/trajan'}, // {label: 'Trajan', url: '/info/trajan'},
@@ -35,10 +34,11 @@ export const NAVIGATION: NavigationGroup = [
{label: 'Drill Commands', url: '/drill'}, {label: 'Drill Commands', url: '/drill'},
{label: 'Equipment', url: '/equipment'}, {label: 'Equipment', url: '/equipment'},
{label: 'Maintenance', url: '/maintenance'}, {label: 'Maintenance', url: '/maintenance'},
{label: 'Resources', url: '/info/resources'},
{label: 'Rules & Regulations', url: '/rules'}, {label: 'Rules & Regulations', url: '/rules'},
] ]
]}, ]},
{label: 'Members', children: [[ {label: 'Events', children: [[
{label: 'Calendar', url: '/events/calendar'}, {label: 'Calendar', url: '/events/calendar'},
], [ ], [
{label: 'Castra Aestiva', url: '/events/castra-aestiva'}, {label: 'Castra Aestiva', url: '/events/castra-aestiva'},

View File

@@ -38,7 +38,7 @@
<li>Enlist with your local reenactment group: <li>Enlist with your local reenactment group:
<ul> <ul>
<li><strong>Southern-Ontario</strong> - <a routerLink="/register">Enlist with Legio XXX</a></li> <li><strong>Southern-Ontario</strong> - <a routerLink="/register">Enlist with Legio XXX</a></li>
<li><em>Elsewhere</em> - <a href="" target="_blank">Find your local recruiter</a></li> <li><em>Elsewhere</em> - <a href="https://www.romanempire.net/roman_reenactment_groups.html" target="_blank">Find your local recruiter</a></li>
</ul> </ul>
<li>Familiarize yourself with our <a routerLink="/rules">Rules & Regulations</a></li> <li>Familiarize yourself with our <a routerLink="/rules">Rules & Regulations</a></li>
<li>Pick out a Roman name:</li> <li>Pick out a Roman name:</li>

View File

@@ -2,7 +2,7 @@
<div class="banner d-print-none"></div> <div class="banner d-print-none"></div>
<div class="cap-width py-5 px-3"> <div class="cap-width py-5 px-3">
<div> <div>
<img src="/assets/img/header.png" alt="Legio XXX" class="mx-auto d-block"> <img src="/assets/img/header.png" alt="Legio XXX" class="mx-auto d-block" style="width: 100%; height: auto;">
<hr> <hr>
</div> </div>