diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b83fbf4b..a6e04053 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,9 +82,4 @@ jobs: - name: Update Release notes run: | echo 'Update Release Notes...' - npm run gren:release -- --token=${{ secrets.GREN_GITHUB_TOKEN }} - - - name: Update Release notes - run: | - echo 'Update Changelog...' - npm run gren:release -- --token=${{ secrets.GREN_GITHUB_TOKEN }} + npm run gren -- --token=${{ secrets.GREN_GITHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 06c30036..66e7d5c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: echo 'Running Protractor on Angular Application...' yarn e2e - - name: Running Test Script on Angular Application - run: | - echo 'Running Test Script on Angular Application...' - yarn test \ No newline at end of file + # - name: Running Test Script on Angular Application + # run: | + # echo 'Running Test Script on Angular Application...' + # yarn test \ No newline at end of file diff --git a/package.json b/package.json index 5301f7aa..e4b16630 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chapter-website", - "version": "0.5.0", + "version": "0.1.2", "private": true, "contributors": [ "Adrian Darian", @@ -13,8 +13,7 @@ "deploy": "yarn build && ngh --branch=gh-pages --no-silent", "docker": "ng serve --host 0.0.0.0 --port 4200 & ngtw watch", "e2e": "ng e2e", - "gren:changelog": "gren changelog --generate --override --tags=all --config=.grenrc.js", - "gren:release": "gren release --override --tags=all --config=.grenrc.js", + "gren": "gren release --override --tags=all --config=.grenrc.js", "lint": "ng lint", "ng": "ng", "prestart": "ngtw build", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 169ccd34..ffa814cf 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -6,9 +6,8 @@ import { CoffeeNCodeComponent, ProjectsComponent, WorkshopsComponent, - InterviewsComponent, MembersComponent, - AccountComponent, + NotFoundComponent, LoginComponent, SignUpComponent, EventsComponent, @@ -36,10 +35,6 @@ const routes: Routes = [ path: "workshops", component: WorkshopsComponent }, - { - path: "interview", - component: InterviewsComponent - }, { path: "members", component: MembersComponent @@ -60,6 +55,10 @@ const routes: Routes = [ path: "", redirectTo: "/home", pathMatch: "full" + }, + { + path: "**", + component: NotFoundComponent } ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 615ffba7..b7c10ff9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,5 @@ // Core Utility Imports import { NgModule, APP_INITIALIZER } from "@angular/core"; -import { Store } from "@ngrx/store"; import { BrowserModule } from "@angular/platform-browser"; import { HttpClientModule } from "@angular/common/http"; import { ReactiveFormsModule } from "@angular/forms"; @@ -14,8 +13,6 @@ import { AppComponent } from "./app.component"; // Main app import import { TitleComponent, CoffeeComponent, - WorkshopCardComponent, - ProjectsDisplayComponent, TerminalComponent } from "./components"; @@ -28,20 +25,17 @@ import { DashboardComponent, LanComponent, CodeEditorComponent, - InterviewsComponent, CalendarComponent, MembersComponent, - AccountComponent, LoginComponent, SignUpComponent, - EventsComponent + EventsComponent, + NotFoundComponent } from "./containers"; // NgRx Store Imports import { RootStoreModule, - RootStoreState, - MemberStoreActions } from "./root-store"; // Data Services @@ -59,17 +53,14 @@ import { DataService } from "./services/data.service"; DashboardComponent, LanComponent, CodeEditorComponent, - InterviewsComponent, CalendarComponent, MembersComponent, LoginComponent, - AccountComponent, - WorkshopCardComponent, - ProjectsDisplayComponent, LoginComponent, SignUpComponent, TerminalComponent, - EventsComponent + EventsComponent, + NotFoundComponent ], imports: [ HttpClientModule, diff --git a/src/app/components/coffee/coffee.component.html b/src/app/components/Coffee/coffee.component.html similarity index 100% rename from src/app/components/coffee/coffee.component.html rename to src/app/components/Coffee/coffee.component.html diff --git a/src/app/components/coffee/coffee.component.scss b/src/app/components/Coffee/coffee.component.scss similarity index 100% rename from src/app/components/coffee/coffee.component.scss rename to src/app/components/Coffee/coffee.component.scss diff --git a/src/app/components/coffee/coffee.component.spec.ts b/src/app/components/Coffee/coffee.component.spec.ts similarity index 100% rename from src/app/components/coffee/coffee.component.spec.ts rename to src/app/components/Coffee/coffee.component.spec.ts diff --git a/src/app/components/coffee/coffee.component.ts b/src/app/components/Coffee/coffee.component.ts similarity index 100% rename from src/app/components/coffee/coffee.component.ts rename to src/app/components/Coffee/coffee.component.ts diff --git a/src/app/components/terminal/terminal.component.html b/src/app/components/Terminal/terminal.component.html similarity index 100% rename from src/app/components/terminal/terminal.component.html rename to src/app/components/Terminal/terminal.component.html diff --git a/src/app/components/terminal/terminal.component.scss b/src/app/components/Terminal/terminal.component.scss similarity index 100% rename from src/app/components/terminal/terminal.component.scss rename to src/app/components/Terminal/terminal.component.scss diff --git a/src/app/components/terminal/terminal.component.spec.ts b/src/app/components/Terminal/terminal.component.spec.ts similarity index 100% rename from src/app/components/terminal/terminal.component.spec.ts rename to src/app/components/Terminal/terminal.component.spec.ts diff --git a/src/app/components/terminal/terminal.component.ts b/src/app/components/Terminal/terminal.component.ts similarity index 100% rename from src/app/components/terminal/terminal.component.ts rename to src/app/components/Terminal/terminal.component.ts diff --git a/src/app/components/title/title.component.html b/src/app/components/Title/title.component.html similarity index 100% rename from src/app/components/title/title.component.html rename to src/app/components/Title/title.component.html diff --git a/src/app/components/title/title.component.scss b/src/app/components/Title/title.component.scss similarity index 100% rename from src/app/components/title/title.component.scss rename to src/app/components/Title/title.component.scss diff --git a/src/app/components/title/title.component.spec.ts b/src/app/components/Title/title.component.spec.ts similarity index 100% rename from src/app/components/title/title.component.spec.ts rename to src/app/components/Title/title.component.spec.ts diff --git a/src/app/components/title/title.component.ts b/src/app/components/Title/title.component.ts similarity index 100% rename from src/app/components/title/title.component.ts rename to src/app/components/Title/title.component.ts diff --git a/src/app/components/index.ts b/src/app/components/index.ts index 63b0d5e3..249e9bf4 100644 --- a/src/app/components/index.ts +++ b/src/app/components/index.ts @@ -1,13 +1,9 @@ -import { TitleComponent } from "./title/title.component"; -import { CoffeeComponent } from "./coffee/coffee.component"; -import { WorkshopCardComponent } from "./workshop-card/workshop-card.component"; -import { ProjectsDisplayComponent } from "./projects-display/projects-display.component"; -import { TerminalComponent } from "./terminal/terminal.component"; +import { TitleComponent } from "./Title/title.component"; +import { CoffeeComponent } from "./Coffee/coffee.component"; +import { TerminalComponent } from "./Terminal/terminal.component"; export { TitleComponent, CoffeeComponent, - WorkshopCardComponent, - ProjectsDisplayComponent, TerminalComponent }; diff --git a/src/app/components/projects-display/projects-display.component.html b/src/app/components/projects-display/projects-display.component.html deleted file mode 100644 index 80dc5d0b..00000000 --- a/src/app/components/projects-display/projects-display.component.html +++ /dev/null @@ -1,261 +0,0 @@ -
-
-

Projects at ACM

-

ACM offers many projects to advance your CSE Skills and your Resume

- -
- - -
-
-
-
- Card Image -
-

ACM Website - -

-
-
- - -

- Build a Robust Website for the Club -

- -
-
- -
Front End
-
    -
  • Angular
  • -
  • Yarn
  • -
  • HTML
  • -
  • CSS
  • -
-
- -
-
Back End
-
    -
  • NGRX
  • -
  • Databases
  • -
  • Node.js
  • -
-
- - -
-
-
-
-
- -
-
-
- Card Image -
-

Video Game CNN's - -

-
-
-

- Construct an Algorithm for a Game -

- -
-
-
Front End
-
    -
  • Angular
  • -
  • Yarn
  • -
  • HTML
  • -
  • CSS
  • -
-
-
-
Back End
-
    -
  • NGRX
  • -
  • Databases
  • -
  • Node.js
  • -
  • Java Script
  • -
-
-
-
-
-
-
-
-
-
- Card Image -
-

HandWriting CLI - -

-
-
-

- Create an app that can detect handwriting styles -

- -
-
-
Front End
-
    -
  • Angular
  • -
  • Yarn
  • -
  • HTML
  • -
  • CSS
  • -
-
-
-
Back End
-
    -
  • NGRX
  • -
  • Databases
  • -
  • Node.js
  • -
  • Java Script
  • -
-
-
-
-
-
-
-
- -
-
-
-
- Card Image -
-

ACM Website - -

-
-
-

- Build a Robust Website for the Club -

- -
-
-
Front End
-
    -
  • Angular
  • -
  • Yarn
  • -
  • HTML
  • -
  • CSS
  • -
-
-
-
Back End
-
    -
  • NGRX
  • -
  • Databases
  • -
  • Node.js
  • -
  • Java Script
  • -
-
-
-
-
-
-
- -
-
-
- Card Image -
-

Video Game CNN - -

-
-
-

- Construct an Algorithm for a Game -

- -
-
-
Front End
-
    -
  • Angular
  • -
  • Yarn
  • -
  • HTML
  • -
  • CSS
  • -
-
-
-
Back End
-
    -
  • NGRX
  • -
  • Databases
  • -
  • Node.js
  • -
  • Java Script
  • -
-
-
-
-
-
-
-
-
-
- Card Image -
-

HandWriting CLI - -

-
-
-

- Create an app that can detect handwriting styles -

- -
-
-
Front End
-
    -
  • Angular
  • -
  • Yarn
  • -
  • HTML
  • -
  • CSS
  • -
-
-
-
Back End
-
    -
  • NGRX
  • -
  • Databases
  • -
  • Node.js
  • -
  • Java Script
  • -
-
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/src/app/components/projects-display/projects-display.component.scss b/src/app/components/projects-display/projects-display.component.scss deleted file mode 100644 index a1087c11..00000000 --- a/src/app/components/projects-display/projects-display.component.scss +++ /dev/null @@ -1,185 +0,0 @@ -.projects-display { - background-image: linear-gradient(147deg, black 0%, #3498db 74%); - text-align: center; - - background-image: linear-gradient(147deg, aqua 0%, #3498db 74%); - background-size: 800% 800%; - - -webkit-animation: AnimationName 11s ease infinite; - -moz-animation: AnimationName 11s ease infinite; - animation: AnimationName 11s ease infinite; - - @-webkit-keyframes AnimationName { - 0% { - background-position: 0% 51%; - } - 50% { - background-position: 100% 50%; - } - 100% { - background-position: 0% 51%; - } - } - @-moz-keyframes AnimationName { - 0% { - background-position: 0% 51%; - } - 50% { - background-position: 100% 50%; - } - 100% { - background-position: 0% 51%; - } - } - @keyframes AnimationName { - 0% { - background-position: 0% 51%; - } - 50% { - background-position: 100% 50%; - } - 100% { - background-position: 0% 51%; - } - } -} - -.c-card:hover { - transform: scale(1.1); /* (150% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ -} - -.list { - font-size: 24px; -} -.list-title { - font-weight: bold; - font-size: 30px; -} - -.card { - background: #fff; - border-radius: 2px; - display: inline-block; - height: 350px; - margin: 1rem; - position: relative; - width: 350px; -} - -.card-1 { - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); - transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1); - background-image: linear-gradient(147deg, aqua 0%, #3498db 74%); - font-family: "Poppins", sans-serif; - border-radius: 10px; -} - -.jumbotron { - color: black; - font-size: medium; - font-family: "Poppins", sans-serif; - height: 250px; - // background-image: linear-gradient(147deg, aqua 0%, #3498DB 74%); - text-align: left; -} - -#button { - background-image: linear-gradient(147deg, black 0%, #3498db 74%); -} - -#titleOne { - text-align: middle; -} -* { - box-sizing: border-box; -} -html { - font-family: Sans-Serif; - padding: 1px 0; -} - -.u-visually-hidden { - position: absolute; - transform: translateX(9999px); -} -.o { - &-button { - padding: 10px 10px; - &--float-left { - float: left; - } - &--full-width { - width: 100%; - } - &--half-width { - width: 50%; - } - } - &-card { - margin: 20px auto; - &--mod-small { - max-width: 400px; - } - &--mod-medium { - max-width: 600px; - } - &--mod-large { - max-width: 800px; - } - } -} - -.c-button { - background-color: rgba(32, 125, 226, 0); - border: solid 1px rgba(32, 125, 226, 1); - &:hover { - background-color: rgba(32, 125, 226, 1); - color: white; - } - &--full-width { - width: 100%; - } -} - -.c-card { - transition: transform 0.2s; - border-radius: 10px; - box-shadow: 0px 5px 30px 0px rgba(0, 0, 0, 0.75); - &_body { - padding: 20px; - } - &_image { - border-top-right-radius: 10px; - border-top-left-radius: 10px; - width: 100%; - - } - &_title { - font-size: 1.75em; - } - &_secondary-title { - font-size: 1.25em; - } - &_text { - font-size: 1em; - } -} -.cardSection { - background-image: linear-gradient(147deg, aqua 0%, #3498db 74%); -} - -.c-card_body { - background-color: white; - text-align: left; - border-radius: 10px; -} - -ul { - text-align: left; - padding: 40px; - display: inline-block; -} - -.max-w-sm rounded overflow-hidden shadow-lg { - border-radius: 50px; -} diff --git a/src/app/components/projects-display/projects-display.component.spec.ts b/src/app/components/projects-display/projects-display.component.spec.ts deleted file mode 100644 index 9594206d..00000000 --- a/src/app/components/projects-display/projects-display.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { async, ComponentFixture, TestBed } from "@angular/core/testing"; - -import { ProjectsDisplayComponent } from "./projects-display.component"; - -describe("ProjectsDisplayComponent", () => { - let component: ProjectsDisplayComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ProjectsDisplayComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ProjectsDisplayComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it("should create", () => { - expect(component).toBeTruthy(); - - }); - - - -}); - - - diff --git a/src/app/components/projects-display/projects-display.component.ts b/src/app/components/projects-display/projects-display.component.ts deleted file mode 100644 index f3be109f..00000000 --- a/src/app/components/projects-display/projects-display.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from "@angular/core"; -import { Projects } from "src/app/models/projects"; - -@Component({ - selector: "app-projects-display", - templateUrl: "./projects-display.component.html", - styleUrls: ["./projects-display.component.scss"] -}) -export class ProjectsDisplayComponent implements OnInit { - constructor() { - } - ngOnInit() { - } -} diff --git a/src/app/components/workshop-card/workshop-card.component.html b/src/app/components/workshop-card/workshop-card.component.html deleted file mode 100644 index 7164dae5..00000000 --- a/src/app/components/workshop-card/workshop-card.component.html +++ /dev/null @@ -1 +0,0 @@ -

workshop-card works!

diff --git a/src/app/components/workshop-card/workshop-card.component.scss b/src/app/components/workshop-card/workshop-card.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/components/workshop-card/workshop-card.component.spec.ts b/src/app/components/workshop-card/workshop-card.component.spec.ts deleted file mode 100644 index b45440f2..00000000 --- a/src/app/components/workshop-card/workshop-card.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from "@angular/core/testing"; - -import { WorkshopCardComponent } from "./workshop-card.component"; - -describe("WorkshopCardComponent", () => { - let component: WorkshopCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [WorkshopCardComponent] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(WorkshopCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it("should create", () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/workshop-card/workshop-card.component.ts b/src/app/components/workshop-card/workshop-card.component.ts deleted file mode 100644 index a0f95fd4..00000000 --- a/src/app/components/workshop-card/workshop-card.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component, OnInit } from "@angular/core"; - -@Component({ - selector: "app-workshop-card", - templateUrl: "./workshop-card.component.html", - styleUrls: ["./workshop-card.component.scss"] -}) -export class WorkshopCardComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} diff --git a/src/app/containers/calendar/calendar.component.html b/src/app/containers/Calendar/calendar.component.html similarity index 100% rename from src/app/containers/calendar/calendar.component.html rename to src/app/containers/Calendar/calendar.component.html diff --git a/src/app/containers/calendar/calendar.component.scss b/src/app/containers/Calendar/calendar.component.scss similarity index 100% rename from src/app/containers/calendar/calendar.component.scss rename to src/app/containers/Calendar/calendar.component.scss diff --git a/src/app/containers/calendar/calendar.component.spec.ts b/src/app/containers/Calendar/calendar.component.spec.ts similarity index 100% rename from src/app/containers/calendar/calendar.component.spec.ts rename to src/app/containers/Calendar/calendar.component.spec.ts diff --git a/src/app/containers/calendar/calendar.component.ts b/src/app/containers/Calendar/calendar.component.ts similarity index 100% rename from src/app/containers/calendar/calendar.component.ts rename to src/app/containers/Calendar/calendar.component.ts diff --git a/src/app/containers/code-editor/code-editor.component.html b/src/app/containers/CodeEditor/code-editor.component.html similarity index 100% rename from src/app/containers/code-editor/code-editor.component.html rename to src/app/containers/CodeEditor/code-editor.component.html diff --git a/src/app/containers/code-editor/code-editor.component.scss b/src/app/containers/CodeEditor/code-editor.component.scss similarity index 100% rename from src/app/containers/code-editor/code-editor.component.scss rename to src/app/containers/CodeEditor/code-editor.component.scss diff --git a/src/app/containers/code-editor/code-editor.component.spec.ts b/src/app/containers/CodeEditor/code-editor.component.spec.ts similarity index 100% rename from src/app/containers/code-editor/code-editor.component.spec.ts rename to src/app/containers/CodeEditor/code-editor.component.spec.ts diff --git a/src/app/containers/code-editor/code-editor.component.ts b/src/app/containers/CodeEditor/code-editor.component.ts similarity index 100% rename from src/app/containers/code-editor/code-editor.component.ts rename to src/app/containers/CodeEditor/code-editor.component.ts diff --git a/src/app/containers/coffee-n-code/coffee-n-code.component.html b/src/app/containers/CoffeeAndCode/coffee-n-code.component.html similarity index 100% rename from src/app/containers/coffee-n-code/coffee-n-code.component.html rename to src/app/containers/CoffeeAndCode/coffee-n-code.component.html diff --git a/src/app/containers/coffee-n-code/coffee-n-code.component.scss b/src/app/containers/CoffeeAndCode/coffee-n-code.component.scss similarity index 100% rename from src/app/containers/coffee-n-code/coffee-n-code.component.scss rename to src/app/containers/CoffeeAndCode/coffee-n-code.component.scss diff --git a/src/app/containers/coffee-n-code/coffee-n-code.component.spec.ts b/src/app/containers/CoffeeAndCode/coffee-n-code.component.spec.ts similarity index 100% rename from src/app/containers/coffee-n-code/coffee-n-code.component.spec.ts rename to src/app/containers/CoffeeAndCode/coffee-n-code.component.spec.ts diff --git a/src/app/containers/coffee-n-code/coffee-n-code.component.ts b/src/app/containers/CoffeeAndCode/coffee-n-code.component.ts similarity index 100% rename from src/app/containers/coffee-n-code/coffee-n-code.component.ts rename to src/app/containers/CoffeeAndCode/coffee-n-code.component.ts diff --git a/src/app/containers/dashboard/dashboard.component.html b/src/app/containers/Dashboard/dashboard.component.html similarity index 100% rename from src/app/containers/dashboard/dashboard.component.html rename to src/app/containers/Dashboard/dashboard.component.html diff --git a/src/app/containers/dashboard/dashboard.component.scss b/src/app/containers/Dashboard/dashboard.component.scss similarity index 100% rename from src/app/containers/dashboard/dashboard.component.scss rename to src/app/containers/Dashboard/dashboard.component.scss diff --git a/src/app/containers/dashboard/dashboard.component.spec.ts b/src/app/containers/Dashboard/dashboard.component.spec.ts similarity index 100% rename from src/app/containers/dashboard/dashboard.component.spec.ts rename to src/app/containers/Dashboard/dashboard.component.spec.ts diff --git a/src/app/containers/dashboard/dashboard.component.ts b/src/app/containers/Dashboard/dashboard.component.ts similarity index 100% rename from src/app/containers/dashboard/dashboard.component.ts rename to src/app/containers/Dashboard/dashboard.component.ts diff --git a/src/app/containers/events/events.component.html b/src/app/containers/Events/events.component.html similarity index 100% rename from src/app/containers/events/events.component.html rename to src/app/containers/Events/events.component.html diff --git a/src/app/containers/events/events.component.scss b/src/app/containers/Events/events.component.scss similarity index 100% rename from src/app/containers/events/events.component.scss rename to src/app/containers/Events/events.component.scss diff --git a/src/app/containers/events/events.component.spec.ts b/src/app/containers/Events/events.component.spec.ts similarity index 100% rename from src/app/containers/events/events.component.spec.ts rename to src/app/containers/Events/events.component.spec.ts diff --git a/src/app/containers/events/events.component.ts b/src/app/containers/Events/events.component.ts similarity index 100% rename from src/app/containers/events/events.component.ts rename to src/app/containers/Events/events.component.ts diff --git a/src/app/containers/home/home.component.html b/src/app/containers/Home/home.component.html similarity index 100% rename from src/app/containers/home/home.component.html rename to src/app/containers/Home/home.component.html diff --git a/src/app/containers/home/home.component.scss b/src/app/containers/Home/home.component.scss similarity index 100% rename from src/app/containers/home/home.component.scss rename to src/app/containers/Home/home.component.scss diff --git a/src/app/containers/home/home.component.spec.ts b/src/app/containers/Home/home.component.spec.ts similarity index 100% rename from src/app/containers/home/home.component.spec.ts rename to src/app/containers/Home/home.component.spec.ts diff --git a/src/app/containers/home/home.component.ts b/src/app/containers/Home/home.component.ts similarity index 100% rename from src/app/containers/home/home.component.ts rename to src/app/containers/Home/home.component.ts diff --git a/src/app/containers/lan/lan.component.html b/src/app/containers/LAN/lan.component.html similarity index 100% rename from src/app/containers/lan/lan.component.html rename to src/app/containers/LAN/lan.component.html diff --git a/src/app/containers/lan/lan.component.scss b/src/app/containers/LAN/lan.component.scss similarity index 100% rename from src/app/containers/lan/lan.component.scss rename to src/app/containers/LAN/lan.component.scss diff --git a/src/app/containers/lan/lan.component.spec.ts b/src/app/containers/LAN/lan.component.spec.ts similarity index 100% rename from src/app/containers/lan/lan.component.spec.ts rename to src/app/containers/LAN/lan.component.spec.ts diff --git a/src/app/containers/lan/lan.component.ts b/src/app/containers/LAN/lan.component.ts similarity index 100% rename from src/app/containers/lan/lan.component.ts rename to src/app/containers/LAN/lan.component.ts diff --git a/src/app/containers/login/login.component.html b/src/app/containers/Login/login.component.html similarity index 100% rename from src/app/containers/login/login.component.html rename to src/app/containers/Login/login.component.html diff --git a/src/app/containers/login/login.component.scss b/src/app/containers/Login/login.component.scss similarity index 100% rename from src/app/containers/login/login.component.scss rename to src/app/containers/Login/login.component.scss diff --git a/src/app/containers/login/login.component.spec.ts b/src/app/containers/Login/login.component.spec.ts similarity index 100% rename from src/app/containers/login/login.component.spec.ts rename to src/app/containers/Login/login.component.spec.ts diff --git a/src/app/containers/login/login.component.ts b/src/app/containers/Login/login.component.ts similarity index 100% rename from src/app/containers/login/login.component.ts rename to src/app/containers/Login/login.component.ts diff --git a/src/app/containers/members/members.component.html b/src/app/containers/Members/members.component.html similarity index 100% rename from src/app/containers/members/members.component.html rename to src/app/containers/Members/members.component.html diff --git a/src/app/containers/members/members.component.scss b/src/app/containers/Members/members.component.scss similarity index 100% rename from src/app/containers/members/members.component.scss rename to src/app/containers/Members/members.component.scss diff --git a/src/app/containers/members/members.component.spec.ts b/src/app/containers/Members/members.component.spec.ts similarity index 100% rename from src/app/containers/members/members.component.spec.ts rename to src/app/containers/Members/members.component.spec.ts diff --git a/src/app/containers/members/members.component.ts b/src/app/containers/Members/members.component.ts similarity index 100% rename from src/app/containers/members/members.component.ts rename to src/app/containers/Members/members.component.ts diff --git a/src/app/containers/NotFound/not-found.component.html b/src/app/containers/NotFound/not-found.component.html new file mode 100644 index 00000000..9e1c74fe --- /dev/null +++ b/src/app/containers/NotFound/not-found.component.html @@ -0,0 +1,7 @@ +
+ Page Not Found +
diff --git a/src/app/containers/NotFound/not-found.component.scss b/src/app/containers/NotFound/not-found.component.scss new file mode 100644 index 00000000..d6ab8477 --- /dev/null +++ b/src/app/containers/NotFound/not-found.component.scss @@ -0,0 +1,4 @@ +.error-404 { + width: 80vw; + margin: 15vh 0 15vh 10vw; +} diff --git a/src/app/containers/account/account.component.spec.ts b/src/app/containers/NotFound/not-found.component.spec.ts similarity index 55% rename from src/app/containers/account/account.component.spec.ts rename to src/app/containers/NotFound/not-found.component.spec.ts index 263a00ff..67562916 100644 --- a/src/app/containers/account/account.component.spec.ts +++ b/src/app/containers/NotFound/not-found.component.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; -import { AccountComponent } from "./account.component"; +import { NotFoundComponent } from "./not-found.component"; -describe("AccountComponent", () => { - let component: AccountComponent; - let fixture: ComponentFixture; +describe("NotFoundComponent", () => { + let component: NotFoundComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [AccountComponent] + declarations: [NotFoundComponent] }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(AccountComponent); + fixture = TestBed.createComponent(NotFoundComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/containers/NotFound/not-found.component.ts b/src/app/containers/NotFound/not-found.component.ts new file mode 100644 index 00000000..0d400a78 --- /dev/null +++ b/src/app/containers/NotFound/not-found.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from "@angular/core"; +import { Store } from "@ngrx/store"; + +@Component({ + selector: "app-not-found", + templateUrl: "./not-found.component.html", + styleUrls: ["./not-found.component.scss"] +}) +export class NotFoundComponent implements OnInit { + + constructor() {} + + ngOnInit() {} +} diff --git a/src/app/containers/projects/projects.component.html b/src/app/containers/Projects/projects.component.html similarity index 100% rename from src/app/containers/projects/projects.component.html rename to src/app/containers/Projects/projects.component.html diff --git a/src/app/containers/projects/projects.component.scss b/src/app/containers/Projects/projects.component.scss similarity index 100% rename from src/app/containers/projects/projects.component.scss rename to src/app/containers/Projects/projects.component.scss diff --git a/src/app/containers/projects/projects.component.spec.ts b/src/app/containers/Projects/projects.component.spec.ts similarity index 100% rename from src/app/containers/projects/projects.component.spec.ts rename to src/app/containers/Projects/projects.component.spec.ts diff --git a/src/app/containers/projects/projects.component.ts b/src/app/containers/Projects/projects.component.ts similarity index 100% rename from src/app/containers/projects/projects.component.ts rename to src/app/containers/Projects/projects.component.ts diff --git a/src/app/containers/sign-up/sign-up.component.html b/src/app/containers/SignUp/sign-up.component.html similarity index 100% rename from src/app/containers/sign-up/sign-up.component.html rename to src/app/containers/SignUp/sign-up.component.html diff --git a/src/app/containers/sign-up/sign-up.component.scss b/src/app/containers/SignUp/sign-up.component.scss similarity index 100% rename from src/app/containers/sign-up/sign-up.component.scss rename to src/app/containers/SignUp/sign-up.component.scss diff --git a/src/app/containers/sign-up/sign-up.component.spec.ts b/src/app/containers/SignUp/sign-up.component.spec.ts similarity index 100% rename from src/app/containers/sign-up/sign-up.component.spec.ts rename to src/app/containers/SignUp/sign-up.component.spec.ts diff --git a/src/app/containers/sign-up/sign-up.component.ts b/src/app/containers/SignUp/sign-up.component.ts similarity index 100% rename from src/app/containers/sign-up/sign-up.component.ts rename to src/app/containers/SignUp/sign-up.component.ts diff --git a/src/app/containers/workshops/workshops.component.html b/src/app/containers/Workshops/workshops.component.html similarity index 100% rename from src/app/containers/workshops/workshops.component.html rename to src/app/containers/Workshops/workshops.component.html diff --git a/src/app/containers/workshops/workshops.component.scss b/src/app/containers/Workshops/workshops.component.scss similarity index 100% rename from src/app/containers/workshops/workshops.component.scss rename to src/app/containers/Workshops/workshops.component.scss diff --git a/src/app/containers/workshops/workshops.component.spec.ts b/src/app/containers/Workshops/workshops.component.spec.ts similarity index 100% rename from src/app/containers/workshops/workshops.component.spec.ts rename to src/app/containers/Workshops/workshops.component.spec.ts diff --git a/src/app/containers/workshops/workshops.component.ts b/src/app/containers/Workshops/workshops.component.ts similarity index 100% rename from src/app/containers/workshops/workshops.component.ts rename to src/app/containers/Workshops/workshops.component.ts diff --git a/src/app/containers/account/account.component.html b/src/app/containers/account/account.component.html deleted file mode 100644 index a3560de5..00000000 --- a/src/app/containers/account/account.component.html +++ /dev/null @@ -1,19 +0,0 @@ -
- -
- -

- Account data dynamically displaying all personal data contained in member.ts - model -

-

- Data will be obtained from NgRx framework once a successful login attempt - occurs -

-

Allows photo upload

-

Allows editing of all data contained in members.ts

-

- Has form submission requesting change for their personal webpage (must be - approved by officers) -

-
diff --git a/src/app/containers/account/account.component.scss b/src/app/containers/account/account.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/containers/account/account.component.ts b/src/app/containers/account/account.component.ts deleted file mode 100644 index 156a6064..00000000 --- a/src/app/containers/account/account.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Component, OnInit } from "@angular/core"; -import { Store } from "@ngrx/store"; - -import { Member } from "../../models"; -import { RootStoreState, MemberStoreActions } from "src/app/root-store"; - -@Component({ - selector: "app-account", - templateUrl: "./account.component.html", - styleUrls: ["./account.component.scss"] -}) -export class AccountComponent implements OnInit { - member: Member; - - constructor(private store: Store) {} - - ngOnInit() {} -} diff --git a/src/app/containers/index.ts b/src/app/containers/index.ts index 54d37348..777e73ee 100644 --- a/src/app/containers/index.ts +++ b/src/app/containers/index.ts @@ -1,17 +1,16 @@ -import { CoffeeNCodeComponent } from "./coffee-n-code/coffee-n-code.component"; -import { HomeComponent } from "./home/home.component"; -import { ProjectsComponent } from "./projects/projects.component"; -import { WorkshopsComponent } from "./workshops/workshops.component"; -import { DashboardComponent } from "./dashboard/dashboard.component"; -import { LanComponent } from "./lan/lan.component"; -import { CodeEditorComponent } from "./code-editor/code-editor.component"; -import { InterviewsComponent } from "./interviews/interviews.component"; -import { CalendarComponent } from "./calendar/calendar.component"; -import { MembersComponent } from "./members/members.component"; -import { AccountComponent } from "./account/account.component"; -import { LoginComponent } from "./login/login.component"; -import { SignUpComponent } from "./sign-up/sign-up.component"; -import { EventsComponent } from "./events/events.component"; +import { CoffeeNCodeComponent } from "./CoffeeAndCode/coffee-n-code.component"; +import { HomeComponent } from "./Home/home.component"; +import { ProjectsComponent } from "./Projects/projects.component"; +import { WorkshopsComponent } from "./Workshops/workshops.component"; +import { DashboardComponent } from "./Dashboard/dashboard.component"; +import { LanComponent } from "./LAN/lan.component"; +import { CodeEditorComponent } from "./CodeEditor/code-editor.component"; +import { CalendarComponent } from "./Calendar/calendar.component"; +import { MembersComponent } from "./Members/members.component"; +import { LoginComponent } from "./Login/login.component"; +import { SignUpComponent } from "./SignUp/sign-up.component"; +import { EventsComponent } from "./Events/events.component"; +import { NotFoundComponent } from "./NotFound/not-found.component"; export { CoffeeNCodeComponent, @@ -21,11 +20,10 @@ export { DashboardComponent, LanComponent, CodeEditorComponent, - InterviewsComponent, CalendarComponent, MembersComponent, - AccountComponent, LoginComponent, SignUpComponent, - EventsComponent + EventsComponent, + NotFoundComponent }; diff --git a/src/app/containers/interviews/interviews.component.html b/src/app/containers/interviews/interviews.component.html deleted file mode 100644 index 1bb5196e..00000000 --- a/src/app/containers/interviews/interviews.component.html +++ /dev/null @@ -1,3 +0,0 @@ -For each company
-For technical interviews
-List of internships \ No newline at end of file diff --git a/src/app/containers/interviews/interviews.component.scss b/src/app/containers/interviews/interviews.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/containers/interviews/interviews.component.spec.ts b/src/app/containers/interviews/interviews.component.spec.ts deleted file mode 100644 index 8b1ee2aa..00000000 --- a/src/app/containers/interviews/interviews.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from "@angular/core/testing"; - -import { InterviewsComponent } from "./interviews.component"; - -describe("InterviewsComponent", () => { - let component: InterviewsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [InterviewsComponent] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(InterviewsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it("should create", () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/containers/interviews/interviews.component.ts b/src/app/containers/interviews/interviews.component.ts deleted file mode 100644 index be39fbcb..00000000 --- a/src/app/containers/interviews/interviews.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component, OnInit } from "@angular/core"; - -@Component({ - selector: "app-interviews", - templateUrl: "./interviews.component.html", - styleUrls: ["./interviews.component.scss"] -}) -export class InterviewsComponent implements OnInit { - constructor() {} - - ngOnInit() {} -}