ztimson/legio-30
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Updated styling

Browse Source
This commit is contained in:
Zakary Timson
2022-09-24 17:54:51 -04:00
parent 0e76d7c1b1
commit 6b6765891b
25 changed files with 206 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/banner/banner.component.html
View File

@ -12,7 +12,7 @@
<mat-icon *ngIf="manual">play_arrow</mat-icon>
</div>
<div *ngIf="!manual" class="banner-seal d-flex flex-column align-items-center justify-content-center">
<img src="/assets/img/spqr.png" class="mt-5" alt="SPQR" height="250" width="250" style="filter: drop-shadow(2px 4px 6px black);">
<img src="/assets/img/eagle.png" class="mt-5" alt="SPQR" height="250" width="250" style="filter: drop-shadow(2px 4px 6px black);">
<div>
<a class="text-white" routerLink="" fragment="about">
<i class="fa fa-angle-double-down fa-4x" style="filter: drop-shadow(2px 4px 6px black);"></i>

2
src/app/components/banner/banner.component.scss
View File

@ -23,7 +23,7 @@
.banner-next {
position: absolute;
top: 50%;
right: 50px;
right: 26px;
transform: translate(-50%, -50%);
}

5
src/app/components/banner/banner.component.ts
View File

@ -1,13 +1,10 @@
import {
AfterViewInit,
Component,
ElementRef,
Host,
HostListener,
Input,
OnDestroy,
OnInit,
ViewChild
OnInit
} from '@angular/core';
import {interval, Subscription} from 'rxjs';
import {shuffle} from '../../misc/utils';

53
src/app/components/footer/footer.component.html
View File

@ -1,7 +1,7 @@
<footer>
<div class="social text-center py-3">
<div class="social text-center py-3" style="background: #990000">
<h2 class="mb-4">Follow us on social media</h2>
<div class="d-flex justify-content-around mx-auto" style="max-width: 300px">
<div class="d-flex justify-content-around mx-auto transparent-link" style="max-width: 300px">
<a href="https://discord.gg/wW458KYR79" target="_blank">
<i class="fa-brands fa-discord fa-2xl"></i>
</a>
@ -18,47 +18,18 @@
<i class="fa-brands fa-youtube fa-2xl"></i>
</a>
</div>
<h3 class="mt-4 mb-0">so we can invade your feed</h3>
<h3 class="mt-4 mb-0">so we can invade your feed ⚔️</h3>
</div>
<div class="p-2" style="background: #333">
<div class="mx-auto d-flex justify-content-around" style="max-width: 800px">
<div>
<h2 class="sitemap-header">Home</h2>
<div style="background: #333">
<div class="mx-auto d-flex justify-content-center flex-wrap">
<div *ngFor="let group of navigation" class="m-3" style="min-width: 175px">
<h2 class="sitemap-header">{{group.label}}</h2>
<ul class="m-0">
<li><a routerLink="/">About</a></li>
<li><a routerLink="/">Contact</a></li>
<li><a routerLink="/">Gallery</a></li>
</ul>
</div>
<div>
<h2 class="sitemap-header">Events</h2>
<ul class="m-0">
<li><a routerLink="/">Castra Aestiva</a></li>
<li><a routerLink="/">Castra Hiberna</a></li>
<li><a routerLink="/">Callendar</a></li>
</ul>
</div>
<div>
<h2 class="sitemap-header">Learn</h2>
<ul class="m-0">
<li><a routerLink="/">Legio XXX</a></li>
<li><a routerLink="/">Legion Camp</a></li>
<li><a routerLink="/">Legion Headquarters</a></li>
<li><a routerLink="/">Legion Organization</a></li>
<li><a routerLink="/">Legionairy Equipment</a></li>
<li><a routerLink="/">Legionairy Training</a></li>
<li><a routerLink="/">Resources</a></li>
</ul>
</div>
<div>
<h2 class="sitemap-header">Members</h2>
<ul class="m-0">
<li><a routerLink="/">Getting Started</a></li>
<li><a routerLink="/">Rules & Regulations</a></li>
<li><a routerLink="/">Approved Vendors</a></li>
<li><a routerLink="/">Kit Assembly</a></li>
<li><a routerLink="/">Kit Maintinance</a></li>
<li><a routerLink="/">Login/Register</a></li>
<ng-container *ngFor="let section of group.children">
<li *ngFor="let item of section">
<a [routerLink]="item.url" [fragment]="item.fragment">{{item.label}}</a>
</li>
</ng-container>
</ul>
</div>
</div>

9
src/app/components/footer/footer.component.scss
View File

@ -8,16 +8,7 @@ ul {
margin: 0;
}
.social {
background: #7f0000;
a, a:visited { color: #fff; }
a:hover, a:visited:hover { color: rgba(255, 255, 255, 0.8); }
}
.copywright {
a, a:visited { color: #b10000; }
a:hover, a:visited:hover { color: #cc0000; }
}

5
src/app/components/footer/footer.component.ts
View File

@ -1,8 +1,11 @@
import {Component} from '@angular/core';
import {NAVIGATION} from '../../misc/navigation';
@Component({
selector: 'xxx-footer',
templateUrl: './footer.component.html',
styleUrls: ['./footer.component.scss']
})
export class FooterComponent { }
export class FooterComponent {
navigation = NAVIGATION;
}

64
src/app/components/navbar/navbar.component.html
View File

@ -1,51 +1,20 @@
<mat-toolbar>
<mat-toolbar-row>
<div>
<a class="navbar-brand d-flex align-items-center" routerLink="/" fragment="banner">
<img src="assets/img/capricorn.png" alt="Capricorn" height="45" width="45">
<a class="navbar-brand d-flex align-items-center" routerLink="/" fragment="banner" (click)="scroll('banner')">
<img src="assets/img/capricorn.png" alt="Capricorn" height="45px" width="45px">
<div class="px-2">LEGIO · XXX</div>
</a>
</div>
<div class="flex-grow-1"></div>
<div *ngIf="!hamburger">
<a routerLink="/" fragment="about"><button mat-button class="navbar-button">About</button></a>
<a routerLink="/" fragment="contact"><button mat-button class="navbar-button">Contact</button ></a>
<a routerLink="gallery"><button mat-button class="navbar-button">Gallery</button></a>
<button mat-button [matMenuTriggerFor]="eventsMenu" class="navbar-button">
Events <mat-icon>expand_more</mat-icon>
</button>
<mat-menu #eventsMenu="matMenu">
<button mat-menu-item>Castra Aestiva</button>
<button mat-menu-item>Castra Hiberna</button>
<mat-divider></mat-divider>
<button mat-menu-item>Calendar</button>
</mat-menu>
<button mat-button [matMenuTriggerFor]="learnMenu" class="navbar-button">
Learn <mat-icon>expand_more</mat-icon>
</button>
<mat-menu #learnMenu="matMenu">
<button mat-menu-item>Legio XXX</button>
<button mat-menu-item>Legion Camp</button>
<button mat-menu-item>Legion Headquarters</button>
<button mat-menu-item>Legion Organization</button>
<button mat-menu-item>Legionairy Equipment</button>
<button mat-menu-item>Legionairy Training</button>
<mat-divider></mat-divider>
<button mat-menu-item>Resources</button>
</mat-menu>
<button mat-button [matMenuTriggerFor]="membersMenu" class="navbar-button">
Members <mat-icon>expand_more</mat-icon>
</button>
<mat-menu #membersMenu="matMenu">
<button mat-menu-item>Getting Started</button>
<button mat-menu-item>Rules & Regulations</button>
<mat-divider></mat-divider>
<button mat-menu-item>Kit Assembly</button>
<button mat-menu-item>Kit Maintinance</button>
<button mat-menu-item>Trusted Vendors</button>
<mat-divider></mat-divider>
<button mat-menu-item>Login/Register</button>
</mat-menu>
<a *ngFor="let item of links.topLevel" [routerLink]="item.url" [fragment]="item.fragment"
(click)="item.fragment ? scroll(item.fragment) : null">
<button mat-button class="navbar-button">{{item.label}}</button>
</a>
<ng-container *ngFor="let group of links.other">
<ng-template [ngTemplateOutlet]="navGroup" [ngTemplateOutletContext]="{'$implicit': group}"></ng-template>
</ng-container>
</div>
<button *ngIf="hamburger" mat-icon-button class="mr-3">
<mat-icon (click)="hamburgerClick.emit()">menu</mat-icon>
@ -53,3 +22,18 @@
</mat-toolbar-row>
</mat-toolbar>
<div class="navbar-spacing"><!-- Spacing --></div>
<ng-template #navGroup let-group>
<button mat-button [matMenuTriggerFor]="menu" class="navbar-button">
{{group.label}} <mat-icon>expand_more</mat-icon>
</button>
<mat-menu #menu="matMenu">
<ng-container *ngFor="let section of group.children; let first = first">
<mat-divider *ngIf="!first"></mat-divider>
<button *ngFor="let item of section" mat-menu-item [routerLink]="item.url" [fragment]="item.fragment"
(click)="item.fragment ? scroll(item.fragment) : null">
{{item.label}}
</button>
</ng-container>
</mat-menu>
</ng-template>

16
src/app/components/navbar/navbar.component.scss
View File

@ -19,19 +19,16 @@
color: #fff;
font-weight: lighter;
&:hover img {
filter: brightness(5%) sepia(75) saturate(100) hue-rotate(25deg);
}
&:hover img { filter: brightness(5%) sepia(75) saturate(100) hue-rotate(25deg); }
&:hover, &:visited:hover { color: #b10000; }
}
.navbar-button {
//color: rgba(255, 255, 255, 0.55);
color: rgba(255, 255, 255, 0.6);
font-weight: normal;
padding: 0 8px 0 8px;
//&:hover {
// color: rgba(255, 255, 255, 0.75);
//}
&:hover { color: #b10000; }
}
}
@ -48,11 +45,10 @@
}
button {
color: rgba(255, 255, 255, 0.6);
height: 36px;
line-height: 36px;
&:hover {
background: rgba(255, 255, 255, 0.15) !important;
}
&:hover { color: #b10000; }
}
}

8
src/app/components/navbar/navbar.component.ts
View File

@ -1,6 +1,7 @@
import {AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output} from '@angular/core';
import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
import {filter, Subscription} from 'rxjs';
import {NAVIGATION} from '../../misc/navigation';
@Component({
selector: 'xxx-navbar',
@ -10,6 +11,11 @@ import {filter, Subscription} from 'rxjs';
export class NavbarComponent implements AfterViewInit, OnDestroy {
private sub!: Subscription;
links = {
topLevel: NAVIGATION[0].children[0],
other: NAVIGATION.slice(1)
}
@Input() hamburger = true;
@Output() hamburgerClick = new EventEmitter<void>();
@ -18,7 +24,9 @@ export class NavbarComponent implements AfterViewInit, OnDestroy {
ngAfterViewInit() {
this.sub = this.route.fragment.subscribe(frag => {
console.log('fire');
if(frag) this.scroll(frag);
else this.scroll('top');
});
}

1
src/app/containers/app/app.component.html
View File

@ -1,5 +1,6 @@
<xxx-navbar [hamburger]="mobile"></xxx-navbar>
<div class="fill app-container">
<div id="top"></div>
<router-outlet></router-outlet>
<xxx-footer></xxx-footer>
</div>

44
src/app/misc/navigation.ts Normal file
View File

@ -0,0 +1,44 @@
export type NavigationItem = {
label: string,
url: string,
fragment?: string
};
export type NavigationGroup = {
label: string,
children: NavigationItem[][]
}[];
export const NAVIGATION: NavigationGroup = [
{label: 'Home', children: [[
{label: 'About', url: '/', fragment: 'about'},
{label: 'Contact', url: '/', fragment: 'contact'},
{label: 'Gallery', url: '/gallery'},
]]},
{label: 'Events', children: [[
{label: 'Castra Aestiva', url: '/event', fragment: 'aestiva'},
{label: 'Castra Hiberna', url: '/event', fragment: 'hiberna'},
], [
{label: 'Calendar', url: '/event/calendar'},
]]},
{label: 'Learn', children: [[
{label: 'Legio XXX', url: '/info/legio-xxx'},
{label: 'Legion Camp', url: '/info/legion-camp'},
{label: 'Legion Headquarters', url: '/info/legion-headquarters'},
{label: 'Legion Organization', url: '/info/legion-organization'},
{label: 'Legionairy Equipment', url: '/info/legionairy-equipment'},
{label: 'Legionairy Training', url: '/info/legionairy-training'},
], [
{label: 'Resources', url: '/info/resources'},
]]},
{label: 'Reenact', children: [[
{label: 'Getting Started', url: '/getting-started'},
{label: 'Rules & Regulations', url: '/rules'},
], [
{label: 'Kit Assembly', url: '/diy'},
{label: 'Kit Maintinance', url: '/info/maintinance'},
{label: 'Trusted Vendors', url: '/vendors'},
], [
{label: 'Login/Register', url: '/login'},
]]},
]

5
src/app/views/404/404.component.html
View File

@ -1,11 +1,12 @@
<section class="p-5 invert">
<div class="d-flex justify-content-center">
<div class="d-flex justify-content-center text-center">
<div>
<img src="/assets/img/column.png" alt="" height="300px" width="auto">
</div>
<div class="d-flex flex-column align-items-center justify-content-center px-5">
<h1>CDIV</h1>
<h2>404</h2>
<h3>Page Not Found</h3>
<p>Page Not Found</p>
</div>
<div>
<img src="/assets/img/column.png" alt="" height="300px" width="auto">

95
src/app/views/home/home.component.html
View File

@ -1,52 +1,75 @@
<!-- Banner -->
<header id="banner" class="fill w-100">
<xxx-banner></xxx-banner>
</header>
<section id="about" class="d-flex flex-column align-items-center bg-black text-white" style="height: 100vh">
<div class="mb-5 py-5"><!-- Spacer --></div>
<h2>About</h2>
<div class="container">
<div class="d-flex align-items-center justify-content-around">
<div class="">
<img src="/assets/img/trajan.png" height="auto" width="275px">
</div>
<div class="text-center">
<h4>Legio XXX Vlpia Victrix</h4>
<h4 class="mb-4">(Trajan's Victorious Thirtieth Legion)</h4>
<p>Legio XXX is a North American Roman re-enactment group that has been active since 2004.</p>
<p>It's members represent a cross between living history enthusiasts and edutainers</p>
<p>recreating the lives of LEGIO XXX, founded by emperor Trajan in the 2nd centery AD.</p>
</div>
<div class="ps-4">
<div class="p-1 text-center" style="border: solid 5px white;">
<div class="p-1" style="border: dashed 5px white;">
<div class="p-3" style="border: solid 5px white;">
<h3 class="text-nowrap" style="font-size: 2em">LEGIO · XXX</h3>
<img src="/assets/img/capricorn.png" class="my-3" alt="capricorn" height="140em" width="140em">
<h4 class="text-nowrap" style="font-size: 1.5em">VLPIA · VICTRIX</h4>
</div>
</div>
</div>
<!-- ABout -->
<section id="about" class="d-flex flex-column flex-md-row align-items-center justify-content-center bg-black text-white fill py-5 py-md-0">
<div class="d-none d-md-inline flex-grow-1 text-end" style="flex-basis: 0">
<img src="/assets/img/trajan2.png" alt="Statue of Trajan" height="450px" width="auto">
</div>
<div class="flex-grow-0 text-center px-5">
<h1>About</h1>
<h2>Legio XXX - Vlpia Victrix</h2>
<h3 class="mb-4">(Trajan's Victorious Thirtieth Legion)</h3>
<p>
Legio XXX is a North American Roman reenactment group established in 2004.
<br><br>
It's members represent a cross between living history enthusiasts and "edutainers"
<br><br>
that recreate the lives of soldiers found in Trajan's leagions during the 1st - 2nd Century AD
</p>
</div>
<div class="flex-md-grow-1" style="flex-basis: 0">
<img class="mt-5" src="/assets/img/standard.png" alt="Legio XXX Standard" height="250px" width="auto">
</div>
</section>
<!-- Discord -->
<section class="d-flex" style="background-color: #990000">
<div class="d-flex flex-grow-1">
<div class="h-100 w-100" style="background: #7289d9"></div>
<img class="d-block d-md-none" src="/assets/img/discord.png" height="100px" width="auto">
<img class="d-none d-md-block" src="/assets/img/discord.png" height="200px" width="auto">
</div>
<div class="d-flex justify-content-start align-items-center flex-grow-1 p-3">
<div class="d-block text-center">
<h1 class="d-block m-0 mb-md-3 transparent-link">
<a href="https://discord.gg/wW458KYR79" target="_blank">Join us on Discord</a>
</h1>
<div class="d-none d-md-inline">
<p>
Ask us questions, get involved
<br><br>
and celebrate the glory of Rome with us!
</p>
</div>
</div>
</div>
</section>
<section id="recruitment" class="d-flex flex-column align-items-center" style="height: 100vh; background: #fff; color: #000;">
<div class="mb-5 py-5"><!-- Spacer --></div>
<div class="d-flex align-items-center justify-content-center">
<div>
<img src="/assets/img/recruitment.png" height="500px" width="auto">
</div>
<div class="ms-5 text-center">
<!-- Recruitment -->
<section id="recruitment" class="d-flex flex-column flex-md-row align-items-center justify-content-center fill invert">
<div class="flex-grow-1 p-5 pb-0 text-center text-md-end" style="flex-basis: 0">
<img src="/assets/img/recruitment.png" alt="I want you for Legio XXX" style="max-width: min(90%, 400px)">
</div>
<div class="d-flex flex-grow-1 justify-content-start align-items-center" style="flex-basis: 0">
<div class="d-block text-center">
<h2>Enlist Today!</h2>
<p>Legio XXX is looking for new recruits.</p>
<p>Check out the <a>Getting Started</a> page to learn more</p>
<p>and <a>register here.</a></p>
<p>
Interested in any <a routerLink="/calendar">events</a>?
<br><br>
Legio XXX is looking for new recruits.
<br><br>
Check out the <a routerLink="/getting-starterd">Getting Started</a> page to learn more
<br><br>
or <a routerLink="/login">register here.</a>
</p>
</div>
</div>
</section>
<!-- Page Break-->
<section style="background: #fff">
<img src="/assets/img/formation.png" width="100%" height="auto">
<img src="/assets/img/formation.png" alt="Legion formation" width="100%" height="auto" style="transform: translateY(10px)">
</section>
<!-- Contact -->
<section id="contact" class="d-flex flex-column align-items-center py-5 bg-black text-white" style="min-height: 100vh">
<div class="mb-5 py-5"><!-- Spacer --></div>
<h2>Contact</h2>

3
src/app/views/home/home.component.ts
View File

@ -1,4 +1,5 @@
import {Component} from '@angular/core';
import {NAVIGATION} from '../../misc/navigation';
@Component({
selector: 'xxx-home',
@ -6,5 +7,5 @@ import {Component} from '@angular/core';
styleUrls: ['./home.component.scss']
})
export class HomeComponent {
navigation = NAVIGATION;
}