Skip to content

Commit

Permalink
Merge pull request #7 from HungryMinds/CRJ1-Inception/models
Browse files Browse the repository at this point in the history
Crj1 inception/models and #5
  • Loading branch information
ames89 authored Jan 29, 2018
2 parents ca749c2 + 39a4956 commit b5379b1
Show file tree
Hide file tree
Showing 81 changed files with 120 additions and 4,413 deletions.
4 changes: 2 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { AngularFirestoreModule } from 'angularfire2/firestore';
import { AngularFireAuthModule } from 'angularfire2/auth';

import { NgcFloatButtonModule } from 'ngc-float-button';
import { CoreModule } from './core/index';

@NgModule({
declarations: [AppComponent, NotfoundComponent],
Expand All @@ -27,8 +28,7 @@ import { NgcFloatButtonModule } from 'ngc-float-button';
NgcFloatButtonModule,
AngularFireModule.initializeApp(environment.firebase),
AngularFirestoreModule.enablePersistence(),
// AuthModule,
// CoreModule,
CoreModule,
AppRoutingModule
],
providers: [],
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.routing.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Platform imports
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule, Routes } from '@angular/router';
import { RouterModule } from '@angular/router';

// @Components
import { NotfoundComponent } from './notfound/notfound.component';
Expand Down
16 changes: 0 additions & 16 deletions src/app/core/constants/routes-access.constant.ts

This file was deleted.

26 changes: 0 additions & 26 deletions src/app/core/constants/routes-role-requirements.constant.ts

This file was deleted.

19 changes: 1 addition & 18 deletions src/app/core/core.module.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
/* ••••••••••••••••••••••••••••••••••••••••••• */
/* •• IMPORTS •• */
/* ••••••••••••••••••••••••••••••••••••••••••• */

// Platform Imports
import { NgModule } from '@angular/core';

// Services Imports
import { SessionService, NotificationService, DialogService } from './services';
import { AuthGuard } from './guards/auth.guard';

// Modules Imports
import { SharedModule } from '../shared';

/* ••••••••••••••••••••••••••••••••••••••••••• */
/* •• MODULE DEFINITION •• */
/* ••••••••••••••••••••••••••••••••••••••••••• */

@NgModule({
imports: [SharedModule],
providers: [SessionService, NotificationService, DialogService, AuthGuard]
providers: []
})
export class CoreModule {}
1 change: 0 additions & 1 deletion src/app/core/enums/index.ts

This file was deleted.

6 changes: 0 additions & 6 deletions src/app/core/enums/notification-type.enum.ts

This file was deleted.

132 changes: 0 additions & 132 deletions src/app/core/guards/auth.guard.ts

This file was deleted.

13 changes: 0 additions & 13 deletions src/app/core/index.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
// Exports module.
export * from './core.module';

// Export guards
export * from './guards/auth.guard';

// Enums Exports
export * from './enums';

// Export interfaces
export * from './interfaces';

// Export public constants
export * from './constants/routes-access.constant';
export * from './constants/routes-role-requirements.constant';

// Export public models
export * from './services';
20 changes: 0 additions & 20 deletions src/app/core/interfaces/dialog.interface.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/app/core/interfaces/index.ts

This file was deleted.

14 changes: 0 additions & 14 deletions src/app/core/interfaces/notification.interface.ts

This file was deleted.

56 changes: 0 additions & 56 deletions src/app/core/services/dialog/dialog.service.ts

This file was deleted.

4 changes: 1 addition & 3 deletions src/app/core/services/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
export { SessionService } from './session/session.service';
export { NotificationService } from './notification/notification.service';
export { DialogService } from './dialog/dialog.service';
export { CampistService } from './models/campist.service';
4 changes: 4 additions & 0 deletions src/app/core/services/models/basal-insulin.interface.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export interface BasalInsulin {
dosage: number;
timestamp: Date;
}
21 changes: 21 additions & 0 deletions src/app/core/services/models/campist.interface.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Team } from './team.enum';
import {
InsulinSchemeIntervals,
InsulinSchemeRatio
} from './insulin-scheme.interface';
import { BasalInsulin } from './basal-insulin.interface';
import { FoodTable } from './food.types';

export interface Campist {
id: string;
names: string;
lastNames: string;
age: number;
team: Team;
allergies: string;
medications: string;
insulinSchemeIntervals: InsulinSchemeIntervals;
insulinSchemeRatio: InsulinSchemeRatio;
basalInsulin: Array<BasalInsulin>;
foodTable: Array<FoodTable>;
}
Loading

0 comments on commit b5379b1

Please sign in to comment.