Merge pull request #22 from Justkant/cart-creation

Cart creation

.dockerignore

@@ -0,0 +1,11 @@
+.idea/
+.git/
+node_modules/
+dist/
+*.iml
+webpack-stats.json
+webpack-stats.debug.json
+npm-debug.log
+rethinkdb_data/
+uploads/
+doc/

.eslintrc

@@ -13,6 +13,7 @@
     "import/no-duplicates": 0,
     "import/named": 0,
     "import/namespace": 0,
+    "react/no-multi-comp": 0,
     "import/no-unresolved": 0,
     "import/no-named-as-default": 2,
     "jsx-quotes": 2,

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 
 node_js:
   - "4"
+  - "5"
 
 sudo: false
 

Dockerfile

@@ -0,0 +1,13 @@
+FROM node:latest
+MAINTAINER Quentin Jaccarino <[email protected]>
+
+ADD package.json /tmp/package.json
+RUN cd /tmp && npm install
+RUN mkdir -p /src && cp -a /tmp/node_modules /src/
+
+WORKDIR /src
+ADD . /src
+
+EXPOSE 8000
+
+CMD npm run build && npm run start

api/api.js

@@ -26,7 +26,7 @@ const staticOptions = {};
 if (config.isProduction) {
   staticOptions.maxAge = '60 days';
 }
-app.use('/uploads', require('serve-static')('uploads/', staticOptions));
+app.use('/uploads', express.static('uploads/', staticOptions));
 
 app.get('/load', users.load);
 app.post('/login', users.login);
@@ -41,6 +41,25 @@ app.route('/users/:id')
   .put(users.auth, users.isOwner, users.updateUser)
   .delete(users.auth, users.isOwner, users.deleteUser);
 
+app.route('/users/:id/cart')
+  .get(users.auth, users.isOwner, users.getUserCart)
+  .post(users.auth, users.isOwner, users.addUserProduct)
+  .delete(users.auth, users.isOwner, users.deleteUserCart);
+
+app.route('/users/:id/cart/:cartId')
+  .get(users.auth, users.isOwner, users.getUserCartItem)
+  .put(users.auth, users.isOwner, users.updateCartItem)
+  .delete(users.auth, users.isOwner, users.deleteCartItem);
+
+app.route('/users/:id/orders')
+  .get(users.auth, users.isOwner, users.getUserOrders)
+  .post(users.auth, users.isOwner, users.validateCart);
+
+app.route('/users/:id/orders/:orderId')
+  .get(users.auth, users.isOwner, users.getUserOrder)
+  .put(users.auth, users.isAdmin, users.updateOrder)
+  .delete(users.auth, users.isAdmin, users.deleteOrder);
+
 app.route('/products')
   .get(users.auth, users.isAdmin, products.getProducts)
   .post(users.auth, users.isAdmin, products.addProduct);
@@ -52,7 +71,7 @@ app.route('/products/:id')
 
 app.get('/market', users.auth, products.getMarket);
 
-app.get('/search/:text', products.search);
+app.get('/search/:text', users.auth, products.search);
 
 app.post('/picture', users.auth, upload.single('picture'), (req, res) => {
   res.json({url: req.file.path});
@@ -64,7 +83,7 @@ if (config.apiPort) {
       console.error(err);
     }
     console.info('----\n==> 🌎  API is running on port %s', config.apiPort);
-    console.info('==> 💻  Send requests to http://localhost:%s ', config.apiPort);
+    console.info('==> 💻  Send requests to http://%s:%s ', config.host, config.apiPort);
   });
 } else {
   console.error('==>     ERROR: No PORT environment variable has been specified');

api/functions/products.js

@@ -20,7 +20,7 @@ function addProduct(req, res) {
     title: req.body.title,
     description: req.body.description,
     imageUrl: req.body.imageUrl,
-    price: 0
+    price: req.body.price
   });
 
   product.save().then(() => {