Merge branch 'main' into 32-add-react-components

.devcontainer/docker-compose.yaml

@@ -7,6 +7,7 @@ services:
   # Custom strapi service
   strapi:
     # Build the strapi service from its folder
+    container_name: clic-strapi
     build:
       # Build context, relative to the current file
       context: ../strapi/.devcontainer
@@ -35,6 +36,7 @@ services:
 
   # Database service for strapi
   strapi-postgres:
+    container_name: clic-postgres
     image: postgres
     environment:
       POSTGRES_DB: strapi_data

.vscode/settings.json

@@ -16,5 +16,47 @@
     "color": "white",
     "backgroundColor": "orange"
   },
-  "todohighlight.keywordsPattern": "(todo|TODO|fixme|FIXME)(:?)"
+  "todohighlight.keywordsPattern": "(todo|TODO|fixme|FIXME)(:?)",
+  "terminal.integrated.profiles.linux": {
+    "strapi": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "overrideName": true
+    },
+    "postgres": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
+      "overrideName": true
+    }
+  },
+  "terminal.integrated.profiles.windows": {
+    "strapi": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "overrideName": true
+    },
+    "postgres": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
+      "overrideName": true
+    }
+  },
+  "terminal.integrated.profiles.osx": {
+    "strapi": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "overrideName": true
+    },
+    "postgres": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
+      "overrideName": true
+    }
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
 }

.vscode/tasks.json

@@ -0,0 +1,34 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start dev container",
+      "type": "shell",
+      "command": "docker compose --file .devcontainer/docker-compose.yaml up",
+      "windows": {
+        "command": "docker compose --file .devcontainer\\docker-compose.yaml up"
+      },
+      "group": "none",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
+    },
+    {
+      "label": "Stop dev container",
+      "type": "shell",
+      "command": "docker compose --file .devcontainer/docker-compose.yaml down",
+      "windows": {
+        "command": "docker compose --file .devcontainer\\docker-compose.yaml down"
+      },
+      "group": "none",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      }
+    }
+  ]
+}

strapi/src/api/association/content-types/association/schema.json

@@ -0,0 +1,126 @@
+{
+  "kind": "singleType",
+  "collectionName": "associations",
+  "info": {
+    "singularName": "association",
+    "pluralName": "associations",
+    "displayName": "Association",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {
+    "i18n": {
+      "localized": true
+    }
+  },
+  "attributes": {
+    "association_name": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string",
+      "required": true,
+      "default": "CLIC",
+      "unique": true
+    },
+    "about": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "richtext",
+      "required": false
+    },
+    "logo": {
+      "type": "media",
+      "multiple": false,
+      "required": true,
+      "allowedTypes": [
+        "images"
+      ],
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      }
+    },
+    "gallery": {
+      "type": "media",
+      "multiple": true,
+      "required": false,
+      "allowedTypes": [
+        "images",
+        "videos"
+      ],
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      }
+    },
+    "official_documents": {
+      "type": "media",
+      "multiple": true,
+      "required": false,
+      "allowedTypes": [
+        "files"
+      ],
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      }
+    },
+    "social_links": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::social-link.social-link"
+    },
+    "members": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::member.member"
+    },
+    "partners": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::partner.partner"
+    },
+    "address": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string",
+      "required": true,
+      "unique": true,
+      "default": "CLIC, INN 132, Station 14, EPFL, CH-1015 Lausanne"
+    },
+    "email": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "email",
+      "default": "clic@epfl.ch",
+      "unique": false
+    },
+    "phone": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "string",
+      "default": "+41 21 693 81 28",
+      "unique": false
+    }
+  }
+}

strapi/src/api/association/controllers/association.ts

@@ -0,0 +1,7 @@
+/**
+ * association controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::association.association');

strapi/src/api/association/routes/association.ts

@@ -0,0 +1,7 @@
+/**
+ * association router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::association.association');

strapi/src/api/association/services/association.ts

@@ -0,0 +1,7 @@
+/**
+ * association service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::association.association');

strapi/src/api/commission/content-types/commission/schema.json

@@ -0,0 +1,72 @@
+{
+  "kind": "collectionType",
+  "collectionName": "commissions",
+  "info": {
+    "singularName": "commission",
+    "pluralName": "commissions",
+    "displayName": "Commission",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {
+    "i18n": {
+      "localized": true
+    }
+  },
+  "attributes": {
+    "commission_name": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string",
+      "required": true,
+      "unique": true
+    },
+    "news": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::news.news",
+      "mappedBy": "commissions"
+    },
+    "description": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "richtext",
+      "required": true
+    },
+    "small_description": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "text",
+      "required": true
+    },
+    "members": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::member.member",
+      "mappedBy": "commissions"
+    },
+    "social_links": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::social-link.social-link",
+      "mappedBy": "commission"
+    },
+    "partners": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::partner.partner",
+      "inversedBy": "commissions"
+    }
+  }
+}

strapi/src/api/commission/controllers/commission.ts

@@ -0,0 +1,7 @@
+/**
+ * commission controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::commission.commission');

strapi/src/api/commission/routes/commission.ts

@@ -0,0 +1,7 @@
+/**
+ * commission router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::commission.commission');

strapi/src/api/commission/services/commission.ts

@@ -0,0 +1,7 @@
+/**
+ * commission service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::commission.commission');