Sync Ec2025 branch #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

hirunatan merged 54 commits into PIWEEK:ec2025 from aurynncrow:ec2025

Dec 15, 2025

.DS_Store

Binary file not shown.

backend/.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,6 @@ $RECYCLE.BIN/ @@
     ssl
     .idea
     nbproject
-    public/uploads/*
     !public/uploads/.gitkeep
     ############################
@@ Expand Down @@

backend/config/plugins.js

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     module.exports = ({ env }) => ({
-      // ...
       email: {
         config: {
           provider: 'strapi-provider-email-local-browser', // For community providers pass the full package name (e.g. provider: 'strapi-provider-email-mandrill')
@@ Expand All / @@ -12,6 +11,36 @@ module.exports = ({ env }) => ({ @@
             testAddress: 'juliasedefdjian@strapi.io',
           },
         },
+        // Uncomment this (and comment above) to use a real SMTP email.
+        // config: {
+        //   provider: 'nodemailer',
+        //   providerOptions: {
+        //     host: '<smtp host>',
+        //     port: 587,
+        //     auth: {
+        //       user: '<user>',
+        //       pass: '<password>',
+        //     },
+        //   },
+        //   settings: {
+        //     defaultFrom: 'from-email@example.com',
+        //     defaultReplyTo: 'no-reply-email@example.com',
+        //   },
+        // }
+      },
+      'users-permissions': {
+        enabled: true,
+        config: {
+          jwtSecret: 'N1WVrkrjgmdjrSyTZYwUC6Fji41yoBjbMdN2qseiwZ8=',
+          jwt: {
+            expiresIn: '7d',
+          },
+          register: {
+            allowedFields: ["activities_staff","registrationType","dni",
+              "phone_number","last_name","pseudonym","smial","room_code",
+              "menu_type","menu_comment","premium","premium_comment",
+              "aide","mentee","mentor","childrens","name","room_type"],
+          },
+        },
       },
-      // ...
     });

backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

backend/package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
       },
       "dependencies": {
         "@strapi/plugin-users-permissions": "5.6.0",
+        "@strapi/provider-email-nodemailer": "^5.11.3",
         "@strapi/strapi": "5.6.0",
         "better-sqlite3": "11.3.0",
         "fs-extra": "^10.0.0",
@@ Expand Down @@

backend/public/uploads/Escudo_EC_OK_e874e7c6c7.svg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/Logo_STE_4cfde55bed.svg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

...c/uploads/Michael_Everson_Wikimedia_2011_hackathon_in_Berlin_087_491617b22f.jpg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/Puerta_Hobbit_TR_472e3aae2a.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/Zanahorias_Hobbit_TR_c9a8c0d33d.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

...ds/medium_Michael_Everson_Wikimedia_2011_hackathon_in_Berlin_087_491617b22f.jpg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/medium_Puerta_Hobbit_TR_472e3aae2a.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/medium_Zanahorias_Hobbit_TR_c9a8c0d33d.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/medium_rene2025_EC_6206f11ca4.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/rene2025_EC_6206f11ca4.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

...ads/small_Michael_Everson_Wikimedia_2011_hackathon_in_Berlin_087_491617b22f.jpg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/small_Puerta_Hobbit_TR_472e3aae2a.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/small_Zanahorias_Hobbit_TR_c9a8c0d33d.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/small_rene2025_EC_6206f11ca4.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

...thumbnail_Michael_Everson_Wikimedia_2011_hackathon_in_Berlin_087_491617b22f.jpg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/thumbnail_Puerta_Hobbit_TR_472e3aae2a.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/thumbnail_Zanahorias_Hobbit_TR_c9a8c0d33d.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/public/uploads/thumbnail_rene2025_EC_6206f11ca4.webp

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

backend/src/api/about-us/content-types/about-us/schema.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,8 @@ @@
       "info": {
         "singularName": "about-us",
         "pluralName": "about-uses",
-        "displayName": "about-us"
+        "displayName": "about-us",
+        "description": ""
       },
       "options": {
         "draftAndPublish": true
@@ Expand Down Expand Up / @@ -34,6 +35,22 @@ @@
           "type": "richtext",
           "required": true,
           "default": "EasyFest provides a simple and straightforward event/festival webpage building toolkit."
+        },
+        "image": {
+          "type": "media",
+          "multiple": false,
+          "required": false,
+          "allowedTypes": [
+            "images",
+            "files",
+            "videos",
+            "audios"
+          ],
+          "pluginOptions": {
+            "i18n": {
+              "localized": true
+            }
+          }
         }
       }
     }

backend/src/api/activity/content-types/activity/schema.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -188,11 +188,32 @@
  
          },

          "type": "enumeration",

          "enum": [

            "Talk",

            "Keynote",

            "Workshop",

            "Party"

            "Actividad",

            "Charla",

            "Taller",

            "Infantil"

          ]

        },

        "registered_users": {

          "type": "relation",

          "relation": "manyToMany",

          "target": "plugin::users-permissions.user",

          "inversedBy": "activities_registered"

        },

        "queued_users": {

          "type": "relation",

          "relation": "manyToMany",

          "target": "plugin::users-permissions.user",

          "inversedBy": "activities_queued"

        },

        "adjust_start": {

          "pluginOptions": {

            "i18n": {

              "localized": true

            }

          },

          "type": "integer",

          "default": 0

        }

      }

    }

backend/src/api/contact-info/content-types/contact-info/schema.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,8 @@ @@
       "info": {
         "singularName": "contact-info",
         "pluralName": "contact-infos",
-        "displayName": "contact-info"
+        "displayName": "contact",
+        "description": ""
       },
       "options": {
         "draftAndPublish": true
@@ Expand Down Expand Up / @@ -32,6 +33,22 @@ @@
             }
           },
           "type": "richtext"
+        },
+        "image": {
+          "type": "media",
+          "multiple": false,
+          "required": false,
+          "allowedTypes": [
+            "images",
+            "files",
+            "videos",
+            "audios"
+          ],
+          "pluginOptions": {
+            "i18n": {
+              "localized": true
+            }
+          }
         }
       }
     }

backend/src/api/enrollment/content-types/enrollment/schema.json

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    {
+      "kind": "singleType",
+      "collectionName": "enrollments",
+      "info": {
+        "singularName": "enrollment",
+        "pluralName": "enrollments",
+        "displayName": "enrollment",
+        "description": ""
+      },
+      "options": {
+        "draftAndPublish": true
+      },
+      "pluginOptions": {},
+      "attributes": {
+        "title": {
+          "type": "string"
+        },
+        "content": {
+          "type": "richtext"
+        }
+      }
+    }

backend/src/api/enrollment/controllers/enrollment.js

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    'use strict';
+    /**
+     * enrollment controller
+     */
+    const { createCoreController } = require('@strapi/strapi').factories;
+    module.exports = createCoreController('api::enrollment.enrollment');

backend/src/api/enrollment/routes/enrollment.js

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    'use strict';
+    /**
+     * enrollment router
+     */
+    const { createCoreRouter } = require('@strapi/strapi').factories;
+    module.exports = createCoreRouter('api::enrollment.enrollment');

backend/src/api/enrollment/services/enrollment.js

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    'use strict';
+    /**
+     * enrollment service
+     */
+    const { createCoreService } = require('@strapi/strapi').factories;
+    module.exports = createCoreService('api::enrollment.enrollment');

backend/src/api/homepage/content-types/homepage/schema.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,12 @@ @@
           "type": "component",
           "repeatable": false,
           "component": "homepage.accommodation_section"
+        },
+        "subtitle": {
+          "type": "string"
+        },
+        "richtitle": {
+          "type": "richtext"
         }
       }
     }

backend/src/api/precios/content-types/precios/schema.json

-Original file line number
+Diff line change
@@ -0,0 +1,36 @@
+    {
+      "kind": "singleType",
+      "collectionName": "preciosos",
+      "info": {
+        "singularName": "precios",
+        "pluralName": "preciosos",
+        "displayName": "prices",
+        "description": ""
+      },
+      "options": {
+        "draftAndPublish": true
+      },
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "attributes": {
+        "title": {
+          "type": "text",
+          "pluginOptions": {
+            "i18n": {
+              "localized": true
+            }
+          }
+        },
+        "content": {
+          "type": "richtext",
+          "pluginOptions": {
+            "i18n": {
+              "localized": true
+            }
+          }
+        }
+      }
+    }

backend/src/api/precios/controllers/precios.js

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    'use strict';
+    /**
+     * precios controller
+     */
+    const { createCoreController } = require('@strapi/strapi').factories;
+    module.exports = createCoreController('api::precios.precios');

backend/src/api/precios/routes/precios.js

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    'use strict';
+    /**
+     * precios router
+     */
+    const { createCoreRouter } = require('@strapi/strapi').factories;
+    module.exports = createCoreRouter('api::precios.precios');

backend/src/api/precios/services/precios.js

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    'use strict';
+    /**
+     * precios service
+     */
+    const { createCoreService } = require('@strapi/strapi').factories;
+    module.exports = createCoreService('api::precios.precios');

backend/src/api/setting/content-types/setting/schema.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -275,6 +275,25 @@ @@
             }
           },
           "component": "site.nav-menu-item"
+        },
+        "enrollment_active": {
+          "pluginOptions": {
+            "i18n": {
+              "localized": false
+            }
+          },
+          "type": "boolean",
+          "default": false
+        },
+        "show_activity_registration": {
+          "pluginOptions": {
+            "i18n": {
+              "localized": false
+            }
+          },
+          "type": "boolean",
+          "default": false,
+          "required": true
         }
       }
     }

backend/src/api/site/content-types/site/schema.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ @@
           "default": "hidden",
           "required": true
         },
-        "status": {
+        "eventStatus": {
           "type": "enumeration",
           "enum": [
             "hype",
@@ Expand All / @@ -43,6 +43,9 @@ @@
           ],
           "default": "hype",
           "required": true
+        },
+        "loginEnabled": {
+          "type": "boolean"
         }
       }
     }