Compare commits
	
		
			330 Commits
		
	
	
		
			e7674bbfc3
			...
			Schedule/m
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 220c891c72 | |||
| 2b9493422d | |||
| 621f568ba2 | |||
| 972d08a54d | |||
| 7a13d412f1 | |||
| 9de4b06e75 | |||
| 123fa97611 | |||
| 1fad792be7 | |||
| 
						
						
							
						
						acd1262955
	
				 | 
					
					
						|||
| 
						
						
							
						
						3d6941ab93
	
				 | 
					
					
						|||
| 
						
						
							
						
						de72bd800c
	
				 | 
					
					
						|||
| b465dcfa92 | |||
| 73f3df0bc6 | |||
| 90a7b7b70e | |||
| 4f002a29e1 | |||
| 66d090d045 | |||
| 4715441afd | |||
| 77ac771b8f | |||
| 3762750968 | |||
| a276c24f8f | |||
| 25c5c1b018 | |||
| c7f37b0854 | |||
| c35f675a11 | |||
| a9e5e45872 | |||
| 73d50f3f50 | |||
| 0871d2971d | |||
| 9744bd973f | |||
| ecaa0af24a | |||
| 
						
						
							
						
						a762b6875d
	
				 | 
					
					
						|||
| 4e6c4ecf38 | |||
| 
						
						
							
						
						ec3c912847
	
				 | 
					
					
						|||
| 5636d96478 | |||
| 
						
						
							
						
						d40ceff2ba
	
				 | 
					
					
						|||
| fd357ba938 | |||
| 92079c5a47 | |||
| 753af3874e | |||
| e03a01ec89 | |||
| fd18df7c3a | |||
| 93c161be4c | |||
| 
						
						
							
						
						853a3a42d2
	
				 | 
					
					
						|||
| a80fb2b297 | |||
| f484fb095e | |||
| 8ff29ca34e | |||
| 
						
						
							
						
						611e7167f9
	
				 | 
					
					
						|||
| 
						
						
							
						
						ee37dc79a7
	
				 | 
					
					
						|||
| 2fb6aef67c | |||
| 7e7cec2f6c | |||
| 345599888d | |||
| 19b4950be4 | |||
| d9307753c4 | |||
| 7a23dcc96a | |||
| f2b80ba89f | |||
| 114116b97c | |||
| 924faca13f | |||
| ea4a0745e0 | |||
| 76f5a39a8f | |||
| 37f8a3ac4e | |||
| ea46dd664c | |||
| b2d0be014c | |||
| 571d27c230 | |||
| 37a9eb46ae | |||
| bfc4f6567b | |||
| d423a57fa0 | |||
| 210fda0401 | |||
| b67b25b4a4 | |||
| 385290d1a2 | |||
| cf2deb983d | |||
| dcec45acf5 | |||
| 008af10d0e | |||
| f7df234312 | |||
| d855bbe911 | |||
| f2507ddcdd | |||
| a70b05a0ef | |||
| 1d793cef4e | |||
| 4cf2ac1aa8 | |||
| 6e6bd285af | |||
| 474a8d3f31 | |||
| 4379794dba | |||
| c5d7ce4178 | |||
| 382d3c203a | |||
| 5a7934b2a3 | |||
| 8476563678 | |||
| 97b57b361d | |||
| 069466ef5f | |||
| d5f6656e2b | |||
| 32e26f35cb | |||
| 36fc33c3e9 | |||
| 
						
						
							
						
						17ab241250
	
				 | 
					
					
						|||
| 36ce5a553b | |||
| a5807148e1 | |||
| 53e478b05c | |||
| 
						
						
							
						
						182be8ac7b
	
				 | 
					
					
						|||
| beba199f60 | |||
| 767a83d1d6 | |||
| 
						
						
							
						
						da3f8c47f9
	
				 | 
					
					
						|||
| 8d1235be92 | |||
| 
						
						
							
						
						1546fc6d47
	
				 | 
					
					
						|||
| 
						
						
							
						
						04f64f505e
	
				 | 
					
					
						|||
| e84e34d735 | |||
| c955fbf5f8 | |||
| 
						
						
							
						
						847936b799
	
				 | 
					
					
						|||
| 
						
						
							
						
						0b27d2e8d8
	
				 | 
					
					
						|||
| 
						
						
							
						
						45fbef52ed
	
				 | 
					
					
						|||
| ca6f676fb7 | |||
| 
						
						
							
						
						cc8530621d
	
				 | 
					
					
						|||
| abff9aef3a | |||
| 41288258c9 | |||
| 47a0c97f3d | |||
| 3ea6c7886a | |||
| 
						
						
							
						
						17d0ae7ccc
	
				 | 
					
					
						|||
| 8f2fb04112 | |||
| c6198b7220 | |||
| 13fd048cd2 | |||
| b7b2eafb93 | |||
| 0860567e1b | |||
| 25009ba149 | |||
| 208c6c63e8 | |||
| e2da7271af | |||
| d5e4387303 | |||
| 1903a6c9be | |||
| 
						
						
							
						
						77a170be6d
	
				 | 
					
					
						|||
| 9f02207eb0 | |||
| 
						
						
							
						
						ae4ad036a8
	
				 | 
					
					
						|||
| 
						
						
							
						
						3996765c8a
	
				 | 
					
					
						|||
| b047c4de35 | |||
| 1f14890d43 | |||
| 2ea6ed16bb | |||
| 189e664f37 | |||
| f33a421aee | |||
| 017235cccf | |||
| 1bff48a4b9 | |||
| 385640c10e | |||
| a0c38a8d59 | |||
| 198ee8a4ce | |||
| 08c662a65f | |||
| c8b7930a8e | |||
| 20d52b2b21 | |||
| 1502cc871c | |||
| 826bbf5990 | |||
| c26972369f | |||
| 4c5cae7ff5 | |||
| 59c3442647 | |||
| 12846ed83d | |||
| bb4ee784fa | |||
| 1777e894e9 | |||
| 3c3659c056 | |||
| e05492f4a8 | |||
| 97a2c8a9f6 | |||
| 9aa425d1c3 | |||
| f0a411c031 | |||
| 
						
						
							
						
						6228e21d38
	
				 | 
					
					
						|||
| 
						
						
							
						
						64e7f8dc6b
	
				 | 
					
					
						|||
| 
						
						
							
						
						a0285e700d
	
				 | 
					
					
						|||
| 
						
						
							
						
						68e55e8355
	
				 | 
					
					
						|||
| 157e5951fc | |||
| 4241f15731 | |||
| cead1188ab | |||
| 5c7147bb17 | |||
| 7d8e1113cc | |||
| 354793a29f | |||
| d5b1df32b6 | |||
| 2a58c335f2 | |||
| 4f511bf066 | |||
| 62f64eed60 | |||
| 4b1db883e2 | |||
| 
						
						
							
						
						58a4c87661
	
				 | 
					
					
						|||
| f52cb31189 | |||
| 044648674c | |||
| 4b0ea8cf40 | |||
| dae59f67ce | |||
| 66282bce9f | |||
| b7a574a312 | |||
| 8fbfb36958 | |||
| 86f1a6f17b | |||
| 68df9f99fa | |||
| 2fe6153705 | |||
| 042553c123 | |||
| 3cf5153e79 | |||
| 07e5fb3a73 | |||
| c14d0a9d21 | |||
| 5c728098df | |||
| 28d252279a | |||
| ab91a39a63 | |||
| d4c48ee9f1 | |||
| 5325d6e3ae | |||
| ce2efb61c8 | |||
| b7c97ead2b | |||
| 84fe1df671 | |||
| 8fdfb470cb | |||
| 160cfb0bbf | |||
| 31159ebb5c | |||
| ac88307036 | |||
| 847b1ca419 | |||
| 5bda05925c | |||
| be084cfd12 | |||
| 0b4b38f6c5 | |||
| 21de520175 | |||
| b88d820c12 | |||
| 521c98fdc2 | |||
| ba8b32160d | |||
| 3571b96cfc | |||
| 619d2601f1 | |||
| 03ff0c0568 | |||
| 82a3b152f2 | |||
| d2a697904e | |||
| fe34ff4705 | |||
| de7774047f | |||
| a524845d06 | |||
| 8e40638b5e | |||
| 13d9020c7d | |||
| 8a544515d0 | |||
| 481c96bec2 | |||
| 1383814e34 | |||
| 7ff47b6e9c | |||
| fba30cff9e | |||
| 875cfb8b7c | |||
| 0ca5640564 | |||
| acfd366fc8 | |||
| 4111839852 | |||
| e69ece23d0 | |||
| b42324987b | |||
| 3b31fa794f | |||
| c33b73a114 | |||
| 2f2a72bfa0 | |||
| 6b58c852a2 | |||
| 8b35b3dc01 | |||
| 93144d0f90 | |||
| 3c08022c20 | |||
| 
						
						
							
						
						204e6a9505
	
				 | 
					
					
						|||
| d639fa5ee3 | |||
| e1d8e37c52 | |||
| 
						
						
							
						
						8e932b1b67
	
				 | 
					
					
						|||
| dbbf74f2c3 | |||
| 4aa15ec72a | |||
| 2938707f0f | |||
| 0e7c18e088 | |||
| 886077349c | |||
| 434cc8dd2b | |||
| d9ec085d2c | |||
| 4a85a55290 | |||
| 37d24c59e7 | |||
| 5acca4d10d | |||
| b050a74b75 | |||
| 010f9200a7 | |||
| 6a39464f61 | |||
| 7222bca6e2 | |||
| 
						
						
							
						
						6df81a66f2
	
				 | 
					
					
						|||
| 34a36f8b1e | |||
| 2a558e40cb | |||
| 3350533e74 | |||
| 
						
						
							
						
						aaaba0ddf3
	
				 | 
					
					
						|||
| 
						
						
							
						
						a253a5152d
	
				 | 
					
					
						|||
| 
						
						
							
						
						38ed249150
	
				 | 
					
					
						|||
| 
						
						
							
						
						212ab638a2
	
				 | 
					
					
						|||
| 
						
						
							
						
						e158fa1f87
	
				 | 
					
					
						|||
| 
						
						
							
						
						6289be529a
	
				 | 
					
					
						|||
| 
						
						
							
						
						1f69040436
	
				 | 
					
					
						|||
| 
						
						
							
						
						56a14a3e8a
	
				 | 
					
					
						|||
| b72c0a8e17 | |||
| bb0e6783ec | |||
| 
						
						
							
						
						57de070eb1
	
				 | 
					
					
						|||
| 24a54bdee4 | |||
| 
						
						
							
						
						d1b4023d92
	
				 | 
					
					
						|||
| c27c3ac9fb | |||
| 
						
						
							
						
						837db9aba9
	
				 | 
					
					
						|||
| 
						
						
							
						
						09d5e1c293
	
				 | 
					
					
						|||
| 
						
						
							
						
						dcd1fad6ac
	
				 | 
					
					
						|||
| 
						
						
							
						
						8c2397c4cf
	
				 | 
					
					
						|||
| cc89d7f5b7 | |||
| 36f1ab3203 | |||
| 45bfe08c9a | |||
| 6c688dab59 | |||
| 
						
						
							
						
						516fc0d5e6
	
				 | 
					
					
						|||
| 
						
						
							
						
						7abd2a001f
	
				 | 
					
					
						|||
| 9850f2145c | |||
| 25fe568148 | |||
| 672d17cf0e | |||
| 49196caccc | |||
| 0b0fe9ae78 | |||
| 057d8ff001 | |||
| 684c3095eb | |||
| bbe1f9767c | |||
| 3956037ab5 | |||
| 21a42737a2 | |||
| 2d43707aca | |||
| f1b3b0dd45 | |||
| 512e8a41dd | |||
| 1a5f3cf65e | |||
| 298cdcaae0 | |||
| dbe24dbc5f | |||
| 1a1baccddd | |||
| ba7e9599de | |||
| fa522eabd3 | |||
| caf11b5b19 | |||
| 25019d8b91 | |||
| 69c3a3b965 | |||
| 
						
						
							
						
						0de7b69b1b
	
				 | 
					
					
						|||
| 
						
						
							
						
						7c9fe9235c
	
				 | 
					
					
						|||
| 
						
						
							
						
						56df39b584
	
				 | 
					
					
						|||
| 
						
						
							
						
						4c79b9e51f
	
				 | 
					
					
						|||
| 
						
						
							
						
						6559462f2b
	
				 | 
					
					
						|||
| 
						
						
							
						
						43adb6d31f
	
				 | 
					
					
						|||
| 
						
						
							
						
						9c92e7d1e9
	
				 | 
					
					
						|||
| 
						
						
							
						
						88108918dd
	
				 | 
					
					
						|||
| 
						
						
							
						
						c0ab074a95
	
				 | 
					
					
						|||
| 
						
						
							
						
						4f4ed952cc
	
				 | 
					
					
						|||
| 
						
						
							
						
						d8cbbdc94b
	
				 | 
					
					
						|||
| 
						
						
							
						
						f39cc004ad
	
				 | 
					
					
						|||
| 
						
						
							
						
						4983b67fbe
	
				 | 
					
					
						|||
| 
						
						
							
						
						0015763523
	
				 | 
					
					
						|||
| 
						
						
							
						
						f1154713b7
	
				 | 
					
					
						|||
| 
						
						
							
						
						883ff19fa3
	
				 | 
					
					
						|||
| 
						
						
							
						
						fdfbd5a948
	
				 | 
					
					
						|||
| 
						
						
							
						
						b90716ab38
	
				 | 
					
					
						|||
| 
						
						
							
						
						3f74c5bb07
	
				 | 
					
					
						|||
| 
						
						
							
						
						c11ad4fa11
	
				 | 
					
					
						|||
| 
						
						
							
						
						5d877c3460
	
				 | 
					
					
						|||
| 
						
						
							
						
						5691ff1783
	
				 | 
					
					
						|||
| 
						
						
							
						
						fbbc6978d5
	
				 | 
					
					
						|||
| bb5d1a6982 | |||
| 
						
						
							
						
						6503af0096
	
				 | 
					
					
						|||
| 
						
						
							
						
						42d9231ef6
	
				 | 
					
					
						|||
| fb6527afd5 | |||
| 
						
						
							
						
						b9fec5e7b4
	
				 | 
					
					
						|||
| 
						
						
							
						
						62136f5060
	
				 | 
					
					
						|||
| 
						
						
							
						
						9ca94668d7
	
				 | 
					
					
						|||
| dda321256c | |||
| 85b0be3479 | |||
| a795108859 | |||
| 3f1c4732ec | 
							
								
								
									
										77
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										77
									
								
								.drone.yml
									
									
									
									
									
								
							@ -1,77 +0,0 @@
 | 
				
			|||||||
---
 | 
					 | 
				
			||||||
kind: pipeline
 | 
					 | 
				
			||||||
type: docker
 | 
					 | 
				
			||||||
name: test
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
steps: 
 | 
					 | 
				
			||||||
  - name: Backend-Tests
 | 
					 | 
				
			||||||
    image: eclipse-temurin:21
 | 
					 | 
				
			||||||
    workspace: backend/
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - echo "Backend CI Test TODO"
 | 
					 | 
				
			||||||
  - name: FrontEnd-Tests
 | 
					 | 
				
			||||||
    image: node:lts-alpine
 | 
					 | 
				
			||||||
    workspace: frontend/
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - echo "Frontend CI Test TODO"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
kind: pipeline
 | 
					 | 
				
			||||||
type: docker
 | 
					 | 
				
			||||||
name: build
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
depends_on:
 | 
					 | 
				
			||||||
  - test
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
steps: 
 | 
					 | 
				
			||||||
  - name: Backend-build
 | 
					 | 
				
			||||||
    image: eclipse-temurin:21
 | 
					 | 
				
			||||||
    workspace: backend/
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - echo "Backend CI build TODO"
 | 
					 | 
				
			||||||
  - name: FrontEnd-build
 | 
					 | 
				
			||||||
    image: node:lts-alpine
 | 
					 | 
				
			||||||
    workspace: frontend/
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - echo "Frontend CI build TODO"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
kind: pipeline
 | 
					 | 
				
			||||||
type: exec
 | 
					 | 
				
			||||||
name: deploy
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
depends_on:
 | 
					 | 
				
			||||||
  - build
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
server:
 | 
					 | 
				
			||||||
  host:
 | 
					 | 
				
			||||||
    from_secret: host
 | 
					 | 
				
			||||||
  user:
 | 
					 | 
				
			||||||
    from_secret: user
 | 
					 | 
				
			||||||
  ssh_key: 
 | 
					 | 
				
			||||||
    from_secret: ssh_key 
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
plateform:
 | 
					 | 
				
			||||||
  os: linux
 | 
					 | 
				
			||||||
  arch: amd64
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
trigger:
 | 
					 | 
				
			||||||
  branch:
 | 
					 | 
				
			||||||
    - master
 | 
					 | 
				
			||||||
  event:
 | 
					 | 
				
			||||||
    - push
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
steps:
 | 
					 | 
				
			||||||
  - name: deploy frontend
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - cd frontend
 | 
					 | 
				
			||||||
      - npm run build
 | 
					 | 
				
			||||||
      - install -d "dist/" "$HOME/dist"
 | 
					 | 
				
			||||||
  - name: deploy backend 
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - echo "deploying backend TODO"
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
kind: signature
 | 
					 | 
				
			||||||
hmac: 3c5387c57626f0946636d82b97fad0daaf09dbb5f02f201791363ff33cc0bb82
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
...
 | 
					 | 
				
			||||||
							
								
								
									
										9
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
				
			|||||||
 | 
					#
 | 
				
			||||||
 | 
					# https://help.github.com/articles/dealing-with-line-endings/
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Linux start script should use lf
 | 
				
			||||||
 | 
					/gradlew        text eol=lf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# These are Windows script files and should use crlf
 | 
				
			||||||
 | 
					*.bat           text eol=crlf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										32
									
								
								.gitea/workflows/backend.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								.gitea/workflows/backend.yaml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,32 @@
 | 
				
			|||||||
 | 
					name: Build and test backend 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					on:
 | 
				
			||||||
 | 
					  push:
 | 
				
			||||||
 | 
					    branches: [ master ]
 | 
				
			||||||
 | 
					  pull_request:
 | 
				
			||||||
 | 
					    branches: [ master ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					jobs:
 | 
				
			||||||
 | 
					  Build-backend:
 | 
				
			||||||
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					    steps:
 | 
				
			||||||
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					    - uses: actions/setup-java@v3
 | 
				
			||||||
 | 
					      with:
 | 
				
			||||||
 | 
					        java-version: '21'
 | 
				
			||||||
 | 
					        distribution: 'temurin'
 | 
				
			||||||
 | 
					    - uses: gradle/gradle-build-action@v3
 | 
				
			||||||
 | 
					    - name: building
 | 
				
			||||||
 | 
					      run: ./gradlew backend:build -x test
 | 
				
			||||||
 | 
					  # Test-backend:
 | 
				
			||||||
 | 
					  #   runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					  #   steps:
 | 
				
			||||||
 | 
					  #   - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					  #   - uses: actions/setup-java@v3
 | 
				
			||||||
 | 
					  #     with:
 | 
				
			||||||
 | 
					  #       java-version: '21'
 | 
				
			||||||
 | 
					  #       distribution: 'temurin'
 | 
				
			||||||
 | 
					  #   - run: curl -fsSL https://get.docker.com | sh
 | 
				
			||||||
 | 
					  #   - uses: gradle/gradle-build-action@v3
 | 
				
			||||||
 | 
					  #   - name: testing
 | 
				
			||||||
 | 
					  #     run: ./gradlew backend:test 
 | 
				
			||||||
							
								
								
									
										57
									
								
								.gitea/workflows/deploy.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								.gitea/workflows/deploy.yaml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,57 @@
 | 
				
			|||||||
 | 
					name: deploy to production
 | 
				
			||||||
 | 
					run-name: ${{ gitea.actor }} has pushed to production
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					on:
 | 
				
			||||||
 | 
					  push:
 | 
				
			||||||
 | 
					    branches:
 | 
				
			||||||
 | 
					      - master 
 | 
				
			||||||
 | 
					  workflow_run:
 | 
				
			||||||
 | 
					    workflows:
 | 
				
			||||||
 | 
					      - Build and test backend 
 | 
				
			||||||
 | 
					      - Build and test frontend 
 | 
				
			||||||
 | 
					    types:
 | 
				
			||||||
 | 
					      - completed
 | 
				
			||||||
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					jobs:
 | 
				
			||||||
 | 
					  deploy-frontend:
 | 
				
			||||||
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					    steps:
 | 
				
			||||||
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					    - name: Use Node.js ${{ matrix.node-version }}
 | 
				
			||||||
 | 
					      uses: actions/setup-node@v3
 | 
				
			||||||
 | 
					      working-directory: ./frontend
 | 
				
			||||||
 | 
					    - run: npm ci 
 | 
				
			||||||
 | 
					      name: clean install
 | 
				
			||||||
 | 
					      working-directory: ./frontend
 | 
				
			||||||
 | 
					    - name: building 
 | 
				
			||||||
 | 
					      working-directory: ./frontend
 | 
				
			||||||
 | 
					      run: npm run build
 | 
				
			||||||
 | 
					    - name: pushing to the server
 | 
				
			||||||
 | 
					      working-directory: ./frontend
 | 
				
			||||||
 | 
					      run: |
 | 
				
			||||||
 | 
					        echo "${{ secrets.SSH_KEY }}" > key
 | 
				
			||||||
 | 
					        chmod 0600 key
 | 
				
			||||||
 | 
					        scp -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key -r dist/ ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:
 | 
				
			||||||
 | 
					    - run: echo "The website has been deployed. visit https://clyde.herisson.ovh/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  deploy-backend:
 | 
				
			||||||
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					    steps:
 | 
				
			||||||
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					    - uses: actions/setup-java@v3
 | 
				
			||||||
 | 
					      with:
 | 
				
			||||||
 | 
					        java-version: '21'
 | 
				
			||||||
 | 
					        distribution: 'temurin'
 | 
				
			||||||
 | 
					    - uses: gradle/gradle-build-action@v3
 | 
				
			||||||
 | 
					    - name: building
 | 
				
			||||||
 | 
					      run: ./gradlew backend:build -x test
 | 
				
			||||||
 | 
					    - name: pushing to the server
 | 
				
			||||||
 | 
					      run: |
 | 
				
			||||||
 | 
					        echo "${{ secrets.SSH_KEY }}" > key
 | 
				
			||||||
 | 
					        chmod 0600 key
 | 
				
			||||||
 | 
					        scp -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key -r * ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:api/
 | 
				
			||||||
 | 
					    - name: restarting the backend 
 | 
				
			||||||
 | 
					      run: |
 | 
				
			||||||
 | 
					        ssh -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} 'cd api/backend && docker build -t clyde/backend . && docker rm clyde_backend_prod -f || true && docker run --rm -d -u $(id -u clyde):$(id -g clyde) -v /var/run/postgresql:/var/run/postgresql --name clyde_backend_prod -p 4000:8080 clyde/backend && docker image prune -f'
 | 
				
			||||||
 | 
					    - run: echo "The backend has been deployed. running at https://clyde.herisson.ovh/api"
 | 
				
			||||||
							
								
								
									
										22
									
								
								.gitea/workflows/frontend.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								.gitea/workflows/frontend.yaml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,22 @@
 | 
				
			|||||||
 | 
					name: Build and test FrontEnd 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					on:
 | 
				
			||||||
 | 
					  push:
 | 
				
			||||||
 | 
					    branches: [ master ]
 | 
				
			||||||
 | 
					  pull_request:
 | 
				
			||||||
 | 
					    branches: [ master ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					jobs:
 | 
				
			||||||
 | 
					  Build-frontend:
 | 
				
			||||||
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					    steps:
 | 
				
			||||||
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					    - name: Use Node.js ${{ matrix.node-version }}
 | 
				
			||||||
 | 
					      uses: actions/setup-node@v3
 | 
				
			||||||
 | 
					      working-directory: ./frontend
 | 
				
			||||||
 | 
					    - run: npm ci 
 | 
				
			||||||
 | 
					      name: clean install
 | 
				
			||||||
 | 
					      working-directory: ./frontend
 | 
				
			||||||
 | 
					    - run: npm run build --if-present
 | 
				
			||||||
 | 
					      name: build
 | 
				
			||||||
 | 
					      working-directory: ./frontend
 | 
				
			||||||
							
								
								
									
										9
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
				
			|||||||
 | 
					# Ignore Gradle project-specific cache directory
 | 
				
			||||||
 | 
					.gradle
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Ignore Gradle build output directory
 | 
				
			||||||
 | 
					build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.project
 | 
				
			||||||
 | 
					.settings
 | 
				
			||||||
 | 
					.idea/
 | 
				
			||||||
							
								
								
									
										1
									
								
								Clyde
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
							
						
						
									
										1
									
								
								Clyde
									
									
									
									
									
										Submodule
									
								
							 Submodule Clyde added at bd27ffd3cb
									
								
							
							
								
								
									
										48
									
								
								Documents/JournalDeBord/29-02.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								Documents/JournalDeBord/29-02.md
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,48 @@
 | 
				
			|||||||
 | 
					# Journal de bord du 29 février
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Ce premier journal de bord permet d'initier une tendance a garder une trace des choix fait lors du dévelopement du
 | 
				
			||||||
 | 
					projet de génie logiciel. Ces journaux pourront alors être consultés par la suite, pour la rédaction du rapport.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Choix des technologies utilisées
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Backend: spring.io
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Le backend est imposé, nous devons utiliser spring boots. La courbe d'aprentisage nous semble difficile mais après de
 | 
				
			||||||
 | 
					longues documentations nous commençons à comprendre son fonctionnement.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Frontend: Vue.js
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Le frontend n'est pas imposé, nous devons utiliser javascript mais le choix du framework (si utilisé) est libre. Nous
 | 
				
			||||||
 | 
					avons pris la recomendation du cours: vue.js qui est un framework simple d'aprentisage et très performant.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#### Librairies
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- **Vue3-toastify:** Nous avons opté pour l'utilisation d'une librarie de "notification". cette librairie permet 
 | 
				
			||||||
 | 
					d'afficher des notifications sur la page. Elle nous est utile autant pour l'application finale que pour le
 | 
				
			||||||
 | 
					dévelopement.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Database: postgresql
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					C'est une base de données très efficace qui est déjà installé
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### VCS: Gitea
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					C'est une alternative a github mais self-hosted. Nous avons accés à un serveur sur lequel gitea est installé
 | 
				
			||||||
 | 
					(https://git.herisson.ovh/).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### CI/CD: Gitea Actions
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Gitea a récement implémenter l'équivalent de github actions dans gitea et qui est complètement compatible avec github
 | 
				
			||||||
 | 
					actions. Nous avons donc implémentés les test et build en continu lors des pr et merge. Lorsqu'un merge est fait avec la
 | 
				
			||||||
 | 
					branche master, le site est instentanément mis à jours (après une dernière verification du build et test) sur l'adresse
 | 
				
			||||||
 | 
					http://clyde.herisson.ovh pour le frontent et http://clyde.herisson.ovh/api pour le backend.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Répartition des taches
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Nous nous répartisons les taches par familiarité et préférences avec les différentes partie du projet.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Wiliam: Frontend visuel
 | 
				
			||||||
 | 
					- Anthony: Frontend technique
 | 
				
			||||||
 | 
					- Max: Backend Endpoints
 | 
				
			||||||
 | 
					- Léo: Backend Data
 | 
				
			||||||
							
								
								
									
										36
									
								
								Documents/JournalDeBord/authentification.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								Documents/JournalDeBord/authentification.md
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,36 @@
 | 
				
			|||||||
 | 
					# Authentification
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Contexte
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Le projet demande de pouvoir authentifier les utilisateurs présents. Le but étant de leurs associer un "contexte"
 | 
				
			||||||
 | 
					(cours, informations personnelles, ...). Pour que ceux-ci puissent accomplir différentes actions nécéssitantes une
 | 
				
			||||||
 | 
					identification (permission, info personelles, ...).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Méthode
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Lorsque qu'un utilisateur se connecte au serveur, nous lui envoyons un token qui sera stocké dans le
 | 
				
			||||||
 | 
					navigateur. Ce token est unique à l'utilisateur et pourra être ré-envoyé dans les futures requêtes
 | 
				
			||||||
 | 
					pour identifier l'utilisateur.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Ce token est donc une chaine de 64 caractères suivant la norme ISO_8859_1(8bits par cararctère) aléatoires,ce qui est d'après nos recherches suffisant.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					De plus une limite de 5 token par utilisateur sera ajoutée de sorte à 
 | 
				
			||||||
 | 
					1) S'assurer qu'une personne ne noie la base de donnée de tokens.
 | 
				
			||||||
 | 
					2) Ajouter une protection supplémentaire pour assurer qu'un token est bien unique à un utilisateur.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Autres méthodes envisagée
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Oauth2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					C'est un protocol d'identification vastement utilisé permettant, en plus d'identifier les requettes,
 | 
				
			||||||
 | 
					de gérer leurs permissions. Un utilisateur créen un token peut lui attribuer des permissions
 | 
				
			||||||
 | 
					spécifique qui restrainderaients les permissions d'utilisation de ce token. C'est très utile pour
 | 
				
			||||||
 | 
					déployer des api de site pouvant notament être accédé par des ordinateurs / bots. Ca n'est en
 | 
				
			||||||
 | 
					revanche pas l'objectif du projet et l'option n'a donc pas été retenue
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Spring Sessions / Tomcat sessions
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Il aurait été possible de laisser une librairie automatiser les sessions. Malheuresement, celà
 | 
				
			||||||
 | 
					implique de devoir se plier au format de la dite librairie. L'implémentation d'un système de gestion
 | 
				
			||||||
 | 
					de token maison semblai à la fois, non-imposible et interessant à notre apprentisage. C'est pourquoi
 | 
				
			||||||
 | 
					nous n'avons pas utilisé cette option.
 | 
				
			||||||
							
								
								
									
										45
									
								
								Documents/JournalDeBord/i18n.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								Documents/JournalDeBord/i18n.md
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,45 @@
 | 
				
			|||||||
 | 
					# Internationalization (i18n)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					L'un des critère du projet est de donner la possibilité aux utilisateur de choisir entre différentes
 | 
				
			||||||
 | 
					langues. Minimum 2 sont a implémenter, le français et l'anglais.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Intention 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					La gestion des langue au niveau backend peut sembler être une bonne idée aux premier abord car celà
 | 
				
			||||||
 | 
					permeterais de laisser la possibilité a différents frontend utilisant la meme api de traduction.
 | 
				
			||||||
 | 
					cependant, peu d'éléments venant de la base de données sont traduisible. Nous alons alors opter pour
 | 
				
			||||||
 | 
					une internationalization au niveau du frontend. Dans le cas ou un éléments venant du frontend
 | 
				
			||||||
 | 
					devrait être traduit, Il suffirait alors de le faire traduire par le frontend directement
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Implémentation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Le frontend va se voir équiper d'une collection de fonctions permettant la traduction. notament
 | 
				
			||||||
 | 
					`i18n(key: str) -> str` qui prendrait en entrée une "clé" identifiant la traduction à aller
 | 
				
			||||||
 | 
					chercher. Cette clé serait sous la forme : `<context>.<element>`. La fonctions retournera alors la
 | 
				
			||||||
 | 
					traduction du texte dans la langue choisie par l'utilisateur. cette langue sera stockée dans les
 | 
				
			||||||
 | 
					cookies pour qu'un utilisateur non enregistré puisse naviguer sur le site sans problèmes. Si
 | 
				
			||||||
 | 
					l'utilisateur est enregistré elle pourra également être ajouter à son profil pour que la langue soit
 | 
				
			||||||
 | 
					mise à jours lors de son prochain passage.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Base de données de traduction
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Les traductions seront rassembler dans fichier txt. Une langue sera présente par fichier et une
 | 
				
			||||||
 | 
					traduction par ligne. (Ce format semble être utilisé par certaines librairies de spring. Malgré le
 | 
				
			||||||
 | 
					fait que nous ne l'utiliserons finalement pas, ce format semble efficace est facile à utilsier).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Chaque ligne commence par la clé. suivi immédiatement d'un "=". le contenu après ce égale est la
 | 
				
			||||||
 | 
					traduction jusqu'au égale.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Considérations
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Il existe certainemnt des librairies prète à l'emploi de traduction mais celà semble être
 | 
				
			||||||
 | 
					  relativement simple à implémenter manuellement.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Dans l'éventualité où nous voudrions implémenter des éléments au milieu d'une traduction (example:
 | 
				
			||||||
 | 
					  Veuillez vérifier votre addresse mail: `tonitch@herisson.ovh` puis revenir sur le site!). Dans ce
 | 
				
			||||||
 | 
					  cas nous pouvons utiliser le regex et simplement renseigner ces éléments par \1, \2, \3, ... puis
 | 
				
			||||||
 | 
					  créer une fonction qui s'occuperais de remplacer ces éléments dans le texte avant de le mettre en
 | 
				
			||||||
 | 
					  avant.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Il ne devrait pas etre trop compliqué d'écrire un script qui vérifie que toutes les traductions
 | 
				
			||||||
 | 
					  sont présente dans tout les fichiers en vérifiant que toutes les clés d'un fichiers sont présente.
 | 
				
			||||||
							
								
								
									
										18
									
								
								README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								README.md
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,18 @@
 | 
				
			|||||||
 | 
					# Clyde project
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Signature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Projet du groupe 01:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Debucquoy Anthony: Extension messagerie
 | 
				
			||||||
 | 
					- Maxime Bartha: Extension publication scientifique
 | 
				
			||||||
 | 
					- William Karpinski: Extension gestion des horaires
 | 
				
			||||||
 | 
					- Léo Moulin: Extension inscription des étudiants
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Dévelopement
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					$ ./gradlew backend:run frontend:run --parallel
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					permet de lancer le frontend sur [http://localhost:5173](http://localhost:5173) ansi que le frontend sur [http://localhost:8080](http://localhost:8080) 
 | 
				
			||||||
							
								
								
									
										39
									
								
								backend/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								backend/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@ -0,0 +1,39 @@
 | 
				
			|||||||
 | 
					HELP.md
 | 
				
			||||||
 | 
					.gradle
 | 
				
			||||||
 | 
					build/
 | 
				
			||||||
 | 
					!gradle/wrapper/gradle-wrapper.jar
 | 
				
			||||||
 | 
					!**/src/main/**/build/
 | 
				
			||||||
 | 
					!**/src/test/**/build/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### STS ###
 | 
				
			||||||
 | 
					.apt_generated
 | 
				
			||||||
 | 
					.classpath
 | 
				
			||||||
 | 
					.factorypath
 | 
				
			||||||
 | 
					.project
 | 
				
			||||||
 | 
					.settings
 | 
				
			||||||
 | 
					.springBeans
 | 
				
			||||||
 | 
					.sts4-cache
 | 
				
			||||||
 | 
					bin/
 | 
				
			||||||
 | 
					!**/src/main/**/bin/
 | 
				
			||||||
 | 
					!**/src/test/**/bin/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### IntelliJ IDEA ###
 | 
				
			||||||
 | 
					.idea
 | 
				
			||||||
 | 
					*.iws
 | 
				
			||||||
 | 
					*.iml
 | 
				
			||||||
 | 
					*.ipr
 | 
				
			||||||
 | 
					out/
 | 
				
			||||||
 | 
					!**/src/main/**/out/
 | 
				
			||||||
 | 
					!**/src/test/**/out/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### NetBeans ###
 | 
				
			||||||
 | 
					/nbproject/private/
 | 
				
			||||||
 | 
					/nbbuild/
 | 
				
			||||||
 | 
					/dist/
 | 
				
			||||||
 | 
					/nbdist/
 | 
				
			||||||
 | 
					/.nb-gradle/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### VS Code ###
 | 
				
			||||||
 | 
					.vscode/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/cdn
 | 
				
			||||||
							
								
								
									
										6
									
								
								backend/Dockerfile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								backend/Dockerfile
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,6 @@
 | 
				
			|||||||
 | 
					FROM eclipse-temurin:21-jdk-alpine
 | 
				
			||||||
 | 
					VOLUME /tmp
 | 
				
			||||||
 | 
					VOLUME /cdn
 | 
				
			||||||
 | 
					ENV SPRING_PROFILES_ACTIVE=prod
 | 
				
			||||||
 | 
					COPY build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar
 | 
				
			||||||
 | 
					ENTRYPOINT ["java", "-jar", "/app.jar"]
 | 
				
			||||||
							
								
								
									
										46
									
								
								backend/build.gradle.kts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								backend/build.gradle.kts
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,46 @@
 | 
				
			|||||||
 | 
					plugins {
 | 
				
			||||||
 | 
						java
 | 
				
			||||||
 | 
						id("org.springframework.boot") version "3.2.2"
 | 
				
			||||||
 | 
						id("io.spring.dependency-management") version "1.1.4"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					group = "ovh.herisson"
 | 
				
			||||||
 | 
					version = "0.0.1-SNAPSHOT"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					java {
 | 
				
			||||||
 | 
						sourceCompatibility = JavaVersion.VERSION_21
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					repositories {
 | 
				
			||||||
 | 
						mavenCentral()
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					dependencies {
 | 
				
			||||||
 | 
						implementation("org.springframework.boot:spring-boot-starter-jdbc")
 | 
				
			||||||
 | 
						implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 | 
				
			||||||
 | 
						implementation("org.springframework.boot:spring-boot-starter-mail")
 | 
				
			||||||
 | 
						implementation("org.springframework.boot:spring-boot-starter-web")
 | 
				
			||||||
 | 
						implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 | 
				
			||||||
 | 
						implementation("org.springframework.boot:spring-boot-starter-security")
 | 
				
			||||||
 | 
						implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 | 
				
			||||||
 | 
						// implementation("org.springframework.session:spring-session-jdbc")
 | 
				
			||||||
 | 
						developmentOnly("org.springframework.boot:spring-boot-devtools")
 | 
				
			||||||
 | 
						runtimeOnly("org.postgresql:postgresql")
 | 
				
			||||||
 | 
						testImplementation("org.springframework.boot:spring-boot-starter-test")
 | 
				
			||||||
 | 
						testImplementation("org.springframework.boot:spring-boot-testcontainers")
 | 
				
			||||||
 | 
						testImplementation("org.testcontainers:junit-jupiter")
 | 
				
			||||||
 | 
						testImplementation("org.testcontainers:postgresql")
 | 
				
			||||||
 | 
						testImplementation("io.rest-assured:rest-assured")
 | 
				
			||||||
 | 
						testImplementation("org.hamcrest:hamcrest")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					tasks.register("run") {
 | 
				
			||||||
 | 
						dependsOn(tasks.bootRun)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					tasks.withType<Test> {
 | 
				
			||||||
 | 
						useJUnitPlatform()
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										9
									
								
								backend/compose.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								backend/compose.yaml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
				
			|||||||
 | 
					services:
 | 
				
			||||||
 | 
					  postgres:
 | 
				
			||||||
 | 
					    image: 'postgres:latest'
 | 
				
			||||||
 | 
					    environment:
 | 
				
			||||||
 | 
					      - 'POSTGRES_DB=clyde'
 | 
				
			||||||
 | 
					      - 'POSTGRES_USER=devel'
 | 
				
			||||||
 | 
					      - 'POSTGRES_PASSWORD=devel'
 | 
				
			||||||
 | 
					    ports:
 | 
				
			||||||
 | 
					      - '5442:5432'
 | 
				
			||||||
@ -0,0 +1,13 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.boot.SpringApplication;
 | 
				
			||||||
 | 
					import org.springframework.boot.autoconfigure.SpringBootApplication;
 | 
				
			||||||
 | 
					import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@SpringBootApplication(exclude = { SecurityAutoConfiguration.class })
 | 
				
			||||||
 | 
					public class ClydeApplication {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						public static void main(String[] args) {
 | 
				
			||||||
 | 
							SpringApplication.run(ClydeApplication.class, args);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,76 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.CrossOrigin;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.GetMapping;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.PathVariable;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.RequestHeader;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.RestController;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.AuthenticatorService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Applications;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class ApplicationsController {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    AuthenticatorService authServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ApplicationsController(AuthenticatorService authServ){
 | 
				
			||||||
 | 
					    this.authServ = authServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** return a list of authorized applications.
 | 
				
			||||||
 | 
					     *  depends on the token
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    @GetMapping("/apps")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/apps/{identifier}")
 | 
				
			||||||
 | 
					    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (getAuthorizedApplications(token).contains(identifier)){
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(true, HttpStatus.OK);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(false, HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ArrayList<Applications> getAuthorizedApplications(String token){
 | 
				
			||||||
 | 
					        ArrayList<Applications> authorizedApps = new ArrayList<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //if unAuthed
 | 
				
			||||||
 | 
					        authorizedApps.add(Applications.Login);
 | 
				
			||||||
 | 
					        authorizedApps.add(Applications.Schedule);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							User user = authServ.getUserFromToken(token);
 | 
				
			||||||
 | 
							if(user == null)
 | 
				
			||||||
 | 
					            return authorizedApps;
 | 
				
			||||||
 | 
					        // if authed
 | 
				
			||||||
 | 
					        authorizedApps.add(Applications.Profile);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Student,Role.Admin},token)) {
 | 
				
			||||||
 | 
					            authorizedApps.add(Applications.Msg);
 | 
				
			||||||
 | 
					            authorizedApps.add(Applications.Forum);
 | 
				
			||||||
 | 
					            authorizedApps.add(Applications.Rdv);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //if Teacher or Secretary or Admin add ManageCourses App
 | 
				
			||||||
 | 
					        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Secretary,Role.Admin},token))
 | 
				
			||||||
 | 
					            authorizedApps.add(Applications.ManageCourses);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token)){
 | 
				
			||||||
 | 
					            authorizedApps.add(Applications.Inscription);
 | 
				
			||||||
 | 
					            authorizedApps.add(Applications.StudentsList);}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
 | 
				
			||||||
 | 
					          authorizedApps.add(Applications.UsersList);}
 | 
				
			||||||
 | 
					        return authorizedApps;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,138 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.AuthenticatorService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.CourseService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.ProtectionService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.TeacherCourseService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Course;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					import java.util.HashMap;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class CourseController {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CourseService courseServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final TeacherCourseService teacherCourseServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final AuthenticatorService authServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public CourseController(CourseService courseServ, TeacherCourseService teacherCourseServ, AuthenticatorService authServ) {
 | 
				
			||||||
 | 
					        this.courseServ = courseServ;
 | 
				
			||||||
 | 
					        this.teacherCourseServ = teacherCourseServ;
 | 
				
			||||||
 | 
					        this.authServ = authServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/course/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<HashMap<String,Object>> getCourse(@RequestHeader("Authorization") String token, @PathVariable long id){
 | 
				
			||||||
 | 
					        if (authServ.getUserFromToken(token) == null)
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Course foundCourse = courseServ.findById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (foundCourse == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.courseWithoutPassword(foundCourse), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/courses")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllCourses(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.coursesWithoutPasswords(courseServ.findAll()),HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/courses/owned")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<HashMap<String ,Object>>> getOwnedCourses(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Teacher},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.coursesWithoutPasswords(courseServ.findOwnedCourses(authServ.getUserFromToken(token))),HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/course/{id}/assistants")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<HashMap<String,Object>>> getCourseAssistants(@RequestHeader("Authorization")String token, @PathVariable long id){
 | 
				
			||||||
 | 
					        if (authServ.getUserFromToken(token) == null)
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Iterable<User> assistants = teacherCourseServ.findCourseAssistants(courseServ.findById(id));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(assistants),HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/course")
 | 
				
			||||||
 | 
					    public ResponseEntity<Map<String ,Object>> postCourse(@RequestHeader("Authorization") String token,
 | 
				
			||||||
 | 
					                                             @RequestBody Course course)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        System.out.println(course);
 | 
				
			||||||
 | 
					        System.out.println(token);
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Course createdCourse = courseServ.save(course);
 | 
				
			||||||
 | 
					        if (createdCourse == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(null,HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.courseWithoutPassword(createdCourse), HttpStatus.CREATED);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PatchMapping("/course/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<Course> patchCourse(@RequestHeader("Authorization") String token,
 | 
				
			||||||
 | 
					                                              @RequestBody Map<String,Object> updates,
 | 
				
			||||||
 | 
					                                              @PathVariable long id)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Teacher,Role.Secretary}, token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!courseServ.modifyData(id, updates, authServ.getUserFromToken(token).getRole()))
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/course/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<String> postTeachers(@RequestHeader("Authorization") String token,
 | 
				
			||||||
 | 
					                                               @RequestBody Iterable<Long> teacherIds,
 | 
				
			||||||
 | 
					                                               @PathVariable Long id)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!teacherCourseServ.saveAll(teacherIds,courseServ.findById(id)))
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @DeleteMapping("course/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<String> deleteUser(@RequestHeader("Authorization") String token, @PathVariable Long id){
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Course toDelete = courseServ.findById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (toDelete == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        courseServ.delete(courseServ.findById(id));
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,97 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Curriculum;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class CurriculumController {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CurriculumService curriculumServ;
 | 
				
			||||||
 | 
					    private final AuthenticatorService authServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final UserCurriculumService userCurriculumServ;
 | 
				
			||||||
 | 
					    private final CurriculumCourseService curriculumCourseServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ){
 | 
				
			||||||
 | 
					        this.curriculumServ = curriculumServ;
 | 
				
			||||||
 | 
					        this.authServ = authServ;
 | 
				
			||||||
 | 
					        this.userCurriculumServ = userCurriculumServ;
 | 
				
			||||||
 | 
					        this.curriculumCourseServ = curriculumCourseServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/curriculum/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<Map<String,Object>> findById(@PathVariable long id){
 | 
				
			||||||
 | 
					        Curriculum foundCurriculum = curriculumServ.findById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (foundCurriculum == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(curriculumCourseServ.getDepthCurriculum(foundCurriculum), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/curriculum")
 | 
				
			||||||
 | 
					    public ResponseEntity<Map<String ,Object>> findSelfCurriculum(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					        if (authServ.getUserFromToken(token) == null)
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Curriculum curriculum = userCurriculumServ.findByUser(authServ.getUserFromToken(token));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (curriculum == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(curriculumCourseServ.getDepthCurriculum(curriculum),HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/curriculums")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<Map<String, Object>>> findAllIndDepth(){
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(curriculumCourseServ.getAllDepthCurriculum(),HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/curriculum")
 | 
				
			||||||
 | 
					    public ResponseEntity<Curriculum> postCurriculum(@RequestHeader("Authorization") String token,@RequestBody Curriculum curriculum){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(curriculumServ.save(curriculum),HttpStatus.CREATED);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/curriculum/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<String> postCoursesToCurriculum(@RequestHeader("Authorization") String token,
 | 
				
			||||||
 | 
					                                                          @RequestBody Iterable<Long> coursesIds,
 | 
				
			||||||
 | 
					                                                          @PathVariable long id)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!curriculumCourseServ.saveAll(coursesIds, curriculumServ.findById(id)))
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @DeleteMapping("/curriculum/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<String > deleteCurriculum(@RequestHeader("Authorization") String token, @PathVariable Long id){
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Curriculum toDelete = curriculumServ.findById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (toDelete == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        curriculumServ.delete(toDelete);
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,82 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.AuthenticatorService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.InscriptionService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.ProtectionService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.RequestState;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class InscriptionController {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final InscriptionService inscriptionServ;
 | 
				
			||||||
 | 
					    private final AuthenticatorService authServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public InscriptionController(InscriptionService inscriptionServ, AuthenticatorService authServ){
 | 
				
			||||||
 | 
					        this.inscriptionServ = inscriptionServ;
 | 
				
			||||||
 | 
					        this.authServ = authServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/requests/register")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<Map<String,Object>>> getAllRequests(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Iterable<InscriptionRequest> inscriptionRequests = inscriptionServ.getAll();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.requestsWithoutPasswords(inscriptionRequests), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/request/register/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<Map<String,Object>> getById(@RequestHeader("Authorization") String token, @PathVariable long id){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        InscriptionRequest foundInscriptionRequest = inscriptionServ.getById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (foundInscriptionRequest == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.requestWithoutPassword(foundInscriptionRequest), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PatchMapping("/request/register/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<InscriptionRequest> changeRequestState(@PathVariable long id,
 | 
				
			||||||
 | 
					                                                                 @RequestHeader("Authorization") String token,
 | 
				
			||||||
 | 
					                                                                 @RequestBody RequestState state)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!inscriptionServ.modifyState(id, state))
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @DeleteMapping("/request/register/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<String > deleteRequest(@RequestHeader("Authorization") String token, @PathVariable Long id){
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService}, token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        InscriptionRequest toDelete = inscriptionServ.getById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (toDelete == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        inscriptionServ.delete(toDelete);
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,56 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.fasterxml.jackson.annotation.JsonFormat;
 | 
				
			||||||
 | 
					import org.springframework.http.HttpHeaders;
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.AuthenticatorService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.ProtectionService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class LoginController {
 | 
				
			||||||
 | 
					    private final AuthenticatorService authServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static public class RequestLogin{
 | 
				
			||||||
 | 
					        private final String identifier;
 | 
				
			||||||
 | 
					        private final String password;
 | 
				
			||||||
 | 
					        @JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss")
 | 
				
			||||||
 | 
					        private final Date expirationDate;
 | 
				
			||||||
 | 
					        public RequestLogin(String identifier, String password, Date expirationDate){
 | 
				
			||||||
 | 
					            this.identifier = identifier;
 | 
				
			||||||
 | 
					            this.password = password;
 | 
				
			||||||
 | 
					            this.expirationDate = expirationDate;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public LoginController(AuthenticatorService authServ){
 | 
				
			||||||
 | 
					        this.authServ = authServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping(value = "/login")
 | 
				
			||||||
 | 
					    public ResponseEntity<String> login(@RequestBody RequestLogin requestLogin){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        String sessionToken = authServ.login(requestLogin.identifier,requestLogin.password,requestLogin.expirationDate);
 | 
				
			||||||
 | 
					        if (sessionToken == null){
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>("Identifier or Password incorrect");
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        HttpHeaders responseHeaders = new HttpHeaders();
 | 
				
			||||||
 | 
					        responseHeaders.set("Set-Cookie",String.format("session_token=%s",sessionToken));
 | 
				
			||||||
 | 
					        return ResponseEntity.ok().headers(responseHeaders).build();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/register")
 | 
				
			||||||
 | 
					    public ResponseEntity<Map<String,Object>> register(@RequestBody InscriptionRequest inscriptionRequest){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        InscriptionRequest returnedInscriptionRequest = authServ.register(inscriptionRequest);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.requestWithoutPassword(returnedInscriptionRequest), HttpStatus.CREATED);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,101 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.TokenRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.*;
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					import java.util.Arrays;
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public class MockController {
 | 
				
			||||||
 | 
					    private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public final UserRepository userRepo;
 | 
				
			||||||
 | 
					    public final TokenRepository tokenRepo;
 | 
				
			||||||
 | 
					    public final TokenService tokenService;
 | 
				
			||||||
 | 
					    public final CurriculumCourseService CurriculumCourseService;
 | 
				
			||||||
 | 
					    public final CurriculumService curriculumService;
 | 
				
			||||||
 | 
					    public final CourseService courseService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public final InscriptionService inscriptionService;
 | 
				
			||||||
 | 
					    ArrayList<User> mockUsers;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
 | 
				
			||||||
 | 
					        this.tokenRepo = tokenRepo;
 | 
				
			||||||
 | 
					        this.userRepo = userRepo;
 | 
				
			||||||
 | 
					        this.tokenService = tokenService;
 | 
				
			||||||
 | 
					        this.CurriculumCourseService = CurriculumCourseService;
 | 
				
			||||||
 | 
					        this.curriculumService = curriculumService;
 | 
				
			||||||
 | 
					        this.courseService = courseService;
 | 
				
			||||||
 | 
					        this.inscriptionService = inscriptionService;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** Saves an example of each user type by :
 | 
				
			||||||
 | 
					     * email : FooRole@FooRole.com, password : FooRole and token : FooRole
 | 
				
			||||||
 | 
					     * For example the admin as "admin@admin.com" as email and "admin" as both password and token
 | 
				
			||||||
 | 
					     * They all have silly names
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/mock")
 | 
				
			||||||
 | 
					    public void postMock(){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // user part
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
 | 
				
			||||||
 | 
					        User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
 | 
				
			||||||
 | 
					        User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
 | 
				
			||||||
 | 
					        User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
 | 
				
			||||||
 | 
					        User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
 | 
				
			||||||
 | 
					        User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,passwordEncoder.encode("inscriptionService"));
 | 
				
			||||||
 | 
					        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        userRepo.saveAll(mockUsers);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Course / Curriculum part
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Curriculum infoBab1 = new Curriculum(1,"info");
 | 
				
			||||||
 | 
					        Curriculum chemistryBab1 = new Curriculum(1,"chemistry");
 | 
				
			||||||
 | 
					        Curriculum psychologyBab1 = new Curriculum(1,"psychology");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        curriculumService.save(infoBab1);
 | 
				
			||||||
 | 
					        curriculumService.save(chemistryBab1);
 | 
				
			||||||
 | 
					        curriculumService.save(psychologyBab1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
 | 
				
			||||||
 | 
					        Course chemistry1 = new Course(12, "Thermochimie",joke);
 | 
				
			||||||
 | 
					        Course psycho1 = new Course(21, "Neuroreaction of isolated brain cells",joke);
 | 
				
			||||||
 | 
					        Course commun = new Course(2, "cours commun",joke);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        courseService.save(progra1);
 | 
				
			||||||
 | 
					        courseService.save(chemistry1);
 | 
				
			||||||
 | 
					        courseService.save(psycho1);
 | 
				
			||||||
 | 
					        courseService.save(commun);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        CurriculumCourseService.save(new CurriculumCourse(infoBab1,progra1));
 | 
				
			||||||
 | 
					        CurriculumCourseService.save(new CurriculumCourse(infoBab1,commun));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,psycho1));
 | 
				
			||||||
 | 
					        CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,commun));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,commun));
 | 
				
			||||||
 | 
					        CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        inscriptionService.save(inscriptionRequest);
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -0,0 +1,20 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.GetMapping;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.CrossOrigin;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.RestController;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.PingResponse;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class PingController {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						@GetMapping("/ping")
 | 
				
			||||||
 | 
						public PingResponse ping(){
 | 
				
			||||||
 | 
							return new PingResponse(1, "pong");
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -0,0 +1,36 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					import org.springframework.web.multipart.MultipartFile;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.StorageService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.FileType;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.StorageFile;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class StorageController {
 | 
				
			||||||
 | 
					    private final StorageService storageServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public StorageController(StorageService storageServ){
 | 
				
			||||||
 | 
					        this.storageServ= storageServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/upload/{fileType}")
 | 
				
			||||||
 | 
					    public ResponseEntity<StorageFile> handleFileUpload(@RequestParam("file") MultipartFile file, @PathVariable FileType fileType) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							StorageFile fileEntry;
 | 
				
			||||||
 | 
							try {
 | 
				
			||||||
 | 
								fileEntry = storageServ.store(file,fileType);
 | 
				
			||||||
 | 
								
 | 
				
			||||||
 | 
							} catch(Exception e){
 | 
				
			||||||
 | 
					            e.printStackTrace();
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(null,HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(fileEntry, HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,37 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.CrossOrigin;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.GetMapping;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.RequestHeader;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.RestController;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.AuthenticatorService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.TokenService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Token;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class TokenController {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final TokenService tokenServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final AuthenticatorService authServ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public TokenController(TokenService tokenServ, AuthenticatorService authServ){
 | 
				
			||||||
 | 
					        this.tokenServ = tokenServ;
 | 
				
			||||||
 | 
					        this.authServ = authServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/tokens")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<Token>> getTokens(@RequestHeader("Authorization")String token){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(tokenServ.getAllTokens(), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,139 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.EndPoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.AuthenticatorService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.ProtectionService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.UserService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					import java.util.HashMap;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@RestController
 | 
				
			||||||
 | 
					@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 | 
				
			||||||
 | 
					public class UserController {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final UserService userService;
 | 
				
			||||||
 | 
					    private final AuthenticatorService authServ;
 | 
				
			||||||
 | 
					    public UserController(UserService userService, AuthenticatorService authServ){
 | 
				
			||||||
 | 
					        this.userService = userService;
 | 
				
			||||||
 | 
					        this.authServ = authServ;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** returns information about the connected user
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param token the session token of the user
 | 
				
			||||||
 | 
					     * @return the user information except his password
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    @GetMapping("/user")
 | 
				
			||||||
 | 
					    public ResponseEntity<HashMap<String,Object>> getUser(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User user = authServ.getUserFromToken(token);
 | 
				
			||||||
 | 
					            if (user == null) return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.userWithoutPassword(user), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/user/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<HashMap<String ,Object>> getUserById(@RequestHeader("Authorization") String token, @PathVariable Long id){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/user")
 | 
				
			||||||
 | 
					    public ResponseEntity<Map<String ,Object>> postUser(@RequestBody User user,@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService,Role.Secretary},token))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.save(user)),HttpStatus.CREATED);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/users")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
 | 
				
			||||||
 | 
					          return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Role posterRole = authServ.getUserFromToken(token).getRole();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Iterable<User> users = new ArrayList<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (posterRole == Role.Admin)
 | 
				
			||||||
 | 
					            users = userService.getAll();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        else if (posterRole == Role.Secretary)
 | 
				
			||||||
 | 
					            users = userService.getAllExceptAdmins();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(users), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** changes the specified user's information
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param updates the changes to be made
 | 
				
			||||||
 | 
					     * @param token the session token of the user posting the change
 | 
				
			||||||
 | 
					     * @param id the id of the user to change
 | 
				
			||||||
 | 
					     * @return a string clarifying the issue (if there is any)
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    @PatchMapping("/user/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<String> patchUser(@RequestHeader("Authorization") String token,
 | 
				
			||||||
 | 
					                                            @RequestBody Map<String,Object> updates,
 | 
				
			||||||
 | 
					                                            @PathVariable Long id) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (token == null) return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User poster = authServ.getUserFromToken(token);
 | 
				
			||||||
 | 
					        if (poster == null) {return new UnauthorizedResponse<>("bad token");}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!userService.modifyData(id, updates, poster))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>("there was an issue with the updates requested");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(null, HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/teachers")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllTeachers(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					        if (authServ.getUserFromToken(token) == null)
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Iterable<User> teachers = userService.getAllTeachers();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(teachers), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/students")
 | 
				
			||||||
 | 
					    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllStudent(@RequestHeader("Authorization") String token){
 | 
				
			||||||
 | 
					        if (authServ.getUserFromToken(token) == null)
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Iterable<User> students = userService.getAllStudents();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(students), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @DeleteMapping("/user/{id}")
 | 
				
			||||||
 | 
					    public ResponseEntity<String> deleteStudent(@RequestHeader("Authorization") String token, @PathVariable Long id){
 | 
				
			||||||
 | 
					        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token) && !id.equals(authServ.getUserFromToken(token).getRegNo()))
 | 
				
			||||||
 | 
					            return new UnauthorizedResponse<>(null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User toDelete = userService.getUserById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (toDelete == null)
 | 
				
			||||||
 | 
					            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        userService.delete(toDelete);
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										37
									
								
								backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,37 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import javax.sql.DataSource;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.context.annotation.Bean;
 | 
				
			||||||
 | 
					import org.springframework.context.annotation.Configuration;
 | 
				
			||||||
 | 
					import org.springframework.context.annotation.Profile;
 | 
				
			||||||
 | 
					import org.springframework.jdbc.datasource.DriverManagerDataSource;
 | 
				
			||||||
 | 
					import org.springframework.scheduling.annotation.EnableScheduling;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Configuration
 | 
				
			||||||
 | 
					@EnableScheduling
 | 
				
			||||||
 | 
					public class JdbcConfig {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						@Bean
 | 
				
			||||||
 | 
						@Profile("!prod")
 | 
				
			||||||
 | 
						public DataSource psqlSource(){
 | 
				
			||||||
 | 
							DriverManagerDataSource source = new DriverManagerDataSource();
 | 
				
			||||||
 | 
							source.setDriverClassName("org.postgresql.Driver");
 | 
				
			||||||
 | 
							source.setUrl("jdbc:postgresql://localhost:5442/clyde");
 | 
				
			||||||
 | 
							source.setUsername("devel");
 | 
				
			||||||
 | 
							source.setPassword("devel");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							return source;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						@Bean
 | 
				
			||||||
 | 
						@Profile("prod")
 | 
				
			||||||
 | 
						public DataSource psqlSourceProd(){
 | 
				
			||||||
 | 
							DriverManagerDataSource source = new DriverManagerDataSource();
 | 
				
			||||||
 | 
							source.setDriverClassName("org.postgresql.Driver");
 | 
				
			||||||
 | 
							source.setUrl("jdbc:postgresql:clyde?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/var/run/postgresql/.s.PGSQL.5432");
 | 
				
			||||||
 | 
							source.setUsername("clyde");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							return source;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,15 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.jpa.repository.Query;
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Course;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface CourseRepository extends CrudRepository<Course,Long> {
 | 
				
			||||||
 | 
					    Course findById(long id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select c from Course c where c.owner = ?1")
 | 
				
			||||||
 | 
					    Iterable<Course> findAllOwnedCoures(User teacher);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,17 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.jpa.repository.Query;
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Course;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Curriculum;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.CurriculumCourse;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface CurriculumCourseRepository extends CrudRepository<CurriculumCourse,Long> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select distinct cc.course from CurriculumCourse cc where cc.curriculum = ?1")
 | 
				
			||||||
 | 
					    Iterable<Course> findCoursesByCurriculum(Curriculum curriculum);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select distinct cc.curriculum from  CurriculumCourse cc")
 | 
				
			||||||
 | 
					    Iterable<Curriculum> findDistinctCurriculums();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,8 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Curriculum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface CurriculumRepository extends CrudRepository<Curriculum,Long> {
 | 
				
			||||||
 | 
					    Curriculum findById(long id);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,14 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.jpa.repository.Query;
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.StorageFile;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface FileRepository extends CrudRepository<StorageFile,Long> {
 | 
				
			||||||
 | 
					    public StorageFile getStorageFileByName(String name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,10 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface InscriptionRepository extends CrudRepository<InscriptionRequest,Long> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    InscriptionRequest findById(long aLong);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,14 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.jpa.repository.Query;
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Course;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.TeacherCourse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface TeacherCourseRepository extends CrudRepository<TeacherCourse, Long> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select tc.user from TeacherCourse tc where tc.course = ?1")
 | 
				
			||||||
 | 
					    Iterable<User> findAllAssistantOfCourse(Course course);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,14 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Token;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface TokenRepository extends CrudRepository<Token,Long> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Token getByToken(String token);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ArrayList <Token> getByUserOrderByExpirationDate(User user);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,13 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.jpa.repository.Query;
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Curriculum;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.UserCurriculum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface UserCurriculumRepository extends CrudRepository<UserCurriculum, Long> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select uc.curriculum from UserCurriculum uc where uc.user = ?1")
 | 
				
			||||||
 | 
					    Curriculum findByUser(User student);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,23 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.data.jpa.repository.Query;
 | 
				
			||||||
 | 
					import org.springframework.data.repository.CrudRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public interface UserRepository extends CrudRepository<User, Long> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    User findById(long id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    User findByEmail(String email);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Teacher")
 | 
				
			||||||
 | 
					    Iterable<User> findAllTeachers();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Student")
 | 
				
			||||||
 | 
					    Iterable<User> findAllStudents();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query("select u from User u where u.role <> ovh.herisson.Clyde.Tables.Role.Admin")
 | 
				
			||||||
 | 
					    Iterable<User> findAllExceptAdmins();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Responses;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public record PingResponse(int id, String txt){};
 | 
				
			||||||
@ -0,0 +1,12 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Responses;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.ResponseEntity;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public class UnauthorizedResponse<T> extends ResponseEntity<T> {
 | 
				
			||||||
 | 
					    public UnauthorizedResponse(T message) {
 | 
				
			||||||
 | 
					        super(message,HttpStatus.UNAUTHORIZED);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,53 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.*;
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class AuthenticatorService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final TokenService tokenService;
 | 
				
			||||||
 | 
					    private final UserService userService;
 | 
				
			||||||
 | 
					    private final InscriptionService inscriptionService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public AuthenticatorService(TokenService tokenService, UserService userService, InscriptionService inscriptionService){
 | 
				
			||||||
 | 
					        this.tokenService = tokenService;
 | 
				
			||||||
 | 
					        this.userService = userService;
 | 
				
			||||||
 | 
					        this.inscriptionService = inscriptionService;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User getUserFromToken(String token){
 | 
				
			||||||
 | 
					        return tokenService.getUserFromToken(token);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String login(String identifier, String password, Date expirationDate){
 | 
				
			||||||
 | 
					        User user = userService.getUser(identifier);
 | 
				
			||||||
 | 
					        if (user == null){return null;}
 | 
				
			||||||
 | 
					        if (!userService.checkPassword(user,password)){return null;}
 | 
				
			||||||
 | 
					        String token = tokenService.generateNewToken();
 | 
				
			||||||
 | 
					        tokenService.saveToken(new Token(user, token,expirationDate));
 | 
				
			||||||
 | 
					        return token;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public InscriptionRequest register(InscriptionRequest inscriptionRequest) {
 | 
				
			||||||
 | 
					        inscriptionRequest.setState(RequestState.Pending);
 | 
				
			||||||
 | 
					        return inscriptionService.save(inscriptionRequest);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public boolean isNotIn(Role[] roles, String token){
 | 
				
			||||||
 | 
					        if (token == null)
 | 
				
			||||||
 | 
					            return true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User poster = getUserFromToken(token);
 | 
				
			||||||
 | 
					        if (poster == null) return true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (Role r:roles){
 | 
				
			||||||
 | 
					            if (poster.getRole() == r)
 | 
				
			||||||
 | 
					                return false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -0,0 +1,83 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.CourseRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Course;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class CourseService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CourseRepository courseRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public CourseService(CourseRepository courseRepo) {
 | 
				
			||||||
 | 
					        this.courseRepo = courseRepo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Course save(Course course){
 | 
				
			||||||
 | 
					        if (course.getOwner().getRole() != Role.Teacher)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					        return courseRepo.save(course);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Course findById(long id){
 | 
				
			||||||
 | 
					        return courseRepo.findById(id);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<Course> findAll() {
 | 
				
			||||||
 | 
					        return courseRepo.findAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<Course> findOwnedCourses(User userFromToken) {
 | 
				
			||||||
 | 
					        return courseRepo.findAllOwnedCoures(userFromToken);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public boolean modifyData(long id, Map<String, Object> updates, Role role) {
 | 
				
			||||||
 | 
					        Course target = courseRepo.findById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (target == null)
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (role == Role.Teacher){
 | 
				
			||||||
 | 
					            for (Map.Entry<String, Object> entry : updates.entrySet()){
 | 
				
			||||||
 | 
					                if (entry.getKey().equals("title")){
 | 
				
			||||||
 | 
					                    target.setTitle((String) entry.getValue());
 | 
				
			||||||
 | 
					                    courseRepo.save(target);
 | 
				
			||||||
 | 
					                    return true;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (role != Role.Secretary)
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (Map.Entry<String ,Object> entry: updates.entrySet()){
 | 
				
			||||||
 | 
					            switch (entry.getKey()){
 | 
				
			||||||
 | 
					                case "title":
 | 
				
			||||||
 | 
					                    target.setTitle((String) entry.getValue());
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                case "credits":
 | 
				
			||||||
 | 
					                    target.setCredits((Integer) entry.getValue());
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                case "owner":
 | 
				
			||||||
 | 
					                    if (((User) entry.getValue() ).getRole() != Role.Teacher)
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    target.setOwner((User) entry.getValue());
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        courseRepo.save(target);
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void delete(Course course) {
 | 
				
			||||||
 | 
					        courseRepo.delete(course);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,93 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.CourseRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.CurriculumCourseRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.CurriculumRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					import java.util.HashMap;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class CurriculumCourseService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CurriculumCourseRepository curriculumCourseRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CourseRepository courseRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CurriculumRepository curriculumRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public CurriculumCourseService(CurriculumCourseRepository curriculumCourseRepository, CourseRepository courseRepo, CurriculumRepository curriculumRepo) {
 | 
				
			||||||
 | 
					        this.curriculumCourseRepo = curriculumCourseRepository;
 | 
				
			||||||
 | 
					        this.courseRepo = courseRepo;
 | 
				
			||||||
 | 
					        this.curriculumRepo = curriculumRepo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void save(CurriculumCourse curriculumCourse){
 | 
				
			||||||
 | 
					        curriculumCourseRepo.save(curriculumCourse);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Map<String, Object> getDepthCurriculum(Curriculum curriculum){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (curriculum == null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        HashMap<String ,Object> toReturn = new HashMap<>();
 | 
				
			||||||
 | 
					        ArrayList<Map<String ,Object>> courses = new ArrayList<>();
 | 
				
			||||||
 | 
					        Iterable<Course> foundCourses = curriculumCourseRepo.findCoursesByCurriculum(curriculum);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (Course c: foundCourses){
 | 
				
			||||||
 | 
					            courses.add(ProtectionService.courseWithoutPassword(c));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        toReturn.put("courses",courses);
 | 
				
			||||||
 | 
					        toReturn.put("curriculumId", curriculum.getCurriculumId());
 | 
				
			||||||
 | 
					        toReturn.put("year", curriculum.getYear());
 | 
				
			||||||
 | 
					        toReturn.put("option", curriculum.getOption());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return  toReturn;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<Map<String, Object>> getAllDepthCurriculum(){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (Curriculum curriculum : curriculumRepo.findAll()){
 | 
				
			||||||
 | 
					            toReturn.add(getDepthCurriculum(curriculum));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return toReturn;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** tries to add all courses to the curriculum
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param coursesIds the ids of the courses to be added
 | 
				
			||||||
 | 
					     * @param curriculum the curriculum to add the courses to
 | 
				
			||||||
 | 
					     * @return if the changes were made
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public boolean saveAll(Iterable<Long> coursesIds, Curriculum curriculum) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (curriculum == null || coursesIds == null)
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ArrayList<Course> toAdd = new ArrayList<>();
 | 
				
			||||||
 | 
					        for (Long courseId : coursesIds){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Course course = courseRepo.findById((long) courseId);
 | 
				
			||||||
 | 
					            if (course == null)
 | 
				
			||||||
 | 
					                return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (!toAdd.contains(course))
 | 
				
			||||||
 | 
					                toAdd.add(course);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (Course course : toAdd){
 | 
				
			||||||
 | 
					            curriculumCourseRepo.save(new CurriculumCourse(curriculum,course));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,25 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.CurriculumRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Curriculum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class CurriculumService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CurriculumRepository curriculumRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public CurriculumService(CurriculumRepository curriculumRepo){
 | 
				
			||||||
 | 
					        this.curriculumRepo = curriculumRepo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    public Curriculum save(Curriculum curriculum){
 | 
				
			||||||
 | 
					        return curriculumRepo.save(curriculum);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    public Curriculum findById(long id){
 | 
				
			||||||
 | 
					        return curriculumRepo.findById(id);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void delete(Curriculum curriculum) {
 | 
				
			||||||
 | 
					        curriculumRepo.delete(curriculum);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,94 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.CurriculumRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.RequestState;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.UserCurriculum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class InscriptionService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final InscriptionRepository inscriptionRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final UserRepository userRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final UserCurriculumRepository userCurriculumRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final CurriculumRepository curriculumRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo){
 | 
				
			||||||
 | 
					        this.inscriptionRepo = inscriptionRepo;
 | 
				
			||||||
 | 
					        this.userRepo = userRepo;
 | 
				
			||||||
 | 
					        this.userCurriculumRepo = userCurriculumRepo;
 | 
				
			||||||
 | 
					        this.curriculumRepo = curriculumRepo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public InscriptionRequest save(InscriptionRequest inscriptionRequest){
 | 
				
			||||||
 | 
					        inscriptionRequest.setPassword(passwordEncoder.encode(inscriptionRequest.getPassword()));
 | 
				
			||||||
 | 
					        return inscriptionRepo.save(inscriptionRequest);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public InscriptionRequest getById(long id){
 | 
				
			||||||
 | 
					        return inscriptionRepo.findById(id);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<InscriptionRequest> getAll(){
 | 
				
			||||||
 | 
					        return inscriptionRepo.findAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public boolean modifyState(long id, RequestState requestState) {
 | 
				
			||||||
 | 
					        InscriptionRequest inscrRequest = getById(id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (inscrRequest == null)
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // if th state is the same we don't send an email
 | 
				
			||||||
 | 
					        if (requestState == inscrRequest.getState())
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /** todo send an email to tell the poster of the inscrRequest (inscrRequest.getEmail())
 | 
				
			||||||
 | 
					         *  to notify them that the state of their request changed
 | 
				
			||||||
 | 
					         *  FooEmailFormat toSend = (String.format("Your request state changed from %s to %s"),
 | 
				
			||||||
 | 
					         *                                              inscrRequest.getState(), requestState)
 | 
				
			||||||
 | 
					         * FooEmailSender.send(toSend, inscrRequest.getEmail())
 | 
				
			||||||
 | 
					         */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //saves the user from the request if accepted
 | 
				
			||||||
 | 
					        if (requestState == RequestState.Accepted)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            if (curriculumRepo.findById(inscrRequest.getCurriculumId()) == null)
 | 
				
			||||||
 | 
					                return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            User userFromRequest = new User(
 | 
				
			||||||
 | 
					                    inscrRequest.getLastName(),
 | 
				
			||||||
 | 
					                    inscrRequest.getFirstName(),
 | 
				
			||||||
 | 
					                    inscrRequest.getEmail(),
 | 
				
			||||||
 | 
					                    inscrRequest.getAddress(),
 | 
				
			||||||
 | 
					                    inscrRequest.getCountry(),
 | 
				
			||||||
 | 
					                    inscrRequest.getBirthDate(),
 | 
				
			||||||
 | 
					                    inscrRequest.getProfilePicture(),
 | 
				
			||||||
 | 
					                    inscrRequest.getPassword()
 | 
				
			||||||
 | 
					            );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            userRepo.save(userFromRequest);
 | 
				
			||||||
 | 
					            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId())));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        inscrRequest.setState(requestState);
 | 
				
			||||||
 | 
					        save(inscrRequest);
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void delete(InscriptionRequest toDelete) {
 | 
				
			||||||
 | 
					        inscriptionRepo.delete(toDelete);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,105 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Course;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.InscriptionRequest;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					import java.util.HashMap;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public class ProtectionService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** return user's data except password
 | 
				
			||||||
 | 
					     * @param user the user to return
 | 
				
			||||||
 | 
					     * @return all the user data without the password
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public static HashMap<String,Object> userWithoutPassword(User user){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (user ==null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        HashMap<String,Object> toReturn = new HashMap<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        toReturn.put("regNo",user.getRegNo());
 | 
				
			||||||
 | 
					        toReturn.put("lastName",user.getLastName());
 | 
				
			||||||
 | 
					        toReturn.put("firstName",user.getFirstName());
 | 
				
			||||||
 | 
					        toReturn.put("email", user.getEmail());
 | 
				
			||||||
 | 
					        toReturn.put("address",user.getAddress());
 | 
				
			||||||
 | 
					        toReturn.put("birthDate",user.getBirthDate());
 | 
				
			||||||
 | 
					        toReturn.put("country",user.getCountry());
 | 
				
			||||||
 | 
					        toReturn.put("profilePictureUrl",user.getProfilePictureUrl());
 | 
				
			||||||
 | 
					        toReturn.put("role",user.getRole());
 | 
				
			||||||
 | 
					        return toReturn;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public static Iterable<HashMap<String ,Object>>usersWithoutPasswords(Iterable<User> users){
 | 
				
			||||||
 | 
					        ArrayList<HashMap<String,Object>> toReturn = new ArrayList<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (User u : users){
 | 
				
			||||||
 | 
					            toReturn.add(userWithoutPassword(u));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return toReturn;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public static HashMap<String,Object> courseWithoutPassword(Course course){
 | 
				
			||||||
 | 
					        if (course == null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        HashMap<String ,Object> toReturn = new HashMap<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        toReturn.put("courseId",course.getCourseID());
 | 
				
			||||||
 | 
					        toReturn.put("credits",course.getCredits());
 | 
				
			||||||
 | 
					        toReturn.put("title", course.getTitle());
 | 
				
			||||||
 | 
					        toReturn.put("owner", userWithoutPassword(course.getOwner()));
 | 
				
			||||||
 | 
					        return toReturn;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public static Iterable<HashMap<String ,Object>> coursesWithoutPasswords(Iterable<Course> courses){
 | 
				
			||||||
 | 
					        ArrayList<HashMap<String,Object>> toReturn = new ArrayList<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (Course course: courses){
 | 
				
			||||||
 | 
					            toReturn.add(ProtectionService.courseWithoutPassword(course));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return toReturn;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public static Map<String, Object> requestWithoutPassword(InscriptionRequest inscriptionRequest) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (inscriptionRequest == null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Map<String, Object> toReturn = new HashMap<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        toReturn.put("id", inscriptionRequest.getId());
 | 
				
			||||||
 | 
					        toReturn.put("lastName", inscriptionRequest.getLastName());
 | 
				
			||||||
 | 
					        toReturn.put("firstName", inscriptionRequest.getFirstName());
 | 
				
			||||||
 | 
					        toReturn.put("address", inscriptionRequest.getAddress());
 | 
				
			||||||
 | 
					        toReturn.put("email",inscriptionRequest.getEmail());
 | 
				
			||||||
 | 
					        toReturn.put("birthDate", inscriptionRequest.getBirthDate());
 | 
				
			||||||
 | 
					        toReturn.put("country", inscriptionRequest.getCountry());
 | 
				
			||||||
 | 
					        toReturn.put("curriculum", inscriptionRequest.getCurriculumId());
 | 
				
			||||||
 | 
					        toReturn.put("state", inscriptionRequest.getState());
 | 
				
			||||||
 | 
					        toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return toReturn;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public static Iterable<Map<String ,Object>> requestsWithoutPasswords(Iterable<InscriptionRequest> inscriptionRequests){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (InscriptionRequest i:inscriptionRequests){
 | 
				
			||||||
 | 
					            toReturn.add(requestWithoutPassword(i));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return toReturn;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -0,0 +1,69 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import org.springframework.web.multipart.MultipartFile;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.FileRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.*;
 | 
				
			||||||
 | 
					import java.io.File;
 | 
				
			||||||
 | 
					import java.io.IOException;
 | 
				
			||||||
 | 
					import java.nio.file.Files;
 | 
				
			||||||
 | 
					import java.nio.file.Path;
 | 
				
			||||||
 | 
					import java.nio.file.Paths;
 | 
				
			||||||
 | 
					import java.nio.file.StandardCopyOption;
 | 
				
			||||||
 | 
					import java.util.Objects;
 | 
				
			||||||
 | 
					import java.util.UUID;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class StorageService {
 | 
				
			||||||
 | 
					    private final Path rootLocation = Paths.get("cdn/");
 | 
				
			||||||
 | 
					    private final FileRepository fileRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public StorageService(FileRepository filerepo){
 | 
				
			||||||
 | 
					        this.fileRepo = filerepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							if(!Files.exists(rootLocation)){
 | 
				
			||||||
 | 
								try {
 | 
				
			||||||
 | 
									Files.createDirectories(rootLocation);
 | 
				
			||||||
 | 
								} catch(IOException e){
 | 
				
			||||||
 | 
									e.printStackTrace();
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public StorageFile store(MultipartFile file, FileType fileType) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (file == null || file.getOriginalFilename() == null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (file.getOriginalFilename().isEmpty()){return null;}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        UUID uuid = UUID.randomUUID();
 | 
				
			||||||
 | 
					        String stringUuid = uuid + "." + file.getOriginalFilename().split("\\.",2)[1];
 | 
				
			||||||
 | 
					        try {
 | 
				
			||||||
 | 
					            if (file.isEmpty()) {
 | 
				
			||||||
 | 
					                return null;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Path destinationFile = this.rootLocation.resolve(Paths.get(stringUuid));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Files.copy(file.getInputStream(), destinationFile,StandardCopyOption.REPLACE_EXISTING);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        catch (IOException e) {
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        String url = this.rootLocation.resolve(Paths.get(Objects.requireNonNull(stringUuid)))
 | 
				
			||||||
 | 
					                .normalize().toString();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return fileRepo.save(new StorageFile(file.getOriginalFilename(),url, fileType));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void delete(StorageFile file) throws SecurityException {
 | 
				
			||||||
 | 
					        File f = new File(file.getUrl());
 | 
				
			||||||
 | 
					        f.delete();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Delete l'entité
 | 
				
			||||||
 | 
					        fileRepo.delete(file);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,53 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Controller;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.TeacherCourseRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Course;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.TeacherCourse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Controller
 | 
				
			||||||
 | 
					public class TeacherCourseService {
 | 
				
			||||||
 | 
					    private final TeacherCourseRepository teacherCourseRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final UserRepository userRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public TeacherCourseService(TeacherCourseRepository teacherCourseRepo, UserRepository userRepo) {
 | 
				
			||||||
 | 
					        this.teacherCourseRepo = teacherCourseRepo;
 | 
				
			||||||
 | 
					        this.userRepo = userRepo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<User> findCourseAssistants(Course course) {
 | 
				
			||||||
 | 
					        if (course == null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					        return teacherCourseRepo.findAllAssistantOfCourse(course);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public boolean saveAll(Iterable<Long> teacherIds, Course course){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (course == null  || teacherIds == null)
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ArrayList<User> toAdd = new ArrayList<>();
 | 
				
			||||||
 | 
					        for (Long teacherId : teacherIds){
 | 
				
			||||||
 | 
					            User teacher = userRepo.findById((long) teacherId);
 | 
				
			||||||
 | 
					            if ( teacher== null){
 | 
				
			||||||
 | 
					                return false;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            if (!toAdd.contains(teacher) && teacher.getRole() == Role.Teacher)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                toAdd.add(teacher);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        for (User teacher: toAdd){
 | 
				
			||||||
 | 
					            teacherCourseRepo.save(new TeacherCourse(teacher,course));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,74 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.scheduling.annotation.Scheduled;
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.TokenRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Token;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					import java.io.UnsupportedEncodingException;
 | 
				
			||||||
 | 
					import java.security.SecureRandom;
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					import java.util.Base64;
 | 
				
			||||||
 | 
					import java.util.Calendar;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class TokenService {
 | 
				
			||||||
 | 
					    private final TokenRepository tokenRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public TokenService(TokenRepository tokenRepo){
 | 
				
			||||||
 | 
					        this.tokenRepo = tokenRepo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<Token> getAllTokens() {
 | 
				
			||||||
 | 
					        return tokenRepo.findAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String generateNewToken(){
 | 
				
			||||||
 | 
					        byte[] bytes = new byte[64];
 | 
				
			||||||
 | 
					        new SecureRandom().nextBytes(bytes);
 | 
				
			||||||
 | 
					        for (int i = 0; i < bytes.length; i++) {
 | 
				
			||||||
 | 
					            bytes[i] = (byte) (((bytes[i]+256)%256  %95+ 32));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        // will never end up in the catch because of the way that SecureRandom.nextBytes is implemented
 | 
				
			||||||
 | 
					        try {
 | 
				
			||||||
 | 
					            return new String(Base64.getEncoder().encode(bytes),"ISO_8859_1");
 | 
				
			||||||
 | 
					        } catch (UnsupportedEncodingException e) {
 | 
				
			||||||
 | 
					            throw new RuntimeException(e);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User getUserFromToken(String token) {
 | 
				
			||||||
 | 
					        Token tokenRep = tokenRepo.getByToken(token);
 | 
				
			||||||
 | 
					        if (tokenRep == null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return tokenRep.getUser();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void saveToken(Token token){
 | 
				
			||||||
 | 
					        //Si l'utilisateur a déja 5 token delete celui qui devait expirer le plus vite
 | 
				
			||||||
 | 
					        ArrayList<Token> tokenList = tokenRepo.getByUserOrderByExpirationDate(token.getUser());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        while(tokenList.size() >= 5){
 | 
				
			||||||
 | 
					            tokenRepo.delete(tokenList.getFirst());
 | 
				
			||||||
 | 
					            tokenList.remove(tokenList.getFirst());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        tokenRepo.save(token);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //Tous les jours a minuit
 | 
				
			||||||
 | 
					    @Scheduled(cron = "0 0 0 * * ?")
 | 
				
			||||||
 | 
					    public void autoDeleteToken() {
 | 
				
			||||||
 | 
					        for (Token t: tokenRepo.findAll()){
 | 
				
			||||||
 | 
					            Calendar cal = Calendar.getInstance();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Calendar cal2 = Calendar.getInstance();
 | 
				
			||||||
 | 
					            cal2.setTime(t.getExpirationDate());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (cal.compareTo(cal2) >= 0){
 | 
				
			||||||
 | 
					                tokenRepo.delete(t);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,20 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Curriculum;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class UserCurriculumService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final UserCurriculumRepository userCurriculumRepository;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository) {
 | 
				
			||||||
 | 
					        this.userCurriculumRepository = userCurriculumRepository;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Curriculum findByUser(User student){
 | 
				
			||||||
 | 
					        return userCurriculumRepository.findByUser(student);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,134 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					import java.util.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public class UserService {
 | 
				
			||||||
 | 
					    private final UserRepository userRepo;
 | 
				
			||||||
 | 
					    private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public UserService(UserRepository userRepo){
 | 
				
			||||||
 | 
					        this.userRepo = userRepo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** return the user identified by th identifier
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param identifier can be an email or the RegNo
 | 
				
			||||||
 | 
					     * @return the identified user
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public User getUser(String identifier){
 | 
				
			||||||
 | 
					        if (identifier == null)
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        try {
 | 
				
			||||||
 | 
					            int id = Integer.parseInt(identifier);
 | 
				
			||||||
 | 
					            return userRepo.findById(id);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        catch (NumberFormatException nfe){
 | 
				
			||||||
 | 
					            return userRepo.findByEmail(identifier);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /** modify the target data
 | 
				
			||||||
 | 
					     * verify the permission of modifying from the poster
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param poster the user wanting to modify target's data
 | 
				
			||||||
 | 
					     * @param updates the changes to be made
 | 
				
			||||||
 | 
					     * @param targetId the id of the user to update
 | 
				
			||||||
 | 
					     * @return if the changes were done or not
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public boolean modifyData(long targetId, Map<String ,Object> updates, User poster){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User target = userRepo.findById(targetId);
 | 
				
			||||||
 | 
					        if (target == null)
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (poster.getRegNo().equals(target.getRegNo())){
 | 
				
			||||||
 | 
					            for (Map.Entry<String, Object> entry : updates.entrySet()){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                switch (entry.getKey()){
 | 
				
			||||||
 | 
					                    case "firstName":
 | 
				
			||||||
 | 
					                        target.setFirstName((String) entry.getValue());
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                    case "lastName":
 | 
				
			||||||
 | 
					                        target.setLastName((String) entry.getValue());
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                    case "email":
 | 
				
			||||||
 | 
					                        target.setEmail((String) entry.getValue());
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                    case "address":
 | 
				
			||||||
 | 
					                        target.setAddress((String) entry.getValue());
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                    case "country":
 | 
				
			||||||
 | 
					                        target.setCountry((String) entry.getValue());
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                    case "birthDate":
 | 
				
			||||||
 | 
					                        target.setBirthDate((Date) entry.getValue());
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                    case "profilePictureUrl":
 | 
				
			||||||
 | 
					                        target.setProfilePictureUrl((String) entry.getValue());
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                    case "password":
 | 
				
			||||||
 | 
					                        target.setPassword(passwordEncoder.encode((String) entry.getValue()));
 | 
				
			||||||
 | 
					                        break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            userRepo.save(target);
 | 
				
			||||||
 | 
					            return true;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        // the secretary can change roles (for example if a student becomes a teacher)
 | 
				
			||||||
 | 
					        else if (poster.getRole() == Role.Secretary)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            for (Map.Entry<String, Object> entry : updates.entrySet()){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                if ( entry.getKey().equals("role")) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    if (entry.getValue() == Role.Admin) {return false;}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    target.setRole((Role) entry.getValue());
 | 
				
			||||||
 | 
					                    userRepo.save(target);
 | 
				
			||||||
 | 
					                    return true;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public boolean checkPassword(User user, String tryingPassword){
 | 
				
			||||||
 | 
					        return passwordEncoder.matches(tryingPassword,  user.getPassword());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User save(User  user){
 | 
				
			||||||
 | 
					        user.setPassword(passwordEncoder.encode(user.getPassword()));
 | 
				
			||||||
 | 
					        return userRepo.save(user);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<User> getAll(){
 | 
				
			||||||
 | 
					        return userRepo.findAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<User> getAllExceptAdmins(){
 | 
				
			||||||
 | 
					        return userRepo.findAllExceptAdmins();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<User> getAllTeachers (){return userRepo.findAllTeachers();}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Iterable<User> getAllStudents(){return userRepo.findAllStudents();}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User getUserById(long id) {
 | 
				
			||||||
 | 
					        return userRepo.findById(id);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void delete(User user) {
 | 
				
			||||||
 | 
					        userRepo.delete(user);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,24 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public enum Applications {
 | 
				
			||||||
 | 
					    // without any token
 | 
				
			||||||
 | 
					    Login,
 | 
				
			||||||
 | 
					    Schedule,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // with any token
 | 
				
			||||||
 | 
					    Profile,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Students and higher authorization
 | 
				
			||||||
 | 
					    Msg,
 | 
				
			||||||
 | 
					    Forum,
 | 
				
			||||||
 | 
					    Rdv,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // teachers and Secretary authorization
 | 
				
			||||||
 | 
					    ManageCourses,
 | 
				
			||||||
 | 
					    UsersList,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // InscriptionService authorization
 | 
				
			||||||
 | 
					    Inscription,
 | 
				
			||||||
 | 
					    StudentsList
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										55
									
								
								backend/src/main/java/ovh/herisson/Clyde/Tables/Course.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								backend/src/main/java/ovh/herisson/Clyde/Tables/Course.java
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,55 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDelete;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDeleteAction;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class Course {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private int courseID;
 | 
				
			||||||
 | 
					    private int credits;
 | 
				
			||||||
 | 
					    private String title;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.SET_NULL)
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Users")
 | 
				
			||||||
 | 
					    private User owner;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Course(int credits, String title, User owner){
 | 
				
			||||||
 | 
					        this.credits = credits;
 | 
				
			||||||
 | 
					        this.title = title;
 | 
				
			||||||
 | 
					        this.owner = owner;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Course() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getCourseID() {
 | 
				
			||||||
 | 
					        return courseID;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getCredits() {
 | 
				
			||||||
 | 
					        return credits;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCredits(int credits){
 | 
				
			||||||
 | 
					        this.credits = credits;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getTitle() {
 | 
				
			||||||
 | 
					        return title;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setTitle(String title){
 | 
				
			||||||
 | 
					        this.title = title;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User getOwner() {
 | 
				
			||||||
 | 
					        return owner;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setOwner(User owner) {
 | 
				
			||||||
 | 
					        this.owner = owner;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,42 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.Entity;
 | 
				
			||||||
 | 
					import jakarta.persistence.GeneratedValue;
 | 
				
			||||||
 | 
					import jakarta.persistence.GenerationType;
 | 
				
			||||||
 | 
					import jakarta.persistence.Id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class Curriculum {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private int curriculumId;
 | 
				
			||||||
 | 
					    private int year;
 | 
				
			||||||
 | 
					    private String option;
 | 
				
			||||||
 | 
					    public Curriculum(int year, String option){
 | 
				
			||||||
 | 
					        this.year = year;
 | 
				
			||||||
 | 
					        this.option = option;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Curriculum() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getCurriculumId(){
 | 
				
			||||||
 | 
					        return this.curriculumId;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getYear(){
 | 
				
			||||||
 | 
					        return this.year;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setYear(int year){
 | 
				
			||||||
 | 
					        this.year = year;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getOption(){
 | 
				
			||||||
 | 
					        return this.option;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setOption(String option){
 | 
				
			||||||
 | 
					        this.option = option;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,49 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDelete;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDeleteAction;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class CurriculumCourse {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private int id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Curriculum")
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    private Curriculum curriculum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Course")
 | 
				
			||||||
 | 
					    private Course course;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public CurriculumCourse(Curriculum curriculum, Course course){
 | 
				
			||||||
 | 
					        this.curriculum = curriculum;
 | 
				
			||||||
 | 
					        this.course = course;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public CurriculumCourse() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getId() {
 | 
				
			||||||
 | 
					        return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Course getCourse() {
 | 
				
			||||||
 | 
					        return course;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCourse(Course course){
 | 
				
			||||||
 | 
					        this.course = course;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Curriculum getCurriculum() {
 | 
				
			||||||
 | 
					        return curriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCurriculum(Curriculum curriculum) {
 | 
				
			||||||
 | 
					        this.curriculum = curriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,8 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public enum FileType {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ProfilePicture,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    EducationCertificate
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,121 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class InscriptionRequest {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private int id;
 | 
				
			||||||
 | 
					    private String firstName;
 | 
				
			||||||
 | 
					    private String lastName;
 | 
				
			||||||
 | 
					    private String address;
 | 
				
			||||||
 | 
					    private String email;
 | 
				
			||||||
 | 
					    private String country;
 | 
				
			||||||
 | 
					    private Date birthDate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private Long curriculumId;
 | 
				
			||||||
 | 
					    private RequestState state;
 | 
				
			||||||
 | 
					    private String profilePicture;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private String password;
 | 
				
			||||||
 | 
					    public InscriptionRequest(){}
 | 
				
			||||||
 | 
					    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password){
 | 
				
			||||||
 | 
					        this.lastName = lastName;
 | 
				
			||||||
 | 
					        this.firstName = firstName;
 | 
				
			||||||
 | 
					        this.address = address;
 | 
				
			||||||
 | 
					        this.email = email;
 | 
				
			||||||
 | 
					        this.country = country;
 | 
				
			||||||
 | 
					        this.birthDate = birthDate;
 | 
				
			||||||
 | 
					        this.curriculumId = curriculumId;
 | 
				
			||||||
 | 
					        this.state = state;
 | 
				
			||||||
 | 
					        this.profilePicture = profilePicture;
 | 
				
			||||||
 | 
					        this.password = password;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getId() {
 | 
				
			||||||
 | 
					        return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getFirstName() {
 | 
				
			||||||
 | 
					        return firstName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setFirstName(String firstName) {
 | 
				
			||||||
 | 
					        this.firstName = firstName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getLastName() {
 | 
				
			||||||
 | 
					        return lastName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setLastName(String lastName) {
 | 
				
			||||||
 | 
					        this.lastName = lastName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getAddress() {
 | 
				
			||||||
 | 
					        return address;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setAddress(String address) {
 | 
				
			||||||
 | 
					        this.address = address;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getEmail() {
 | 
				
			||||||
 | 
					        return email;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setEmail(String email) {
 | 
				
			||||||
 | 
					        this.email = email;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getCountry() {
 | 
				
			||||||
 | 
					        return country;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCountry(String country) {
 | 
				
			||||||
 | 
					        this.country = country;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Date getBirthDate() {
 | 
				
			||||||
 | 
					        return birthDate;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setBirthDate(Date birthDate) {
 | 
				
			||||||
 | 
					        this.birthDate = birthDate;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public long getCurriculumId() {
 | 
				
			||||||
 | 
					        return curriculumId;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCurriculumId(long curriculum) {
 | 
				
			||||||
 | 
					        this.curriculumId = curriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public RequestState getState() {
 | 
				
			||||||
 | 
					        return state;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setState(RequestState state) {
 | 
				
			||||||
 | 
					        this.state = state;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getProfilePicture() {
 | 
				
			||||||
 | 
					        return profilePicture;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setProfilePicture(String profilePicture) {
 | 
				
			||||||
 | 
					        this.profilePicture = profilePicture;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getPassword() {
 | 
				
			||||||
 | 
					        return password;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setPassword(String password) {
 | 
				
			||||||
 | 
					        this.password = password;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,78 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDelete;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDeleteAction;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class ReInscriptionRequest {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private int id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Users")
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    private User user;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Curriculum")
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    private Curriculum newCurriculum;
 | 
				
			||||||
 | 
					    private RequestState state;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //Permet de différencier les demandes de changement et une réinscription dans le même Curriculum
 | 
				
			||||||
 | 
					    //Pour la réinscription on va le mettre a 0
 | 
				
			||||||
 | 
					    private boolean type = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ReInscriptionRequest(){}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ReInscriptionRequest(User user, Curriculum newCurriculum, RequestState state, boolean type){
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					        this.newCurriculum = newCurriculum;
 | 
				
			||||||
 | 
					        this.state = state;
 | 
				
			||||||
 | 
					        this.type = type;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ReInscriptionRequest(User user, Curriculum newCurriculum, RequestState state){
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					        this.newCurriculum = newCurriculum;
 | 
				
			||||||
 | 
					        this.state = state;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getId() {
 | 
				
			||||||
 | 
					        return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User getUser() {
 | 
				
			||||||
 | 
					        return user;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setUser(User user) {
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Curriculum getNewCurriculum() {
 | 
				
			||||||
 | 
					        return newCurriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setNewCurriculum(Curriculum newCurriculum) {
 | 
				
			||||||
 | 
					        this.newCurriculum = newCurriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public RequestState getState() {
 | 
				
			||||||
 | 
					        return state;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setState(RequestState state) {
 | 
				
			||||||
 | 
					        this.state = state;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public boolean isType() {
 | 
				
			||||||
 | 
					        return type;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setType(boolean type) {
 | 
				
			||||||
 | 
					        this.type = type;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,7 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public enum RequestState {
 | 
				
			||||||
 | 
					    Accepted,
 | 
				
			||||||
 | 
					    Refused,
 | 
				
			||||||
 | 
					    Pending
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,9 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public enum Role {
 | 
				
			||||||
 | 
					    Teacher,
 | 
				
			||||||
 | 
					    Student,
 | 
				
			||||||
 | 
					    Admin,
 | 
				
			||||||
 | 
					    InscriptionService,
 | 
				
			||||||
 | 
					    Secretary
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,59 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class StorageFile {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private Long id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private String name;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private String url;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private FileType fileType;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public StorageFile(String name, String url, FileType fileType){
 | 
				
			||||||
 | 
					        this.name = name;
 | 
				
			||||||
 | 
					        this.url = url;
 | 
				
			||||||
 | 
					        this.fileType = fileType;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public StorageFile(){}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setId(Long id) {
 | 
				
			||||||
 | 
					        this.id = id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Long getId() {
 | 
				
			||||||
 | 
					        return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getName() {
 | 
				
			||||||
 | 
					        return name;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setName(String name) {
 | 
				
			||||||
 | 
					        this.name = name;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getUrl() {
 | 
				
			||||||
 | 
					        return url;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setUrl(String url) {
 | 
				
			||||||
 | 
					        this.url = url;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public FileType getFileType() {
 | 
				
			||||||
 | 
					        return fileType;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setFileType(FileType fileType) {
 | 
				
			||||||
 | 
					        this.fileType = fileType;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,51 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDelete;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDeleteAction;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class TeacherCourse {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private int id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Users")
 | 
				
			||||||
 | 
					    private User user;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Course")
 | 
				
			||||||
 | 
					    private Course course;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public TeacherCourse(User user, Course course){
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					        this.course = course;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public TeacherCourse() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getId() {
 | 
				
			||||||
 | 
					        return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User getUser() {
 | 
				
			||||||
 | 
					        return user;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setUser(User user) {
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Course getCourse() {
 | 
				
			||||||
 | 
					        return course;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCourse(Course course) {
 | 
				
			||||||
 | 
					        this.course = course;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										56
									
								
								backend/src/main/java/ovh/herisson/Clyde/Tables/Token.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								backend/src/main/java/ovh/herisson/Clyde/Tables/Token.java
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,56 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDelete;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDeleteAction;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class Token {
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    private int id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    @JoinColumn(name ="Users")
 | 
				
			||||||
 | 
					    private User user;
 | 
				
			||||||
 | 
					    private String token;
 | 
				
			||||||
 | 
					    private Date expirationDate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Token(User user, String token, Date expirationDate){
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					        this.token = token;
 | 
				
			||||||
 | 
					        this.expirationDate = expirationDate;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Token(){}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getId() {
 | 
				
			||||||
 | 
					        return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    public User getUser() {
 | 
				
			||||||
 | 
					        return user;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setUser(User regNo) {
 | 
				
			||||||
 | 
					        this.user = regNo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getToken(){
 | 
				
			||||||
 | 
					        return token;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setToken(String data) {
 | 
				
			||||||
 | 
					        this.token = data;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setExpirationDate(Date date){
 | 
				
			||||||
 | 
					        this.expirationDate = date;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Date getExpirationDate(){
 | 
				
			||||||
 | 
					        return expirationDate;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										122
									
								
								backend/src/main/java/ovh/herisson/Clyde/Tables/User.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										122
									
								
								backend/src/main/java/ovh/herisson/Clyde/Tables/User.java
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,122 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					@Table(name = "Users")
 | 
				
			||||||
 | 
					public class User {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private Long regNo;
 | 
				
			||||||
 | 
					    private String lastName;
 | 
				
			||||||
 | 
					    private String firstName;
 | 
				
			||||||
 | 
					    @Column(unique = true)
 | 
				
			||||||
 | 
					    private String email;
 | 
				
			||||||
 | 
					    private String address;
 | 
				
			||||||
 | 
					    private String country;
 | 
				
			||||||
 | 
					    private Date birthDate;
 | 
				
			||||||
 | 
					    private String profilePictureUrl;
 | 
				
			||||||
 | 
					    private ovh.herisson.Clyde.Tables.Role role;
 | 
				
			||||||
 | 
					    private String password;
 | 
				
			||||||
 | 
					    public User(String lastName, String firstName, String email, String address,
 | 
				
			||||||
 | 
					                String country, Date birthDate, String profilePictureUrl, Role role, String password)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        this.lastName = lastName;
 | 
				
			||||||
 | 
					        this.firstName = firstName;
 | 
				
			||||||
 | 
					        this.email = email;
 | 
				
			||||||
 | 
					        this.address = address;
 | 
				
			||||||
 | 
					        this.country = country;
 | 
				
			||||||
 | 
					        this.birthDate = birthDate;
 | 
				
			||||||
 | 
					        this.profilePictureUrl = profilePictureUrl;
 | 
				
			||||||
 | 
					        this.role = role;
 | 
				
			||||||
 | 
					        this.password = password;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User(String lastName, String firstName, String email, String address,
 | 
				
			||||||
 | 
					                String country, Date birthDate, String profilePictureUrl, String password)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        this.lastName = lastName;
 | 
				
			||||||
 | 
					        this.firstName = firstName;
 | 
				
			||||||
 | 
					        this.email = email;
 | 
				
			||||||
 | 
					        this.address = address;
 | 
				
			||||||
 | 
					        this.country = country;
 | 
				
			||||||
 | 
					        this.birthDate = birthDate;
 | 
				
			||||||
 | 
					        this.profilePictureUrl = profilePictureUrl;
 | 
				
			||||||
 | 
					        this.password = password;
 | 
				
			||||||
 | 
					        this.role = Role.Student;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    public User() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Long getRegNo(){
 | 
				
			||||||
 | 
					        return this.regNo;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    public String getLastName() {
 | 
				
			||||||
 | 
					        return lastName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setLastName(String lastName) {
 | 
				
			||||||
 | 
					        this.lastName = lastName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getFirstName() {
 | 
				
			||||||
 | 
					        return firstName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setFirstName(String firstName) {
 | 
				
			||||||
 | 
					        this.firstName = firstName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getEmail() {
 | 
				
			||||||
 | 
					        return email;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setEmail(String email) {
 | 
				
			||||||
 | 
					        this.email = email;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getAddress() {
 | 
				
			||||||
 | 
					        return address;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setAddress(String address) {
 | 
				
			||||||
 | 
					        this.address = address;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getCountry() {
 | 
				
			||||||
 | 
					        return country;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCountry(String country) {
 | 
				
			||||||
 | 
					        this.country = country;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Date getBirthDate() {
 | 
				
			||||||
 | 
					        return birthDate;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setBirthDate(Date birthDate) {
 | 
				
			||||||
 | 
					        this.birthDate = birthDate;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public String getProfilePictureUrl(){return this.profilePictureUrl;}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setProfilePictureUrl(String profilePictureUrl){
 | 
				
			||||||
 | 
					        this.profilePictureUrl = profilePictureUrl;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    public ovh.herisson.Clyde.Tables.Role getRole() {
 | 
				
			||||||
 | 
					        return role;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setRole(ovh.herisson.Clyde.Tables.Role role) {
 | 
				
			||||||
 | 
					        this.role = role;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    public String getPassword(){
 | 
				
			||||||
 | 
					        return password;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setPassword(String password) {
 | 
				
			||||||
 | 
					        this.password = password;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,50 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Tables;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import jakarta.persistence.*;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDelete;
 | 
				
			||||||
 | 
					import org.hibernate.annotations.OnDeleteAction;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Entity
 | 
				
			||||||
 | 
					public class UserCurriculum {
 | 
				
			||||||
 | 
					    @Id
 | 
				
			||||||
 | 
					    @GeneratedValue(strategy = GenerationType.AUTO)
 | 
				
			||||||
 | 
					    private int id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //Un étudiant peut avoir plusieurs curriculums
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Users")
 | 
				
			||||||
 | 
					    private User user;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ManyToOne(fetch = FetchType.EAGER)
 | 
				
			||||||
 | 
					    @JoinColumn(name = "Curriculum")
 | 
				
			||||||
 | 
					    @OnDelete(action = OnDeleteAction.CASCADE)
 | 
				
			||||||
 | 
					    private Curriculum curriculum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public UserCurriculum(User user, Curriculum curriculum){
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					        this.curriculum = curriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public UserCurriculum() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public int getId() {
 | 
				
			||||||
 | 
					        return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public User getUser() {
 | 
				
			||||||
 | 
					        return user;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setUser(User user) {
 | 
				
			||||||
 | 
					        this.user = user;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public Curriculum getCurriculum() {
 | 
				
			||||||
 | 
					        return curriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setCurriculum(Curriculum curriculum) {
 | 
				
			||||||
 | 
					        this.curriculum = curriculum;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										3
									
								
								backend/src/main/resources/application.properties
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								backend/src/main/resources/application.properties
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					spring.jpa.hibernate.ddl-auto=create-drop
 | 
				
			||||||
 | 
					spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 | 
				
			||||||
 | 
					spring.sql.init.mode=always
 | 
				
			||||||
							
								
								
									
										192
									
								
								backend/src/main/resources/static/assets/index-BP8s9Pse.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										192
									
								
								backend/src/main/resources/static/assets/index-BP8s9Pse.js
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										12
									
								
								backend/src/main/resources/static/index.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								backend/src/main/resources/static/index.html
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,12 @@
 | 
				
			|||||||
 | 
					<!doctype html>
 | 
				
			||||||
 | 
					<html>
 | 
				
			||||||
 | 
					  <head>
 | 
				
			||||||
 | 
					    <meta charset="UTF-8" />
 | 
				
			||||||
 | 
					    <title>Clyde's api</title>
 | 
				
			||||||
 | 
					    <script type="module" crossorigin src="assets/index-BP8s9Pse.js"></script>
 | 
				
			||||||
 | 
					    <link rel="stylesheet" crossorigin href="assets/index-rZb_qAw7.css">
 | 
				
			||||||
 | 
					  </head>
 | 
				
			||||||
 | 
					  <body>
 | 
				
			||||||
 | 
					    <div id="app"></div>
 | 
				
			||||||
 | 
					  </body>
 | 
				
			||||||
 | 
					</html>
 | 
				
			||||||
							
								
								
									
										1897
									
								
								backend/src/main/resources/static/openapi.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1897
									
								
								backend/src/main/resources/static/openapi.yaml
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@ -0,0 +1,14 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					// import org.springframework.boot.test.context.SpringBootTest;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// @SpringBootTest
 | 
				
			||||||
 | 
					class ClydeApplicationTests {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						@Test
 | 
				
			||||||
 | 
						void contextLoads() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,105 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Endpoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.ExposedPort;
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.HostConfig;
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.PortBinding;
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.Ports;
 | 
				
			||||||
 | 
					import io.restassured.RestAssured;
 | 
				
			||||||
 | 
					import io.restassured.http.ContentType;
 | 
				
			||||||
 | 
					import org.junit.Assert;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.*;
 | 
				
			||||||
 | 
					import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			||||||
 | 
					import org.springframework.boot.test.context.SpringBootTest;
 | 
				
			||||||
 | 
					import org.springframework.boot.test.web.server.LocalServerPort;
 | 
				
			||||||
 | 
					import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 | 
				
			||||||
 | 
					import org.springframework.http.MediaType;
 | 
				
			||||||
 | 
					import org.springframework.mock.web.MockMultipartFile;
 | 
				
			||||||
 | 
					import org.springframework.test.context.ActiveProfiles;
 | 
				
			||||||
 | 
					import org.testcontainers.containers.PostgreSQLContainer;
 | 
				
			||||||
 | 
					import org.testcontainers.junit.jupiter.Container;
 | 
				
			||||||
 | 
					import org.testcontainers.junit.jupiter.Testcontainers;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.ClydeApplication;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.EndPoints.StorageController;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.FileRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.StorageService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.FileType;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.StorageFile;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.io.File;
 | 
				
			||||||
 | 
					import java.io.FileWriter;
 | 
				
			||||||
 | 
					import java.io.IOException;
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import static io.restassured.RestAssured.with;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Testcontainers
 | 
				
			||||||
 | 
					@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 | 
				
			||||||
 | 
					@ActiveProfiles(value ="dev")
 | 
				
			||||||
 | 
					public class StorageControllerTest {
 | 
				
			||||||
 | 
					    @LocalServerPort
 | 
				
			||||||
 | 
					    private Integer port;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private ClydeApplication controller;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private StorageController storageController;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private StorageService storageService;
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private FileRepository fileRepository;
 | 
				
			||||||
 | 
					    @Container
 | 
				
			||||||
 | 
					    @ServiceConnection
 | 
				
			||||||
 | 
					    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:alpine")
 | 
				
			||||||
 | 
					            .withDatabaseName("clyde")
 | 
				
			||||||
 | 
					            .withUsername("devel")
 | 
				
			||||||
 | 
					            .withPassword("devel")
 | 
				
			||||||
 | 
					            .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5442), new ExposedPort(5432)))));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @BeforeAll
 | 
				
			||||||
 | 
					    static void beforeAll(){
 | 
				
			||||||
 | 
					        postgres.start();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @AfterAll
 | 
				
			||||||
 | 
					    static void afterAll(){
 | 
				
			||||||
 | 
					        postgres.stop();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @BeforeEach
 | 
				
			||||||
 | 
					    void setup(){
 | 
				
			||||||
 | 
					        RestAssured.baseURI = "http://localhost:" + port;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @AfterEach
 | 
				
			||||||
 | 
					    void afterEach(){
 | 
				
			||||||
 | 
					        fileRepository.deleteAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    public void uploadFileTest() throws IOException {
 | 
				
			||||||
 | 
					        File mmf = new File("test.txt");
 | 
				
			||||||
 | 
					        mmf.createNewFile();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        FileWriter fw = new FileWriter(mmf);
 | 
				
			||||||
 | 
					        fw.write("Ceci est un test");
 | 
				
			||||||
 | 
					        fw.close();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        with().multiPart("file", mmf).pathParam("fileType", FileType.ProfilePicture).when().request("POST", "/upload/{fileType}").then().statusCode(200);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        StorageFile sf = fileRepository.getStorageFileByName("test.txt");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //On vérifie que le fichier a bien été stocké dans la db
 | 
				
			||||||
 | 
					        Assert.assertFalse(sf == null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //On vérifie que le fichier a bel et bien été stocké dans le dossier cdn
 | 
				
			||||||
 | 
					        File extFile = new File(sf.getUrl());
 | 
				
			||||||
 | 
					        Assert.assertTrue(extFile.exists());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Assert.assertEquals("cdn", extFile.getParent());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //On delete tranquillement les fichiers (la méthode delete a déja été testée dans StorageServiceTest)
 | 
				
			||||||
 | 
					        storageService.delete(sf);
 | 
				
			||||||
 | 
					        mmf.delete();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,149 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Endpoints;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.ExposedPort;
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.HostConfig;
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.PortBinding;
 | 
				
			||||||
 | 
					import com.github.dockerjava.api.model.Ports;
 | 
				
			||||||
 | 
					import io.restassured.RestAssured;
 | 
				
			||||||
 | 
					import io.restassured.http.ContentType;
 | 
				
			||||||
 | 
					import org.junit.Assert;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.*;
 | 
				
			||||||
 | 
					import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			||||||
 | 
					import org.springframework.boot.test.context.SpringBootTest;
 | 
				
			||||||
 | 
					import org.springframework.boot.test.web.server.LocalServerPort;
 | 
				
			||||||
 | 
					import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatus;
 | 
				
			||||||
 | 
					import org.springframework.http.HttpStatusCode;
 | 
				
			||||||
 | 
					import org.springframework.test.context.ActiveProfiles;
 | 
				
			||||||
 | 
					import org.testcontainers.containers.PostgreSQLContainer;
 | 
				
			||||||
 | 
					import org.testcontainers.junit.jupiter.Container;
 | 
				
			||||||
 | 
					import org.testcontainers.junit.jupiter.Testcontainers;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.ClydeApplication;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.TokenRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Services.TokenService;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Token;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					import java.util.HashMap;
 | 
				
			||||||
 | 
					import java.util.Map;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import static io.restassured.RestAssured.with;
 | 
				
			||||||
 | 
					import static org.hamcrest.Matchers.equalTo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Testcontainers
 | 
				
			||||||
 | 
					@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 | 
				
			||||||
 | 
					@ActiveProfiles(value = "dev")
 | 
				
			||||||
 | 
					public class UserControllerTest {
 | 
				
			||||||
 | 
					    @LocalServerPort
 | 
				
			||||||
 | 
					    private Integer port;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private ClydeApplication controller;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private TokenService tokenService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private UserRepository userRepository;
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private TokenRepository tokenRepository;
 | 
				
			||||||
 | 
					    @Container
 | 
				
			||||||
 | 
					    @ServiceConnection
 | 
				
			||||||
 | 
					    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:alpine")
 | 
				
			||||||
 | 
					            .withDatabaseName("clyde")
 | 
				
			||||||
 | 
					            .withUsername("devel")
 | 
				
			||||||
 | 
					            .withPassword("devel")
 | 
				
			||||||
 | 
					            .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5442), new ExposedPort(5432)))));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @BeforeAll
 | 
				
			||||||
 | 
					    static void beforeAll(){
 | 
				
			||||||
 | 
					        postgres.start();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @AfterAll
 | 
				
			||||||
 | 
					    static void afterAll(){
 | 
				
			||||||
 | 
					        postgres.stop();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @BeforeEach
 | 
				
			||||||
 | 
					    void setup(){
 | 
				
			||||||
 | 
					        RestAssured.baseURI = "http://localhost:" + port;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @AfterEach
 | 
				
			||||||
 | 
					    void aftereach(){
 | 
				
			||||||
 | 
					        tokenRepository.deleteAll();
 | 
				
			||||||
 | 
					        userRepository.deleteAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    //Verifie qu'un user qui n'a pas les permissions admin ou secretaire ne peut pas post
 | 
				
			||||||
 | 
					    public void userPostTest(){
 | 
				
			||||||
 | 
					        User god = new User("god","god","admin@admin.com","everywhere","every",new Date(0), null, Role.Admin,"goddoesntneedpassword");
 | 
				
			||||||
 | 
					        Token godToken = new Token(god, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
 | 
					        userRepository.save(god);
 | 
				
			||||||
 | 
					        tokenService.saveToken(godToken);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Can god post herobrine himself ?
 | 
				
			||||||
 | 
					        User herobrine = new User("brine","hero","herobrine@student.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        with().body(herobrine).contentType(ContentType.JSON).header("Authorization", godToken.getToken()).when().request("POST", "/user").then().statusCode(201);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        userRepository.delete(herobrine);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Can noob post herobrine without authorizations (no)
 | 
				
			||||||
 | 
					        User noob = new User("boon","noob","noob@student.com","everywhere","every",new Date(0), null, Role.Student,"noob");
 | 
				
			||||||
 | 
					        Token noobToken = new Token(noob, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
 | 
					        userRepository.save(noob);
 | 
				
			||||||
 | 
					        tokenService.saveToken(noobToken);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        with().body(herobrine).contentType(ContentType.JSON).header("Authorization", noobToken.getToken()).when().request("POST", "/user").then().statusCode(401);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    public void userGetTest(){
 | 
				
			||||||
 | 
					        User herobrine = new User("brine","hero","herobrine@student.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
 | 
				
			||||||
 | 
					        userRepository.save(herobrine);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Token t = new Token(herobrine, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
 | 
					        tokenRepository.save(t);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        with().header("Authorization", t.getToken()).when().request("GET", "/user").then().assertThat().statusCode(200).body("firstName",equalTo("hero"));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    public void userPatchTest(){
 | 
				
			||||||
 | 
					        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Admin,"test");
 | 
				
			||||||
 | 
					        userRepository.save(herobrine);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Token t = new Token(herobrine, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
 | 
					        tokenRepository.save(t);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Map<String, Object> data = new HashMap<String, Object>();
 | 
				
			||||||
 | 
					        data.put("firstName", "test");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Teste que le patch s'execute bien
 | 
				
			||||||
 | 
					        with().body(data).contentType(ContentType.JSON).header("Authorization", t.getToken()).pathParam("id", herobrine.getRegNo()).when().request("PATCH", "/user/{id}").then().statusCode(200);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Teste que la donnée a bien été altérée
 | 
				
			||||||
 | 
					        with().header("Authorization", t.getToken()).when().request("GET", "/user").then().body("firstName",equalTo("test"));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    public void UserDeleteTest(){
 | 
				
			||||||
 | 
					        User god = new User("god","god","admin@admin.com","everywhere","every",new Date(0), null, Role.Admin,"goddoesntneedpassword");
 | 
				
			||||||
 | 
					        Token godToken = new Token(god, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
 | 
					        userRepository.save(god);
 | 
				
			||||||
 | 
					        tokenService.saveToken(godToken);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
 | 
				
			||||||
 | 
					        userRepository.save(herobrine);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        with().header("Authorization", godToken.getToken()).pathParam("id", herobrine.getRegNo()).when().request("DELETE", "/user/{id}").then().statusCode(200);
 | 
				
			||||||
 | 
					        Assert.assertEquals(userRepository.existsById(herobrine.getRegNo()), false);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,41 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.junit.Assert;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.AfterEach;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.BeforeEach;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			||||||
 | 
					import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 | 
				
			||||||
 | 
					import org.springframework.test.context.TestPropertySource;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.GregorianCalendar;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@DataJpaTest
 | 
				
			||||||
 | 
					@TestPropertySource(properties = {
 | 
				
			||||||
 | 
					        "spring.test.database.replace=none",
 | 
				
			||||||
 | 
					        "spring.datasource.url=jdbc:tc:postgresql:16-alpine:///db"
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					public class UserRepoTest {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    UserRepository userRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @BeforeEach
 | 
				
			||||||
 | 
					    public void setup(){
 | 
				
			||||||
 | 
					        User herobrine = new User("brine","hero","admin@admin.com","in your WalLs","ShadowsLand", new GregorianCalendar(2005, 4, 3).getTime(), null, Role.Admin,"admin");
 | 
				
			||||||
 | 
					        userRepo.save(herobrine);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @AfterEach
 | 
				
			||||||
 | 
					    public void clean(){
 | 
				
			||||||
 | 
					        userRepo.deleteAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    public void usertest(){
 | 
				
			||||||
 | 
					        Assert.assertEquals("brine", userRepo.findById(1).getLastName());
 | 
				
			||||||
 | 
					        Assert.assertTrue(new GregorianCalendar(2005, 4, 3).getTime().equals(userRepo.findById(1).getBirthDate()));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,80 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.junit.Assert;
 | 
				
			||||||
 | 
					import org.junit.Before;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.AfterEach;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.BeforeEach;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			||||||
 | 
					import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 | 
				
			||||||
 | 
					import org.springframework.mock.web.MockMultipartFile;
 | 
				
			||||||
 | 
					import org.springframework.test.context.TestPropertySource;
 | 
				
			||||||
 | 
					import org.springframework.web.multipart.MultipartFile;
 | 
				
			||||||
 | 
					import org.testcontainers.shaded.com.google.common.net.MediaType;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.FileRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.FileType;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.StorageFile;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.io.File;
 | 
				
			||||||
 | 
					import java.io.IOException;
 | 
				
			||||||
 | 
					import java.nio.file.Files;
 | 
				
			||||||
 | 
					import java.nio.file.Path;
 | 
				
			||||||
 | 
					import java.nio.file.Paths;
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@DataJpaTest
 | 
				
			||||||
 | 
					@TestPropertySource(properties = {
 | 
				
			||||||
 | 
					        "spring.test.database.replace=none",
 | 
				
			||||||
 | 
					        "spring.datasource.url=jdbc:tc:postgresql:16-alpine:///db"
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					public class StorageServiceTest {
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    FileRepository fileRepo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    StorageService ss;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @BeforeEach
 | 
				
			||||||
 | 
					    public void setup(){
 | 
				
			||||||
 | 
					        if (ss == null){
 | 
				
			||||||
 | 
					            ss = new StorageService(fileRepo);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @AfterEach
 | 
				
			||||||
 | 
					    public void aftereach(){
 | 
				
			||||||
 | 
					        fileRepo.deleteAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    //Check si le fichier est bien sauvegardé dans la DB et si le fichier est bien sauvegardé au bon endroit
 | 
				
			||||||
 | 
					    public void saveFile(){
 | 
				
			||||||
 | 
					        //Test si le directory a bien été crée a l'init du fileService
 | 
				
			||||||
 | 
					        Path rootloc = Paths.get("cdn/");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Assert.assertTrue(Files.exists(rootloc));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    public void deleteFile() throws IOException {
 | 
				
			||||||
 | 
					        File file = new File("cdn/test.txt");
 | 
				
			||||||
 | 
					        file.createNewFile();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //On vérifie que le fichier a bien été crée
 | 
				
			||||||
 | 
					        Assert.assertTrue(file.exists());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //StorageFile représentant le fichier
 | 
				
			||||||
 | 
					        StorageFile sf = new StorageFile("testfile",file.getPath(), FileType.ProfilePicture);
 | 
				
			||||||
 | 
					        fileRepo.save(sf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Check that the storagefile is properly saved
 | 
				
			||||||
 | 
					        StorageFile resp = fileRepo.getStorageFileByName("testfile");
 | 
				
			||||||
 | 
					        Assert.assertEquals(sf, resp);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ss.delete(sf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //On vérifie que le fichier a bien été delete et que le StorageFile a été delete de la DB
 | 
				
			||||||
 | 
					        Assert.assertFalse(file.exists());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        resp = fileRepo.getStorageFileByName("testfile");
 | 
				
			||||||
 | 
					        Assert.assertEquals(null, resp);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,93 @@
 | 
				
			|||||||
 | 
					package ovh.herisson.Clyde.Services;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.junit.Assert;
 | 
				
			||||||
 | 
					import org.junit.Before;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.AfterEach;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.BeforeAll;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.BeforeEach;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			||||||
 | 
					import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 | 
				
			||||||
 | 
					import org.springframework.test.context.TestPropertySource;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.TokenRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Repositories.UserRepository;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Role;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.Token;
 | 
				
			||||||
 | 
					import ovh.herisson.Clyde.Tables.User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					import java.util.Calendar;
 | 
				
			||||||
 | 
					import java.util.Date;
 | 
				
			||||||
 | 
					import java.util.GregorianCalendar;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import static org.junit.jupiter.api.Assertions.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@DataJpaTest
 | 
				
			||||||
 | 
					@TestPropertySource(properties = {
 | 
				
			||||||
 | 
					        "spring.test.database.replace=none",
 | 
				
			||||||
 | 
					        "spring.datasource.url=jdbc:tc:postgresql:16-alpine:///db"
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class TokenServiceTest {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    TokenRepository tokenRepository;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    UserRepository userRepository;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @AfterEach
 | 
				
			||||||
 | 
					    public void aftereach(){
 | 
				
			||||||
 | 
					        tokenRepository.deleteAll();
 | 
				
			||||||
 | 
					        userRepository.deleteAll();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    void saveToken() {
 | 
				
			||||||
 | 
					        User herobrine = userRepository.findById(1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User herobrinenul = new User("brine","heronul","pasadmin@student.com","in your WalLs","ShadowsLand", new GregorianCalendar(2005, 4, 3).getTime(), null, Role.Admin,"admin");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        TokenService tokenService = new TokenService(tokenRepository);
 | 
				
			||||||
 | 
					        Token testToken = new Token(herobrine, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
 | 
					        tokenService.saveToken(testToken);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Iterable<Token> t = tokenService.getAllTokens();
 | 
				
			||||||
 | 
					        Token tok = t.iterator().next();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Assert.assertEquals(herobrine, tok.getUser());
 | 
				
			||||||
 | 
					        Assert.assertNotEquals(herobrinenul, tok.getUser());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    void saveTokenLimit(){
 | 
				
			||||||
 | 
					        TokenService tokenService = new TokenService(tokenRepository);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //On va stocker les token qu'on va sauvegarder au préalable dans une liste pour tester que les tokens remplacés sont bien ceux avec la date d'expi la plus jeune
 | 
				
			||||||
 | 
					        //A la fin il ne devrait donc rester que les 5 derniers tokens de tokenList
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ArrayList<Token> tokenList = new ArrayList<>();
 | 
				
			||||||
 | 
					        GregorianCalendar gc = new GregorianCalendar();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        User malveillant = new User("Cargo", "John", "CargoJ@mail.com", "secret", "secret", null, null, null, "secret");
 | 
				
			||||||
 | 
					        userRepository.save(malveillant);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (int i = 0; i < 20; i++){
 | 
				
			||||||
 | 
					            gc.add(Calendar.DAY_OF_WEEK, 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Token t = new Token(malveillant, tokenService.generateNewToken(), gc.getTime());
 | 
				
			||||||
 | 
					            tokenList.add(t);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            tokenService.saveToken(t);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Testons les tokens
 | 
				
			||||||
 | 
					        ArrayList <Token> resp = tokenRepository.getByUserOrderByExpirationDate(malveillant);
 | 
				
			||||||
 | 
					        Assert.assertTrue(resp.size() == 5);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (int i = 1; i <= resp.size(); i++){
 | 
				
			||||||
 | 
					            Assert.assertEquals(tokenList.get(tokenList.size()-i), resp.get(resp.size()-i));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										3
									
								
								backend/src/test/resources/application.properties
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								backend/src/test/resources/application.properties
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver
 | 
				
			||||||
 | 
					spring.jpa.hibernate.ddl-auto=create-drop
 | 
				
			||||||
 | 
					spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 | 
				
			||||||
							
								
								
									
										6
									
								
								frontend/.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								frontend/.gitignore
									
									
									
									
										vendored
									
									
								
							@ -14,6 +14,9 @@ dist-ssr
 | 
				
			|||||||
coverage
 | 
					coverage
 | 
				
			||||||
*.local
 | 
					*.local
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/cypress/videos/
 | 
				
			||||||
 | 
					/cypress/screenshots/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Editor directories and files
 | 
					# Editor directories and files
 | 
				
			||||||
.vscode/*
 | 
					.vscode/*
 | 
				
			||||||
!.vscode/extensions.json
 | 
					!.vscode/extensions.json
 | 
				
			||||||
@ -25,6 +28,3 @@ coverage
 | 
				
			|||||||
*.sw?
 | 
					*.sw?
 | 
				
			||||||
 | 
					
 | 
				
			||||||
*.tsbuildinfo
 | 
					*.tsbuildinfo
 | 
				
			||||||
 | 
					 | 
				
			||||||
# Personal but I don't like to store the lock
 | 
					 | 
				
			||||||
package-lock.json
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
# Clyde
 | 
					# Clyde
 | 
				
			||||||
 | 
					
 | 
				
			||||||
This is the frontend part of the Clyde application
 | 
					This is the frontend side of the Clyde management system
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Project Setup
 | 
					## Project Setup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -19,15 +19,3 @@ npm run dev
 | 
				
			|||||||
```sh
 | 
					```sh
 | 
				
			||||||
npm run build
 | 
					npm run build
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					 | 
				
			||||||
### Run Unit Tests with [Vitest](https://vitest.dev/)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
```sh
 | 
					 | 
				
			||||||
npm run test:unit
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
### Lint with [ESLint](https://eslint.org/)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
```sh
 | 
					 | 
				
			||||||
npm run lint
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										20
									
								
								frontend/build.gradle.kts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								frontend/build.gradle.kts
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,20 @@
 | 
				
			|||||||
 | 
					import com.github.gradle.node.npm.task.NpmTask
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					plugins {
 | 
				
			||||||
 | 
						id("com.github.node-gradle.node") version "7.0.2"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					tasks.register<NpmTask>("build") {
 | 
				
			||||||
 | 
						dependsOn(tasks.npmInstall)
 | 
				
			||||||
 | 
						args.set(listOf("run", "build"))
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					var dev = tasks.register<NpmTask>("dev") {
 | 
				
			||||||
 | 
						dependsOn(tasks.npmInstall)
 | 
				
			||||||
 | 
						args.set(listOf("run", "dev"))
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					tasks.register<NpmTask>("run") {
 | 
				
			||||||
 | 
						dependsOn(dev)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -1,10 +1,9 @@
 | 
				
			|||||||
<!DOCTYPE html>
 | 
					<!DOCTYPE html>
 | 
				
			||||||
<html lang="en">
 | 
					<html>
 | 
				
			||||||
  <head>
 | 
					  <head>
 | 
				
			||||||
    <meta charset="UTF-8">
 | 
					    <meta charset="UTF-8">
 | 
				
			||||||
    <link rel="icon" href="/favicon.ico">
 | 
					    <link rel="icon" href="/favicon.ico">
 | 
				
			||||||
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 | 
					    <title> Clyde 🪦</title>
 | 
				
			||||||
    <title>Vite App</title>
 | 
					 | 
				
			||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
  <body>
 | 
					  <body>
 | 
				
			||||||
    <div id="app"></div>
 | 
					    <div id="app"></div>
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										1591
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										1591
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@ -6,20 +6,16 @@
 | 
				
			|||||||
  "scripts": {
 | 
					  "scripts": {
 | 
				
			||||||
    "dev": "vite",
 | 
					    "dev": "vite",
 | 
				
			||||||
    "build": "vite build",
 | 
					    "build": "vite build",
 | 
				
			||||||
    "preview": "vite preview",
 | 
					    "preview": "vite preview"
 | 
				
			||||||
    "test:unit": "vitest",
 | 
					 | 
				
			||||||
    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
 | 
					 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
    "vue": "^3.4.15"
 | 
					    "vite-plugin-top-level-await": "^1.4.1",
 | 
				
			||||||
 | 
					    "vue": "^3.4.15",
 | 
				
			||||||
 | 
					    "vue3-toastify": "^0.2.1"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "@vitejs/plugin-vue": "^5.0.3",
 | 
					    "@vitejs/plugin-vue": "^5.0.3",
 | 
				
			||||||
    "@vue/test-utils": "^2.4.4",
 | 
					 | 
				
			||||||
    "eslint": "^8.49.0",
 | 
					 | 
				
			||||||
    "eslint-plugin-vue": "^9.17.0",
 | 
					 | 
				
			||||||
    "jsdom": "^24.0.0",
 | 
					    "jsdom": "^24.0.0",
 | 
				
			||||||
    "vite": "^5.0.11",
 | 
					    "vite": "^5.0.11"
 | 
				
			||||||
    "vitest": "^1.2.2"
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								frontend/public/Clyde.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								frontend/public/Clyde.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 1.2 KiB  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 318 B  | 
							
								
								
									
										54
									
								
								frontend/public/i18n/EN.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								frontend/public/i18n/EN.txt
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,54 @@
 | 
				
			|||||||
 | 
					login.guest.signin=Sign in
 | 
				
			||||||
 | 
					login.guest.register=Register
 | 
				
			||||||
 | 
					login.guest.alregister=Already Registered
 | 
				
			||||||
 | 
					login.guest.welcome=WELCOME TO THE UNIVERSITY
 | 
				
			||||||
 | 
					login.guest.email=E-MAIL 
 | 
				
			||||||
 | 
					login.guest.firstname=FIRSTNAME
 | 
				
			||||||
 | 
					login.guest.surname=SURNAME
 | 
				
			||||||
 | 
					login.guest.country=COUNTRY
 | 
				
			||||||
 | 
					login.guest.address=ADDRESS
 | 
				
			||||||
 | 
					login.guest.password=PASSWORD
 | 
				
			||||||
 | 
					login.guest.nextpage=Next Page
 | 
				
			||||||
 | 
					login.guest.lastpage=Last Page
 | 
				
			||||||
 | 
					login.guest.submit=Submit
 | 
				
			||||||
 | 
					login.guest.birthday=BIRTHDAY
 | 
				
			||||||
 | 
					login.guest.confirm=CONFIRM
 | 
				
			||||||
 | 
					login.cPassword=Confirm Password
 | 
				
			||||||
 | 
					login.password=Password
 | 
				
			||||||
 | 
					app.home=Home
 | 
				
			||||||
 | 
					app.login=Login
 | 
				
			||||||
 | 
					app.notifications=Notifications
 | 
				
			||||||
 | 
					app.settings=Settings
 | 
				
			||||||
 | 
					app.messages=Messages
 | 
				
			||||||
 | 
					app.forum=Forum
 | 
				
			||||||
 | 
					app.schedules=Schedules
 | 
				
			||||||
 | 
					app.inscription.requests=Inscription Requests
 | 
				
			||||||
 | 
					app.manage.courses=Manage Courses
 | 
				
			||||||
 | 
					app.language=Language
 | 
				
			||||||
 | 
					app.manage.profile=Manage profile
 | 
				
			||||||
 | 
					app.studentList=Students List
 | 
				
			||||||
 | 
					app.users=Users
 | 
				
			||||||
 | 
					request.moreInfos=More Infos
 | 
				
			||||||
 | 
					request.accept=Accept
 | 
				
			||||||
 | 
					request.refuse=Refuse
 | 
				
			||||||
 | 
					courses.createCourse=Create course
 | 
				
			||||||
 | 
					courses.deleteCourse=Delete course
 | 
				
			||||||
 | 
					courses.modify=Modify
 | 
				
			||||||
 | 
					courses.toDelete=Course to Delete
 | 
				
			||||||
 | 
					courses.confirm=Confirm
 | 
				
			||||||
 | 
					courses.back=Back
 | 
				
			||||||
 | 
					profile.modify.data=Modify personnal data
 | 
				
			||||||
 | 
					profile.reRegister=Re-register
 | 
				
			||||||
 | 
					profile.unRegister=Unregister
 | 
				
			||||||
 | 
					profile.course.list=Courses list
 | 
				
			||||||
 | 
					profile.address=Address
 | 
				
			||||||
 | 
					profile.picture=Profile picture
 | 
				
			||||||
 | 
					profile.change.curriculum=Change curriculum
 | 
				
			||||||
 | 
					name=Name
 | 
				
			||||||
 | 
					Teacher=Teacher
 | 
				
			||||||
 | 
					Student=Student
 | 
				
			||||||
 | 
					Secretary=Secretary
 | 
				
			||||||
 | 
					Curriculum=curriculum
 | 
				
			||||||
 | 
					Credits=Credits
 | 
				
			||||||
 | 
					InscriptionService=I.S.
 | 
				
			||||||
 | 
					faculty=Faculty
 | 
				
			||||||
							
								
								
									
										54
									
								
								frontend/public/i18n/FR.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								frontend/public/i18n/FR.txt
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,54 @@
 | 
				
			|||||||
 | 
					login.guest.signin=SE CONNECTER
 | 
				
			||||||
 | 
					login.guest.register=S'enregistrer
 | 
				
			||||||
 | 
					login.guest.alregister=Déjà Enregistré
 | 
				
			||||||
 | 
					login.guest.welcome=BIENVENUE A L'UNIVERSITE
 | 
				
			||||||
 | 
					login.guest.email=E-MAIL 
 | 
				
			||||||
 | 
					login.guest.firstname=PRENOM
 | 
				
			||||||
 | 
					login.guest.surname=NOM
 | 
				
			||||||
 | 
					login.guest.country=PAYS
 | 
				
			||||||
 | 
					login.guest.address=ADRESSE
 | 
				
			||||||
 | 
					login.guest.password=MOT DE PASSE
 | 
				
			||||||
 | 
					login.guest.nextpage=Prochaine Page
 | 
				
			||||||
 | 
					login.guest.lastpage=Derniere Page
 | 
				
			||||||
 | 
					login.guest.submit=Envoyer
 | 
				
			||||||
 | 
					login.guest.birthday=DATE DE NAISSANCE
 | 
				
			||||||
 | 
					login.guest.confirm=CONFIRMER
 | 
				
			||||||
 | 
					login.cPassword=Confirmer mot de passe
 | 
				
			||||||
 | 
					login.password=Mot de passe
 | 
				
			||||||
 | 
					app.home=Home
 | 
				
			||||||
 | 
					app.login=Se connecter
 | 
				
			||||||
 | 
					app.notifications=Notifications
 | 
				
			||||||
 | 
					app.settings=Options
 | 
				
			||||||
 | 
					app.messages=Messages
 | 
				
			||||||
 | 
					app.forum=Forum
 | 
				
			||||||
 | 
					app.schedules=Horaires
 | 
				
			||||||
 | 
					app.inscription.requests=Demandes d'Inscription
 | 
				
			||||||
 | 
					app.manage.courses=Gérer les cours
 | 
				
			||||||
 | 
					app.language=Langue
 | 
				
			||||||
 | 
					app.manage.profile=Gérer le profil
 | 
				
			||||||
 | 
					app.studentList=Liste des étudiants
 | 
				
			||||||
 | 
					app.users=Utilisateurs
 | 
				
			||||||
 | 
					request.moreInfos=Plus d'Infos
 | 
				
			||||||
 | 
					request.accept=Accepter
 | 
				
			||||||
 | 
					request.refuse=Refuser
 | 
				
			||||||
 | 
					courses.createCourse=Créer un cours
 | 
				
			||||||
 | 
					courses.deleteCourse=Supprimer un cours
 | 
				
			||||||
 | 
					courses.modify=Modifier
 | 
				
			||||||
 | 
					courses.toDelete=Cours à supprimer
 | 
				
			||||||
 | 
					courses.confirm=Confirmer
 | 
				
			||||||
 | 
					courses.back=Retour
 | 
				
			||||||
 | 
					profile.modify.data=Modifier données personnelles
 | 
				
			||||||
 | 
					profile.reRegister=Réinsciption
 | 
				
			||||||
 | 
					profile.unRegister=Désinscription
 | 
				
			||||||
 | 
					profile.course.list=Liste des cours
 | 
				
			||||||
 | 
					profile.address=Adresse
 | 
				
			||||||
 | 
					profile.picture=Photo de profil
 | 
				
			||||||
 | 
					profile.change.curriculum=Changer cursus
 | 
				
			||||||
 | 
					name=Nom
 | 
				
			||||||
 | 
					Teacher=Enseignant
 | 
				
			||||||
 | 
					Student=Etudiant
 | 
				
			||||||
 | 
					Secretary=Secrétaire
 | 
				
			||||||
 | 
					Curriculum=Cursus
 | 
				
			||||||
 | 
					Credits=Credits
 | 
				
			||||||
 | 
					InscriptionService=S.I.
 | 
				
			||||||
 | 
					faculty=Faculté
 | 
				
			||||||
@ -1,47 +1,257 @@
 | 
				
			|||||||
<script setup>
 | 
					<script setup>
 | 
				
			||||||
import HelloWorld from './components/HelloWorld.vue'
 | 
					  import { toast } from 'vue3-toastify';
 | 
				
			||||||
import TheWelcome from './components/TheWelcome.vue'
 | 
					  import { ref } from 'vue'
 | 
				
			||||||
 | 
					  import i18n, { setLang } from './i18n.js'
 | 
				
			||||||
 | 
					  import { isLogged } from '@/rest/Users.js'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  import { appList, currentView } from '@/rest/apps.js'
 | 
				
			||||||
 | 
							var prevURL;
 | 
				
			||||||
 | 
							var currentURL = window.location.hash;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					window.onhashchange = function() {
 | 
				
			||||||
 | 
					    prevURL = currentURL;
 | 
				
			||||||
 | 
					    currentURL = window.location.hash;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					const Logged = ref(isLogged());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					window.addEventListener('hashchange', () => {
 | 
				
			||||||
 | 
					 if((location.hash === "#/home" && prevURL === "#/login") || (location.hash === "#/home" && prevURL === "#/profil")){
 | 
				
			||||||
 | 
							window.location.reload();
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
 | 
					});
 | 
				
			||||||
 | 
					  const home=ref(i18n("app.home"))
 | 
				
			||||||
 | 
					  const notifications=ref(i18n("app.notifications"))
 | 
				
			||||||
 | 
					  const settings=ref(i18n("app.settings"))
 | 
				
			||||||
 | 
					  const login=ref(i18n("app.login"))
 | 
				
			||||||
 | 
					  const active=ref(false)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						const apps = ref([])
 | 
				
			||||||
 | 
						appList().then(e => apps.value = e)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</script>
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<template>
 | 
					<template>
 | 
				
			||||||
  <header>
 | 
					  <div class="container">
 | 
				
			||||||
    <img alt="Vue logo" class="logo" src="./assets/logo.svg" width="125" height="125" />
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <div class="wrapper">
 | 
					    <div class="topBar">
 | 
				
			||||||
      <HelloWorld msg="You did it!" />
 | 
					      <ul class="horizontal">
 | 
				
			||||||
 | 
					        <li title=home>
 | 
				
			||||||
 | 
					            <a class="icon" href="#home">
 | 
				
			||||||
 | 
					                <img class="clyde" src="/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
 | 
				
			||||||
 | 
					            </a></li>
 | 
				
			||||||
 | 
					        <li title=home>
 | 
				
			||||||
 | 
					            <a class="icon" href="#home">
 | 
				
			||||||
 | 
									<div class=" fa-solid fa-house" style="margin-top: 7px; margin-bottom: 3px;"></div>
 | 
				
			||||||
 | 
					            </a></li>
 | 
				
			||||||
 | 
					        <li style="float: right;" title=login>
 | 
				
			||||||
 | 
					            <a class="icon" href="#/login">
 | 
				
			||||||
 | 
					                <div class="fa-solid fa-user" :style="Logged ? 'color: orange' : 'haha'" style="margin-top: 7px; margin-bottom: 3px; "></div>
 | 
				
			||||||
 | 
					            </a></li>
 | 
				
			||||||
 | 
					        <li style="float: right;" title=notifications>
 | 
				
			||||||
 | 
					            <a class="icon" href="#Notifications">
 | 
				
			||||||
 | 
					                <div class="fa-solid fa-bell"  style="margin-top: 7px; margin-bottom: 3px;"></div>
 | 
				
			||||||
 | 
					            </a></li>
 | 
				
			||||||
 | 
					        <li @click="active=!active" class="option"style="float: right;" title=settings>
 | 
				
			||||||
 | 
					            <a class="icon" >
 | 
				
			||||||
 | 
					                <div  class="fa-solid fa-gear"  style="margin-top: 7px; margin-bottom: 3px;"></div>
 | 
				
			||||||
 | 
					                <div v-if="active" class="dropdown">
 | 
				
			||||||
 | 
					                  <div class="dropdown-content">{{i18n("app.language")}}</div>
 | 
				
			||||||
 | 
					                  <ul style="list-style-type:none;">
 | 
				
			||||||
 | 
					                    <li style=" margin-bottom:10px;margin-right:20px;float:left; font-size:10px; color:black;">
 | 
				
			||||||
 | 
					                      <button @:click="setLang('en');" href="#home">EN</button>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    </li>
 | 
				
			||||||
 | 
					                    <li style="float:left;font-size:10px; color:black;"><button @:click="setLang('fr');" href="#home">FR</button></li>
 | 
				
			||||||
 | 
					                  </ul>
 | 
				
			||||||
 | 
					                  <div style='align-items:center;'>
 | 
				
			||||||
 | 
					                  <a style="cursor:pointer;font-size:20px;" href="#/profil" class="dropdown-content">
 | 
				
			||||||
 | 
					                    {{i18n("app.manage.profile")}}
 | 
				
			||||||
 | 
					                  </a>
 | 
				
			||||||
 | 
					                  </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                </div>
 | 
				
			||||||
 | 
					            </a></li>
 | 
				
			||||||
 | 
					      </ul>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
  </header>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <main>
 | 
					    <div class="leftBar">
 | 
				
			||||||
    <TheWelcome />
 | 
					    <ul class="vertical">
 | 
				
			||||||
  </main>
 | 
					        <li v-for="app in apps">
 | 
				
			||||||
 | 
											<a :href="app.path">
 | 
				
			||||||
 | 
					            <div class="fa-solid" :class="app.icon" style="font-size: 40px;"></div>
 | 
				
			||||||
 | 
					            <div class="text">{{app.text}}</div>
 | 
				
			||||||
 | 
											</a>
 | 
				
			||||||
 | 
									</li>
 | 
				
			||||||
 | 
					    </ul>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					    <div class="page">
 | 
				
			||||||
 | 
					        <Suspense>
 | 
				
			||||||
 | 
									<component :is="currentView" />
 | 
				
			||||||
 | 
					        </Suspense>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<style scoped>
 | 
					<style scoped>
 | 
				
			||||||
header {
 | 
					  
 | 
				
			||||||
  line-height: 1.5;
 | 
					  .container{
 | 
				
			||||||
}
 | 
								height: 100%;
 | 
				
			||||||
 | 
								width: 100%;
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
 | 
				
			||||||
 | 
					    grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
 | 
				
			||||||
 | 
					    grid-template-areas:
 | 
				
			||||||
 | 
					    "topBar topBar" 
 | 
				
			||||||
 | 
					    "leftBar page";
 | 
				
			||||||
 | 
					    row-gap:0px;
 | 
				
			||||||
 | 
					    column-gap:0px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.logo {
 | 
					  .page {
 | 
				
			||||||
 | 
					    grid-area:page;
 | 
				
			||||||
 | 
							height: 100%;
 | 
				
			||||||
 | 
							width: 100%;
 | 
				
			||||||
 | 
					    place-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .topBar{
 | 
				
			||||||
 | 
					    grid-area:topBar;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .leftBar{
 | 
				
			||||||
 | 
					    grid-area:leftBar;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					.option {
 | 
				
			||||||
 | 
					  position: relative;
 | 
				
			||||||
  display: block;
 | 
					  display: block;
 | 
				
			||||||
  margin: 0 auto 2rem;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@media (min-width: 1024px) {
 | 
					 | 
				
			||||||
  header {
 | 
					 | 
				
			||||||
    display: flex;
 | 
					 | 
				
			||||||
    place-items: center;
 | 
					 | 
				
			||||||
    padding-right: calc(var(--section-gap) / 2);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .logo {
 | 
					.dropdown {
 | 
				
			||||||
    margin: 0 2rem 0 0;
 | 
					  margin-top:55px;
 | 
				
			||||||
  }
 | 
					  width:160px;
 | 
				
			||||||
 | 
					  display: inline-block;
 | 
				
			||||||
  header .wrapper {
 | 
					  height:110px;
 | 
				
			||||||
    display: flex;
 | 
					  font-size: 13px;
 | 
				
			||||||
    place-items: flex-start;
 | 
					  position: absolute;
 | 
				
			||||||
    flex-wrap: wrap;
 | 
					  z-index: 1;
 | 
				
			||||||
  }
 | 
					  background-color:white;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.dropdown-content { 
 | 
				
			||||||
 | 
					  min-width: 160px;
 | 
				
			||||||
 | 
					  text-align: center;
 | 
				
			||||||
 | 
					  margin-bottom: 10px;
 | 
				
			||||||
 | 
					  right:0;
 | 
				
			||||||
 | 
					  color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  text-decoration: none;
 | 
				
			||||||
 | 
					  font-size:24px
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .dropdown-content div{
 | 
				
			||||||
 | 
					    display:block;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ul.vertical{
 | 
				
			||||||
 | 
							list-style-type: none;
 | 
				
			||||||
 | 
							margin-top: 61px;
 | 
				
			||||||
 | 
					    top:0;
 | 
				
			||||||
 | 
					    left:0;
 | 
				
			||||||
 | 
							padding: 25px 0 0;
 | 
				
			||||||
 | 
							width: 70px ;
 | 
				
			||||||
 | 
							background-color: rgb(53, 53, 53);
 | 
				
			||||||
 | 
							border-right:5px;
 | 
				
			||||||
 | 
							border-color:black;
 | 
				
			||||||
 | 
							height: 100%;
 | 
				
			||||||
 | 
							position: fixed;
 | 
				
			||||||
 | 
							overflow:;
 | 
				
			||||||
 | 
							transition-duration: .3s;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						li a{
 | 
				
			||||||
 | 
							display: flex;
 | 
				
			||||||
 | 
							padding: 8px 16px;
 | 
				
			||||||
 | 
							color:rgb(255, 255, 255);
 | 
				
			||||||
 | 
							text-decoration: none;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ul.vertical li a:hover:not(.active) {
 | 
				
			||||||
 | 
							background-color: rgb(112, 112, 112);
 | 
				
			||||||
 | 
							border-radius:6px;
 | 
				
			||||||
 | 
							color: white;
 | 
				
			||||||
 | 
							transform: translate(0px ,1px);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ul.vertical li a.active {
 | 
				
			||||||
 | 
							background-color: rgb(239, 60, 168);
 | 
				
			||||||
 | 
							border-radius:6px;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ul.horizontal li a.active {
 | 
				
			||||||
 | 
						  background-color: rgb(57, 57, 57);
 | 
				
			||||||
 | 
						  border-radius:6px;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						ul.horizontal {
 | 
				
			||||||
 | 
							z-index: 101;
 | 
				
			||||||
 | 
					    box-shadow: 0px 3px 3px rgb(0, 0, 0);
 | 
				
			||||||
 | 
							display: block ;
 | 
				
			||||||
 | 
							list-style-type:none;
 | 
				
			||||||
 | 
							margin:0;
 | 
				
			||||||
 | 
							padding: 0;
 | 
				
			||||||
 | 
							top: 0; 
 | 
				
			||||||
 | 
					    left:0;
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
							position: fixed;
 | 
				
			||||||
 | 
							height:61px;
 | 
				
			||||||
 | 
							width: 100%;
 | 
				
			||||||
 | 
							background-color: rgb(24, 24, 24);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ul.horizontal li {
 | 
				
			||||||
 | 
							font-size: 35px;
 | 
				
			||||||
 | 
							float: left;
 | 
				
			||||||
 | 
							align-items: center;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ul.horizontal li a.icon:hover:not(.active){
 | 
				
			||||||
 | 
							background-color: black;
 | 
				
			||||||
 | 
							border-radius:6px;
 | 
				
			||||||
 | 
							color:white;
 | 
				
			||||||
 | 
							transform: translate(0px ,1px);
 | 
				
			||||||
 | 
							
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						  ul.vertical:hover {
 | 
				
			||||||
 | 
							z-index: 100;
 | 
				
			||||||
 | 
							width: 250px;
 | 
				
			||||||
 | 
							border-top-right-radius: 40px;
 | 
				
			||||||
 | 
					    box-shadow: 3px 0px 3px rgb(0, 0, 0);
 | 
				
			||||||
 | 
							transition-duration: .3s;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						  .text {
 | 
				
			||||||
 | 
							right: 0%;
 | 
				
			||||||
 | 
							width: 0%;
 | 
				
			||||||
 | 
							opacity: 0;
 | 
				
			||||||
 | 
							color: white;
 | 
				
			||||||
 | 
							font-size: 1.2em;
 | 
				
			||||||
 | 
							font-weight: 600;
 | 
				
			||||||
 | 
							transition-duration: .3s;
 | 
				
			||||||
 | 
						  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						  ul.vertical:hover .text {
 | 
				
			||||||
 | 
							opacity: 1;
 | 
				
			||||||
 | 
							width: 60%;
 | 
				
			||||||
 | 
							transition-duration: .3s;
 | 
				
			||||||
 | 
							padding-left: 15px;
 | 
				
			||||||
 | 
						  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						  .clyde:hover{
 | 
				
			||||||
 | 
							  content: url("./assets/angry_clyde.png")
 | 
				
			||||||
 | 
						  }
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
</style>
 | 
					</style>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<!-- vim:set noet sts=0 sw=4 ts=2: --> 
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										111
									
								
								frontend/src/Apps/Inscription.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										111
									
								
								frontend/src/Apps/Inscription.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,111 @@
 | 
				
			|||||||
 | 
					<script setup>
 | 
				
			||||||
 | 
					  import i18n from "@/i18n.js"
 | 
				
			||||||
 | 
					  import {ref} from 'vue'
 | 
				
			||||||
 | 
					  import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const requests = ref(await getAllRegisters());
 | 
				
			||||||
 | 
					  console.log(requests);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  async function upPage(id,review){
 | 
				
			||||||
 | 
					    await validateRegister(id,review);
 | 
				
			||||||
 | 
					    requests.value = await getAllRegisters();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<template> 
 | 
				
			||||||
 | 
					  <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
 | 
				
			||||||
 | 
					  <div class="bodu" v-if="item.state === 'Pending'">
 | 
				
			||||||
 | 
					  <div class="container">
 | 
				
			||||||
 | 
					    <div class="id"><a>{{item.id}}</a></div>
 | 
				
			||||||
 | 
					    <div class="surname"><a>{{item.lastName}}</a></div>
 | 
				
			||||||
 | 
					    <div class="firstname"><a>{{item.firstName}}</a></div>
 | 
				
			||||||
 | 
					    <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}</button></div>
 | 
				
			||||||
 | 
					    <div class="accept"><button @click="upPage(item.id,'Accepted')" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
 | 
				
			||||||
 | 
					    <div class="refuse"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<style scoped>
 | 
				
			||||||
 | 
					  .container{
 | 
				
			||||||
 | 
					    color:white;
 | 
				
			||||||
 | 
					    height:100px;
 | 
				
			||||||
 | 
					    font-size:20px;
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
 | 
				
			||||||
 | 
					    grid-template-areas:
 | 
				
			||||||
 | 
					    "id type surname firstname infos accept refuse"; 
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .infos {
 | 
				
			||||||
 | 
					    grid-area:infos;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .accept{
 | 
				
			||||||
 | 
					    grid-area:accept;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .refuse{
 | 
				
			||||||
 | 
					    grid-area:refuse;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .titles {
 | 
				
			||||||
 | 
					    grid-area:titles;
 | 
				
			||||||
 | 
					    background-color:rgb(215,215,215);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  .id{
 | 
				
			||||||
 | 
					    grid-area:id;
 | 
				
			||||||
 | 
					    margin-left:40px;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .type{
 | 
				
			||||||
 | 
					    grid-area:type;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .surname{
 | 
				
			||||||
 | 
					    grid-area:surname;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					    white-space: nowrap;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
 | 
					    text-overflow:ellipsis;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .firstname{
 | 
				
			||||||
 | 
					    grid-area:firstname;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					    white-space: nowrap;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
 | 
					    text-overflow:ellipsis;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  button{
 | 
				
			||||||
 | 
					    font-size:15px;
 | 
				
			||||||
 | 
					     height:50px;
 | 
				
			||||||
 | 
					     width:100px;
 | 
				
			||||||
 | 
					    border:none;
 | 
				
			||||||
 | 
					    border-radius:20px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 .bodu {
 | 
				
			||||||
 | 
					    margin-top:2%;
 | 
				
			||||||
 | 
					    width:66%;
 | 
				
			||||||
 | 
					    border:2px solid black;
 | 
				
			||||||
 | 
					    border-radius:9px;
 | 
				
			||||||
 | 
					    background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</style>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										270
									
								
								frontend/src/Apps/Login.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										270
									
								
								frontend/src/Apps/Login.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,270 @@
 | 
				
			|||||||
 | 
					<script setup>
 | 
				
			||||||
 | 
					  import {reactive, ref } from 'vue'
 | 
				
			||||||
 | 
					  import i18n from '@/i18n.js'
 | 
				
			||||||
 | 
					  import { login , register , disconnect, isLogged} from '@/rest/Users.js'
 | 
				
			||||||
 | 
					  import { getAllCurriculums } from '@/rest/curriculum.js'
 | 
				
			||||||
 | 
					  import { uploadProfilePicture } from '@/rest/uploads.js'
 | 
				
			||||||
 | 
					  import {toast} from 'vue3-toastify'
 | 
				
			||||||
 | 
					  import 'vue3-toastify/dist/index.css';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const loginPage= ref(true)
 | 
				
			||||||
 | 
					  const page = ref(0)
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  const outputs = reactive({
 | 
				
			||||||
 | 
					    surname:null,
 | 
				
			||||||
 | 
					    firstname:null,
 | 
				
			||||||
 | 
					    password:null,
 | 
				
			||||||
 | 
					    birthday:null,
 | 
				
			||||||
 | 
					    email:null,
 | 
				
			||||||
 | 
					    address:null,
 | 
				
			||||||
 | 
					    country:null,
 | 
				
			||||||
 | 
					    curriculum:null,
 | 
				
			||||||
 | 
					  })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const submitValue= ref(i18n("login.guest.submit"))
 | 
				
			||||||
 | 
					  const passwordConfirm=ref("")
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					  const imageSaved = ref(false)
 | 
				
			||||||
 | 
					  const ppData = ref(false)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const curricula= await getAllCurriculums();
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  function goBackHome(){
 | 
				
			||||||
 | 
					    setTimeout(() => {
 | 
				
			||||||
 | 
					      window.location.href="#/home";
 | 
				
			||||||
 | 
					      }, "500");
 | 
				
			||||||
 | 
					 } 
 | 
				
			||||||
 | 
					  function verifyInputs(pass){
 | 
				
			||||||
 | 
					    if(pass==passwordConfirm.value){
 | 
				
			||||||
 | 
					      page.value++;
 | 
				
			||||||
 | 
					      return toast('Password and Confirm Password are correct.', {
 | 
				
			||||||
 | 
					      
 | 
				
			||||||
 | 
					    type: "success",});
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else{
 | 
				
			||||||
 | 
					    return toast('Password and Confirm Password are different',{type: "error",});
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  if (isLogged()){
 | 
				
			||||||
 | 
					  disconnect();
 | 
				
			||||||
 | 
					  window.location.reload();}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<template>
 | 
				
			||||||
 | 
					    <div class="setup">
 | 
				
			||||||
 | 
					        <div v-if="loginPage">
 | 
				
			||||||
 | 
					      <div class='loginBox' style="margin-top:30%;">
 | 
				
			||||||
 | 
					          <form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"class="form">
 | 
				
			||||||
 | 
					            <h1 style="color:rgb(239,60,168); font-family: sans-serif;">
 | 
				
			||||||
 | 
					              {{i18n("login.guest.signin")}}
 | 
				
			||||||
 | 
					            </h1>
 | 
				
			||||||
 | 
					            <div class="inputBox">
 | 
				
			||||||
 | 
					              <p>ID / {{i18n("login.guest.email")}}</p> 
 | 
				
			||||||
 | 
					              <input type="text" v-model="outputs.email">
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div class="inputBox">
 | 
				
			||||||
 | 
					              <p>{{i18n("login.guest.password")}}</p>
 | 
				
			||||||
 | 
					              <input type="password" v-model="outputs.password">
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div class="register">
 | 
				
			||||||
 | 
					              <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div class="inputBox" style="margin-bottom:35px;">
 | 
				
			||||||
 | 
					              <input type="submit" v-model="submitValue">
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					          </form>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					        <div v-else>
 | 
				
			||||||
 | 
					          <div class='loginBox' style="margin-top:30%; margin-bottom:50%;">
 | 
				
			||||||
 | 
					            <form class="form">
 | 
				
			||||||
 | 
					            <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
 | 
				
			||||||
 | 
					              {{i18n("login.guest.welcome")}}
 | 
				
			||||||
 | 
					            </h1>
 | 
				
			||||||
 | 
					            <div v-if="page === 0">
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("login.guest.surname")}}</p>
 | 
				
			||||||
 | 
					                <input type="text" v-model="outputs.surname">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("login.guest.firstname")}}</p>
 | 
				
			||||||
 | 
					                <input type="text" v-model="outputs.firstname">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("login.guest.birthday")}}</p>
 | 
				
			||||||
 | 
					                <input type="date" v-model="outputs.birthday">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                 <p>{{i18n("login.guest.password")}}</p>
 | 
				
			||||||
 | 
					                 <input type="password" v-model="outputs.password">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("login.guest.confirm")}} {{i18n("login.guest.password")}}</p>
 | 
				
			||||||
 | 
					                 <input type="password" v-model="passwordConfirm">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              
 | 
				
			||||||
 | 
					              <div class="switchpage">
 | 
				
			||||||
 | 
					                <button @click="verifyInputs(outputs.password);">{{i18n("login.guest.nextpage")}}</button>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div @click="(loginPage=!loginPage) && (page=0)" class="register">
 | 
				
			||||||
 | 
					                <a>{{i18n("login.guest.alregister")}}</a>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div v-else>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("login.guest.email")}}</p>
 | 
				
			||||||
 | 
					                <input type="mail" v-model="outputs.email">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("login.guest.address")}}</p>
 | 
				
			||||||
 | 
					                <input type="text" v-model="outputs.address">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("login.guest.country")}}</p>
 | 
				
			||||||
 | 
					                <input type="text" v-model="outputs.country">
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <form class="inputBox"novalidate enctype="multipart/form-data">
 | 
				
			||||||
 | 
					              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
 | 
				
			||||||
 | 
					              <label class="browser">
 | 
				
			||||||
 | 
					                Parcourir . . .
 | 
				
			||||||
 | 
									        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
 | 
				
			||||||
 | 
					              </label>
 | 
				
			||||||
 | 
					              </form>
 | 
				
			||||||
 | 
					              <div class="inputBox">
 | 
				
			||||||
 | 
					                <p>{{i18n("Curriculum").toUpperCase()}}</p> 
 | 
				
			||||||
 | 
					                  <select v-model="outputs.curriculum">
 | 
				
			||||||
 | 
					                    <option v-for="item in curricula">{{item.curriculumId}}</option>
 | 
				
			||||||
 | 
					                    
 | 
				
			||||||
 | 
					                  </select>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div style="align-self:center;" class="inputBox">
 | 
				
			||||||
 | 
					                <button style="margin-top:25px;" @click="register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData);">
 | 
				
			||||||
 | 
					                  {{i18n("login.guest.submit")}}
 | 
				
			||||||
 | 
					                </button>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div  class="switchpage">
 | 
				
			||||||
 | 
					                <button @click="page--">{{i18n("login.guest.lastpage")}}</button>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div  @click="(loginPage=!loginPage) && (page=0)" class="register">
 | 
				
			||||||
 | 
					                <a>{{i18n("login.guest.alregister")}}</a>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					          </form>
 | 
				
			||||||
 | 
					         </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<style scoped>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.setup {
 | 
				
			||||||
 | 
					  margin-left: auto;
 | 
				
			||||||
 | 
					  margin-right:auto;
 | 
				
			||||||
 | 
					  min-width:400px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  width:25%;
 | 
				
			||||||
 | 
					  height:60%;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.loginBox {
 | 
				
			||||||
 | 
					  background-color: rgb(24,24,24);
 | 
				
			||||||
 | 
					  display:flex;
 | 
				
			||||||
 | 
					  justify-content: center;
 | 
				
			||||||
 | 
					  border-radius: 5%;
 | 
				
			||||||
 | 
					  box-shadow:0 5px 25px #000000;
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					.form {
 | 
				
			||||||
 | 
					  position:relative;
 | 
				
			||||||
 | 
					  width:100%;
 | 
				
			||||||
 | 
					  display: flex;
 | 
				
			||||||
 | 
					  flex-direction: column;
 | 
				
			||||||
 | 
					  align-items:center;
 | 
				
			||||||
 | 
					  gap: 3%;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.inputBox input,button,select {
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  width:100%;
 | 
				
			||||||
 | 
					  border: none;
 | 
				
			||||||
 | 
					  margin-right: 12.5%;
 | 
				
			||||||
 | 
					  padding-left: 2.5%;
 | 
				
			||||||
 | 
					  padding-top:2.5%;
 | 
				
			||||||
 | 
					  padding-bottom:2.5%;
 | 
				
			||||||
 | 
					  outline:none;
 | 
				
			||||||
 | 
					  border-radius: 10px;
 | 
				
			||||||
 | 
					  font-size:1.35em;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.inputBox p{
 | 
				
			||||||
 | 
					  position:relative;
 | 
				
			||||||
 | 
					  z-index: 100;
 | 
				
			||||||
 | 
					  font-family:sans-serif ; 
 | 
				
			||||||
 | 
					  color:rgb(239,60,168);
 | 
				
			||||||
 | 
					  transition:0.5;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.register{
 | 
				
			||||||
 | 
					  color:rgb(239,60,168);
 | 
				
			||||||
 | 
					  width:70%;
 | 
				
			||||||
 | 
					  margin-bottom:20px;
 | 
				
			||||||
 | 
					  margin-top:20px;
 | 
				
			||||||
 | 
					  cursor: pointer;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.switchpage{
 | 
				
			||||||
 | 
					  width:100px;
 | 
				
			||||||
 | 
					  background:rgb(255, 0 255);
 | 
				
			||||||
 | 
					  border: none;
 | 
				
			||||||
 | 
					  padding-right:0;
 | 
				
			||||||
 | 
					  padding-top:10px;
 | 
				
			||||||
 | 
					  padding-bottom:10px;
 | 
				
			||||||
 | 
					  outline:none;
 | 
				
			||||||
 | 
					  border-radius: 4px;
 | 
				
			||||||
 | 
					  font-size:0.8em;
 | 
				
			||||||
 | 
					  align-self:right;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					input[type=submit],button,select{
 | 
				
			||||||
 | 
					  margin-bottom:20px;
 | 
				
			||||||
 | 
					  background-color: rgb(239,60,168);
 | 
				
			||||||
 | 
					  cursor: pointer;
 | 
				
			||||||
 | 
					  padding:10px;
 | 
				
			||||||
 | 
					  font-size:1.35em;
 | 
				
			||||||
 | 
					  border:none;
 | 
				
			||||||
 | 
					  border-radius:20px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					input[type=file]{
 | 
				
			||||||
 | 
					  display:none;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.browser{
 | 
				
			||||||
 | 
					  display:inline-block;
 | 
				
			||||||
 | 
					  cursor:pointer;
 | 
				
			||||||
 | 
					  border-radius:20px;
 | 
				
			||||||
 | 
					  background-color:rgb(239,60,168);
 | 
				
			||||||
 | 
					  padding:5%;
 | 
				
			||||||
 | 
					  font-size:1.35em;
 | 
				
			||||||
 | 
					  font-family:sans-serif;
 | 
				
			||||||
 | 
					  background:#FFFFFF;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					button:active ,.switchpage:active{
 | 
				
			||||||
 | 
					  opacity:0.8;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</style>
 | 
				
			||||||
							
								
								
									
										291
									
								
								frontend/src/Apps/ManageCourses.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										291
									
								
								frontend/src/Apps/ManageCourses.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,291 @@
 | 
				
			|||||||
 | 
					<script setup>
 | 
				
			||||||
 | 
					  import i18n from "@/i18n.js"
 | 
				
			||||||
 | 
					  import {reactive , ref} from 'vue'
 | 
				
			||||||
 | 
					  import { getCourses,deleteCourse,alterCourse,createCourse } from "@/rest/courses.js"
 | 
				
			||||||
 | 
					  import {getUser, getSelf, getTeachers } from "@/rest/Users.js"
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  const self = await getSelf();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const curriculum = ref(await getCourses(self.role));
 | 
				
			||||||
 | 
					  const profList = await getTeachers();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const createMod = ref(false)
 | 
				
			||||||
 | 
					  const deleteMod = ref(false)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const editElementID = ref("")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  function editItem(id){
 | 
				
			||||||
 | 
					    editElementID = id;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  //Juste pour montrer le Create Mode
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					  const pattern = {
 | 
				
			||||||
 | 
					    "title":null,
 | 
				
			||||||
 | 
					    "credits":null,
 | 
				
			||||||
 | 
					    "owner":null,
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  let toModify = Object.assign({},pattern);
 | 
				
			||||||
 | 
					  let toAdd = Object.assign({}, pattern);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  async function addToCourse(){
 | 
				
			||||||
 | 
					    let isnull= false;
 | 
				
			||||||
 | 
					     
 | 
				
			||||||
 | 
					    for(const [key, value] of Object.entries(toAdd)){
 | 
				
			||||||
 | 
					      console.log(toAdd.owner);
 | 
				
			||||||
 | 
					      if(value === null){
 | 
				
			||||||
 | 
					        isnull=true;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (!isnull){
 | 
				
			||||||
 | 
					       await createCourse(toAdd.title,toAdd.credits,toAdd.owner);
 | 
				
			||||||
 | 
					       toAdd= Object.assign({},pattern);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					       curriculum.value = await getCourses(self.role);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }}
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  function setModify(item){
 | 
				
			||||||
 | 
					     for(const el in profList){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					           if(profList[el].regNo === item.owner.regNo){
 | 
				
			||||||
 | 
					        toModify.owner= profList[el];
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					     }
 | 
				
			||||||
 | 
					     toModify.credits= item.credits;
 | 
				
			||||||
 | 
					     toModify.title= item.title;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  async function patchCourse(course){
 | 
				
			||||||
 | 
					    for (let element in toModify){
 | 
				
			||||||
 | 
					        console.log(toModify,1)
 | 
				
			||||||
 | 
					        console.log(toModify[element],2)
 | 
				
			||||||
 | 
					      
 | 
				
			||||||
 | 
					        if (element =="owner" && (toModify[element].regNo != course.owner.regNo)){
 | 
				
			||||||
 | 
					          await alterCourse(course.courseId,{owner:toModify[element].regNo});
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else if(element == "title" && (toModify[element] != course.title)){
 | 
				
			||||||
 | 
					         await alterCourse(course.courseId,{title:toModify[element]});
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else if(element == "credits" && (parseInt(toModify[element]) != course.credits)){
 | 
				
			||||||
 | 
					         await alterCourse(course.courseId,{credits:parseInt(toModify[element])});
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					      toModify= Object.assign({},pattern);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      curriculum.value = await getCourses(self.role);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  //Juste pour montrer le Delete Mode
 | 
				
			||||||
 | 
					  let toRemove = null;
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  async function removeCourse(course) {
 | 
				
			||||||
 | 
					      
 | 
				
			||||||
 | 
					     await deleteCourse(course.courseId)
 | 
				
			||||||
 | 
					    curriculum.value = await getCourses(self.role);
 | 
				
			||||||
 | 
					    toRemove = null;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</script>
 | 
				
			||||||
 | 
					<template>
 | 
				
			||||||
 | 
					  <div class="body">
 | 
				
			||||||
 | 
					    <div v-if="!deleteMod && !createMod && (self.role !== 'Teacher')" class="listTitle buttonGrid">
 | 
				
			||||||
 | 
					      <button class="create" @click="editElementID= '';createMod = true;">
 | 
				
			||||||
 | 
					        {{i18n("courses.createCourse")}}
 | 
				
			||||||
 | 
					      </button>
 | 
				
			||||||
 | 
					      <button class="delete" @click="deleteMod=true" >
 | 
				
			||||||
 | 
					        {{i18n("courses.deleteCourse")}}
 | 
				
			||||||
 | 
					      </button>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					    <div v-if="createMod">
 | 
				
			||||||
 | 
					      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        <div style="margin-bottom:20px;">
 | 
				
			||||||
 | 
					         {{i18n("name")}} : 
 | 
				
			||||||
 | 
					        <input v-model="toAdd.title">
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					        <div style="margin-bottom:20px;">
 | 
				
			||||||
 | 
					          {{i18n("Teacher")}} : 
 | 
				
			||||||
 | 
					         <select style="max-width:200px;" class="teacher" v-model="toAdd.owner">
 | 
				
			||||||
 | 
					           <option v-for="item in profList" :value="item">{{item.lastName}}</option>
 | 
				
			||||||
 | 
					        </select>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					        <div style="margin-bottom:20px;">
 | 
				
			||||||
 | 
					          {{i18n("Credits")}} : 
 | 
				
			||||||
 | 
					        <input v-model="toAdd.credits">
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					      <button class="create" @click="createMod=!createMod; addToCourse();"> {{i18n("courses.confirm")}} </button>
 | 
				
			||||||
 | 
					      <button style="float:right;" @click="createMod=!createMod">{{i18n("courses.back")}}</button>
 | 
				
			||||||
 | 
					      </form>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					    <div v-if="deleteMod">
 | 
				
			||||||
 | 
					      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
 | 
				
			||||||
 | 
					        <div style="margin-bottom:20px;">
 | 
				
			||||||
 | 
					          {{i18n("courses.toDelete")}} :
 | 
				
			||||||
 | 
					         <select style="max-width:200px;" class="teacher" v-model="toRemove">
 | 
				
			||||||
 | 
					          <option v-for="item in curriculum" :value='item'>{{item.title}}</option>
 | 
				
			||||||
 | 
					          
 | 
				
			||||||
 | 
					        </select>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					        <button class="delete" @click="deleteMod=!deleteMod; removeCourse(toRemove);"> {{i18n("courses.deleteCourse")}} </button>
 | 
				
			||||||
 | 
					        <button style="float:right;" @click="deleteMod=!deleteMod"> {{i18n("courses.back")}}</button>
 | 
				
			||||||
 | 
					      </form>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title" style="width:50%;margin-left:auto; margin-right:auto;">
 | 
				
			||||||
 | 
					      <div  v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
 | 
				
			||||||
 | 
					        <button   @click="editElementID = item.title; setModify(item); ">
 | 
				
			||||||
 | 
					        {{i18n("courses.modify")}}
 | 
				
			||||||
 | 
					        </button>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					      <div v-else>
 | 
				
			||||||
 | 
					        <button @click="editElementID= '';patchCourse(item)"> {{i18n("courses.confirm")}} </button>
 | 
				
			||||||
 | 
					        <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					      <div  class="listElement" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      <div class="containerElement" v-if="editElementID !== item.title" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        <div class="name"> {{item.title}} </div>
 | 
				
			||||||
 | 
					        <div class="teacher">{{item.owner.lastName}}</div> 
 | 
				
			||||||
 | 
					        <div class="credits">{{i18n("Credits")}}:{{item.credits}}</div>  
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					      <div class="containerElement"v-else>
 | 
				
			||||||
 | 
					        <input style="max-width:200px;" class="name" v-model="toModify.title">
 | 
				
			||||||
 | 
					        <select v-if="self.role === 'Secretary'" style="max-width:200px;" class="teacher" v-model="toModify.owner">
 | 
				
			||||||
 | 
					          <option v-for="(item,index) in profList" :value='item'>{{item.lastName}}</option>
 | 
				
			||||||
 | 
					        </select>
 | 
				
			||||||
 | 
					        <div v-else class="teacher">{{item.owner.lastName}}</div> 
 | 
				
			||||||
 | 
					        <input v-if="self.role==='Secretary'"style="max-width:100px;"class="credits" v-model="toModify.credits">  
 | 
				
			||||||
 | 
					        <div v-else class="credits">{{i18n("Credits")}}:{{item.credits}}</div>  
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<style scoped>
 | 
				
			||||||
 | 
					.body {
 | 
				
			||||||
 | 
					    width:100%;
 | 
				
			||||||
 | 
					    margin-top:3.5%;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.infosContainer {
 | 
				
			||||||
 | 
					  min-width:350px;
 | 
				
			||||||
 | 
					  padding-bottom:50px;
 | 
				
			||||||
 | 
					  border:2px solid black;
 | 
				
			||||||
 | 
					  font-size:25px;
 | 
				
			||||||
 | 
					  color:white;
 | 
				
			||||||
 | 
					  padding:20px;
 | 
				
			||||||
 | 
					  background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  border-radius:20px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 .containerElement{ 
 | 
				
			||||||
 | 
					    justify-content:center;
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns:38.8% 38.8% 22.4%;
 | 
				
			||||||
 | 
					    grid-template-areas:
 | 
				
			||||||
 | 
					    "name teacher credits"; 
 | 
				
			||||||
 | 
					    column-gap:10px;  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .name {
 | 
				
			||||||
 | 
					    grid-area:name;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .teacher{
 | 
				
			||||||
 | 
					    grid-area:teacher;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .credits{
 | 
				
			||||||
 | 
					    grid-area:credits;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.listElement{
 | 
				
			||||||
 | 
					 min-width:625px;
 | 
				
			||||||
 | 
					  border:2px solid black;
 | 
				
			||||||
 | 
					  font-size:25px;
 | 
				
			||||||
 | 
					  color:white;
 | 
				
			||||||
 | 
					  padding:20px;
 | 
				
			||||||
 | 
					  background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  border-radius:20px;
 | 
				
			||||||
 | 
					  margin-bottom:10px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.modify{
 | 
				
			||||||
 | 
					  font-size:25px;
 | 
				
			||||||
 | 
					  padding:10px 10px 10px 10px;
 | 
				
			||||||
 | 
					  background-color: rgb(239,60,168);
 | 
				
			||||||
 | 
					  cursor: pointer;
 | 
				
			||||||
 | 
					  border:none;
 | 
				
			||||||
 | 
					  border-radius:15px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  input, select{
 | 
				
			||||||
 | 
					  padding:10px 10px 10px 10px; 
 | 
				
			||||||
 | 
					  font-size:25px;
 | 
				
			||||||
 | 
					  cursor: pointer;
 | 
				
			||||||
 | 
					  border:none;
 | 
				
			||||||
 | 
					  border-radius:15px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  button{
 | 
				
			||||||
 | 
					    font-size:15px;
 | 
				
			||||||
 | 
					     height:50px;
 | 
				
			||||||
 | 
					     width:100px;
 | 
				
			||||||
 | 
					    border:none;
 | 
				
			||||||
 | 
					    border-radius:20px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .buttonGrid{
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns: auto auto;
 | 
				
			||||||
 | 
					    column-gap:50px;
 | 
				
			||||||
 | 
					    grid-template-areas:
 | 
				
			||||||
 | 
					      "create delete";
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .create{
 | 
				
			||||||
 | 
					    grid-area:create;
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					    background-color:rgb(0,200,0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .delete{
 | 
				
			||||||
 | 
					    grid-area:delete;
 | 
				
			||||||
 | 
					    background-color:rgb(200,0,0);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .listTitle{
 | 
				
			||||||
 | 
					    min-width:380px;
 | 
				
			||||||
 | 
					    display: flex;
 | 
				
			||||||
 | 
					    justify-content: center;
 | 
				
			||||||
 | 
					    align-items: center;
 | 
				
			||||||
 | 
					    width:25%;
 | 
				
			||||||
 | 
					    margin-left:auto;
 | 
				
			||||||
 | 
					    margin-right:auto;
 | 
				
			||||||
 | 
					    border:2px solid black;
 | 
				
			||||||
 | 
					    font-size:25px;
 | 
				
			||||||
 | 
					    color:white;
 | 
				
			||||||
 | 
					    padding:20px;
 | 
				
			||||||
 | 
					    background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					    border-radius:20px;
 | 
				
			||||||
 | 
					    margin-bottom:10px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    button:hover{
 | 
				
			||||||
 | 
					      opacity:0.8;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					</style>
 | 
				
			||||||
							
								
								
									
										329
									
								
								frontend/src/Apps/Profil.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										329
									
								
								frontend/src/Apps/Profil.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,329 @@
 | 
				
			|||||||
 | 
					<script setup>
 | 
				
			||||||
 | 
					  import {reactive, ref } from 'vue'
 | 
				
			||||||
 | 
					  import {getSelf,alterSelf,disconnect,deleteUser} from '../rest/Users.js'
 | 
				
			||||||
 | 
					  import {getSelfCurriculum, getAllCurriculums} from '../rest/curriculum.js'
 | 
				
			||||||
 | 
					  import {getCourses} from "../rest/courses.js"
 | 
				
			||||||
 | 
					  import i18n from "@/i18n.js"
 | 
				
			||||||
 | 
					  import { uploadProfilePicture } from '@/rest/uploads.js'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const user = ref(await getSelf());
 | 
				
			||||||
 | 
					  const UserCurriculum = ref(""); 
 | 
				
			||||||
 | 
					  const curricula = ref (await getAllCurriculums());
 | 
				
			||||||
 | 
					  if(user.value.role === "Student"){
 | 
				
			||||||
 | 
					    UserCurriculum.value = await getSelfCurriculum();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  if(user.role === "Teacher"){
 | 
				
			||||||
 | 
					    UserCurriculum.value = await getCourses("Teacher");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  const modif = ref(false);
 | 
				
			||||||
 | 
					  const curric = ref(false);
 | 
				
			||||||
 | 
					  const reg = ref(false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const pattern = {
 | 
				
			||||||
 | 
					    profilPictureUrl:null,
 | 
				
			||||||
 | 
					    email:null,
 | 
				
			||||||
 | 
					    address:null,
 | 
				
			||||||
 | 
					    password:null,
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  const patternInfos ={
 | 
				
			||||||
 | 
					    email: null,
 | 
				
			||||||
 | 
					    password: null,
 | 
				
			||||||
 | 
					    passwordConfirm:null,
 | 
				
			||||||
 | 
					    id:null,
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  let toModify= Object.assign({}, pattern);
 | 
				
			||||||
 | 
					  let personnalInfos =  Object.assign({}, patternInfos);
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  function resetInputs(inputs,list){
 | 
				
			||||||
 | 
					    inputs=Object.assign({},list); 
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  async function ChangeInfos(){
 | 
				
			||||||
 | 
					    for (let element in toModify){
 | 
				
			||||||
 | 
					         if (element =="email" && (toModify[element] !== null)){
 | 
				
			||||||
 | 
					          await  alterSelf(user.value.regNo,{email : toModify[element]});
 | 
				
			||||||
 | 
					        }      
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (element =="profilPictureUrl" && (toModify[element] !== null)){
 | 
				
			||||||
 | 
					          await  alterSelf(user.value.regNo,{ profilPictureUrl : toModify[element]});
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else if(element == "address" && (toModify[element] !== null)){
 | 
				
			||||||
 | 
					          await  alterSelf(user.value.regNo,{address : toModify[element]});
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else if(element == "password" && (toModify[element] !== null)){
 | 
				
			||||||
 | 
					          await  alterSelf(user.value.regNo,{password : toModify[element]});
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					      toModify= Object.assign({},pattern);
 | 
				
			||||||
 | 
					        user.value = await getSelf()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   } 
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  function setModify(item){
 | 
				
			||||||
 | 
					     toModify.address = item.address;
 | 
				
			||||||
 | 
					     toModify.profilPictureUrl = item.profilPictureUrl;
 | 
				
			||||||
 | 
					     toModify.email= item.email;
 | 
				
			||||||
 | 
					     toModify.password= item.password;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  async function unRegister(){
 | 
				
			||||||
 | 
					   deleteUser(user.value.regNo);
 | 
				
			||||||
 | 
					   disconnect()
 | 
				
			||||||
 | 
					   setTimeout(() => {
 | 
				
			||||||
 | 
					      window.location.href="#/home";
 | 
				
			||||||
 | 
					      }, "500");
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  function getPP(){
 | 
				
			||||||
 | 
					    if(user.value.profilePictureUrl === null){
 | 
				
			||||||
 | 
					      return "/Clyde.png"
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return user.profilePictureUrl
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<template>
 | 
				
			||||||
 | 
					  <div class="body">
 | 
				
			||||||
 | 
					  <div class="container">
 | 
				
			||||||
 | 
					    <div class="profilPic">
 | 
				
			||||||
 | 
					      <img class="subContainter" :src=getPP()>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					      <div class="globalInfos">
 | 
				
			||||||
 | 
					        <div v-if="modif==false && curric==false && reg==false " class="infosContainer" >
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            {{user.firstName}} {{user.lastName}}   
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            E-mail: {{user.email}}      
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div v-if="user.role==='Student'">
 | 
				
			||||||
 | 
					            {{user.option}} {{i18n(user.role)}} 
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div v-else>
 | 
				
			||||||
 | 
					            Role:  {{i18n((user.role))}} 
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            <button @click="modif=!modif; setModify(user)"> {{i18n("profile.modify.data")}} </button>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div v-if="(user.role==='Student')">
 | 
				
			||||||
 | 
					            <button @click="reg=!reg">{{i18n("profile.reRegister")}}</button>
 | 
				
			||||||
 | 
					            <button @click="unRegister()" style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div v-if="(user.role==='Student')">
 | 
				
			||||||
 | 
					            <button @click="curric=!curric">{{i18n("profile.change.curriculum")}}</button>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					        <div v-else-if="modif" class="infosContainer">
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            {{i18n("profile.picture")}}:
 | 
				
			||||||
 | 
					            <input type="file" @change="user.profilPicture = uploadProfilePicture($event.target.files);" accept="image/*">
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            E-mail:  
 | 
				
			||||||
 | 
					            <input type="mail" v-model="toModify.email" />
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            {{i18n("profile.address")}}:
 | 
				
			||||||
 | 
					            <input type="text" v-model="toModify.id">
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            {{i18n("login.password")}}:
 | 
				
			||||||
 | 
					            <input type="password" v-model="toModify.password">
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            {{i18n("login.cPassword")}}:
 | 
				
			||||||
 | 
					            <input type="password" v-model="toModify.passwordConfirm">
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            <button @click=" modif=!modif; ChangeInfos();">{{i18n("courses.confirm")}}</button>
 | 
				
			||||||
 | 
					            <button @click="modif=!modif; resetInputs(toModify,pattern);" style="float:right;">{{i18n("courses.back")}}</button>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					        <div v-else-if="curric" class="infosContainer">
 | 
				
			||||||
 | 
					          <div style="height:40px;">
 | 
				
			||||||
 | 
					            {{i18n("Curriculum")}}:  
 | 
				
			||||||
 | 
					            <select v-model="curriculum" >
 | 
				
			||||||
 | 
					              <option v-for="item in curricula" style="font-size:20px;" :value="item">{{item.option}}</option>        
 | 
				
			||||||
 | 
					            </select>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            <button @click=" curric=!curric;">{{i18n("courses.confirm")}}</button>
 | 
				
			||||||
 | 
					            <button @click="curric=!curric; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					        <div v-else-if="reg" class="infosContainer">
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            E-mail:  
 | 
				
			||||||
 | 
					            <input type="mail" v-model="toModify.email" />
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            ID :
 | 
				
			||||||
 | 
					            <input type="text" v-model="toModify.id">
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            {{i18n("login.password")}}:
 | 
				
			||||||
 | 
					            <input type="password" v-model="toModify.password">
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            {{i18n("login.cPassword")}}:
 | 
				
			||||||
 | 
					            <input type="password" id="confirm">
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          <div>
 | 
				
			||||||
 | 
					            <button @click=" reg=!reg;">{{i18n("courses.confirm")}}</button>
 | 
				
			||||||
 | 
					            <button @click=" reg=!reg; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					      
 | 
				
			||||||
 | 
					      <div v-if="modif==false && curric==false && reg==false "class="moreInfos">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        <div v-if="(user.role ==='Student')">
 | 
				
			||||||
 | 
					          <div class="listTitle">
 | 
				
			||||||
 | 
					            {{i18n("profile.course.list")}}
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          <div  class="listElement" v-for="item in UserCurriculum.courses">
 | 
				
			||||||
 | 
					          <div class=" containerElement">
 | 
				
			||||||
 | 
					            <div class="name"> {{item.title}} </div>
 | 
				
			||||||
 | 
					            <div class="teacher">{{item.owner.lastName}}</div> 
 | 
				
			||||||
 | 
					            <div class="credits">Credits:{{item.credits}}</div>  
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        <div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					</div>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					<style scoped>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.container{
 | 
				
			||||||
 | 
					  min-width:675px;
 | 
				
			||||||
 | 
					  display:grid;
 | 
				
			||||||
 | 
					  grid-template-columns:10vw 50vw;
 | 
				
			||||||
 | 
					  grid-template-rows:200px auto;
 | 
				
			||||||
 | 
					  column-gap:2.7%;
 | 
				
			||||||
 | 
					  row-gap:45px;
 | 
				
			||||||
 | 
					  grid-template-areas:
 | 
				
			||||||
 | 
					  "profilPic globalInfos"
 | 
				
			||||||
 | 
					  "minfos minfos";
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.profilPic{
 | 
				
			||||||
 | 
					  width:100%;
 | 
				
			||||||
 | 
					  grid-area:profilPic;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.globalInfos {
 | 
				
			||||||
 | 
					  grid-area:globalInfos;
 | 
				
			||||||
 | 
					  align-self :center;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.subContainter{
 | 
				
			||||||
 | 
					  width:100%;
 | 
				
			||||||
 | 
					  background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  border-radius:20px;
 | 
				
			||||||
 | 
					  border:4px solid black;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.moreInfos {
 | 
				
			||||||
 | 
					  grid-area:minfos;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					.body {
 | 
				
			||||||
 | 
					    min-width:960px;
 | 
				
			||||||
 | 
					    width:100%;
 | 
				
			||||||
 | 
					    display:flex;
 | 
				
			||||||
 | 
					    align-items:center;
 | 
				
			||||||
 | 
					    justify-content:center;
 | 
				
			||||||
 | 
					    margin-top:5%;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					 .containerElement{ 
 | 
				
			||||||
 | 
					   justify-content:center;
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns:38.8% 38.8% 22.4%;
 | 
				
			||||||
 | 
					    grid-template-areas:
 | 
				
			||||||
 | 
					    "name teacher credits"; 
 | 
				
			||||||
 | 
					    column-gap:10px;
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .name {
 | 
				
			||||||
 | 
					    grid-area:name;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .teacher{
 | 
				
			||||||
 | 
					    grid-area:teacher;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .credits{
 | 
				
			||||||
 | 
					    grid-area:credits;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.listTitle{
 | 
				
			||||||
 | 
					    min-width:197px;
 | 
				
			||||||
 | 
					    display: flex;
 | 
				
			||||||
 | 
					    justify-content: center;
 | 
				
			||||||
 | 
					    align-items: center;
 | 
				
			||||||
 | 
					    width:8vw;
 | 
				
			||||||
 | 
					    margin-left:auto;
 | 
				
			||||||
 | 
					    margin-right:auto;
 | 
				
			||||||
 | 
					    border:2px solid black;
 | 
				
			||||||
 | 
					    font-size:25px;
 | 
				
			||||||
 | 
					    color:white;
 | 
				
			||||||
 | 
					    padding:20px;
 | 
				
			||||||
 | 
					    background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					    border-radius:20px;margin-bottom:10px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.listElement{
 | 
				
			||||||
 | 
					  min-width:625px;
 | 
				
			||||||
 | 
					  border:2px solid black;
 | 
				
			||||||
 | 
					  font-size:25px;
 | 
				
			||||||
 | 
					  color:white;
 | 
				
			||||||
 | 
					  padding:20px;
 | 
				
			||||||
 | 
					  background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  border-radius:20px;
 | 
				
			||||||
 | 
					  margin-bottom:10px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.infosContainer {
 | 
				
			||||||
 | 
					min-width:350px;
 | 
				
			||||||
 | 
					padding-bottom:50px;
 | 
				
			||||||
 | 
					border:2px solid black;
 | 
				
			||||||
 | 
					font-size:25px;
 | 
				
			||||||
 | 
					color:white;
 | 
				
			||||||
 | 
					padding:20px;
 | 
				
			||||||
 | 
					background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					border-radius:20px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					button{
 | 
				
			||||||
 | 
					  border:none;
 | 
				
			||||||
 | 
					  background-color:rgb(239, 60, 168);
 | 
				
			||||||
 | 
					  border-radius:10px;
 | 
				
			||||||
 | 
					  height:35px;
 | 
				
			||||||
 | 
					  margin-top:10px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					button:hover{
 | 
				
			||||||
 | 
					  opacity:0.8;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					</style>
 | 
				
			||||||
							
								
								
									
										211
									
								
								frontend/src/Apps/Schedule.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										211
									
								
								frontend/src/Apps/Schedule.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,211 @@
 | 
				
			|||||||
 | 
					<script setup>
 | 
				
			||||||
 | 
					  import { ref } from 'vue'
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					  const schedule = [
 | 
				
			||||||
 | 
					    {course:"Math Pour L'info",
 | 
				
			||||||
 | 
					     start:"Wed Mar 27 2024 10:15 GMT+0100",
 | 
				
			||||||
 | 
					     end:"Wed Mar 27 2024 12:15 GMT+0100"},
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					      course:"Calculus",
 | 
				
			||||||
 | 
					      start:"Wed Mar 27 2024 08:00 GMT+0100",
 | 
				
			||||||
 | 
					      end:"Wed Mar 27 2024 10:00 GMT+0100"
 | 
				
			||||||
 | 
					      
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  {
 | 
				
			||||||
 | 
					      course:"Physique II",
 | 
				
			||||||
 | 
					      start:"Tue Mar 26 2024 10:15 GMT+0100",
 | 
				
			||||||
 | 
					      end:"Tue Mar 26 2024 12:15 GMT+0100"      
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					      course:"Math Pour L'info",
 | 
				
			||||||
 | 
					      start:"Thu Mar 28 2024 10:15 GMT+0100",
 | 
				
			||||||
 | 
					      end:"Thu Mar 28 2024 12:15 GMT+0100"      
 | 
				
			||||||
 | 
					  }]
 | 
				
			||||||
 | 
					  function formatDate(date) {
 | 
				
			||||||
 | 
					    var d = new Date(date),
 | 
				
			||||||
 | 
					        month = '' + (d.getMonth() + 1),
 | 
				
			||||||
 | 
					        day = '' + d.getDate(),
 | 
				
			||||||
 | 
					        year = d.getFullYear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (month.length < 2) 
 | 
				
			||||||
 | 
					        month = '0' + month;
 | 
				
			||||||
 | 
					    if (day.length < 2) 
 | 
				
			||||||
 | 
					        day = '0' + day;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return [day, month, year].join('-');
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  function getMonday(d) {
 | 
				
			||||||
 | 
					    d = new Date(d);
 | 
				
			||||||
 | 
					    var day = d.getDay(),
 | 
				
			||||||
 | 
					    diff = d.getDate() - day + (day == 0 ? -6 : 1);
 | 
				
			||||||
 | 
					    return new Date(d.setDate(diff));
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  function getAnyDays(d){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    var day = new Date(mondayOfWeek.value);
 | 
				
			||||||
 | 
					    day.setDate(day.getDate() + d );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return day;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const mondayOfWeek=ref(getMonday(new Date(schedule[1].start)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  function isNotCourse(element){
 | 
				
			||||||
 | 
					    return element==null;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  function durationCourse(element){
 | 
				
			||||||
 | 
					    const hour = element.end.substring(3,5) -element.start.substring(3,5);
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					    return (element.end - element.start)%2;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  function sortByDate(a, b) {
 | 
				
			||||||
 | 
					    const nameA = a.start; // ignore upper and lowercase
 | 
				
			||||||
 | 
					    const nameB = b.start; // ignore upper and lowercase
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					    if (nameA < nameB) {
 | 
				
			||||||
 | 
					      return -1;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (nameA > nameB) {
 | 
				
			||||||
 | 
					      return 1;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return 0; 
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  function transpose(a) {
 | 
				
			||||||
 | 
					    const trans = [[],[],[],[],[],[]];
 | 
				
			||||||
 | 
					    for(let i = 0; i < 6;i++){
 | 
				
			||||||
 | 
					      for(let j=0; j< 7; j++){
 | 
				
			||||||
 | 
					        if(a[j][i] !== null){
 | 
				
			||||||
 | 
					          trans[i].push(a[j][i]);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return trans;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  function matrixFromList(list){
 | 
				
			||||||
 | 
					    const matrix = [[],[],[],[],[],[],[]];
 | 
				
			||||||
 | 
					    for(let key in list){
 | 
				
			||||||
 | 
					      const temp = [];
 | 
				
			||||||
 | 
					      const day = new Date(list[key].start);
 | 
				
			||||||
 | 
					      matrix[day.getDay()].push(list[key]);
 | 
				
			||||||
 | 
					      matrix[day.getDay()].sort((a,b) => sortByDate(a,b));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					      return matrix;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  const schedule2 = matrixFromList(schedule);
 | 
				
			||||||
 | 
					  const scheduleByWeek = transpose(schedule2);
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  console.log(scheduleByWeek)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</script>
 | 
				
			||||||
 | 
					<template>
 | 
				
			||||||
 | 
					  <div class="grid">
 | 
				
			||||||
 | 
					    <div class="options" >
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					    <div class="schedule">
 | 
				
			||||||
 | 
					      <table class="table">
 | 
				
			||||||
 | 
					        <tr style="background-color:rgb(24,24,24)">
 | 
				
			||||||
 | 
					          <th/>
 | 
				
			||||||
 | 
					          <th class="header">Lundi {{formatDate(getAnyDays(0))}}</th>
 | 
				
			||||||
 | 
					          <th class="header">Mardi {{formatDate(getAnyDays(1))}}</th>
 | 
				
			||||||
 | 
					          <th class="header">Mercredi {{formatDate(getAnyDays(2))}}</th>
 | 
				
			||||||
 | 
					          <th class="header">Jeudi {{formatDate(getAnyDays(3))}}</th>
 | 
				
			||||||
 | 
					          <th class="header">Vendredi {{formatDate(getAnyDays(4))}}</th>
 | 
				
			||||||
 | 
					          <th class="header">Samedi {{formatDate(getAnyDays(5))}}</th>
 | 
				
			||||||
 | 
					          <th class="header">Dimanche {{formatDate(getAnyDays(6))}}</th>
 | 
				
			||||||
 | 
					        </tr>
 | 
				
			||||||
 | 
					        <tr v-for="(n,index) in 12">
 | 
				
			||||||
 | 
					          <th class="hour">{{8 + index}}:00-{{9+index}}:00</th>
 | 
				
			||||||
 | 
					            <td v-for="m in 7"></td>
 | 
				
			||||||
 | 
					        </tr>
 | 
				
			||||||
 | 
					      </table>
 | 
				
			||||||
 | 
					      <div class="courseGrid">
 | 
				
			||||||
 | 
					        <div v-for="i in 7">
 | 
				
			||||||
 | 
					          Test
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					<style scoped>
 | 
				
			||||||
 | 
					  .grid{
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    margin-top:2%;
 | 
				
			||||||
 | 
					    align-items:center;
 | 
				
			||||||
 | 
					    justify-content:center;
 | 
				
			||||||
 | 
					    grid-template-columns:15vw 70vw;
 | 
				
			||||||
 | 
					    column-gap:2.5vw;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    grid-template-areas:"options schedule";
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  .schedule{
 | 
				
			||||||
 | 
					    position:relative;  
 | 
				
			||||||
 | 
					    border-radius:20px;
 | 
				
			||||||
 | 
					    grid-area:schedule;
 | 
				
			||||||
 | 
					    width:100%;
 | 
				
			||||||
 | 
					    height:85vh;
 | 
				
			||||||
 | 
					    background-color:rgba(255,255,255,0.1);    
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  .options{
 | 
				
			||||||
 | 
					    border-radius:20px;
 | 
				
			||||||
 | 
					    grid-area:options;
 | 
				
			||||||
 | 
					    background-color:rgba(255,255,255,0.1);
 | 
				
			||||||
 | 
					    width:100%;
 | 
				
			||||||
 | 
					    height:85vh;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .table{
 | 
				
			||||||
 | 
					    width:100%;
 | 
				
			||||||
 | 
					    height:100%;
 | 
				
			||||||
 | 
					    border-spacing:0;
 | 
				
			||||||
 | 
					    border-collapse:separate;
 | 
				
			||||||
 | 
					    border-radius: 20px;
 | 
				
			||||||
 | 
					    border: 2px solid black
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .hour{
 | 
				
			||||||
 | 
					    background-color:rgb(72,72,72)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .header{
 | 
				
			||||||
 | 
					    align-items:center;
 | 
				
			||||||
 | 
					    width:12.5%;
 | 
				
			||||||
 | 
					    color:#FFFFFF;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  table th:not(:last-child),
 | 
				
			||||||
 | 
					  table td:not(:last-child) {
 | 
				
			||||||
 | 
					  border-right: 1px solid black;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  table tr:not(:last-child)>td,
 | 
				
			||||||
 | 
					  table tr:not(:last-child)>th
 | 
				
			||||||
 | 
					  {
 | 
				
			||||||
 | 
					    border-bottom:1px solid black;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .courseGrid{
 | 
				
			||||||
 | 
					    top:13.75%;   
 | 
				
			||||||
 | 
					    left:12.5%;
 | 
				
			||||||
 | 
					    position:absolute;
 | 
				
			||||||
 | 
					    width:87.5%;
 | 
				
			||||||
 | 
					    height:86.25%; 
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns:repeat(7,1fr);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .course{
 | 
				
			||||||
 | 
					    width:100%;
 | 
				
			||||||
 | 
					    height:100%;
 | 
				
			||||||
 | 
					    background-color:rgb(100,0,100);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					</style>
 | 
				
			||||||
							
								
								
									
										84
									
								
								frontend/src/Apps/StudentsList.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										84
									
								
								frontend/src/Apps/StudentsList.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,84 @@
 | 
				
			|||||||
 | 
					<script setup>
 | 
				
			||||||
 | 
					  import i18n from "@/i18n.js"
 | 
				
			||||||
 | 
					  import { reactive  } from 'vue'
 | 
				
			||||||
 | 
					  import { getStudents } from '../rest/Users.js'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const users = await getStudents();
 | 
				
			||||||
 | 
					</script> 
 | 
				
			||||||
 | 
					<template style="margin-top:5%;">
 | 
				
			||||||
 | 
					  <div style="display:flex; justify-content:center; " v-for="item in users">
 | 
				
			||||||
 | 
					    <div class="bodu">
 | 
				
			||||||
 | 
					      <div class="container">
 | 
				
			||||||
 | 
					        <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
 | 
				
			||||||
 | 
					        <div class="option"><a>{{item.role}}</a></div>
 | 
				
			||||||
 | 
					        <div class="surname"><a>{{item.lastName}}</a></div>
 | 
				
			||||||
 | 
					        <div class="firstname"><a>{{item.firstName}}</a></div>
 | 
				
			||||||
 | 
					        <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<style scoped>
 | 
				
			||||||
 | 
					  .container{
 | 
				
			||||||
 | 
					    color:white;
 | 
				
			||||||
 | 
					    height:100px;
 | 
				
			||||||
 | 
					    font-size:30px;
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
 | 
				
			||||||
 | 
					    grid-template-areas:
 | 
				
			||||||
 | 
					    "status option surname firstname infos"; 
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .infos {
 | 
				
			||||||
 | 
					    grid-area:infos;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .option{
 | 
				
			||||||
 | 
					    grid-area:option;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .status{
 | 
				
			||||||
 | 
					    grid-area:status;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .surname{
 | 
				
			||||||
 | 
					    grid-area:surname;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					    white-space: nowrap;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
 | 
					    text-overflow:ellipsis;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .firstname{
 | 
				
			||||||
 | 
					    grid-area:firstname;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					    white-space: nowrap;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
 | 
					    text-overflow:ellipsis;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  button{
 | 
				
			||||||
 | 
					    font-size:15px;
 | 
				
			||||||
 | 
					     height:50px;
 | 
				
			||||||
 | 
					     width:75%;
 | 
				
			||||||
 | 
					    border:none;
 | 
				
			||||||
 | 
					    border-radius:20px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .bodu {
 | 
				
			||||||
 | 
					    margin-top:2%;
 | 
				
			||||||
 | 
					    width:66%;
 | 
				
			||||||
 | 
					    border:2px solid black;
 | 
				
			||||||
 | 
					    border-radius:9px;
 | 
				
			||||||
 | 
					    background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</style>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										81
									
								
								frontend/src/Apps/UsersList.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										81
									
								
								frontend/src/Apps/UsersList.vue
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,81 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					<script setup>
 | 
				
			||||||
 | 
					  import i18n from "@/i18n.js"
 | 
				
			||||||
 | 
					  import { reactive  } from 'vue'
 | 
				
			||||||
 | 
					  import { getAllUsers } from '../rest/Users.js'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const users = await getAllUsers();
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					</script> 
 | 
				
			||||||
 | 
					<template style="margin-top:5%;">
 | 
				
			||||||
 | 
					  <div style="display:flex; justify-content:center; min-width:1140px;" v-for="item in users">
 | 
				
			||||||
 | 
					    <div class="bodu">
 | 
				
			||||||
 | 
					      <div class="container">
 | 
				
			||||||
 | 
					        <div class="role"><a style="margin-left:30px">{{i18n(item.role)}}</a></div>
 | 
				
			||||||
 | 
					        <div class="surname"><a>{{item.lastName}}</a></div>
 | 
				
			||||||
 | 
					        <div class="firstname"><a>{{item.firstName}}</a></div>
 | 
				
			||||||
 | 
					        <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<style scoped>
 | 
				
			||||||
 | 
					  .container{
 | 
				
			||||||
 | 
					    color:white;
 | 
				
			||||||
 | 
					    height:100px;
 | 
				
			||||||
 | 
					    font-size:30px;
 | 
				
			||||||
 | 
					    display:grid;
 | 
				
			||||||
 | 
					    grid-template-columns:27.7% 27.7% 27.7% 16.9%;
 | 
				
			||||||
 | 
					    grid-template-areas:
 | 
				
			||||||
 | 
					    "role surname firstname infos"; 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  .infos {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    grid-area:infos;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .role {
 | 
				
			||||||
 | 
					    grid-area:role;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .surname{
 | 
				
			||||||
 | 
					    grid-area:surname;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					    white-space: nowrap;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
 | 
					    text-overflow:ellipsis;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .firstname{
 | 
				
			||||||
 | 
					    grid-area:firstname;
 | 
				
			||||||
 | 
					    align-self:center;
 | 
				
			||||||
 | 
					    white-space: nowrap;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
 | 
					    text-overflow:ellipsis;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  button{
 | 
				
			||||||
 | 
					    font-size:15px;
 | 
				
			||||||
 | 
					     height:50px;
 | 
				
			||||||
 | 
					     width:75%;
 | 
				
			||||||
 | 
					    border:none;
 | 
				
			||||||
 | 
					    border-radius:20px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .bodu {
 | 
				
			||||||
 | 
					    margin-top:2%;
 | 
				
			||||||
 | 
					    width:66%;
 | 
				
			||||||
 | 
					    border:2px solid black;
 | 
				
			||||||
 | 
					    border-radius:9px;
 | 
				
			||||||
 | 
					    background-color:rgb(50,50,50);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					</style>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										
											BIN
										
									
								
								frontend/src/assets/angry_clyde.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								frontend/src/assets/angry_clyde.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 1.2 KiB  | 
@ -1,86 +0,0 @@
 | 
				
			|||||||
/* color palette from <https://github.com/vuejs/theme> */
 | 
					 | 
				
			||||||
:root {
 | 
					 | 
				
			||||||
  --vt-c-white: #ffffff;
 | 
					 | 
				
			||||||
  --vt-c-white-soft: #f8f8f8;
 | 
					 | 
				
			||||||
  --vt-c-white-mute: #f2f2f2;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  --vt-c-black: #181818;
 | 
					 | 
				
			||||||
  --vt-c-black-soft: #222222;
 | 
					 | 
				
			||||||
  --vt-c-black-mute: #282828;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  --vt-c-indigo: #2c3e50;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
 | 
					 | 
				
			||||||
  --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
 | 
					 | 
				
			||||||
  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
 | 
					 | 
				
			||||||
  --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  --vt-c-text-light-1: var(--vt-c-indigo);
 | 
					 | 
				
			||||||
  --vt-c-text-light-2: rgba(60, 60, 60, 0.66);
 | 
					 | 
				
			||||||
  --vt-c-text-dark-1: var(--vt-c-white);
 | 
					 | 
				
			||||||
  --vt-c-text-dark-2: rgba(235, 235, 235, 0.64);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* semantic color variables for this project */
 | 
					 | 
				
			||||||
:root {
 | 
					 | 
				
			||||||
  --color-background: var(--vt-c-white);
 | 
					 | 
				
			||||||
  --color-background-soft: var(--vt-c-white-soft);
 | 
					 | 
				
			||||||
  --color-background-mute: var(--vt-c-white-mute);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  --color-border: var(--vt-c-divider-light-2);
 | 
					 | 
				
			||||||
  --color-border-hover: var(--vt-c-divider-light-1);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  --color-heading: var(--vt-c-text-light-1);
 | 
					 | 
				
			||||||
  --color-text: var(--vt-c-text-light-1);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  --section-gap: 160px;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@media (prefers-color-scheme: dark) {
 | 
					 | 
				
			||||||
  :root {
 | 
					 | 
				
			||||||
    --color-background: var(--vt-c-black);
 | 
					 | 
				
			||||||
    --color-background-soft: var(--vt-c-black-soft);
 | 
					 | 
				
			||||||
    --color-background-mute: var(--vt-c-black-mute);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    --color-border: var(--vt-c-divider-dark-2);
 | 
					 | 
				
			||||||
    --color-border-hover: var(--vt-c-divider-dark-1);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    --color-heading: var(--vt-c-text-dark-1);
 | 
					 | 
				
			||||||
    --color-text: var(--vt-c-text-dark-2);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
*,
 | 
					 | 
				
			||||||
*::before,
 | 
					 | 
				
			||||||
*::after {
 | 
					 | 
				
			||||||
  box-sizing: border-box;
 | 
					 | 
				
			||||||
  margin: 0;
 | 
					 | 
				
			||||||
  font-weight: normal;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
body {
 | 
					 | 
				
			||||||
  min-height: 100vh;
 | 
					 | 
				
			||||||
  color: var(--color-text);
 | 
					 | 
				
			||||||
  background: var(--color-background);
 | 
					 | 
				
			||||||
  transition:
 | 
					 | 
				
			||||||
    color 0.5s,
 | 
					 | 
				
			||||||
    background-color 0.5s;
 | 
					 | 
				
			||||||
  line-height: 1.6;
 | 
					 | 
				
			||||||
  font-family:
 | 
					 | 
				
			||||||
    Inter,
 | 
					 | 
				
			||||||
    -apple-system,
 | 
					 | 
				
			||||||
    BlinkMacSystemFont,
 | 
					 | 
				
			||||||
    'Segoe UI',
 | 
					 | 
				
			||||||
    Roboto,
 | 
					 | 
				
			||||||
    Oxygen,
 | 
					 | 
				
			||||||
    Ubuntu,
 | 
					 | 
				
			||||||
    Cantarell,
 | 
					 | 
				
			||||||
    'Fira Sans',
 | 
					 | 
				
			||||||
    'Droid Sans',
 | 
					 | 
				
			||||||
    'Helvetica Neue',
 | 
					 | 
				
			||||||
    sans-serif;
 | 
					 | 
				
			||||||
  font-size: 15px;
 | 
					 | 
				
			||||||
  text-rendering: optimizeLegibility;
 | 
					 | 
				
			||||||
  -webkit-font-smoothing: antialiased;
 | 
					 | 
				
			||||||
  -moz-osx-font-smoothing: grayscale;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@ -1 +0,0 @@
 | 
				
			|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
 | 
					 | 
				
			||||||
| 
		 Before Width: | Height: | Size: 276 B  | 
@ -1,35 +1,11 @@
 | 
				
			|||||||
@import './base.css';
 | 
					body {
 | 
				
			||||||
 | 
					   background-color: rgb(53, 25, 60);
 | 
				
			||||||
 | 
					   margin:0;
 | 
				
			||||||
 | 
					   width: 100vw;
 | 
				
			||||||
 | 
					   height: 100vh;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#app {
 | 
					#app {
 | 
				
			||||||
  max-width: 1280px;
 | 
					   width: 100%;
 | 
				
			||||||
  margin: 0 auto;
 | 
					   height: 100%;
 | 
				
			||||||
  padding: 2rem;
 | 
					 | 
				
			||||||
  font-weight: normal;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
a,
 | 
					 | 
				
			||||||
.green {
 | 
					 | 
				
			||||||
  text-decoration: none;
 | 
					 | 
				
			||||||
  color: hsla(160, 100%, 37%, 1);
 | 
					 | 
				
			||||||
  transition: 0.4s;
 | 
					 | 
				
			||||||
  padding: 3px;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@media (hover: hover) {
 | 
					 | 
				
			||||||
  a:hover {
 | 
					 | 
				
			||||||
    background-color: hsla(160, 100%, 37%, 0.2);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@media (min-width: 1024px) {
 | 
					 | 
				
			||||||
  body {
 | 
					 | 
				
			||||||
    display: flex;
 | 
					 | 
				
			||||||
    place-items: center;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  #app {
 | 
					 | 
				
			||||||
    display: grid;
 | 
					 | 
				
			||||||
    grid-template-columns: 1fr 1fr;
 | 
					 | 
				
			||||||
    padding: 0 2rem;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -1,44 +0,0 @@
 | 
				
			|||||||
<script setup>
 | 
					 | 
				
			||||||
defineProps({
 | 
					 | 
				
			||||||
  msg: {
 | 
					 | 
				
			||||||
    type: String,
 | 
					 | 
				
			||||||
    required: true
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
})
 | 
					 | 
				
			||||||
</script>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<template>
 | 
					 | 
				
			||||||
  <div class="greetings">
 | 
					 | 
				
			||||||
    <h1 class="green">{{ msg }}</h1>
 | 
					 | 
				
			||||||
    <h3>
 | 
					 | 
				
			||||||
      You’ve successfully created a project with
 | 
					 | 
				
			||||||
      <a href="https://vitejs.dev/" target="_blank" rel="noopener">Vite</a> +
 | 
					 | 
				
			||||||
      <a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>.
 | 
					 | 
				
			||||||
    </h3>
 | 
					 | 
				
			||||||
  </div>
 | 
					 | 
				
			||||||
</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<style scoped>
 | 
					 | 
				
			||||||
h1 {
 | 
					 | 
				
			||||||
  font-weight: 500;
 | 
					 | 
				
			||||||
  font-size: 2.6rem;
 | 
					 | 
				
			||||||
  position: relative;
 | 
					 | 
				
			||||||
  top: -10px;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
h3 {
 | 
					 | 
				
			||||||
  font-size: 1.2rem;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.greetings h1,
 | 
					 | 
				
			||||||
.greetings h3 {
 | 
					 | 
				
			||||||
  text-align: center;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@media (min-width: 1024px) {
 | 
					 | 
				
			||||||
  .greetings h1,
 | 
					 | 
				
			||||||
  .greetings h3 {
 | 
					 | 
				
			||||||
    text-align: left;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
</style>
 | 
					 | 
				
			||||||
@ -1,88 +0,0 @@
 | 
				
			|||||||
<script setup>
 | 
					 | 
				
			||||||
import WelcomeItem from './WelcomeItem.vue'
 | 
					 | 
				
			||||||
import DocumentationIcon from './icons/IconDocumentation.vue'
 | 
					 | 
				
			||||||
import ToolingIcon from './icons/IconTooling.vue'
 | 
					 | 
				
			||||||
import EcosystemIcon from './icons/IconEcosystem.vue'
 | 
					 | 
				
			||||||
import CommunityIcon from './icons/IconCommunity.vue'
 | 
					 | 
				
			||||||
import SupportIcon from './icons/IconSupport.vue'
 | 
					 | 
				
			||||||
</script>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<template>
 | 
					 | 
				
			||||||
  <WelcomeItem>
 | 
					 | 
				
			||||||
    <template #icon>
 | 
					 | 
				
			||||||
      <DocumentationIcon />
 | 
					 | 
				
			||||||
    </template>
 | 
					 | 
				
			||||||
    <template #heading>Documentation</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    Vue’s
 | 
					 | 
				
			||||||
    <a href="https://vuejs.org/" target="_blank" rel="noopener">official documentation</a>
 | 
					 | 
				
			||||||
    provides you with all information you need to get started.
 | 
					 | 
				
			||||||
  </WelcomeItem>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  <WelcomeItem>
 | 
					 | 
				
			||||||
    <template #icon>
 | 
					 | 
				
			||||||
      <ToolingIcon />
 | 
					 | 
				
			||||||
    </template>
 | 
					 | 
				
			||||||
    <template #heading>Tooling</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    This project is served and bundled with
 | 
					 | 
				
			||||||
    <a href="https://vitejs.dev/guide/features.html" target="_blank" rel="noopener">Vite</a>. The
 | 
					 | 
				
			||||||
    recommended IDE setup is
 | 
					 | 
				
			||||||
    <a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a> +
 | 
					 | 
				
			||||||
    <a href="https://github.com/johnsoncodehk/volar" target="_blank" rel="noopener">Volar</a>. If
 | 
					 | 
				
			||||||
    you need to test your components and web pages, check out
 | 
					 | 
				
			||||||
    <a href="https://www.cypress.io/" target="_blank" rel="noopener">Cypress</a> and
 | 
					 | 
				
			||||||
    <a href="https://on.cypress.io/component" target="_blank" rel="noopener"
 | 
					 | 
				
			||||||
      >Cypress Component Testing</a
 | 
					 | 
				
			||||||
    >.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <br />
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    More instructions are available in <code>README.md</code>.
 | 
					 | 
				
			||||||
  </WelcomeItem>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  <WelcomeItem>
 | 
					 | 
				
			||||||
    <template #icon>
 | 
					 | 
				
			||||||
      <EcosystemIcon />
 | 
					 | 
				
			||||||
    </template>
 | 
					 | 
				
			||||||
    <template #heading>Ecosystem</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    Get official tools and libraries for your project:
 | 
					 | 
				
			||||||
    <a href="https://pinia.vuejs.org/" target="_blank" rel="noopener">Pinia</a>,
 | 
					 | 
				
			||||||
    <a href="https://router.vuejs.org/" target="_blank" rel="noopener">Vue Router</a>,
 | 
					 | 
				
			||||||
    <a href="https://test-utils.vuejs.org/" target="_blank" rel="noopener">Vue Test Utils</a>, and
 | 
					 | 
				
			||||||
    <a href="https://github.com/vuejs/devtools" target="_blank" rel="noopener">Vue Dev Tools</a>. If
 | 
					 | 
				
			||||||
    you need more resources, we suggest paying
 | 
					 | 
				
			||||||
    <a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">Awesome Vue</a>
 | 
					 | 
				
			||||||
    a visit.
 | 
					 | 
				
			||||||
  </WelcomeItem>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  <WelcomeItem>
 | 
					 | 
				
			||||||
    <template #icon>
 | 
					 | 
				
			||||||
      <CommunityIcon />
 | 
					 | 
				
			||||||
    </template>
 | 
					 | 
				
			||||||
    <template #heading>Community</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    Got stuck? Ask your question on
 | 
					 | 
				
			||||||
    <a href="https://chat.vuejs.org" target="_blank" rel="noopener">Vue Land</a>, our official
 | 
					 | 
				
			||||||
    Discord server, or
 | 
					 | 
				
			||||||
    <a href="https://stackoverflow.com/questions/tagged/vue.js" target="_blank" rel="noopener"
 | 
					 | 
				
			||||||
      >StackOverflow</a
 | 
					 | 
				
			||||||
    >. You should also subscribe to
 | 
					 | 
				
			||||||
    <a href="https://news.vuejs.org" target="_blank" rel="noopener">our mailing list</a> and follow
 | 
					 | 
				
			||||||
    the official
 | 
					 | 
				
			||||||
    <a href="https://twitter.com/vuejs" target="_blank" rel="noopener">@vuejs</a>
 | 
					 | 
				
			||||||
    twitter account for latest news in the Vue world.
 | 
					 | 
				
			||||||
  </WelcomeItem>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  <WelcomeItem>
 | 
					 | 
				
			||||||
    <template #icon>
 | 
					 | 
				
			||||||
      <SupportIcon />
 | 
					 | 
				
			||||||
    </template>
 | 
					 | 
				
			||||||
    <template #heading>Support Vue</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    As an independent project, Vue relies on community backing for its sustainability. You can help
 | 
					 | 
				
			||||||
    us by
 | 
					 | 
				
			||||||
    <a href="https://vuejs.org/sponsor/" target="_blank" rel="noopener">becoming a sponsor</a>.
 | 
					 | 
				
			||||||
  </WelcomeItem>
 | 
					 | 
				
			||||||
</template>
 | 
					 | 
				
			||||||
@ -1,87 +0,0 @@
 | 
				
			|||||||
<template>
 | 
					 | 
				
			||||||
  <div class="item">
 | 
					 | 
				
			||||||
    <i>
 | 
					 | 
				
			||||||
      <slot name="icon"></slot>
 | 
					 | 
				
			||||||
    </i>
 | 
					 | 
				
			||||||
    <div class="details">
 | 
					 | 
				
			||||||
      <h3>
 | 
					 | 
				
			||||||
        <slot name="heading"></slot>
 | 
					 | 
				
			||||||
      </h3>
 | 
					 | 
				
			||||||
      <slot></slot>
 | 
					 | 
				
			||||||
    </div>
 | 
					 | 
				
			||||||
  </div>
 | 
					 | 
				
			||||||
</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<style scoped>
 | 
					 | 
				
			||||||
.item {
 | 
					 | 
				
			||||||
  margin-top: 2rem;
 | 
					 | 
				
			||||||
  display: flex;
 | 
					 | 
				
			||||||
  position: relative;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.details {
 | 
					 | 
				
			||||||
  flex: 1;
 | 
					 | 
				
			||||||
  margin-left: 1rem;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
i {
 | 
					 | 
				
			||||||
  display: flex;
 | 
					 | 
				
			||||||
  place-items: center;
 | 
					 | 
				
			||||||
  place-content: center;
 | 
					 | 
				
			||||||
  width: 32px;
 | 
					 | 
				
			||||||
  height: 32px;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  color: var(--color-text);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
h3 {
 | 
					 | 
				
			||||||
  font-size: 1.2rem;
 | 
					 | 
				
			||||||
  font-weight: 500;
 | 
					 | 
				
			||||||
  margin-bottom: 0.4rem;
 | 
					 | 
				
			||||||
  color: var(--color-heading);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@media (min-width: 1024px) {
 | 
					 | 
				
			||||||
  .item {
 | 
					 | 
				
			||||||
    margin-top: 0;
 | 
					 | 
				
			||||||
    padding: 0.4rem 0 1rem calc(var(--section-gap) / 2);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  i {
 | 
					 | 
				
			||||||
    top: calc(50% - 25px);
 | 
					 | 
				
			||||||
    left: -26px;
 | 
					 | 
				
			||||||
    position: absolute;
 | 
					 | 
				
			||||||
    border: 1px solid var(--color-border);
 | 
					 | 
				
			||||||
    background: var(--color-background);
 | 
					 | 
				
			||||||
    border-radius: 8px;
 | 
					 | 
				
			||||||
    width: 50px;
 | 
					 | 
				
			||||||
    height: 50px;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .item:before {
 | 
					 | 
				
			||||||
    content: ' ';
 | 
					 | 
				
			||||||
    border-left: 1px solid var(--color-border);
 | 
					 | 
				
			||||||
    position: absolute;
 | 
					 | 
				
			||||||
    left: 0;
 | 
					 | 
				
			||||||
    bottom: calc(50% + 25px);
 | 
					 | 
				
			||||||
    height: calc(50% - 25px);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .item:after {
 | 
					 | 
				
			||||||
    content: ' ';
 | 
					 | 
				
			||||||
    border-left: 1px solid var(--color-border);
 | 
					 | 
				
			||||||
    position: absolute;
 | 
					 | 
				
			||||||
    left: 0;
 | 
					 | 
				
			||||||
    top: calc(50% + 25px);
 | 
					 | 
				
			||||||
    height: calc(50% - 25px);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .item:first-of-type:before {
 | 
					 | 
				
			||||||
    display: none;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .item:last-of-type:after {
 | 
					 | 
				
			||||||
    display: none;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
</style>
 | 
					 | 
				
			||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user