Merge pull request #87 from alkemyTech/release_v1.1.0

Release v1.1.0

Author: soyarielruiz

.env.example

@@ -3,4 +3,6 @@ DB_USER=root
 DB_PASSWORD= 
 DB_PORT=3306
 SECRETORPRIVATEKEY=
-AUTH_ROUNDS=
+AUTH_ROUNDS=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=

.gitignore

@@ -1,3 +1,6 @@
 node_modules
 .env
+docker_schemas
 docker-compose.yaml
+docker_schemas
+files

app.js

@@ -3,14 +3,15 @@ const express = require('express');
 const path = require('path');
 const cookieParser = require('cookie-parser');
 const logger = require('morgan');
-const cors = require('cors')
-require('dotenv').config()
+const cors = require('cors');
+require('dotenv').config();
 
 const indexRouter = require('./routes/index');
 const usersRouter = require('./routes/users');
+const authRouter = require('./routes/authentication');
 
 const app = express();
-app.use(cors())
+app.use(cors());
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -24,14 +25,15 @@ app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
+app.use('/auth', authRouter);
 
 // catch 404 and forward to error handler
-app.use(function(req, res, next) {
+app.use(function (req, res, next) {
   next(createError(404));
 });
 
 // error handler
-app.use(function(err, req, res, next) {
+app.use(function (err, req, res, next) {
   // set locals, only providing error in development
   res.locals.message = err.message;
   res.locals.error = req.app.get('env') === 'development' ? err : {};

assets/email/plantilla_email.html

@@ -298,7 +298,7 @@
                       <div
                         style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;line-height:1.5;text-align:left;color:#000000;">
                         <p style="text-align: center;"><span
-                            style="font-size: 24px;"><strong>{{organizationName }}/strong></span></p>
+                            style="font-size: 24px;"><strong>{{organizationName}}</strong></span></p>
                         <p style="text-align: center;">&nbsp;</p>
                         <p style="text-align: center;"><span style="font-size: 16px;">{{welcomeText}}</span></p>
                       </div>

config/aws-sdk.js

@@ -0,0 +1,19 @@
+const AWS = require('aws-sdk');
+require('dotenv').config();
+const { AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY } = process.env;
+
+AWS.config.update({
+  accessKeyId: AWS_ACCESS_KEY_ID,
+  secretAccessKey: AWS_SECRET_ACCESS_KEY,
+  region: 'us-east-1',
+  apiVersion: '2006-03-01',
+  signatureVersion: 'v4',
+});
+
+const s3Bucket = new AWS.S3({
+  params: { Bucket: 'cohorte-septiembre-5efe33c6' },
+});
+
+module.exports = s3Bucket;
+
+

controllers/activitiesController.js

@@ -1,3 +1,40 @@
-class ActivitiesController{}
+const { Activities } = require('../models');
 
-module.exports = ActivitiesController;
+class ActivitiesController {
+  static async createActivities(req, res) {
+    const { name, content, image } = req.body;
+
+    try {
+      const createActivity = await Activities.create({
+        name,
+        content,
+        image,
+      });
+
+      return res.status(201).json({
+        msg: 'activity created successfully',
+        activity: createActivity,
+      });
+    } catch (error) {
+      res.status(400).json(error);
+    }
+  }
+
+  static async updateActivities(req, res) {
+    const { id } = req.params;
+    const  {name, content, image }  = req.body;
+    let updateActivities;
+    try {
+         [updateActivities] = await Activities.update(
+          {name, content, image},
+          {where:{id}}
+         )
+    } catch (error) {
+      return res.status(400).json(error);
+    }
+    if(updateActivities) return res.status(200).json({activities:{name,content,image}})
+    return res.status(404).json({ msg: 'could not find Activitie' });
+  }  
+}
+
+module.exports = ActivitiesController;

controllers/authentication.js

@@ -0,0 +1,25 @@
+const db = require('../models');
+const bcrypt = require('bcrypt');
+const AuthDao = require('../dao/authentication');
+
+class AuthController {
+  static async loginUser(req, res) {
+    const { email, password } = req.body;
+    try {
+      const where = { email: email };
+      const attributes = ['email', 'password'];
+
+      const userData = await AuthDao.findUser(where, attributes);
+
+      if (!userData || !bcrypt.compareSync(password, userData.password)) {
+        throw { ok: false };
+      }
+
+      res.status(200).json(userData);
+    } catch (error) {
+      res.status(400).json(error);
+    }
+  }
+}
+
+module.exports = AuthController;

controllers/categories.js

@@ -1,3 +1,60 @@
-class CategoriesController {}
+const { Category } = require('../models');
+const CategoryDao = require('../dao/categorie');
 
-module.exports = CategoriesController;
+class CategoriesController {
+  static async post(req, res, next) {
+    try {
+      const { name, description, image } = req.body;
+      const category = await Category.create({
+        name,
+        description,
+        image,
+      });
+      category
+        ? res.status(200).json({ msg: 'Category created successfully' })
+        : res.status(404).json({ msg: 'Error. Category not created.' });
+    } catch (error) {
+      next(error);
+    }
+  }
+  static async deleteCategory(req, res) {
+    const { id } = req.params;
+    try {
+      const where = { id };
+      const categoryDeleted = await CategoryDao.deleteCategory(where);
+
+      if (categoryDeleted) {
+        res.status(200).json({ msg: 'Category deleted successfully' });
+      } else {
+        res.status(404).json({ msg: 'Could not find category' });
+      }
+    } catch (error) {
+      res.status(400).json(error);
+    }
+  }
+  static async getAll(req, res) {
+    try {
+      const categories = await CategoryDao.filteringCategoryResultsByField("name")
+      const format= categories.map(category=>category.name)
+      return res.status(200).json(format)
+    } catch (error) {
+      return res.status(500).send(error)
+    }
+  }
+  static async updateCategory(req, res) {
+    const { id } = req.params;
+    const { name, description, image } = req.body;
+    try {
+      const categoryUpdated = await Category.findByPk(id);
+      categoryUpdated &&
+        (await categoryUpdated.update({ name, description, image }));
+      categoryUpdated
+        ? res.status(200).json({ msg: 'Category updated successfully' })
+        : res.status(404).json({ msg: 'Could not find category' });
+    } catch (error) {
+      res.status(400).json(error);
+    }
+  }
+}
+
+module.exports = CategoriesController;

controllers/contacts.js

@@ -0,0 +1,15 @@
+const ContactDao = require("../dao/contact")
+class ContactController {
+    static async createContact(req, res) {
+        try {
+            const { name, email, phone, message } = req.body
+            const contactData = await ContactDao.createContact({ name, email, phone: phone ?? null, message: message ?? null })
+            return res.status(201).json(contactData)
+        } catch (error) {
+            return res.status(500).json(error)
+        }
+
+    }
+}
+
+module.exports = ContactController

controllers/news.js

@@ -1,3 +1,60 @@
-class News {};
+const { New } = require('../models');
+const NewDao = require('../dao/new');
+class News {
+  static async DetailNew(req, res) {
+    try {
+      const { id } = req.params;
+      const newData = await NewDao.findNewById(+id);
+      if (!newData) return res.status(404).send("New wasn't found");
+      return res.status(200).json(newData);
+    } catch (error) {
+      return res.status(500).send(error.message);
+    }
+  }
 
-module.exports = News;
+  static async putNew(req, res) {
+    const { id } = req.params;
+    const { name, content, image, CategoryId } = req.body;
+
+    try {
+      await NewDao.updateNew(name, image, content, CategoryId, id);
+
+      const response = await NewDao.findNewById(id);
+
+      if (!response) return res.status(404).json({ msg: 'New does not exist' });
+
+      return res.status(201).json(response);
+    } catch (error) {
+      return res.status(500).json(error.message);
+    }
+  }
+
+  static async deleteNew(req, res) {
+    const { id } = req.params;
+
+    try {
+      const newToDelete = await New.findByPk(id, {
+        attributes: ['id'],
+      });
+
+      if (!newToDelete) {
+        return res.json({
+          msg: 'new not found',
+        });
+      }
+
+      await newToDelete.destroy();
+
+      return res.json({
+        msg: `New with ${newToDelete.id} has been deleted succesfully`,
+      });
+    } catch (error) {
+      return res.status(500).json({
+        error,
+        msg: 'error in db',
+      });
+    }
+  }
+}
+
+module.exports = News;