diff --git a/Front/skydivelogs-app/src/app/app.module.ts b/Front/skydivelogs-app/src/app/app.module.ts index 4f8e332..b576e3d 100644 --- a/Front/skydivelogs-app/src/app/app.module.ts +++ b/Front/skydivelogs-app/src/app/app.module.ts @@ -1,10 +1,14 @@ import { BrowserModule } from "@angular/platform-browser"; import { APP_INITIALIZER, NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from "@angular/common/http"; -import { DatePipe } from '@angular/common'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { TranslateHttpLoader } from '@ngx-translate/http-loader'; +import { + HttpClient, + HttpClientModule, + HTTP_INTERCEPTORS, +} from "@angular/common/http"; +import { DatePipe } from "@angular/common"; +import { TranslateLoader, TranslateModule } from "@ngx-translate/core"; +import { TranslateHttpLoader } from "@ngx-translate/http-loader"; import { AppComponent } from "./app.component"; import { environment } from "../environments/environment"; @@ -26,9 +30,9 @@ import { CreateUserComponent } from "./create-user/create-user.component"; import { LoginUserComponent } from "./login-user/login-user.component"; import { UserProfileComponent } from "./user-profile/user-profile.component"; import { ListOfImagesComponent } from "./list-of-images/list-of-images.component"; -import { JumpInfosComponent } from './jump-infos/jump-infos.component'; -import { NewTunnelFlightComponent } from './new-tunnel-flight/new-tunnel-flight.component'; -import { ListOfTunnelFlightsComponent } from './list-of-tunnel-flights/list-of-tunnel-flights.component'; +import { JumpInfosComponent } from "./jump-infos/jump-infos.component"; +import { NewTunnelFlightComponent } from "./new-tunnel-flight/new-tunnel-flight.component"; +import { ListOfTunnelFlightsComponent } from "./list-of-tunnel-flights/list-of-tunnel-flights.component"; import { DateService } from "../services/date.service"; import { AircraftService } from "../services/aircraft.service"; @@ -65,67 +69,71 @@ import { MatTabsModule } from "@angular/material/tabs"; import { MatDialogModule } from "@angular/material/dialog"; import { MatCardModule } from "@angular/material/card"; import { MatRadioModule } from "@angular/material/radio"; -import { MatSidenavModule } from '@angular/material/sidenav'; -import { MatListModule } from '@angular/material/list'; -import { MatToolbarModule } from '@angular/material/toolbar'; -import { NgChartsModule } from 'ng2-charts'; +import { MatSidenavModule } from "@angular/material/sidenav"; +import { MatListModule } from "@angular/material/list"; +import { MatToolbarModule } from "@angular/material/toolbar"; +import { NgChartsModule } from "ng2-charts"; import { JwtAuthInterceptor } from "../interceptor/jwt-auth.interceptor"; import { ErrorInterceptor } from "../interceptor/error.interceptor"; const appRoutes: Routes = [ - { path: "", component: DefaultComponent, canActivate: [AuthGuardService] }, + { + path: "", + component: DefaultComponent, + canActivate: [AuthGuardService], + }, { path: "summary", component: SummaryComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "jumps", component: ListOfJumpsComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "dzs", component: ListOfDzsComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "newjump", component: NewJumpComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "aircrafts", component: ListOfAircraftsComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "jumpTypes", component: ListOfJumpTypesComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "gears", component: ListOfGearsComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "user", component: UserProfileComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "newTunnelFlight", component: NewTunnelFlightComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, { path: "tunnelFlights", component: ListOfTunnelFlightsComponent, - canActivate: [AuthGuardService] + canActivate: [AuthGuardService], }, - + { path: "login", component: LoginComponent }, ]; @@ -161,7 +169,7 @@ export function initConfig(configService: ConfigurationHelper) { ListOfImagesComponent, JumpInfosComponent, NewTunnelFlightComponent, - ListOfTunnelFlightsComponent + ListOfTunnelFlightsComponent, ], imports: [ RouterModule.forRoot( @@ -173,8 +181,8 @@ export function initConfig(configService: ConfigurationHelper) { loader: { provide: TranslateLoader, useFactory: httpTranslateLoader, - deps: [HttpClient] - } + deps: [HttpClient], + }, }), ReactiveFormsModule, FormsModule, @@ -201,7 +209,7 @@ export function initConfig(configService: ConfigurationHelper) { MatSidenavModule, MatListModule, MatToolbarModule, - NgChartsModule + NgChartsModule, ], exports: [HttpClientModule], providers: [ @@ -220,11 +228,15 @@ export function initConfig(configService: ConfigurationHelper) { ConfigurationHelper, DatePipe, ServiceCacheApi, - { provide: APP_INITIALIZER, useFactory: initConfig, deps: [ConfigurationHelper], multi: true }, + { + provide: APP_INITIALIZER, + useFactory: initConfig, + deps: [ConfigurationHelper], + multi: true, + }, { provide: HTTP_INTERCEPTORS, useClass: JwtAuthInterceptor, multi: true }, - { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true } + { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true }, ], bootstrap: [AppComponent], }) -export class AppModule { -} +export class AppModule {} diff --git a/Front/skydivelogs-app/src/app/default/default.component.html b/Front/skydivelogs-app/src/app/default/default.component.html index 36d3786..50063a7 100644 --- a/Front/skydivelogs-app/src/app/default/default.component.html +++ b/Front/skydivelogs-app/src/app/default/default.component.html @@ -1 +1,18 @@ -
+
+

+ + timeline + +

+

+ + add_circle + +

+

+ + list_alt + +

+
+ \ No newline at end of file diff --git a/Front/skydivelogs-app/src/assets/css/styles.css b/Front/skydivelogs-app/src/assets/css/styles.css index a2fa98c..abc78c1 100644 --- a/Front/skydivelogs-app/src/assets/css/styles.css +++ b/Front/skydivelogs-app/src/assets/css/styles.css @@ -16,17 +16,12 @@ mat-form-field{ } a { - /* background-color: red; */ - /* box-shadow: 0 2px 0 darkred; */ color: white; - /* padding: 0.5em 0.5em; */ - /* position: relative; */ text-decoration: none; text-transform: uppercase; } a:hover { - /* background-color: #ce0606; */ box-shadow: 0 2px 0 darkred; } @@ -34,3 +29,10 @@ a:active { box-shadow: none; top: 5px; } + +a.nostyle { + text-decoration: none !important; +} +a.nostyle:hover { + box-shadow: none !important; +} \ No newline at end of file