Compare commits
58 Commits
agenda
...
back-postg
Author | SHA1 | Date | |
---|---|---|---|
820757c836 | |||
730aa5f450 | |||
dda3e5fcfd | |||
5e8e875a37 | |||
86e7dc7c75 | |||
6235fe7e68 | |||
fc73293122 | |||
e26f8da662 | |||
b4c05f8c59 | |||
ca282378ec | |||
746fa97cf3 | |||
8b24456b48 | |||
6befd10735 | |||
db094a8d86 | |||
c739b4d26d | |||
dacb0dd179 | |||
b00c28a02a | |||
208cbbfa1d | |||
d77f38b405 | |||
525f98a054 | |||
43aadac503 | |||
07f66f65ed | |||
6e5651c527 | |||
1ed976b039 | |||
013b97cec0 | |||
e7cb8cf469 | |||
184642a750 | |||
a8ae5f14d4 | |||
e6565275c8 | |||
f629fb4a4e | |||
7a9955b781 | |||
1e97177777 | |||
9e2ab9fa5a | |||
70b00a1996 | |||
720b19df93 | |||
1498b5908b | |||
45bbe51897 | |||
c715955758 | |||
0fc4be2008 | |||
c7ddc37bf9 | |||
93bb46b017 | |||
eed4e6f855 | |||
d2cc3e00e1 | |||
249d00177c | |||
36e4967394 | |||
c32eea8a40 | |||
30344a60b7 | |||
2465545b6b | |||
83cbeb7a2e | |||
645a10477d | |||
a859871265 | |||
0eab9a8063 | |||
1dff7573ff | |||
8af40bfe50 | |||
afa4d34ec8 | |||
c5fc5b600e | |||
a4939737fe | |||
e7ebcc0d3a |
18
.gitea/workflows/back.yaml
Normal file
18
.gitea/workflows/back.yaml
Normal file
@ -0,0 +1,18 @@
|
||||
name: Format
|
||||
|
||||
on: [ push, pull_request ]
|
||||
|
||||
jobs:
|
||||
|
||||
formatting:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4 # v2 minimum required
|
||||
- uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'temurin' # See 'Supported distributions' for available options
|
||||
java-version: '21'
|
||||
|
||||
- uses: axel-op/googlejavaformat-action@v3
|
||||
with:
|
||||
args: "--set-exit-if-changed --skip-sorting-imports --aosp -n"
|
24
.gitea/workflows/front.yaml
Normal file
24
.gitea/workflows/front.yaml
Normal file
@ -0,0 +1,24 @@
|
||||
name: CI
|
||||
on: push
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Install everything
|
||||
working-directory: ./front/MyINPulse-front
|
||||
run: npm i
|
||||
|
||||
- name: Run ESLint
|
||||
working-directory: ./front/MyINPulse-front
|
||||
run: npx eslint
|
||||
|
||||
- name: Run prettier
|
||||
working-directory: ./front/MyINPulse-front
|
||||
run: npx prettier src --check
|
||||
|
||||
- name: Build frontend
|
||||
working-directory: ./front/MyINPulse-front
|
||||
run: npm run build
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
.idea
|
||||
keycloak/CAS/target
|
||||
docker-compose.yaml
|
||||
postgres/data
|
38
Makefile
38
Makefile
@ -1,13 +1,16 @@
|
||||
help:
|
||||
@echo "make [clean dev-front prod dev-back]"
|
||||
@echo "make [clean dev-front prod dev-back dev]"
|
||||
|
||||
clean:
|
||||
@cp config/frontdev.env front/MyINPulse-front/.env
|
||||
@cp config/frontdev.env .env
|
||||
@cp config/frontdev.env MyINPulse-back/.env
|
||||
@cp config/prod.docker-compose.yaml docker-compose.yaml
|
||||
@docker compose down
|
||||
@rm -f docker-compose.yaml
|
||||
@rm -f .env
|
||||
@rm -f front/MyINPulse-front/.env
|
||||
|
||||
@rm -f MyINPulse-back/.env
|
||||
|
||||
# Install npm packages
|
||||
front/MyINPulse-front/.installed:
|
||||
@ -18,24 +21,37 @@ vite: ./front/MyINPulse-front/.installed
|
||||
|
||||
|
||||
dev-front: clean vite
|
||||
@cp config/frontdev.front.env front/MyINPulse-front/.env
|
||||
@cp config/frontdev.main.env .env
|
||||
@cp config/frontdev.env front/MyINPulse-front/.env
|
||||
@cp config/frontdev.env .env
|
||||
@cp config/frontdev.env MyINPulse-back/.env
|
||||
@cp config/frontdev.docker-compose.yaml docker-compose.yaml
|
||||
@docker compose up -d --build
|
||||
@cd ./front/MyINPulse-front/ && npm run dev
|
||||
|
||||
prod: clean
|
||||
@cp config/prod.front.env front/MyINPulse-front/.env
|
||||
@cp config/prod.main.env .env
|
||||
@cp config/frontdev.docker-compose.yaml docker-compose.yaml
|
||||
@cp config/prod.env front/MyINPulse-front/.env
|
||||
@cp config/prod.env .env
|
||||
@cp config/prod.env .env
|
||||
@cp config/prod.docker-compose.yaml docker-compose.yaml
|
||||
@docker compose up -d --build
|
||||
|
||||
|
||||
|
||||
dev-back:
|
||||
@cp config/backdev.front.env front/MyINPulse-front/.env
|
||||
@cp config/backdev.main.env .env
|
||||
@cp config/backdev.env front/MyINPulse-front/.env
|
||||
@cp config/backdev.env .env
|
||||
@cp config/backdev.env MyINPulse-back/.env
|
||||
@cp config/backdev.docker-compose.yaml docker-compose.yaml
|
||||
@docker compose up -d --build
|
||||
@echo "cd MyINPulse-back"
|
||||
@echo "./gradlew bootRun --args='--server.port=8081'"
|
||||
@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
|
||||
@echo "./gradlew bootRun --args='--server.port=8081'"
|
||||
|
||||
dev: clean vite
|
||||
@cp config/dev.env front/MyINPulse-front/.env
|
||||
@cp config/dev.env .env
|
||||
@cp config/dev.env MyINPulse-back/.env
|
||||
@cp config/dev.docker-compose.yaml docker-compose.yaml
|
||||
@docker compose up -d --build
|
||||
@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
|
||||
@echo "./gradlew bootRun --args='--server.port=8081'"
|
||||
@cd ./front/MyINPulse-front/ && npm run dev &
|
||||
|
@ -20,6 +20,10 @@ repositories {
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-data-rest'
|
||||
implementation 'org.postgresql:postgresql'
|
||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||
}
|
||||
|
@ -1,29 +1,15 @@
|
||||
package enseirb.myinpulse;
|
||||
|
||||
import enseirb.myinpulse.security.KeycloakJwtRolesConverter;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.core.convert.converter.Converter;
|
||||
import org.springframework.security.authentication.AbstractAuthenticationToken;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.oauth2.jwt.*;
|
||||
import org.springframework.security.web.SecurityFilterChain;
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.CorsConfigurationSource;
|
||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole;
|
||||
|
||||
@SpringBootApplication
|
||||
public class MyinpulseApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(MyinpulseApplication.class, args);
|
||||
}
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(MyinpulseApplication.class, args);
|
||||
}
|
||||
}
|
||||
|
@ -2,13 +2,14 @@ package enseirb.myinpulse.api;
|
||||
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.CrossOrigin;
|
||||
|
||||
import java.security.Principal;
|
||||
|
||||
import javax.management.relation.RoleNotFoundException;
|
||||
|
||||
@SpringBootApplication
|
||||
@RestController
|
||||
public class GetUserInfo {
|
||||
@ -21,23 +22,19 @@ public class GetUserInfo {
|
||||
}
|
||||
|
||||
@CrossOrigin(methods = {RequestMethod.GET, RequestMethod.OPTIONS})
|
||||
@GetMapping("/random")
|
||||
public boolean rand(){
|
||||
System.err.println("HELLO");
|
||||
@GetMapping("/unauth/random")
|
||||
public boolean rand(@RequestHeader("Authorization") String token) throws RoleNotFoundException {
|
||||
System.err.println(token);
|
||||
return Math.random() > 0.5;
|
||||
}
|
||||
|
||||
@CrossOrigin(methods = {RequestMethod.GET, RequestMethod.OPTIONS})
|
||||
@GetMapping("/random2")
|
||||
public boolean rand2(){
|
||||
System.err.println("HELLO2");
|
||||
@GetMapping("/admin/random")
|
||||
public boolean rand2() {
|
||||
return Math.random() > 0.5;
|
||||
}
|
||||
|
||||
@CrossOrigin(methods = {RequestMethod.GET, RequestMethod.OPTIONS})
|
||||
@GetMapping("/random3")
|
||||
public boolean rand3(){
|
||||
System.err.println("HELLO");
|
||||
@GetMapping("/entrepreneur/random")
|
||||
public boolean rand3() {
|
||||
return Math.random() > 0.5;
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,10 @@
|
||||
package enseirb.myinpulse.config;
|
||||
|
||||
import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole;
|
||||
|
||||
import enseirb.myinpulse.security.KeycloakJwtRolesConverter;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
@ -12,39 +16,62 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole;
|
||||
|
||||
@Configuration
|
||||
public class WebSecurityCustomConfiguration {
|
||||
// CORS configuration
|
||||
// TODO: make sure to only accept our own domains
|
||||
|
||||
@Value("${VITE_APP_URL}")
|
||||
private String frontendUrl;
|
||||
|
||||
/**
|
||||
* Configure the CORS (Cross Origin Ressource Sharing -- a security feature) configuration. The
|
||||
* only allowed website is the frontend, defined in the .env file.
|
||||
*
|
||||
* @return the CORS configuration used by the backend
|
||||
*/
|
||||
@Bean
|
||||
public CorsConfigurationSource corsConfigurationSource() {
|
||||
CorsConfiguration configuration = new CorsConfiguration();
|
||||
configuration.setAllowedOrigins(List.of("*"));
|
||||
configuration.setAllowedOrigins(List.of(frontendUrl));
|
||||
configuration.setAllowedMethods(Arrays.asList("GET", "OPTIONS"));
|
||||
configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type",
|
||||
"x-auth-token")); // Do not remove, this fixes the CORS errors when unauthenticated
|
||||
UrlBasedCorsConfigurationSource source = new
|
||||
UrlBasedCorsConfigurationSource();
|
||||
configuration.setAllowedHeaders(
|
||||
Arrays.asList("authorization", "content-type", "x-auth-token"));
|
||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||
source.registerCorsConfiguration("/**", configuration);
|
||||
|
||||
return source;
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure the authorisation required for each path.
|
||||
*
|
||||
* <p>admin endpoints are under /admin/* and entrepreneur are under /entrepreneur/*
|
||||
*
|
||||
* <p>If endpoints dont require authentication, they are under /unauth/
|
||||
*
|
||||
* @param http automatically filled in by spring.
|
||||
* @return a securityfilterchain, automatically used by spring.
|
||||
* @throws Exception TODO: figure out when the exception are raised
|
||||
*/
|
||||
@Bean
|
||||
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||
http
|
||||
.authorizeHttpRequests(authorize -> authorize
|
||||
.requestMatchers("/random2").access(hasRole("REALM_MyINPulse-entrepreneur"))
|
||||
.requestMatchers("/random").access(hasRole("REALM_MyINPulse-admin"))
|
||||
.requestMatchers("/random3").permitAll()
|
||||
.anyRequest().authenticated()
|
||||
)
|
||||
.oauth2ResourceServer(oauth2 -> oauth2
|
||||
.jwt(jwt -> jwt.
|
||||
jwtAuthenticationConverter(new KeycloakJwtRolesConverter())));
|
||||
http.authorizeHttpRequests(
|
||||
authorize ->
|
||||
authorize
|
||||
.requestMatchers("/entrepreneur/**")
|
||||
.access(hasRole("REALM_MyINPulse-entrepreneur"))
|
||||
.requestMatchers("/admin/**")
|
||||
.access(hasRole("REALM_MyINPulse-admin"))
|
||||
.requestMatchers("/unauth/**")
|
||||
.permitAll()
|
||||
.anyRequest()
|
||||
.authenticated())
|
||||
.oauth2ResourceServer(
|
||||
oauth2 ->
|
||||
oauth2.jwt(
|
||||
jwt ->
|
||||
jwt.jwtAuthenticationConverter(
|
||||
new KeycloakJwtRolesConverter())));
|
||||
return http.build();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,7 @@
|
||||
package enseirb.myinpulse.exceptions;
|
||||
|
||||
public class RoleNotFoudException extends RuntimeException {
|
||||
public RoleNotFoudException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
package enseirb.myinpulse.exceptions;
|
||||
|
||||
public class UserNotFoundException extends RuntimeException {
|
||||
public UserNotFoundException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
@ -0,0 +1,38 @@
|
||||
package enseirb.myinpulse.postgres_db.controller;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Administrateurs;
|
||||
import enseirb.myinpulse.postgres_db.repository.AdministrateursRepository;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
public class AdministrateursController {
|
||||
|
||||
@Autowired AdministrateursRepository administrateursRepository;
|
||||
|
||||
@GetMapping("/Administrateurs")
|
||||
@ResponseBody
|
||||
public Iterable<Administrateurs> allAdministrateurs() {
|
||||
return this.administrateursRepository.findAll();
|
||||
}
|
||||
|
||||
@GetMapping("/Administrateurs/{id}")
|
||||
public Administrateurs getAdministrateursById(@PathVariable Long id) {
|
||||
Optional<Administrateurs> administrateur = this.administrateursRepository.findById(id);
|
||||
if (administrateur.isEmpty()) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
|
||||
}
|
||||
return administrateur.get();
|
||||
}
|
||||
|
||||
@PostMapping("/Administrateurs")
|
||||
public Administrateurs addAdministrateurs(@RequestBody Administrateurs administrateurs) {
|
||||
return this.administrateursRepository.save(administrateurs);
|
||||
}
|
||||
}
|
@ -0,0 +1,49 @@
|
||||
package enseirb.myinpulse.postgres_db.controller;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.ComptesRendus;
|
||||
import enseirb.myinpulse.postgres_db.repository.ComptesRendusRepository;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
public class ComptesRendusController {
|
||||
|
||||
@Autowired ComptesRendusRepository comptesRendusRepository;
|
||||
|
||||
@GetMapping("/ComptesRendus")
|
||||
@ResponseBody
|
||||
public Iterable<ComptesRendus> allComptesRendus() {
|
||||
return this.comptesRendusRepository.findAll();
|
||||
}
|
||||
|
||||
@GetMapping("/ComptesRendus/{id}")
|
||||
public ComptesRendus getComptesRendusById(@PathVariable Long id) {
|
||||
Optional<ComptesRendus> compteRendu = this.comptesRendusRepository.findById(id);
|
||||
if (compteRendu.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas");
|
||||
}
|
||||
return compteRendu.get();
|
||||
}
|
||||
|
||||
@PostMapping("/ComptesRendus")
|
||||
public ComptesRendus addComptesRendus(@RequestBody ComptesRendus comptesRendus) {
|
||||
return this.comptesRendusRepository.save(comptesRendus);
|
||||
}
|
||||
|
||||
@PostMapping("/ComptesRendus/{id}")
|
||||
public ComptesRendus updateProjets(@PathVariable Long id, String contenu_compte_rendu) {
|
||||
Optional<ComptesRendus> compteRendu = this.comptesRendusRepository.findById(id);
|
||||
if (compteRendu.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas");
|
||||
}
|
||||
if (contenu_compte_rendu != null) {
|
||||
compteRendu.get().setContenu_compte_rendu(contenu_compte_rendu);
|
||||
}
|
||||
return this.comptesRendusRepository.save(compteRendu.get());
|
||||
}
|
||||
}
|
@ -0,0 +1,58 @@
|
||||
package enseirb.myinpulse.postgres_db.controller;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Entrepreneurs;
|
||||
import enseirb.myinpulse.postgres_db.repository.EntrepreneursRepository;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
public class EntrepreneursController {
|
||||
|
||||
@Autowired EntrepreneursRepository entrepreneursRepository;
|
||||
|
||||
@GetMapping("/Entrepreneurs")
|
||||
@ResponseBody
|
||||
public Iterable<Entrepreneurs> allEntrepreneurs() {
|
||||
return this.entrepreneursRepository.findAll();
|
||||
}
|
||||
|
||||
@GetMapping("/Entrepreneurs/{id}")
|
||||
public Entrepreneurs getEntrepreneursById(@PathVariable Long id) {
|
||||
Optional<Entrepreneurs> entrepreneur = entrepreneursRepository.findById(id);
|
||||
if (entrepreneur.isEmpty()) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas");
|
||||
}
|
||||
return entrepreneur.get();
|
||||
}
|
||||
|
||||
@PostMapping("/Entrepreneurs")
|
||||
public Entrepreneurs addEntrepreneurs(@RequestBody Entrepreneurs entrepreneurs) {
|
||||
return this.entrepreneursRepository.save(entrepreneurs);
|
||||
}
|
||||
|
||||
@PostMapping("/Entrepreneurs/{id}")
|
||||
public Entrepreneurs updateEntrepreneurs(
|
||||
@PathVariable Long id, String ecole, String filiere, Boolean status_snee) {
|
||||
Optional<Entrepreneurs> entrepreneur = entrepreneursRepository.findById(id);
|
||||
if (entrepreneur.isEmpty()) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas");
|
||||
}
|
||||
if (ecole != null) {
|
||||
entrepreneur.get().setEcole(ecole);
|
||||
}
|
||||
if (filiere != null) {
|
||||
entrepreneur.get().setFiliere(filiere);
|
||||
}
|
||||
if (status_snee != null) {
|
||||
entrepreneur.get().setStatus_snee(status_snee);
|
||||
}
|
||||
return this.entrepreneursRepository.save(entrepreneur.get());
|
||||
}
|
||||
}
|
@ -0,0 +1,64 @@
|
||||
package enseirb.myinpulse.postgres_db.controller;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Projets;
|
||||
import enseirb.myinpulse.postgres_db.repository.ProjetsRepository;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
public class ProjetsController {
|
||||
|
||||
@Autowired ProjetsRepository projetsRepository;
|
||||
|
||||
@GetMapping("/Projets")
|
||||
@ResponseBody
|
||||
public Iterable<Projets> allProjets() {
|
||||
return this.projetsRepository.findAll();
|
||||
}
|
||||
|
||||
@GetMapping("/Projets/{id}")
|
||||
public Projets getProjetsById(@PathVariable Long id) {
|
||||
Optional<Projets> projet = this.projetsRepository.findById(id);
|
||||
if (projet.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas");
|
||||
}
|
||||
return projet.get();
|
||||
}
|
||||
|
||||
@PostMapping("/Projets")
|
||||
public Projets addProjets(@RequestBody Projets projet) {
|
||||
return this.projetsRepository.save(projet);
|
||||
}
|
||||
|
||||
@PostMapping("/Projets/{id}")
|
||||
public Projets updateProjets(
|
||||
@PathVariable Long id,
|
||||
String nom_projet,
|
||||
byte[] logo,
|
||||
LocalDate date_creation,
|
||||
String status_projet) {
|
||||
Optional<Projets> projet = this.projetsRepository.findById(id);
|
||||
if (projet.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas");
|
||||
}
|
||||
if (nom_projet != null) {
|
||||
projet.get().setNom_projet(nom_projet);
|
||||
}
|
||||
if (logo != null) {
|
||||
projet.get().setLogo(logo);
|
||||
}
|
||||
if (date_creation != null) {
|
||||
projet.get().setDate_creation(date_creation);
|
||||
}
|
||||
if (status_projet != null) {
|
||||
projet.get().setStatus_projet(status_projet);
|
||||
}
|
||||
return this.projetsRepository.save(projet.get());
|
||||
}
|
||||
}
|
@ -0,0 +1,67 @@
|
||||
package enseirb.myinpulse.postgres_db.controller;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.RendezVous;
|
||||
import enseirb.myinpulse.postgres_db.repository.RendezVousRepository;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalTime;
|
||||
import java.util.Optional;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
@RestController
|
||||
public class RendezVousController {
|
||||
|
||||
@Autowired RendezVousRepository rendezVousRepository;
|
||||
|
||||
@GetMapping("/RendezVous")
|
||||
@ResponseBody
|
||||
public Iterable<RendezVous> allRendezVous() {
|
||||
return this.rendezVousRepository.findAll();
|
||||
}
|
||||
|
||||
@GetMapping("/RendezVous/{id}")
|
||||
public RendezVous getRendezVousById(@PathVariable Long id) {
|
||||
Optional<RendezVous> rendezVous = this.rendezVousRepository.findById(id);
|
||||
if (rendezVous.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas");
|
||||
}
|
||||
return rendezVous.get();
|
||||
}
|
||||
|
||||
@PostMapping("/RendezVous")
|
||||
public RendezVous addRendezVous(@RequestBody RendezVous rendezVous) {
|
||||
return this.rendezVousRepository.save(rendezVous);
|
||||
}
|
||||
|
||||
@PostMapping("/RendezVous/{id}")
|
||||
public RendezVous updateRendezVous(
|
||||
@PathVariable Long id,
|
||||
LocalDate date_rdv,
|
||||
LocalTime heure_rdv,
|
||||
LocalTime duree_rdv,
|
||||
String lieu_rdv,
|
||||
String sujet_rdv) {
|
||||
Optional<RendezVous> rendezVous = this.rendezVousRepository.findById(id);
|
||||
if (rendezVous.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas");
|
||||
}
|
||||
if (date_rdv != null) {
|
||||
rendezVous.get().setDate_rdv(date_rdv);
|
||||
}
|
||||
if (heure_rdv != null) {
|
||||
rendezVous.get().setHeure_rdv(heure_rdv);
|
||||
}
|
||||
if (duree_rdv != null) {
|
||||
rendezVous.get().setDuree_rdv(duree_rdv);
|
||||
}
|
||||
if (lieu_rdv != null) {
|
||||
rendezVous.get().setLieu_rdv(lieu_rdv);
|
||||
}
|
||||
if (sujet_rdv != null) {
|
||||
rendezVous.get().setSujet_rdv(sujet_rdv);
|
||||
}
|
||||
return this.rendezVousRepository.save(rendezVous.get());
|
||||
}
|
||||
}
|
@ -0,0 +1,60 @@
|
||||
package enseirb.myinpulse.postgres_db.controller;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Sections;
|
||||
import enseirb.myinpulse.postgres_db.repository.SectionsRepository;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
public class SectionsController {
|
||||
|
||||
@Autowired SectionsRepository sectionsRepository;
|
||||
|
||||
@GetMapping("/Sections")
|
||||
@ResponseBody
|
||||
public Iterable<Sections> allSections() {
|
||||
return this.sectionsRepository.findAll();
|
||||
}
|
||||
|
||||
@GetMapping("/Sections/{id}")
|
||||
public Sections getSectionsById(@PathVariable Long id) {
|
||||
Optional<Sections> section = this.sectionsRepository.findById(id);
|
||||
if (section.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cette section n'extise pas");
|
||||
}
|
||||
return section.get();
|
||||
}
|
||||
|
||||
@PostMapping("/Sections")
|
||||
public Sections addSections(@RequestBody Sections sections) {
|
||||
return this.sectionsRepository.save(sections);
|
||||
}
|
||||
|
||||
@PostMapping("/Sections/{id}")
|
||||
public Sections updateSections(
|
||||
@PathVariable Long id,
|
||||
String titre,
|
||||
String contenu_section,
|
||||
LocalDateTime date_modification) {
|
||||
Optional<Sections> section = this.sectionsRepository.findById(id);
|
||||
if (section.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cette section n'extise pas");
|
||||
}
|
||||
if (titre != null) {
|
||||
section.get().setTitre(titre);
|
||||
}
|
||||
if (contenu_section != null) {
|
||||
section.get().setContenu_section(contenu_section);
|
||||
}
|
||||
if (date_modification != null) {
|
||||
section.get().setDate_modification(date_modification);
|
||||
}
|
||||
return this.sectionsRepository.save(section.get());
|
||||
}
|
||||
}
|
@ -0,0 +1,67 @@
|
||||
package enseirb.myinpulse.postgres_db.controller;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Utilisateurs;
|
||||
import enseirb.myinpulse.postgres_db.repository.UtilisateursRepository;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
public class UtilisateursController {
|
||||
|
||||
@Autowired UtilisateursRepository utilisateursRepository;
|
||||
|
||||
@GetMapping("/Utilisateurs")
|
||||
@ResponseBody
|
||||
public Iterable<Utilisateurs> allUtilisateurs() {
|
||||
return this.utilisateursRepository.findAll();
|
||||
}
|
||||
|
||||
@GetMapping("/Utilisateurs/{id}")
|
||||
public Utilisateurs getUtilisateursById(@PathVariable Long id) {
|
||||
Optional<Utilisateurs> utilisateur = utilisateursRepository.findById(id);
|
||||
if (utilisateur.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas");
|
||||
}
|
||||
return utilisateur.get();
|
||||
}
|
||||
|
||||
@PostMapping("/Utilisateurs")
|
||||
public Utilisateurs addUtilisateurs(@RequestBody Utilisateurs utilisateurs) {
|
||||
return this.utilisateursRepository.save(utilisateurs);
|
||||
}
|
||||
|
||||
@PostMapping("/Utilisateurs/{id}")
|
||||
public Utilisateurs updateUtilisateurs(
|
||||
@PathVariable Long id,
|
||||
String nom_utilisateur,
|
||||
String prenom_utilisateur,
|
||||
String mail_principal,
|
||||
String mail_secondaire,
|
||||
String numero_telephone) {
|
||||
Optional<Utilisateurs> utilisateur = utilisateursRepository.findById(id);
|
||||
if (utilisateur.isEmpty()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas");
|
||||
}
|
||||
if (nom_utilisateur != null) {
|
||||
utilisateur.get().setNom_utilisateur(nom_utilisateur);
|
||||
}
|
||||
if (prenom_utilisateur != null) {
|
||||
utilisateur.get().setPrenom_utilisateur(prenom_utilisateur);
|
||||
}
|
||||
if (mail_principal != null) {
|
||||
utilisateur.get().setMail_principal(mail_principal);
|
||||
}
|
||||
if (mail_secondaire != null) {
|
||||
utilisateur.get().setMail_secondaire(mail_secondaire);
|
||||
}
|
||||
if (numero_telephone != null) {
|
||||
utilisateur.get().setNumero_telephone(numero_telephone);
|
||||
}
|
||||
return this.utilisateursRepository.save(utilisateur.get());
|
||||
}
|
||||
}
|
@ -0,0 +1,43 @@
|
||||
package enseirb.myinpulse.postgres_db.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.persistence.PrimaryKeyJoinColumn;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Entity
|
||||
@Table(name = "administrateurs")
|
||||
@PrimaryKeyJoinColumn(name = "id_administrateur", referencedColumnName = "id_utilisateur")
|
||||
public class Administrateurs extends Utilisateurs {
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_projet")
|
||||
private Projets projetsAdministrateurs;
|
||||
|
||||
@OneToMany(mappedBy = "administrateursSections", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private List<Sections> ListSections = new ArrayList<>();
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_rdv")
|
||||
private RendezVous rendezVousAdministrateurs;
|
||||
|
||||
public Administrateurs() {}
|
||||
|
||||
public Administrateurs(
|
||||
String nom_utilisateur,
|
||||
Long id_utilisateur,
|
||||
String prenom_utilisateur,
|
||||
String mail_principal,
|
||||
String mail_secondaire,
|
||||
String numero_telephone) {
|
||||
super(
|
||||
nom_utilisateur,
|
||||
id_utilisateur,
|
||||
prenom_utilisateur,
|
||||
mail_principal,
|
||||
mail_secondaire,
|
||||
numero_telephone);
|
||||
}
|
||||
}
|
@ -0,0 +1,46 @@
|
||||
package enseirb.myinpulse.postgres_db.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
@Entity
|
||||
@Table(name = "comptes_rendus")
|
||||
public class ComptesRendus {
|
||||
|
||||
@Id
|
||||
@NotNull
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id_compte_rendu;
|
||||
|
||||
private String contenu_compte_rendu;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_rdv")
|
||||
private RendezVous rendezVousComptesRendus;
|
||||
|
||||
public ComptesRendus() {}
|
||||
|
||||
public ComptesRendus(Long id_compte_rendu, String contenu_compte_rendu) {
|
||||
this.id_compte_rendu = id_compte_rendu;
|
||||
this.contenu_compte_rendu = contenu_compte_rendu;
|
||||
}
|
||||
|
||||
public Long getId_compte_rendu() {
|
||||
return id_compte_rendu;
|
||||
}
|
||||
|
||||
public void setId_compte_rendu(Long id_compte_rendu) {
|
||||
this.id_compte_rendu = id_compte_rendu;
|
||||
}
|
||||
|
||||
public String getContenu_compte_rendu() {
|
||||
return contenu_compte_rendu;
|
||||
}
|
||||
|
||||
public void setContenu_compte_rendu(String contenu_compte_rendu) {
|
||||
this.contenu_compte_rendu = contenu_compte_rendu;
|
||||
}
|
||||
}
|
@ -0,0 +1,80 @@
|
||||
package enseirb.myinpulse.postgres_db.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "entrepreneurs")
|
||||
@PrimaryKeyJoinColumn(name = "id_entrepreneur", referencedColumnName = "id_utilisateur")
|
||||
public class Entrepreneurs extends Utilisateurs {
|
||||
|
||||
@Column(length = 255)
|
||||
private String ecole;
|
||||
|
||||
@Column(length = 255)
|
||||
private String filiere;
|
||||
|
||||
private boolean status_snee;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_projet_participation", referencedColumnName = "id_projet")
|
||||
private Projets projetsParticipation;
|
||||
|
||||
// @Column(insertable=false, updatable=false)
|
||||
@OneToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_projet_propose", referencedColumnName = "id_projet")
|
||||
private Projets projetsPropose;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_rdv")
|
||||
private RendezVous rendezVousEntrepreneurs;
|
||||
|
||||
public Entrepreneurs() {}
|
||||
|
||||
public Entrepreneurs(
|
||||
String nom_utilisateur,
|
||||
Long id_utilisateur,
|
||||
String prenom_utilisateur,
|
||||
String mail_principal,
|
||||
String mail_secondaire,
|
||||
String numero_telephone,
|
||||
String ecole,
|
||||
boolean status_snee,
|
||||
String filiere) {
|
||||
super(
|
||||
nom_utilisateur,
|
||||
id_utilisateur,
|
||||
prenom_utilisateur,
|
||||
mail_principal,
|
||||
mail_secondaire,
|
||||
numero_telephone);
|
||||
this.ecole = ecole;
|
||||
this.status_snee = status_snee;
|
||||
this.filiere = filiere;
|
||||
}
|
||||
|
||||
public String getEcole() {
|
||||
return ecole;
|
||||
}
|
||||
|
||||
public void setEcole(String ecole) {
|
||||
this.ecole = ecole;
|
||||
}
|
||||
|
||||
public String getFiliere() {
|
||||
return filiere;
|
||||
}
|
||||
|
||||
public void setFiliere(String filiere) {
|
||||
this.filiere = filiere;
|
||||
}
|
||||
|
||||
public boolean isStatus_snee() {
|
||||
return status_snee;
|
||||
}
|
||||
|
||||
public void setStatus_snee(boolean status_snee) {
|
||||
this.status_snee = status_snee;
|
||||
}
|
||||
}
|
@ -0,0 +1,98 @@
|
||||
package enseirb.myinpulse.postgres_db.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Entity
|
||||
@Table(name = "projets")
|
||||
public class Projets {
|
||||
|
||||
@Id
|
||||
@NotNull
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id_projet;
|
||||
|
||||
@Column(length = 255)
|
||||
private String nom_projet;
|
||||
|
||||
private byte[] logo;
|
||||
|
||||
private LocalDate date_creation;
|
||||
|
||||
@Column(length = 255)
|
||||
private String status_projet;
|
||||
|
||||
@OneToMany(mappedBy = "projetsAdministrateurs", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private List<Administrateurs> listAdministrateurs = new ArrayList<>();
|
||||
|
||||
@OneToMany(mappedBy = "projetsParticipation", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private List<Entrepreneurs> ListEntrepreneursParticipation = new ArrayList<>();
|
||||
|
||||
@OneToOne(mappedBy = "projetsPropose", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private Entrepreneurs entrepreneursPropose;
|
||||
|
||||
@OneToMany(mappedBy = "projetsSections", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private List<Sections> ListSections = new ArrayList<>();
|
||||
|
||||
// Hibernate expects entities to have a no-arg constructor,
|
||||
// though it does not necessarily have to be public.
|
||||
|
||||
public Projets() {}
|
||||
|
||||
public Projets(
|
||||
Long id_projet,
|
||||
String nom_projet,
|
||||
byte[] logo,
|
||||
LocalDate date_creation,
|
||||
String status_projet) {
|
||||
this.id_projet = id_projet;
|
||||
this.nom_projet = nom_projet;
|
||||
this.logo = logo;
|
||||
this.date_creation = date_creation;
|
||||
this.status_projet = status_projet;
|
||||
}
|
||||
|
||||
public Long getId_projet() {
|
||||
return id_projet;
|
||||
}
|
||||
|
||||
public void setId_projet(Long id_projet) {
|
||||
this.id_projet = id_projet;
|
||||
}
|
||||
|
||||
public String getNom_projet() {
|
||||
return nom_projet;
|
||||
}
|
||||
|
||||
public void setNom_projet(String nom_projet) {
|
||||
this.nom_projet = nom_projet;
|
||||
}
|
||||
|
||||
public byte[] getLogo() {
|
||||
return logo;
|
||||
}
|
||||
|
||||
public void setLogo(byte[] logo) {
|
||||
this.logo = logo;
|
||||
}
|
||||
|
||||
public LocalDate getDate_creation() {
|
||||
return date_creation;
|
||||
}
|
||||
|
||||
public void setDate_creation(LocalDate date_creation) {
|
||||
this.date_creation = date_creation;
|
||||
}
|
||||
|
||||
public String getStatus_projet() {
|
||||
return status_projet;
|
||||
}
|
||||
|
||||
public void setStatus_projet(String status_projet) {
|
||||
this.status_projet = status_projet;
|
||||
}
|
||||
}
|
@ -0,0 +1,111 @@
|
||||
package enseirb.myinpulse.postgres_db.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Entity
|
||||
@Table(name = "rendez_vous")
|
||||
public class RendezVous {
|
||||
|
||||
@OneToMany(mappedBy = "rendezVousEntrepreneurs", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private final List<Entrepreneurs> ListEntrepreneurs = new ArrayList<>();
|
||||
|
||||
@OneToMany(mappedBy = "rendezVousAdministrateurs", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private final List<Administrateurs> ListAdministrateurs = new ArrayList<>();
|
||||
|
||||
@OneToMany(mappedBy = "rendezVousComptesRendus", fetch = FetchType.LAZY, orphanRemoval = true)
|
||||
private final List<ComptesRendus> ListComptesRendus = new ArrayList<>();
|
||||
|
||||
@ManyToMany(
|
||||
fetch = FetchType.LAZY,
|
||||
cascade = {CascadeType.ALL})
|
||||
@JoinTable(
|
||||
name = "concerner",
|
||||
joinColumns = @JoinColumn(name = "id_rdv"),
|
||||
inverseJoinColumns = @JoinColumn(name = "id_section"))
|
||||
List<Sections> ListSections = new ArrayList<>();
|
||||
|
||||
@Id
|
||||
@NotNull
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id_rdv;
|
||||
|
||||
private LocalDate date_rdv;
|
||||
private LocalTime heure_rdv;
|
||||
private LocalTime duree_rdv;
|
||||
|
||||
@Column(length = 255)
|
||||
private String lieu_rdv;
|
||||
|
||||
private String sujet_rdv;
|
||||
|
||||
public RendezVous() {}
|
||||
|
||||
public RendezVous(
|
||||
Long id_rdv,
|
||||
LocalDate date_rdv,
|
||||
LocalTime heure_rdv,
|
||||
LocalTime duree_rdv,
|
||||
String lieu_rdv,
|
||||
String sujet_rdv) {
|
||||
this.id_rdv = id_rdv;
|
||||
this.date_rdv = date_rdv;
|
||||
this.heure_rdv = heure_rdv;
|
||||
this.duree_rdv = duree_rdv;
|
||||
this.lieu_rdv = lieu_rdv;
|
||||
this.sujet_rdv = sujet_rdv;
|
||||
}
|
||||
|
||||
public Long getId_rdv() {
|
||||
return id_rdv;
|
||||
}
|
||||
|
||||
public void setId_rdv(Long id_rdv) {
|
||||
this.id_rdv = id_rdv;
|
||||
}
|
||||
|
||||
public LocalDate getDate_rdv() {
|
||||
return date_rdv;
|
||||
}
|
||||
|
||||
public void setDate_rdv(LocalDate date_rdv) {
|
||||
this.date_rdv = date_rdv;
|
||||
}
|
||||
|
||||
public LocalTime getHeure_rdv() {
|
||||
return heure_rdv;
|
||||
}
|
||||
|
||||
public void setHeure_rdv(LocalTime heure_rdv) {
|
||||
this.heure_rdv = heure_rdv;
|
||||
}
|
||||
|
||||
public LocalTime getDuree_rdv() {
|
||||
return duree_rdv;
|
||||
}
|
||||
|
||||
public void setDuree_rdv(LocalTime duree_rdv) {
|
||||
this.duree_rdv = duree_rdv;
|
||||
}
|
||||
|
||||
public String getLieu_rdv() {
|
||||
return lieu_rdv;
|
||||
}
|
||||
|
||||
public void setLieu_rdv(String lieu_rdv) {
|
||||
this.lieu_rdv = lieu_rdv;
|
||||
}
|
||||
|
||||
public String getSujet_rdv() {
|
||||
return sujet_rdv;
|
||||
}
|
||||
|
||||
public void setSujet_rdv(String sujet_rdv) {
|
||||
this.sujet_rdv = sujet_rdv;
|
||||
}
|
||||
}
|
@ -0,0 +1,81 @@
|
||||
package enseirb.myinpulse.postgres_db.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Entity
|
||||
@Table(name = "sections")
|
||||
public class Sections {
|
||||
|
||||
@Id
|
||||
@NotNull
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id_section;
|
||||
|
||||
@Column(length = 255)
|
||||
private String titre;
|
||||
|
||||
private String contenu_section;
|
||||
|
||||
private LocalDateTime date_modification;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_projet")
|
||||
private Projets projetsSections;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "id_admnistrateur")
|
||||
private Administrateurs administrateursSections;
|
||||
|
||||
@ManyToMany(mappedBy = "ListSections")
|
||||
private List<RendezVous> rendezVous = new ArrayList<>();
|
||||
|
||||
public Sections() {}
|
||||
|
||||
public Sections(
|
||||
Long id_section,
|
||||
String titre,
|
||||
String contenu_section,
|
||||
LocalDateTime date_modification) {
|
||||
this.id_section = id_section;
|
||||
this.titre = titre;
|
||||
this.contenu_section = contenu_section;
|
||||
this.date_modification = date_modification;
|
||||
}
|
||||
|
||||
public String getTitre() {
|
||||
return titre;
|
||||
}
|
||||
|
||||
public void setTitre(String titre) {
|
||||
this.titre = titre;
|
||||
}
|
||||
|
||||
public Long getId_section() {
|
||||
return id_section;
|
||||
}
|
||||
|
||||
public void setId_section(Long id_section) {
|
||||
this.id_section = id_section;
|
||||
}
|
||||
|
||||
public String getContenu_section() {
|
||||
return contenu_section;
|
||||
}
|
||||
|
||||
public void setContenu_section(String contenu_section) {
|
||||
this.contenu_section = contenu_section;
|
||||
}
|
||||
|
||||
public LocalDateTime getDate_modification() {
|
||||
return date_modification;
|
||||
}
|
||||
|
||||
public void setDate_modification(LocalDateTime date_modification) {
|
||||
this.date_modification = date_modification;
|
||||
}
|
||||
}
|
@ -0,0 +1,95 @@
|
||||
package enseirb.myinpulse.postgres_db.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
@Entity
|
||||
@Table(name = "utilisateurs")
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
public class Utilisateurs {
|
||||
|
||||
@Id
|
||||
@NotNull
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id_utilisateur;
|
||||
|
||||
@Column(length = 255)
|
||||
private String nom_utilisateur;
|
||||
|
||||
@Column(length = 255)
|
||||
private String prenom_utilisateur;
|
||||
|
||||
@Column(length = 255)
|
||||
private String mail_principal;
|
||||
|
||||
@Column(length = 255)
|
||||
private String mail_secondaire;
|
||||
|
||||
@Column(length = 20)
|
||||
private String numero_telephone;
|
||||
|
||||
public Utilisateurs() {}
|
||||
|
||||
public Utilisateurs(
|
||||
String nom_utilisateur,
|
||||
Long id_utilisateur,
|
||||
String prenom_utilisateur,
|
||||
String mail_principal,
|
||||
String mail_secondaire,
|
||||
String numero_telephone) {
|
||||
this.nom_utilisateur = nom_utilisateur;
|
||||
this.id_utilisateur = id_utilisateur;
|
||||
this.prenom_utilisateur = prenom_utilisateur;
|
||||
this.mail_principal = mail_principal;
|
||||
this.mail_secondaire = mail_secondaire;
|
||||
this.numero_telephone = numero_telephone;
|
||||
}
|
||||
|
||||
public Long getId_utilisateur() {
|
||||
return id_utilisateur;
|
||||
}
|
||||
|
||||
public void setId_utilisateur(Long id_utilisateur) {
|
||||
this.id_utilisateur = id_utilisateur;
|
||||
}
|
||||
|
||||
public String getNom_utilisateur() {
|
||||
return nom_utilisateur;
|
||||
}
|
||||
|
||||
public void setNom_utilisateur(String nom_utilisateur) {
|
||||
this.nom_utilisateur = nom_utilisateur;
|
||||
}
|
||||
|
||||
public String getPrenom_utilisateur() {
|
||||
return prenom_utilisateur;
|
||||
}
|
||||
|
||||
public void setPrenom_utilisateur(String prenom_utilisateur) {
|
||||
this.prenom_utilisateur = prenom_utilisateur;
|
||||
}
|
||||
|
||||
public String getMail_principal() {
|
||||
return mail_principal;
|
||||
}
|
||||
|
||||
public void setMail_principal(String mail_principal) {
|
||||
this.mail_principal = mail_principal;
|
||||
}
|
||||
|
||||
public String getMail_secondaire() {
|
||||
return mail_secondaire;
|
||||
}
|
||||
|
||||
public void setMail_secondaire(String mail_secondaire) {
|
||||
this.mail_secondaire = mail_secondaire;
|
||||
}
|
||||
|
||||
public String getNumero_telephone() {
|
||||
return numero_telephone;
|
||||
}
|
||||
|
||||
public void setNumero_telephone(String numero_telephone) {
|
||||
this.numero_telephone = numero_telephone;
|
||||
}
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
package enseirb.myinpulse.postgres_db.repository;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Administrateurs;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
|
||||
|
||||
@RepositoryRestResource
|
||||
public interface AdministrateursRepository extends JpaRepository<Administrateurs, Long> {
|
||||
|
||||
/* @Query("SELECT a from Administrateurs a")
|
||||
Administrateurs findAllAdministrateurs(); */
|
||||
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
package enseirb.myinpulse.postgres_db.repository;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.ComptesRendus;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
|
||||
|
||||
@RepositoryRestResource
|
||||
public interface ComptesRendusRepository extends JpaRepository<ComptesRendus, Long> {}
|
@ -0,0 +1,14 @@
|
||||
package enseirb.myinpulse.postgres_db.repository;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Entrepreneurs;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
|
||||
|
||||
@RepositoryRestResource
|
||||
public interface EntrepreneursRepository extends JpaRepository<Entrepreneurs, Long> {
|
||||
|
||||
/* @Query("SELECT e from Entrepreneurs e")
|
||||
Entrepreneurs findAllEntrepreneurs(); */
|
||||
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
package enseirb.myinpulse.postgres_db.repository;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Projets;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
|
||||
|
||||
@RepositoryRestResource
|
||||
public interface ProjetsRepository extends JpaRepository<Projets, Long> {}
|
@ -0,0 +1,9 @@
|
||||
package enseirb.myinpulse.postgres_db.repository;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.RendezVous;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
|
||||
|
||||
@RepositoryRestResource
|
||||
public interface RendezVousRepository extends JpaRepository<RendezVous, Long> {}
|
@ -0,0 +1,9 @@
|
||||
package enseirb.myinpulse.postgres_db.repository;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Sections;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
|
||||
|
||||
@RepositoryRestResource
|
||||
public interface SectionsRepository extends JpaRepository<Sections, Long> {}
|
@ -0,0 +1,14 @@
|
||||
package enseirb.myinpulse.postgres_db.repository;
|
||||
|
||||
import enseirb.myinpulse.postgres_db.model.Utilisateurs;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
|
||||
|
||||
@RepositoryRestResource
|
||||
public interface UtilisateursRepository extends JpaRepository<Utilisateurs, Long> {
|
||||
|
||||
/* @Query("SELECT u from Utilisateurs u")
|
||||
Utilisateurs findAllUtilisateurs(); */
|
||||
|
||||
}
|
@ -1,5 +1,11 @@
|
||||
/*
|
||||
* Source: https://github.com/ChristianHuff-DEV/secure-spring-rest-api-using-keycloak/blob/main/src/main/java/io/betweendata/RestApi/security/oauth2/KeycloakJwtRolesConverter.java
|
||||
* edited by Pierre Tellier
|
||||
*/
|
||||
package enseirb.myinpulse.security;
|
||||
|
||||
import static java.util.stream.Collectors.toSet;
|
||||
|
||||
import org.springframework.core.convert.converter.Converter;
|
||||
import org.springframework.security.authentication.AbstractAuthenticationToken;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
@ -14,44 +20,37 @@ import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static java.util.stream.Collectors.toSet;
|
||||
|
||||
|
||||
public class KeycloakJwtRolesConverter implements Converter<Jwt, AbstractAuthenticationToken> {
|
||||
/**
|
||||
* Prefix used for realm level roles.
|
||||
*/
|
||||
/** Prefix used for realm level roles. */
|
||||
public static final String PREFIX_REALM_ROLE = "ROLE_REALM_";
|
||||
/**
|
||||
* Prefix used in combination with the resource (client) name for resource level roles.
|
||||
*/
|
||||
|
||||
/** Prefix used in combination with the resource (client) name for resource level roles. */
|
||||
public static final String PREFIX_RESOURCE_ROLE = "ROLE_";
|
||||
|
||||
/**
|
||||
* Name of the claim containing the realm level roles
|
||||
*/
|
||||
/** Name of the claim containing the realm level roles */
|
||||
private static final String CLAIM_REALM_ACCESS = "realm_access";
|
||||
/**
|
||||
* Name of the claim containing the resources (clients) the user has access to.
|
||||
*/
|
||||
|
||||
/** Name of the claim containing the resources (clients) the user has access to. */
|
||||
private static final String CLAIM_RESOURCE_ACCESS = "resource_access";
|
||||
/**
|
||||
* Name of the claim containing roles. (Applicable to realm and resource level.)
|
||||
*/
|
||||
|
||||
/** Name of the claim containing roles. (Applicable to realm and resource level.) */
|
||||
private static final String CLAIM_ROLES = "roles";
|
||||
|
||||
@Override
|
||||
public AbstractAuthenticationToken convert(Jwt source)
|
||||
{
|
||||
return new JwtAuthenticationToken(source, Stream.concat(new JwtGrantedAuthoritiesConverter().convert(source)
|
||||
.stream(), TEMPORARNAME(source).stream())
|
||||
.collect(toSet()));
|
||||
public AbstractAuthenticationToken convert(Jwt source) {
|
||||
return new JwtAuthenticationToken(
|
||||
source,
|
||||
Stream.concat(
|
||||
new JwtGrantedAuthoritiesConverter().convert(source).stream(),
|
||||
tokenRolesExtractor(source).stream())
|
||||
.collect(toSet()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts the realm and resource level roles from a JWT token distinguishing between them using prefixes.
|
||||
* Extracts the realm and resource level roles from a JWT token distinguishing between them
|
||||
* using prefixes.
|
||||
*/
|
||||
public Collection<GrantedAuthority> TEMPORARNAME(Jwt jwt) {
|
||||
public Collection<GrantedAuthority> tokenRolesExtractor(Jwt jwt) {
|
||||
// Collection that will hold the extracted roles
|
||||
Collection<GrantedAuthority> grantedAuthorities = new ArrayList<>();
|
||||
|
||||
@ -66,33 +65,43 @@ public class KeycloakJwtRolesConverter implements Converter<Jwt, AbstractAuthent
|
||||
// Check if any roles are present
|
||||
if (roles != null && !roles.isEmpty()) {
|
||||
// Iterate of the roles and add them to the granted authorities
|
||||
Collection<GrantedAuthority> realmRoles = roles.stream()
|
||||
// Prefix all realm roles with "ROLE_realm_"
|
||||
.map(role -> new SimpleGrantedAuthority(PREFIX_REALM_ROLE + role))
|
||||
.collect(Collectors.toList());
|
||||
Collection<GrantedAuthority> realmRoles =
|
||||
roles.stream()
|
||||
// Prefix all realm roles with "ROLE_realm_"
|
||||
.map(role -> new SimpleGrantedAuthority(PREFIX_REALM_ROLE + role))
|
||||
.collect(Collectors.toList());
|
||||
grantedAuthorities.addAll(realmRoles);
|
||||
}
|
||||
}
|
||||
|
||||
// Resource (client) roles
|
||||
// A user might have access to multiple resources all containing their own roles. Therefore, it is a map of
|
||||
// A user might have access to multiple resources all containing their own roles. Therefore,
|
||||
// it is a map of
|
||||
// resource each possibly containing a "roles" property.
|
||||
Map<String, Map<String, Collection<String>>> resourceAccess = jwt.getClaim(CLAIM_RESOURCE_ACCESS);
|
||||
Map<String, Map<String, Collection<String>>> resourceAccess =
|
||||
jwt.getClaim(CLAIM_RESOURCE_ACCESS);
|
||||
|
||||
// Check if resources are assigned
|
||||
if (resourceAccess != null && !resourceAccess.isEmpty()) {
|
||||
// Iterate of all the resources
|
||||
resourceAccess.forEach((resource, resourceClaims) -> {
|
||||
// Iterate of the "roles" claim inside the resource claims
|
||||
resourceClaims.get(CLAIM_ROLES).forEach(
|
||||
// Add the role to the granted authority prefixed with ROLE_ and the name of the resource
|
||||
role -> grantedAuthorities.add(new SimpleGrantedAuthority(PREFIX_RESOURCE_ROLE + resource + "_" + role))
|
||||
);
|
||||
});
|
||||
resourceAccess.forEach(
|
||||
(resource, resourceClaims) -> {
|
||||
// Iterate of the "roles" claim inside the resource claims
|
||||
resourceClaims
|
||||
.get(CLAIM_ROLES)
|
||||
.forEach(
|
||||
// Add the role to the granted authority prefixed with ROLE_
|
||||
// and the name of the resource
|
||||
role ->
|
||||
grantedAuthorities.add(
|
||||
new SimpleGrantedAuthority(
|
||||
PREFIX_RESOURCE_ROLE
|
||||
+ resource
|
||||
+ "_"
|
||||
+ role)));
|
||||
});
|
||||
}
|
||||
|
||||
return grantedAuthorities;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,135 @@
|
||||
package enseirb.myinpulse.utils.keycloak;
|
||||
|
||||
import static org.springframework.http.MediaType.APPLICATION_JSON;
|
||||
|
||||
import enseirb.myinpulse.exceptions.UserNotFoundException;
|
||||
import enseirb.myinpulse.utils.keycloak.datatypes.RoleRepresentation;
|
||||
import enseirb.myinpulse.utils.keycloak.datatypes.UserRepresentation;
|
||||
|
||||
import org.springframework.web.client.RestClient;
|
||||
|
||||
import javax.management.relation.RoleNotFoundException;
|
||||
|
||||
public class KeycloakApi {
|
||||
|
||||
static final String keycloakUrl;
|
||||
static final String realmName;
|
||||
|
||||
static {
|
||||
if (System.getenv("VITE_KEYCLOAK_URL") == null) {
|
||||
System.exit(-1);
|
||||
}
|
||||
keycloakUrl = System.getenv("VITE_KEYCLOAK_URL");
|
||||
}
|
||||
|
||||
static {
|
||||
if (System.getenv("VITE_KEYCLOAK_REALM") == null) {
|
||||
System.exit(-1);
|
||||
}
|
||||
realmName = System.getenv("VITE_KEYCLOAK_REALM");
|
||||
}
|
||||
|
||||
/**
|
||||
* Uses Keycloak API to retrieve a role representation of a role by its name
|
||||
*
|
||||
* @param roleName name of the role
|
||||
* @param bearer authorization header used by the client to authenticate to keycloak
|
||||
*/
|
||||
public static RoleRepresentation getRoleRepresentationByName(String roleName, String bearer)
|
||||
throws RoleNotFoundException {
|
||||
RoleRepresentation[] response =
|
||||
RestClient.builder()
|
||||
.baseUrl(keycloakUrl)
|
||||
.defaultHeader("Authorization", bearer)
|
||||
.build()
|
||||
.get()
|
||||
.uri("/admin/realms/{realmName}/roles/{roleName}", realmName, roleName)
|
||||
.retrieve()
|
||||
.body(RoleRepresentation[].class);
|
||||
|
||||
if (response == null || response.length == 0) {
|
||||
throw new RoleNotFoundException("Role not found");
|
||||
}
|
||||
return response[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Use keycloak API to to retreive a userID via his name or email.
|
||||
*
|
||||
* @param username username or mail of the user
|
||||
* @param bearer bearer of the user, allowing access to database
|
||||
* @return the userid, as a String
|
||||
* @throws UserNotFoundException
|
||||
*/
|
||||
public static String getUserIdByName(String username, String bearer)
|
||||
throws UserNotFoundException {
|
||||
UserRepresentation[] response =
|
||||
RestClient.builder()
|
||||
.baseUrl(keycloakUrl)
|
||||
.defaultHeader("Authorization", bearer)
|
||||
.build()
|
||||
.get()
|
||||
.uri(
|
||||
"/admin/realms/{realmName}/users?username={username}",
|
||||
realmName,
|
||||
username)
|
||||
.retrieve()
|
||||
.body(UserRepresentation[].class);
|
||||
|
||||
if (response == null || response.length == 0) {
|
||||
throw new UserNotFoundException("User not found");
|
||||
}
|
||||
return response[0].id;
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO: check for error
|
||||
*
|
||||
* <p>Set a keycloak role to a keycloak user.
|
||||
*
|
||||
* <p>Usual roles should be `MyINPulse-admin` and `MyINPulse-entrepreneur`
|
||||
*
|
||||
* @param username
|
||||
* @param roleName
|
||||
* @param bearer
|
||||
* @throws RoleNotFoundException
|
||||
* @throws UserNotFoundException
|
||||
*/
|
||||
public static void setRoleToUser(String username, String roleName, String bearer)
|
||||
throws RoleNotFoundException, UserNotFoundException {
|
||||
RoleRepresentation roleRepresentation = getRoleRepresentationByName(roleName, bearer);
|
||||
String userId = getUserIdByName(username, bearer);
|
||||
|
||||
RestClient.builder()
|
||||
.baseUrl(keycloakUrl)
|
||||
.defaultHeader("Authorization", bearer)
|
||||
.build()
|
||||
.post()
|
||||
.uri(
|
||||
"/admin/realms/${realmName}/users/${userId}/role-mappings/realm",
|
||||
realmName,
|
||||
userId)
|
||||
.body(roleRepresentation)
|
||||
.contentType(APPLICATION_JSON)
|
||||
.retrieve();
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete a user from Keycloak database. TODO: check the bearer permission.
|
||||
*
|
||||
* @param username
|
||||
* @param bearer
|
||||
* @throws UserNotFoundException
|
||||
*/
|
||||
public static void deleteUser(String username, String bearer) throws UserNotFoundException {
|
||||
String userId = getUserIdByName(username, bearer);
|
||||
|
||||
RestClient.builder()
|
||||
.baseUrl(keycloakUrl)
|
||||
.defaultHeader("Authorization", bearer)
|
||||
.build()
|
||||
.delete()
|
||||
.uri("/admin/realms/${realmName}/users/${userId}", realmName, userId)
|
||||
.retrieve();
|
||||
}
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
package enseirb.myinpulse.utils.keycloak.datatypes;
|
||||
|
||||
public class RoleRepresentation {
|
||||
public String id;
|
||||
public String name;
|
||||
public String description;
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
package enseirb.myinpulse.utils.keycloak.datatypes;
|
||||
|
||||
public class UserRepresentation {
|
||||
public String id;
|
||||
public String name;
|
||||
}
|
@ -2,3 +2,7 @@ spring.application.name=myinpulse
|
||||
spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs
|
||||
spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test
|
||||
logging.level.org.springframework.security=DEBUG
|
||||
spring.datasource.url=jdbc:postgresql://${DATABASE_URL}/${BACKEND_DB}
|
||||
spring.datasource.username=${BACKEND_USER}
|
||||
spring.datasource.password=${BACKEND_PASSWORD}
|
||||
spring.jpa.hibernate.ddl-auto=update
|
||||
|
68
MyINPulse-back/src/main/resources/data.sql
Normal file
68
MyINPulse-back/src/main/resources/data.sql
Normal file
@ -0,0 +1,68 @@
|
||||
TRUNCATE projets, utilisateurs, entrepreneurs, sections, rendez_vous, comptes_rendus CASCADE;
|
||||
|
||||
INSERT INTO projets (nom_projet, logo, date_creation, status_projet)
|
||||
VALUES ('Eau du robinet', decode('013d7d16d7ad4fefb61bd95b765c8ceb', 'hex'), TO_DATE('01-OCT-2023', 'DD-MON-YYYY'),
|
||||
'En cours'),
|
||||
('Air oxygéné', decode('150647a0984e8f228cd14b54', 'hex'), TO_DATE('04-APR-2024', 'DD-MON-YYYY'), 'En cours'),
|
||||
('Débat concours', decode('022024abd5486e245c145dda65116f', 'hex'), TO_DATE('22-NOV-2023', 'DD-MON-YYYY'),
|
||||
'Suspendu'),
|
||||
('HDeirbMI', decode('ab548d6c1d595a2975e6476f544d14c55a', 'hex'), TO_DATE('07-DEC-2024', 'DD-MON-YYYY'),
|
||||
'Lancement');
|
||||
|
||||
INSERT INTO utilisateurs (nom_utilisateur, prenom_utilisateur, mail_principal, mail_secondaire, numero_telephone) VALUES
|
||||
('Dupont', 'Dupond', 'super@mail.fr', 'super2@mail.fr', '06 45 72 45 98'),
|
||||
('Martin', 'Matin', 'genial@mail.fr', 'genial2@mail.fr', '06 52 14 58 73'),
|
||||
('Charvet', 'Lautre', 'mieux@tmail.fr', 'mieux2@tmail.fr', '07 49 82 16 35'),
|
||||
('Leguez', 'Theo', 'bof@mesmails.fr', 'bof2@mesmails.fr', '+33 6 78 14 25 29'),
|
||||
('Kia', 'Bi', 'special@mail.fr', 'special2@mail.fr', '07 65 31 38 95'),
|
||||
('Ducaillou', 'Pierre', 'maildefou@xyz.fr', 'maildefou2@xyz.fr', '06 54 78 12 62');
|
||||
|
||||
|
||||
INSERT INTO entrepreneurs (ecole, filiere, status_snee, id_entrepreneur) VALUES
|
||||
('ENSEIRB-MATMECA', 'INFO', TRUE, 1),
|
||||
('ENSC', 'Cognitique', TRUE, 2),
|
||||
('ENSEIRB-MATMECA', 'MATMECA', FALSE, 3),
|
||||
('SupOptique', 'Classique', TRUE, 4),
|
||||
('ENSEGID', 'Géoscience', FALSE, 5),
|
||||
('ENSMAC', 'Matériaux composites - Mécanique', FALSE, 6);
|
||||
|
||||
INSERT INTO sections (titre, contenu_section, date_modification) VALUES
|
||||
('Problème', 'les problèmes...', TO_TIMESTAMP('15-JAN-2025 09:30:20', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Segment de client', 'Le segment AB passant le client n°8 est de longueur 32mm.
|
||||
Le segment BC a quant à lui un longueur de 28mm. Quelle la longueur du segment AC ?', TO_TIMESTAMP('12-OCT-2022 17:47:38', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Proposition de valeur unique', '''Son prix est de 2594€'' ''Ah oui c''est unique en effet', TO_TIMESTAMP('25-MAY-2024 11:12:04', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Solution', 'Un problème ? Une solution', TO_TIMESTAMP('08-FEB-2024 10:17:53', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Canaux', 'Ici nous avons la Seine, là-bas le Rhin, oh et plus loin le canal de Suez', TO_TIMESTAMP('19-JUL-2023 19:22:45', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Sources de revenus', 'Y''en n''a pas on est pas payé. Enfin y''a du café quoi', TO_TIMESTAMP('12-JAN-2025 11:40:26', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Structure des coûts', '''Ah oui là ça va faire au moins 1000€ par mois'', Eirbware', TO_TIMESTAMP('06-FEB-2025 13:04:06', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Indicateurs clés', 'On apprend les clés comme des badges, ça se fait', TO_TIMESTAMP('05-FEB-2025 12:42:38', 'DD-MON-YYYY, HH24:MI:SS')),
|
||||
('Avantages concurrentiel', 'On est meilleur', TO_TIMESTAMP('23-APR-2024 16:24:02', 'DD-MON-YYYY, HH24:MI:SS'));
|
||||
|
||||
INSERT INTO rendez_vous (date_rdv, heure_rdv, duree_rdv, lieu_rdv, sujet_rdv) VALUES
|
||||
(TO_DATE('24-DEC-2023', 'DD-MON-YYYY'), '00:00:00', '00:37:53', 'À la maison', 'Ouvrir les cadeaux'),
|
||||
(TO_DATE('15-AUG-2024', 'DD-MON-YYYY'), '22:35:00', '00:12:36', 'Sur les quais ou dans un champ probablement', 'BOUM BOUM les feux d''artifices (on fête quoi déjà ?)'),
|
||||
(TO_DATE('28-FEB-2023', 'DD-MON-YYYY'), '14:20:00', '00:20:00', 'Salle TD 15', 'Ah mince c''est pas une année bissextile !'),
|
||||
(TO_DATE('23-JAN-2024', 'DD-MON-YYYY'), '12:56:27', '11:03:33', 'Là où le vent nous porte', 'Journée la plus importante de l''année'),
|
||||
(TO_DATE('25-AUG-2025', 'DD-MON-YYYY'), '00:09:00', '01:00:00', 'Euh c''est par où l''amphi 56 ?', 'Rentrée scolaire (il fait trop froid c''est quoi ça on est en août)');
|
||||
|
||||
INSERT INTO comptes_rendus (contenu_compte_rendu) VALUES
|
||||
('Ah oui ça c''est super, ah ouais j''aime bien, bien vu de penser à ça'),
|
||||
('Bonne réunion'),
|
||||
('Ouais, j''ai rien compris mais niquel on fait comme vous avez dit'),
|
||||
('Non non ça va pas du tout ce que tu me proposes, faut tout refaire'),
|
||||
('Réponse de la DSI : non'),
|
||||
('Trop dommage qu''Apple ait sorti leur logiciel avant nous, on avait la même idée et tout on aurait tellement pu leur faire de la concurrence');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
1
MyINPulse-back/src/main/resources/delete.sql
Normal file
1
MyINPulse-back/src/main/resources/delete.sql
Normal file
@ -0,0 +1 @@
|
||||
DROP TABLE IF EXISTS administrateurs, projets, utilisateurs, entrepreneurs, sections, rendez_vous, comptes_rendus, concerner CASCADE;
|
134
MyINPulse-back/src/main/resources/schema.sql
Normal file
134
MyINPulse-back/src/main/resources/schema.sql
Normal file
@ -0,0 +1,134 @@
|
||||
DROP TABLE IF EXISTS projets CASCADE;
|
||||
DROP TABLE IF EXISTS utilisateurs CASCADE;
|
||||
DROP TABLE IF EXISTS entrepreneurs CASCADE;
|
||||
DROP TABLE IF EXISTS administrateurs CASCADE;
|
||||
DROP TABLE IF EXISTS sections CASCADE;
|
||||
DROP TABLE IF EXISTS rendez_vous CASCADE;
|
||||
DROP TABLE IF EXISTS comptes_rendus CASCADE;
|
||||
DROP TABLE IF EXISTS concerner CASCADE;
|
||||
DROP TABLE IF EXISTS formes CASCADE;
|
||||
|
||||
CREATE TABLE projets
|
||||
(
|
||||
id_projet SERIAL NOT NULL,
|
||||
nom_projet VARCHAR(255),
|
||||
logo BYTEA,
|
||||
date_creation DATE,
|
||||
status_projet VARCHAR(255),
|
||||
CONSTRAINT pk_projet PRIMARY KEY (id_projet)
|
||||
);
|
||||
|
||||
CREATE TABLE utilisateurs
|
||||
(
|
||||
id_utilisateur SERIAL NOT NULL,
|
||||
nom_utilisateur VARCHAR(255) ,
|
||||
prenom_utilisateur VARCHAR(255) ,
|
||||
mail_principal VARCHAR(255) ,
|
||||
mail_secondaire VARCHAR(255) ,
|
||||
numero_telephone VARCHAR(20) ,
|
||||
CONSTRAINT pk_utilisateur PRIMARY KEY (id_utilisateur) );
|
||||
|
||||
CREATE TABLE entrepreneurs
|
||||
(
|
||||
id_entrepreneur SERIAL REFERENCES utilisateurs (id_utilisateur),
|
||||
ecole VARCHAR(255),
|
||||
filiere VARCHAR(255),
|
||||
status_snee BOOLEAN,
|
||||
CONSTRAINT pk_entrepreneur PRIMARY KEY (id_entrepreneur)
|
||||
);
|
||||
|
||||
CREATE TABLE administrateurs
|
||||
(
|
||||
id_administrateur SERIAL REFERENCES utilisateurs (id_utilisateur),
|
||||
CONSTRAINT pk_administrateur PRIMARY KEY (id_administrateur)
|
||||
);
|
||||
|
||||
CREATE TABLE sections
|
||||
(
|
||||
id_section SERIAL NOT NULL,
|
||||
titre VARCHAR(255),
|
||||
contenu_section TEXT,
|
||||
date_modification TIMESTAMP,
|
||||
CONSTRAINT pk_section PRIMARY KEY (id_section)
|
||||
);
|
||||
|
||||
CREATE TABLE rendez_vous
|
||||
(
|
||||
id_rdv SERIAL NOT NULL,
|
||||
date_rdv DATE,
|
||||
heure_rdv TIME,
|
||||
duree_rdv TIME,
|
||||
lieu_rdv VARCHAR(255),
|
||||
sujet_rdv TEXT,
|
||||
CONSTRAINT pk_rdv PRIMARY KEY (id_rdv)
|
||||
);
|
||||
|
||||
CREATE TABLE comptes_rendus
|
||||
(
|
||||
id_compte_rendu SERIAL NOT NULL,
|
||||
contenu_compte_rendu TEXT,
|
||||
CONSTRAINT pk_compte_rendu PRIMARY KEY (id_compte_rendu)
|
||||
);
|
||||
|
||||
CREATE TABLE concerner
|
||||
(
|
||||
id_section SERIAL REFERENCES sections (id_section),
|
||||
id_rdv SERIAL REFERENCES sections (id_rdv),
|
||||
CONSTRAINT pk_concerner PRIMARY KEY (id_section, id_rdv)
|
||||
);
|
||||
|
||||
|
||||
ALTER TABLE projets
|
||||
ADD CONSTRAINT fk1_projet FOREIGN KEY (id_administrateur)
|
||||
REFERENCES administrateurs (id_administrateur)
|
||||
ON DELETE CASCADE;
|
||||
|
||||
ALTER TABLE projets
|
||||
ADD CONSTRAINT fk2_projet FOREIGN KEY (id_entrepreneur_participation)
|
||||
REFERENCES entrepreneurs (id_entrepreneur)
|
||||
ON DELETE CASCADE;
|
||||
|
||||
ALTER TABLE entrepreneurs
|
||||
ADD CONSTRAINT fk1_entrepreneur FOREIGN KEY (id_projet_propose)
|
||||
REFERENCES projets (id_projet)
|
||||
ON DELETE CASCADE;
|
||||
|
||||
ALTER TABLE sections
|
||||
ADD CONSTRAINT fk1_section FOREIGN KEY (id_projet)
|
||||
REFERENCES projets (id_projet)
|
||||
ON DELETE CASCADE;
|
||||
|
||||
ALTER TABLE sections
|
||||
ADD CONSTRAINT fk2_section FOREIGN KEY (id_administrateur)
|
||||
REFERENCES administrateurs (id_administrateur)
|
||||
ON DELETE CASCADE;
|
||||
|
||||
ALTER TABLE rendez-vous
|
||||
ADD CONSTRAINT fk1_rdv FOREIGN KEY (id_entrepreneur)
|
||||
REFERENCES entrepreneurs (id_entrepreneur)
|
||||
ON
|
||||
DELETE
|
||||
CASCADE;
|
||||
|
||||
ALTER TABLE rendez-vous
|
||||
ADD CONSTRAINT fk2_rdv FOREIGN KEY (id_administrateur)
|
||||
REFERENCES administrateurs (id_administrateur)
|
||||
ON
|
||||
DELETE
|
||||
CASCADE;
|
||||
|
||||
ALTER TABLE comptes-rendus
|
||||
ADD CONSTRAINT fk1_compte_rendu FOREIGN KEY (id_rdv)
|
||||
REFERENCES rendez_vous (id_rdv)
|
||||
ON
|
||||
DELETE
|
||||
CASCADE;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -6,8 +6,6 @@ import org.springframework.boot.test.context.SpringBootTest;
|
||||
@SpringBootTest
|
||||
class MyinpulseApplicationTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
}
|
||||
|
||||
@Test
|
||||
void contextLoads() {}
|
||||
}
|
||||
|
24
agenda/.gitignore
vendored
24
agenda/.gitignore
vendored
@ -1,24 +0,0 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
3
agenda/.vscode/extensions.json
vendored
3
agenda/.vscode/extensions.json
vendored
@ -1,3 +0,0 @@
|
||||
{
|
||||
"recommendations": ["Vue.volar"]
|
||||
}
|
@ -1,5 +0,0 @@
|
||||
# Vue 3 + Vite
|
||||
|
||||
This template should help get you started developing with Vue 3 in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
|
||||
|
||||
Learn more about IDE Support for Vue in the [Vue Docs Scaling up Guide](https://vuejs.org/guide/scaling-up/tooling.html#ide-support).
|
@ -1,13 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Mon Agenda Vue</title>
|
||||
<link rel="icon" type="image/svg+xml" href="public/agenda-icon.svg" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/main.js"></script>
|
||||
</body>
|
||||
</html>
|
1106
agenda/package-lock.json
generated
1106
agenda/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,18 +0,0 @@
|
||||
{
|
||||
"name": "agenda",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"vue": "^3.5.13"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
"vite": "^6.2.0"
|
||||
}
|
||||
}
|
@ -1,26 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
|
||||
<rect x="4" y="10" width="56" height="50" rx="4" ry="4" fill="#f2f2f2" stroke="#333" stroke-width="2"/>
|
||||
<rect x="4" y="10" width="56" height="12" fill="#1976d2"/>
|
||||
<circle cx="14" cy="16" r="2" fill="#fff"/>
|
||||
<circle cx="50" cy="16" r="2" fill="#fff"/>
|
||||
<!-- Grille du calendrier -->
|
||||
<g fill="#fff" stroke="#ccc">
|
||||
<rect x="10" y="26" width="8" height="8"/>
|
||||
<rect x="20" y="26" width="8" height="8"/>
|
||||
<rect x="30" y="26" width="8" height="8"/>
|
||||
<rect x="40" y="26" width="8" height="8"/>
|
||||
<rect x="50" y="26" width="8" height="8"/>
|
||||
|
||||
<rect x="10" y="36" width="8" height="8"/>
|
||||
<rect x="20" y="36" width="8" height="8"/>
|
||||
<rect x="30" y="36" width="8" height="8"/>
|
||||
<rect x="40" y="36" width="8" height="8"/>
|
||||
<rect x="50" y="36" width="8" height="8"/>
|
||||
|
||||
<rect x="10" y="46" width="8" height="8"/>
|
||||
<rect x="20" y="46" width="8" height="8"/>
|
||||
<rect x="30" y="46" width="8" height="8"/>
|
||||
<rect x="40" y="46" width="8" height="8"/>
|
||||
<rect x="50" y="46" width="8" height="8"/>
|
||||
</g>
|
||||
</svg>
|
Before Width: | Height: | Size: 1.1 KiB |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
Before Width: | Height: | Size: 1.5 KiB |
@ -1,17 +0,0 @@
|
||||
<template>
|
||||
<div id="app">
|
||||
<h1>Mon agenda</h1>
|
||||
<Agenda />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Agenda from './components/Agenda.vue'
|
||||
|
||||
export default {
|
||||
name: 'App',
|
||||
components: {
|
||||
Agenda
|
||||
}
|
||||
}
|
||||
</script>
|
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>
|
Before Width: | Height: | Size: 496 B |
@ -1,586 +0,0 @@
|
||||
<template>
|
||||
<div class="ade-agenda-container">
|
||||
<!-- Import ICS -->
|
||||
<div style="margin-bottom: 15px; text-align: center;">
|
||||
<input type="file" @change="handleFileUpload" accept=".ics" />
|
||||
</div>
|
||||
|
||||
<!-- Affiche un message tant que skipCells n'est pas prêt -->
|
||||
<div v-if="!skipCellsReady">
|
||||
Chargement de la grille...
|
||||
</div>
|
||||
|
||||
<!-- Tableau ADE, rendu UNIQUEMENT si skipCells est prêt -->
|
||||
<table
|
||||
class="ade-table"
|
||||
v-if="skipCellsReady"
|
||||
>
|
||||
<thead>
|
||||
<!-- Ligne du haut : Semaine + date de début -->
|
||||
<tr class="top-row">
|
||||
<th :colspan="daysOfWeek.length + 1" class="week-title">
|
||||
S{{ isoWeekNumber }} {{ formatDDMM(currentMonday) }}
|
||||
</th>
|
||||
</tr>
|
||||
|
||||
<!-- Ligne des jours -->
|
||||
<tr class="days-row">
|
||||
<th class="time-col-header">Horaire</th>
|
||||
<th
|
||||
v-for="(day, index) in daysOfWeek"
|
||||
:key="index"
|
||||
class="day-header"
|
||||
>
|
||||
<div class="day-label">
|
||||
{{ weekdayLabel(day) }} {{ formatDateShort(day) }}
|
||||
</div>
|
||||
<div class="resource-name">
|
||||
{{ resourceName }}
|
||||
</div>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<!-- Pour chaque créneau horaire -->
|
||||
<tr v-for="(slot, slotIndex) in timeSlots" :key="slotIndex">
|
||||
<!-- Colonne Horaire -->
|
||||
<td class="time-col">
|
||||
{{ slot.start }} - {{ slot.end }}
|
||||
</td>
|
||||
|
||||
<!-- 7 jours -->
|
||||
<template v-for="(day, dayIndex) in daysOfWeek" :key="dayIndex">
|
||||
<!--
|
||||
On n'affiche un <td> que si la case n'est pas "skip"
|
||||
(déjà couverte par un rowspan au-dessus).
|
||||
-->
|
||||
<td
|
||||
v-if="!skipCells[dayIndex][slotIndex].skip"
|
||||
:rowspan="skipCells[dayIndex][slotIndex].rowSpan"
|
||||
class="agenda-cell"
|
||||
:style="eventStyleForCell(dayIndex, slotIndex)"
|
||||
>
|
||||
<!-- Si des événements commencent EXACTEMENT ici -->
|
||||
<div
|
||||
v-for="(evt, evtIndex) in skipCells[dayIndex][slotIndex].events"
|
||||
:key="evtIndex"
|
||||
class="event-card"
|
||||
>
|
||||
<div class="event-title">{{ evt.title }}</div>
|
||||
<div class="event-info">
|
||||
{{ evt.start }} - {{ evt.end }}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</template>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!-- Barre d'onglets de navigation -->
|
||||
<div class="week-tabs">
|
||||
<button class="arrow-btn" @click="prevPage" :disabled="startIndex === 0">
|
||||
←
|
||||
</button>
|
||||
<button
|
||||
v-for="(week, idx) in displayedWeeks"
|
||||
:key="idx"
|
||||
class="week-tab-button"
|
||||
@click="goToWeek(week.monday)"
|
||||
>
|
||||
S{{ week.isoWeek }} {{ formatDDMM(week.monday) }}
|
||||
</button>
|
||||
<button
|
||||
class="arrow-btn"
|
||||
@click="nextPage"
|
||||
:disabled="startIndex + weeksToShow >= allWeeks.length"
|
||||
>
|
||||
→
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
/** Calcule la semaine ISO d'une date donnée. */
|
||||
function getIsoWeekNumber(date) {
|
||||
const tempDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
|
||||
const dayNum = tempDate.getUTCDay() || 7;
|
||||
tempDate.setUTCDate(tempDate.getUTCDate() + 4 - dayNum);
|
||||
const yearStart = new Date(Date.UTC(tempDate.getUTCFullYear(), 0, 1));
|
||||
return Math.ceil(((tempDate - yearStart) / 86400000 + 1) / 7);
|
||||
}
|
||||
|
||||
/** Retourne 'YYYY-MM-DD' */
|
||||
function formatDate(dateObj) {
|
||||
const yyyy = dateObj.getFullYear();
|
||||
const mm = String(dateObj.getMonth() + 1).padStart(2, "0");
|
||||
const dd = String(dateObj.getDate()).padStart(2, "0");
|
||||
return `${yyyy}-${mm}-${dd}`;
|
||||
}
|
||||
|
||||
export default {
|
||||
name: "AdeLikeAgenda",
|
||||
data() {
|
||||
const currentMonday = new Date(2025, 2, 31); // Par exemple
|
||||
return {
|
||||
currentMonday,
|
||||
resourceName: "El Alaoui El Ismaili Omar",
|
||||
|
||||
// Créneaux de 30 min
|
||||
timeSlots: [
|
||||
{ start: "08:00", end: "08:30" },
|
||||
{ start: "08:30", end: "09:00" },
|
||||
{ start: "09:00", end: "09:30" },
|
||||
{ start: "09:30", end: "10:00" },
|
||||
{ start: "10:00", end: "10:30" },
|
||||
{ start: "10:30", end: "11:00" },
|
||||
{ start: "11:00", end: "11:30" },
|
||||
{ start: "11:30", end: "12:00" },
|
||||
{ start: "12:00", end: "12:30" },
|
||||
{ start: "12:30", end: "13:00" },
|
||||
{ start: "13:00", end: "13:30" },
|
||||
{ start: "13:30", end: "14:00" },
|
||||
{ start: "14:00", end: "14:30" },
|
||||
{ start: "14:30", end: "15:00" },
|
||||
{ start: "15:00", end: "15:30" },
|
||||
{ start: "15:30", end: "16:00" },
|
||||
{ start: "16:00", end: "16:30" },
|
||||
{ start: "16:30", end: "17:00" },
|
||||
{ start: "17:00", end: "17:30" },
|
||||
{ start: "17:30", end: "18:00" },
|
||||
{ start: "18:00", end: "18:30" },
|
||||
{ start: "18:30", end: "19:00" },
|
||||
{ start: "19:00", end: "19:30" },
|
||||
{ start: "19:30", end: "19:55" },
|
||||
],
|
||||
|
||||
events: [], // Contiendra la liste des événements importés
|
||||
allWeeks: [], // Liste de semaines pour la barre d'onglets
|
||||
weeksToShow: 7, // 7 semaines affichées dans la barre
|
||||
startIndex: 0, // Index de la 1ère semaine dans la barre
|
||||
|
||||
/**
|
||||
* Tableau 2D (dayIndex, slotIndex) pour savoir si on "saute" (skip) cette case,
|
||||
* combien de rowSpan, et quels événements démarrent ici.
|
||||
*/
|
||||
skipCells: [],
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
/** Les 7 jours de currentMonday */
|
||||
daysOfWeek() {
|
||||
const result = [];
|
||||
for (let i = 0; i < 7; i++) {
|
||||
const d = new Date(this.currentMonday);
|
||||
d.setDate(d.getDate() + i);
|
||||
result.push(d);
|
||||
}
|
||||
return result;
|
||||
},
|
||||
/** Numéro de semaine (ISO) */
|
||||
isoWeekNumber() {
|
||||
return getIsoWeekNumber(this.currentMonday);
|
||||
},
|
||||
/** Liste des semaines à afficher (avec pagination) */
|
||||
displayedWeeks() {
|
||||
return this.allWeeks.slice(this.startIndex, this.startIndex + this.weeksToShow);
|
||||
},
|
||||
|
||||
/**
|
||||
* Renvoie true si skipCells est "prêt" :
|
||||
* - 7 jours
|
||||
* - Au moins 1 timeSlot
|
||||
* - skipCells a la même taille que daysOfWeek x timeSlots
|
||||
*/
|
||||
skipCellsReady() {
|
||||
if (!this.skipCells || !this.skipCells.length) return false;
|
||||
if (this.skipCells.length !== this.daysOfWeek.length) return false;
|
||||
if (!this.skipCells[0].length) return false;
|
||||
if (this.skipCells[0].length !== this.timeSlots.length) return false;
|
||||
return true;
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
// À chaque changement de semaine ou de liste d'événements,
|
||||
// on recalcule la matrice skipCells
|
||||
currentMonday() {
|
||||
this.buildSkipCells();
|
||||
},
|
||||
events: {
|
||||
handler() {
|
||||
this.buildSkipCells();
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
/** Initialise la liste de toutes les semaines */
|
||||
initWeeks() {
|
||||
const totalCount = 15; // ex: 15 semaines
|
||||
const baseDate = new Date(this.currentMonday);
|
||||
for (let i = 0; i < totalCount; i++) {
|
||||
const temp = new Date(baseDate);
|
||||
temp.setDate(baseDate.getDate() + i * 7);
|
||||
this.allWeeks.push({
|
||||
monday: temp,
|
||||
isoWeek: getIsoWeekNumber(temp),
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
/** Construit skipCells = la matrice skip/rowSpan/events pour chaque jour/slot */
|
||||
buildSkipCells() {
|
||||
// Si daysOfWeek ou timeSlots sont vides, on annule
|
||||
if (!this.daysOfWeek.length || !this.timeSlots.length) {
|
||||
this.skipCells = [];
|
||||
return;
|
||||
}
|
||||
|
||||
// Réinitialise skipCells
|
||||
this.skipCells = Array(this.daysOfWeek.length) // nb de jours
|
||||
.fill(null)
|
||||
.map(() =>
|
||||
Array(this.timeSlots.length)
|
||||
.fill(null)
|
||||
.map(() => ({ skip: false, rowSpan: 1, events: [] }))
|
||||
);
|
||||
|
||||
// Parcours de chaque jour
|
||||
this.daysOfWeek.forEach((day, dayIndex) => {
|
||||
const dayStr = formatDate(day);
|
||||
|
||||
// Parcours des créneaux
|
||||
for (let slotIndex = 0; slotIndex < this.timeSlots.length; slotIndex++) {
|
||||
const cell = this.skipCells[dayIndex][slotIndex];
|
||||
if (cell.skip) continue; // déjà couvert par un rowspan
|
||||
|
||||
const slotStart = this.timeSlots[slotIndex].start;
|
||||
const slotEnd = this.timeSlots[slotIndex].end;
|
||||
|
||||
// Cherche événements qui chevauchent ce créneau
|
||||
const eventsInSlot = this.events.filter((evt) => {
|
||||
const evtStart = evt.start;
|
||||
const evtEnd = evt.end;
|
||||
|
||||
// Vérifie si l'événement commence ou chevauche ce créneau
|
||||
return (
|
||||
evt.day === dayStr &&
|
||||
((evtStart >= slotStart && evtStart < slotEnd) || // Commence dans ce créneau
|
||||
(evtEnd > slotStart && evtEnd <= slotEnd) || // Se termine dans ce créneau
|
||||
(evtStart < slotStart && evtEnd > slotEnd)) // Couvre entièrement ce créneau
|
||||
);
|
||||
});
|
||||
|
||||
if (eventsInSlot.length > 0) {
|
||||
// rowSpan = max de tous les événements qui chevauchent ce créneau
|
||||
let maxSpan = 1;
|
||||
eventsInSlot.forEach((evt) => {
|
||||
const r = this.getEventRowSpan(evt, slotIndex);
|
||||
if (r > maxSpan) maxSpan = r;
|
||||
});
|
||||
|
||||
// Associe la liste des événements et le rowSpan
|
||||
cell.events = eventsInSlot;
|
||||
cell.rowSpan = maxSpan;
|
||||
|
||||
// "Skip" les créneaux suivants couverts par ce rowSpan
|
||||
for (let i = 1; i < maxSpan; i++) {
|
||||
if (slotIndex + i < this.timeSlots.length) {
|
||||
this.skipCells[dayIndex][slotIndex + i].skip = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/** Style d'arrière-plan si un événement est présent. */
|
||||
eventStyleForCell(dayIndex, slotIndex) {
|
||||
const cellInfo = this.skipCells[dayIndex][slotIndex];
|
||||
if (!cellInfo.events.length) {
|
||||
// Pas d'événement => style neutre
|
||||
return {};
|
||||
}
|
||||
// On peut par ex. prendre la couleur du 1er événement
|
||||
const firstEvt = cellInfo.events[0];
|
||||
return {
|
||||
backgroundColor: firstEvt.color || "#cef",
|
||||
};
|
||||
},
|
||||
|
||||
/** Calcule le rowSpan d'un événement (nombre de créneaux couverts) */
|
||||
getEventRowSpan(evt, slotIndex) {
|
||||
const toMinutes = (time) => {
|
||||
const [h, m] = time.split(":").map(Number);
|
||||
return h * 60 + m;
|
||||
};
|
||||
|
||||
const evtStart = toMinutes(evt.start);
|
||||
const evtEnd = toMinutes(evt.end);
|
||||
const slotStart = toMinutes(this.timeSlots[slotIndex].start);
|
||||
|
||||
const duration = evtEnd - Math.max(evtStart, slotStart); // Durée restante à partir de ce créneau
|
||||
const slotDuration = 30; // 30 min par créneau
|
||||
|
||||
return Math.ceil(duration / slotDuration);
|
||||
},
|
||||
|
||||
/** Formatage de dates */
|
||||
formatDateShort(dateObj) {
|
||||
const dd = String(dateObj.getDate()).padStart(2, "0");
|
||||
const mm = String(dateObj.getMonth() + 1).padStart(2, "0");
|
||||
const yyyy = dateObj.getFullYear();
|
||||
return `${dd}/${mm}/${yyyy}`;
|
||||
},
|
||||
formatDDMM(dateObj) {
|
||||
const dd = String(dateObj.getDate()).padStart(2, "0");
|
||||
const mm = String(dateObj.getMonth() + 1).padStart(2, "0");
|
||||
return `${dd}/${mm}`;
|
||||
},
|
||||
weekdayLabel(dateObj) {
|
||||
const dayIndex = dateObj.getDay();
|
||||
const labels = ["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"];
|
||||
return labels[dayIndex];
|
||||
},
|
||||
|
||||
/** Navigation dans la barre de semaines */
|
||||
goToWeek(mondayDate) {
|
||||
this.currentMonday = new Date(
|
||||
mondayDate.getFullYear(),
|
||||
mondayDate.getMonth(),
|
||||
mondayDate.getDate()
|
||||
);
|
||||
},
|
||||
prevPage() {
|
||||
if (this.startIndex > 0) this.startIndex--;
|
||||
},
|
||||
nextPage() {
|
||||
if (this.startIndex + this.weeksToShow < this.allWeeks.length) {
|
||||
this.startIndex++;
|
||||
}
|
||||
},
|
||||
|
||||
/** Import de fichier ICS */
|
||||
handleFileUpload(event) {
|
||||
const file = event.target.files[0];
|
||||
if (!file) return;
|
||||
|
||||
const reader = new FileReader();
|
||||
reader.onload = (e) => {
|
||||
const content = e.target.result;
|
||||
this.parseICS(content);
|
||||
};
|
||||
reader.readAsText(file);
|
||||
},
|
||||
|
||||
/** Parse ICS simple */
|
||||
parseICS(text) {
|
||||
const lines = text.split(/\r?\n/);
|
||||
let currentEvent = null;
|
||||
const events = [];
|
||||
|
||||
for (const line of lines) {
|
||||
if (line === "BEGIN:VEVENT") {
|
||||
currentEvent = {};
|
||||
} else if (line === "END:VEVENT") {
|
||||
if (currentEvent) events.push(currentEvent);
|
||||
currentEvent = null;
|
||||
} else if (currentEvent) {
|
||||
if (line.startsWith("DTSTART")) {
|
||||
currentEvent.start = this.parseICSTime(line);
|
||||
} else if (line.startsWith("DTEND")) {
|
||||
currentEvent.end = this.parseICSTime(line);
|
||||
} else if (line.startsWith("SUMMARY")) {
|
||||
currentEvent.title = line.split(":")[1] || "Sans titre";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Transforme {start: {date, time}, end: {date, time}} en {day, start, end}
|
||||
this.events = events.map((e) => ({
|
||||
title: e.title,
|
||||
day: e.start.date,
|
||||
start: e.start.time,
|
||||
end: e.end.time,
|
||||
color: "#acf",
|
||||
}));
|
||||
},
|
||||
|
||||
/** Parse la ligne ICS pour extraire la date + heure (fuseau Europe/Paris) */
|
||||
parseICSTime(line) {
|
||||
const match = line.match(/:(\d{8})T(\d{6})Z?/);
|
||||
if (!match) return { date: "", time: "" };
|
||||
|
||||
const dateStr = match[1];
|
||||
const timeStr = match[2];
|
||||
// Date en UTC
|
||||
const utcDate = new Date(
|
||||
Date.UTC(
|
||||
parseInt(dateStr.slice(0, 4), 10),
|
||||
parseInt(dateStr.slice(4, 6), 10) - 1,
|
||||
parseInt(dateStr.slice(6, 8), 10),
|
||||
parseInt(timeStr.slice(0, 2), 10),
|
||||
parseInt(timeStr.slice(2, 4), 10),
|
||||
parseInt(timeStr.slice(4, 6), 10)
|
||||
)
|
||||
);
|
||||
// Convertit en local (Europe/Paris)
|
||||
const localDate = new Date(
|
||||
utcDate.toLocaleString("en-US", { timeZone: "Europe/Paris" })
|
||||
);
|
||||
|
||||
return {
|
||||
date: `${localDate.getFullYear()}-${String(localDate.getMonth() + 1).padStart(2, "0")}-${String(localDate.getDate()).padStart(2, "0")}`,
|
||||
time: `${String(localDate.getHours()).padStart(2, "0")}:${String(localDate.getMinutes()).padStart(2, "0")}`,
|
||||
};
|
||||
},
|
||||
},
|
||||
|
||||
/** Au montage, on initialise la liste des semaines et on construit skipCells */
|
||||
mounted() {
|
||||
this.initWeeks();
|
||||
// Force un build initial
|
||||
this.buildSkipCells();
|
||||
// Optionnel: Debug en console
|
||||
console.log("skipCells initial:", this.skipCells);
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.ade-agenda-container {
|
||||
font-family: Arial, sans-serif;
|
||||
max-width: 1200px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
/* Tableau principal */
|
||||
.ade-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
margin-bottom: 10px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* Titre de la semaine */
|
||||
.top-row .week-title {
|
||||
background-color: #cde;
|
||||
font-size: 1.1rem;
|
||||
padding: 8px;
|
||||
text-align: center;
|
||||
color: #333;
|
||||
border-bottom: 2px solid #bbb;
|
||||
}
|
||||
|
||||
/* En-têtes des jours */
|
||||
.days-row th {
|
||||
background-color: #eee;
|
||||
color: #333;
|
||||
border: 1px solid #ccc;
|
||||
padding: 4px;
|
||||
text-align: center;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.time-col-header {
|
||||
background-color: #ececec;
|
||||
font-weight: bold;
|
||||
width: 80px;
|
||||
}
|
||||
|
||||
.day-header {
|
||||
width: calc((100% - 80px) / 7);
|
||||
}
|
||||
|
||||
.day-label {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.resource-name {
|
||||
font-size: 0.85rem;
|
||||
color: #555;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
/* Corps du tableau */
|
||||
td {
|
||||
border: 1px solid #ccc;
|
||||
padding: 3px;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.time-col {
|
||||
background-color: #f8f8f8;
|
||||
text-align: center;
|
||||
font-size: 0.85rem;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.agenda-cell {
|
||||
min-height: 40px;
|
||||
background-color: transparent;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* Cartes d'événement */
|
||||
.event-card {
|
||||
margin: 2px 0;
|
||||
padding: 4px;
|
||||
border: 1px solid #999;
|
||||
border-radius: 4px;
|
||||
font-size: 0.8rem;
|
||||
background-color: #acf;
|
||||
text-align: center;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.event-title {
|
||||
font-weight: bold;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
.event-info {
|
||||
font-size: 0.75rem;
|
||||
color: #555;
|
||||
}
|
||||
|
||||
/* Barre d'onglets en bas */
|
||||
.week-tabs {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 5px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.week-tab-button {
|
||||
padding: 4px 8px;
|
||||
border: 1px solid #666;
|
||||
background-color: #eee;
|
||||
cursor: pointer;
|
||||
border-radius: 4px;
|
||||
font-size: 0.8rem;
|
||||
min-width: 60px;
|
||||
}
|
||||
.week-tab-button:hover {
|
||||
background-color: #ccc;
|
||||
}
|
||||
|
||||
.arrow-btn {
|
||||
padding: 4px 8px;
|
||||
border: 1px solid #666;
|
||||
background-color: #ddd;
|
||||
cursor: pointer;
|
||||
border-radius: 4px;
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
.arrow-btn:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
</style>
|
@ -1,5 +0,0 @@
|
||||
import { createApp } from 'vue'
|
||||
import './style.css'
|
||||
import App from './App.vue'
|
||||
|
||||
createApp(App).mount('#app')
|
@ -1,79 +0,0 @@
|
||||
:root {
|
||||
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||
line-height: 1.5;
|
||||
font-weight: 400;
|
||||
|
||||
color-scheme: light dark;
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
background-color: #242424;
|
||||
|
||||
font-synthesis: none;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
a {
|
||||
font-weight: 500;
|
||||
color: #646cff;
|
||||
text-decoration: inherit;
|
||||
}
|
||||
a:hover {
|
||||
color: #535bf2;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
display: flex;
|
||||
place-items: center;
|
||||
min-width: 320px;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 3.2em;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
button {
|
||||
border-radius: 8px;
|
||||
border: 1px solid transparent;
|
||||
padding: 0.6em 1.2em;
|
||||
font-size: 1em;
|
||||
font-weight: 500;
|
||||
font-family: inherit;
|
||||
background-color: #1a1a1a;
|
||||
cursor: pointer;
|
||||
transition: border-color 0.25s;
|
||||
}
|
||||
button:hover {
|
||||
border-color: #646cff;
|
||||
}
|
||||
button:focus,
|
||||
button:focus-visible {
|
||||
outline: 4px auto -webkit-focus-ring-color;
|
||||
}
|
||||
|
||||
.card {
|
||||
padding: 2em;
|
||||
}
|
||||
|
||||
#app {
|
||||
max-width: 1280px;
|
||||
margin: 0 auto;
|
||||
padding: 2rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: light) {
|
||||
:root {
|
||||
color: #213547;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
a:hover {
|
||||
color: #747bff;
|
||||
}
|
||||
button {
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import vue from '@vitejs/plugin-vue'
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [vue()],
|
||||
})
|
@ -1,15 +1,14 @@
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:latest
|
||||
env_file: .env
|
||||
build:
|
||||
context: postgres/
|
||||
dockerfile: Dockerfile
|
||||
container_name: MyINPulse-DB
|
||||
#ports:
|
||||
# - 5432:5432
|
||||
ports:
|
||||
- 5433:5432
|
||||
volumes:
|
||||
- ./postgres:/var/lib/postgresql/data
|
||||
environment:
|
||||
POSTGRES_DB: ${POSTGRES_DB}
|
||||
POSTGRES_USER: ${POSTGRES_USER}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||
- ./postgres/data:/var/lib/postgresql/data
|
||||
|
||||
keycloak:
|
||||
container_name: MyINPulse-keycloak
|
||||
|
22
config/backdev.env
Normal file
22
config/backdev.env
Normal file
@ -0,0 +1,22 @@
|
||||
POSTGRES_DB=postgres_db
|
||||
POSTGRES_USER=postgres
|
||||
POSTGRES_PASSWORD=postgres_db_user_password
|
||||
|
||||
KEYCLOAK_ADMIN=admin
|
||||
KEYCLOAK_ADMIN_PASSWORD=admin
|
||||
KEYCLOAK_HOSTNAME=localhost
|
||||
KEYCLOAK_DB=keycloak_db
|
||||
KEYCLOAK_USER=keycloak_db_user
|
||||
KEYCLOAK_PASSWORD=keycloak_db_user_password
|
||||
|
||||
BACKEND_DB=backend_db
|
||||
BACKEND_USER=backend_db_user
|
||||
BACKEND_PASSWORD=backend_db_user_password
|
||||
|
||||
DATABASE_URL=localhost:5433
|
||||
|
||||
VITE_KEYCLOAK_URL=http://localhost:7080
|
||||
VITE_KEYCLOAK_CLIENT_ID=myinpulse
|
||||
VITE_KEYCLOAK_REALM=test
|
||||
VITE_APP_URL=http://localhost:8080
|
||||
VITE_BACKEND_URL=http://localhost:8081/
|
@ -1,5 +0,0 @@
|
||||
VITE_KEYCLOAK_URL=http://localhost:7080
|
||||
VITE_KEYCLOAK_CLIENT_ID=myinpulse
|
||||
VITE_KEYCLOAK_REALM=test
|
||||
VITE_APP_URL=http://localhost:8080
|
||||
VITE_BACKEND_URL=http://localhost:8081/
|
@ -1,6 +0,0 @@
|
||||
POSTGRES_DB=keycloak_db
|
||||
POSTGRES_USER=keycloak_db_user
|
||||
POSTGRES_PASSWORD=keycloak_db_user_password
|
||||
KEYCLOAK_ADMIN=admin
|
||||
KEYCLOAK_ADMIN_PASSWORD=admin
|
||||
KEYCLOAK_HOSTNAME=localhost
|
52
config/dev.docker-compose.yaml
Normal file
52
config/dev.docker-compose.yaml
Normal file
@ -0,0 +1,52 @@
|
||||
services:
|
||||
postgres:
|
||||
env_file: .env
|
||||
build:
|
||||
context: postgres/
|
||||
dockerfile: Dockerfile
|
||||
container_name: MyINPulse-DB
|
||||
ports:
|
||||
- 5433:5432
|
||||
volumes:
|
||||
- ./postgres/data:/var/lib/postgresql/data
|
||||
|
||||
|
||||
keycloak:
|
||||
container_name: MyINPulse-keycloak
|
||||
build:
|
||||
context: ./keycloak
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
KC_DB: postgres
|
||||
KC_DB_URL: jdbc:postgresql://postgres/${POSTGRES_DB}
|
||||
KC_DB_USERNAME: ${POSTGRES_USER}
|
||||
KC_DB_PASSWORD: ${POSTGRES_PASSWORD}
|
||||
environment:
|
||||
KC_HOSTNAME_PORT: 7080
|
||||
KC_HOSTNAME_STRICT_BACKCHANNEL: "true"
|
||||
KC_BOOTSTRAP_ADMIN_USERNAME: ${KEYCLOAK_ADMIN}
|
||||
KC_BOOTSTRAP_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
|
||||
KC_LOG_LEVEL: info
|
||||
command: ["start-dev", "--http-port", "7080", "--https-port", "7443", "--hostname", "${KEYCLOAK_HOSTNAME}"]
|
||||
ports:
|
||||
- "7080:7080"
|
||||
- "7443:7443"
|
||||
depends_on:
|
||||
- postgres
|
||||
|
||||
#front:
|
||||
# build:
|
||||
# context: ./front/
|
||||
# dockerfile: Dockerfile
|
||||
# container_name: MyINPulse-front
|
||||
# ports:
|
||||
# - "8080:80"
|
||||
|
||||
#back:
|
||||
# build:
|
||||
# context: ./MyINPulse-back/
|
||||
# dockerfile: Dockerfile
|
||||
# container_name: MyINPulse-back
|
||||
# ports:
|
||||
# - "8081:8080"
|
||||
|
22
config/dev.env
Normal file
22
config/dev.env
Normal file
@ -0,0 +1,22 @@
|
||||
POSTGRES_DB=postgres_db
|
||||
POSTGRES_USER=postgres
|
||||
POSTGRES_PASSWORD=postgres_db_user_password
|
||||
|
||||
KEYCLOAK_ADMIN=admin
|
||||
KEYCLOAK_ADMIN_PASSWORD=admin
|
||||
KEYCLOAK_HOSTNAME=localhost
|
||||
KEYCLOAK_DB=keycloak_db
|
||||
KEYCLOAK_USER=keycloak_db_user
|
||||
KEYCLOAK_PASSWORD=keycloak_db_user_password
|
||||
|
||||
BACKEND_DB=backend_db
|
||||
BACKEND_USER=backend_db_user
|
||||
BACKEND_PASSWORD=backend_db_user_password
|
||||
|
||||
DATABASE_URL=localhost:5433
|
||||
|
||||
VITE_KEYCLOAK_URL=http://localhost:7080
|
||||
VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
|
||||
VITE_KEYCLOAK_REALM=test
|
||||
VITE_APP_URL=http://localhost:5173
|
||||
VITE_BACKEND_URL=http://localhost:8081/
|
@ -1,15 +1,15 @@
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:latest
|
||||
env_file: .env
|
||||
build:
|
||||
context: postgres/
|
||||
dockerfile: Dockerfile
|
||||
container_name: MyINPulse-DB
|
||||
#ports:
|
||||
# - 5432:5432
|
||||
volumes:
|
||||
- ./postgres:/var/lib/postgresql/data
|
||||
environment:
|
||||
POSTGRES_DB: ${POSTGRES_DB}
|
||||
POSTGRES_USER: ${POSTGRES_USER}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||
- ./postgres/data:/var/lib/postgresql/data
|
||||
|
||||
|
||||
keycloak:
|
||||
container_name: MyINPulse-keycloak
|
||||
|
22
config/frontdev.env
Normal file
22
config/frontdev.env
Normal file
@ -0,0 +1,22 @@
|
||||
POSTGRES_DB=postgres_db
|
||||
POSTGRES_USER=postgres
|
||||
POSTGRES_PASSWORD=postgres_db_user_password
|
||||
|
||||
KEYCLOAK_ADMIN=admin
|
||||
KEYCLOAK_ADMIN_PASSWORD=admin
|
||||
KEYCLOAK_HOSTNAME=localhost
|
||||
KEYCLOAK_DB=keycloak_db
|
||||
KEYCLOAK_USER=keycloak_db_user
|
||||
KEYCLOAK_PASSWORD=keycloak_db_user_password
|
||||
|
||||
BACKEND_DB=backend_db
|
||||
BACKEND_USER=backend_db_user
|
||||
BACKEND_PASSWORD=backend_db_user_password
|
||||
|
||||
DATABASE_URL=MyINPulse-DB
|
||||
|
||||
VITE_KEYCLOAK_URL=http://localhost:7080
|
||||
VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
|
||||
VITE_KEYCLOAK_REALM=test
|
||||
VITE_APP_URL=http://localhost:5173
|
||||
VITE_BACKEND_URL=http://localhost:8081/
|
@ -1,5 +0,0 @@
|
||||
VITE_KEYCLOAK_URL=http://localhost:7080
|
||||
VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
|
||||
VITE_KEYCLOAK_REALM=test
|
||||
VITE_APP_URL=http://localhost:5173
|
||||
VITE_BACKEND_URL=http://localhost:8081/
|
@ -1,6 +0,0 @@
|
||||
POSTGRES_DB=keycloak_db
|
||||
POSTGRES_USER=keycloak_db_user
|
||||
POSTGRES_PASSWORD=keycloak_db_user_password
|
||||
KEYCLOAK_ADMIN=admin
|
||||
KEYCLOAK_ADMIN_PASSWORD=admin
|
||||
KEYCLOAK_HOSTNAME=localhost
|
@ -1,11 +1,14 @@
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:latest
|
||||
env_file: .env
|
||||
build:
|
||||
context: postgres/
|
||||
dockerfile: Dockerfile
|
||||
container_name: MyINPulse-DB
|
||||
#ports:
|
||||
# - 5432:5432
|
||||
volumes:
|
||||
- ./postgres:/var/lib/postgresql/data
|
||||
- ./postgres/data:/var/lib/postgresql/data
|
||||
environment:
|
||||
POSTGRES_DB: ${POSTGRES_DB}
|
||||
POSTGRES_USER: ${POSTGRES_USER}
|
||||
@ -27,10 +30,10 @@ services:
|
||||
KC_BOOTSTRAP_ADMIN_USERNAME: ${KEYCLOAK_ADMIN}
|
||||
KC_BOOTSTRAP_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
|
||||
KC_LOG_LEVEL: info
|
||||
command: ["start-dev", "--http-port", "7080", "--https-port", "7443", "--hostname", "${KEYCLOAK_HOSTNAME}"]
|
||||
ports:
|
||||
- "7080:7080"
|
||||
- "7443:7443"
|
||||
command: ["start-dev", "--http-port", "7080", "--https-port", "7443", "--hostname", "${KEYCLOAK_HOSTNAME}"] # TODO: remove start-dev
|
||||
#ports:
|
||||
# - "7080:7080"
|
||||
# - "7443:7443"
|
||||
depends_on:
|
||||
- postgres
|
||||
|
||||
@ -47,6 +50,6 @@ services:
|
||||
context: ./MyINPulse-back/
|
||||
dockerfile: Dockerfile
|
||||
container_name: MyINPulse-back
|
||||
ports:
|
||||
- "8081:8080"
|
||||
#ports:
|
||||
# - "8081:8080"
|
||||
|
22
config/prod.env
Normal file
22
config/prod.env
Normal file
@ -0,0 +1,22 @@
|
||||
POSTGRES_DB=postgres_db
|
||||
POSTGRES_USER=postgres
|
||||
POSTGRES_PASSWORD=postgres_db_user_password
|
||||
|
||||
KEYCLOAK_ADMIN=admin
|
||||
KEYCLOAK_ADMIN_PASSWORD=admin
|
||||
KEYCLOAK_HOSTNAME=0549cd63f912d5dc9b31278d6f.eirb.fr
|
||||
KEYCLOAK_DB=keycloak_db
|
||||
KEYCLOAK_USER=keycloak_db_user
|
||||
KEYCLOAK_PASSWORD=keycloak_db_user_password
|
||||
|
||||
BACKEND_DB=backend_db
|
||||
BACKEND_USER=backend_db_user
|
||||
BACKEND_PASSWORD=backend_db_user_password
|
||||
|
||||
DATABASE_URL=MyINPulse-DB
|
||||
|
||||
VITE_KEYCLOAK_URL=https://0549cd63f912d5dc9b31278d6f.eirb.fr
|
||||
VITE_KEYCLOAK_CLIENT_ID=myinpulse-eirb
|
||||
VITE_KEYCLOAK_REALM=test
|
||||
VITE_APP_URL=https://0549cd63f912d5dc9b31278d6f.piair.dev
|
||||
VITE_BACKEND_URL=http://TODO/
|
@ -1,5 +0,0 @@
|
||||
VITE_KEYCLOAK_URL=https://0549cd63f912d5dc9b31278d6f.eirb.fr
|
||||
VITE_KEYCLOAK_CLIENT_ID=myinpulse-eirb
|
||||
VITE_KEYCLOAK_REALM=test
|
||||
VITE_APP_URL=https://0549cd63f912d5dc9b31278d6f.piair.dev
|
||||
VITE_BACKEND_URL=http://TODO/
|
@ -1,6 +0,0 @@
|
||||
POSTGRES_DB=keycloak_db
|
||||
POSTGRES_USER=keycloak_db_user
|
||||
POSTGRES_PASSWORD=keycloak_db_user_password
|
||||
KEYCLOAK_ADMIN=admin
|
||||
KEYCLOAK_ADMIN_PASSWORD=admin
|
||||
KEYCLOAK_HOSTNAME=0549cd63f912d5dc9b31278d6f.eirb.fr
|
2
front/MyINPulse-front/.gitignore
vendored
2
front/MyINPulse-front/.gitignore
vendored
@ -36,4 +36,4 @@ playwright-report/
|
||||
# Custom
|
||||
|
||||
.installed
|
||||
package-lock.json
|
||||
./package-lock.json
|
7
front/MyINPulse-front/.prettierrc
Normal file
7
front/MyINPulse-front/.prettierrc
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"useTabs":false,
|
||||
"semi":true,
|
||||
"trailingComma":"es5",
|
||||
"arrowParens":"always",
|
||||
"tabWidth":4
|
||||
}
|
29
front/MyINPulse-front/eslint.config.js
Normal file
29
front/MyINPulse-front/eslint.config.js
Normal file
@ -0,0 +1,29 @@
|
||||
import eslint from "@eslint/js";
|
||||
import eslintConfigPrettier from "eslint-config-prettier";
|
||||
import eslintPluginVue from "eslint-plugin-vue";
|
||||
import globals from "globals";
|
||||
import typescriptEslint from "typescript-eslint";
|
||||
|
||||
export default typescriptEslint.config(
|
||||
{ ignores: ["*.d.ts", "**/coverage", "**/dist"] },
|
||||
{
|
||||
extends: [
|
||||
eslint.configs.recommended,
|
||||
...typescriptEslint.configs.recommended,
|
||||
...eslintPluginVue.configs["flat/recommended"],
|
||||
],
|
||||
files: ["**/*.{ts,vue}"],
|
||||
languageOptions: {
|
||||
ecmaVersion: "latest",
|
||||
sourceType: "module",
|
||||
globals: globals.browser,
|
||||
parserOptions: {
|
||||
parser: typescriptEslint.parser,
|
||||
},
|
||||
},
|
||||
rules: {
|
||||
// your rules
|
||||
},
|
||||
},
|
||||
eslintConfigPrettier
|
||||
);
|
@ -1,10 +0,0 @@
|
||||
{
|
||||
"entrepreneurs": [
|
||||
{ "id": 1, "name": "Alice", "email": "alice@example.com" },
|
||||
{ "id": 2, "name": "Bob", "email": "bob@example.com" },
|
||||
{ "id": 3, "name": "Charlie", "email": "charlie@example.com" }
|
||||
],
|
||||
"data": [
|
||||
{ "canva_data": "this is a fake data to test api" }
|
||||
]
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
#!/usr/bin/bash
|
||||
json-server --watch db.json --port 5000
|
1397
front/MyINPulse-front/package-lock.json
generated
1397
front/MyINPulse-front/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -26,8 +26,15 @@
|
||||
"@types/node": "^22.10.7",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
"@vue/tsconfig": "^0.7.0",
|
||||
"eslint": "^9.20.0",
|
||||
"eslint-config-prettier": "^10.0.1",
|
||||
"eslint-plugin-vue": "^9.32.0",
|
||||
"globals": "^15.14.0",
|
||||
"jiti": "^2.4.2",
|
||||
"npm-run-all2": "^7.0.2",
|
||||
"prettier": "3.5.0",
|
||||
"typescript": "~5.7.3",
|
||||
"typescript-eslint": "^8.23.0",
|
||||
"vite": "^6.0.11",
|
||||
"vite-plugin-vue-devtools": "^7.7.0",
|
||||
"vue-tsc": "^2.2.0"
|
||||
|
@ -1,15 +1,47 @@
|
||||
<script setup lang="ts">
|
||||
import { RouterLink, RouterView } from 'vue-router'
|
||||
import { RouterView } from "vue-router";
|
||||
import ErrorWrapper from "@/views/errorWrapper.vue";
|
||||
import ProjectComponent from "@/components/ProjectComponent.vue";
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
<Header />
|
||||
<RouterLink to="/">Home</RouterLink> |
|
||||
<RouterLink to="/canvas">Canvas</RouterLink>
|
||||
<HeaderComponent />
|
||||
<error-wrapper></error-wrapper>
|
||||
<div id="main">
|
||||
<ProjectComponent
|
||||
v-for="(project, index) in projects"
|
||||
:key="index"
|
||||
:project-name="project.name"
|
||||
/>
|
||||
</div>
|
||||
<RouterView />
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import HeaderComponent from "@/components/HeaderComponent.vue";
|
||||
|
||||
export default {
|
||||
name: "App",
|
||||
components: {
|
||||
HeaderComponent,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
projects: [
|
||||
{
|
||||
name: "Projet Alpha",
|
||||
//link: './project-alpha.html',
|
||||
//members: ['Alice', 'Bob', 'Charlie'],
|
||||
},
|
||||
{
|
||||
name: "Projet Beta",
|
||||
//link: './project-beta.html',
|
||||
//members: ['David', 'Eve', 'Frank'],
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped></style>
|
||||
|
@ -1,75 +0,0 @@
|
||||
<template>
|
||||
<div id="agenda">
|
||||
<h3>Rendez-vous</h3>
|
||||
<table>
|
||||
<tbody>
|
||||
<tr v-for=" (p, index) in projectRDV" :key="index" >
|
||||
<td>{{ p.projectName }} </td> <td>{{ p.date }}</td> <td>{{ p.lieu }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineProps } from "vue";
|
||||
|
||||
interface rendezVous{
|
||||
projectName: String,
|
||||
date: String,
|
||||
lieu: String,
|
||||
}
|
||||
|
||||
const props = defineProps<{
|
||||
projectRDV: rendezVous[]
|
||||
}>();
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
#agenda {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
/* Table Styling */
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-family: Arial, sans-serif;
|
||||
text-align: left;
|
||||
margin-top: 20px;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* Header Row (if exists) */
|
||||
th {
|
||||
background-color: #f4f4f4;
|
||||
padding: 12px;
|
||||
font-weight: bold;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* Table Body Rows */
|
||||
tbody tr {
|
||||
border-bottom: 1px solid #ddd;
|
||||
transition: background-color 0.2s ease; /* Smooth hover effect */
|
||||
}
|
||||
|
||||
tbody tr:hover {
|
||||
background-color: #f9f9f9; /* Highlight row on hover */
|
||||
}
|
||||
|
||||
/* Cells Styling */
|
||||
td {
|
||||
padding: 10px;
|
||||
border: 1px solid #eee;
|
||||
font-size: 14px;
|
||||
vertical-align: middle; /* Align text to middle */
|
||||
}
|
||||
|
||||
/* First Column Styling */
|
||||
td:first-child {
|
||||
text-align: center;
|
||||
width: 50px; /* Adjust width as needed */
|
||||
}
|
||||
|
||||
</style>
|
@ -1,26 +1,26 @@
|
||||
<template>
|
||||
<header>
|
||||
<img src="./icons/logo inpulse.png" alt="INPulse" />
|
||||
<img src="./icons/logo inpulse.png" alt="INPulse" />
|
||||
</header>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
export default {
|
||||
name: 'Header',
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
header img {
|
||||
width: 100px;
|
||||
}
|
||||
</template>
|
||||
|
||||
header{
|
||||
<script lang="ts">
|
||||
export default {
|
||||
name: "HeaderComponent",
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
header img {
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 10px 20px;
|
||||
background-color: #fff;
|
||||
border-bottom: 2px solid #ddd;
|
||||
}
|
||||
</style>
|
||||
}
|
||||
</style>
|
@ -1,129 +0,0 @@
|
||||
<template>
|
||||
<div @click="goToLink" class="project">
|
||||
<div class="project-header">
|
||||
<h2 >{{ projectName }}</h2>
|
||||
<div class="project-buttons">
|
||||
<button class="contact-btn">Contact</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="project-body">
|
||||
<ul>
|
||||
<li v-for="(name, index) in listName" :key="index">{{ name }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineProps } from "vue";
|
||||
import { useRouter } from 'vue-router'
|
||||
|
||||
|
||||
const props = defineProps<{
|
||||
projectName: string;
|
||||
listName: string[];
|
||||
projectLink: string;
|
||||
}>();
|
||||
|
||||
const router = useRouter();
|
||||
|
||||
const goToLink = () => {
|
||||
if (props.projectLink) {
|
||||
router.push(props.projectLink);
|
||||
}
|
||||
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
<style scoped>
|
||||
.project {
|
||||
background: linear-gradient(to right, #f4f4f4, #ffffff);
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 10px;
|
||||
padding: 20px;
|
||||
margin: 20px 0;
|
||||
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
|
||||
font-family: Arial, sans-serif;
|
||||
}
|
||||
|
||||
/* Header Styling */
|
||||
.project-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.project-header h2 {
|
||||
font-size: 20px;
|
||||
color: #333;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Button Container */
|
||||
.project-buttons {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
|
||||
.info-btn {
|
||||
background-color: #4CAF50;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.info-btn:hover {
|
||||
background-color: #45a049;
|
||||
transform: scale(1.05);
|
||||
}
|
||||
|
||||
.contact-btn {
|
||||
background-color: #007BFF;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.contact-btn:hover {
|
||||
background-color: #0056b3;
|
||||
transform: scale(1.05);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.project-body {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.project-body p {
|
||||
font-size: 16px;
|
||||
color: #555;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.project-body ul {
|
||||
list-style-type: disc;
|
||||
margin: 0;
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
.project-body ul li {
|
||||
font-size: 14px;
|
||||
color: #666;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
|
||||
button {
|
||||
padding: 10px 15px;
|
||||
background-color: #007bff;
|
||||
color: white;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
border-radius: 5px;
|
||||
}
|
||||
button:hover {
|
||||
background-color: #0056b3;
|
||||
}
|
||||
|
||||
</style>
|
21
front/MyINPulse-front/src/components/ProjectComponent.vue
Normal file
21
front/MyINPulse-front/src/components/ProjectComponent.vue
Normal file
@ -0,0 +1,21 @@
|
||||
<template>
|
||||
<div class="project">
|
||||
<div class="project-header">
|
||||
<h2>{{ projectName }}</h2>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import type { PropType } from "vue";
|
||||
|
||||
export default {
|
||||
name: "ProjectComponent",
|
||||
props: {
|
||||
projectName: {
|
||||
type: Object as PropType<string>,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
@ -1,88 +0,0 @@
|
||||
<template>
|
||||
<div :class="['cell', { expanded }]"
|
||||
@click="toggleExpand"
|
||||
:style="{ justifyContent: expanded ? 'flex-start' : 'center' }"> <!-- Looking for finding a way
|
||||
to make this style in the toggleExpand event -->
|
||||
|
||||
<h3>{{ title }}</h3>
|
||||
<p>{{ currentDescription }}</p>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, defineProps, onMounted } from "vue";
|
||||
import axios from "axios";
|
||||
|
||||
const props = defineProps<{
|
||||
title: string;
|
||||
description: string;
|
||||
}>();
|
||||
|
||||
const expanded = ref(false);
|
||||
const currentDescription = ref(props.description);
|
||||
|
||||
const fetchData = async () => {
|
||||
try {
|
||||
const response = await axios.get("http://localhost:5000/data"); // Update the URL if needed
|
||||
currentDescription.value = response.data[0].canva_data;
|
||||
} catch (error) {
|
||||
console.error("Erreur lors de la récupération des données :", error);
|
||||
}
|
||||
};
|
||||
|
||||
const toggleExpand = async () => {
|
||||
if (!expanded.value) {
|
||||
await fetchData();
|
||||
} else {
|
||||
currentDescription.value = props.description;
|
||||
}
|
||||
expanded.value = !expanded.value;
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
<style scoped>
|
||||
@import "@/components/canvas/style-project.css";
|
||||
|
||||
.cell {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
text-align: center;
|
||||
transition: all 0.3s ease;
|
||||
cursor: pointer;
|
||||
box-shadow: 0 4px 5px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.cell:not(.expanded):hover {
|
||||
transform: scale(1.05);
|
||||
box-shadow: 0 8px 9px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.cell h3 {
|
||||
font-size: 20px;
|
||||
font-weight: 500;
|
||||
/*margin-bottom: 10px;*/
|
||||
}
|
||||
|
||||
.cell p {
|
||||
font-size: 14px;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.expanded {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: white;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
</style>
|
@ -1,120 +0,0 @@
|
||||
<template>
|
||||
<header>
|
||||
<img src="../icons/logo inpulse.png" alt="INPulse Logo">
|
||||
<div class="header-buttons">
|
||||
<div class="menu">
|
||||
<button class="contact-button" @click="toggleDropdown">Contact</button>
|
||||
<div class="contact-dropdown" v-bind:class="{ 'dropdown-visible': isDropdownOpen }">
|
||||
<button @click="contactAll">Contact All</button>
|
||||
<button v-for="(email, index) in entrepreneurEmails" :key="index">
|
||||
{{ email }}
|
||||
</button>
|
||||
</div>
|
||||
<button class="return-button">
|
||||
<RouterLink to="/">Return to list project</RouterLink>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
</template>
|
||||
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from "vue";
|
||||
import axios from "axios";
|
||||
|
||||
const isDropdownOpen = ref(false);
|
||||
const entrepreneurEmails = ref([]);
|
||||
|
||||
const toggleDropdown = () => {
|
||||
isDropdownOpen.value = !isDropdownOpen.value;
|
||||
console.log("Dropdown toggled:", isDropdownOpen.value); // for debug purposes
|
||||
};
|
||||
|
||||
const fetchEntrepreneurs = async () => {
|
||||
try {
|
||||
const response = await axios.get("http://localhost:5000/entrepreneurs");
|
||||
entrepreneurEmails.value = response.data.map(e => e.email);
|
||||
} catch (error) {
|
||||
console.error("Erreur lors de la récupération des entrepreneurs:", error);
|
||||
}
|
||||
};
|
||||
|
||||
const contactAll = () => {
|
||||
alert("Contacter tous les entrepreneurs : " + entrepreneurEmails.value.join(", "));
|
||||
};
|
||||
|
||||
onMounted(fetchEntrepreneurs);
|
||||
</script>
|
||||
|
||||
|
||||
<style scoped>
|
||||
@import "@/components/canvas/style-project.css";
|
||||
|
||||
header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.header-buttons {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.menu {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.contact-button, .return-button {
|
||||
background-color: #000;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 10px;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.return-button a {
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.contact-dropdown {
|
||||
display: none;
|
||||
position: absolute;
|
||||
background-color: white;
|
||||
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2);
|
||||
border-radius: 8px;
|
||||
padding: 10px;
|
||||
margin-top: 5px;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.contact-dropdown button {
|
||||
display: block;
|
||||
width: 100%;
|
||||
padding: 5px;
|
||||
text-align: left;
|
||||
border: none;
|
||||
background: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.contact-dropdown button:hover {
|
||||
background-color: #f0f0f0;
|
||||
}
|
||||
|
||||
.dropdown-visible {
|
||||
display: block;
|
||||
}
|
||||
|
||||
header img {
|
||||
width: 100px;
|
||||
height: auto;
|
||||
}
|
||||
</style>
|
@ -1,56 +0,0 @@
|
||||
<template>
|
||||
<div class="canvas">
|
||||
<CanvasItem
|
||||
v-for="(item, index) in items"
|
||||
:key="index"
|
||||
:title="item.title"
|
||||
:description="item.description"
|
||||
:class="item.class"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from "vue";
|
||||
import CanvasItem from "@/components/canvas/CanvasItem.vue";
|
||||
|
||||
const items = ref([
|
||||
{ title: "1. Problème", description: "3 problèmes essentiels à résoudre pour le client", class: "Probleme" },
|
||||
{ title: "2. Segments", description: "Les segments de clientèle visés", class: "Segments" },
|
||||
{ title: "3. Valeur", description: "La proposition de valeur", class: "Valeur" },
|
||||
{ title: "4. Solution", description: "Les solutions proposées", class: "Solution" },
|
||||
{ title: "5. Avantage", description: "Les avantages concurrentiels", class: "Avantage" },
|
||||
{ title: "6. Canaux", description: "Les canaux de distribution", class: "Canaux" },
|
||||
{ title: "7. Indicateurs", description: "Les indicateurs clés de performance", class: "Indicateurs" },
|
||||
{ title: "8. Coûts", description: "Les coûts associés", class: "Couts" },
|
||||
{ title: "9. Revenus", description: "Les sources de revenus", class: "Revenus" }
|
||||
]);
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
@import "@/components/canvas/style-project.css";
|
||||
|
||||
.canvas {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(10, 1fr);
|
||||
grid-template-rows: repeat(6, 1fr);
|
||||
gap: 10px;
|
||||
padding: 10px;
|
||||
max-width: 1200px;
|
||||
margin: 20px auto;
|
||||
background-color: #fff;
|
||||
position: relative;
|
||||
height: 80vh;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.Probleme { grid-column: 1 / 3; grid-row: 1 / 5; }
|
||||
.Segments { grid-column: 9 / 11; grid-row: 1 / 5; }
|
||||
.Valeur { grid-column: 5 / 7; grid-row: 1 / 5; }
|
||||
.Solution { grid-column: 3 / 5; grid-row: 1 / 3; }
|
||||
.Avantage { grid-column: 7 / 9; grid-row: 1 / 3; }
|
||||
.Canaux { grid-column: 7 / 9; grid-row: 3 / 5; }
|
||||
.Indicateurs { grid-column: 3 / 5; grid-row: 3 / 5; }
|
||||
.Couts { grid-column: 1 / 6; grid-row: 5 / 7; }
|
||||
.Revenus { grid-column: 6 / 11; grid-row: 5 / 7; }
|
||||
</style>
|
@ -1,156 +0,0 @@
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
margin: 0;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.cell {
|
||||
flex: 1;
|
||||
border: 1px solid #ddd;
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
.produit {
|
||||
background-color: #f9e4e4;
|
||||
}
|
||||
|
||||
.marche {
|
||||
background-color: #e4f1f9;
|
||||
}
|
||||
|
||||
.valeur {
|
||||
background-color: #f9f4e4;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin: 0;
|
||||
font-size: 18px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 5px 0 0;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
|
||||
h1 img {
|
||||
height: 80px;
|
||||
margin: 40px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#ade {
|
||||
max-width: 1200px;
|
||||
margin: 20px auto;
|
||||
padding: 20px;
|
||||
text-align: center;
|
||||
background-color: #e8f5e9;
|
||||
border: 2px solid #4caf50;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#ade h3 {
|
||||
color: #2e7d32;
|
||||
}
|
||||
|
||||
#ade p {
|
||||
margin: 10px 0;
|
||||
font-size: 16px;
|
||||
color: #333;
|
||||
}
|
||||
header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 10px 20px;
|
||||
background-color: #fff;
|
||||
border-bottom: 2px solid #ddd;
|
||||
}
|
||||
|
||||
header img {
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
header .contact-menu {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.contact-button, .return {
|
||||
padding: 10px 15px;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
background-color: #2196f3;
|
||||
color: #fff;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.contact-button:hover, .return:hover {
|
||||
background-color: #1976d2;
|
||||
}
|
||||
|
||||
/* Dropdown styling */
|
||||
.contact-dropdown {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 50px;
|
||||
display: none;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
padding: 15px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.contact-dropdown button {
|
||||
padding: 8px 12px;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
background-color: #4caf50;
|
||||
color: #fff;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.contact-dropdown button:hover {
|
||||
background-color: #388e3c;
|
||||
}
|
||||
|
||||
.return {
|
||||
background-color: #f44336;
|
||||
}
|
||||
|
||||
.return:hover {
|
||||
background-color: #d32f2f;
|
||||
}
|
||||
|
||||
.header-buttons {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 15px;
|
||||
}
|
||||
|
||||
|
||||
a{
|
||||
color: white;
|
||||
}
|
@ -1,17 +1,43 @@
|
||||
<script setup lang="ts">
|
||||
const props = defineProps(['data']);
|
||||
import { color } from "@/services/popupDisplayer.ts";
|
||||
import type { PropType } from "vue";
|
||||
|
||||
defineProps({
|
||||
errorMessage: {
|
||||
type: Object as PropType<string>,
|
||||
required: true,
|
||||
},
|
||||
errorColor: {
|
||||
type: Object as PropType<color>,
|
||||
default: color.Red,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div :class='["red", "yellow", "blue", "green"][data.type]' class="error-modal">
|
||||
<p>{{["Erreur :(", "Warning :|", "Info :)", "Succes ;)"][data.type]}}</p>
|
||||
<p>{{data.errorMessage}}</p>
|
||||
<div class="loading" :class='["red-loader", "yellow-loader", "blue-loader", "green-loader"][data.type]'></div>
|
||||
</div>
|
||||
<div
|
||||
:class="['red', 'yellow', 'blue', 'green'][errorColor]"
|
||||
class="error-modal"
|
||||
>
|
||||
<p>
|
||||
{{
|
||||
["Erreur :(", "Warning :|", "Info :)", "Succes ;)"][errorColor]
|
||||
}}
|
||||
</p>
|
||||
<p>{{ errorMessage }}</p>
|
||||
<div
|
||||
class="loading"
|
||||
:class="
|
||||
['red-loader', 'yellow-loader', 'blue-loader', 'green-loader'][
|
||||
errorColor
|
||||
]
|
||||
"
|
||||
></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.error-modal{
|
||||
.error-modal {
|
||||
margin-bottom: 1em;
|
||||
padding: 1em;
|
||||
border-radius: 1em;
|
||||
@ -19,41 +45,45 @@ const props = defineProps(['data']);
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
animation: disappear 5s linear forwards;
|
||||
}
|
||||
}
|
||||
|
||||
.red{
|
||||
.red {
|
||||
background-color: #ee6055;
|
||||
color: white;
|
||||
}
|
||||
.red-loader {
|
||||
}
|
||||
|
||||
.red-loader {
|
||||
background-color: #fa8383;
|
||||
}
|
||||
}
|
||||
|
||||
.yellow{
|
||||
background-color: #FF9D23;
|
||||
color: white;
|
||||
}
|
||||
.yellow-loader{
|
||||
.yellow {
|
||||
background-color: #ff9d23;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.yellow-loader {
|
||||
background-color: #ffbf81;
|
||||
}
|
||||
}
|
||||
|
||||
.blue {
|
||||
.blue {
|
||||
background-color: #809bce;
|
||||
color: white;
|
||||
}
|
||||
.blue-loader{
|
||||
background-color: #95b8d1;
|
||||
}
|
||||
}
|
||||
|
||||
.green {
|
||||
.blue-loader {
|
||||
background-color: #95b8d1;
|
||||
}
|
||||
|
||||
.green {
|
||||
background-color: green;
|
||||
color: white;
|
||||
}
|
||||
.green-loader {
|
||||
background-color: darkgreen;
|
||||
}
|
||||
}
|
||||
|
||||
.loading {
|
||||
.green-loader {
|
||||
background-color: darkgreen;
|
||||
}
|
||||
|
||||
.loading {
|
||||
box-sizing: border-box;
|
||||
position: absolute;
|
||||
padding: 0;
|
||||
@ -62,33 +92,33 @@ const props = defineProps(['data']);
|
||||
height: 1em;
|
||||
width: 0;
|
||||
animation: loading 4s linear forwards;
|
||||
}
|
||||
}
|
||||
|
||||
/* Animation for the loading bar */
|
||||
@keyframes loading {
|
||||
/* Animation for the loading bar */
|
||||
@keyframes loading {
|
||||
0% {
|
||||
width: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
100% {
|
||||
width: 0;
|
||||
width: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes disappear {
|
||||
@keyframes disappear {
|
||||
0% {
|
||||
height: 100px;
|
||||
padding: 1em;
|
||||
margin: 1em;
|
||||
height: 100px;
|
||||
padding: 1em;
|
||||
margin: 1em;
|
||||
}
|
||||
80% {
|
||||
height: 100px;
|
||||
padding: 1em;
|
||||
margin: 1em;
|
||||
height: 100px;
|
||||
padding: 1em;
|
||||
margin: 1em;
|
||||
}
|
||||
100% {
|
||||
height: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
height: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
}
|
||||
</style>
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 5.1 KiB |
18
front/MyINPulse-front/src/components/temp-modal.vue
Normal file
18
front/MyINPulse-front/src/components/temp-modal.vue
Normal file
@ -0,0 +1,18 @@
|
||||
<script setup lang="ts">
|
||||
import { addNewMessage } from "@/services/popupDisplayer.ts";
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<button
|
||||
@click="
|
||||
addNewMessage(
|
||||
'new error from another view',
|
||||
Math.floor(Math.random() * 4)
|
||||
)
|
||||
"
|
||||
>
|
||||
Add an error
|
||||
</button>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
@ -1,77 +1,31 @@
|
||||
import { createApp } from 'vue'
|
||||
import App from './App.vue'
|
||||
import router from './router/router.ts'
|
||||
import {createPinia} from "pinia";
|
||||
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
|
||||
import AuthStorePlugin from './plugins/authStore';
|
||||
import keycloakService from './services/keycloak';
|
||||
import {useAuthStore} from "@/stores/authStore.ts";
|
||||
let store: any;
|
||||
import { createApp } from "vue";
|
||||
import App from "./App.vue";
|
||||
import router from "./router/router.ts";
|
||||
import { createPinia } from "pinia";
|
||||
import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
|
||||
import keycloakService from "./services/keycloak";
|
||||
import { type AuthStore, useAuthStore } from "@/stores/authStore.ts";
|
||||
|
||||
let store: AuthStore;
|
||||
|
||||
keycloakService.CallInit(() => {
|
||||
try {
|
||||
const app = createApp(App)
|
||||
const app = createApp(App);
|
||||
|
||||
// Setup pinia store, allowing user to keep logged in status after refresh
|
||||
const pinia = createPinia();
|
||||
pinia.use(piniaPluginPersistedstate);
|
||||
app.use(pinia);
|
||||
app.use(AuthStorePlugin, { pinia });
|
||||
store = useAuthStore();
|
||||
app.use(router)
|
||||
keycloakService.CallInitStore(store);
|
||||
app.use(router);
|
||||
|
||||
app.mount('#app');
|
||||
app.mount("#app");
|
||||
} catch (e) {
|
||||
console.error("Error while initiating Keycloak.")
|
||||
console.error(e)
|
||||
createApp(App).mount('#app');
|
||||
console.error("Error while initiating Keycloak.");
|
||||
console.error(e);
|
||||
createApp(App).mount("#app");
|
||||
}
|
||||
});
|
||||
|
||||
})
|
||||
|
||||
// this shit made by me so i can run the canva vue app
|
||||
createApp(App).use(router).mount('#app');
|
||||
|
||||
// TODO: fix the comment
|
||||
/*
|
||||
function tokenInterceptor () {
|
||||
axios.interceptors.request.use(config => {
|
||||
const keycloak = useKeycloak()
|
||||
if (keycloak.authenticated) {
|
||||
// Note that this is a simple example.
|
||||
// you should be careful not to leak tokens to third parties.
|
||||
// in this example the token is added to all usage of axios.
|
||||
config.headers.Authorization = `Bearer ${keycloak.token}`
|
||||
}
|
||||
return config
|
||||
}, error => {
|
||||
console.error("tokenInterceptor: Rejected")
|
||||
return Promise.reject(error)
|
||||
})
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
app.use(VueKeyCloak,{
|
||||
onReady: (keycloak) => {
|
||||
console.log("Ready !")
|
||||
tokenInterceptor()
|
||||
},
|
||||
init: {
|
||||
onLoad: 'login-required',
|
||||
checkLoginIframe: false,
|
||||
|
||||
},
|
||||
|
||||
config: {
|
||||
realm: 'test',
|
||||
url: 'http://localhost:7080',
|
||||
clientId: 'myinpulse'
|
||||
}
|
||||
} );
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
export {store};
|
||||
export { store };
|
||||
|
@ -1,14 +0,0 @@
|
||||
// file: src/plugins/authStore.js
|
||||
|
||||
import { useAuthStore } from "@/stores/authStore.ts";
|
||||
import keycloakService from '@/services/keycloak';
|
||||
// Setup auth store as a plugin so it can be accessed globally in our FE
|
||||
const authStorePlugin = {
|
||||
install(app: any, option: any) {
|
||||
const store = useAuthStore(option.pinia);
|
||||
app.config.globalProperties.$store = store;
|
||||
keycloakService.CallInitStore(store);
|
||||
}
|
||||
}
|
||||
|
||||
export default authStorePlugin;
|
@ -1,30 +1,17 @@
|
||||
import { createRouter, createWebHistory } from 'vue-router'
|
||||
import { createRouter, createWebHistory } from "vue-router";
|
||||
|
||||
const router = createRouter({
|
||||
history: createWebHistory(import.meta.env.BASE_URL),
|
||||
routes: [
|
||||
{
|
||||
path: '/test',
|
||||
name: 'test',
|
||||
// route level code-splitting
|
||||
// this generates a separate chunk (About.[hash].js) for this route
|
||||
// which is lazy-loaded when the route is visited.
|
||||
component: () => import('../views/test.vue'),
|
||||
},
|
||||
history: createWebHistory(import.meta.env.BASE_URL),
|
||||
routes: [
|
||||
{
|
||||
path: "/test",
|
||||
name: "test",
|
||||
// route level code-splitting
|
||||
// this generates a separate chunk (About.[hash].js) for this route
|
||||
// which is lazy-loaded when the route is visited.
|
||||
component: () => import("../views/testComponent.vue"),
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
{
|
||||
path: '/',
|
||||
name: 'Admin-main',
|
||||
component: () => import('../views/AdminMain.vue'),
|
||||
},
|
||||
|
||||
// route pour les canvas (made by adnane), in fact the two vue apps are separated for now
|
||||
{
|
||||
path: '/canvas',
|
||||
name: 'canvas',
|
||||
component: () => import('../views/CanvasView.vue'),
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
export default router
|
||||
export default router;
|
||||
|
@ -1,31 +1,37 @@
|
||||
import axios from "axios";
|
||||
import {store} from "@/main.ts";
|
||||
import {addNewMessage, color} from "@/services/popupDisplayer.ts";
|
||||
import axios, { type AxiosError, type AxiosResponse } from "axios";
|
||||
import { store } from "@/main.ts";
|
||||
import { addNewMessage, color } from "@/services/popupDisplayer.ts";
|
||||
|
||||
const axiosInstance = axios.create({
|
||||
baseURL: import.meta.env.VITE_BACKEND_URL,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
});
|
||||
|
||||
axiosInstance.interceptors.response.use(
|
||||
response => response, // Directly return successful responses.
|
||||
async error => {
|
||||
(response) => response, // Directly return successful responses.
|
||||
async (error) => {
|
||||
const originalRequest = error.config;
|
||||
if (error.response.status === 401 && !originalRequest._retry && store.authenticated) {
|
||||
if (
|
||||
((error.response && error.response.status === 401) ||
|
||||
error.code == "ERR_NETWORK") &&
|
||||
!originalRequest._retry &&
|
||||
store.authenticated
|
||||
) {
|
||||
originalRequest._retry = true; // Mark the request as retried to avoid infinite loops.
|
||||
try {
|
||||
await store.refreshUserToken();
|
||||
// Update the authorization header with the new access token.
|
||||
axiosInstance.defaults.headers.common['Authorization'] = `Bearer ${store.user.token}`;
|
||||
axiosInstance.defaults.headers.common["Authorization"] =
|
||||
`Bearer ${store.user.token}`;
|
||||
return axiosInstance(originalRequest); // Retry the original request with the new access token.
|
||||
} catch (refreshError) {
|
||||
// Handle refresh token errors by clearing stored tokens and redirecting to the login page.
|
||||
console.error('Token refresh failed:', refreshError);
|
||||
localStorage.removeItem('accessToken');
|
||||
localStorage.removeItem('refreshToken');
|
||||
window.location.href = '/login';
|
||||
console.error("Token refresh failed:", refreshError);
|
||||
localStorage.removeItem("accessToken");
|
||||
localStorage.removeItem("refreshToken");
|
||||
window.location.href = "/login";
|
||||
return Promise.reject(refreshError);
|
||||
}
|
||||
}
|
||||
@ -34,23 +40,29 @@ axiosInstance.interceptors.response.use(
|
||||
);
|
||||
|
||||
// TODO: spawn a error modal
|
||||
function defaultApiErrorHandler(err: string){
|
||||
addNewMessage(err, color.Red);
|
||||
function defaultApiErrorHandler(err: AxiosError) {
|
||||
addNewMessage(err.message, color.Red);
|
||||
}
|
||||
|
||||
function defaultApiSuccessHandler(response: any){
|
||||
addNewMessage(response.data, color.green)
|
||||
}
|
||||
function callApi(endpoint: string, onSuccessHandler?: any, onErrorHandler?: any): void {
|
||||
axiosInstance.get(endpoint).then(
|
||||
onSuccessHandler == null ? defaultApiSuccessHandler : onSuccessHandler
|
||||
).catch(
|
||||
(err) => {
|
||||
onErrorHandler == null ? defaultApiErrorHandler(err): onErrorHandler(err);
|
||||
throw err;
|
||||
}
|
||||
)
|
||||
function defaultApiSuccessHandler(response: AxiosResponse) {
|
||||
addNewMessage(response.data, color.Green);
|
||||
}
|
||||
|
||||
function callApi(
|
||||
endpoint: string,
|
||||
onSuccessHandler?: (response: AxiosResponse) => void,
|
||||
onErrorHandler?: (error: AxiosError) => void
|
||||
): void {
|
||||
axiosInstance
|
||||
.get(endpoint)
|
||||
.then(
|
||||
onSuccessHandler == null
|
||||
? defaultApiSuccessHandler
|
||||
: onSuccessHandler
|
||||
)
|
||||
.catch(
|
||||
onErrorHandler == null ? defaultApiErrorHandler : onErrorHandler
|
||||
);
|
||||
}
|
||||
|
||||
export {callApi}
|
||||
export { callApi };
|
||||
|
@ -1,33 +1,31 @@
|
||||
import Keycloak from 'keycloak-js';
|
||||
import Keycloak from "keycloak-js";
|
||||
import type { AuthStore } from "@/stores/authStore.ts";
|
||||
|
||||
const options = {
|
||||
url: import.meta.env.VITE_KEYCLOAK_URL,
|
||||
clientId: import.meta.env.VITE_KEYCLOAK_CLIENT_ID,
|
||||
realm: import.meta.env.VITE_KEYCLOAK_REALM
|
||||
}
|
||||
|
||||
realm: import.meta.env.VITE_KEYCLOAK_REALM,
|
||||
};
|
||||
|
||||
const keycloak = new Keycloak(options);
|
||||
let authenticated: boolean | undefined;
|
||||
let store = null;
|
||||
|
||||
async function login(){
|
||||
async function login() {
|
||||
try {
|
||||
await keycloak.login() // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
|
||||
await keycloak.login(); // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
|
||||
return keycloak;
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
console.log(error);
|
||||
}
|
||||
}
|
||||
|
||||
async function signup(){
|
||||
async function signup() {
|
||||
try {
|
||||
await keycloak.login(
|
||||
{action: "register"}
|
||||
) // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
|
||||
await keycloak.login({ action: "register" }); // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
|
||||
return keycloak;
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
console.log(error);
|
||||
}
|
||||
}
|
||||
|
||||
@ -42,31 +40,33 @@ async function init(onInitCallback: () => void) {
|
||||
onLoad: "check-sso",
|
||||
silentCheckSsoRedirectUri: `${location.origin}/silent-check-sso.htm`,
|
||||
responseMode: "query",
|
||||
})
|
||||
onInitCallback()
|
||||
});
|
||||
onInitCallback();
|
||||
} catch (error) {
|
||||
console.error("Keycloak init failed")
|
||||
console.error(error)
|
||||
console.error("Keycloak init failed");
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes store with Keycloak user data
|
||||
*
|
||||
*/
|
||||
async function initStore(storeInstance: any) {
|
||||
async function initStore(storeInstance: AuthStore) {
|
||||
try {
|
||||
store = storeInstance
|
||||
console.log(keycloak)
|
||||
await store.initOauth(keycloak)
|
||||
store = storeInstance;
|
||||
console.log(keycloak);
|
||||
await store.initOauth(keycloak);
|
||||
|
||||
// Show alert if user is not authenticated
|
||||
if (!authenticated) { console.warn("not authenticated") }
|
||||
if (!authenticated) {
|
||||
console.warn("not authenticated");
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Keycloak init failed")
|
||||
console.error(error)
|
||||
console.error("Keycloak init failed");
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Logout user
|
||||
@ -83,7 +83,7 @@ async function refreshToken() {
|
||||
await keycloak.updateToken(480);
|
||||
return keycloak;
|
||||
} catch (error) {
|
||||
console.error('Failed to refresh token');
|
||||
console.error("Failed to refresh token");
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
@ -97,4 +97,4 @@ const KeycloakService = {
|
||||
callSignup: signup,
|
||||
};
|
||||
|
||||
export default KeycloakService;
|
||||
export default KeycloakService;
|
||||
|
@ -1,19 +1,43 @@
|
||||
import {ref} from "vue";
|
||||
enum color {Red, Yellow, Blue, green}
|
||||
import { ref, type Ref } from "vue";
|
||||
|
||||
function addNewMessage(errorMessage: string, type?: color, timeout?: number){
|
||||
if (timeout == null){
|
||||
enum color {
|
||||
Red,
|
||||
Yellow,
|
||||
Blue,
|
||||
Green,
|
||||
}
|
||||
|
||||
type ErrorMessageContent = {
|
||||
message: string;
|
||||
color: color;
|
||||
id: number;
|
||||
timeout: number;
|
||||
};
|
||||
|
||||
let id: number = 0;
|
||||
const getId = () => {
|
||||
id = id + 1;
|
||||
return id;
|
||||
};
|
||||
|
||||
function addNewMessage(errorMessage: string, type?: color, timeout?: number) {
|
||||
if (timeout == null) {
|
||||
timeout = 5000;
|
||||
}
|
||||
if (type == null){
|
||||
if (type == null) {
|
||||
type = color.Red;
|
||||
}
|
||||
|
||||
const data = {errorMessage: errorMessage, timeout: timeout, type: type, uid: Math.random()*100000};
|
||||
errorList.value.push(data)
|
||||
setTimeout(() => errorList.value.slice(0, 1), timeout)
|
||||
const data: ErrorMessageContent = {
|
||||
message: errorMessage,
|
||||
timeout: timeout,
|
||||
color: type,
|
||||
id: getId(),
|
||||
};
|
||||
errorList.value.push(data);
|
||||
setTimeout(() => errorList.value.slice(0, 1), timeout);
|
||||
}
|
||||
|
||||
const errorList: any= ref([])
|
||||
const errorList: Ref<ErrorMessageContent[]> = ref([]);
|
||||
|
||||
export {addNewMessage, errorList, color}
|
||||
export { addNewMessage, errorList, color, type ErrorMessageContent };
|
||||
|
@ -1,54 +1,61 @@
|
||||
import { defineStore } from "pinia";
|
||||
import keycloakService from '@/services/keycloak';
|
||||
import keycloakService from "@/services/keycloak";
|
||||
import type Keycloak from "keycloak-js";
|
||||
export const useAuthStore = defineStore("storeAuth", {
|
||||
|
||||
const useAuthStore = defineStore("storeAuth", {
|
||||
state: () => {
|
||||
return {
|
||||
testv: true,
|
||||
authenticated: false,
|
||||
user: {
|
||||
token: "",
|
||||
refreshToken: "",
|
||||
username: "",
|
||||
},
|
||||
}
|
||||
};
|
||||
},
|
||||
persist: true,
|
||||
getters: {},
|
||||
actions: {
|
||||
// Initialize Keycloak OAuth
|
||||
async initOauth(keycloak: Keycloak, clearData = true) {
|
||||
if(clearData) { await this.clearUserData(); }
|
||||
if (clearData) {
|
||||
await this.clearUserData();
|
||||
}
|
||||
|
||||
this.authenticated = !!keycloak.authenticated; // the !! removes undefined
|
||||
if (this.authenticated && keycloak.token && keycloak.idTokenParsed && keycloak.refreshToken){
|
||||
if (
|
||||
this.authenticated &&
|
||||
keycloak.token &&
|
||||
keycloak.idTokenParsed &&
|
||||
keycloak.refreshToken
|
||||
) {
|
||||
this.user.username = keycloak.idTokenParsed.given_name;
|
||||
this.user.token = keycloak.token;
|
||||
this.user.refreshToken = keycloak.refreshToken;
|
||||
}
|
||||
},
|
||||
async login(){
|
||||
async login() {
|
||||
try {
|
||||
const keycloak = await keycloakService.callLogin();
|
||||
if (keycloak)
|
||||
await this.initOauth(keycloak);
|
||||
if (keycloak) await this.initOauth(keycloak);
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
console.log(error);
|
||||
}
|
||||
},
|
||||
async signup() {
|
||||
try {
|
||||
const keycloak = await keycloakService.callSignup();
|
||||
if (keycloak)
|
||||
await this.initOauth(keycloak);
|
||||
if (keycloak) await this.initOauth(keycloak);
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
console.log(error);
|
||||
}
|
||||
},
|
||||
// Logout user
|
||||
async logout() {
|
||||
try {
|
||||
await keycloakService.CallLogout(import.meta.env.VITE_APP_URL + "/test");
|
||||
await keycloakService.CallLogout(
|
||||
import.meta.env.VITE_APP_URL + "/test"
|
||||
);
|
||||
await this.clearUserData();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
@ -58,23 +65,23 @@ export const useAuthStore = defineStore("storeAuth", {
|
||||
async refreshUserToken() {
|
||||
try {
|
||||
const keycloak = await keycloakService.CallTokenRefresh();
|
||||
if (keycloak)
|
||||
await this.initOauth(keycloak, false);
|
||||
if (keycloak) await this.initOauth(keycloak, false);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
},
|
||||
test() {
|
||||
this.testv = !this.testv;
|
||||
},
|
||||
// Clear user's store data
|
||||
clearUserData() {
|
||||
this.authenticated = false;
|
||||
this.user = {
|
||||
token: "",
|
||||
refreshToken: "",
|
||||
username: "",
|
||||
refreshToken: "",
|
||||
username: "",
|
||||
};
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
type AuthStore = ReturnType<typeof useAuthStore>;
|
||||
|
||||
export { useAuthStore, type AuthStore };
|
||||
|
@ -1,15 +0,0 @@
|
||||
<template>
|
||||
<div class="about">
|
||||
<h1>This is an about page</h1>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style>
|
||||
@media (min-width: 1024px) {
|
||||
.about {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
</style>
|
@ -1,68 +0,0 @@
|
||||
<template>
|
||||
<Header />
|
||||
<error-wrapper></error-wrapper>
|
||||
<div id="container">
|
||||
<div id="main">
|
||||
<ProjectComp
|
||||
v-for="(project, index) in projects"
|
||||
:key="index"
|
||||
:projectName="project.name"
|
||||
:listName="project.members"
|
||||
:projectLink="project.link"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Agenda :projectRDV="rendezVous" />
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import Header from '../components/Header.vue';
|
||||
import Agenda from "../components/Agenda.vue"
|
||||
import ProjectComp from '../components/Project-comp.vue';
|
||||
|
||||
import { ref } from "vue";
|
||||
|
||||
const projects = ref([
|
||||
{
|
||||
name: "Projet Alpha",
|
||||
link: "/canvas", // to test
|
||||
members: ["Alice", "Bob", "Charlie"],
|
||||
},
|
||||
{
|
||||
name: "Projet Beta",
|
||||
link: "./canvas", // to test
|
||||
members: ["David", "Eve", "Frank"],
|
||||
},
|
||||
]);
|
||||
|
||||
const rendezVous = ref([
|
||||
{ projectName: "Projet Alpha", date: "2025-03-10", lieu: "P106" },
|
||||
{ projectName: "Projet Beta", date: "2025-04-15", lieu: "Td10" },
|
||||
]);
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
#container {
|
||||
margin: 0;
|
||||
display: grid;
|
||||
grid-template-columns: 3fr 1fr; /* Main body takes 3/4, agenda 1/4 */
|
||||
height: 100vh; /* Full viewport height */
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 10px 15px;
|
||||
background-color: #007bff;
|
||||
color: white;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
border-radius: 5px;
|
||||
}
|
||||
button:hover {
|
||||
background-color: #0056b3;
|
||||
}
|
||||
|
||||
</style>
|
@ -1,17 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<header>
|
||||
<HeaderCanvas />
|
||||
</header>
|
||||
</div>
|
||||
<div>
|
||||
<h1>Page Canvas</h1>
|
||||
<LeanCanvas />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import HeaderCanvas from '../components/canvas/HeaderCanvas.vue';
|
||||
import LeanCanvas from '../components/canvas/LeanCanvas.vue';
|
||||
</script>
|
||||
|
@ -1,22 +1,25 @@
|
||||
<script setup lang="ts">
|
||||
|
||||
import {errorList} from "@/services/popupDisplayer.ts";
|
||||
import { errorList } from "@/services/popupDisplayer.ts";
|
||||
import ErrorModal from "@/components/errorModal.vue";
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="error-wrapper">
|
||||
<error-modal v-for="elm in errorList" :data=elm></error-modal>
|
||||
</div>
|
||||
<div class="error-wrapper">
|
||||
<error-modal
|
||||
v-for="elm in errorList"
|
||||
:key="elm.id"
|
||||
:error-message="elm.message"
|
||||
:error-color="elm.color"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.error-wrapper{
|
||||
position: absolute;
|
||||
left: 70%;
|
||||
//background-color: blue;
|
||||
height: 100%;
|
||||
width: 30%;
|
||||
|
||||
.error-wrapper {
|
||||
position: absolute;
|
||||
left: 70%;
|
||||
//background-color: blue;
|
||||
height: 100%;
|
||||
width: 30%;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
@ -1,75 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
import {store} from "../main.ts";
|
||||
import {callApi} from "@/services/api.ts";
|
||||
import ErrorModal from "@/components/errorModal.vue";
|
||||
import {errorList} from "@/services/popupDisplayer.ts";
|
||||
//import TempModal from "@/components/temp-modal.vue";
|
||||
import ErrorWrapper from "@/App.vue";
|
||||
function addResToTable(id: any){
|
||||
return (req: any) => {
|
||||
console.log(req)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<h1>Test page</h1>
|
||||
<table class="test" style="width:100%">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Is Currently Authenticated ? </td>
|
||||
<td>{{store.authenticated}}</td>
|
||||
<td><button @click="store.login">Login</button></td>
|
||||
<td><button @click="store.logout">Logout</button></td>
|
||||
<td><button @click="store.signup">Signup</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>current token</td>
|
||||
<td>{{store.user.token}}</td>
|
||||
<td><button @click="store.refreshUserToken">Refresh</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Current refresh token</td>
|
||||
<td>{{store.user.refreshToken}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Entrepreneur API call</td>
|
||||
<td><button @click="callApi('random')">call</button></td>
|
||||
<td>res</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Admin API call</td>
|
||||
<td><button @click="callApi('random2')">call</button></td>
|
||||
<td>res</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Unauth API call</td>
|
||||
<td><button @click="callApi('random3')">call</button></td>
|
||||
<td>res</td>
|
||||
<td id="3"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<temp-modal></temp-modal>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
table {
|
||||
width: 100px;
|
||||
table-layout: fixed
|
||||
}
|
||||
tr {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
td {
|
||||
border: solid 1px black;
|
||||
width: 20%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
90
front/MyINPulse-front/src/views/testComponent.vue
Normal file
90
front/MyINPulse-front/src/views/testComponent.vue
Normal file
@ -0,0 +1,90 @@
|
||||
<script lang="ts" setup>
|
||||
import { store } from "../main.ts";
|
||||
import { callApi } from "@/services/api.ts";
|
||||
import { ref } from "vue";
|
||||
|
||||
const CustomRequest = ref("");
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<h1>Test page</h1>
|
||||
<table class="test" style="width: 100%">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Is Currently Authenticated ?</td>
|
||||
<td>{{ store.authenticated }}</td>
|
||||
<td>
|
||||
<button @click="store.login">Login</button>
|
||||
</td>
|
||||
<td>
|
||||
<button @click="store.logout">Logout</button>
|
||||
</td>
|
||||
<td>
|
||||
<button @click="store.signup">Signup</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>current token</td>
|
||||
<td>{{ store.user.token }}</td>
|
||||
<td>
|
||||
<button @click="store.refreshUserToken">Refresh</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Current refresh token</td>
|
||||
<td>{{ store.user.refreshToken }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Entrepreneur API call</td>
|
||||
<td>
|
||||
<button @click="callApi('random')">call</button>
|
||||
</td>
|
||||
<td>res</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Admin API call</td>
|
||||
<td>
|
||||
<button @click="callApi('random2')">call</button>
|
||||
</td>
|
||||
<td>res</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Unauth API call</td>
|
||||
<td>
|
||||
<button @click="callApi('random3')">call</button>
|
||||
</td>
|
||||
<td>res</td>
|
||||
<td id="3"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<input v-model="CustomRequest" placeholder="edit me" />
|
||||
</td>
|
||||
<td>
|
||||
<button @click="callApi(CustomRequest)">call</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
table {
|
||||
width: 100px;
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
tr {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
td {
|
||||
border: solid 1px black;
|
||||
width: 20%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user