From 6158ecf3439c05ca512ef62939cdd4607aef137a Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 21 Apr 2018 21:33:16 +0100 Subject: [PATCH] Code cleanup. submit response still not working --- client/dev/app.module.ts | 32 +++++++++---------- client/dev/material.module.ts | 15 +-------- .../submit-response.component.ts | 4 +-- .../submit-response/submit-response.html | 6 ++-- 4 files changed, 20 insertions(+), 37 deletions(-) diff --git a/client/dev/app.module.ts b/client/dev/app.module.ts index 4aaa92e..0265e6f 100644 --- a/client/dev/app.module.ts +++ b/client/dev/app.module.ts @@ -1,6 +1,6 @@ import { NgModule, ErrorHandler, Injectable, Injector } from "@angular/core"; import { HttpModule } from "@angular/http"; -import {FormsModule, ReactiveFormsModule} from "@angular/forms"; +import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { BrowserModule } from "@angular/platform-browser"; import { App } from "./app"; @@ -9,25 +9,25 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HomeComponent } from "./pages/home/home.component"; import { homeRouting } from "./pages/home/home.route"; import { HomeService } from "./pages/home/home.service"; -import {SubmitResponseComponent} from "./pages/submit-response/submit-response.component"; +import { SubmitResponseComponent } from "./pages/submit-response/submit-response.component"; import { NavbarComponent } from './components/navbar/navbar.component'; import { TimeChartComponent } from './components/time-chart/time-chart.component'; import { CalendarChartComponent } from './components/calendar-chart/calendar-chart.component'; -import {OverviewChartComponent } from './components/overview-chart/overview-chart.component'; +import { OverviewChartComponent } from './components/overview-chart/overview-chart.component'; import { MaterialModule } from './material.module'; -import {SharedModule} from "./shared-helpers.module"; -import {LoaderComponent} from "./components/loader/loader.component"; -import {TeamComponent} from "./pages/team/team.component"; -import {TeamService} from "./services/team.service"; -import {AllTeamsService} from "./services/all-teams.service"; -import {GridChartComponent} from "./components/grid-chart/grid-chart.component"; -import {DayBreakdownChartComponent} from "./components/day-breakdown-chart/day-breakdown-chart"; -import {CommonService} from "./services/common.service"; -import {SplashScreenComponent} from "./components/splash-screen/splash-screen"; -import {AppFeedbackComponent} from "./components/app-feedback/app-feedback"; -import {AppHelpComponent} from "./components/app-help/app-help"; -import {MessageChartComponent} from "./components/message-chart/message-chart"; +import { SharedModule } from "./shared-helpers.module"; +import { LoaderComponent } from "./components/loader/loader.component"; +import { TeamComponent } from "./pages/team/team.component"; +import { TeamService } from "./services/team.service"; +import { AllTeamsService } from "./services/all-teams.service"; +import { GridChartComponent } from "./components/grid-chart/grid-chart.component"; +import { DayBreakdownChartComponent } from "./components/day-breakdown-chart/day-breakdown-chart"; +import { CommonService } from "./services/common.service"; +import { SplashScreenComponent } from "./components/splash-screen/splash-screen"; +import { AppFeedbackComponent } from "./components/app-feedback/app-feedback"; +import { AppHelpComponent } from "./components/app-help/app-help"; +import { MessageChartComponent } from "./components/message-chart/message-chart"; import { Angulartics2Module, Angulartics2GoogleTagManager } from "angulartics2"; import * as Rollbar from 'rollbar'; @@ -49,13 +49,13 @@ export class RollbarErrorHandler implements ErrorHandler { @NgModule({ imports: [ + MaterialModule, BrowserModule, FormsModule, ReactiveFormsModule, HttpModule, homeRouting, BrowserAnimationsModule, - MaterialModule, SharedModule, Angulartics2Module.forRoot([ Angulartics2GoogleTagManager ]) ], diff --git a/client/dev/material.module.ts b/client/dev/material.module.ts index b8856c5..ab1ad04 100644 --- a/client/dev/material.module.ts +++ b/client/dev/material.module.ts @@ -8,18 +8,6 @@ import { MatSelectModule } from "@angular/material/select"; import { MatDialogModule } from "@angular/material/dialog"; import { MatSnackBarModule } from "@angular/material/snack-bar"; import { MatInputModule } from "@angular/material/input"; -import { MatFormFieldModule } from "@angular/material/form-field"; - -// import { -// MatButtonModule, -// MatCardModule, -// MatMenuModule, -// MatProgressSpinnerModule, -// MatSelectModule, -// MatDialogModule, -// MatSnackBarModule, -// MatInputModule -// } from "@angular/material"; @NgModule({ imports: [], @@ -32,8 +20,7 @@ import { MatFormFieldModule } from "@angular/material/form-field"; MatSelectModule, MatDialogModule, MatSnackBarModule, - // MatInputModule, - MatFormFieldModule + MatInputModule, ] }) export class MaterialModule {} diff --git a/client/dev/pages/submit-response/submit-response.component.ts b/client/dev/pages/submit-response/submit-response.component.ts index 8ea2cb4..971a482 100644 --- a/client/dev/pages/submit-response/submit-response.component.ts +++ b/client/dev/pages/submit-response/submit-response.component.ts @@ -1,5 +1,5 @@ import {Component } from "@angular/core"; -import {FormControl, Validators} from "@angular/forms"; +import { FormControl, Validators} from "@angular/forms"; @Component({ selector: "submit-response-page", @@ -8,8 +8,6 @@ import {FormControl, Validators} from "@angular/forms"; }) export class SubmitResponseComponent { - title: string = "happy-app"; - constructor() { console.log("submit response"); } diff --git a/client/dev/pages/submit-response/submit-response.html b/client/dev/pages/submit-response/submit-response.html index 1732bec..96676ee 100644 --- a/client/dev/pages/submit-response/submit-response.html +++ b/client/dev/pages/submit-response/submit-response.html @@ -1,10 +1,8 @@
- - + + {{getErrorMessage()}} -

This feature is still in development- check back soon

-