From 117723c637909c877b762a1f37707a219d5ebbc2 Mon Sep 17 00:00:00 2001 From: Davidbld <128605626+Davidbld@users.noreply.github.com> Date: Tue, 17 Sep 2024 15:40:07 +0200 Subject: [PATCH 1/6] Fix RestartOffPage - Removal of the old version - Removal of the components --- node_modules/.package-lock.json | 6 +++ package-lock.json | 6 +++ website/sco2-react/app/components/Button.jsx | 9 ---- website/sco2-react/app/components/Menu.jsx | 10 ---- website/sco2-react/app/components/Menu2.jsx | 11 ----- website/sco2-react/app/components/Menu3.jsx | 10 ---- website/sco2-react/app/components/Menu4.jsx | 10 ---- website/sco2-react/app/globals.css | 18 ------- website/sco2-react/app/layout.tsx | 22 --------- website/sco2-react/app/page.tsx | 49 -------------------- website/sco2-react/package-lock.json | 27 ++++++----- 11 files changed, 28 insertions(+), 150 deletions(-) create mode 100644 node_modules/.package-lock.json create mode 100644 package-lock.json delete mode 100644 website/sco2-react/app/components/Button.jsx delete mode 100644 website/sco2-react/app/components/Menu.jsx delete mode 100644 website/sco2-react/app/components/Menu2.jsx delete mode 100644 website/sco2-react/app/components/Menu3.jsx delete mode 100644 website/sco2-react/app/components/Menu4.jsx diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json new file mode 100644 index 00000000..0504281b --- /dev/null +++ b/node_modules/.package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "Social-Co2", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..0504281b --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "Social-Co2", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/website/sco2-react/app/components/Button.jsx b/website/sco2-react/app/components/Button.jsx deleted file mode 100644 index 2572e67d..00000000 --- a/website/sco2-react/app/components/Button.jsx +++ /dev/null @@ -1,9 +0,0 @@ -'use client'; -export default function Button({children}){ - return( - - - ) -}; \ No newline at end of file diff --git a/website/sco2-react/app/components/Menu.jsx b/website/sco2-react/app/components/Menu.jsx deleted file mode 100644 index 7deb8b9a..00000000 --- a/website/sco2-react/app/components/Menu.jsx +++ /dev/null @@ -1,10 +0,0 @@ -export default function Menu1() { - return ( -
-
-

C'est quoi SCO2 ?

-
-

Le réseau social Social CO², abrégé SCO2, se distingue par sa vocation écologique et responsable, reposant sur un système de scoring personnalisé attribué à chaque utilisateur. Cette plateforme innovante se caractérise également par son suivi, en temps réel, de l’impact de chaque individu sur son environnement. De plus, et grâce à son interopérabilité, SCO2 est accessible de manière fluide et efficace tant sur les appareils mobiles tels que les smartphones, que sur les ordinateurs personnels.

-
- ); -} diff --git a/website/sco2-react/app/components/Menu2.jsx b/website/sco2-react/app/components/Menu2.jsx deleted file mode 100644 index c5bdbdeb..00000000 --- a/website/sco2-react/app/components/Menu2.jsx +++ /dev/null @@ -1,11 +0,0 @@ -export default function Menu2(){ - return( -
-
-

Pourquoi SCO2 ?

-
-

SCO2 a pour objectif d'éveiller la conscience de la population à l'égard de sa production et de sa consommation, ainsi que de susciter une réflexion approfondie sur les enjeux du dérèglement climatique. Par ailleurs, la compétitivité entre utilisateurs s'avère être un moyen ingénieux de conférer une dimension ludique à cette sensibilisation. De plus, il est crucial de sensibiliser la population aux conséquences de la surproduction et de la surconsommation de l'environnement. Cette sensibilisation favorise une compréhension approfondie des impacts de nos choix sur la planète, encourageant ainsi des comportements plus durables.

-
- - ); -} \ No newline at end of file diff --git a/website/sco2-react/app/components/Menu3.jsx b/website/sco2-react/app/components/Menu3.jsx deleted file mode 100644 index cc203e4a..00000000 --- a/website/sco2-react/app/components/Menu3.jsx +++ /dev/null @@ -1,10 +0,0 @@ -export default function Menu3() { - return ( -
-
-

L’interface de SCO2

-
-

Dotée d'une interface d'une remarquable efficacité, empreinte de minimalisme, SCO2 parvient à dédier ses ressources à l'aspect fondamental de son service : la facilitation des échanges entre les utilisateurs. Cette conception épurée, au-delà de conférer une expérience utilisateur des plus fluides et intuitives, incarne une approche où l'essence des interactions au sein de la plateforme est sublimée. En privilégiant la simplicité sans compromettre la fonctionnalité, SCO2 offre un cadre propice à des échanges fluides et enrichissants.

-
- ); -} \ No newline at end of file diff --git a/website/sco2-react/app/components/Menu4.jsx b/website/sco2-react/app/components/Menu4.jsx deleted file mode 100644 index 70cdfadc..00000000 --- a/website/sco2-react/app/components/Menu4.jsx +++ /dev/null @@ -1,10 +0,0 @@ -export default function Menu4() { - return ( -
-
-

Une messagerie instantané responsable

-
-

La messagerie de SCO2, intégrée avec élégance, offre une expérience de communication fluide. Son interface intuitive permet des échanges instantanés, individuels ou en groupe, assurant une flexibilité optimale. Priorisant la sécurité et la confidentialité, elle constitue un outil favorisant des conversations harmonieuses au sein même de la plateforme.

-
- ); -} diff --git a/website/sco2-react/app/globals.css b/website/sco2-react/app/globals.css index d7323623..eb924094 100644 --- a/website/sco2-react/app/globals.css +++ b/website/sco2-react/app/globals.css @@ -7,21 +7,3 @@ body{ background: linear-gradient( rgb(108, 163, 94) 0%, rgb(108, 163, 94) 0%, rgb(99, 136, 137) 100%); } -.font{ - font-family:Arial, Helvetica, sans-serif , sans-serif; -} - -:root { - --foreground-rgb: 0, 0, 0; - --background-start-rgb: 214, 219, 220; - --background-end-rgb: 255, 255, 255; -} - -@media (prefers-color-scheme: white) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 16, 230, 53; - --background-end-rgb: 163, 230, 53; - } -} - diff --git a/website/sco2-react/app/layout.tsx b/website/sco2-react/app/layout.tsx index 32fbb8a9..e69de29b 100644 --- a/website/sco2-react/app/layout.tsx +++ b/website/sco2-react/app/layout.tsx @@ -1,22 +0,0 @@ -import type { Metadata } from "next"; -import { Inter } from "next/font/google"; -import "./globals.css"; - -const inter = Inter({ subsets: ["latin"] }); - -export const metadata: Metadata = { - title: "SCO2", - description: "Bienvenue sur le site web de SCO2", -}; - -export default function RootLayout({ - children, -}: Readonly<{ - children: React.ReactNode; -}>) { - return ( - - {children} - - ); -} diff --git a/website/sco2-react/app/page.tsx b/website/sco2-react/app/page.tsx index 28ebecba..e69de29b 100644 --- a/website/sco2-react/app/page.tsx +++ b/website/sco2-react/app/page.tsx @@ -1,49 +0,0 @@ -import Menu from '../app/components/Menu'; -import Menu2 from '../app/components/Menu2'; -import Menu3 from '../app/components/Menu3'; -import Menu4 from '../app/components/Menu4'; -import Button from '../app/components/Button'; - - - - -export default function Home() { - return ( -
- {/* Ajout d'un favicon */} -
- banner -
- logo -
-
-
- -
-
- -
- -
-
- -
-
-
-
image1
-
-
image2
-
-
image3
-
- -
- - ); -} \ No newline at end of file diff --git a/website/sco2-react/package-lock.json b/website/sco2-react/package-lock.json index 980b10e8..424d3d13 100644 --- a/website/sco2-react/package-lock.json +++ b/website/sco2-react/package-lock.json @@ -994,12 +994,13 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1991,10 +1992,11 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -2649,6 +2651,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -3013,12 +3016,13 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -4375,6 +4379,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, From 8d04421c471c3aeffded3dbe7a771a77b47798f8 Mon Sep 17 00:00:00 2001 From: Davidbld <128605626+Davidbld@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:24:20 +0200 Subject: [PATCH 2/6] Update LandingPage - draft Navbar - planification Footer --- .../app/components/footer/Footer.jsx | 9 ++++++ .../app/components/navbar/Navbar.jsx | 14 ++++++++++ website/sco2-react/app/globals.css | 12 ++------ website/sco2-react/app/layout.tsx | 28 +++++++++++++++++++ website/sco2-react/app/page.tsx | 8 ++++++ 5 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 website/sco2-react/app/components/footer/Footer.jsx create mode 100644 website/sco2-react/app/components/navbar/Navbar.jsx diff --git a/website/sco2-react/app/components/footer/Footer.jsx b/website/sco2-react/app/components/footer/Footer.jsx new file mode 100644 index 00000000..a383d535 --- /dev/null +++ b/website/sco2-react/app/components/footer/Footer.jsx @@ -0,0 +1,9 @@ +const Footer = () => { + return ( +
+ Footer +
+ ) +} + +export default Footer \ No newline at end of file diff --git a/website/sco2-react/app/components/navbar/Navbar.jsx b/website/sco2-react/app/components/navbar/Navbar.jsx new file mode 100644 index 00000000..806208ed --- /dev/null +++ b/website/sco2-react/app/components/navbar/Navbar.jsx @@ -0,0 +1,14 @@ +const Navbar = () => { + return ( +
+
Logo
+
+ Bla + Bla + Bla +
+
+ ) +} + +export default Navbar \ No newline at end of file diff --git a/website/sco2-react/app/globals.css b/website/sco2-react/app/globals.css index eb924094..3051dd91 100644 --- a/website/sco2-react/app/globals.css +++ b/website/sco2-react/app/globals.css @@ -1,9 +1,3 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - - -body{ - background: linear-gradient( rgb(108, 163, 94) 0%, rgb(108, 163, 94) 0%, rgb(99, 136, 137) 100%); -} - +body { + background-color +} \ No newline at end of file diff --git a/website/sco2-react/app/layout.tsx b/website/sco2-react/app/layout.tsx index e69de29b..55b0b9ad 100644 --- a/website/sco2-react/app/layout.tsx +++ b/website/sco2-react/app/layout.tsx @@ -0,0 +1,28 @@ +import type { Metadata } from "next"; +import { Inter } from "next/font/google"; +import "./globals.css"; +import Navbar from "./components/navbar/Navbar"; +import Footer from "./components/footer/Footer"; + +const inter = Inter({ subsets: ["latin"] }); + +export const metadata: Metadata = { + title: "Social CO²", + description: "Bienvenue sur le site web de SCO2", +}; + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return ( + + + + {children} +