diff --git a/README.md b/README.md index 37b5e42..754fd3c 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,40 @@ # 291st JTF -[Clan page](https://291st.ca) for the 291st Joint Task Force -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.2.2. +--- + +> "Putting the Damned to Rest" + + +![Skull Sword and Globe Emblem](./src/assets/img/logo.png) + +This is the clan [website](https://291st.ca) for the 291st Joint Task Force. + +This project was generated using Angular 14. ## Table of Contents -[[_TOC_]] + +* [291st JTF](#291st-jtf) + * [Table of Contents](#table-of-contents) + * [Prerequisites](#prerequisites) + * [Setup](#setup) + * [Cheatsheet](#cheatsheet) + ## Prerequisites -- [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) -- [NodeJS 16](https://nodejs.org/en/) -- _[Docker](https://docs.docker.com/install/) (Optional)_ +- [NodeJS](https://nodejs.org/en/) +- [Docker](https://docs.docker.com/install/) ## Setup The project can either be run using NPM or Docker. NPM is recommended for development.
-NPM +NPM (Development) 1. Install the dependencies: `npm install` 2. Start the Angular server: `npm run start`
-Docker +Docker (Production) 1. Build the docker image: `docker build -t 291st: .` 2. Start the new image: `docker run -p 4200:80 291st:` diff --git a/angular.json b/angular.json index 2089dd8..4d27a47 100644 --- a/angular.json +++ b/angular.json @@ -21,7 +21,7 @@ "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.app.json", + "tsConfig": "tsconfig.json", "inlineStyleLanguage": "scss", "assets": [ "src/assets" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d508f10..3e7fced 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,8 +1,9 @@ import {NgModule} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; import {AppRouting} from './app.routing'; +import {DiscordComponent} from './components/discord/discord.component'; import {FooterComponent} from './components/footer/footer.component'; -import {NavbarComponent} from './components/navbar/navbar.component'; +import {ServersComponent} from './components/servers/servers.component'; import {AppComponent} from './containers/app/app.component'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {MaterialModule} from './material.module'; @@ -10,9 +11,10 @@ import {HomeComponent} from './views/home/home.component'; export const APP_COMPONENTS = [ AppComponent, - HomeComponent, + DiscordComponent, FooterComponent, - NavbarComponent + HomeComponent, + ServersComponent, ] @NgModule({ diff --git a/src/app/components/discord/discord.component.ts b/src/app/components/discord/discord.component.ts new file mode 100644 index 0000000..e655820 --- /dev/null +++ b/src/app/components/discord/discord.component.ts @@ -0,0 +1,7 @@ +import {Component} from '@angular/core'; + +@Component({ + selector: 'app-discord', + template: `` +}) +export class DiscordComponent { } diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html index d483af1..067bd8b 100644 --- a/src/app/components/footer/footer.component.html +++ b/src/app/components/footer/footer.component.html @@ -1,7 +1,7 @@