Removed unnecessary page breaks in sections and reorganized Customer and Admin Portals login.

Author: yehiarasheed

WebApplication2/Customer/Pages/CustomerComponent.aspx

@@ -288,7 +288,7 @@
         /* Styled Button */
         .styled-button {
             display: flex;
-            width: 170px;
+            width: 180px;
             padding: 10px;
             font-size: 16px;
             color: #fff;
@@ -486,12 +486,10 @@
      </div>
             <div id ="recharge-balance" class="content">
                  <h2>Recharge Balance</h2>
-                <br />
                 <div>
                     <h3>Amount:</h3>
                     <asp:TextBox ID="txtRechargeAmount" runat="server" CssClass="styled-textbox" placeholder="Enter Amount"></asp:TextBox>
                 </div>
-                <br />
                 <div>
                     <h3>Payment Method:</h3>
                     <asp:DropDownList ID="ddlPaymentMethod" runat="server" CssClass="styled-dropdown">
@@ -514,17 +512,14 @@
            </div>
            <div id="renew-subscription" class="content">
             <h2>Renew Subscription</h2>
-                <br />
                 <div>
                     <h3>Plan ID:</h3>
                     <asp:TextBox ID="txtPlanID" runat="server" CssClass="styled-textbox" placeholder="Enter your Plan ID"></asp:TextBox>
                 </div>
-                <br />
                 <div>
                     <h3>Amount:</h3>
                     <asp:TextBox ID="txtRenewAmount" runat="server" CssClass="styled-textbox" placeholder="Enter Amount"></asp:TextBox>
                 </div>
-                <br />
                 <div>
                     <h3>Payment Method:</h3>
                     <asp:DropDownList ID="ddlRenewPaymentMethod" runat="server" CssClass="styled-dropdown">
@@ -533,7 +528,7 @@
                         <asp:ListItem Text="Cash" Value="cash" />
                     </asp:DropDownList>
                 </div>
-                <br />
+               <br />
                 <asp:Button ID="btnSubmitRenewSubscription" runat="server" Text="Renew Subscription" OnClick="RenewSubscription_Click" CssClass="styled-button" />
 
         </div> 

WebApplication2/Customer/Pages/CustomerComponent.aspx.cs

@@ -20,30 +20,30 @@ protected void Page_Load(object sender, EventArgs e)
                 int NationalID = 2; // Example NationalID
                 string PlanName = "Premium Plan"; // Example PlanName
 
-               // ShowConsoleMessage("Retrieving all active benefits...");
-                ShowAllServicePlans(connStr);
-                ShowAllBenefits(connStr);
-                ShowAllShops(connStr);
-                ShowCompanyOfferedPlans(connStr, MobileNo);
-                ShowUsagePlanCM(connStr, MobileNo);
-                ShowSubscribedPlansFiveMonths(connStr, MobileNo);
-                //ShowConsoleMessage("Retrieving unresolved technical support tickets...");
-                //ShowUnresolvedTickets(connStr, NationalID);
-
-                //ShowConsoleMessage("Retrieving the highest voucher...");
-                ShowHighestVoucher(connStr, MobileNo);
-
-                //ShowConsoleMessage("Retrieving remaining amount for the last payment...");
-                //ShowRemainingAmount(connStr, MobileNo, PlanName);
-
-                //ShowConsoleMessage("Retrieving extra amount for the last payment...");
-                //ShowExtraAmount(connStr, MobileNo, PlanName);
-
-                //ShowConsoleMessage("Retrieving top 10 successful payments...");
-                ShowTopPayments(connStr, MobileNo);
-
-                // Clear console when data is loaded
-                //ClearConsole();
+                //// ShowConsoleMessage("Retrieving all active benefits...");
+                // ShowAllServicePlans(connStr);
+                // ShowAllBenefits(connStr);
+                // ShowAllShops(connStr);
+                // ShowCompanyOfferedPlans(connStr, MobileNo);
+                // ShowUsagePlanCM(connStr, MobileNo);
+                // ShowSubscribedPlansFiveMonths(connStr, MobileNo);
+                // //ShowConsoleMessage("Retrieving unresolved technical support tickets...");
+                // ShowUnresolvedTickets(connStr, NationalID);
+
+                // //ShowConsoleMessage("Retrieving the highest voucher...");
+                // ShowHighestVoucher(connStr, MobileNo);
+
+                // //ShowConsoleMessage("Retrieving remaining amount for the last payment...");
+                // ShowRemainingAmount(connStr, MobileNo, PlanName);
+
+                // //ShowConsoleMessage("Retrieving extra amount for the last payment...");
+                // ShowExtraAmount(connStr, MobileNo, PlanName);
+
+                // //ShowConsoleMessage("Retrieving top 10 successful payments...");
+                // ShowTopPayments(connStr, MobileNo);
+                ShowCashbackWalletCustomer(connStr,1234567);
+               // // Clear console when data is loaded
+               // //ClearConsole();
             }
         }
 
@@ -620,6 +620,7 @@ private void ShowCashbackWalletCustomer(string connStr, int NationalID)
 
                     tableHtml += "</tbody></table>";
                     lblCashbackStatus.Text = tableHtml != "<table class='styled-table sortable'><thead><tr><th>Cashback ID</th><th>Benefit ID</th><th>Wallet ID</th><th>Amount</th><th>Credit Date</th></tr></thead><tbody></tbody></table>" ? tableHtml : "<div class='error'>No cashback transaction found related to this wallet.</div>";
+                    
                 }
                 catch (Exception ex)
                 {

WebApplication2/Customer/Pages/login.aspx

@@ -17,13 +17,12 @@
         }
 
         .login-container {
-            background: white;
-            border-radius: 8px;
-            padding: 30px;
-            box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1);
-            width: 100%;
-            max-width: 400px;
             text-align: center;
+            background: white;
+            padding: 30px 40px;
+            border-radius: 10px;
+            box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
+            width: 300px;
         }
 
         .login-container h2 {
@@ -58,16 +57,16 @@
 
         .login-container input[type="submit"],
         .login-container .login-button {
-            width: 60%;
-            background-color: #2575fc;
+            width: 60% !important; 
+            background: #2575fc;
             border: none;
             padding: 12px;
             color: white;
             font-size: 16px;
             font-weight: bold;
             border-radius: 5px;
             cursor: pointer;
-            transition: background-color 0.3s ease;
+            margin-top: 10px;
         }
 
         .login-container input[type="submit"]:hover,
@@ -86,29 +85,38 @@
             text-decoration: underline;
         }
 
+        .customer-login-link {
+            margin-top: 10px;  
+            font-size: 17px;   
+            color: #606060;  
+        }
+
+        .customer-login-link a {
+            color: #2575fc;   
+            text-decoration: none;
+        }
+
+        .customer-login-link a:hover {
+            text-decoration: underline; 
+        }
     </style>
 </head>
 <body>
-    <form id="form1" runat="server">
-        <div class="login-container">
+    <form id="form1" runat="server" class="login-container">
             <h2>Customer Login</h2>
-            
             <!-- Mobile Number Field -->
-            <label for="mnumber">Account Mobile Number:</label>
-            <asp:TextBox ID="mnumber" runat="server" placeholder="Enter your Mobile Number" type="text"></asp:TextBox>
+            <asp:TextBox ID="mnumber" runat="server" placeholder="Mobile Number" type="text"></asp:TextBox>
 
             <!-- Password Field -->
-            <label for="password">Password:</label>
-            <asp:TextBox ID="password" runat="server" placeholder="Enter your Password" type="password"></asp:TextBox>
+            <asp:TextBox ID="password" runat="server" placeholder="Password" type="password"></asp:TextBox>
 
             <!-- Login Button -->
             <div>
             <asp:Button ID="buttonlogin" runat="server" onclick="loginm" Text="Login" CssClass="login-button" />
             </div>
             <br />
             <div class="customer-login-link">
-                Are you a admin? <a href="/Pages/Login/Login.aspx">Go to admin login</a>
-            </div>
+                Are you an admin? <a href="/Pages/Login/Login.aspx">Go to admin login</a>
     </form>
 </body>
 </html>

WebApplication2/Pages/Login/Login.aspx

@@ -44,14 +44,14 @@
         .login-button {
             width: 60% !important; 
             background: #E91E63;
-            color: white;
-            padding: 12px;
             border: none;
-            border-radius: 5px;
+            padding: 12px;
+            color: white;
             font-size: 16px;
+            font-weight: bold;
+            border-radius: 5px;
             cursor: pointer;
             margin-top: 10px;
-            font-weight: bold;
         }
 
         .login-button:hover {
@@ -88,8 +88,8 @@
         
         .customer-login-link {
             margin-top: 10px;  
-            font-size: 14px;   
-            color: lightgrey;  
+            font-size: 17px;   
+            color: #606060;  
         }
 
         .customer-login-link a {
@@ -105,11 +105,9 @@
 <body>
     <form id="form1" runat="server" class="login-container">
         <h2>Admin Login</h2>
-        <asp:Label ID="LabelOfLogin" runat="server" Text="Enter AdminID and Password"></asp:Label>
-        <br />
-        <input id="txtUsername" runat="server" type="text" placeholder="Enter AdminID" />
+        <input id="txtUsername" runat="server" type="text" placeholder="AdminID" />
         <br />
-        <input id="txtPassword" runat="server" type="password" placeholder="Enter Password" />
+        <input id="txtPassword" runat="server" type="password" placeholder="Password" />
         <br />
         <asp:Button ID="btnLogin" runat="server" CssClass="login-button" Text="Login" OnClick="LoginButton" />
         <div>