Merge branch 'master' of github.com:assemblee-virtuelle/website

assemblee-virtuelle · Jan 9, 2025 · 509c4f5 · 509c4f5
2 parents e9e8c7b + 6056048
commit 509c4f5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git 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 --force
           docker compose build av-website
           docker compose up -d av-website
diff --git 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 (member) {
           return (
             <div>
               <a data-modal-target={member.id} data-modal-toggle={member.id} class="cursor-pointer">
@@ -42,8 +43,10 @@ const { data: roles } = await dataProvider.getMany('Person', {
               <ActorModal actor={member} />
             </div>
           );
+          }
         })}
       </div>
     </div>
   )
+
 }
diff --git 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:

diff --git a/src/navigation.js b/src/navigation.js
@@ -56,6 +56,10 @@ export const headerData = {
           text: 'GitHub',
           href: 'https://github.com/assemblee-virtuelle',
         },
+        {
+          text: 'Matrix',
+          href: 'https://matrix.to/#/#virtual_assembly:matrix.org',
+        },
       ],
     },
   ],
@@ -68,17 +72,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' },
       ],
     },
     {
@@ -88,10 +92,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/' },
       ],
     },
   ],

diff --git a/src/pages/blog/[...page].astro b/src/pages/blog/[...page].astro
@@ -26,7 +26,7 @@ const metadata = {
 
 <Layout metadata={metadata}>
   <section class="px-6 sm:px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-4xl">
-    <Headline subtitle="Les dernières actualités de l'Assemblée Virtuelle et des projets qu'elle porte">
+    <Headline subtitle="Les dernières actualités de l'Assemblée Virtuelle (AV) et des projets qu'elle porte">
       Le Blog de l'AV
     </Headline>
     <BlogList posts={page.data} />

diff --git a/src/pages/organisations/index.astro b/src/pages/organisations/index.astro
@@ -14,8 +14,8 @@ const metadata = {
 
 <Layout metadata={metadata}>
   <section class="px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-4xl">
-    <Headline subtitle="Les dernières actualités de l'Assemblée Virtuelle et des projets qu'elle porte">
-      Les organisation membres de l'AV
+    <Headline subtitle="(Entreprises, coopératives, associations ou collectif autour d'un projet)">
+      Les organisations membres de l'AV
     </Headline>
 
     {

diff --git a/tailwind.config.cjs → tailwind.config.js b/tailwind.config.cjs → tailwind.config.js