diff --git a/epf-front-skeleton-main/src/app/home/home.component.ts b/epf-front-skeleton-main/src/app/home/home.component.ts index aa732226527761ecfd38572b358abcf65c7f2581..bb4eee1ba894b2a6e8ac2c559c1212793a661386 100644 --- a/epf-front-skeleton-main/src/app/home/home.component.ts +++ b/epf-front-skeleton-main/src/app/home/home.component.ts @@ -6,11 +6,7 @@ import { Component, OnInit } from "@angular/core" styleUrls: ["./home.component.scss"], }) export class HomeComponent implements OnInit { + constructor() {} - constructor() { - } - - ngOnInit(): void { - } - + ngOnInit(): void {} } diff --git a/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts b/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts index 71c08449811ca4549e09db1d403cdea76bfbef89..512625ed42d118d6cf51d4d4fdb04018896c5e5c 100644 --- a/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts +++ b/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts @@ -1,17 +1,11 @@ -import { Injectable } from "@angular/core" -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router" -import { Observable } from "rxjs" +import { inject } from "@angular/core" +import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot } from "@angular/router" import { MajorService } from "../../services/major.service" import { Student } from "../../models/student.model" -@Injectable({ - providedIn: "root", -}) -export class MajorStudentsResolver implements Resolve<Student[]> { - constructor(private majorService: MajorService) { - } - - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Student[]> { - return this.majorService.findStudentsFromMajor(route.params["id"]) - } +export const MajorStudentsResolver: ResolveFn<Student[]> = ( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot, +) => { + return inject(MajorService).findStudentsFromMajor(route.params["id"]) } 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 64c2209012def8e367bd370625c2cff5634356a9..cf304e35ff9140bd2a7b266d997605c0ac0ffd60 100644 --- a/epf-front-skeleton-main/src/app/majors/majors.resolver.ts +++ b/epf-front-skeleton-main/src/app/majors/majors.resolver.ts @@ -1,17 +1,8 @@ -import { Injectable } from "@angular/core" -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router" -import { Observable } from "rxjs" +import { inject } from "@angular/core" +import { ResolveFn } from "@angular/router" import { MajorService } from "services/major.service" import { Major } from "models/major.model" -@Injectable({ - providedIn: "root", -}) -export class MajorsResolver implements Resolve<Major[]> { - constructor(private majorService: MajorService) { - } - - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Major[]> { - return this.majorService.findAll() - } +export const MajorsResolver: ResolveFn<Major[]> = () => { + return inject(MajorService).findAll() } diff --git a/epf-front-skeleton-main/src/app/models/dto/MajorStudentsDto.ts b/epf-front-skeleton-main/src/app/models/dto/MajorStudentsDto.ts deleted file mode 100644 index 8f724d611bbef3368bd62d18e4d6bc8f9d5f7178..0000000000000000000000000000000000000000 --- a/epf-front-skeleton-main/src/app/models/dto/MajorStudentsDto.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Major } from "../major.model" -import { Student } from "../student.model" - -export class MajorStudentsDto { - major: Major - students: Student[] - - constructor(major: Major, students: Student[]) { - this.major = major - this.students = students - } -} diff --git a/epf-front-skeleton-main/src/app/models/dto/majorsAndCoursesDto.ts b/epf-front-skeleton-main/src/app/models/dto/majorsAndCoursesDto.ts deleted file mode 100644 index 57cbe8159863d775518d3eafa6b97999f0396fd8..0000000000000000000000000000000000000000 --- a/epf-front-skeleton-main/src/app/models/dto/majorsAndCoursesDto.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Major } from "../major.model" -import { Course } from "../course.model" - -export class MajorsAndCoursesDto { - constructor(majors: Major[], courses: Course[]) { - this.majors = majors - this.courses = courses - } - - majors: Major[] - courses: Course[] -} 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 28b242522c82869cfec2242e8e5a2e0dc111784c..ea0e651db0781ea30274e7ff6841ad9be5ac2c4d 100644 --- a/epf-front-skeleton-main/src/app/navbar/navbar.component.ts +++ b/epf-front-skeleton-main/src/app/navbar/navbar.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core" +import { Component } from "@angular/core" import { Link } from "models/links.model" @Component({ 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 a294634082902a52d186e8b4e5e5f89513c7490c..04f64b02b60bedbd18892c414357659af0867433 100644 --- a/epf-front-skeleton-main/src/app/services/course.service.ts +++ b/epf-front-skeleton-main/src/app/services/course.service.ts @@ -9,7 +9,7 @@ import { HttpClient } from "@angular/common/http" export class CourseService { constructor(private http: HttpClient) {} - private coursesUrl = "http://localhost:8080/cours" + private coursesUrl = "http://localhost:8080/courses" findAll(): Observable<Course[]> { return this.http.get<Course[]>(this.coursesUrl) 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 8f80e5547becc9767172f9d573867a7674a18623..1cde366fb7c931bda6b566ead04c6d7cec25d520 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,4 +1,4 @@ -import { Component, OnInit } from "@angular/core" +import { Component } from "@angular/core" import { map, Observable } from "rxjs" import { Student } from "models/student.model" import { ActivatedRoute, Router } from "@angular/router" @@ -38,7 +38,7 @@ export class StudentDetailsComponent { addCourseToStudent(student: Student) { if (this.courseSelectModel != null) { - this.studentService.addCourseToStudent(student, this.courseSelectModel!!) + this.studentService.addCourseToStudent(student, this.courseSelectModel) } else { this.notSelectedCourse = true } 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 8616ba2c100be119979acc4f059e2803c8dcc7c0..a3205967743f0d7b6155bbfbd98d494acfa49f08 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,21 +1,17 @@ -import { Injectable } from "@angular/core" -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router" +import { inject } from "@angular/core" +import { ActivatedRouteSnapshot, ResolveFn, 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" -@Injectable({ - providedIn: "root", -}) -export class StudentDetailsResolver implements Resolve<Student> { - constructor(private studentService: StudentService) { - } - - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Student> { - if (route.params["id"] == "new") { - return new Observable((observer) => observer.next({firstName: "", lastName: "", major: {name: "", description: "", students: []}})) - } - return this.studentService.findById(parseInt(route.params["id"], 10)) +export const StudentDetailsResolver: ResolveFn<Student> = ( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot, +) => { + if (route.params["id"] == "new") { + return new Observable((observer) => { + observer.next({ firstName: "", lastName: "", major: { name: "", description: "", students: [] } }) + }) } + return inject(StudentService).findById(parseInt(route.params["id"], 10)) } 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 a4a65422c287ce97dc1a26f096b1a89803492ee0..23c12664147c373db5d386755e72f650a6299303 100644 --- a/epf-front-skeleton-main/src/app/students/students.resolver.ts +++ b/epf-front-skeleton-main/src/app/students/students.resolver.ts @@ -1,17 +1,8 @@ -import { Injectable } from "@angular/core" -import { Resolve } from "@angular/router" -import { Observable } from "rxjs" +import { inject } from "@angular/core" +import { ResolveFn } from "@angular/router" import { Student } from "models/student.model" import { StudentService } from "services/student.service" -@Injectable({ - providedIn: "root", -}) -export class StudentsResolver implements Resolve<Student[]> { - constructor(private studentService: StudentService) { - } - - resolve(): Observable<Student[]> { - return this.studentService.findAll() - } +export const StudentsResolver: ResolveFn<Student[]> = () => { + return inject(StudentService).findAll() } diff --git a/epf-front-skeleton-main/src/assets/3dgirl.png b/epf-front-skeleton-main/src/assets/3dgirl.png deleted file mode 100644 index cd8cdc0ac032f4b0013003f00621c58963bb8f88..0000000000000000000000000000000000000000 Binary files a/epf-front-skeleton-main/src/assets/3dgirl.png and /dev/null differ diff --git a/epf-front-skeleton-main/src/assets/EtudiMa.png b/epf-front-skeleton-main/src/assets/EtudiMa.png deleted file mode 100644 index 7f505e4213385de2b08dc97a6832096fadcb014b..0000000000000000000000000000000000000000 Binary files a/epf-front-skeleton-main/src/assets/EtudiMa.png and /dev/null differ diff --git a/epf-front-skeleton-main/src/assets/ask-for-help.png b/epf-front-skeleton-main/src/assets/ask-for-help.png deleted file mode 100644 index 81bf4f50276b4efdcf571d544f02f50fe2c711b0..0000000000000000000000000000000000000000 Binary files a/epf-front-skeleton-main/src/assets/ask-for-help.png and /dev/null differ diff --git a/epf-front-skeleton-main/src/assets/background.jpg b/epf-front-skeleton-main/src/assets/background.jpg deleted file mode 100644 index 9957c31887f52c3aae27529d969300ab66331fb8..0000000000000000000000000000000000000000 Binary files a/epf-front-skeleton-main/src/assets/background.jpg and /dev/null differ diff --git a/epf-front-skeleton-main/src/assets/build.png b/epf-front-skeleton-main/src/assets/build.png deleted file mode 100644 index e49865bf0ebedb7cab3117e9ede827575b89247c..0000000000000000000000000000000000000000 Binary files a/epf-front-skeleton-main/src/assets/build.png and /dev/null differ diff --git a/epf-front-skeleton-main/src/assets/logo.png b/epf-front-skeleton-main/src/assets/logo.png deleted file mode 100644 index f232cd5f2610aa3ea0ee4ae986aa3e5f1be46890..0000000000000000000000000000000000000000 Binary files a/epf-front-skeleton-main/src/assets/logo.png and /dev/null differ diff --git a/epf-front-skeleton-main/src/assets/team.png b/epf-front-skeleton-main/src/assets/team.png deleted file mode 100644 index 4ce0529b0f7c96735f5932541a8c586a557d04a5..0000000000000000000000000000000000000000 Binary files a/epf-front-skeleton-main/src/assets/team.png and /dev/null differ diff --git a/epf-front-skeleton-main/src/theme.scss b/epf-front-skeleton-main/src/theme.scss index b9183ea427994ea71ae8e91e170b8bce7a45c2ae..817504fca9d479d3e1bee8e55ac2dc6cbdb63f42 100644 --- a/epf-front-skeleton-main/src/theme.scss +++ b/epf-front-skeleton-main/src/theme.scss @@ -1,25 +1,54 @@ -@use '@angular/material' as mat; +@use "@angular/material" as mat; @include mat.core(); -$dark-purple-palette: (50: #6A0F59, 100: #7D1269, 200: #74107F, 300: #580C61, 400: #5D0D82, 500: #4A0A67, 600: #43095D, 700: #35074A, 800: #290539, 900: #1B0325, contrast:(A50: #EAC7F9)); -$red-purple-palette: (50: #B71C32, 100: #B01C32, 200: #C31D47, 300: #A5193D, 400: #B11B52, 500: #961644, 600: #A01860, 700: #82134E, 800: #8D1667, 900: #751255, contrast:(A50: #961644)); +$dark-purple-palette: ( + 50: #6a0f59, + 100: #7d1269, + 200: #74107f, + 300: #580c61, + 400: #5d0d82, + 500: #4a0a67, + 600: #43095d, + 700: #35074a, + 800: #290539, + 900: #1b0325, + contrast: ( + A50: #eac7f9, + ), +); +$red-purple-palette: ( + 50: #b71c32, + 100: #b01c32, + 200: #c31d47, + 300: #a5193d, + 400: #b11b52, + 500: #961644, + 600: #a01860, + 700: #82134e, + 800: #8d1667, + 900: #751255, + contrast: ( + A50: #961644, + ), +); $my-primary: mat.define-palette($dark-purple-palette, 500, 50, 900); $my-accent: mat.define-palette($red-purple-palette, 500, 50, 900); $my-warn: mat.define-palette(mat.$red-palette); -//$my-theme: mat.define-light-theme($my-primary, $my-accent, $my-warn) - -$my-theme: mat.define-light-theme(( - color: ( primary: $my-primary, accent: $my-accent, warn: $my-warn,) -)); +$my-theme: mat.define-light-theme( + ( + color: ( + primary: $my-primary, + accent: $my-accent, + warn: $my-warn, + ), + ) +); @include mat.all-component-colors($my-theme); $common-purple: mat.get-color-from-palette($dark-purple-palette, 500); $common-red: mat.get-color-from-palette(mat.$red-palette, A700); -$warn : mat.get-color-from-palette($my-warn, 400); -$white : #FFFFFF; - - - +$warn: mat.get-color-from-palette($my-warn, 400); +$white: #ffffff;