From f718468dded73001b149cee56309d7c31fed8498 Mon Sep 17 00:00:00 2001 From: "aurian.jault" Date: Fri, 3 Feb 2023 13:36:29 +0100 Subject: [PATCH 01/12] Supr de mon index grave style alors que bastien fais un dossier console pour test????? --- src/index.html | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 src/index.html diff --git a/src/index.html b/src/index.html deleted file mode 100644 index b32303c..0000000 --- a/src/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - My awesome blog - - - -

My awesome blog

- - - - - - - - \ No newline at end of file From 8a178e7720b97927fbb2bc6c02f8a1f740f62777 Mon Sep 17 00:00:00 2001 From: "aurian.jault" Date: Sun, 5 Feb 2023 19:21:40 +0100 Subject: [PATCH 02/12] Algo de calcul des Set dans un deck --- src/Console/Console.html | 24 --------- src/algo.js | 113 ++++++++++++++++++++------------------- src/index.html | 24 +++++++++ 3 files changed, 82 insertions(+), 79 deletions(-) delete mode 100644 src/Console/Console.html create mode 100644 src/index.html diff --git a/src/Console/Console.html b/src/Console/Console.html deleted file mode 100644 index 1f6b5c3..0000000 --- a/src/Console/Console.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - Console - - - -

Console - test

- -
- -
- - - - - - - - - \ No newline at end of file diff --git a/src/algo.js b/src/algo.js index c4e8740..3c256d9 100644 --- a/src/algo.js +++ b/src/algo.js @@ -1,58 +1,3 @@ -// Pseudo code -// -/* - * function checkReslt(array ) - * { - * new array> matrice = vide - * - * forEach(array: value) - * { - * matrice.add(value.getAttrib) - * } - * Check all length of matrice - * for(i = 0; i tab - * for (j=0; j + + + + + + Console + + + +

Console - test

+ +
+ +
+ + + + + + + + + From 94bef45306cf2ef13c22e82a8ac7cdfa61fed1cd Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Sat, 11 Feb 2023 11:48:30 +0100 Subject: [PATCH 03/12] :stethoscope: add sonarqube ci --- .drone.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index dc1207c..cefe0da 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,4 +28,12 @@ steps: COMMAND: create OVERWRITE: true ADMINS: aurianjault,raphaellacote,bastienjacquelin,remiarnal - depends_on : [hyperset-build] \ No newline at end of file + depends_on : [hyperset-build] + + - name: code-analysis + environment: + SONAR_TOKEN: + from_secret: SONAR_TOKEN + commands: + - sonar-scanner -Dsonar.projectKey=hyperset -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar + depends_on: [ hyperset-build ] \ No newline at end of file From 6145f743b73cd538938e75f96ee6eb89a606818e Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Sat, 11 Feb 2023 11:52:53 +0100 Subject: [PATCH 04/12] :green_heart: fix sonarqube --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index cefe0da..e03de0a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,5 +35,5 @@ steps: SONAR_TOKEN: from_secret: SONAR_TOKEN commands: - - sonar-scanner -Dsonar.projectKey=hyperset -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar + - sonar-scanner -Dsonar.projectKey=hyperset -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$${SONAR_TOKEN} depends_on: [ hyperset-build ] \ No newline at end of file From 9177b35b5b8053c3024850541edaeb8bb522f64e Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Sat, 11 Feb 2023 11:59:00 +0100 Subject: [PATCH 05/12] idk waid --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index e03de0a..b80e216 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,6 +31,7 @@ steps: depends_on : [hyperset-build] - name: code-analysis + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest environment: SONAR_TOKEN: from_secret: SONAR_TOKEN From ed34f5a4a283f1f7955cb9a8e55680295cf94e0d Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Sat, 11 Feb 2023 12:02:09 +0100 Subject: [PATCH 06/12] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b80e216..2094717 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ steps: depends_on : [hyperset-build] - name: code-analysis - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-sonar:latest environment: SONAR_TOKEN: from_secret: SONAR_TOKEN From 537e95b75d4b5cab3aede9886e04a29627f1c8f3 Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Sat, 11 Feb 2023 12:06:18 +0100 Subject: [PATCH 07/12] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2094717..f5eb1de 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,5 +36,5 @@ steps: SONAR_TOKEN: from_secret: SONAR_TOKEN commands: - - sonar-scanner -Dsonar.projectKey=hyperset -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$${SONAR_TOKEN} + - sonarscanner -Dsonar.projectKey=hyperset -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$${SONAR_TOKEN} depends_on: [ hyperset-build ] \ No newline at end of file From 929f54fa36a72ad8842a4e65a230e827a03f71d6 Mon Sep 17 00:00:00 2001 From: "aurian.jault" Date: Tue, 14 Feb 2023 14:00:25 +0100 Subject: [PATCH 08/12] ALGO QUI MARCHE TOUJOURS PAS --- src/algo.js | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/src/algo.js b/src/algo.js index 3c256d9..500b282 100644 --- a/src/algo.js +++ b/src/algo.js @@ -1,7 +1,10 @@ +import('./Model/Card.js') + + function isSet(cards) { let attributesMatrix = []; - + cards.forEach(element => { attributesMatrix.push(element.getAttributes()); }); @@ -61,38 +64,51 @@ function nbrSets(deck, setSize){ matrix = [] // Remplie la matrice des valeurs du deck for (i=0;i Date: Sat, 18 Feb 2023 15:00:58 +0100 Subject: [PATCH 09/12] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f5eb1de..763ebc4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ steps: depends_on : [hyperset-build] - name: code-analysis - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-sonar:latest + image: sonarsource/sonar-scanner-cli environment: SONAR_TOKEN: from_secret: SONAR_TOKEN From 226c456ee1026cb0a2e3e1ba530ce65ac14db4f8 Mon Sep 17 00:00:00 2001 From: RemRem et ToTo Date: Sat, 18 Feb 2023 15:01:36 +0100 Subject: [PATCH 10/12] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 763ebc4..d365e34 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,5 +36,5 @@ steps: SONAR_TOKEN: from_secret: SONAR_TOKEN commands: - - sonarscanner -Dsonar.projectKey=hyperset -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$${SONAR_TOKEN} + - sonar-scanner -Dsonar.projectKey=hyperset -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$${SONAR_TOKEN} depends_on: [ hyperset-build ] \ No newline at end of file From c1cfe99118ddb3e712a3a8e5fb66cfbcba7e4636 Mon Sep 17 00:00:00 2001 From: "aurian.jault" Date: Sun, 19 Feb 2023 21:43:20 +0100 Subject: [PATCH 11/12] abandon de l algo commun pour tous les set possibles et creation des algo pour chaques configuration --- src/algo.js | 111 +++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/src/algo.js b/src/algo.js index 500b282..c3da01b 100644 --- a/src/algo.js +++ b/src/algo.js @@ -59,74 +59,71 @@ function checkAttributes(attributes){ return boolLoop === true; } - -function nbrSets(deck, setSize){ - matrix = [] - // Remplie la matrice des valeurs du deck - for (i=0;i Date: Sun, 19 Feb 2023 21:45:24 +0100 Subject: [PATCH 12/12] supression de l index.html --- src/index.html | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 src/index.html diff --git a/src/index.html b/src/index.html deleted file mode 100644 index e8691d0..0000000 --- a/src/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - Console - - - -

Console - test

- -
- -
- - - - - - - - -