There was an error fetching the commit references. Please try again later.
Merge branch 'dev' into feat/saleandcart
Showing
- client/css/cart.css 2 additions, 4 deletionsclient/css/cart.css
- client/css/catalog.css 15 additions, 7 deletionsclient/css/catalog.css
- client/css/make-sale.css 9 additions, 12 deletionsclient/css/make-sale.css
- client/css/navbar.css 2 additions, 1 deletionclient/css/navbar.css
- client/css/sidebar.css 35 additions, 0 deletionsclient/css/sidebar.css
- client/js/catalog.js 1 addition, 1 deletionclient/js/catalog.js
- client/js/login-page.js 1 addition, 1 deletionclient/js/login-page.js
- client/js/navbar.js 10 additions, 19 deletionsclient/js/navbar.js
- client/js/sidebar.js 38 additions, 0 deletionsclient/js/sidebar.js
- client/pages/catalog.php 7 additions, 0 deletionsclient/pages/catalog.php
- client/protoype/cart.html 63 additions, 0 deletionsclient/protoype/cart.html
- client/protoype/sidebar.html 44 additions, 0 deletionsclient/protoype/sidebar.html
- server/controllers/catalog.php 9 additions, 2 deletionsserver/controllers/catalog.php
- server/models/db.sql 25 additions, 1 deletionserver/models/db.sql
Please register or sign in to comment