From 9b8eca6e5fc24571a7dfa85e40f8b2c3ad2c1eb1 Mon Sep 17 00:00:00 2001 From: Alice Poggioli Date: Tue, 8 Oct 2024 16:35:09 +0200 Subject: [PATCH 01/10] update footer links --- src/navigation.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/navigation.js b/src/navigation.js index e05b725..18f9e85 100644 --- a/src/navigation.js +++ b/src/navigation.js @@ -80,17 +80,17 @@ export const footerData = { links: [ { text: "Raison d'être et code social", href: '#' }, { text: 'Organisations membres', href: '#' }, - { text: "L'équipe", href: '#' }, - { text: 'Histoire', href: '#' }, + { text: "L'équipe", href: '/organisations' }, + { text: 'Histoire', href: 'https://virtual-assembly.org/documents/https%3A%2F%2Fdata.virtual-assembly.org%2Fdocuments%2F6d255935-1515-495a-95c1-d458d6aaee22' }, ], }, { title: 'Projets', links: [ - { text: 'Applications', href: '#' }, - { text: 'Ontologies', href: '#' }, - { text: 'Méthodologies', href: '#' }, - { text: 'Innovations sociales', href: '#' }, + { text: 'Applications', href: '/projets/applications' }, + { text: 'Ontologies', href: '/projets/ontologies' }, + { text: 'Méthodologies', href: '/projets/methodologies' }, + { text: 'Innovations sociales', href: '/projets/innovations-sociales' }, ], }, { @@ -100,10 +100,10 @@ export const footerData = { { title: 'Communauté', links: [ - { text: 'Forum', href: '#' }, - { text: 'Chat', href: '#' }, - { text: 'PeerTube', href: '#' }, - { text: 'GitHub', href: '#' }, + { text: 'Forum', href: 'https://forums.assemblee-virtuelle.org/' }, + { text: 'Chat', href: 'https://forums.assemblee-virtuelle.org/chat/c/general/6' }, + { text: 'PeerTube', href: 'https://peertube.virtual-assembly.org/' }, + { text: 'GitHub', href: 'https://github.com/assemblee-virtuelle/' }, ], }, ], From 8fc50a1452a333908b9f10cd06d0fdde563891f5 Mon Sep 17 00:00:00 2001 From: Alice Poggioli Date: Tue, 15 Oct 2024 10:07:35 +0200 Subject: [PATCH 02/10] fix a tap error ? --- tailwind.config.cjs => tailwind.config.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tailwind.config.cjs => tailwind.config.js (100%) diff --git a/tailwind.config.cjs b/tailwind.config.js similarity index 100% rename from tailwind.config.cjs rename to tailwind.config.js From 3b95bce6a2d5309949521c07eb31c76702a0ff44 Mon Sep 17 00:00:00 2001 From: Alice Poggioli Date: Tue, 15 Oct 2024 10:09:44 +0200 Subject: [PATCH 03/10] remove the dark mode --- src/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.yaml b/src/config.yaml index f16c232..151dd1e 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -61,7 +61,7 @@ apps: index: false ui: - theme: 'system' # Values: "system" | "light" | "dark" | "light:only" | "dark:only" + theme: 'light:only' # Values: "system" | "light" | "dark" | "light:only" | "dark:only" tokens: default: From 94ec2569ea2e66da18e2e6d7beb6558f06496b3f Mon Sep 17 00:00:00 2001 From: Alice Poggioli Date: Tue, 15 Oct 2024 10:10:40 +0200 Subject: [PATCH 04/10] fix a error on build --- src/components/organizations/Members.astro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/organizations/Members.astro b/src/components/organizations/Members.astro index 7324553..3cd619e 100644 --- a/src/components/organizations/Members.astro +++ b/src/components/organizations/Members.astro @@ -28,6 +28,7 @@ const { data: roles } = await dataProvider.getMany('Person', { {associations?.map((association) => { const member = members.find((m) => m.id === association['pair:membershipActor']); const role = roles.find((r) => r.id === association['pair:membershipRole']); + if (typeof member !== 'undefined') { return (
@@ -42,8 +43,10 @@ const { data: roles } = await dataProvider.getMany('Person', {
); + } })} ) + } From 50c99db176772cbf76d4a1467d107c8d42ed4430 Mon Sep 17 00:00:00 2001 From: Alice-Po <61314813+Alice-Po@users.noreply.github.com> Date: Tue, 15 Oct 2024 11:29:47 +0200 Subject: [PATCH 05/10] Update src/components/organizations/Members.astro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sébastien Rosset --- src/components/organizations/Members.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/organizations/Members.astro b/src/components/organizations/Members.astro index 3cd619e..ebcd9be 100644 --- a/src/components/organizations/Members.astro +++ b/src/components/organizations/Members.astro @@ -28,7 +28,7 @@ const { data: roles } = await dataProvider.getMany('Person', { {associations?.map((association) => { const member = members.find((m) => m.id === association['pair:membershipActor']); const role = roles.find((r) => r.id === association['pair:membershipRole']); - if (typeof member !== 'undefined') { + if (member) { return (
From 54d91b8f0ca05851e1725aafe16f8b8f40b8361b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rosset?= Date: Tue, 15 Oct 2024 11:45:36 +0200 Subject: [PATCH 06/10] Add `docker system prune` command to prevent disk space issues --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c4cd057..94734bf 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,5 +19,6 @@ jobs: port: 22 script: | cd deployment_semapps_av + docker system prune docker compose build av-website docker compose up -d av-website From 2d50c5f2285e61c90856ce039c0b164449660586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rosset?= Date: Wed, 16 Oct 2024 16:12:14 +0200 Subject: [PATCH 07/10] Fix docker system prune job --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 94734bf..2d6d8e5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,6 +19,6 @@ jobs: port: 22 script: | cd deployment_semapps_av - docker system prune + docker system prune --force docker compose build av-website docker compose up -d av-website From 2255de4b8c94fb14bf199406551caf408024118b Mon Sep 17 00:00:00 2001 From: DUTHE Date: Tue, 22 Oct 2024 13:40:54 +0200 Subject: [PATCH 08/10] Faute d'orthographe --- src/pages/organisations/index.astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/organisations/index.astro b/src/pages/organisations/index.astro index 1dfbc01..fbb2039 100644 --- a/src/pages/organisations/index.astro +++ b/src/pages/organisations/index.astro @@ -14,8 +14,8 @@ const metadata = {
- - Les organisation membres de l'AV + + Les organisations membres de l'AV { From 6b0c9d61206a8e023a868a2ff8375e7004d43504 Mon Sep 17 00:00:00 2001 From: DUTHE Date: Wed, 18 Dec 2024 17:54:05 +0100 Subject: [PATCH 09/10] Update list of av members --- src/pages/blog/[...page].astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/blog/[...page].astro b/src/pages/blog/[...page].astro index fced1b5..2126b9c 100644 --- a/src/pages/blog/[...page].astro +++ b/src/pages/blog/[...page].astro @@ -26,7 +26,7 @@ const metadata = {
- + Le Blog de l'AV From 605604815ee77ab5ad994226775579c554b0bbac Mon Sep 17 00:00:00 2001 From: DUTHE Date: Sat, 21 Dec 2024 17:33:50 +0100 Subject: [PATCH 10/10] Add matrix link in menu + correct members AV --- src/navigation.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/navigation.js b/src/navigation.js index 18f9e85..0f91479 100644 --- a/src/navigation.js +++ b/src/navigation.js @@ -68,6 +68,10 @@ export const headerData = { text: 'GitHub', href: 'https://github.com/assemblee-virtuelle', }, + { + text: 'Matrix', + href: 'https://matrix.to/#/#virtual_assembly:matrix.org', + }, ], }, ],