From 9242450a8da827d97a389e5a2f2c035e449deb96 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 6 Nov 2025 11:55:54 +0100 Subject: [PATCH 1/6] Fix visual discrepancy on tag page --- src/scss/_theme.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scss/_theme.scss b/src/scss/_theme.scss index 3006d34..e88c333 100644 --- a/src/scss/_theme.scss +++ b/src/scss/_theme.scss @@ -82,6 +82,10 @@ a:not([class]):visited { margin-left: 1rem; } +.box-flex { + display: flex; +} + .align-center { align-items: center; } From 918904b2393228d7304f951dce5f85bde150d1ee Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 6 Nov 2025 12:02:41 +0100 Subject: [PATCH 2/6] Update public repo URL --- package.json | 6 +++--- src/pages/mentions-legales.md | 2 +- src/posts/liberation-site-astro.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6734c15..5f8d787 100755 --- a/package.json +++ b/package.json @@ -52,13 +52,13 @@ }, "repository": { "type": "git", - "url": "git+https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe.git" + "url": "git+https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public.git" }, "keywords": [], "author": "Yves Gatesoupe", "license": "MIT", "bugs": { - "url": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe/issues" + "url": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public/issues" }, - "homepage": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe" + "homepage": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public" } diff --git a/src/pages/mentions-legales.md b/src/pages/mentions-legales.md index c9e2b1d..9a23682 100644 --- a/src/pages/mentions-legales.md +++ b/src/pages/mentions-legales.md @@ -48,7 +48,7 @@ https://www.6clones.fr/ __***Propriété Intellectuelle***__ -Le site et le code source de ce site sont librement réuilisable sous [licence MIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe/src/branch/master/LICENSE.txt) sauf les dossiers suivants et leur contenu : +Le site et le code source de ce site sont librement réuilisable sous [licence MIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public/src/branch/master/LICENSE.txt) sauf les dossiers suivants et leur contenu : * src/members * src/images/astrolabe diff --git a/src/posts/liberation-site-astro.md b/src/posts/liberation-site-astro.md index b651c09..39d1632 100644 --- a/src/posts/liberation-site-astro.md +++ b/src/posts/liberation-site-astro.md @@ -23,7 +23,7 @@ Nous souhaitons donc mettre à disposition notre site pour une réutilisation et N'hésitez donc pas à réutiliser notre code, et si c'est le cas nous apprécierions que vous nous le disiez via notre [formulaire de contact](#contact-form) -Pour obtenir le code de notre site, vous pouvez le récupérer via notre [repo GIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe). +Pour obtenir le code de notre site, vous pouvez le récupérer via notre [repo GIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public).

From f5d5fc0585544cb87b47ce1d5c679c1c76390e67 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 6 Nov 2025 12:10:22 +0100 Subject: [PATCH 3/6] Add submodule members-data --- .gitmodules | 4 ++++ members-data | 1 + src/images/profiles | 1 - src/members | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 members-data delete mode 120000 src/images/profiles delete mode 120000 src/members diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1fd4295 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "members-data"] + path = members-data + url = ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_private.git + branch = master diff --git a/members-data b/members-data new file mode 160000 index 0000000..78ea9f9 --- /dev/null +++ b/members-data @@ -0,0 +1 @@ +Subproject commit 78ea9f98d400b9b7c92cc5d6d1b8a0d57be5fa86 diff --git a/src/images/profiles b/src/images/profiles deleted file mode 120000 index ef0cb46..0000000 --- a/src/images/profiles +++ /dev/null @@ -1 +0,0 @@ -../../../SiteWebAstrolabe_private/profiles \ No newline at end of file diff --git a/src/members b/src/members deleted file mode 120000 index 60d8641..0000000 --- a/src/members +++ /dev/null @@ -1 +0,0 @@ -../../SiteWebAstrolabe_private/members \ No newline at end of file From 3ea14af31d91c7c7191522fe971140d219e43aab Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 6 Nov 2025 12:17:59 +0100 Subject: [PATCH 4/6] Update members NOV --- members-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/members-data b/members-data index 78ea9f9..68ef49b 160000 --- a/members-data +++ b/members-data @@ -1 +1 @@ -Subproject commit 78ea9f98d400b9b7c92cc5d6d1b8a0d57be5fa86 +Subproject commit 68ef49b2a937ceabbd2e1bcfe89a190734481ae7 From c97177b5002afaa76aaeee31363256fae4158106 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 6 Nov 2025 12:21:38 +0100 Subject: [PATCH 5/6] Add symlinks to submodule members_data subfolders --- src/images/profiles | 1 + src/members | 1 + 2 files changed, 2 insertions(+) create mode 120000 src/images/profiles create mode 120000 src/members diff --git a/src/images/profiles b/src/images/profiles new file mode 120000 index 0000000..d2aa226 --- /dev/null +++ b/src/images/profiles @@ -0,0 +1 @@ +../../members-data/profiles/ \ No newline at end of file diff --git a/src/members b/src/members new file mode 120000 index 0000000..c8200da --- /dev/null +++ b/src/members @@ -0,0 +1 @@ +../members-data/members/ \ No newline at end of file From e10ad590295737296a66de9b6a6de776dd4715c0 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 6 Nov 2025 12:24:58 +0100 Subject: [PATCH 6/6] Update readme to include submodules --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf182bc..3305af2 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,15 @@ Requirements : ### Install -1. Clone or fork this repo: `git clone ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_public.git` -2. Clone or fork the private repo containing members data in the same folder that SiteWebAstrolabe_public : `git clone ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_private.git` +1. Clone or fork this repo INCLUDING its submodule: `git clone --recurse-submodules ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_public.git` 3. `cd` into the project directory (SiteWebAstrolabe_public) and run `npm install` 4. Once all the dependencies are installed run `npm start` 5. Open your browser at `http://localhost:8080` and away you go! +If you don't have the members data (page /equipe), you may have done a simple (non-recursive) clone. In this case, populate with member data by running `git submodule update --init --recursive`. Also, check that you do have the rights for the https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_private repository. + +If you need to get the latest commits of the SiteWebAstrolabe_private repo, you can do a `git submodule update --remote`. + ### Deploy 1. Copy paste deploy.js file in two new files `deploy-preprod.js`and `deploy-prod.js`