Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# - name: Running Test Script on Angular Application
# run: |
# echo 'Running Test Script on Angular Application...'
# yarn test
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chapter-website",
"version": "0.5.0",
"version": "0.1.2",
"private": true,
"contributors": [
"Adrian Darian",
Expand All @@ -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",
Expand Down
11 changes: 5 additions & 6 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import {
CoffeeNCodeComponent,
ProjectsComponent,
WorkshopsComponent,
InterviewsComponent,
MembersComponent,
AccountComponent,
NotFoundComponent,
LoginComponent,
SignUpComponent,
EventsComponent,
Expand Down Expand Up @@ -36,10 +35,6 @@ const routes: Routes = [
path: "workshops",
component: WorkshopsComponent
},
{
path: "interview",
component: InterviewsComponent
},
{
path: "members",
component: MembersComponent
Expand All @@ -60,6 +55,10 @@ const routes: Routes = [
path: "",
redirectTo: "/home",
pathMatch: "full"
},
{
path: "**",
component: NotFoundComponent
}
];

Expand Down
17 changes: 4 additions & 13 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -14,8 +13,6 @@ import { AppComponent } from "./app.component"; // Main app import
import {
TitleComponent,
CoffeeComponent,
WorkshopCardComponent,
ProjectsDisplayComponent,
TerminalComponent
} from "./components";

Expand All @@ -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
Expand All @@ -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,
Expand Down
10 changes: 3 additions & 7 deletions src/app/components/index.ts
Original file line number Diff line number Diff line change
@@ -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
};
Loading