diff --git a/.DS_Store b/.DS_Store old mode 100644 new mode 100755 index e3bc430c..bd164cca Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/__test__/cart.spec.js b/__test__/cart.spec.js old mode 100644 new mode 100755 diff --git a/__test__/product.spec.js b/__test__/product.spec.js old mode 100644 new mode 100755 diff --git a/__test__/user.spec.js b/__test__/user.spec.js old mode 100644 new mode 100755 diff --git a/controller/auth.js b/controller/auth.js old mode 100644 new mode 100755 index b393fe40..2384a360 --- a/controller/auth.js +++ b/controller/auth.js @@ -1,27 +1,27 @@ -const User = require("../model/user"); +const User = require('../model/user'); module.exports.login = (req, res) => { - const username = req.body.username; - const password = req.body.password; + const username = req.body.username; + const password = req.body.password; - if (username && password) { - User.findOne({ - username, - }) - .then((user) => { - if (!user) { - res.json({ - status: "Error", - msg: "username or password is incorrect", - }); - } else { - res.json({ - token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9", - }); - } - }) - .catch((err) => { - console.log(err); - }); - } + if (username && password) { + User.findOne({ + username, + }) + .then((user) => { + if (!user) { + res.status(401).json({ + status: 'Error', + msg: 'username or password is incorrect', + }); + } else { + res.json({ + token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9', + }); + } + }) + .catch((err) => { + console.log(err); + }); + } }; diff --git a/controller/cart.js b/controller/cart.js old mode 100644 new mode 100755 index 67144145..5daee867 --- a/controller/cart.js +++ b/controller/cart.js @@ -1,113 +1,110 @@ -const Cart = require('../model/cart') +const Cart = require('../model/cart'); -module.exports.getAllCarts = (req,res) => { - const limit = Number(req.query.limit) || 0 - const sort = req.query.sort=="desc"?-1:1 - const startDate = req.query.startdate || new Date('1970-1-1') - const endDate = req.query.enddate || new Date() +module.exports.getAllCarts = (req, res) => { + const limit = Number(req.query.limit) || 0; + const sort = req.query.sort == 'desc' ? -1 : 1; + const startDate = req.query.startdate || new Date('1970-1-1'); + const endDate = req.query.enddate || new Date(); - console.log(startDate,endDate) - - Cart.find({ - date:{ $gte:new Date(startDate), $lt:new Date(endDate)} - }) - .select('-_id -products._id') - .limit(limit) - .sort({id:sort}) - .then(carts=>{ - res.json(carts) - }) - .catch(err=>console.log(err)) -} + console.log(startDate, endDate); + Cart.find({ + date: { $gte: new Date(startDate), $lt: new Date(endDate) }, + }) + .select('-_id -products._id') + .limit(limit) + .sort({ id: sort }) + .then((carts) => { + res.json(carts); + }) + .catch((err) => console.log(err)); +}; -module.exports.getCartsbyUserid = (req,res) => { - const userId = req.params.userid - const startDate = req.query.startdate || new Date('1970-1-1') - const endDate = req.query.enddate || new Date() +module.exports.getCartsbyUserid = (req, res) => { + const userId = req.params.userid; + const startDate = req.query.startdate || new Date('1970-1-1'); + const endDate = req.query.enddate || new Date(); - console.log(startDate,endDate) - Cart.find({ - userId, - date:{ $gte:new Date(startDate), $lt:new Date(endDate)} - }) - .select('-_id -products._id') - .then(carts=>{ - res.json(carts) - }) - .catch(err=>console.log(err)) -} + console.log(startDate, endDate); + Cart.find({ + userId, + date: { $gte: new Date(startDate), $lt: new Date(endDate) }, + }) + .select('-_id -products._id') + .then((carts) => { + res.json(carts); + }) + .catch((err) => console.log(err)); +}; -module.exports.getSingleCart = (req,res) => { - const id = req.params.id - Cart.findOne({ - id - }) - .select('-_id -products._id') - .then(cart => res.json(cart)) - .catch(err=> console.log(err)) -} +module.exports.getSingleCart = (req, res) => { + const id = req.params.id; + Cart.findOne({ + id, + }) + .select('-_id -products._id') + .then((cart) => res.json(cart)) + .catch((err) => console.log(err)); +}; -module.exports.addCart = (req,res) => { - if (typeof req.body == undefined) { - res.json({ - status: "error", - message: "data is undefined" - }) - } else { - console.log(req.body.date) - let cartCount = 0; - Cart.find().countDocuments(function (err, count) { - cartCount = count - }) +module.exports.addCart = (req, res) => { + if (typeof req.body == undefined) { + res.json({ + status: 'error', + message: 'data is undefined', + }); + } else { + // let cartCount = 0; + // Cart.find().countDocuments(function (err, count) { + // cartCount = count + // }) - .then(() => { - const cart = new Cart({ - id: cartCount + 1, - userId: req.body.userId, - date:req.body.date, - products:req.body.products - }) - // cart.save() - // .then(cart => res.json(cart)) - // .catch(err => console.log(err)) + // .then(() => { + const cart = { + id: 11, + userId: req.body.userId, + date: req.body.date, + products: req.body.products, + }; + // cart.save() + // .then(cart => res.json(cart)) + // .catch(err => console.log(err)) - res.json(cart) - }) + res.json(cart); + // }) - //res.json({...req.body,id:Cart.find().count()+1}) - } -} + //res.json({...req.body,id:Cart.find().count()+1}) + } +}; - -module.exports.editCart = (req,res) => { - if (typeof req.body == undefined || req.params.id == null) { - res.json({ - status: "error", - message: "something went wrong! check your sent data" - }) - } else { - res.json({ - id:req.params.id, - userId: req.body.userId, - date:req.body.date, - products:req.body.products - }) - } -} +module.exports.editCart = (req, res) => { + if (typeof req.body == undefined || req.params.id == null) { + res.json({ + status: 'error', + message: 'something went wrong! check your sent data', + }); + } else { + res.json({ + id: req.params.id, + userId: req.body.userId, + date: req.body.date, + products: req.body.products, + }); + } +}; module.exports.deleteCart = (req, res) => { - if (req.params.id == null) { - res.json({ - status: "error", - message: "cart id should be provided" - }) - } else { - Cart.findOne({id:req.params.id}) - .select('-_id -products._id') - .then(cart=>{ - res.json(cart) - }) - .catch(err=>console.log(err)) - } - } + if (req.params.id == null) { + res.json({ + status: 'error', + message: 'cart id should be provided', + }); + } else { + Cart.findOne({ id: req.params.id }) + .select('-_id -products._id') + .then((cart) => { + res.json(cart); + }) + .catch((err) => console.log(err)); + } +}; diff --git a/controller/home.js b/controller/home.js old mode 100644 new mode 100755 diff --git a/controller/product.js b/controller/product.js old mode 100644 new mode 100755 index f91f8973..29a5b230 --- a/controller/product.js +++ b/controller/product.js @@ -1,118 +1,118 @@ -const Product = require("../model/product"); +const Product = require('../model/product'); module.exports.getAllProducts = (req, res) => { - const limit = Number(req.query.limit) || 0; - const sort = req.query.sort == "desc" ? -1 : 1; + const limit = Number(req.query.limit) || 0; + const sort = req.query.sort == 'desc' ? -1 : 1; - Product.find() - .select(["-_id"]) - .limit(limit) - .sort({ id: sort }) - .then((products) => { - res.json(products); - }) - .catch((err) => console.log(err)); + Product.find() + .select(['-_id']) + .limit(limit) + .sort({ id: sort }) + .then((products) => { + res.json(products); + }) + .catch((err) => console.log(err)); }; module.exports.getProduct = (req, res) => { - const id = req.params.id; + const id = req.params.id; - Product.findOne({ - id, - }) - .select(["-_id"]) - .then((product) => { - res.json(product); - }) - .catch((err) => console.log(err)); + Product.findOne({ + id, + }) + .select(['-_id']) + .then((product) => { + res.json(product); + }) + .catch((err) => console.log(err)); }; module.exports.getProductCategories = (req, res) => { - Product.distinct("category") - .then((categories) => { - res.json(categories); - }) - .catch((err) => console.log(err)); + Product.distinct('category') + .then((categories) => { + res.json(categories); + }) + .catch((err) => console.log(err)); }; module.exports.getProductsInCategory = (req, res) => { - const category = req.params.category; - const limit = Number(req.query.limit) || 0; - const sort = req.query.sort == "desc" ? -1 : 1; + const category = req.params.category; + const limit = Number(req.query.limit) || 0; + const sort = req.query.sort == 'desc' ? -1 : 1; - Product.find({ - category, - }) - .select(["-_id"]) - .limit(limit) - .sort({ id: sort }) - .then((products) => { - res.json(products); - }) - .catch((err) => console.log(err)); + Product.find({ + category, + }) + .select(['-_id']) + .limit(limit) + .sort({ id: sort }) + .then((products) => { + res.json(products); + }) + .catch((err) => console.log(err)); }; module.exports.addProduct = (req, res) => { - if (typeof req.body == undefined) { - res.json({ - status: "error", - message: "data is undefined", - }); - } else { - let productCount = 0; - Product.find() - .countDocuments(function (err, count) { - productCount = count; - }) - .then(() => { - const product = new Product({ - id: productCount + 1, - title: req.body.title, - price: req.body.price, - description: req.body.description, - image: req.body.image, - category: req.body.category, - }); - // product.save() - // .then(product => res.json(product)) - // .catch(err => console.log(err)) - res.json(product); - }); - } + if (typeof req.body == undefined) { + res.json({ + status: 'error', + message: 'data is undefined', + }); + } else { + // let productCount = 0; + // Product.find() + // .countDocuments(function (err, count) { + // productCount = count; + // }) + // .then(() => { + const product = { + id: 21, + title: req.body.title, + price: req.body.price, + description: req.body.description, + image: req.body.image, + category: req.body.category, + }; + // product.save() + // .then(product => res.json(product)) + // .catch(err => console.log(err)) + res.json(product); + // }); + } }; module.exports.editProduct = (req, res) => { - if (typeof req.body == undefined || req.params.id == null) { - res.json({ - status: "error", - message: "something went wrong! check your sent data", - }); - } else { - res.json({ - id: req.params.id, - title: req.body.title, - price: req.body.price, - description: req.body.description, - image: req.body.image, - category: req.body.category, - }); - } + if (typeof req.body == undefined || req.params.id == null) { + res.json({ + status: 'error', + message: 'something went wrong! check your sent data', + }); + } else { + res.json({ + id: req.params.id, + title: req.body.title, + price: req.body.price, + description: req.body.description, + image: req.body.image, + category: req.body.category, + }); + } }; module.exports.deleteProduct = (req, res) => { - if (req.params.id == null) { - res.json({ - status: "error", - message: "cart id should be provided", - }); - } else { - Product.findOne({ - id: req.params.id, - }) - .select(["-_id"]) - .then((product) => { - res.json(product); - }) - .catch((err) => console.log(err)); - } + if (req.params.id == null) { + res.json({ + status: 'error', + message: 'cart id should be provided', + }); + } else { + Product.findOne({ + id: req.params.id, + }) + .select(['-_id']) + .then((product) => { + res.json(product); + }) + .catch((err) => console.log(err)); + } }; diff --git a/controller/user.js b/controller/user.js old mode 100644 new mode 100755 index f7fcbc28..fb830597 --- a/controller/user.js +++ b/controller/user.js @@ -1,123 +1,122 @@ -const User = require('../model/user') +const User = require('../model/user'); module.exports.getAllUser = (req, res) => { - const limit = Number(req.query.limit) || 0 - const sort = req.query.sort == "desc" ? -1 : 1 + const limit = Number(req.query.limit) || 0; + const sort = req.query.sort == 'desc' ? -1 : 1; - User.find().select(['-_id']).limit(limit).sort({ - id: sort - }) - .then(users => { - res.json(users) - }) - .catch(err => console.log(err)) -} + User.find() + .select(['-_id']) + .limit(limit) + .sort({ + id: sort, + }) + .then((users) => { + res.json(users); + }) + .catch((err) => console.log(err)); +}; module.exports.getUser = (req, res) => { - const id = req.params.id - - User.findOne({ - id - }).select(['-_id']) - .then(user => { - res.json(user) - }) - .catch(err => console.log(err)) -} - + const id = req.params.id; + User.findOne({ + id, + }) + .select(['-_id']) + .then((user) => { + res.json(user); + }) + .catch((err) => console.log(err)); +}; module.exports.addUser = (req, res) => { - if (typeof req.body == undefined) { - res.json({ - status: "error", - message: "data is undefined" - }) - } else { - - let userCount = 0; - User.find().countDocuments(function (err, count) { - userCount = count - }) - .then(() => { - const user = new User({ - id: userCount + 1, - email:req.body.email, - username:req.body.username, - password:req.body.password, - name:{ - firstname:req.body.firstname, - lastname:req.body.lastname - }, - address:{ - city:req.body.address.city, - street:req.body.address.street, - number:req.body.number, - zipcode:req.body.zipcode, - geolocation:{ - lat:req.body.geolocation.lat, - long:req.body.geolocation.long - } - }, - phone:req.body.phone - }) - // user.save() - // .then(user => res.json(user)) - // .catch(err => console.log(err)) - - res.json(user) - }) - - + if (typeof req.body == undefined) { + res.json({ + status: 'error', + message: 'data is undefined', + }); + } else { + // let userCount = 0; + // User.find() + // .countDocuments(function (err, count) { + // userCount = count; + // }) + // .then(() => { + const user = { + id: 11, + email: req.body.email, + username: req.body.username, + password: req.body.password, + name: { + firstname: req.body.firstname, + lastname: req.body.lastname, + }, + address: { + city: req.body.address.city, + street: req.body.address.street, + number: req.body.number, + zipcode: req.body.zipcode, + geolocation: { + lat: req.body.address.geolocation.lat, + long: req.body.address.geolocation.long, + }, + }, + phone: req.body.phone, + }; + // user.save() + // .then(user => res.json(user)) + // .catch(err => console.log(err)) + res.json(user); + //}); - //res.json({id:User.find().count()+1,...req.body}) - } -} + //res.json({id:User.find().count()+1,...req.body}) + } +}; module.exports.editUser = (req, res) => { - if (typeof req.body == undefined || req.params.id == null) { - res.json({ - status: "error", - message: "something went wrong! check your sent data" - }) - } else { - res.json({ - id: req.params.id, - email:req.body.email, - username:req.body.username, - password:req.body.password, - name:{ - firstname:req.body.firstname, - lastname:req.body.lastname - }, - address:{ - city:req.body.address.city, - street:req.body.address.street, - number:req.body.number, - zipcode:req.body.zipcode, - geolocation:{ - lat:req.body.geolocation.lat, - long:req.body.geolocation.long - } - }, - phone:req.body.phone - }) - } -} + if (typeof req.body == undefined || req.params.id == null) { + res.json({ + status: 'error', + message: 'something went wrong! check your sent data', + }); + } else { + res.json({ + id: req.params.id, + email: req.body.email, + username: req.body.username, + password: req.body.password, + name: { + firstname: req.body.firstname, + lastname: req.body.lastname, + }, + address: { + city: req.body.address.city, + street: req.body.address.street, + number: req.body.number, + zipcode: req.body.zipcode, + geolocation: { + lat: req.body.address.geolocation.lat, + long: req.body.address.geolocation.long, + }, + }, + phone: req.body.phone, + }); + } +}; module.exports.deleteUser = (req, res) => { - if (req.params.id == null) { - res.json({ - status: "error", - message: "cart id should be provided" - }) - } else { - User.findOne({id:req.params.id}) - .select(['-_id']) - .then(user => { - res.json(user) - }) - .catch(err=>console.log(err)) - } -} \ No newline at end of file + if (req.params.id == null) { + res.json({ + status: 'error', + message: 'cart id should be provided', + }); + } else { + User.findOne({ id: req.params.id }) + .select(['-_id']) + .then((user) => { + res.json(user); + }) + .catch((err) => console.log(err)); + } +}; diff --git a/jest.config.js b/jest.config.js old mode 100644 new mode 100755 diff --git a/model/cart.js b/model/cart.js old mode 100644 new mode 100755 diff --git a/model/product.js b/model/product.js old mode 100644 new mode 100755 diff --git a/model/user.js b/model/user.js old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/public/.DS_Store b/public/.DS_Store old mode 100644 new mode 100755 diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png old mode 100644 new mode 100755 diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png old mode 100644 new mode 100755 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png old mode 100644 new mode 100755 diff --git a/public/browserconfig.xml b/public/browserconfig.xml old mode 100644 new mode 100755 diff --git a/public/dist/master.min.css b/public/dist/master.min.css old mode 100644 new mode 100755 diff --git a/public/dist/master.min.css.map b/public/dist/master.min.css.map old mode 100644 new mode 100755 diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png old mode 100644 new mode 100755 diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png old mode 100644 new mode 100755 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Bold.eot b/public/fonts/DubaiW23-Bold.eot old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Bold.ttf b/public/fonts/DubaiW23-Bold.ttf old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Bold.woff b/public/fonts/DubaiW23-Bold.woff old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Bold.woff2 b/public/fonts/DubaiW23-Bold.woff2 old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Light.eot b/public/fonts/DubaiW23-Light.eot old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Light.ttf b/public/fonts/DubaiW23-Light.ttf old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Light.woff b/public/fonts/DubaiW23-Light.woff old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Light.woff2 b/public/fonts/DubaiW23-Light.woff2 old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Medium.eot b/public/fonts/DubaiW23-Medium.eot old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Medium.ttf b/public/fonts/DubaiW23-Medium.ttf old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Medium.woff b/public/fonts/DubaiW23-Medium.woff old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Medium.woff2 b/public/fonts/DubaiW23-Medium.woff2 old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Regular.eot b/public/fonts/DubaiW23-Regular.eot old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Regular.ttf b/public/fonts/DubaiW23-Regular.ttf old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Regular.woff b/public/fonts/DubaiW23-Regular.woff old mode 100644 new mode 100755 diff --git a/public/fonts/DubaiW23-Regular.woff2 b/public/fonts/DubaiW23-Regular.woff2 old mode 100644 new mode 100755 diff --git a/public/fonts/dana-bold.woff b/public/fonts/dana-bold.woff old mode 100644 new mode 100755 diff --git a/public/fonts/dana-regular.woff b/public/fonts/dana-regular.woff old mode 100644 new mode 100755 diff --git a/public/fonts/dana2webGX.woff b/public/fonts/dana2webGX.woff old mode 100644 new mode 100755 diff --git a/public/icons/.DS_Store b/public/icons/.DS_Store old mode 100644 new mode 100755 diff --git a/public/icons/bag.svg b/public/icons/bag.svg old mode 100644 new mode 100755 diff --git a/public/icons/book.svg b/public/icons/book.svg old mode 100644 new mode 100755 diff --git a/public/icons/box.svg b/public/icons/box.svg old mode 100644 new mode 100755 diff --git a/public/icons/coffee.svg b/public/icons/coffee.svg old mode 100644 new mode 100755 diff --git a/public/icons/github.svg b/public/icons/github.svg old mode 100644 new mode 100755 diff --git a/public/icons/intro.svg b/public/icons/intro.svg old mode 100644 new mode 100755 diff --git a/public/icons/logo.png b/public/icons/logo.png old mode 100644 new mode 100755 diff --git a/public/icons/logo2.png b/public/icons/logo2.png old mode 100644 new mode 100755 diff --git a/public/icons/shopping-bag.svg b/public/icons/shopping-bag.svg old mode 100644 new mode 100755 diff --git a/public/icons/user.svg b/public/icons/user.svg old mode 100644 new mode 100755 diff --git a/public/icons/zap.svg b/public/icons/zap.svg old mode 100644 new mode 100755 diff --git a/public/img/.DS_Store b/public/img/.DS_Store old mode 100644 new mode 100755 diff --git a/public/img/51UDEzMJVpL._AC_UL640_QL65_ML3_.jpg b/public/img/51UDEzMJVpL._AC_UL640_QL65_ML3_.jpg old mode 100644 new mode 100755 diff --git a/public/img/51Y5NI-I5jL._AC_UX679_.jpg b/public/img/51Y5NI-I5jL._AC_UX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/51eg55uWmdL._AC_UX679_.jpg b/public/img/51eg55uWmdL._AC_UX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/61IBBVJvSDL._AC_SY879_.jpg b/public/img/61IBBVJvSDL._AC_SY879_.jpg old mode 100644 new mode 100755 diff --git a/public/img/61U7T1koQqL._AC_SX679_.jpg b/public/img/61U7T1koQqL._AC_SX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/61mtL65D4cL._AC_SX679_.jpg b/public/img/61mtL65D4cL._AC_SX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/61pHAEJ4NML._AC_UX679_.jpg b/public/img/61pHAEJ4NML._AC_UX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/61sbMiUnoGL._AC_UL640_QL65_ML3_.jpg b/public/img/61sbMiUnoGL._AC_UL640_QL65_ML3_.jpg old mode 100644 new mode 100755 diff --git a/public/img/71-3HjGNDUL._AC_SY879._SX._UX._SY._UY_.jpg b/public/img/71-3HjGNDUL._AC_SY879._SX._UX._SY._UY_.jpg old mode 100644 new mode 100755 diff --git a/public/img/71HblAHs5xL._AC_UY879_-2.jpg b/public/img/71HblAHs5xL._AC_UY879_-2.jpg old mode 100644 new mode 100755 diff --git a/public/img/71YAIFU48IL._AC_UL640_QL65_ML3_.jpg b/public/img/71YAIFU48IL._AC_UL640_QL65_ML3_.jpg old mode 100644 new mode 100755 diff --git a/public/img/71YXzeOuslL._AC_UY879_.jpg b/public/img/71YXzeOuslL._AC_UY879_.jpg old mode 100644 new mode 100755 diff --git a/public/img/71kWymZ+c+L._AC_SX679_.jpg b/public/img/71kWymZ+c+L._AC_SX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/71li-ujtlUL._AC_UX679_.jpg b/public/img/71li-ujtlUL._AC_UX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/71pWzhdJNwL._AC_UL640_QL65_ML3_.jpg b/public/img/71pWzhdJNwL._AC_UL640_QL65_ML3_.jpg old mode 100644 new mode 100755 diff --git a/public/img/71z3kpMAYsL._AC_UY879_.jpg b/public/img/71z3kpMAYsL._AC_UY879_.jpg old mode 100644 new mode 100755 diff --git a/public/img/81QpkIctqPL._AC_SX679_.jpg b/public/img/81QpkIctqPL._AC_SX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/81XH0e8fefL._AC_UY879_.jpg b/public/img/81XH0e8fefL._AC_UY879_.jpg old mode 100644 new mode 100755 diff --git a/public/img/81Zt42ioCgL._AC_SX679_.jpg b/public/img/81Zt42ioCgL._AC_SX679_.jpg old mode 100644 new mode 100755 diff --git a/public/img/81fPKd-2AYL._AC_SL1500_.jpg b/public/img/81fPKd-2AYL._AC_SL1500_.jpg old mode 100644 new mode 100755 diff --git a/public/js/polyfill.min.js b/public/js/polyfill.min.js old mode 100644 new mode 100755 diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png old mode 100644 new mode 100755 diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg old mode 100644 new mode 100755 diff --git a/public/scss/_badge.scss b/public/scss/_badge.scss old mode 100644 new mode 100755 diff --git a/public/scss/_code.scss b/public/scss/_code.scss old mode 100644 new mode 100755 diff --git a/public/scss/_custom.scss b/public/scss/_custom.scss old mode 100644 new mode 100755 diff --git a/public/scss/_modal.scss b/public/scss/_modal.scss old mode 100644 new mode 100755 diff --git a/public/scss/_nav.scss b/public/scss/_nav.scss old mode 100644 new mode 100755 diff --git a/public/scss/_table.scss b/public/scss/_table.scss old mode 100644 new mode 100755 diff --git a/public/site.webmanifest b/public/site.webmanifest old mode 100644 new mode 100755 diff --git a/routes/auth.js b/routes/auth.js old mode 100644 new mode 100755 diff --git a/routes/cart.js b/routes/cart.js old mode 100644 new mode 100755 diff --git a/routes/home.js b/routes/home.js old mode 100644 new mode 100755 diff --git a/routes/product.js b/routes/product.js old mode 100644 new mode 100755 diff --git a/routes/user.js b/routes/user.js old mode 100644 new mode 100755 diff --git a/server.js b/server.js old mode 100644 new mode 100755 index bac96793..eb712339 --- a/server.js +++ b/server.js @@ -1,54 +1,56 @@ //initializes -const express = require("express"); +const mongoose = require('mongoose'); +const express = require('express'); +const cors = require('cors'); +const path = require('path'); + +//app const app = express(); -const bodyParser = require("body-parser"); -const cors = require("cors"); -const mongoose = require("mongoose"); -const path = require("path"); //port -const port = 6400; +const port = 3000; //routes -const productRoute = require("./routes/product"); -const homeRoute = require("./routes/home"); -const cartRoute = require("./routes/cart"); -const userRoute = require("./routes/user"); -const authRoute = require("./routes/auth"); +const productRoute = require('./routes/product'); +const homeRoute = require('./routes/home'); +const cartRoute = require('./routes/cart'); +const userRoute = require('./routes/user'); +const authRoute = require('./routes/auth'); //middleware app.use(cors()); -app.use(express.static(path.join(__dirname, "/public"))); -app.use(bodyParser.urlencoded({ extended: true })); -app.use(bodyParser.json()); +app.use(express.static(path.join(__dirname, '/public'))); +app.use(express.urlencoded({ extended: true })); +app.use(express.json()); //view engine -app.set("view engine", "ejs"); -app.set("views", "views"); +app.set('view engine', 'ejs'); +app.set('views', 'views'); -app.disable("view cache"); +app.disable('view cache'); -app.use("/", homeRoute); -app.use("/products", productRoute); -app.use("/carts", cartRoute); -app.use("/users", userRoute); -app.use("/auth", authRoute); +app.use('/', homeRoute); +app.use('/products', productRoute); +app.use('/carts', cartRoute); +app.use('/users', userRoute); +app.use('/auth', authRoute); //mongoose -mongoose.set("useFindAndModify", false); +mongoose.set('useFindAndModify', false); +mongoose.set('useUnifiedTopology', true); mongoose - .connect( - "mongodb+srv://keikaavousi:DZpYnmSicavx5dEy@cluster0-ffwd2.mongodb.net/shop?retryWrites=true&w=majority", - { useNewUrlParser: true } - ) - .then((result) => { - app.listen(process.env.PORT || port, () => { - console.log("connect"); - }); - }) - .catch((err) => { - console.log(err); - }); + .connect( + 'mongodb+srv://keikaavousi:DZpYnmSicavx5dEy@cluster0-ffwd2.mongodb.net/shop?retryWrites=true&w=majority', + { useNewUrlParser: true }, + ) + .then(() => { + app.listen(process.env.PORT || port, () => { + console.log('connect'); + }); + }) + .catch((err) => { + console.log(err); + }); module.exports = app; diff --git a/views/.DS_Store b/views/.DS_Store old mode 100644 new mode 100755 diff --git a/views/home/docs.ejs b/views/home/docs.ejs old mode 100644 new mode 100755 diff --git a/views/home/index.ejs b/views/home/index.ejs old mode 100644 new mode 100755 diff --git a/views/shared/aside.ejs b/views/shared/aside.ejs old mode 100644 new mode 100755 diff --git a/views/shared/authDocs.ejs b/views/shared/authDocs.ejs old mode 100644 new mode 100755 diff --git a/views/shared/cartDocs.ejs b/views/shared/cartDocs.ejs old mode 100644 new mode 100755 diff --git a/views/shared/footer.ejs b/views/shared/footer.ejs old mode 100644 new mode 100755 diff --git a/views/shared/header.ejs b/views/shared/header.ejs old mode 100644 new mode 100755 diff --git a/views/shared/productDocs.ejs b/views/shared/productDocs.ejs old mode 100644 new mode 100755 index 1bfde7b1..d9bb8c37 --- a/views/shared/productDocs.ejs +++ b/views/shared/productDocs.ejs @@ -136,8 +136,8 @@ [ "electronics", "jewelery", - "men clothing", - "women clothing" + "men's clothing", + "women's clothing" ] diff --git a/views/shared/userDocs.ejs b/views/shared/userDocs.ejs old mode 100644 new mode 100755