diff --git a/README.md b/README.md index 46f1e59..6cb4fd2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OG Tech PC Solutions +# Computer Store Vault Solutions E-commerce web app project based on mvc model. Inspired by IdealTechPC. Neon theme. diff --git a/admin_edit_products.php b/admin_edit_products.php index 9e7b9d9..8b94070 100644 --- a/admin_edit_products.php +++ b/admin_edit_products.php @@ -4,7 +4,7 @@ - OG Tech PC - Edit Products + Computer Store Vault - Edit Products - OG Tech PC - Manage Products Panel + Computer Store Vault - Manage Products Panel -

Total sales of last 7 days: RM

+

Total sales of last 7 days: ₹

Start Date:

End Date:

@@ -288,7 +288,7 @@ $month_tot =$row['Amount']; } ?> -

Total sales of last 90 days: RM

+

Total sales of last 90 days: ₹




diff --git a/admin_view_orders.php b/admin_view_orders.php index fdc3d31..96b442e 100644 --- a/admin_view_orders.php +++ b/admin_view_orders.php @@ -4,7 +4,7 @@ - OG Tech PC - Admin View Orders + Computer Store Vault - Admin View Orders -OG Tech PC - Cart +Computer Store Vault - Cart
diff --git a/classes/admin.class.php b/classes/admin.class.php index 185e155..82fbde4 100644 --- a/classes/admin.class.php +++ b/classes/admin.class.php @@ -209,7 +209,7 @@ protected function inspectProduct(){ $category = $row["Category"]; $category = Item::CATEGORY_ICON[(int)$category]; $sellingprice = $row["SellingPrice"]; - $sellingprice = "RM ". number_format($sellingprice, 2); + $sellingprice = "₹". number_format($sellingprice, 2); $quantityinstock = $row["QuantityInStock"]; echo( diff --git a/classes/signupContr.class.php b/classes/signupContr.class.php index 61e72df..63b3435 100644 --- a/classes/signupContr.class.php +++ b/classes/signupContr.class.php @@ -59,6 +59,17 @@ private function uidExists() { return $result; } + private function pwdInvalid() { + $result = null; + if (!preg_match("/[a-zA-Z0-9]*$/", $this->pwd) || !preg_match("/\d/", $this->pwd)) { + $result = false; + } + else{ + $result = true; + } + return $result; + } + public function createUser() { if($this->emptyInput() == false) { header("location: ../signup.php?error=empty_input"); @@ -80,6 +91,11 @@ public function createUser() { exit(); } + if($this->pwdInvalid() == false) { + header("location: ../signup.php?error=password_invalid"); + exit(); + } + $this->setUser($this->username, $this->pwd, $this->email); } } \ No newline at end of file diff --git a/footer.php b/footer.php index 188dbab..a5a956b 100644 --- a/footer.php +++ b/footer.php @@ -1,7 +1,7 @@
@@ -55,6 +55,9 @@ else if ($_GET["error"] == "username_taken") echo "

*Username/Email already taken!

"; + + else if ($_GET["error"] == "password_invalid") + echo "

*Password must contain at least one special character and one digit!

"; else if ($_GET["error"] == "none") echo "

You have signed up! Please go to Login page

"; diff --git a/static/css/base.css b/static/css/base.css index 2169952..193f4fa 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -33,18 +33,16 @@ } .unglow { - -webkit-text-fill-color: white; + -webkit-text-fill-color: #333333; } .page-title { - color: white; - text-shadow: black 4px 0px 8px, black -4px 0px 8px, black 0px 4px 8px, - black 0px -4px 8px; + color: #333333; } /* body */ body { - background-color: black; + background-color: #FFFFFF; } /* containers */ @@ -77,19 +75,6 @@ body { font-weight: bold; } -.glow-text { - text-shadow: 0px 0px 5px cyan; - font-weight: bold; -} - -.glow-title { - background-color: cyan; - color: white; - font-weight: bold; - pointer-events: none; - box-shadow: 2px 2px 10px white; - text-decoration: underline; -} #bordershadow { height: 70px; diff --git a/static/css/cards.css b/static/css/cards.css index a5188e0..e735c54 100644 --- a/static/css/cards.css +++ b/static/css/cards.css @@ -1,9 +1,8 @@ /* square card boxes */ .selectable-card { min-height: 350px; - background-color: black; - box-shadow: white 4px 4px 8px 2px; - backdrop-filter: blur(15px); + background-color: #F0F0F0; + border: 1px solid #DDDDDD; transition: 0.2s cubic-bezier(0.8, 0, 0.2, 1); } @@ -16,37 +15,31 @@ } #no-hover:hover { - box-shadow: white 4px 4px 8px 2px; + border: 1px solid #DDDDDD; transition: 0.2s cubic-bezier(0.8, 0, 0.2, 1); } .selectable-card:hover { - box-shadow: red 8px 8px 24px 4px; -} - -.selectable-card.tint-glass-cyan { - background-color: rgba(0, 170, 200, 0.5); + border: 1px solid #007BFF; } /* cart cards */ .collapsible-card { - color: white; - background-color: rgba(0, 52, 63, 0.8); - backdrop-filter: blur(20px); + color: #333333; + background-color: #F0F0F0; } .collapsible-card:hover { - box-shadow: black 4px 4px 20px 2px; + background-color: #E0E0E0; } /* cart titles */ .title-card { - color: white; + color: #333333; padding: 20px; - background-color: rgba(56, 56, 56, 0.7); + background-color: #F0F0F0; border-radius: 20px; - box-shadow: black 4px 4px 8px 2px; - backdrop-filter: blur(15px); + border: 1px solid #DDDDDD; transition: 0.2s cubic-bezier(0.8, 0, 0.2, 1); } diff --git a/static/css/nav.css b/static/css/nav.css index 38370b5..17f20f3 100644 --- a/static/css/nav.css +++ b/static/css/nav.css @@ -4,6 +4,8 @@ nav { z-index: 5050; position: fixed; top: 0; + background-color: #FFFFFF; + box-shadow: 0 2px 4px 0 rgba(0,0,0,.2); } .nav { @@ -15,28 +17,11 @@ nav { .page_underline { font-weight: bold; - background-image: -webkit-linear-gradient(92deg, #f35626, #feab3a); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - -webkit-animation: hue 5s infinite linear; - text-shadow: 0px 0px 8px orange; - box-shadow: 0px 2px 5px orange; + color: #007BFF; + border-bottom: 2px solid #007BFF; } .underline { font-weight: bold; - background-image: -webkit-linear-gradient(92deg, #f35626, #feab3a); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - -webkit-animation: hue 5s infinite linear; - text-shadow: 0px 0px 8px orange; -} - -@-webkit-keyframes hue { - from { - -webkit-filter: hue-rotate(0deg); - } - to { - -webkit-filter: hue-rotate(360deg); - } + color: #007BFF; } diff --git a/static/pages/cart_items.php b/static/pages/cart_items.php index 04a1560..416525b 100644 --- a/static/pages/cart_items.php +++ b/static/pages/cart_items.php @@ -76,12 +76,12 @@ $displayShipping = 25; $displaySVoucher = ""; } - if ($displayShipping === 0) $displayShipping = "RM$displayShipping"; - else $displayShipping = "RM$displayShipping"; + if ($displayShipping === 0) $displayShipping = "₹$displayShipping"; + else $displayShipping = "₹$displayShipping"; if ($sumTotal >= 2000){ $shippingTotal = $sumTotal - 100; - $displayPVoucher = "-RM100 (Promo voucher applied)"; + $displayPVoucher = "-₹100 (Promo voucher applied)"; } else if ($sumTotal >= 200 && $sumTotal < 2000){ $shippingTotal = $sumTotal; @@ -96,7 +96,7 @@ echo("Total Items:$cartItemCount"); echo("Delivery Charges:");echo("$displayShipping $displaySVoucher"); echo("Promo Voucher:$displayPVoucher"); - echo("Sum Total:RM$sumTotal"); + echo("Sum Total:₹$sumTotal"); ?> diff --git a/static/pages/order_items.php b/static/pages/order_items.php index bcdb5b8..260a98b 100644 --- a/static/pages/order_items.php +++ b/static/pages/order_items.php @@ -75,12 +75,12 @@ $displayShipping = 25; $displaySVoucher = ""; } - if ($displayShipping === 0) $displayShipping = "RM$displayShipping"; - else $displayShipping = "RM$displayShipping"; + if ($displayShipping === 0) $displayShipping = "₹$displayShipping"; + else $displayShipping = "₹$displayShipping"; if ($sumTotal >= 2000){ $shippingTotal = $sumTotal - 100; - $displayPVoucher = "-RM100 (Promo voucher applied)"; + $displayPVoucher = "-₹100 (Promo voucher applied)"; } else if ($sumTotal >= 200 && $sumTotal < 2000){ $shippingTotal = $sumTotal; diff --git a/warranty_page.php b/warranty_page.php index f57d904..7b62cf2 100644 --- a/warranty_page.php +++ b/warranty_page.php @@ -1,7 +1,7 @@ -Warranty Info - OG Tech PC +Warranty Info - Computer Store Vault