Merge pull request #4 from cs-worcester-cs-448-sp-2019/revert-3-Left-…

…Nav-Bar Revert "Left nav bar"
CS-Worcester · Apr 24, 2019 · e4d236b · e4d236b
2 parents 7afcf3d + 281830c
commit e4d236b
Show file tree

Hide file tree

Showing 26 changed files with 404 additions and 1,890 deletions.
diff --git a/ampath-simple-app/package-lock.json b/ampath-simple-app/package-lock.json
diff --git a/ampath-simple-app/package.json b/ampath-simple-app/package.json
@@ -28,18 +28,16 @@
     "hammerjs": "^2.0.8",
     "material-components-web": "^1.1.0",
     "rxjs": "~6.3.3",
-    "server": "^1.0.18",
-    "webpack-dev": "^1.1.1",
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.10.7",
+    "@angular-devkit/build-angular": "~0.10.0",
     "@angular/cli": "~7.0.4",
     "@angular/compiler-cli": "~7.0.0",
     "@angular/language-service": "~7.0.0",
+    "@types/node": "~8.9.4",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "~8.9.4",
     "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",

diff --git a/ampath-simple-app/src/app/app-routing.module.ts b/ampath-simple-app/src/app/app-routing.module.ts
diff --git a/ampath-simple-app/src/app/app.component.css b/ampath-simple-app/src/app/app.component.css
@@ -1,22 +0,0 @@
-.container {
-  position: absolute;
-  top:0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.container .mat-drawer {
-  min-width: 200px;
-}
-
-.container .mat-drawer .mat-button {
-  display: block;
-  width: 100%;
-  text-align: center;
-  font-size: 1.5em;
-}
-
-.spacer {
-  flex: 1 1 auto;
-}

diff --git a/ampath-simple-app/src/app/app.component.html b/ampath-simple-app/src/app/app.component.html
@@ -1,28 +1,5 @@
-<mat-drawer-container class="container" autosize>
-  <mat-drawer #drawer class="sidenav">
-      <br>
-      <br>
-      <br>
-      <button color="accent" mat-button routerLink="/hiv-care-lib">Clinic Flow</button>
-      <br>
-      <br>
-      <button color="accent" mat-button routerLink="/patient-search">Patient Search</button>
-      <br>
-      <br>
-      <button color="accent" mat-button routerLink="/patients-program-enrollment">Patients Program Enrollment</button>
-  </mat-drawer>
-  <div class="sidenav-content">
-      <mat-toolbar color="accent">
-          <mat-toolbar-row>
-              <button mat-icon-button (click)="drawer.toggle()">
-                  <mat-icon>menu</mat-icon>
-                </button>
+<!--The content below is only a placeholder and can be replaced.-->
+<mat-toolbar>
+  <span>My Application</span>
+</mat-toolbar>
 
-                <span>Ampath</span>
-                <span class="spacer"></span>
-          </mat-toolbar-row>
-        </mat-toolbar>
-
-  <router-outlet></router-outlet>
-</div>
-</mat-drawer-container>
diff --git a/ampath-simple-app/src/app/app.module.ts b/ampath-simple-app/src/app/app.module.ts
@@ -2,13 +2,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 
 import {MatToolbarModule} from '@angular/material/toolbar';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {MatSidenavModule} from '@angular/material/sidenav';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 
-import { AppRoutingModule } from './app-routing.module';
-
 import { AppComponent } from './app.component';
 
 @NgModule({
@@ -17,13 +12,8 @@ import { AppComponent } from './app.component';
   ],
   imports: [
     BrowserModule,
-	AppRoutingModule,
     MatToolbarModule,
-	BrowserAnimationsModule,
-    MatButtonModule,
-    MatIconModule,
-    MatSidenavModule,
-    MatToolbarModule
+    BrowserAnimationsModule
 
   ],
   providers: [],

diff --git a/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.css b/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.css
diff --git a/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.html b/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.html
diff --git a/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.spec.ts b/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.spec.ts
diff --git a/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.ts b/ampath-simple-app/src/app/hiv-care-lib/clinic-flow/clinic-flow.component.ts
diff --git a/ampath-simple-app/src/app/hiv-care-lib/hiv-care-lib-routing.module.ts b/ampath-simple-app/src/app/hiv-care-lib/hiv-care-lib-routing.module.ts
diff --git a/ampath-simple-app/src/app/hiv-care-lib/hiv-care-lib.module.ts b/ampath-simple-app/src/app/hiv-care-lib/hiv-care-lib.module.ts
diff --git a/ampath-simple-app/src/app/patient-search/patient-search-routing.module.ts b/ampath-simple-app/src/app/patient-search/patient-search-routing.module.ts
diff --git a/ampath-simple-app/src/app/patient-search/patient-search.component.css b/ampath-simple-app/src/app/patient-search/patient-search.component.css
diff --git a/ampath-simple-app/src/app/patient-search/patient-search.component.html b/ampath-simple-app/src/app/patient-search/patient-search.component.html
diff --git a/ampath-simple-app/src/app/patient-search/patient-search.component.spec.ts b/ampath-simple-app/src/app/patient-search/patient-search.component.spec.ts
diff --git a/ampath-simple-app/src/app/patient-search/patient-search.component.ts b/ampath-simple-app/src/app/patient-search/patient-search.component.ts
diff --git a/ampath-simple-app/src/app/patient-search/patient-search.module.ts b/ampath-simple-app/src/app/patient-search/patient-search.module.ts
diff --git a/...ple-app/src/app/patients-program-enrollment/patients-program-enrollment-routing.module.ts b/...ple-app/src/app/patients-program-enrollment/patients-program-enrollment-routing.module.ts
diff --git a/...-simple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.css b/...-simple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.css
diff --git a/...simple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.html b/...simple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.html
diff --git a/...ple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.spec.ts b/...ple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.spec.ts
diff --git a/...h-simple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.ts b/...h-simple-app/src/app/patients-program-enrollment/patients-program-enrollment.component.ts
diff --git a/ampath-simple-app/src/app/patients-program-enrollment/patients-program-enrollment.module.ts b/ampath-simple-app/src/app/patients-program-enrollment/patients-program-enrollment.module.ts
diff --git a/ampath-simple-app/src/environments/version b/ampath-simple-app/src/environments/version
diff --git a/ampath-simple-app/src/styles.css b/ampath-simple-app/src/styles.css
@@ -1,11 +1,2 @@
 /* You can add global styles to this file, and also import other style files */
-@import '~@angular/material/prebuilt-themes/pink-bluegrey.css';
-
-
-body {
-    font-family: Roboto, Arial, sans-serif;
-}
-
-p {
-    text-align: center;
-  }
+@import "~@angular/material/prebuilt-themes/indigo-pink.css";