From c23bbdb4cdeffa3fee2428cfc5eac805fb12fff5 Mon Sep 17 00:00:00 2001 From: Pierre-Louis BERTRAND <plbertrand@takima.fr> Date: Mon, 11 Sep 2023 16:02:45 +0200 Subject: [PATCH] imports --- .../src/app/app-routing.module.ts | 18 +++++++++--------- epf-front-skeleton-main/src/app/app.module.ts | 18 +++++++++--------- .../src/app/majors/majors.component.ts | 2 +- .../src/app/majors/majors.resolver.ts | 4 ++-- .../src/app/navbar/navbar.component.ts | 2 +- .../src/app/services/constantsMock.service.ts | 6 +++--- .../src/app/services/course.service.ts | 2 +- .../src/app/services/major.service.ts | 6 +++--- .../src/app/services/student.service.ts | 6 +++--- .../students/research/research.component.ts | 12 ++++++------ .../student-details.component.html | 2 +- .../student-details.component.ts | 8 ++++---- .../student-details.resolver.ts | 6 +++--- .../src/app/students/students.component.ts | 4 ++-- .../src/app/students/students.resolver.ts | 4 ++-- epf-front-skeleton-main/tsconfig.json | 2 +- 16 files changed, 51 insertions(+), 51 deletions(-) diff --git a/epf-front-skeleton-main/src/app/app-routing.module.ts b/epf-front-skeleton-main/src/app/app-routing.module.ts index 5dc7bce..8c70ab9 100644 --- a/epf-front-skeleton-main/src/app/app-routing.module.ts +++ b/epf-front-skeleton-main/src/app/app-routing.module.ts @@ -1,14 +1,14 @@ import { NgModule } from "@angular/core" import { RouterModule, Routes } from "@angular/router" -import { HomeComponent } from "./home/home.component" -import { StudentsComponent } from "./students/students.component" -import { StudentsResolver } from "./students/students.resolver" -import { StudentDetailsComponent } from "./students/student-details/student-details.component" -import { StudentDetailsResolver } from "./students/student-details/student-details.resolver" -import { MajorsComponent } from "./majors/majors.component" -import { MajorsResolver } from "./majors/majors.resolver" -import { MajorStudentsResolver } from "./majors/major-students/major-students.resolver" -import { MajorStudentsComponent } from "./majors/major-students/major-students.component" +import { HomeComponent } from "home/home.component" +import { StudentsComponent } from "students/students.component" +import { StudentsResolver } from "students/students.resolver" +import { StudentDetailsComponent } from "students/student-details/student-details.component" +import { StudentDetailsResolver } from "students/student-details/student-details.resolver" +import { MajorsComponent } from "majors/majors.component" +import { MajorsResolver } from "majors/majors.resolver" +import { MajorStudentsResolver } from "majors/major-students/major-students.resolver" +import { MajorStudentsComponent } from "majors/major-students/major-students.component" const routes: Routes = [ { path: "", component: HomeComponent }, diff --git a/epf-front-skeleton-main/src/app/app.module.ts b/epf-front-skeleton-main/src/app/app.module.ts index 56e8771..f1dfdf4 100644 --- a/epf-front-skeleton-main/src/app/app.module.ts +++ b/epf-front-skeleton-main/src/app/app.module.ts @@ -1,20 +1,20 @@ import { NgModule } from "@angular/core" import { BrowserModule } from "@angular/platform-browser" -import { AppRoutingModule } from "./app-routing.module" -import { AppComponent } from "./app.component" +import { AppRoutingModule } from "app-routing.module" +import { AppComponent } from "app.component" import { BrowserAnimationsModule } from "@angular/platform-browser/animations" -import { NavbarComponent } from "./navbar/navbar.component" +import { NavbarComponent } from "navbar/navbar.component" import { MatListModule } from "@angular/material/list" -import { HomeComponent } from "./home/home.component" -import { StudentsComponent } from "./students/students.component" -import { StudentDetailsComponent } from "./students/student-details/student-details.component" +import { HomeComponent } from "home/home.component" +import { StudentsComponent } from "students/students.component" +import { StudentDetailsComponent } from "students/student-details/student-details.component" import { FormsModule } from "@angular/forms" import { MatIconModule } from "@angular/material/icon" import { MatButtonModule } from "@angular/material/button" -import { MajorsComponent } from "./majors/majors.component" -import { MajorStudentsComponent } from "./majors/major-students/major-students.component" -import { ResearchComponent } from "./students/research/research.component" +import { MajorsComponent } from "majors/majors.component" +import { MajorStudentsComponent } from "majors/major-students/major-students.component" +import { ResearchComponent } from "students/research/research.component" @NgModule({ declarations: [ diff --git a/epf-front-skeleton-main/src/app/majors/majors.component.ts b/epf-front-skeleton-main/src/app/majors/majors.component.ts index e600f84..7fc3b52 100644 --- a/epf-front-skeleton-main/src/app/majors/majors.component.ts +++ b/epf-front-skeleton-main/src/app/majors/majors.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core" import { map, Observable } from "rxjs" -import { Major } from "../models/major.model" +import { Major } from "models/major.model" import { ActivatedRoute } from "@angular/router" @Component({ diff --git a/epf-front-skeleton-main/src/app/majors/majors.resolver.ts b/epf-front-skeleton-main/src/app/majors/majors.resolver.ts index dee4bef..64c2209 100644 --- a/epf-front-skeleton-main/src/app/majors/majors.resolver.ts +++ b/epf-front-skeleton-main/src/app/majors/majors.resolver.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core" import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router" import { Observable } from "rxjs" -import { MajorService } from "../services/major.service" -import { Major } from "../models/major.model" +import { MajorService } from "services/major.service" +import { Major } from "models/major.model" @Injectable({ providedIn: "root", diff --git a/epf-front-skeleton-main/src/app/navbar/navbar.component.ts b/epf-front-skeleton-main/src/app/navbar/navbar.component.ts index 5c06bc1..6e039d5 100644 --- a/epf-front-skeleton-main/src/app/navbar/navbar.component.ts +++ b/epf-front-skeleton-main/src/app/navbar/navbar.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from "@angular/core" -import { Link } from "../models/links.model" +import { Link } from "models/links.model" @Component({ selector: "epf-navbar", diff --git a/epf-front-skeleton-main/src/app/services/constantsMock.service.ts b/epf-front-skeleton-main/src/app/services/constantsMock.service.ts index 2341e62..9819e76 100644 --- a/epf-front-skeleton-main/src/app/services/constantsMock.service.ts +++ b/epf-front-skeleton-main/src/app/services/constantsMock.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core" -import { Student } from "../models/student.model" -import { Course } from "../models/course.model" -import { Major } from "../models/major.model" +import { Student } from "models/student.model" +import { Course } from "models/course.model" +import { Major } from "models/major.model" @Injectable({ providedIn: "root", diff --git a/epf-front-skeleton-main/src/app/services/course.service.ts b/epf-front-skeleton-main/src/app/services/course.service.ts index 23d6508..c79212d 100644 --- a/epf-front-skeleton-main/src/app/services/course.service.ts +++ b/epf-front-skeleton-main/src/app/services/course.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core" import { Observable } from "rxjs" -import { Course } from "../models/course.model" +import { Course } from "models/course.model" import { ConstantsMockService } from "./constantsMock.service" @Injectable({ diff --git a/epf-front-skeleton-main/src/app/services/major.service.ts b/epf-front-skeleton-main/src/app/services/major.service.ts index 65f1422..eac8a4a 100644 --- a/epf-front-skeleton-main/src/app/services/major.service.ts +++ b/epf-front-skeleton-main/src/app/services/major.service.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core" import { Observable } from "rxjs" -import { Major } from "../models/major.model" -import { MajorStudentsDto } from "../models/dto/MajorStudentsDto" -import { MajorsAndCoursesDto } from "../models/dto/majorsAndCoursesDto" +import { Major } from "models/major.model" +import { MajorStudentsDto } from "models/dto/MajorStudentsDto" +import { MajorsAndCoursesDto } from "models/dto/majorsAndCoursesDto" import { ConstantsMockService } from "./constantsMock.service" @Injectable({ diff --git a/epf-front-skeleton-main/src/app/services/student.service.ts b/epf-front-skeleton-main/src/app/services/student.service.ts index e2ddfa4..12e9462 100644 --- a/epf-front-skeleton-main/src/app/services/student.service.ts +++ b/epf-front-skeleton-main/src/app/services/student.service.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core" import { Observable } from "rxjs" -import { Student } from "../models/student.model" -import { Course } from "../models/course.model" +import { Student } from "models/student.model" +import { Course } from "models/course.model" import { ConstantsMockService } from "./constantsMock.service" -import { MajorsAndCoursesDto } from "../models/dto/majorsAndCoursesDto" +import { MajorsAndCoursesDto } from "models/dto/majorsAndCoursesDto" @Injectable({ providedIn: "root", diff --git a/epf-front-skeleton-main/src/app/students/research/research.component.ts b/epf-front-skeleton-main/src/app/students/research/research.component.ts index 8302163..ec56e51 100644 --- a/epf-front-skeleton-main/src/app/students/research/research.component.ts +++ b/epf-front-skeleton-main/src/app/students/research/research.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, OnInit, Output } from "@angular/core" import { Observable } from "rxjs" -import { MajorsAndCoursesDto } from "../../models/dto/majorsAndCoursesDto" -import { Major } from "../../models/major.model" -import { MajorService } from "../../services/major.service" -import { Course } from "../../models/course.model" -import { StudentService } from "../../services/student.service" -import { Student } from "../../models/student.model" +import { MajorsAndCoursesDto } from "models/dto/majorsAndCoursesDto" +import { Major } from "models/major.model" +import { MajorService } from "services/major.service" +import { Course } from "models/course.model" +import { StudentService } from "services/student.service" +import { Student } from "models/student.model" @Component({ selector: "epf-research", diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html index 1be7142..cdd03ba 100644 --- a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html +++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html @@ -2,7 +2,7 @@ <h1>Student's personal data</h1> <form (ngSubmit)="save(student)" #studentForm="ngForm"> <div class="form-group"> - <label for="firstName">Fist Name</label> + <label for="firstName">First Name</label> <input type="text" class="form-control" id="firstName" required [(ngModel)]="student.firstName" name="firstName" diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts index d4637b3..e090df4 100644 --- a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts +++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core" import { map, Observable } from "rxjs" -import { Student } from "../../models/student.model" +import { Student } from "models/student.model" import { ActivatedRoute, Router } from "@angular/router" -import { Course } from "../../models/course.model" -import { CourseService } from "../../services/course.service" -import { StudentService } from "../../services/student.service" +import { Course } from "models/course.model" +import { CourseService } from "services/course.service" +import { StudentService } from "services/student.service" @Component({ selector: "epf-student-details", diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts b/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts index 0388f40..7d971f9 100644 --- a/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts +++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core" import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router" import { Observable } from "rxjs" -import { StudentService } from "../../services/student.service" -import { Student } from "../../models/student.model" -import { Major } from "../../models/major.model" +import { StudentService } from "services/student.service" +import { Student } from "models/student.model" +import { Major } from "models/major.model" @Injectable({ providedIn: "root", diff --git a/epf-front-skeleton-main/src/app/students/students.component.ts b/epf-front-skeleton-main/src/app/students/students.component.ts index 5e5fd68..d83297a 100644 --- a/epf-front-skeleton-main/src/app/students/students.component.ts +++ b/epf-front-skeleton-main/src/app/students/students.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core" import { map, Observable } from "rxjs" -import { Student } from "../models/student.model" +import { Student } from "models/student.model" import { ActivatedRoute } from "@angular/router" -import { StudentService } from "../services/student.service" +import { StudentService } from "services/student.service" @Component({ selector: "epf-students", diff --git a/epf-front-skeleton-main/src/app/students/students.resolver.ts b/epf-front-skeleton-main/src/app/students/students.resolver.ts index ce3c123..a4a6542 100644 --- a/epf-front-skeleton-main/src/app/students/students.resolver.ts +++ b/epf-front-skeleton-main/src/app/students/students.resolver.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core" import { Resolve } from "@angular/router" import { Observable } from "rxjs" -import { Student } from "../models/student.model" -import { StudentService } from "../services/student.service" +import { Student } from "models/student.model" +import { StudentService } from "services/student.service" @Injectable({ providedIn: "root", diff --git a/epf-front-skeleton-main/tsconfig.json b/epf-front-skeleton-main/tsconfig.json index ff06eae..0769790 100644 --- a/epf-front-skeleton-main/tsconfig.json +++ b/epf-front-skeleton-main/tsconfig.json @@ -2,7 +2,7 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", + "baseUrl": "src/app", "outDir": "./dist/out-tsc", "forceConsistentCasingInFileNames": true, "strict": true, -- GitLab