feat: ekintzarik ez dagoenean agenda ezkutatzen du

Fosil-eko firewallak ez du onartzen zerbitzaria -> internet -> zerbitzaria konexiorik. Hori dela eta, zerbitzariak ostatzen dituen domeinuei IP pribatua egokitzen zaie.

.woodpecker.yml

@@ -0,0 +1,25 @@
+skip_clone: true
+
+steps:
+  clone:
+    image: alpine/git
+    commands:
+      - echo "172.17.0.1 git.fosil.eu" >> /etc/hosts
+      - git clone https://git.fosil.eu/labasarea/laba-webgunea.git .
+
+  build:
+    image: node:22-alpine
+    environment:
+      STRAPI_URL:
+        from_secret: STRAPI_URL
+      SITE_URL:
+        from_secret: SITE_URL
+    volumes:
+      - astro-dist:/deploy
+    commands:
+      - echo "172.17.0.1 kudeatu.laba.eus" >> /etc/hosts
+      - corepack enable
+      - pnpm --filter front install --frozen-lockfile
+      - pnpm front:build
+      - rm -rf /deploy/*
+      - cp -a front/dist/. /deploy/

Dockerfile

@@ -1,7 +1,7 @@
 # 1.- Build
 FROM node:22-alpine AS builder
 
-RUN corepack enable && corepack prepare pnpm@10.18.2 --activate
+RUN corepack enable && corepack prepare pnpm@11.4.0 --activate
 
 WORKDIR /app
 
@@ -18,7 +18,7 @@ FROM node:22-alpine AS runner
 
 WORKDIR /app
 
-RUN corepack enable && corepack prepare pnpm@10.18.2 --activate
+RUN corepack enable && corepack prepare pnpm@11.4.0 --activate
 
 COPY --from=builder /app/back ./back
 COPY --from=builder /app/node_modules ./node_modules

README.md

@@ -1,4 +1,4 @@
-[![Netlify Status](https://api.netlify.com/api/v1/badges/3e9ed70d-2f4b-4152-9aaf-1129570d01b4/deploy-status)](https://app.netlify.com/sites/laba-webgunea/deploys)
+[![status-badge](https://ci.laba.eus/api/badges/1/status.svg?events=push%2Cmanual%2Ccron)](https://ci.laba.eus/repos/1)
 
 # Laba.eus
 

back/package.json

@@ -15,22 +15,22 @@
     "upgrade:dry": "pnpm dlx @strapi/upgrade latest --dry"
   },
   "dependencies": {
-    "@strapi/plugin-cloud": "5.29.0",
+    "@strapi/plugin-cloud": "5.49.0",
-    "@strapi/plugin-graphql": "5.29.0",
+    "@strapi/plugin-graphql": "5.49.0",
-    "@strapi/plugin-users-permissions": "5.29.0",
+    "@strapi/plugin-users-permissions": "5.49.0",
-    "@strapi/provider-upload-cloudinary": "5.29.0",
+    "@strapi/provider-upload-cloudinary": "5.49.0",
-    "@strapi/strapi": "5.29.0",
+    "@strapi/strapi": "5.49.0",
     "better-sqlite3": "11.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.30.1",
+    "react-router-dom": "^6.30.4",
-    "strapi-plugin-icons-field": "^0.1.3",
+    "strapi-plugin-icons-field": "^1.2.4",
     "strapi-plugin-webp-converter": "^1.0.4",
-    "styled-components": "^6.1.19"
+    "styled-components": "^6.4.3"
   },
   "devDependencies": {
-    "@types/node": "^20.19.23",
+    "@types/node": "^20.19.43",
-    "@types/react": "^18.3.26",
+    "@types/react": "^18.3.31",
     "@types/react-dom": "^18.3.7",
     "typescript": "^5.9.3"
   },

back/types/generated/contentTypes.d.ts

@@ -26,6 +26,11 @@ export interface AdminApiToken extends Struct.CollectionTypeSchema {
       Schema.Attribute.SetMinMaxLength<{
         minLength: 1;
       }>;
+    adminPermissions: Schema.Attribute.Relation<
+      'oneToMany',
+      'admin::permission'
+    >;
+    adminUserOwner: Schema.Attribute.Relation<'manyToOne', 'admin::user'>;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
@@ -39,6 +44,9 @@ export interface AdminApiToken extends Struct.CollectionTypeSchema {
         minLength: 1;
       }>;
     expiresAt: Schema.Attribute.DateTime;
+    kind: Schema.Attribute.Enumeration<['content-api', 'admin']> &
+      Schema.Attribute.Required &
+      Schema.Attribute.DefaultTo<'content-api'>;
     lastUsedAt: Schema.Attribute.DateTime;
     lifespan: Schema.Attribute.BigInteger;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
@@ -56,7 +64,6 @@ export interface AdminApiToken extends Struct.CollectionTypeSchema {
     >;
     publishedAt: Schema.Attribute.DateTime;
     type: Schema.Attribute.Enumeration<['read-only', 'full-access', 'custom']> &
-      Schema.Attribute.Required &
       Schema.Attribute.DefaultTo<'read-only'>;
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@@ -134,6 +141,7 @@ export interface AdminPermission extends Struct.CollectionTypeSchema {
         minLength: 1;
       }>;
     actionParameters: Schema.Attribute.JSON & Schema.Attribute.DefaultTo<{}>;
+    apiToken: Schema.Attribute.Relation<'manyToOne', 'admin::api-token'>;
     conditions: Schema.Attribute.JSON & Schema.Attribute.DefaultTo<[]>;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@@ -385,6 +393,8 @@ export interface AdminUser extends Struct.CollectionTypeSchema {
     };
   };
   attributes: {
+    apiTokens: Schema.Attribute.Relation<'oneToMany', 'admin::api-token'> &
+      Schema.Attribute.Private;
     blocked: Schema.Attribute.Boolean &
       Schema.Attribute.Private &
       Schema.Attribute.DefaultTo<false>;
@@ -858,12 +868,13 @@ export interface PluginUploadFile extends Struct.CollectionTypeSchema {
     };
   };
   attributes: {
-    alternativeText: Schema.Attribute.String;
+    alternativeText: Schema.Attribute.Text;
-    caption: Schema.Attribute.String;
+    caption: Schema.Attribute.Text;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
     ext: Schema.Attribute.String;
+    focalPoint: Schema.Attribute.JSON;
     folder: Schema.Attribute.Relation<'manyToOne', 'plugin::upload.folder'> &
       Schema.Attribute.Private;
     folderPath: Schema.Attribute.String &
@@ -883,7 +894,7 @@ export interface PluginUploadFile extends Struct.CollectionTypeSchema {
       Schema.Attribute.Private;
     mime: Schema.Attribute.String & Schema.Attribute.Required;
     name: Schema.Attribute.String & Schema.Attribute.Required;
-    previewUrl: Schema.Attribute.String;
+    previewUrl: Schema.Attribute.Text;
     provider: Schema.Attribute.String & Schema.Attribute.Required;
     provider_metadata: Schema.Attribute.JSON;
     publishedAt: Schema.Attribute.DateTime;
@@ -892,7 +903,7 @@ export interface PluginUploadFile extends Struct.CollectionTypeSchema {
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
-    url: Schema.Attribute.String & Schema.Attribute.Required;
+    url: Schema.Attribute.Text & Schema.Attribute.Required;
     width: Schema.Attribute.Integer;
   };
 }

docker-compose.yaml

@@ -7,6 +7,9 @@ services:
       - "1337:1337"
     environment:
       NODE_ENV: production
+    extra_hosts:
+      - "ci-api.laba.eus:172.17.0.1"
+      - "ci.laba.eus:172.17.0.1"
     volumes:
       - /var/fosil/laba/kudeatu/back/.tmp:/app/back/.tmp
     restart: unless-stopped

front/package.json

@@ -10,23 +10,24 @@
     "serve": "serve dist"
   },
   "dependencies": {
-    "@astrojs/node": "^9.5.0",
+    "@astrojs/node": "^11.0.0",
-    "@astrojs/react": "^4.4.0",
+    "@astrojs/react": "^6.0.0",
-    "@astrojs/rss": "^4.0.12",
+    "@astrojs/rss": "^4.0.19",
-    "@astrojs/sitemap": "^3.6.0",
+    "@astrojs/sitemap": "^3.7.3",
-    "@types/react": "^19.1.11",
+    "@types/react": "^19.2.15",
-    "@types/react-dom": "^19.1.7",
+    "@types/react-dom": "^19.2.3",
-    "astro": "^5.14.7",
+    "astro": "^7.0.4",
-    "dayjs": "^1.11.15",
+    "dayjs": "^1.11.21",
-    "gsap": "^3.13.0",
+    "gsap": "^3.15.0",
-    "marked": "^15.0.11",
+    "marked": "^18.0.4",
-    "react": "^19.1.1",
+    "react": "^19.2.6",
-    "react-dom": "^19.1.1",
+    "react-dom": "^19.2.6",
-    "satori": "^0.18.3",
+    "satori": "^0.26.0",
-    "serve": "^14.2.4",
+    "serve": "^14.2.6",
-    "sharp": "^0.34.4"
+    "sharp": "^0.34.5",
+    "vite": "8.0.16"
   },
   "devDependencies": {
-    "sass-embedded": "^1.90.0"
+    "sass-embedded": "^1.100.0"
   }
 }

front/src/layouts/Layout.astro

@@ -44,6 +44,28 @@ const {
     <meta property="og:image:width" content="1200" />
     <meta property="og:image:height" content="630" />
     <meta property="og:image:alt" content="Laba logoa" />
+
+    <!-- Matomo -->
+    <script>
+      var _paq = (window._paq = window._paq || []);
+      // Call disableCookies before calling trackPageView
+      _paq.push(["disableCookies"]);
+      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+      _paq.push(["trackPageView"]);
+      _paq.push(["enableLinkTracking"]);
+      (function () {
+        var u = "https://analytics.txarli.dev/";
+        _paq.push(["setTrackerUrl", u + "matomo.php"]);
+        _paq.push(["setSiteId", "1"]);
+        var d = document,
+          g = d.createElement("script"),
+          s = d.getElementsByTagName("script")[0];
+        g.async = true;
+        g.src = u + "matomo.js";
+        s.parentNode.insertBefore(g, s);
+      })();
+    </script>
+    <!-- End Matomo Code -->
   </head>
 
   <body>

front/src/views/hasiera/Hasiera.astro

@@ -43,13 +43,19 @@ const hurrengoEkintzak = ekintzak.filter((ekintza) =>
       <IrudiEstela mosaikoa={mosaikoa} />
     </section>
 
-    <ZigZag from="marroia" />
+    {hurrengoEkintzak.length > 0 && 
+      <ZigZag from="marroia" />
 
-    <section class="agenda" id="agenda">
+      <section class="agenda" id="agenda">
-      <EkintzaZerrenda ekintzak={hurrengoEkintzak} title="Agenda" />
+        <EkintzaZerrenda ekintzak={hurrengoEkintzak} title="Agenda" />
-    </section>
+      </section>
+    }
 
-    <ZigZag from="gorria-background" to="gorria" />
+    <ZigZag from={
+        hurrengoEkintzak.length > 0 ? 
+        "gorria-background" 
+        : "marroia"
+      } to="gorria" />
 
     <section class="izan-labazkide" id="izan-labazkide">
       <div class="labazkide-wrapper">

package.json

@@ -38,5 +38,6 @@
   },
   "dependencies": {
     "prettier": "^3.6.2"
-  }
+  },
+  "packageManager": "pnpm@11.4.0"
 }

pnpm-workspace.yaml

@@ -3,6 +3,45 @@ packages:
   - e2e
   - front
 
+allowBuilds:
+  '@apollo/protobufjs': true
+  '@parcel/watcher': true
+  '@swc/core': true
+  better-sqlite3: true
+  core-js-pure: true
+  cypress: true
+  esbuild: true
+  sharp: true
+
+minimumReleaseAgeExclude:
+  - '@strapi/admin@5.47.0'
+  - '@strapi/cloud-cli@5.47.0'
+  - '@strapi/content-manager@5.47.0'
+  - '@strapi/content-releases@5.47.0'
+  - '@strapi/content-type-builder@5.47.0'
+  - '@strapi/core@5.47.0'
+  - '@strapi/data-transfer@5.47.0'
+  - '@strapi/database@5.47.0'
+  - '@strapi/email@5.47.0'
+  - '@strapi/generators@5.47.0'
+  - '@strapi/i18n@5.47.0'
+  - '@strapi/logger@5.47.0'
+  - '@strapi/openapi@5.47.0'
+  - '@strapi/permissions@5.47.0'
+  - '@strapi/plugin-cloud@5.47.0'
+  - '@strapi/plugin-graphql@5.47.0'
+  - '@strapi/plugin-users-permissions@5.47.0'
+  - '@strapi/provider-email-sendmail@5.47.0'
+  - '@strapi/provider-upload-cloudinary@5.47.0'
+  - '@strapi/provider-upload-local@5.47.0'
+  - '@strapi/review-workflows@5.47.0'
+  - '@strapi/strapi@5.47.0'
+  - '@strapi/types@5.47.0'
+  - '@strapi/typescript-utils@5.47.0'
+  - '@strapi/upload@5.47.0'
+  - '@strapi/utils@5.47.0'
+  - astro@6.4.2
+
 onlyBuiltDependencies:
   - '@swc/core'
   - better-sqlite3