Skip to content

Commit 6a0a301

Browse files
authored
Merge pull request #47 from UCMercedACM/develop
v0.1.2
2 parents bb5852e + b3abef4 commit 6a0a301

86 files changed

Lines changed: 65 additions & 667 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,4 @@ jobs:
8282
- name: Update Release notes
8383
run: |
8484
echo 'Update Release Notes...'
85-
npm run gren:release -- --token=${{ secrets.GREN_GITHUB_TOKEN }}
86-
87-
- name: Update Release notes
88-
run: |
89-
echo 'Update Changelog...'
90-
npm run gren:release -- --token=${{ secrets.GREN_GITHUB_TOKEN }}
85+
npm run gren -- --token=${{ secrets.GREN_GITHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
echo 'Running Protractor on Angular Application...'
4141
yarn e2e
4242
43-
- name: Running Test Script on Angular Application
44-
run: |
45-
echo 'Running Test Script on Angular Application...'
46-
yarn test
43+
# - name: Running Test Script on Angular Application
44+
# run: |
45+
# echo 'Running Test Script on Angular Application...'
46+
# yarn test

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "chapter-website",
3-
"version": "0.5.0",
3+
"version": "0.1.2",
44
"private": true,
55
"contributors": [
66
"Adrian Darian",
@@ -13,8 +13,7 @@
1313
"deploy": "yarn build && ngh --branch=gh-pages --no-silent",
1414
"docker": "ng serve --host 0.0.0.0 --port 4200 & ngtw watch",
1515
"e2e": "ng e2e",
16-
"gren:changelog": "gren changelog --generate --override --tags=all --config=.grenrc.js",
17-
"gren:release": "gren release --override --tags=all --config=.grenrc.js",
16+
"gren": "gren release --override --tags=all --config=.grenrc.js",
1817
"lint": "ng lint",
1918
"ng": "ng",
2019
"prestart": "ngtw build",

src/app/app-routing.module.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import {
66
CoffeeNCodeComponent,
77
ProjectsComponent,
88
WorkshopsComponent,
9-
InterviewsComponent,
109
MembersComponent,
11-
AccountComponent,
10+
NotFoundComponent,
1211
LoginComponent,
1312
SignUpComponent,
1413
EventsComponent,
@@ -36,10 +35,6 @@ const routes: Routes = [
3635
path: "workshops",
3736
component: WorkshopsComponent
3837
},
39-
{
40-
path: "interview",
41-
component: InterviewsComponent
42-
},
4338
{
4439
path: "members",
4540
component: MembersComponent
@@ -60,6 +55,10 @@ const routes: Routes = [
6055
path: "",
6156
redirectTo: "/home",
6257
pathMatch: "full"
58+
},
59+
{
60+
path: "**",
61+
component: NotFoundComponent
6362
}
6463
];
6564

src/app/app.module.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Core Utility Imports
22
import { NgModule, APP_INITIALIZER } from "@angular/core";
3-
import { Store } from "@ngrx/store";
43
import { BrowserModule } from "@angular/platform-browser";
54
import { HttpClientModule } from "@angular/common/http";
65
import { ReactiveFormsModule } from "@angular/forms";
@@ -14,8 +13,6 @@ import { AppComponent } from "./app.component"; // Main app import
1413
import {
1514
TitleComponent,
1615
CoffeeComponent,
17-
WorkshopCardComponent,
18-
ProjectsDisplayComponent,
1916
TerminalComponent
2017
} from "./components";
2118

@@ -28,20 +25,17 @@ import {
2825
DashboardComponent,
2926
LanComponent,
3027
CodeEditorComponent,
31-
InterviewsComponent,
3228
CalendarComponent,
3329
MembersComponent,
34-
AccountComponent,
3530
LoginComponent,
3631
SignUpComponent,
37-
EventsComponent
32+
EventsComponent,
33+
NotFoundComponent
3834
} from "./containers";
3935

4036
// NgRx Store Imports
4137
import {
4238
RootStoreModule,
43-
RootStoreState,
44-
MemberStoreActions
4539
} from "./root-store";
4640

4741
// Data Services
@@ -59,17 +53,14 @@ import { DataService } from "./services/data.service";
5953
DashboardComponent,
6054
LanComponent,
6155
CodeEditorComponent,
62-
InterviewsComponent,
6356
CalendarComponent,
6457
MembersComponent,
6558
LoginComponent,
66-
AccountComponent,
67-
WorkshopCardComponent,
68-
ProjectsDisplayComponent,
6959
LoginComponent,
7060
SignUpComponent,
7161
TerminalComponent,
72-
EventsComponent
62+
EventsComponent,
63+
NotFoundComponent
7364
],
7465
imports: [
7566
HttpClientModule,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)