Merge pull request #227 from binary-coffee-dev/develop

release 2024.04.02.01

.github/workflows/deployment.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 16.x ]
+        node-version: [ 16.19.1 ]
 
     steps:
       - uses: actions/checkout@v2
@@ -104,6 +104,7 @@ jobs:
           SMTP_PORT: ${{ secrets.PROD__SMTP_PORT }}
           SMTP_USERNAME: ${{ secrets.PROD__SMTP_USERNAME }}
           SMTP_PASSWORD: ${{ secrets.PROD__SMTP_PASSWORD }}
+          BOT_NOTIFICATION_TOKEN: ${{ secrets.BOT_NOTIFICATION_TOKEN }}
 
       - name: Copy project to the hosting
         uses: easingthemes/[email protected]
@@ -158,6 +159,7 @@ jobs:
           SMTP_PORT: ${{ secrets.PROD__SMTP_PORT }}
           SMTP_USERNAME: ${{ secrets.PROD__SMTP_USERNAME }}
           SMTP_PASSWORD: ${{ secrets.PROD__SMTP_PASSWORD }}
+          BOT_NOTIFICATION_TOKEN: ${{ secrets.BOT_NOTIFICATION_TOKEN }}
 
       - name: Copy project to the hosting
         uses: easingthemes/[email protected]

.gitignore

@@ -1,4 +1,5 @@
 .strapi-updater.json
+.strapi
 
 .env
 .nyc_output

config/custom.js

@@ -1,15 +1,12 @@
 module.exports = ({env}) => ({
-  myCustomConfiguration: 'This configuration is accessible through strapi.routes.myCustomConfiguration',
-
-  // toDo (gonzalezext)[19.08.23]: remove this captcha variable
-  captchaSecret: env('CAPTCHA_SECRET', 'captcha-secret'),
-
   apiUrl: env('API_URL', 'https://api.binarycoffee.dev'),
   siteUrl: env('SITE_URL', 'https://binarycoffee.dev'),
 
-  feedArticlesLimit: env.int('FEED_ARTICLES_LIMIT', 15),
-  enableBotNotifications: false,
+  enableBotNotifications: true,
+  botNotificationToken: env('BOT_NOTIFICATION_TOKEN', 'bot_token'),
+  botNotifierUrl: env('BOT_NOTIFIER_URL', 'https://monitor.binarycoffee.dev/notification'),
 
+  feedArticlesLimit: env.int('FEED_ARTICLES_LIMIT', 15),
   maxPostRequestLimit: 20,
   maxSimilarPostRequestLimit: 20,
   maxNumberOfArticlesPerDay: 5,
@@ -23,7 +20,5 @@ module.exports = ({env}) => ({
   githubClientId: env('GITHUB_CLIENT_ID', ''),
   githubClientSecret: env('GITHUB_CLIENT_SECRET', ''),
 
-  botNotifierUrl: env('BOT_NOTIFIER_URL', 'https://botnotifier.binary-coffee.dev/notify/channel'),
-
   podcastEspacioBinarioIdentifier: 'espacio-binario'
 });

config/database.js

@@ -10,19 +10,4 @@ module.exports = ({env}) => ({
     },
     debug: false,
   },
-  // defaultConnection: 'default',
-  // connections: {
-  //   default: {
-  //     connector: 'bookshelf',
-  //     settings: {
-  //       client: 'mysql',
-  //       database: env('DATABASE_NAME', 'blog'),
-  //       username: env('DATABASE_USERNAME', 'api'),
-  //       password: env('DATABASE_PASSWORD', 'password'),
-  //       port: env.int('DATABASE_PORT', 3306),
-  //       host: env('DATABASE_HOST', 'mysql')
-  //     },
-  //     options: {},
-  //   }
-  // }
 });

config/env/test/custom.js

@@ -0,0 +1,7 @@
+const mainCustom = require('../../custom');
+
+module.exports = ({env}) => ({
+  ...mainCustom({env}),
+
+  enableBotNotifications: false,
+});

config/middlewares.js

@@ -1,9 +1,9 @@
 module.exports = [
+  'strapi::logger',
   'strapi::errors',
   'strapi::security',
   'strapi::cors',
   {name: 'strapi::poweredBy', config: {poweredBy: 'Binary Coffee <strapi.io>'}},
-  'strapi::logger',
   'strapi::query',
   'strapi::body',
   {name: 'strapi::session', config: {signed: false}},

create_env_file.sh

@@ -17,6 +17,9 @@ echo "NODE_ENV=$NODE_ENV" >> .env
 echo "SITE_URL=$SITE_URL" >> .env
 echo "API_URL=$API_URL" >> .env
 
+# bot notification
+echo "BOT_NOTIFICATION_TOKEN=$BOT_NOTIFICATION_TOKEN" >> .env
+
 # docker configurations
 echo "BLOG_RESOURCES=$BLOG_RESOURCES" >> .env