Laba bizi atala sortzen du (#17)

* feat: laba bizi backenda sortzen du

* chore: Strapi bertsioa igotzen du

* chore: gatsbyn tipo berriak sortzen ditu

* feat: izena aldatzen du

* refactor: extract interface

* feat: ekintzaren bista sortzen du

* feat: zikloa Gatsbyn sortzen du

* chore: erabiltzaile izena aldatzen du

* feat: bizi atala sortzen du

* feat: bizi atalean ekintza eta zikloak erakusten ditu

* fix: focus visible erabiltzen du

* chore: ekintzak sartzen ditu

* feat: semantika hobetzen du

* feat: titularra erakusten du

* feat: colorea aldaten du

* feat: izenbururako hoverra konpontzen du

* feat: dastatu laba fonteak aldatzen ditu

* feat: partially active sartzen du esteketan

* refactor: cubic bezier kentzen du

* database

* chore: irudiak databasetik ezabatzen ditu

* feat: Strapi bertsioa igotzen du

* feat: cloudinary konfiguratzen du

* feat: kartelak erakusten ditu

* chore: ziklo antiespezista sortzen du

* chore: zikloa aldatzen du

* chore: tortura ekintza sortzen du

* feat: ekintza layout sortzen du

* feat: maketazioa konpontzen du

* chore: Strapi bertsioa eguneratzen du

* refactor: naming

* feat: gainburua sortzen du

* feat: maketazio dohikuntzak

* feat: ekintza zerrenda sortzen du

* feat: maketazioa hobetzen du (agian)

* feat: blur kentzen du

* fix: preview-a konpontzen du

* feat: hitzordua sartzen du

* fix: datak konpontzen ditu

* feat: irudiak handitzen ditu

* feat: draft and publish kentzen du

* feat: strapi bertsioa igotzen du

* chore: querya aldatzen du

* feat: zikloa maketatzen du

* feat: zikloak bizin erakusten ditu

* feat: maketazioa aldatzen du

* refactor: fragmentuak sortzen ditu

* refactor: fragmentua erabilten du

* feat: zikloa erakusten du

* chore: edukiak sartzen ditu

* feat: gainburua dohitzen du

* feat: strapi bertsioa igotzen du

* feat: liburutegiak igotzen ditu

* fix: build-a konpontzen du

* fix: mugikor maketazioa konpontzen du

* fix: mugikor maketazioa hobetzen du

* chore: start sript-a aldatzen du

* chore: konfigurazioa aldatzen du

* chore: Strapi bertsioa igotzen du

* chore: netlify deployments kentzen du

* chore: browserslist eguneratzen du

* Revert "chore: netlify deployments kentzen du"

This reverts commit 166fb859036ad311d1e49430d7222999071d5cb2.

* chore: warning-ak ekiditen ditu

* feat: focus-a konpontzen du

* feat: kartela konpontzen du

* feat: pasa diren zikloak ezkutatzen ditu

* feat: ekintzak ezkutatzen ditu produkzioan

back/config/admin.js

@@ -5,5 +5,10 @@ module.exports = ({ env }) => ({
   apiToken: {
     salt: env("API_TOKEN_SALT", "4444a34644486306e97051f610dfdae4"),
   },
+  transfer: {
+    token: {
+      salt: env("TRANSFER_SALT", "NDDFL8BZi0QK5oYDbRgNow=="),
+    },
+  },
   url: "/kudeatu",
 });

back/config/env/production/database.js

@@ -1,19 +1,15 @@
-const parse = require("pg-connection-string").parse;
-const config = parse(process.env.DATABASE_URL);
+const path = require("path");
 
 module.exports = ({ env }) => ({
   connection: {
-    client: "postgres",
+    client: "sqlite",
     connection: {
-      host: config.host,
-      port: config.port,
-      database: config.database,
-      user: config.user,
-      password: config.password,
-      ssl: {
-        rejectUnauthorized: false,
-      },
+      filename: path.join(
+        __dirname,
+        "..",
+        env("DATABASE_FILENAME", "./data.db")
+      ),
     },
-    debug: false,
+    useNullAsDefault: true,
   },
 });

back/config/env/production/server.js

@@ -1,5 +1,5 @@
 module.exports = ({ env }) => ({
-  url: env("PUBLIC_URL", "https://fast-springs-77208.herokuapp.com"),
+  url: env("PUBLIC_URL", "https://vervet-big-dassie.ngrok-free.app"),
   host: env("HOST", "0.0.0.0"),
   port: env.int("PORT", 1337),
 });

back/config/middlewares.js

@@ -7,8 +7,20 @@ module.exports = [
         useDefaults: true,
         directives: {
           "connect-src": ["'self'", "https:"],
-          "img-src": ["'self'", "data:", "blob:", "res.cloudinary.com"],
-          "media-src": ["'self'", "data:", "blob:", "res.cloudinary.com"],
+          "img-src": [
+            "'self'",
+            "data:",
+            "blob:",
+            "market-assets.strapi.io",
+            "res.cloudinary.com",
+          ],
+          "media-src": [
+            "'self'",
+            "data:",
+            "blob:",
+            "market-assets.strapi.io",
+            "res.cloudinary.com",
+          ],
           upgradeInsecureRequests: null,
         },
       },

back/config/plugins.js

@@ -1,4 +1,18 @@
-module.exports = {
+module.exports = ({ env }) => ({
+  upload: {
+    config: {
+      provider: "cloudinary",
+      providerOptions: {
+        cloud_name: env("CLOUDINARY_NAME"),
+        api_key: env("CLOUDINARY_KEY"),
+        api_secret: env("CLOUDINARY_SECRET"),
+      },
+      actionOptions: {
+        upload: {},
+        delete: {},
+      },
+    },
+  },
   graphql: {
     config: {
       endpoint: "/graphql",
@@ -26,4 +40,4 @@ module.exports = {
       ],
     },
   },
-};
+});

back/package.json

@@ -15,17 +15,17 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/plugin-graphql": "^4.16.2",
-    "@strapi/plugin-i18n": "^4.16.2",
-    "@strapi/plugin-users-permissions": "^4.16.2",
-    "@strapi/provider-upload-cloudinary": "^4.16.2",
-    "@strapi/strapi": "^4.16.2",
-    "pg": "^8.11.3",
-    "pg-connection-string": "^2.6.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "@strapi/plugin-graphql": "^4.25.17",
+    "@strapi/plugin-i18n": "^4.25.13",
+    "@strapi/plugin-users-permissions": "^4.25.17",
+    "@strapi/provider-upload-cloudinary": "^4.25.17",
+    "@strapi/strapi": "^4.25.17",
+    "pg": "^8.13.1",
+    "pg-connection-string": "^2.7.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-router-dom": "^5.3.4",
-    "sqlite3": "5.1.6",
+    "sqlite3": "5.1.7",
     "strapi-plugin-netlify-deployments": "^2.0.2",
     "styled-components": "^5.3.11"
   },

back/src/api/bizi/content-types/bizi/schema.json

@@ -0,0 +1,22 @@
+{
+  "kind": "singleType",
+  "collectionName": "bizis",
+  "info": {
+    "singularName": "bizi",
+    "pluralName": "bizis",
+    "displayName": "Bizi"
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "izenburua": {
+      "type": "string",
+      "required": true
+    },
+    "deskribapena": {
+      "type": "text"
+    }
+  }
+}

back/src/api/bizi/controllers/bizi.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * bizi controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::bizi.bizi');

back/src/api/bizi/routes/bizi.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * bizi router
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('api::bizi.bizi');

back/src/api/bizi/services/bizi.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * bizi service
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::bizi.bizi');

back/src/api/ekintza/content-types/ekintza/schema.json

@@ -0,0 +1,59 @@
+{
+  "kind": "collectionType",
+  "collectionName": "ekintzak",
+  "info": {
+    "singularName": "ekintza",
+    "pluralName": "ekintzak",
+    "displayName": "Ekintza",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "izenburua": {
+      "type": "string",
+      "required": true
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "izenburua",
+      "required": true
+    },
+    "hitzordua": {
+      "type": "datetime",
+      "required": true
+    },
+    "titularra": {
+      "type": "text"
+    },
+    "elkarlana": {
+      "type": "component",
+      "repeatable": true,
+      "component": "bizi.elkarlana"
+    },
+    "labakoUzta": {
+      "type": "boolean",
+      "default": false,
+      "required": true
+    },
+    "kartela": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
+      "allowedTypes": [
+        "images"
+      ]
+    },
+    "zikloa": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "api::zikloa.zikloa",
+      "inversedBy": "ekintzak"
+    },
+    "deskribapena": {
+      "type": "richtext"
+    }
+  }
+}

back/src/api/ekintza/controllers/ekintza.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * ekintza controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::ekintza.ekintza');

back/src/api/ekintza/routes/ekintza.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * ekintza router
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('api::ekintza.ekintza');

back/src/api/ekintza/services/ekintza.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * ekintza service
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::ekintza.ekintza');

back/src/api/erakundea/content-types/erakundea/schema.json

@@ -0,0 +1,32 @@
+{
+  "kind": "collectionType",
+  "collectionName": "erakundeak",
+  "info": {
+    "singularName": "erakundea",
+    "pluralName": "erakundeak",
+    "displayName": "Erakundea",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": false
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "izena": {
+      "type": "string",
+      "required": true
+    },
+    "esteka": {
+      "type": "string",
+      "regex": "[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)"
+    },
+    "logoa": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
+      "allowedTypes": [
+        "images"
+      ]
+    }
+  }
+}

back/src/api/erakundea/controllers/erakundea.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * erakundea controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::erakundea.erakundea');

back/src/api/erakundea/routes/erakundea.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * erakundea router
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('api::erakundea.erakundea');

back/src/api/erakundea/services/erakundea.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * erakundea service
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::erakundea.erakundea');

back/src/api/zikloa/content-types/zikloa/schema.json

@@ -0,0 +1,34 @@
+{
+  "kind": "collectionType",
+  "collectionName": "zikloas",
+  "info": {
+    "singularName": "zikloa",
+    "pluralName": "zikloas",
+    "displayName": "Zikloa",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "izena": {
+      "type": "string",
+      "required": true
+    },
+    "deskribapena": {
+      "type": "richtext"
+    },
+    "slug": {
+      "type": "uid",
+      "required": true,
+      "targetField": "izena"
+    },
+    "ekintzak": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::ekintza.ekintza",
+      "mappedBy": "zikloa"
+    }
+  }
+}

back/src/api/zikloa/controllers/zikloa.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * zikloa controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::zikloa.zikloa');

back/src/api/zikloa/routes/zikloa.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * zikloa router
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('api::zikloa.zikloa');

back/src/api/zikloa/services/zikloa.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * zikloa service
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::zikloa.zikloa');

back/src/components/bizi/elkarlana.json

@@ -0,0 +1,19 @@
+{
+  "collectionName": "components_bizi_elkarlanas",
+  "info": {
+    "displayName": "elkarlana",
+    "icon": "handHeart",
+    "description": ""
+  },
+  "options": {},
+  "attributes": {
+    "harremana": {
+      "type": "string"
+    },
+    "erakundeak": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::erakundea.erakundea"
+    }
+  }
+}

back/types/generated/components.d.ts

@@ -1,5 +1,22 @@
 import type { Schema, Attribute } from '@strapi/strapi';
 
+export interface BiziElkarlana extends Schema.Component {
+  collectionName: 'components_bizi_elkarlanas';
+  info: {
+    displayName: 'elkarlana';
+    icon: 'handHeart';
+    description: '';
+  };
+  attributes: {
+    harremana: Attribute.String;
+    erakundeak: Attribute.Relation<
+      'bizi.elkarlana',
+      'oneToMany',
+      'api::erakundea.erakundea'
+    >;
+  };
+}
+
 export interface KafetegiaAlergenoa extends Schema.Component {
   collectionName: 'components_kafetegia_alergenoas';
   info: {
@@ -119,6 +136,7 @@ export interface OrokorraHelbidea extends Schema.Component {
 declare module '@strapi/types' {
   export module Shared {
     export interface Components {
+      'bizi.elkarlana': BiziElkarlana;
       'kafetegia.alergenoa': KafetegiaAlergenoa;
       'kafetegia.edaria': KafetegiaEdaria;
       'kafetegia.izenburua': KafetegiaIzenburua;

back/types/generated/contentTypes.d.ts

@@ -403,9 +403,12 @@ export interface PluginUploadFile extends Schema.CollectionType {
     folderPath: Attribute.String &
       Attribute.Required &
       Attribute.Private &
-      Attribute.SetMinMax<{
-        min: 1;
-      }>;
+      Attribute.SetMinMax<
+        {
+          min: 1;
+        },
+        number
+      >;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     createdBy: Attribute.Relation<
@@ -441,9 +444,12 @@ export interface PluginUploadFolder extends Schema.CollectionType {
   attributes: {
     name: Attribute.String &
       Attribute.Required &
-      Attribute.SetMinMax<{
-        min: 1;
-      }>;
+      Attribute.SetMinMax<
+        {
+          min: 1;
+        },
+        number
+      >;
     pathId: Attribute.Integer & Attribute.Required & Attribute.Unique;
     parent: Attribute.Relation<
       'plugin::upload.folder',
@@ -462,9 +468,12 @@ export interface PluginUploadFolder extends Schema.CollectionType {
     >;
     path: Attribute.String &
       Attribute.Required &
-      Attribute.SetMinMax<{
-        min: 1;
-      }>;
+      Attribute.SetMinMax<
+        {
+          min: 1;
+        },
+        number
+      >;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     createdBy: Attribute.Relation<
@@ -503,6 +512,12 @@ export interface PluginContentReleasesRelease extends Schema.CollectionType {
   attributes: {
     name: Attribute.String & Attribute.Required;
     releasedAt: Attribute.DateTime;
+    scheduledAt: Attribute.DateTime;
+    timezone: Attribute.String;
+    status: Attribute.Enumeration<
+      ['ready', 'blocked', 'failed', 'done', 'empty']
+    > &
+      Attribute.Required;
     actions: Attribute.Relation<
       'plugin::content-releases.release',
       'oneToMany',
@@ -551,11 +566,13 @@ export interface PluginContentReleasesReleaseAction
       'morphToOne'
     >;
     contentType: Attribute.String & Attribute.Required;
+    locale: Attribute.String;
     release: Attribute.Relation<
       'plugin::content-releases.release-action',
       'manyToOne',
       'plugin::content-releases.release'
     >;
+    isEntryValid: Attribute.Boolean;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     createdBy: Attribute.Relation<
@@ -595,10 +612,13 @@ export interface PluginI18NLocale extends Schema.CollectionType {
   };
   attributes: {
     name: Attribute.String &
-      Attribute.SetMinMax<{
-        min: 1;
-        max: 50;
-      }>;
+      Attribute.SetMinMax<
+        {
+          min: 1;
+          max: 50;
+        },
+        number
+      >;
     code: Attribute.String & Attribute.Unique;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
@@ -768,6 +788,107 @@ export interface PluginUsersPermissionsUser extends Schema.CollectionType {
   };
 }
 
+export interface ApiBiziBizi extends Schema.SingleType {
+  collectionName: 'bizis';
+  info: {
+    singularName: 'bizi';
+    pluralName: 'bizis';
+    displayName: 'Bizi';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    izenburua: Attribute.String & Attribute.Required;
+    deskribapena: Attribute.Text;
+    createdAt: Attribute.DateTime;
+    updatedAt: Attribute.DateTime;
+    publishedAt: Attribute.DateTime;
+    createdBy: Attribute.Relation<'api::bizi.bizi', 'oneToOne', 'admin::user'> &
+      Attribute.Private;
+    updatedBy: Attribute.Relation<'api::bizi.bizi', 'oneToOne', 'admin::user'> &
+      Attribute.Private;
+  };
+}
+
+export interface ApiEkintzaEkintza extends Schema.CollectionType {
+  collectionName: 'ekintzak';
+  info: {
+    singularName: 'ekintza';
+    pluralName: 'ekintzak';
+    displayName: 'Ekintza';
+    description: '';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    izenburua: Attribute.String & Attribute.Required;
+    slug: Attribute.UID<'api::ekintza.ekintza', 'izenburua'> &
+      Attribute.Required;
+    hitzordua: Attribute.DateTime & Attribute.Required;
+    titularra: Attribute.Text;
+    elkarlana: Attribute.Component<'bizi.elkarlana', true>;
+    labakoUzta: Attribute.Boolean &
+      Attribute.Required &
+      Attribute.DefaultTo<false>;
+    kartela: Attribute.Media;
+    zikloa: Attribute.Relation<
+      'api::ekintza.ekintza',
+      'manyToOne',
+      'api::zikloa.zikloa'
+    >;
+    deskribapena: Attribute.RichText;
+    createdAt: Attribute.DateTime;
+    updatedAt: Attribute.DateTime;
+    publishedAt: Attribute.DateTime;
+    createdBy: Attribute.Relation<
+      'api::ekintza.ekintza',
+      'oneToOne',
+      'admin::user'
+    > &
+      Attribute.Private;
+    updatedBy: Attribute.Relation<
+      'api::ekintza.ekintza',
+      'oneToOne',
+      'admin::user'
+    > &
+      Attribute.Private;
+  };
+}
+
+export interface ApiErakundeaErakundea extends Schema.CollectionType {
+  collectionName: 'erakundeak';
+  info: {
+    singularName: 'erakundea';
+    pluralName: 'erakundeak';
+    displayName: 'Erakundea';
+    description: '';
+  };
+  options: {
+    draftAndPublish: false;
+  };
+  attributes: {
+    izena: Attribute.String & Attribute.Required;
+    esteka: Attribute.String;
+    logoa: Attribute.Media;
+    createdAt: Attribute.DateTime;
+    updatedAt: Attribute.DateTime;
+    createdBy: Attribute.Relation<
+      'api::erakundea.erakundea',
+      'oneToOne',
+      'admin::user'
+    > &
+      Attribute.Private;
+    updatedBy: Attribute.Relation<
+      'api::erakundea.erakundea',
+      'oneToOne',
+      'admin::user'
+    > &
+      Attribute.Private;
+  };
+}
+
 export interface ApiHasieraHasiera extends Schema.SingleType {
   collectionName: 'hasierak';
   info: {
@@ -900,6 +1021,44 @@ export interface ApiPribatutasunPolitikaPribatutasunPolitika
   };
 }
 
+export interface ApiZikloaZikloa extends Schema.CollectionType {
+  collectionName: 'zikloas';
+  info: {
+    singularName: 'zikloa';
+    pluralName: 'zikloas';
+    displayName: 'Zikloa';
+    description: '';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    izena: Attribute.String & Attribute.Required;
+    deskribapena: Attribute.RichText;
+    slug: Attribute.UID<'api::zikloa.zikloa', 'izena'> & Attribute.Required;
+    ekintzak: Attribute.Relation<
+      'api::zikloa.zikloa',
+      'oneToMany',
+      'api::ekintza.ekintza'
+    >;
+    createdAt: Attribute.DateTime;
+    updatedAt: Attribute.DateTime;
+    publishedAt: Attribute.DateTime;
+    createdBy: Attribute.Relation<
+      'api::zikloa.zikloa',
+      'oneToOne',
+      'admin::user'
+    > &
+      Attribute.Private;
+    updatedBy: Attribute.Relation<
+      'api::zikloa.zikloa',
+      'oneToOne',
+      'admin::user'
+    > &
+      Attribute.Private;
+  };
+}
+
 declare module '@strapi/types' {
   export module Shared {
     export interface ContentTypes {
@@ -918,10 +1077,14 @@ declare module '@strapi/types' {
       'plugin::users-permissions.permission': PluginUsersPermissionsPermission;
       'plugin::users-permissions.role': PluginUsersPermissionsRole;
       'plugin::users-permissions.user': PluginUsersPermissionsUser;
+      'api::bizi.bizi': ApiBiziBizi;
+      'api::ekintza.ekintza': ApiEkintzaEkintza;
+      'api::erakundea.erakundea': ApiErakundeaErakundea;
       'api::hasiera.hasiera': ApiHasieraHasiera;
       'api::kafetegia.kafetegia': ApiKafetegiaKafetegia;
       'api::lege-oharra.lege-oharra': ApiLegeOharraLegeOharra;
       'api::pribatutasun-politika.pribatutasun-politika': ApiPribatutasunPolitikaPribatutasunPolitika;
+      'api::zikloa.zikloa': ApiZikloaZikloa;
     }
   }
 }