Merge branch 'main' into messages_improvements

.env.example

@@ -23,9 +23,13 @@ KEYCLOAK_ADMIN_CLIENT = "admin-cli"
 KEYCLOAK_ADMIN_SECRET = "**********"
 KEYCLOAK_DIRECTUS_CLIENT = "directus"
 KEYCLOAK_DIRECTUS_SECRET = "**********"
+KEYCLOAK_NUXT_CLIENT = "nuxt"
 
 COLLECTIVO_URL = "http://localhost:3000"
 COLLECTIVO_DOMAIN = "localhost"
 COLLECTIVO_DEBUG = "false"
 COLLECTIVO_API_URL = "http://host.docker.internal:3000"
 COLLECTIVO_API_TOKEN = "badToken"
+COLLECTIVO_AUTH_SERVICE = "keycloak"
+
+SHARED_DOMAIN = "localhost"

.github/utils/app/action.yml

@@ -42,7 +42,7 @@ runs:
 
     - name: Install dependencies
       shell: bash
-      run: pnpm install
+      run: pnpm install --no-frozen-lockfile
 
     - name: Build
       if: inputs.build == 'true'

README.md

@@ -1,6 +1,6 @@
 ![Collectivo](docs/assets/collectivo_rgb_header.png)
 
-Collectivo is an open-source framework for buildig community platforms. It allows you to create a digital space, where users can interact with each other and organize together. Thanks to its modular design, the platform is completely flexible and can include [many different features](#features). Good software for all! :)
+Collectivo is an open-source framework for buildig community platforms. It allows you to create a digital space, where users can interact with each other and organize together. Thanks to its modular design, the platform is completely flexible and can include [many different features](https://docs.collectivo.io/#features). Good software for all! :)
 
 Collectivo is built on [Nuxt](https://nuxt.com/docs/), [Directus](https://directus.io/), and [Keycloak](https://www.keycloak.org/). Features of the plattform are split into separate extensions, using [Nuxt Layers](https://nuxt.com/docs/guide/going-further/layers). The software is designed to make it as easy as possible to develop additional extensions and integrate existing tools into the plattform.
 

collectivo/app/eslint.config.mjs

@@ -0,0 +1,5 @@
+// @ts-check
+import withNuxt from "./.nuxt/eslint.config.mjs";
+
+export default withNuxt();
+// Your custom configs here

collectivo/app/package.json

@@ -18,13 +18,13 @@
     "@collectivo/payments": "workspace:*"
   },
   "devDependencies": {
-    "@nuxt/devtools": "^1.0.8",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.21.0",
-    "eslint": "8.56.0",
+    "@nuxt/devtools": "^1.3.1",
+    "@typescript-eslint/eslint-plugin": "7.8.0",
+    "@typescript-eslint/parser": "7.8.0",
+    "eslint": "9.2.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-vue": "9.21.1",
-    "nuxt": "^3.10.1",
+    "eslint-plugin-vue": "9.26.0",
+    "nuxt": "^3.11.2",
     "prettier": "3.2.5"
   }
 }

collectivo/collectivo/app.config.ts

@@ -193,6 +193,7 @@ export default defineAppConfig({
     },
     input: {
       wrapper: "relative",
+      base: "disabled:cursor-default disabled:opacity-50",
       size: {
         md: "text-sm leading-[18px]",
       },
@@ -233,7 +234,7 @@ export default defineAppConfig({
       },
     },
     select: {
-      base: "h-[50px]",
+      base: "h-[50px] disabled:cursor-default disabled:opacity-50",
       rounded: "rounded-lg",
       variant: {
         solid:

collectivo/collectivo/components/collectivo/Card.vue

@@ -11,11 +11,11 @@ const _ = defineProps({
 
 <template>
   <div :class="`card bg-${color ?? 'primary'}-50`">
-    <div :class="`card-corner bg-${color ?? 'primary'}-100`"></div>
+    <div :class="`card-corner bg-${color ?? 'primary'}-100`" />
     <p v-if="title" class="card__title">
       {{ title }}
     </p>
-    <slot name="content"></slot>
+    <slot name="content" />
   </div>
 </template>
 

collectivo/collectivo/components/collectivo/Container.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="cv-container">
-    <slot></slot>
+    <slot />
   </div>
 </template>
 

collectivo/collectivo/components/collectivo/form/Builder.vue

@@ -20,7 +20,7 @@ const renderer = {
 };
 
 marked.use({
-  // @ts-ignore
+  // @ts-expect-error
   renderer,
 });
 
@@ -287,7 +287,7 @@ async function fillOutAll() {
             v-if="input.description"
             class="leading-5 py-2 md-description"
             v-html="parse(t(input.description))"
-          ></div>
+          />
         </div>
         <div v-else-if="input.type === 'description'" class="form-field-lg">
           <UFormGroup :label="input.label ? t(input.label) : undefined">
@@ -298,7 +298,7 @@ async function fillOutAll() {
               v-else
               class="md-description md-small"
               v-html="parse(t(input.description))"
-            ></div>
+            />
           </UFormGroup>
         </div>
         <component
@@ -307,9 +307,8 @@ async function fillOutAll() {
           :class="input.width ? `form-field-${input.width}` : 'form-field-lg'"
           :input="input"
           :state="state"
-        >
-        </component>
-        <div v-else-if="input.type === 'clear'" class="basis-full"></div>
+        />
+        <div v-else-if="input.type === 'clear'" class="basis-full" />
         <div
           v-else
           :class="input.width ? `form-field-${input.width}` : 'form-field-md'"
@@ -325,7 +324,7 @@ async function fillOutAll() {
                 v-if="input.description"
                 class="md-description md-small"
                 v-html="parse(t(input.description))"
-              ></div>
+              />
             </template>
             <template #error="{ error }">
               <div v-if="error && typeof error === 'string'">
@@ -429,14 +428,14 @@ async function fillOutAll() {
               <CollectivoFormDatePicker
                 v-if="input.useDatePicker"
                 v-model="state[input.key]"
-              ></CollectivoFormDatePicker>
+              />
               <CollectivoFormDate
                 v-else
                 v-model="state[input.key]"
                 :max-years-future="input.maxYearsFuture"
                 :max-years-past="input.maxYearsPast"
                 :disabled="input.disabled"
-              ></CollectivoFormDate>
+              />
             </template>
             <template v-else-if="input.type === 'checkbox'">
               <div class="form-box flex flex-row">
@@ -449,7 +448,7 @@ async function fillOutAll() {
                   v-if="input.content"
                   class="md-description md-small"
                   v-html="parse(t(input.content))"
-                ></span>
+                />
               </div>
             </template>
             <template v-else-if="input.type === 'custom-input'">
@@ -459,7 +458,7 @@ async function fillOutAll() {
         </div>
       </template>
     </template>
-    <div class="basis-full"></div>
+    <div class="basis-full" />
     <div class="form-field mt-2">
       <UButton
         v-if="props.submit"

collectivo/collectivo/composables/tiles.ts

@@ -22,11 +22,11 @@ class CollectivoTileStore {
     const directus = useDirectus();
 
     try {
-      // @ts-ignore
+      // @ts-expect-error
       // directus typing seems to be faulty with "fields: ["*.*"]"
       this.data = await directus.request(
         readItems("collectivo_tiles", {
-          fields: ["*.*"],
+          fields: ["*", "tiles_buttons.*"],
           filter: {
             tiles_status: {
               _eq: "published",