diff --git a/client/css/cart.css b/client/css/cart.css index 7b2326d90fe26225e9eb39d5c627aa53871a79d6..50f2a2aeb5fed27bc8a572889b87ea66f27f28a3 100644 --- a/client/css/cart.css +++ b/client/css/cart.css @@ -19,10 +19,9 @@ } .cart-group{ - padding-top: 10%; + padding-top: 5%; display: block; position: relative; - } .cart-group h1{ diff --git a/client/css/make-sale.css b/client/css/make-sale.css index 7e4762391ff881ad149f3c9d8151b3e84146c3c9..278b0bb3c4c7cfcacf48eedbc9a728f97fe410e6 100644 --- a/client/css/make-sale.css +++ b/client/css/make-sale.css @@ -10,41 +10,38 @@ .container{ - position: relative; - /* max-width: 100%; */ - /* height: 100vh; */ - /* background-image: linear-gradient(rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.8)), url(../image/bg.webp); */ + max-width: 100%; + height: 100vh; mix-blend-mode: multiply; background-position: center; background-size: cover; - display: block; - place-items: center; - display: block; + display: flex; + flex-direction: column; } .saleform-group { + flex: 1 1 auto; position: relative; - /* width: 31%; - height: 31%; */ - margin-top: 5vh; + padding-top: 5vh; min-width: 300px; - flex-shrink: 0; - display: grid; - place-items: center; + display: flex; + flex-direction: column; + margin-left: 10%; + margin-right: 10%; } .saleform-group h1 { - /* color: #ffffffab; */ font-size: 30px; - margin-left: 5%; - margin-bottom: 10px; + padding-bottom: 10px; } + #price-criteria, #quantity-criteria { text-align : left; - font-size : medium; + font-size : small; color: red; + padding-left: 10px; /* color : #ffffffab; */ } @@ -58,39 +55,48 @@ #saleform { display: flex; flex-direction: column; + flex: 1 1 auto; } .input-group { display: flex; flex: 1 1 auto; - /* background-color: red; */ } .input-image-field { - /* background: linear-gradient(rgba(255,255,255,0.67), rgba(255,255,255,0.67)); */ - /* display:inline-block; */ - flex: 1 1 1vw; - margin: 10px; + width: 25vw; + height: 25vw; border-radius: 10px; background-color: azure; - min-width: 20%; - min-height: 15vw; transition: max-height 0.5s; } .input-text-fields { flex: 1 1 auto; - /* background-color: #3c00a0; */ + padding: 10px; + display: flex; + flex-direction: column; } .input-field { - /* background: linear-gradient(rgba(255,255,255,0.67), rgba(255,255,255,0.67)); */ - /* display: block; */ - margin: 15px 0; + margin: 10px; border-radius: 10px; align-items: center; - /* max-height: 65px; */ + background-color: #eaeaea; transition: max-height 0.5s; overflow: hidden; color: black ; } +#product_description-field{ + display: flex; +} + +#product_description { + flex: 1 1 auto; + resize:vertical; + background-color: transparent; + padding: 10px; + font-size: small; + border-color: transparent; +} + .input-field ::placeholder { color: black; } @@ -101,7 +107,6 @@ input { width: 100%; - background-color: #eaeaea; padding: 18px; border-color: transparent; } diff --git a/client/js/login-page.js b/client/js/login-page.js index e956baac46e579607507a0852b8af1cd6c3243a0..838f9306685e21ebab24ab0c9ce16c6feb08cc35 100644 --- a/client/js/login-page.js +++ b/client/js/login-page.js @@ -33,7 +33,7 @@ signinBtn.onclick = function(){ username = ""; password = ""; alert(responseData.message); - location.href = "../pages/account-page.php"; + location.href = "../pages/catalog.php"; } else { alert("error: " + responseData.message) } @@ -92,7 +92,7 @@ signupBtn.onclick = function(){ username = ""; password = ""; alert("Sign up success: " + responseData.message); - location.href = "../pages/account-page.php"; + location.href = "../pages/catalog.php"; } else { console.log("Caught exception"); console.log("error: " + responseData.message); diff --git a/client/pages/cart.php b/client/pages/cart.php index 373be2f652a39b74434cdcb9217bdbe881dd2111..a2075ab7f0999c312385c0a6126787103874d24d 100644 --- a/client/pages/cart.php +++ b/client/pages/cart.php @@ -14,7 +14,7 @@ </head> <body> <div class="container"> - <div id="tabgroup"> + <div class="tabgroup" id="tabgroup"> <script> addnavbar(); </script> diff --git a/client/pages/make-sale.php b/client/pages/make-sale.php index dcd3c439fa9b0cca3f8f611f400038627385bbf3..04f7d479d3586837a582e37016318c173852761d 100644 --- a/client/pages/make-sale.php +++ b/client/pages/make-sale.php @@ -30,16 +30,16 @@ <input type="text" id="product_name" placeholder="Product Name"> </div> <div class="input-field" id="product_description-field"> - <input type="text" id="product_description" placeholder="Product Description"> + <textarea type="text" id="product_description" placeholder="Product Description"></textarea> </div> <div class="input-field" id="product_price-field"> <input type="text" id="product_price" placeholder="Price" oninput="checkNumericPrice()"> - <p id="price-criteria"> </p> </div> + <p id="price-criteria"> </p> <div class="input-field" id="product_quantity-field"> - <input type="text" id="product_qty" placeholder="Quantity" oninput="checkNumericQuantity()"> - <p id="quantity-criteria"> </p> + <input type="text" id="product_quantity" placeholder="Quantity" oninput="checkNumericQuantity()"> </div> + <p id="quantity-criteria"> </p> </div> </div>