diff --git a/.appbuilder-state.json b/.appbuilder-state.json index 175f7853..1559e4c8 100644 --- a/.appbuilder-state.json +++ b/.appbuilder-state.json @@ -1 +1 @@ -{"applicationId":"7lbb7zedobce","applicationName":"Health Vault","platform":"Angular"} \ No newline at end of file +{"applicationId":"gblgxiirrjzf","applicationName":"Movie App","platform":"Angular"} \ No newline at end of file diff --git a/README.md b/README.md index a3d62cd2..dc5580b1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Health Vault +# Movie App This project was generated with [App Builder Code Gen](https://www.infragistics.com/products/appbuilder). diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index 034e8480..00000000 --- a/SECURITY.md +++ /dev/null @@ -1,21 +0,0 @@ -# Security Policy - -## Supported Versions - -Use this section to tell people about which versions of your project are -currently being supported with security updates. - -| Version | Supported | -| ------- | ------------------ | -| 5.1.x | :white_check_mark: | -| 5.0.x | :x: | -| 4.0.x | :white_check_mark: | -| < 4.0 | :x: | - -## Reporting a Vulnerability - -Use this section to tell people how to report a vulnerability. - -Tell them where to go, how often they can expect to get an update on a -reported vulnerability, what to expect if the vulnerability is accepted or -declined, etc. diff --git a/angular.json b/angular.json index 53489fb3..fcc98344 100644 --- a/angular.json +++ b/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "health-vault": { + "movie-app": { "projectType": "application", "schematics": { "@schematics/angular:component": { @@ -22,7 +22,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/health-vault", + "outputPath": "dist/movie-app", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", @@ -79,10 +79,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "buildTarget": "health-vault:build:production" + "buildTarget": "movie-app:build:production" }, "development": { - "buildTarget": "health-vault:build:development" + "buildTarget": "movie-app:build:development" } }, "defaultConfiguration": "development" @@ -90,7 +90,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "buildTarget": "health-vault:build" + "buildTarget": "movie-app:build" } }, "test": { diff --git a/ignite-ui-cli.json b/ignite-ui-cli.json index 6661aebf..f4f993cc 100644 --- a/ignite-ui-cli.json +++ b/ignite-ui-cli.json @@ -3,7 +3,7 @@ "project": { "defaultPort": 4200, "framework": "angular", - "projectType": "igx-ts", + "projectType": "igx-ts-legacy", "projectTemplate": "base", "theme": "Default", "themePath": "node_modules/igniteui-angular/styles/igniteui-angular.css", diff --git a/karma.conf.js b/karma.conf.js index 2fc01c48..5f9a5a89 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -25,7 +25,7 @@ module.exports = function (config) { suppressAll: true // removes the duplicated traces }, coverageReporter: { - dir: require('path').join(__dirname, './coverage/health-vault'), + dir: require('path').join(__dirname, './coverage/movie-app'), subdir: '.', reporters: [ { type: 'html' }, diff --git a/package.json b/package.json index 36a614ff..df277cf3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "health-vault", + "name": "movie-app", "version": "0.0.0", "scripts": { "ng": "ng", @@ -11,32 +11,30 @@ }, "private": true, "dependencies": { - "@angular/animations": "~17.0.0", - "@angular/common": "~17.0.0", - "@angular/compiler": "~17.0.0", - "@angular/core": "~17.0.0", - "@angular/forms": "~17.0.0", - "@angular/platform-browser": "~17.0.0", - "@angular/platform-browser-dynamic": "~17.0.0", - "@angular/router": "~17.0.0", - "hammerjs": "~2.0.8", - "igniteui-angular": "~17.0.0", - "igniteui-angular-charts": "~17.0.0", - "igniteui-angular-core": "~17.0.0", + "@angular/animations": "~17.2.0", + "@angular/common": "~17.2.0", + "@angular/compiler": "~17.2.0", + "@angular/core": "~17.2.0", + "@angular/forms": "~17.2.0", + "@angular/platform-browser": "~17.2.0", + "@angular/platform-browser-dynamic": "~17.2.0", + "@angular/router": "~17.2.0", + "hammerjs": "^2.0.8", + "igniteui-angular": "~17.1.0", "minireset.css": "~0.0.7", "rxjs": "~7.8.0", "tslib": "~2.3.0", "zone.js": "~0.14.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~17.0.0", - "@angular-eslint/builder": "~17.0.0", - "@angular-eslint/eslint-plugin": "~17.0.0", - "@angular-eslint/eslint-plugin-template": "~17.0.0", - "@angular-eslint/schematics": "~17.0.0", - "@angular-eslint/template-parser": "~17.0.0", - "@angular/cli": "~17.0.0", - "@angular/compiler-cli": "~17.0.0", + "@angular-devkit/build-angular": "~17.2.0", + "@angular-eslint/builder": "~17.2.0", + "@angular-eslint/eslint-plugin": "~17.2.0", + "@angular-eslint/eslint-plugin-template": "~17.2.0", + "@angular-eslint/schematics": "~17.2.0", + "@angular-eslint/template-parser": "~17.2.0", + "@angular/cli": "~17.2.0", + "@angular/compiler-cli": "~17.2.0", "@types/jasmine": "~5.1.1", "@typescript-eslint/eslint-plugin": "6.9.1", "@typescript-eslint/parser": "6.9.1", @@ -48,6 +46,6 @@ "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.1.0", - "typescript": "~5.2.2" + "typescript": "~5.3.2" } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 178a49bb..6e3d095f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,22 +4,16 @@ import { RouterModule, Routes } from '@angular/router'; import { PageNotFoundComponent } from './error-routing/not-found/not-found.component'; import { UncaughtErrorComponent } from './error-routing/error/uncaught-error.component'; import { ErrorRoutingModule } from './error-routing/error-routing.module'; -import { HomeComponent } from './home/home.component'; -import { MedicationsComponent } from './medications/medications.component'; -import { HealthIndicatorsComponent } from './health-indicators/health-indicators.component'; -import { AppointmentsComponent } from './appointments/appointments.component'; -import { ProfileComponent } from './profile/profile.component'; -import { EmergencyComponent } from './emergency/emergency.component'; +import { MoviesComponent } from './movies/movies.component'; +import { MovieComplexComponent } from './movie-complex/movie-complex.component'; +import { MyPurchasesComponent } from './my-purchases/my-purchases.component'; export const routes: Routes = [ - { path: '', redirectTo: 'home', pathMatch: 'full' }, + { path: '', redirectTo: 'movies', pathMatch: 'full' }, { path: 'error', component: UncaughtErrorComponent }, - { path: 'home', component: HomeComponent, data: { text: 'Home' } }, - { path: 'medications', component: MedicationsComponent, data: { text: 'Medications' } }, - { path: 'health-indicators', component: HealthIndicatorsComponent, data: { text: 'Health Indicators' } }, - { path: 'appointments', component: AppointmentsComponent, data: { text: 'Appointments' } }, - { path: 'profile', component: ProfileComponent, data: { text: 'Profile' } }, - { path: 'emergency', component: EmergencyComponent, data: { text: 'Emergency' } }, + { path: 'movies', component: MoviesComponent, data: { text: 'Movies' } }, + { path: 'movie-complex', component: MovieComplexComponent, data: { text: 'Movie Complex' } }, + { path: 'my-purchases', component: MyPurchasesComponent, data: { text: 'My Purchases' } }, { path: '**', component: PageNotFoundComponent } // must always be last ]; diff --git a/src/app/app.component.html b/src/app/app.component.html index 3b85fbd9..8cf36fc5 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,70 +1,78 @@ -
- - -
- -

- HEALTHCARE ASSISTANT -

-
- + + +
+ + movie + + Movies +
+
+ + location_on + + Theatres +
+
+ + shopping_cart + + My Purchases +
+
+ + local_offer + + Promos +
+
+ + help + + Help & Support +
+
+ + chat_bubble + + Contact Us +
+ + +
+
-
- -

- Sandy Anderson -

-
+

+ MOVIE APP +

- -
-
-
- -
- - -
- - home - - Home -
-
- - healing +
+
-
- + +
-
- - calendar_today - - Appointments -
-
- - account_circle - - Medical Profile -
-
- - error - - Emergency -
- - + + + + + My Profile + + + Logout + + +
+
+
+ +
diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 35d06415..9b4f79bd 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,97 +1,93 @@ :host { height: 100%; display: flex; - flex-direction: column; justify-content: flex-start; align-items: stretch; align-content: flex-start; } -.row-layout { +.nav-drawer { + min-width: min-content; + min-height: 0; + flex-shrink: 0; +} +.view-container { + overflow: auto; + position: relative; + min-width: 0; + min-height: 0; + flex-grow: 1; +} +.icon { + --size: 24px; + font-size: 24px; + width: 24px; + height: 24px; +} +.text { + height: max-content; + min-width: min-content; +} +.avatar { + --igx-avatar-background: transparent; +} +.column-layout { display: flex; + flex-direction: column; } -.main-navigation { - border-color: #BDD2B9; - border-width: 0px 0px 1px; - border-style: solid; +.group { justify-content: flex-start; align-items: stretch; align-content: flex-start; position: relative; min-width: 50px; min-height: 50px; + flex-grow: 1; + flex-basis: 0; } -.group { +.row-layout { + display: flex; +} +.header { + background-color: #361439; justify-content: flex-start; align-items: center; align-content: flex-start; - gap: 8px; - overflow: hidden; position: relative; - min-width: 50px; + padding: 12px 20px; + height: 70px; + min-height: 70px; + max-height: 70px; + flex-shrink: 0; } .group_1 { justify-content: flex-start; align-items: center; align-content: flex-start; - gap: 16px; position: relative; min-width: 50px; min-height: 50px; + flex-grow: 1; } -.bottom-container { +.group_2 { justify-content: flex-start; - align-items: stretch; + align-items: center; align-content: flex-start; + gap: 24px; position: relative; min-width: 50px; min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.navbar { - --igx-navbar-background: #F0F6EF; - height: max-content; - min-width: min-content; - flex-grow: 1; - flex-basis: 0; -} -.view-container { - overflow: auto; - position: relative; - flex-grow: 1; -} -.nav-drawer { - min-width: min-content; - min-height: 0; - max-width: 236px; - flex-shrink: 0; } -.navbar-content { - gap: 1rem; +.button { + --igx-button-foreground: hsla(var(--ig-gray-900)); + margin: 0 8px 0 0; } -.image { - object-fit: cover; - height: 32px; - min-width: 0; - min-height: 0; - max-height: 32px; - flex-shrink: 0; +.button_1 { + --igx-button-foreground: hsla(var(--ig-gray-900)); } -.text { - color: hsla(var(--ig-secondary-400)); +.dropdown { + left: 0; + top: 0; + position: absolute; height: max-content; min-width: min-content; } -.avatar { - --igx-avatar-background: transparent; -} -.icon { - --size: 24px; - font-size: 24px; - width: 24px; - height: 24px; - color: hsla(var(--ig-primary-700)); -} -.button { - --igx-button-foreground: hsla(var(--ig-primary-900)); -} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e1572640..aeccd246 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,43 +3,39 @@ import { BrowserModule, HammerModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { HomeComponent } from './home/home.component'; -import { IgxIconModule, IgxListModule, IgxButtonModule, IgxRippleModule, IgxAvatarModule, IgxToggleModule, IgxDialogModule, IgxNavbarModule, IgxNavigationDrawerModule } from 'igniteui-angular'; +import { MoviesComponent } from './movies/movies.component'; +import { IgxButtonModule, IgxRippleModule, IgxTabsModule, IgxCardModule, IgxIconModule, IgxSelectModule, IgxInputGroupModule, IgxDatePickerModule, IgxListModule, IgxAvatarModule, IgxNavigationDrawerModule, IgxToggleModule, IgxDropDownModule } from 'igniteui-angular'; import { FormsModule } from '@angular/forms'; -import { MedicationsComponent } from './medications/medications.component'; -import { HealthIndicatorsComponent } from './health-indicators/health-indicators.component'; -import { IgxCategoryChartModule } from 'igniteui-angular-charts'; -import { AppointmentsComponent } from './appointments/appointments.component'; -import { ProfileComponent } from './profile/profile.component'; -import { EmergencyComponent } from './emergency/emergency.component'; +import { MovieComplexComponent } from './movie-complex/movie-complex.component'; +import { MyPurchasesComponent } from './my-purchases/my-purchases.component'; import { HttpClientModule } from '@angular/common/http'; @NgModule({ declarations: [ AppComponent, - HomeComponent, - MedicationsComponent, - HealthIndicatorsComponent, - AppointmentsComponent, - ProfileComponent, - EmergencyComponent + MoviesComponent, + MovieComplexComponent, + MyPurchasesComponent ], imports: [ BrowserModule, HammerModule, AppRoutingModule, BrowserAnimationsModule, - IgxIconModule, - IgxListModule, IgxButtonModule, IgxRippleModule, - FormsModule, - IgxCategoryChartModule, + IgxTabsModule, + IgxCardModule, + IgxIconModule, + IgxSelectModule, + IgxInputGroupModule, + IgxDatePickerModule, + IgxListModule, IgxAvatarModule, - IgxToggleModule, - IgxDialogModule, - IgxNavbarModule, + FormsModule, IgxNavigationDrawerModule, + IgxToggleModule, + IgxDropDownModule, HttpClientModule ], providers: [], diff --git a/src/app/appointments/appointments.component.html b/src/app/appointments/appointments.component.html deleted file mode 100644 index 381ab0c1..00000000 --- a/src/app/appointments/appointments.component.html +++ /dev/null @@ -1,290 +0,0 @@ -
-
-
-
-
-

- UPCOMING APPOINTMENTS -

-
-
- - - -
-
- -
-

- Internal Medicine -

-

- Tuesday, January 24, 2023 - 2:30pm - Dr. M. Matthews -

-
-
- -
- - - - -
-
- -
-

- Dermatology -

-

- Friday, February 24, 2023 - 08:45am - Dr. V. Sawyer -

-
-
- -
- - - - -
-
- -
-

- Gynaecology -

-

- Monday, March 6, 2023 - 6:30pm - Dr. J. Dean -

-
-
- -
- - - -
-
-
-
-

- RECENT -

-
-
- - - -
-
- -
-

- Oftalmology -

-

- Thursday, January 12, 2023 - Dr. H. Chandler -

-
-
- -
- - - - -
-
- -
-

- Traumatology -

-

- Friday, December 16, 2022 - Dr. J. Dean -

-
-
- -
- - - - -
-
- -
-

- Otorhinolaryngology -

-

- Tuesday, December 13, 2022 - Dr. H. McNamara -

-
-
- -
- - - - -
-
- -
-

- Internal Medicine -

-

- Monday, November 28, 2022 - Dr. M. Matthews -

-
-
- -
- - - -
-
-
-
-
-
- Dermatology Appointment -
-
-
- -
-

- Dr. Michael Matthews -

-

- Internal Medicine -

-
-
- - - - - - calendar_today - - - - Tuesday, January 24, 2023 - - - - - - access_time - - - - 2:30pm - 2:45pm - - - - - - location_on - - - - Plainsboro Clinic - 1 Plainsboro Rd. Plainsboro, NJ 08536 - - -
-
-

- REQUIREMENTS -

-
-

- - Recommended shower before appointment. -

-

- - Wear loose comfortable clothing. -

-

- - Avoid using makeup or nail polish before appointment. -

-

- - Don't try any new skin care products in the days prior to your appointment. -

-

- - Take your medications as scheduled. Your dermatologist needs to know their effects on your skin. - -

-
-
-
- - -
-
-
- - -
- Appointment Cancellation -
- - -

- Are you sure you want to cancel your appointment? -

- - - - - - diff --git a/src/app/appointments/appointments.component.scss b/src/app/appointments/appointments.component.scss deleted file mode 100644 index ebd9bb12..00000000 --- a/src/app/appointments/appointments.component.scss +++ /dev/null @@ -1,219 +0,0 @@ -:host { - height: 100%; - display: flex; - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: stretch; -} -.row-layout { - display: flex; -} -.group { - background-color: rgba(256, 256, 256, 0.6); - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: stretch; - gap: 24px; - position: relative; - padding: 32px; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.column-layout { - display: flex; - flex-direction: column; -} -.group_1 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 32px; - position: relative; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.group_2 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 16px; - position: relative; - min-width: 360px; - min-height: 50px; - flex-shrink: 0; -} -.group_3 { - justify-content: space-between; - align-items: center; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; -} -.group_4 { - justify-content: flex-start; - align-items: baseline; - align-content: flex-start; - gap: 4px; - position: relative; - min-width: 50px; -} -.group_5 { - border-color: #CDE0C9; - border-width: 0px 0px 1px; - border-style: solid; - justify-content: space-between; - align-items: center; - align-content: flex-start; - position: relative; - padding: 0 0 16px; - min-width: 50px; - min-height: 50px; -} -.group_6 { - justify-content: flex-start; - align-items: center; - align-content: flex-start; - position: relative; - min-width: 50px; - min-height: 50px; -} -.group_7 { - justify-content: center; - align-items: stretch; - align-content: flex-start; - position: relative; - padding: 0 0 0 24px; - min-width: 50px; - min-height: 50px; -} -.group_8 { - background-color: rgba(256, 256, 256, 0.6); - border-color: #CDE0C9; - border-width: 0px 0px 0px 1px; - border-style: solid; - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: stretch; - gap: 24px; - position: relative; - padding: 32px; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.group_9 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 16px; - position: relative; - min-width: 50px; - min-height: 50px; -} -.group_10 { - justify-content: flex-start; - align-items: center; - align-content: flex-start; - gap: 16px; - position: relative; - min-width: 50px; -} -.group_11 { - justify-content: center; - align-items: stretch; - align-content: flex-start; - position: relative; - min-width: 50px; - min-height: 50px; -} -.group_12 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; -} -.group_13 { - flex-wrap: wrap; - justify-content: flex-end; - align-items: stretch; - align-content: flex-start; - gap: 16px; - position: relative; -} -.text { - color: hsla(var(--ig-info-500)); - margin: 0 8px 0 0; - height: max-content; - min-width: min-content; -} -.image { - object-fit: cover; - height: 28px; - min-width: 0; - min-height: 0; - max-height: 28px; - flex-shrink: 0; -} -.content { - color: hsla(var(--ig-secondary-500)); - height: max-content; - min-width: min-content; -} -.avatar { - --igx-avatar-background: transparent; -} -.text_1 { - height: max-content; - min-width: min-content; -} -.text_2 { - color: hsla(var(--ig-info-500)); - height: max-content; - min-width: min-content; -} -.avatar_1::part(base) { - --igx-avatar-color: hsla(var(--ig-secondary-400)); -} -.avatar_2::part(base) { - --igx-avatar-color: hsla(var(--ig-info-500)); -} -.avatar_3::part(base) { - --igx-avatar-color: hsla(var(--ig-info-500)); -} -.avatar_4::part(base) { - --igx-avatar-color: hsla(var(--ig-info-500)); -} -.list { - height: max-content; -} -.button { - --igx-button-foreground: hsla(var(--ig-primary-800)); -} -.button_1 { - height: max-content; - flex-shrink: 0; -} -.button_2 { - --igx-button-background: hsla(var(--ig-primary-500)); - height: max-content; - flex-shrink: 0; -} -.button_3 { - height: max-content; -} -.button_4 { - --igx-button-foreground: hsla(var(--ig-surface-500)); - --igx-button-background: hsla(var(--ig-error-500)); - height: max-content; -} diff --git a/src/app/appointments/appointments.component.spec.ts b/src/app/appointments/appointments.component.spec.ts deleted file mode 100644 index 63b728a5..00000000 --- a/src/app/appointments/appointments.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -import { IgxListModule, IgxButtonModule, IgxRippleModule, IgxIconModule, IgxAvatarModule, IgxToggleModule, IgxDialogModule } from 'igniteui-angular'; -import { AppointmentsComponent } from './appointments.component'; - -describe('AppointmentsComponent', () => { - let component: AppointmentsComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ AppointmentsComponent ], - imports: [ NoopAnimationsModule, FormsModule, IgxListModule, IgxButtonModule, IgxRippleModule, IgxIconModule, IgxAvatarModule, IgxToggleModule, IgxDialogModule ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(AppointmentsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/appointments/appointments.component.ts b/src/app/appointments/appointments.component.ts deleted file mode 100644 index 40450e9a..00000000 --- a/src/app/appointments/appointments.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-appointments', - templateUrl: './appointments.component.html', - styleUrls: ['./appointments.component.scss'] -}) -export class AppointmentsComponent {} diff --git a/src/app/emergency/emergency.component.ts b/src/app/emergency/emergency.component.ts deleted file mode 100644 index edd663d6..00000000 --- a/src/app/emergency/emergency.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-emergency', - templateUrl: './emergency.component.html', - styleUrls: ['./emergency.component.scss'] -}) -export class EmergencyComponent {} diff --git a/src/app/health-indicators/health-indicators.component.html b/src/app/health-indicators/health-indicators.component.html deleted file mode 100644 index 85f2a521..00000000 --- a/src/app/health-indicators/health-indicators.component.html +++ /dev/null @@ -1,144 +0,0 @@ -
-
-

- HEALTH INDICATORS -

-
-
-
-
- -
-

- WEIGHT -

-
- 112 -
-

- lbs -

-
-
-
- -
-
-
-
- -
-

- HEART RATE -

-
- 90 -
-

- bpm -

-
-
-
- -
-
-
-
-
-
- -
-

- BLOOD PRESSURE -

-
- 140 -
-
- / -
-
- 70 -
-

- mmHg -

-
-
-
- -
-
-
-
- -
-

- BLOOD SUGAR -

-
- 85 -
-

- mg/dL -

-
-
-
- -
-
-
-
-
-
- -
-

- TOTAL CHOLESTEROL -

-
- 200 -
-

- mg/dL -

-
-
-
- -
-
-
-
- -
-

- CHOLESTEROL HDL / LDL -

-
- 80 -
-

- mg/dL -

-
- - -
-
- 85 -
-

- mg/dL -

-
-
-
- -
-
-
-
-
-
diff --git a/src/app/health-indicators/health-indicators.component.scss b/src/app/health-indicators/health-indicators.component.scss deleted file mode 100644 index 6609c06a..00000000 --- a/src/app/health-indicators/health-indicators.component.scss +++ /dev/null @@ -1,191 +0,0 @@ -:host { - height: 100%; - display: flex; - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; -} -.row-layout { - display: flex; -} -.group { - background-color: rgba(256, 256, 256, 0.6); - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: stretch; - gap: 24px; - overflow: auto; - position: relative; - padding: 32px; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.column-layout { - display: flex; - flex-direction: column; -} -.group_1 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 16px; - position: relative; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.group_2 { - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: stretch; - gap: 32px; - position: relative; - min-width: 50px; - min-height: 50px; - flex-grow: 1; - flex-shrink: 0; -} -.group_3 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 32px; - position: relative; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.group_4 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; - min-height: 50px; - flex-grow: 1; - flex-shrink: 0; -} -.group_5 { - justify-content: flex-start; - align-items: center; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; -} -.group_6 { - justify-content: flex-start; - align-items: baseline; - align-content: flex-start; - gap: 4px; - position: relative; - min-width: 50px; -} -.group_7 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - position: relative; - min-width: 50px; - min-height: 50px; - flex-grow: 1; - flex-shrink: 0; -} -.group_8 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; - min-height: 150px; - flex-grow: 1; - flex-shrink: 0; -} -.text { - color: hsla(var(--ig-info-500)); - margin: 0 8px 0 0; - height: max-content; - min-width: min-content; -} -.image { - object-fit: cover; - height: 24px; - min-width: 0; - min-height: 0; - max-height: 24px; - flex-shrink: 0; -} -.text_1 { - color: hsla(var(--ig-secondary-300)); - margin: 0 8px 0 0; - height: max-content; - min-width: min-content; -} -.h6 { - color: hsla(var(--ig-secondary-500)); - height: max-content; - min-width: min-content; -} -.text_2 { - color: hsla(var(--ig-secondary-200)); - height: max-content; - min-width: min-content; -} -.h6_1 { - color: hsla(var(--ig-secondary-100)); - height: max-content; - min-width: min-content; -} -.category-chart { - --brushes: #70C3A1; - --outlines: #70C3A1; - --marker-brushes: #70C3A1; - --marker-outlines: #70C3A1; - min-height: 200px; - flex-grow: 1; - flex-basis: 0; -} -.category-chart_1 { - --brushes: #E7B7C8; - --outlines: #E7B7C8; - --marker-brushes: #E7B7C8; - --marker-outlines: #E7B7C8; - min-height: 200px; - flex-grow: 1; - flex-shrink: 0; -} -.category-chart_2 { - --brushes: #CDB3D4 #AE91B6; - --outlines: #CDB3D4 #AE91B6; - --marker-brushes: #CDB3D4 #AE91B6; - --marker-outlines: #CDB3D4 #AE91B6; - min-height: 200px; - flex-grow: 1; - flex-basis: 0; -} -.category-chart_3 { - --brushes: #FFBE88; - --outlines: #FFBE88; - --marker-brushes: #FFBE88; - --marker-outlines: #FFBE88; - min-height: 200px; - flex-grow: 1; - flex-shrink: 0; -} -.category-chart_4 { - --brushes: #74C2A3 #DFA8BB; - --outlines: #74C2A3 #DFA8BB; - --marker-brushes: #74C2A3 #DFA8BB; - --marker-outlines: #74C2A3 #DFA8BB; - min-height: 200px; - flex-grow: 1; - flex-shrink: 0; -} diff --git a/src/app/health-indicators/health-indicators.component.ts b/src/app/health-indicators/health-indicators.component.ts deleted file mode 100644 index 8419d53e..00000000 --- a/src/app/health-indicators/health-indicators.component.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subject, takeUntil } from 'rxjs'; -import { BPSystolicDiastolicType } from '../models/patient-dashboard/bpsystolic-diastolic-type'; -import { TotalCholesterolType } from '../models/patient-dashboard/total-cholesterol-type'; -import { CholesterolHDLLDLType } from '../models/patient-dashboard/cholesterol-hdlldltype'; -import { GlucoseType } from '../models/patient-dashboard/glucose-type'; -import { HeartRateType } from '../models/patient-dashboard/heart-rate-type'; -import { WeightType } from '../models/patient-dashboard/weight-type'; -import { PatientDashboardService } from '../services/patient-dashboard.service'; - -@Component({ - selector: 'app-health-indicators', - templateUrl: './health-indicators.component.html', - styleUrls: ['./health-indicators.component.scss'] -}) -export class HealthIndicatorsComponent implements OnInit, OnDestroy { - private destroy$: Subject = new Subject(); - public patientDashboardWeight: WeightType[] = []; - public patientDashboardHeartRate: HeartRateType[] = []; - public patientDashboardBPSystolicDiastolic: BPSystolicDiastolicType[] = []; - public patientDashboardGlucose: GlucoseType[] = []; - public patientDashboardTotalCholesterol: TotalCholesterolType[] = []; - public patientDashboardCholesterolHDLLDL: CholesterolHDLLDLType[] = []; - - constructor( - private patientDashboardService: PatientDashboardService, - ) {} - - ngOnInit() { - this.patientDashboardService.getWeightList().pipe(takeUntil(this.destroy$)).subscribe({ - next: (data) => this.patientDashboardWeight = data, - error: (_err: any) => this.patientDashboardWeight = [] - }); - this.patientDashboardService.getHeartRateList().pipe(takeUntil(this.destroy$)).subscribe({ - next: (data) => this.patientDashboardHeartRate = data, - error: (_err: any) => this.patientDashboardHeartRate = [] - }); - this.patientDashboardService.getBPSystolicDiastolicList().pipe(takeUntil(this.destroy$)).subscribe({ - next: (data) => this.patientDashboardBPSystolicDiastolic = data, - error: (_err: any) => this.patientDashboardBPSystolicDiastolic = [] - }); - this.patientDashboardService.getGlucoseList().pipe(takeUntil(this.destroy$)).subscribe({ - next: (data) => this.patientDashboardGlucose = data, - error: (_err: any) => this.patientDashboardGlucose = [] - }); - this.patientDashboardService.getTotalCholesterolList().pipe(takeUntil(this.destroy$)).subscribe({ - next: (data) => this.patientDashboardTotalCholesterol = data, - error: (_err: any) => this.patientDashboardTotalCholesterol = [] - }); - this.patientDashboardService.getCholesterolHDLLDLList().pipe(takeUntil(this.destroy$)).subscribe({ - next: (data) => this.patientDashboardCholesterolHDLLDL = data, - error: (_err: any) => this.patientDashboardCholesterolHDLLDL = [] - }); - } - - ngOnDestroy() { - this.destroy$.next(); - this.destroy$.complete(); - } -} diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html deleted file mode 100644 index f4165431..00000000 --- a/src/app/home/home.component.html +++ /dev/null @@ -1,280 +0,0 @@ -
-
-
- -

- HEART RATE -

-
-
-

- 82 -

-
- bpm -
-
-

- +1.12% -

-
-
-
- -

- BLOOD PRESSURE -

-
-
-

- 140 -

-

- / -

-

- 70 -

-
- mmHg -
-
-

- +1.12% -

-
-
-
- -

- CHOLESTEROL -

-
-
-

- 200 -

-
- mg/dL -
-
-

- +1.12% -

-
-
-
- -

- WEIGHT -

-
-
-

- 112 -

-
- lbs -
-
-

- +1.12% -

-
-
-
-
-
-
-
-

- CURRENT MEDICATIONS -

-
-
- - View all - - - arrow_forward - -
-
- - - -
-
- -
-

- Calcium 500mg -

-

- 1 tablet(s), 1 time(s), daily, with meal -

-
-
- -
- - - - -
-
- -
-

- Hydrolyzed Collagen -

-

- 2 scoop(s), 1 time(s), daily -

-
-
- -
- - - - -
-
- -
-

- Vitamin B19 1000mg -

-

- 1 pill, 2 time(s), weekly, in the morning -

-
-
- -
- - - - -
-
- -
-

- Vitamin D 100.000 IU -

-

- 1 capsule, 1 time(s), trimonthly, with main meal -

-
-
- -
- - - -
-
-
-
-

- UPCOMING APPOINTMENTS -

-
-
- - View all - - - arrow_forward - -
-
- - - -
-
- -
-

- Internal Medicine -

-

- Tuesday, January 24, 2023 - 2:30pm - Dr. M. Matthews -

-
-
- -
- - - - -
-
- -
-

- Dermatology -

-

- Friday, February 24, 2023 - 08:45am - Dr. V. Sawyer -

-
-
- -
- - - - -
-
- -
-

- Gynaecology -

-

- Monday, March 6, 2023 - 6:30pm - Dr. J. Dean -

-
-
- -
- - - -
-
-
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss deleted file mode 100644 index 8db85504..00000000 --- a/src/app/home/home.component.scss +++ /dev/null @@ -1,264 +0,0 @@ -:host { - height: 100%; - display: flex; - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; -} -.column-layout { - display: flex; - flex-direction: column; -} -.group { - background-color: rgba(256, 256, 256, 0.6); - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 40px; - overflow: auto; - position: relative; - padding: 32px; - min-width: 50px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.row-layout { - display: flex; -} -.group_1 { - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 20px; - position: relative; - min-width: 50px; - min-height: 50px; - flex-shrink: 0; -} -.group_2 { - background-color: #DFA8BB; - background-image: url("/assets/kpi-hrate.svg"); - background-size: cover; - background-repeat: no-repeat; - border-radius: 13px; - justify-content: center; - align-items: stretch; - align-content: flex-start; - gap: 4px; - position: relative; - padding: 20px; - min-width: 280px; - flex-grow: 1; - flex-basis: 0; -} -.group_3 { - justify-content: space-between; - align-items: baseline; - align-content: flex-start; - position: relative; -} -.group_4 { - justify-content: flex-start; - align-items: baseline; - align-content: flex-start; - gap: 4px; - position: relative; - min-width: 50px; -} -.group_5 { - background-color: #C8AFCF; - background-image: url("/assets/kpi-bp.svg"); - background-size: cover; - background-repeat: no-repeat; - border-radius: 13px; - justify-content: center; - align-items: stretch; - align-content: flex-start; - gap: 4px; - position: relative; - padding: 20px; - min-width: 280px; - flex-grow: 1; - flex-basis: 0; -} -.group_6 { - background-color: #FFBE88; - background-image: url("/assets/kpi-cholesterol.svg"); - background-size: cover; - background-repeat: no-repeat; - border-radius: 13px; - justify-content: center; - align-items: stretch; - align-content: flex-start; - gap: 4px; - position: relative; - padding: 20px; - min-width: 280px; - flex-grow: 1; - flex-basis: 0; -} -.group_7 { - background-color: #70C3A1; - background-image: url("/assets/kpi-weight.svg"); - background-size: cover; - background-repeat: no-repeat; - border-radius: 13px; - justify-content: center; - align-items: stretch; - align-content: flex-start; - gap: 4px; - position: relative; - padding: 20px; - min-width: 280px; - flex-grow: 1; - flex-basis: 0; -} -.group_8 { - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: stretch; - gap: 40px; - position: relative; - min-width: 50px; - min-height: 50px; -} -.group_9 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 16px; - position: relative; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; -} -.group_10 { - justify-content: space-between; - align-items: center; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; -} -.group_11 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; -} -.group_12 { - border-color: #CDE0C9; - border-width: 0px 0px 1px; - border-style: solid; - justify-content: space-between; - align-items: center; - align-content: flex-start; - position: relative; - padding: 0 0 16px; - min-width: 50px; - min-height: 50px; -} -.group_13 { - justify-content: flex-start; - align-items: center; - align-content: flex-start; - position: relative; - min-width: 50px; - min-height: 50px; -} -.group_14 { - justify-content: center; - align-items: stretch; - align-content: flex-start; - position: relative; - padding: 0 0 0 24px; - min-width: 50px; - min-height: 50px; -} -.image { - object-fit: cover; - width: 28px; - height: 24px; - min-width: 0; - min-height: 0; - max-width: 28px; - max-height: 24px; - flex-shrink: 0; -} -.content { - color: white; - height: max-content; - min-width: min-content; -} -.image_1 { - object-fit: cover; - width: 24px; - height: 28px; - min-width: 0; - min-height: 0; - max-width: 24px; - max-height: 28px; - flex-shrink: 0; -} -.image_2 { - object-fit: cover; - width: 24px; - height: 24px; - min-width: 0; - min-height: 0; - max-width: 24px; - max-height: 24px; - flex-shrink: 0; -} -.text { - color: hsla(var(--ig-info-500)); - margin: 0 8px 0 0; - height: max-content; - min-width: min-content; -} -.hyperlink { - color: hsla(var(--ig-primary-900)); - height: max-content; - min-width: min-content; - flex-shrink: 0; -} -.icon { - --size: 18px; - font-size: 18px; - width: 18px; - height: 18px; - color: hsla(var(--ig-primary-800)); -} -.image_3 { - object-fit: cover; - height: 26px; - min-width: 0; - min-height: 0; - max-height: 26px; - flex-shrink: 0; -} -.text_1 { - color: hsla(var(--ig-secondary-500)); - height: max-content; - min-width: min-content; -} -.image_4 { - object-fit: cover; - height: 28px; - min-width: 0; - min-height: 0; - max-height: 28px; - flex-shrink: 0; -} -.list { - height: max-content; -} -.button { - --igx-button-foreground: hsla(var(--ig-primary-800)); -} diff --git a/src/app/home/home.component.spec.ts b/src/app/home/home.component.spec.ts deleted file mode 100644 index 2b952b03..00000000 --- a/src/app/home/home.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -import { IgxIconModule, IgxListModule, IgxButtonModule, IgxRippleModule } from 'igniteui-angular'; -import { HomeComponent } from './home.component'; - -describe('HomeComponent', () => { - let component: HomeComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ HomeComponent ], - imports: [ NoopAnimationsModule, FormsModule, IgxIconModule, IgxListModule, IgxButtonModule, IgxRippleModule ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(HomeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts deleted file mode 100644 index 9f4f9320..00000000 --- a/src/app/home/home.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-home', - templateUrl: './home.component.html', - styleUrls: ['./home.component.scss'] -}) -export class HomeComponent {} diff --git a/src/app/medications/medications.component.html b/src/app/medications/medications.component.html deleted file mode 100644 index cad177b0..00000000 --- a/src/app/medications/medications.component.html +++ /dev/null @@ -1,260 +0,0 @@ -
-
-
-
-
-

- CURRENT MEDICATIONS -

-
-
- - - -
-
- -
-

- Calcium 500mg -

-

- 1 tablet(s), 1 time(s), daily, with meal -

-
-
- -
- - - - -
-
- -
-

- Hydrolyzed Collagen -

-

- 2 scoop(s), 1 time(s), daily -

-
-
- -
- - - - -
-
- -
-

- Vitamin B19 1000mg -

-

- 1 pill, 2 time(s), weekly, in the morning -

-
-
- -
- - - - -
-
- -
-

- Vitamin D 100.000 IU -

-

- 1 capsule, 1 time(s), trimonthly, with main meal -

-
-
- -
- - - -
-
-
-
-

- EXPIRED PRESCRIPTIONS -

-
-
- - - -
-
- -
-

- Hypersol B Nasal Spray -

-

- 1 spray, 3 time(s) / day, each nostril, for 7 days -

-
-
- -
- - - - -
-
- -
-

- Prednisone 20mg -

-

- 1 tablet, 2 time(s) / day, with food, for 7 days -

-
-
- -
- - - -
-
-
-
-
-
- Calcium 500mg -
-
-
-

- DOSAGE -

-
-
-

- 1 -

-
-
-

- tablet -

-
-
-
-
-

- FREQUENCY -

-
-
-

- 1 time(s) -

-
-
-

- daily -

-
-
-
-
-
-

- INDICATIONS -

-

- Take by mouth with breakfast. -

-

- Gador Calcium 500 mg Tablets are Calcium supplements formulated to help support bone strength. Sourced from high quality ingredients, these gluten free Nature Made Calcium 500 mg contain no color added and no artificial flavors. This gluten free Calcium supplement is perfect for adults who are low in Calcium or want an additional dietary supplement with their diet. Adults, take one of these Calcium tablet bone supplements 1 to 2 times daily with water and a meal. -

- - + View more information - -
-
-

- PRESCRIPTION INFO -

-
-
-

- Refills Left: -

-

- 4 -

-
-
-

- Last Refill: -

-

- 1/10/2023 -

-
-
-

- Prescribed by: -

-

- Dr. Robert Stevens -

-
-
-
-
- - -
-
-
diff --git a/src/app/medications/medications.component.spec.ts b/src/app/medications/medications.component.spec.ts deleted file mode 100644 index b9fa02e1..00000000 --- a/src/app/medications/medications.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -import { IgxListModule, IgxButtonModule, IgxRippleModule, IgxIconModule } from 'igniteui-angular'; -import { MedicationsComponent } from './medications.component'; - -describe('MedicationsComponent', () => { - let component: MedicationsComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ MedicationsComponent ], - imports: [ NoopAnimationsModule, FormsModule, IgxListModule, IgxButtonModule, IgxRippleModule, IgxIconModule ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(MedicationsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/medications/medications.component.ts b/src/app/medications/medications.component.ts deleted file mode 100644 index fdff3188..00000000 --- a/src/app/medications/medications.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-medications', - templateUrl: './medications.component.html', - styleUrls: ['./medications.component.scss'] -}) -export class MedicationsComponent {} diff --git a/src/app/models/movie-app-data/movie-list-type.ts b/src/app/models/movie-app-data/movie-list-type.ts new file mode 100644 index 00000000..48938b1e --- /dev/null +++ b/src/app/models/movie-app-data/movie-list-type.ts @@ -0,0 +1,3 @@ +export interface MovieListType { + Name: string; +} diff --git a/src/app/models/movie-app-data/my-purchases-type.ts b/src/app/models/movie-app-data/my-purchases-type.ts new file mode 100644 index 00000000..11b141a1 --- /dev/null +++ b/src/app/models/movie-app-data/my-purchases-type.ts @@ -0,0 +1,6 @@ +export interface MyPurchasesType { + Name: string; + Theatre: string; + Purchased: string; + MoviePoster: string; +} diff --git a/src/app/models/movie-app-data/now-playing-type.ts b/src/app/models/movie-app-data/now-playing-type.ts new file mode 100644 index 00000000..2edf280f --- /dev/null +++ b/src/app/models/movie-app-data/now-playing-type.ts @@ -0,0 +1,6 @@ +export interface NowPlayingType { + Name: string; + Genre: string; + Description: string; + MoviePoster: string; +} diff --git a/src/app/models/movie-app-data/showtimes-type.ts b/src/app/models/movie-app-data/showtimes-type.ts new file mode 100644 index 00000000..002dabbf --- /dev/null +++ b/src/app/models/movie-app-data/showtimes-type.ts @@ -0,0 +1,3 @@ +export interface ShowtimesType { + Showtimes: string; +} diff --git a/src/app/models/movie-app-data/theatres-near-you-type.ts b/src/app/models/movie-app-data/theatres-near-you-type.ts new file mode 100644 index 00000000..c1ad7ead --- /dev/null +++ b/src/app/models/movie-app-data/theatres-near-you-type.ts @@ -0,0 +1,6 @@ +export interface TheatresNearYouType { + Initials: string; + Theatre: string; + Address: string; + Avatarcolor: string; +} diff --git a/src/app/models/movie-app-data/theatres-type.ts b/src/app/models/movie-app-data/theatres-type.ts new file mode 100644 index 00000000..36f7e32e --- /dev/null +++ b/src/app/models/movie-app-data/theatres-type.ts @@ -0,0 +1,3 @@ +export interface TheatresType { + Theatres: string; +} diff --git a/src/app/models/patient-dashboard/bpsystolic-diastolic-type.ts b/src/app/models/patient-dashboard/bpsystolic-diastolic-type.ts deleted file mode 100644 index 4890a8e1..00000000 --- a/src/app/models/patient-dashboard/bpsystolic-diastolic-type.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface BPSystolicDiastolicType { - Month: string; - Systolic: number; - Diastolic: number; -} diff --git a/src/app/models/patient-dashboard/cholesterol-hdlldltype.ts b/src/app/models/patient-dashboard/cholesterol-hdlldltype.ts deleted file mode 100644 index b5d890c1..00000000 --- a/src/app/models/patient-dashboard/cholesterol-hdlldltype.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface CholesterolHDLLDLType { - Month: string; - HDL: number; - LDL: number; -} diff --git a/src/app/models/patient-dashboard/glucose-type.ts b/src/app/models/patient-dashboard/glucose-type.ts deleted file mode 100644 index 27d4c0ea..00000000 --- a/src/app/models/patient-dashboard/glucose-type.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface GlucoseType { - Month: string; - Glucose: number; -} diff --git a/src/app/models/patient-dashboard/heart-rate-type.ts b/src/app/models/patient-dashboard/heart-rate-type.ts deleted file mode 100644 index 62e5a109..00000000 --- a/src/app/models/patient-dashboard/heart-rate-type.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface HeartRateType { - Month: string; - HeartRate: number; -} diff --git a/src/app/models/patient-dashboard/total-cholesterol-type.ts b/src/app/models/patient-dashboard/total-cholesterol-type.ts deleted file mode 100644 index 1f3a2297..00000000 --- a/src/app/models/patient-dashboard/total-cholesterol-type.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface TotalCholesterolType { - Month: string; - Cholesterol: number; -} diff --git a/src/app/models/patient-dashboard/weight-type.ts b/src/app/models/patient-dashboard/weight-type.ts deleted file mode 100644 index 18bd22c0..00000000 --- a/src/app/models/patient-dashboard/weight-type.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface WeightType { - Month: string; - Weight: number; -} diff --git a/src/app/emergency/emergency.component.html b/src/app/movie-complex/movie-complex.component.html similarity index 52% rename from src/app/emergency/emergency.component.html rename to src/app/movie-complex/movie-complex.component.html index 451f6e42..43b3956e 100644 --- a/src/app/emergency/emergency.component.html +++ b/src/app/movie-complex/movie-complex.component.html @@ -1,9 +1,9 @@
- -
+ +
Start building! -
-

+ +

Remove the "demo-content" container, and add your own content.

diff --git a/src/app/emergency/emergency.component.scss b/src/app/movie-complex/movie-complex.component.scss similarity index 79% rename from src/app/emergency/emergency.component.scss rename to src/app/movie-complex/movie-complex.component.scss index c6488c43..6ecbbf70 100644 --- a/src/app/emergency/emergency.component.scss +++ b/src/app/movie-complex/movie-complex.component.scss @@ -10,8 +10,7 @@ flex-direction: column; } .demo-content { - background-color: transparent; - border-color: hsla(var(--ig-gray-400)); + border-color: hsla(var(--ig-secondary-400)); border-width: 2px; border-style: dashed; justify-content: center; @@ -30,20 +29,18 @@ margin: 0 0 24px; min-width: 0; min-height: 0; - max-width: 280px; flex-shrink: 0; } -.h5 { - color: hsla(var(--ig-info-500)); +.h6 { + color: hsla(var(--ig-primary-400)); margin: 0 0 16px; height: max-content; min-width: min-content; } .text { text-align: center; - color: hsla(var(--ig-gray-700)); - margin: 0 0 24px; + color: hsla(var(--ig-gray-500)); height: max-content; min-width: min-content; - max-width: 320px; + max-width: 280px; } diff --git a/src/app/emergency/emergency.component.spec.ts b/src/app/movie-complex/movie-complex.component.spec.ts similarity index 51% rename from src/app/emergency/emergency.component.spec.ts rename to src/app/movie-complex/movie-complex.component.spec.ts index 1bb234db..5d615928 100644 --- a/src/app/emergency/emergency.component.spec.ts +++ b/src/app/movie-complex/movie-complex.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { EmergencyComponent } from './emergency.component'; +import { MovieComplexComponent } from './movie-complex.component'; -describe('EmergencyComponent', () => { - let component: EmergencyComponent; - let fixture: ComponentFixture; +describe('MovieComplexComponent', () => { + let component: MovieComplexComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [EmergencyComponent] + declarations: [MovieComplexComponent] }) .compileComponents(); - fixture = TestBed.createComponent(EmergencyComponent); + fixture = TestBed.createComponent(MovieComplexComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/movie-complex/movie-complex.component.ts b/src/app/movie-complex/movie-complex.component.ts new file mode 100644 index 00000000..622318c5 --- /dev/null +++ b/src/app/movie-complex/movie-complex.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-movie-complex', + templateUrl: './movie-complex.component.html', + styleUrls: ['./movie-complex.component.scss'] +}) +export class MovieComplexComponent {} diff --git a/src/app/movies/movies.component.html b/src/app/movies/movies.component.html new file mode 100644 index 00000000..ccb99858 --- /dev/null +++ b/src/app/movies/movies.component.html @@ -0,0 +1,157 @@ +
+
+ Movie Premieres +
+
+
+
+
+ MoviePlex Metropolis +
+ +
+
+
+ + + + Now Playing + + + + + + + +

+ {{ item.Name }} +

+
+ {{ item.Genre }} +
+ + +

+ {{ item.Description }} +

+ + + + + + + + + + + + + + + + + Opening This Week + + +
+ +

+ Remove the "demo-content" container, and add your own content. +

+
+ + + + + Coming Soon + + +
+ +

+ Remove the "demo-content" container, and add your own content. +

+
+ + + +
+
+
+

+ BUY TICKETS +

+ + + + movie + + + + {{ item.Name }} + + + + + + + location_on + + + + {{ item.Theatres }} + + + + + + + + + + access_time + + + + {{ item.Showtimes }} + + + + +
+
+

+ THEATRES NEAR YOU +

+ + + + + + {{ item.Theatre }} + {{ item.Address }} + + + +
+
diff --git a/src/app/medications/medications.component.scss b/src/app/movies/movies.component.scss similarity index 50% rename from src/app/medications/medications.component.scss rename to src/app/movies/movies.component.scss index 6be1731d..a9ad59df 100644 --- a/src/app/medications/medications.component.scss +++ b/src/app/movies/movies.component.scss @@ -6,233 +6,240 @@ align-items: stretch; align-content: stretch; } -.row-layout { +.column-layout { display: flex; + flex-direction: column; } .group { - background-color: rgba(256, 256, 256, 0.6); - flex-wrap: wrap; + background-color: #110613; justify-content: flex-start; align-items: stretch; - align-content: stretch; + align-content: flex-start; gap: 24px; + overflow: auto; position: relative; padding: 32px; - min-width: 360px; + min-width: 512px; min-height: 50px; - flex-grow: 1; + flex-grow: 4; flex-basis: 0; } -.column-layout { +.row-layout { display: flex; - flex-direction: column; } .group_1 { + background-image: url("https://images.unsplash.com/photo-1612036782180-6f0b6cd846fe?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1400&q=80"); + background-size: cover; + background-repeat: no-repeat; justify-content: flex-start; align-items: stretch; align-content: flex-start; - gap: 32px; position: relative; - min-width: 360px; - min-height: 50px; - flex-grow: 1; - flex-basis: 0; + min-width: 50px; + min-height: 320px; + max-height: 320px; } .group_2 { - justify-content: flex-start; - align-items: stretch; + background-color: rgb(25, 9, 27, 0.3); + justify-content: center; + align-items: center; align-content: flex-start; - gap: 16px; position: relative; - min-width: 360px; min-height: 50px; - flex-shrink: 0; + flex-grow: 1; + flex-basis: 0; } .group_3 { - justify-content: space-between; - align-items: center; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; -} -.group_4 { justify-content: flex-start; - align-items: baseline; - align-content: flex-start; - gap: 4px; - position: relative; - min-width: 50px; -} -.group_5 { - border-color: #CDE0C9; - border-width: 0px 0px 1px; - border-style: solid; - justify-content: space-between; - align-items: center; + align-items: stretch; align-content: flex-start; position: relative; - padding: 0 0 16px; min-width: 50px; min-height: 50px; } -.group_6 { - justify-content: flex-start; - align-items: center; - align-content: flex-start; - position: relative; - min-width: 50px; - min-height: 50px; +.tabs { + min-width: auto; + flex-grow: 1; + flex-shrink: 0; } -.group_7 { - justify-content: center; - align-items: stretch; - align-content: flex-start; - position: relative; - padding: 0 0 0 24px; - min-width: 50px; - min-height: 50px; +.tab-item { + min-width: 100%; } -.group_8 { - background-color: rgba(256, 256, 256, 0.6); - border-color: #CDE0C9; - border-width: 0px 0px 0px 1px; - border-style: solid; - flex-wrap: wrap; - justify-content: flex-start; - align-items: stretch; - align-content: stretch; - gap: 24px; - position: relative; - padding: 32px; - min-width: 360px; - min-height: 50px; +.card { + height: max-content; + min-width: 320px; flex-grow: 1; flex-basis: 0; } -.group_9 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; +.demo-content { + border-color: hsla(var(--ig-secondary-200)); + border-width: 2px; + border-style: dashed; + flex-wrap: wrap; + justify-content: center; + align-items: center; + align-content: center; gap: 32px; - position: relative; - width: 657px; - min-width: 360px; - min-height: 50px; - max-width: 657px; -} -.group_10 { - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; + padding: 48px; + min-width: auto; min-height: 50px; + flex-grow: 1; + flex-basis: 0; } -.group_11 { +.group_4 { + background-color: #110613; justify-content: flex-start; align-items: stretch; align-content: flex-start; - gap: 4px; - position: relative; - min-width: 50px; - min-height: 50px; -} -.group_12 { - background-color: #F0F6EF; - justify-content: center; - align-items: center; - align-content: flex-start; + overflow: auto; position: relative; - padding: 0 8px; - min-width: 50px; + padding: 32px; + min-width: 400px; min-height: 50px; + flex-grow: 1; + flex-basis: 0; } -.group_13 { +.buy-tickets { + background-color: #19091B; + border-color: #361439; + border-width: 4px 0px 0px; + border-style: solid; justify-content: flex-start; align-items: stretch; align-content: flex-start; gap: 16px; - position: relative; - min-width: 50px; - min-height: 50px; + margin: 0.0px 0.0px 32px; + padding: 24px; + flex-shrink: 0; } -.group_14 { +.theatres-near-you { + background-color: #19091B; + border-color: #361439; + border-width: 4px 0px 0px; + border-style: solid; justify-content: flex-start; align-items: stretch; align-content: flex-start; - position: relative; - min-width: 50px; - min-height: 50px; -} -.group_15 { - justify-content: flex-start; - align-items: baseline; - align-content: flex-start; - gap: 8px; - position: relative; - min-width: 50px; + gap: 24px; + margin: 0.0px; + padding: 24.0px 0.0px; + flex-shrink: 0; } -.group_16 { - justify-content: flex-end; - align-items: stretch; - align-content: flex-start; - gap: 16px; - position: relative; - min-width: 50px; +.content { + height: max-content; + min-width: min-content; } -.text { - color: hsla(var(--ig-info-500)); - margin: 0 8px 0 0; +.h5_1 { + text-align: center; + margin: 0 0 16px; height: max-content; min-width: min-content; } .image { + height: 100%; + min-height: 100%; + max-height: 100%; +} +.image_1 { object-fit: cover; - height: 26px; min-width: 0; min-height: 0; - max-height: 26px; + max-width: 160px; flex-shrink: 0; } -.content { - color: hsla(var(--ig-secondary-500)); +.text { + text-align: center; + color: hsla(var(--ig-gray-500)); height: max-content; min-width: min-content; + max-width: 320px; +} +.title { + margin: 0.0px 0.0px 16px; + padding: 0.0px; + width: max-content; + height: max-content; +} +.icon { + --size: 24px; + font-size: 24px; + width: 24px; + height: 24px; } .text_1 { - color: hsla(var(--ig-secondary-400)); + margin: 0 0 0 24px; height: max-content; min-width: min-content; } -.text_2 { - color: hsla(var(--ig-info-500)); +.avatar { + --igx-avatar-background: hsla(var(--ig-success-500)); +} +.tab-item-content { + flex-wrap: wrap; + justify-content: flex-start; + align-items: stretch; + align-content: flex-start; + gap: 24px; + overflow: auto; + padding: 24px 0 0; + height: 100%; + min-width: 100%; + min-height: 50px; + max-height: 100%; +} +.media-content { + min-height: 180px; + max-height: 180px; +} +.body-content { + min-width: 50px; + min-height: 50px; +} +.actions-content { + min-width: 50px; + min-height: 40px; +} +.tab-item-content_1 { + justify-content: flex-start; + align-items: stretch; + align-content: flex-start; + padding: 24px 0 0; + height: 100%; + min-width: 100%; + min-height: 50px; + max-height: 100%; +} +.button { + --igx-button-foreground: white; + --igx-button-background: hsla(var(--ig-primary-500)); + height: max-content; +} +.button_1 { + --igx-button-foreground: hsla(var(--ig-primary-400)); height: max-content; - min-width: min-content; } -.hyperlink { - color: hsla(var(--ig-primary-900)); +.button_2 { + --igx-button-foreground: hsla(var(--ig-primary-400)); +} +.select { height: max-content; min-width: min-content; } -.text_3 { - color: hsla(var(--ig-secondary-400)); +.date-picker { height: max-content; min-width: 120px; } -.list { +.select_1 { + margin: 0 0 16px; height: max-content; + min-width: min-content; } -.button { - --igx-button-foreground: hsla(var(--ig-primary-800)); -} -.button_1 { +.button_3 { + --igx-button-foreground: white; + --igx-button-background: hsla(var(--ig-primary-500)); + margin: 0 24px; height: max-content; - flex-shrink: 0; } -.button_2 { - --igx-button-background: hsla(var(--ig-primary-500)); +.list { height: max-content; - flex-shrink: 0; } diff --git a/src/app/movies/movies.component.spec.ts b/src/app/movies/movies.component.spec.ts new file mode 100644 index 00000000..a0266c98 --- /dev/null +++ b/src/app/movies/movies.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule } from '@angular/forms'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; + +import { IgxButtonModule, IgxRippleModule, IgxTabsModule, IgxCardModule, IgxIconModule, IgxSelectModule, IgxInputGroupModule, IgxDatePickerModule, IgxListModule, IgxAvatarModule } from 'igniteui-angular'; +import { MoviesComponent } from './movies.component'; + +describe('MoviesComponent', () => { + let component: MoviesComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MoviesComponent ], + imports: [ NoopAnimationsModule, FormsModule, HttpClientTestingModule, IgxButtonModule, IgxRippleModule, IgxTabsModule, IgxCardModule, IgxIconModule, IgxSelectModule, IgxInputGroupModule, IgxDatePickerModule, IgxListModule, IgxAvatarModule ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MoviesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/movies/movies.component.ts b/src/app/movies/movies.component.ts new file mode 100644 index 00000000..06602510 --- /dev/null +++ b/src/app/movies/movies.component.ts @@ -0,0 +1,55 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { TheatresNearYouType } from '../models/movie-app-data/theatres-near-you-type'; +import { MovieListType } from '../models/movie-app-data/movie-list-type'; +import { ShowtimesType } from '../models/movie-app-data/showtimes-type'; +import { TheatresType } from '../models/movie-app-data/theatres-type'; +import { NowPlayingType } from '../models/movie-app-data/now-playing-type'; +import { MovieAppDataService } from '../services/movie-app-data.service'; + +@Component({ + selector: 'app-movies', + templateUrl: './movies.component.html', + styleUrls: ['./movies.component.scss'] +}) +export class MoviesComponent implements OnInit, OnDestroy { + private destroy$: Subject = new Subject(); + public movieAppDataNowPlaying: NowPlayingType[] = []; + public value: string = '1'; + public movieAppDataMovieList: MovieListType[] = []; + public movieAppDataTheatres: TheatresType[] = []; + public movieAppDataShowtimes: ShowtimesType[] = []; + public movieAppDataTheatresNearYou: TheatresNearYouType[] = []; + + constructor( + private movieAppDataService: MovieAppDataService, + ) {} + + ngOnInit() { + this.movieAppDataService.getNowPlayingList().pipe(takeUntil(this.destroy$)).subscribe({ + next: (data) => this.movieAppDataNowPlaying = data, + error: (_err: any) => this.movieAppDataNowPlaying = [] + }); + this.movieAppDataService.getMovieListList().pipe(takeUntil(this.destroy$)).subscribe({ + next: (data) => this.movieAppDataMovieList = data, + error: (_err: any) => this.movieAppDataMovieList = [] + }); + this.movieAppDataService.getTheatresList().pipe(takeUntil(this.destroy$)).subscribe({ + next: (data) => this.movieAppDataTheatres = data, + error: (_err: any) => this.movieAppDataTheatres = [] + }); + this.movieAppDataService.getShowtimesList().pipe(takeUntil(this.destroy$)).subscribe({ + next: (data) => this.movieAppDataShowtimes = data, + error: (_err: any) => this.movieAppDataShowtimes = [] + }); + this.movieAppDataService.getTheatresNearYouList().pipe(takeUntil(this.destroy$)).subscribe({ + next: (data) => this.movieAppDataTheatresNearYou = data, + error: (_err: any) => this.movieAppDataTheatresNearYou = [] + }); + } + + ngOnDestroy() { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/src/app/my-purchases/my-purchases.component.html b/src/app/my-purchases/my-purchases.component.html new file mode 100644 index 00000000..da756013 --- /dev/null +++ b/src/app/my-purchases/my-purchases.component.html @@ -0,0 +1,40 @@ +
+

+ My Purchases +

+ + + +
+ +
+
+
+
+ {{ item.Name }} +
+ + {{ item.Theatre }} + +
+
+

+ Purchased +

+

+ {{ item.Purchased }} +

+
+
+ +
+
+ + + +
diff --git a/src/app/my-purchases/my-purchases.component.scss b/src/app/my-purchases/my-purchases.component.scss new file mode 100644 index 00000000..0e11f259 --- /dev/null +++ b/src/app/my-purchases/my-purchases.component.scss @@ -0,0 +1,111 @@ +:host { + height: 100%; + display: flex; + justify-content: flex-start; + align-items: stretch; + align-content: flex-start; +} +.column-layout { + display: flex; + flex-direction: column; +} +.group { + background-color: #110613; + justify-content: flex-start; + align-items: stretch; + align-content: flex-start; + overflow: auto; + position: relative; + padding: 32px; + min-height: 50px; + flex-grow: 1; + flex-basis: 0; +} +.row-layout { + display: flex; +} +.group_1 { + justify-content: flex-start; + align-items: center; + align-content: flex-start; + gap: 32px; + position: relative; + padding: 8px 0; +} +.group_2 { + flex-wrap: wrap; + justify-content: space-between; + align-items: center; + align-content: space-between; + gap: 16px; + position: relative; + min-width: 320px; + min-height: auto; + flex-grow: 1; + flex-basis: 0; +} +.group_3 { + flex-wrap: wrap; + justify-content: space-between; + align-items: stretch; + align-content: flex-start; + gap: 16px; + position: relative; + min-width: 50px; + min-height: 50px; +} +.group_4 { + justify-content: flex-start; + align-items: flex-start; + align-content: flex-start; + gap: 6px; + position: relative; + min-width: 300px; +} +.group_5 { + justify-content: flex-start; + align-items: flex-start; + align-content: flex-start; + gap: 6px; + position: relative; + padding: 4px 0 0; + min-width: 140px; +} +.h4 { + margin: 0 0 24px; + height: max-content; + min-width: min-content; +} +.image { + object-fit: cover; + width: 135px; + height: 180px; + min-width: 0; + min-height: 0; + max-width: 135px; + max-height: 180px; + flex-shrink: 0; +} +.h6 { + height: max-content; + max-width: 300px; +} +.hyperlink { + color: hsla(var(--ig-primary-400)); + height: max-content; +} +.text { + color: hsla(var(--ig-gray-500)); + height: max-content; +} +.text_1 { + height: max-content; + min-width: auto; +} +.list { + height: max-content; +} +.button { + height: max-content; + flex-shrink: 0; +} diff --git a/src/app/health-indicators/health-indicators.component.spec.ts b/src/app/my-purchases/my-purchases.component.spec.ts similarity index 55% rename from src/app/health-indicators/health-indicators.component.spec.ts rename to src/app/my-purchases/my-purchases.component.spec.ts index 6d475208..27bd5c06 100644 --- a/src/app/health-indicators/health-indicators.component.spec.ts +++ b/src/app/my-purchases/my-purchases.component.spec.ts @@ -3,23 +3,23 @@ import { FormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { IgxCategoryChartModule } from 'igniteui-angular-charts'; -import { HealthIndicatorsComponent } from './health-indicators.component'; +import { IgxListModule, IgxButtonModule, IgxRippleModule, IgxIconModule } from 'igniteui-angular'; +import { MyPurchasesComponent } from './my-purchases.component'; -describe('HealthIndicatorsComponent', () => { - let component: HealthIndicatorsComponent; - let fixture: ComponentFixture; +describe('MyPurchasesComponent', () => { + let component: MyPurchasesComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ HealthIndicatorsComponent ], - imports: [ NoopAnimationsModule, FormsModule, HttpClientTestingModule, IgxCategoryChartModule ] + declarations: [ MyPurchasesComponent ], + imports: [ NoopAnimationsModule, FormsModule, HttpClientTestingModule, IgxListModule, IgxButtonModule, IgxRippleModule, IgxIconModule ] }) .compileComponents(); }); beforeEach(() => { - fixture = TestBed.createComponent(HealthIndicatorsComponent); + fixture = TestBed.createComponent(MyPurchasesComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/my-purchases/my-purchases.component.ts b/src/app/my-purchases/my-purchases.component.ts new file mode 100644 index 00000000..10b46676 --- /dev/null +++ b/src/app/my-purchases/my-purchases.component.ts @@ -0,0 +1,30 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { MyPurchasesType } from '../models/movie-app-data/my-purchases-type'; +import { MovieAppDataService } from '../services/movie-app-data.service'; + +@Component({ + selector: 'app-my-purchases', + templateUrl: './my-purchases.component.html', + styleUrls: ['./my-purchases.component.scss'] +}) +export class MyPurchasesComponent implements OnInit, OnDestroy { + private destroy$: Subject = new Subject(); + public movieAppDataMyPurchases: MyPurchasesType[] = []; + + constructor( + private movieAppDataService: MovieAppDataService, + ) {} + + ngOnInit() { + this.movieAppDataService.getMyPurchasesList().pipe(takeUntil(this.destroy$)).subscribe({ + next: (data) => this.movieAppDataMyPurchases = data, + error: (_err: any) => this.movieAppDataMyPurchases = [] + }); + } + + ngOnDestroy() { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/src/app/profile/profile.component.html b/src/app/profile/profile.component.html deleted file mode 100644 index 451f6e42..00000000 --- a/src/app/profile/profile.component.html +++ /dev/null @@ -1,9 +0,0 @@ -
- -
- Start building! -
-

- Remove the "demo-content" container, and add your own content. -

-
diff --git a/src/app/profile/profile.component.scss b/src/app/profile/profile.component.scss deleted file mode 100644 index c6488c43..00000000 --- a/src/app/profile/profile.component.scss +++ /dev/null @@ -1,49 +0,0 @@ -:host { - height: 100%; - display: flex; - justify-content: flex-start; - align-items: stretch; - align-content: flex-start; -} -.column-layout { - display: flex; - flex-direction: column; -} -.demo-content { - background-color: transparent; - border-color: hsla(var(--ig-gray-400)); - border-width: 2px; - border-style: dashed; - justify-content: center; - align-items: center; - align-content: flex-start; - left: 50%; - transform: translate(-50%, -50%); - top: 50%; - position: absolute; - padding: 64px; - min-width: 50px; - min-height: 50px; -} -.image { - object-fit: cover; - margin: 0 0 24px; - min-width: 0; - min-height: 0; - max-width: 280px; - flex-shrink: 0; -} -.h5 { - color: hsla(var(--ig-info-500)); - margin: 0 0 16px; - height: max-content; - min-width: min-content; -} -.text { - text-align: center; - color: hsla(var(--ig-gray-700)); - margin: 0 0 24px; - height: max-content; - min-width: min-content; - max-width: 320px; -} diff --git a/src/app/profile/profile.component.spec.ts b/src/app/profile/profile.component.spec.ts deleted file mode 100644 index 7d6e5450..00000000 --- a/src/app/profile/profile.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProfileComponent } from './profile.component'; - -describe('ProfileComponent', () => { - let component: ProfileComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ProfileComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(ProfileComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/profile/profile.component.ts b/src/app/profile/profile.component.ts deleted file mode 100644 index 2f2c8c68..00000000 --- a/src/app/profile/profile.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-profile', - templateUrl: './profile.component.html', - styleUrls: ['./profile.component.scss'] -}) -export class ProfileComponent {} diff --git a/src/app/services/patient-dashboard.service.spec.ts b/src/app/services/movie-app-data.service.spec.ts similarity index 60% rename from src/app/services/patient-dashboard.service.spec.ts rename to src/app/services/movie-app-data.service.spec.ts index 855029d8..7655886d 100644 --- a/src/app/services/patient-dashboard.service.spec.ts +++ b/src/app/services/movie-app-data.service.spec.ts @@ -1,15 +1,15 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { PatientDashboardService } from './patient-dashboard.service'; +import { MovieAppDataService } from './movie-app-data.service'; -describe('PatientDashboardService', () => { - let service: PatientDashboardService; +describe('MovieAppDataService', () => { + let service: MovieAppDataService; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule] }); - service = TestBed.inject(PatientDashboardService); + service = TestBed.inject(MovieAppDataService); }); it('should be created', () => { diff --git a/src/app/services/movie-app-data.service.ts b/src/app/services/movie-app-data.service.ts new file mode 100644 index 00000000..0708255c --- /dev/null +++ b/src/app/services/movie-app-data.service.ts @@ -0,0 +1,42 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { MovieListType } from '../models/movie-app-data/movie-list-type'; +import { MyPurchasesType } from '../models/movie-app-data/my-purchases-type'; +import { NowPlayingType } from '../models/movie-app-data/now-playing-type'; +import { ShowtimesType } from '../models/movie-app-data/showtimes-type'; +import { TheatresNearYouType } from '../models/movie-app-data/theatres-near-you-type'; +import { TheatresType } from '../models/movie-app-data/theatres-type'; + +@Injectable({ + providedIn: 'root' +}) +export class MovieAppDataService { + constructor( + private http: HttpClient + ) { } + + public getNowPlayingList(): Observable { + return this.http.get("https://excel2json.io/api/share/15755be7-cee3-4b74-4382-08da496bf5f2"); + } + + public getMovieListList(): Observable { + return this.http.get("https://excel2json.io/api/share/99cd7568-0b49-4c09-4387-08da496bf5f2"); + } + + public getTheatresList(): Observable { + return this.http.get("https://excel2json.io/api/share/5435e256-3846-4895-4385-08da496bf5f2"); + } + + public getShowtimesList(): Observable { + return this.http.get("https://excel2json.io/api/share/f179620a-3bb6-49cd-4384-08da496bf5f2"); + } + + public getTheatresNearYouList(): Observable { + return this.http.get("https://excel2json.io/api/share/49f543dc-9c4e-43e8-4386-08da496bf5f2"); + } + + public getMyPurchasesList(): Observable { + return this.http.get("https://excel2json.io/api/share/3f89384c-e58f-429a-4388-08da496bf5f2"); + } +} diff --git a/src/app/services/patient-dashboard.service.ts b/src/app/services/patient-dashboard.service.ts deleted file mode 100644 index f6ac5d91..00000000 --- a/src/app/services/patient-dashboard.service.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { BPSystolicDiastolicType } from '../models/patient-dashboard/bpsystolic-diastolic-type'; -import { CholesterolHDLLDLType } from '../models/patient-dashboard/cholesterol-hdlldltype'; -import { GlucoseType } from '../models/patient-dashboard/glucose-type'; -import { HeartRateType } from '../models/patient-dashboard/heart-rate-type'; -import { TotalCholesterolType } from '../models/patient-dashboard/total-cholesterol-type'; -import { WeightType } from '../models/patient-dashboard/weight-type'; - -@Injectable({ - providedIn: 'root' -}) -export class PatientDashboardService { - constructor( - private http: HttpClient - ) { } - - public getWeightList(): Observable { - return this.http.get("https://excel2json.io/api/share/b8fb8833-7e2c-4a84-e611-08daf8ae6744"); - } - - public getHeartRateList(): Observable { - return this.http.get("https://excel2json.io/api/share/43cfd6ae-a6db-42b5-e610-08daf8ae6744"); - } - - public getBPSystolicDiastolicList(): Observable { - return this.http.get("https://excel2json.io/api/share/16761321-7913-4d05-e616-08daf8ae6744"); - } - - public getGlucoseList(): Observable { - return this.http.get("https://excel2json.io/api/share/e1b52986-0c42-4ee1-e617-08daf8ae6744"); - } - - public getTotalCholesterolList(): Observable { - return this.http.get("https://excel2json.io/api/share/2f36bf07-125a-4301-e612-08daf8ae6744"); - } - - public getCholesterolHDLLDLList(): Observable { - return this.http.get("https://excel2json.io/api/share/a1863711-3edb-42ae-e613-08daf8ae6744"); - } -} diff --git a/src/assets/Avatar13.png b/src/assets/Avatar13.png deleted file mode 100644 index 647ea796..00000000 Binary files a/src/assets/Avatar13.png and /dev/null differ diff --git a/src/assets/Avatar4.png b/src/assets/Avatar4.png deleted file mode 100644 index eea20ffe..00000000 Binary files a/src/assets/Avatar4.png and /dev/null differ diff --git a/src/assets/BPressure-White.svg b/src/assets/BPressure-White.svg deleted file mode 100644 index 9205f026..00000000 --- a/src/assets/BPressure-White.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/BPressure_Color.svg b/src/assets/BPressure_Color.svg deleted file mode 100644 index 677c0666..00000000 --- a/src/assets/BPressure_Color.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/Cholesterol-White.svg b/src/assets/Cholesterol-White.svg deleted file mode 100644 index 2e49d835..00000000 --- a/src/assets/Cholesterol-White.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/Cholesterol_Color.svg b/src/assets/Cholesterol_Color.svg deleted file mode 100644 index 799df182..00000000 --- a/src/assets/Cholesterol_Color.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/HRate-White.svg b/src/assets/HRate-White.svg deleted file mode 100644 index bd2a8ed4..00000000 --- a/src/assets/HRate-White.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/HRate_Color.svg b/src/assets/HRate_Color.svg deleted file mode 100644 index 6d53af0e..00000000 --- a/src/assets/HRate_Color.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/Med2.svg b/src/assets/Med2.svg deleted file mode 100644 index 5e8646b4..00000000 --- a/src/assets/Med2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/Scale-White.svg b/src/assets/Scale-White.svg deleted file mode 100644 index 4dc250a8..00000000 --- a/src/assets/Scale-White.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/Scale_Color.svg b/src/assets/Scale_Color.svg deleted file mode 100644 index ab2fe1c4..00000000 --- a/src/assets/Scale_Color.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/appt-past.svg b/src/assets/appt-past.svg deleted file mode 100644 index 239cd170..00000000 --- a/src/assets/appt-past.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/appt-upcoming.svg b/src/assets/appt-upcoming.svg deleted file mode 100644 index 538ac21b..00000000 --- a/src/assets/appt-upcoming.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/blood-sugar.svg b/src/assets/blood-sugar.svg deleted file mode 100644 index 7a3cae37..00000000 --- a/src/assets/blood-sugar.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/kpi-bp.svg b/src/assets/kpi-bp.svg deleted file mode 100644 index c71b109e..00000000 --- a/src/assets/kpi-bp.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/assets/kpi-cholesterol.svg b/src/assets/kpi-cholesterol.svg deleted file mode 100644 index 3cc997f9..00000000 --- a/src/assets/kpi-cholesterol.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/assets/kpi-hrate.svg b/src/assets/kpi-hrate.svg deleted file mode 100644 index 8c18bd10..00000000 --- a/src/assets/kpi-hrate.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/kpi-weight.svg b/src/assets/kpi-weight.svg deleted file mode 100644 index dc2a6e0e..00000000 --- a/src/assets/kpi-weight.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/assets/logo2.svg b/src/assets/logo2.svg deleted file mode 100644 index 24b7577a..00000000 --- a/src/assets/logo2.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/meds-expired.svg b/src/assets/meds-expired.svg deleted file mode 100644 index 76559d90..00000000 --- a/src/assets/meds-expired.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/start-building-dark.svg b/src/assets/start-building-dark.svg new file mode 100644 index 00000000..d560e709 --- /dev/null +++ b/src/assets/start-building-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/start-building.svg b/src/assets/start-building.svg deleted file mode 100644 index c418b8d8..00000000 --- a/src/assets/start-building.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/index.html b/src/index.html index 8abbb6a9..24944ffd 100644 --- a/src/index.html +++ b/src/index.html @@ -2,7 +2,7 @@ - Health Vault + Movie App @@ -10,7 +10,7 @@ - + diff --git a/src/styles.scss b/src/styles.scss index b3744507..34a0a4bd 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -5,17 +5,16 @@ @use "igniteui-angular/theming" as *; @include core(); -@include typography($font-family: "Montserrat"); +@include typography($font-family: "Nunito Sans"); $custom-palette: palette( - $primary: #56C596, - $secondary: #205072, - $surface: #fff, - $error: #CC333F, - $success: #97c556, - $warn: #eb8541, - $info: #329D9C); -@include theme($palette: $custom-palette, $elevation: false); + $primary: #F03F20, + $secondary: #38143B, + $surface: #18091A, + $error: #B81C4C, + $success: #439C47, + $info: #3F51B5); +@include theme($palette: $custom-palette, $schema: $dark-material-schema, $elevation: false, $roundness: 0); body { background: hsla(var(--ig-surface-500));