add celebrate, move to mjs node files

ValJed · ValJed · commit 899c333fdeee · 2021-01-07T21:05:11.000+01:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -16,6 +16,7 @@ module.exports = {
   // add your custom rules here
   rules: {
     'no-console': 'off',
-    'no-throw-literal': 'off'
+    'no-throw-literal': 'off',
+    'require-await': 'off'
   }
 }
diff --git a/api/app/index.mjs b/api/app/index.mjs
@@ -1,21 +1,22 @@
-const config = require('config')
-const database = require('../infra/mongodb')
-const http = require('../interfaces/index.js')
+
+import config from 'config'
+import database from '../infra/mongodb'
+import http from '../interfaces/index'
 
 // Infra
-const jsonwt = require('../infra/jwt')
-const encrypt = require('../infra/encryption')
-const log = require('../infra/logger')()
-const fileUpload = require('../infra/fileUpload')
+import jsonwt from '../infra/jwt'
+import encrypt from '../infra/encryption'
+import log from '../infra/logger'
+import fileUpload from '../infra/fileUpload'
 
 // Repositories
-const userRepository = require('../infra/mongodb/repositories/userRepo')
-const artistRepository = require('../infra/mongodb/repositories/artistRepo')
-const imageRepository = require('../infra/mongodb/repositories/imageRepo')
+import userRepository from '../infra/mongodb/repositories/userRepo.mjs'
+import artistRepository from '../infra/mongodb/repositories/artistRepo.mjs'
+import imageRepository from '../infra/mongodb/repositories/imageRepo.mjs'
 
 // Services
-const userService = require('./services/userService')
-const artistService = require('./services/artistService')
+import userService from './services/userService.mjs'
+import artistService from './services/artistService.mjs'
 
 const dbConfig = config.get('dbConfig')
 const serverConfig = config.get('serverConfig')
@@ -28,7 +29,7 @@ const jwtConfig = config.get('jwtConfig')
 const startApp = async () => {
   try {
     const { client, db } = await database.connect(dbConfig)
-    console.log('Connected to DB')
+    log.info('Connected to DB')
 
     const userRepo = userRepository(db)
     const artistRepo = artistRepository(db)
diff --git a/api/app/services/artistService.mjs b/api/app/services/artistService.mjs
@@ -1,5 +1,5 @@
 
-module.exports = ({
+export default ({
   // usersRepo,
   artistRepo,
   imageRepo,
@@ -26,8 +26,8 @@ module.exports = ({
     }
   }
 
-  const addArtist = async (projectData) => {
-    const project = ProjectEntity(projectData)
+  const addArtist = async (project) => {
+    // const project = ProjectEntity(projectData)
 
     const createdProject = await artistRepo.createArtist(project)
 
diff --git a/api/app/services/userService.mjs b/api/app/services/userService.mjs
@@ -1,6 +1,6 @@
-const userEntity = require('../../domain/User')
+import userEntity from '../../domain/User'
 
-module.exports = ({
+export default ({
   userRepo,
   encrypt,
   jwt,
@@ -149,7 +149,7 @@ module.exports = ({
   }
 
   const sendUserMail = ({ subject, email, message }) => {
-    return sendMail(subject, email, message)
+    // return sendMail(subject, email, message)
   }
 
   return {
diff --git a/api/domain/Artist.mjs b/api/domain/Artist.mjs
@@ -0,0 +1,26 @@
+import celebrate from 'celebrate'
+import { urlRegex } from '../../utils/index.mjs'
+
+const { Joi } = celebrate
+
+export default Joi.object({
+  name: Joi.string().required(),
+  genre: Joi.string().required(),
+  content: Joi.string().required(),
+  socialLinks: Joi.object({
+    facebook: Joi.string(),
+    instagram: Joi.string(),
+    youtube: Joi.string(),
+    videos: Joi.object({
+      youtube: Joi.array().items(Joi.string())
+    }),
+    releases: Joi.array().items(
+      Joi.object({
+        name: Joi.string().required(),
+        location: Joi.string().required(),
+        link: Joi.string().pattern(urlRegex).required(),
+        date: Joi.date().required()
+      })
+    )
+  })
+})
diff --git a/api/domain/User.mjs b/api/domain/User.mjs
@@ -1,4 +1,4 @@
-module.exports = ({ username, email, hash, salt }) => {
+export default ({ username, email, hash, salt }) => {
   const user = {
     username,
     email,
diff --git a/api/infra/encryption.mjs b/api/infra/encryption.mjs
@@ -1,4 +1,4 @@
-const crypto = require('crypto')
+import crypto from 'crypto'
 
 const encryptPsw = (password) => {
   const salt = crypto.randomBytes(16).toString('hex')
@@ -34,7 +34,7 @@ const encryptFileName = (fileName) => {
   console.error('This type of file is not supported !')
 }
 
-module.exports = {
+export default {
   encryptPsw,
   comparePsw,
   encryptFileName
diff --git a/api/infra/fileUpload.mjs b/api/infra/fileUpload.mjs
@@ -1,6 +1,6 @@
-const multer = require('multer')
+import multer from 'multer'
 
-module.exports = () => {
+export default () => {
   // const storage = multer.diskStorage({
   //   destination: (req, file, cb) => {
 
diff --git a/api/infra/jwt.mjs b/api/infra/jwt.mjs
@@ -1,6 +1,6 @@
-const jwt = require('jsonwebtoken')
+import jwt from 'jsonwebtoken'
 
-module.exports = config => ({
+export default config => ({
   signin: (id) => {
     return jwt.sign({ id }, config.secret)
   },
diff --git a/api/infra/logger.js b/api/infra/logger.js
diff --git a/api/infra/logger.mjs b/api/infra/logger.mjs
@@ -0,0 +1,10 @@
+import pino from 'pino'
+const isDev = process.env.NODE_ENV === 'development'
+
+export default pino({
+  name: 'pepites',
+  level: 'info',
+  enabled: true,
+  useLevelLabels: true,
+  ...isDev ? { prettyPrint: { colorize: true } } : {}
+}, pino.destination())
diff --git a/api/infra/mongodb/index.mjs b/api/infra/mongodb/index.mjs
@@ -1,4 +1,5 @@
-const { MongoClient } = require('mongodb')
+// const { MongoClient } = require('mongodb')
+import mongodb from 'mongodb'
 
 let client
 let db
@@ -9,7 +10,7 @@ const connect = async ({
   options
 }) => {
   if (!client) {
-    client = new MongoClient(uri, options)
+    client = new mongodb.MongoClient(uri, options)
 
     await client.connect()
 
@@ -26,7 +27,7 @@ const disconnect = async () => {
   await client.close()
 }
 
-module.exports = {
+export default {
   client: () => client,
   db: () => db,
   connect,
diff --git a/api/infra/mongodb/repositories/artistRepo.mjs b/api/infra/mongodb/repositories/artistRepo.mjs
@@ -1,6 +1,7 @@
-const { ObjectID } = require('mongodb')
+import mongodb from 'mongodb'
+const { ObjectID } = mongodb
 
-module.exports = (db) => {
+export default (db) => {
   const UsersDb = db.collection('artists')
 
   return {
diff --git a/api/infra/mongodb/repositories/imageRepo.mjs b/api/infra/mongodb/repositories/imageRepo.mjs
@@ -1,6 +1,7 @@
-const { ObjectID } = require('mongodb')
+import mongodb from 'mongodb'
+const { ObjectID } = mongodb
 
-const repository = (db) => {
+export default (db) => {
   const ImageDb = db.collection('images')
 
   return {
@@ -13,5 +14,3 @@ const repository = (db) => {
     deleteOne: id => ImageDb.deleteOne({ _id: ObjectID(id) })
   }
 }
-
-module.exports = repository
diff --git a/api/infra/mongodb/repositories/userRepo.mjs b/api/infra/mongodb/repositories/userRepo.mjs
@@ -1,6 +1,7 @@
-const { ObjectID } = require('mongodb')
+import mongodb from 'mongodb'
+const { ObjectID } = mongodb
 
-module.exports = (db) => {
+export default (db) => {
   const UsersDb = db.collection('users')
 
   return {
diff --git a/api/interfaces/index.mjs b/api/interfaces/index.mjs
@@ -1,9 +1,12 @@
-const express = require('express')
-const cors = require('cors')
-const helmet = require('helmet')
-const routes = require('./routes')
+import express from 'express'
+import cors from 'cors'
+import helmet from 'helmet'
+import celebration from 'celebrate'
+import routes from './routes'
 
-module.exports = ({
+const { errors } = celebration
+
+export default ({
   config: {
     serverConfig,
     corsConfig
@@ -20,6 +23,7 @@ module.exports = ({
   app.use('/api', express.static('public'))
   app.use(helmet())
   app.use(cors(corsConfig))
+  app.use(errors())
 
   app.use('/api', routes.map((route) => {
     return route({
diff --git a/api/interfaces/routes/artists.js b/api/interfaces/routes/artists.js
diff --git a/api/interfaces/routes/artists.mjs b/api/interfaces/routes/artists.mjs
@@ -0,0 +1,41 @@
+// const express = require('express')
+// const Artist = require('../../domain/Artist')
+import express from 'express'
+import celeb from 'celebrate'
+import Artist from '../../domain/Artist'
+
+const { celebrate, Segments } = celeb
+
+const validateArtist = celebrate({
+  [Segments.BODY]: Artist
+})
+
+export default ({
+  services: {
+    artist: artistService
+  }
+}) => {
+  const router = express.Router()
+
+  router.get('/artists', async (req, res, next) => {
+    try {
+      const artists = artistService.getArtists()
+
+      res.status(200).send(artists)
+    } catch (err) {
+      res.status(err.status || 500).send(err.error)
+    }
+  })
+
+  router.post('/artists', validateArtist, async (req, res, next) => {
+    try {
+      const artists = artistService.createArtist(req.body)
+
+      res.status(200).send(artists)
+    } catch (err) {
+      res.status(err.status || 500).send(err.error)
+    }
+  })
+
+  return router
+}
diff --git a/api/interfaces/routes/index.js b/api/interfaces/routes/index.js
diff --git a/api/interfaces/routes/index.mjs b/api/interfaces/routes/index.mjs
@@ -0,0 +1,4 @@
+import users from './users.mjs'
+import artists from './artists.mjs'
+
+export default [users, artists]
diff --git a/api/interfaces/routes/users.mjs b/api/interfaces/routes/users.mjs
@@ -1,6 +1,6 @@
-const express = require('express')
+import express from 'express'
 
-module.exports = ({
+export default ({
   services: {
     artist: artistService,
     user: userService
@@ -13,8 +13,6 @@ module.exports = ({
     try {
       const { cookie } = req.headers
 
-      console.log('cookie ===> ', require('util').inspect(cookie, { colors: true, depth: 2 }))
-
       const regex = /\pep-token=[^\s]+/
 
       const [tokenWithKey] = cookie.match(regex) || []
diff --git a/components/admin/EditArtist.vue b/components/admin/EditArtist.vue
@@ -248,7 +248,6 @@ export default {
       ]
     },
     addEvent (data) {
-      console.log('data ===> ', data)
       this.artist.events.push(data)
     }
   }
diff --git a/components/admin/EditEvent.vue b/components/admin/EditEvent.vue
@@ -90,7 +90,7 @@ export default {
 
       if (this.valid) {
         this.addEvent(form)
-        // this.$refs.form.reset()
+        this.$refs.form.reset()
         this.closeModal()
       }
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/pages/Admin.vue b/pages/Admin.vue
diff --git a/utils/index.mjs b/utils/index.mjs

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ module.exports = {`
`16`	`16`	`// add your custom rules here`
`17`	`17`	`rules: {`
`18`	`18`	`'no-console': 'off',`
`19`		`- 'no-throw-literal': 'off'`
	`19`	`+ 'no-throw-literal': 'off',`
	`20`	`+ 'require-await': 'off'`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-module.exports = ({`
	`2`	`+export default ({`
`3`	`3`	`// usersRepo,`
`4`	`4`	`artistRepo,`
`5`	`5`	`imageRepo,`
`@@ -26,8 +26,8 @@ module.exports = ({`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- const addArtist = async (projectData) => {`
`30`		`- const project = ProjectEntity(projectData)`
	`29`	`+ const addArtist = async (project) => {`
	`30`	`+ // const project = ProjectEntity(projectData)`
`31`	`31`
`32`	`32`	`const createdProject = await artistRepo.createArtist(project)`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-const userEntity = require('../../domain/User')`
	`1`	`+import userEntity from '../../domain/User'`
`2`	`2`
`3`		`-module.exports = ({`
	`3`	`+export default ({`
`4`	`4`	`userRepo,`
`5`	`5`	`encrypt,`
`6`	`6`	`jwt,`
`@@ -149,7 +149,7 @@ module.exports = ({`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`const sendUserMail = ({ subject, email, message }) => {`
`152`		`- return sendMail(subject, email, message)`
	`152`	`+ // return sendMail(subject, email, message)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module.exports = ({ username, email, hash, salt }) => {`
	`1`	`+export default ({ username, email, hash, salt }) => {`
`2`	`2`	`const user = {`
`3`	`3`	`username,`
`4`	`4`	`email,`