diff --git a/Front/skydivelogs-app/src/app/app.component.css b/Front/skydivelogs-app/src/app/app.component.css index 9673883..27eedbc 100644 --- a/Front/skydivelogs-app/src/app/app.component.css +++ b/Front/skydivelogs-app/src/app/app.component.css @@ -1,7 +1,7 @@ body { margin: 10px; color: #424242; - height: 600px; + height: 650px; overflow: auto; } @@ -28,7 +28,7 @@ body { overflow: hidden; z-index: 50; background-color: grey; - height: 600px; + height: 650px; padding: 5px; left: -220px; transition: 0.5s linear left; diff --git a/Front/skydivelogs-app/src/app/app.component.ts b/Front/skydivelogs-app/src/app/app.component.ts index b81df13..5cd9283 100644 --- a/Front/skydivelogs-app/src/app/app.component.ts +++ b/Front/skydivelogs-app/src/app/app.component.ts @@ -9,7 +9,6 @@ import { ServiceComm } from '../services/service-comm.service'; export class AppComponent implements OnInit { title = 'app'; showMenu = false; - // showMenu = true; constructor(private serviceComm: ServiceComm) { } diff --git a/Front/skydivelogs-app/src/app/app.module.ts b/Front/skydivelogs-app/src/app/app.module.ts index 5fed3f2..690d3cc 100644 --- a/Front/skydivelogs-app/src/app/app.module.ts +++ b/Front/skydivelogs-app/src/app/app.module.ts @@ -16,6 +16,7 @@ import { NewAircraftComponent } from './new-aircraft/new-aircraft.component'; import { NewGearComponent } from './new-gear/new-gear.component'; import { NewDropZoneComponent } from './new-drop-zone/new-drop-zone.component'; import { NewJumpTypeComponent } from './new-jump-type/new-jump-type.component'; +import { DefaultComponent } from './default/default.component'; import { DateService } from '../services/date.service'; import { ServiceApiPut } from '../services/service-api-put.service'; @@ -49,7 +50,8 @@ const appRoutes: Routes = [ { path: 'newjump', component: NewJumpComponent }, { path: 'aircrafts', component: ListOfAircraftsComponent }, { path: 'jumpTypes', component: ListOfJumpTypesComponent }, - { path: 'gears', component: ListOfGearsComponent } + { path: 'gears', component: ListOfGearsComponent }, + { path: '**', component: DefaultComponent } ]; @NgModule({ @@ -65,7 +67,8 @@ const appRoutes: Routes = [ NewAircraftComponent, NewGearComponent, NewDropZoneComponent, - NewJumpTypeComponent + NewJumpTypeComponent, + DefaultComponent ], imports: [ RouterModule.forRoot( diff --git a/Front/skydivelogs-app/src/app/default/default.component.css b/Front/skydivelogs-app/src/app/default/default.component.css new file mode 100644 index 0000000..e69de29 diff --git a/Front/skydivelogs-app/src/app/default/default.component.html b/Front/skydivelogs-app/src/app/default/default.component.html new file mode 100644 index 0000000..94bf6e9 --- /dev/null +++ b/Front/skydivelogs-app/src/app/default/default.component.html @@ -0,0 +1,10 @@ +

+ + Summary of jumps + +

+

+ + Add new jumps + +

diff --git a/Front/skydivelogs-app/src/app/default/default.component.spec.ts b/Front/skydivelogs-app/src/app/default/default.component.spec.ts new file mode 100644 index 0000000..eb0d146 --- /dev/null +++ b/Front/skydivelogs-app/src/app/default/default.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DefaultComponent } from './default.component'; + +describe('DefaultComponent', () => { + let component: DefaultComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DefaultComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DefaultComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Front/skydivelogs-app/src/app/default/default.component.ts b/Front/skydivelogs-app/src/app/default/default.component.ts new file mode 100644 index 0000000..0bec71f --- /dev/null +++ b/Front/skydivelogs-app/src/app/default/default.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-default', + templateUrl: './default.component.html', + styleUrls: ['./default.component.css'] +}) +export class DefaultComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css index 9a7951d..502afda 100644 --- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css +++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.css @@ -4,7 +4,7 @@ table { .table-container { position: relative; - height: 600px; + height: 650px; overflow: auto; } diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css index 9a7951d..502afda 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css @@ -4,7 +4,7 @@ table { .table-container { position: relative; - height: 600px; + height: 650px; overflow: auto; } diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css index 9a7951d..502afda 100644 --- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css +++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css @@ -4,7 +4,7 @@ table { .table-container { position: relative; - height: 600px; + height: 650px; overflow: auto; } diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css index 9a7951d..502afda 100644 --- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css +++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.css @@ -4,7 +4,7 @@ table { .table-container { position: relative; - height: 600px; + height: 650px; overflow: auto; } diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css index 9a7951d..502afda 100644 --- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css +++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css @@ -4,7 +4,7 @@ table { .table-container { position: relative; - height: 600px; + height: 650px; overflow: auto; } diff --git a/Front/skydivelogs-app/src/assets/img/addJump.png b/Front/skydivelogs-app/src/assets/img/addJump.png new file mode 100644 index 0000000..fac8c5f Binary files /dev/null and b/Front/skydivelogs-app/src/assets/img/addJump.png differ diff --git a/Front/skydivelogs-app/src/assets/img/summary.png b/Front/skydivelogs-app/src/assets/img/summary.png new file mode 100644 index 0000000..63b0fa0 Binary files /dev/null and b/Front/skydivelogs-app/src/assets/img/summary.png differ