louie_branch #84

Merged
MarkHipe merged 10 commits from louie_branch into main 2024-05-21 09:12:14 +08:00
1 changed files with 27 additions and 22 deletions
Showing only changes of commit e1d31a0a47 - Show all commits

View File

@ -108,12 +108,13 @@ $allSignups = array_merge($all_customers, $all_vendors);
<ul class="dropdown-menu dropdown-menu-right ec-dropdown-menu">
<!-- User image -->
<li class="dropdown-header">
<img loading="lazy" src="assets/img/user/user.png" class="img-circle" alt="User Image" />
<div class="d-inline-block">
John Deo <small class="pt-1"><?php echo $_SESSION['email']?></small>
<div class="d-flex align-items-center">
<img loading="lazy" src="assets/img/user/user.png" class="img-circle" alt="User Image" />
<small class="pt-1"><?php echo $_SESSION['email']?></small>
</div>
</li>
<li>
<!-- Commented out for future use or functionality -->
<!-- <li>
<a href="#">
<i class="mdi mdi-account"></i> My Profile
</a>
@ -125,7 +126,7 @@ $allSignups = array_merge($all_customers, $all_vendors);
</li>
<li>
<a href="#"> <i class="mdi mdi-diamond-stone"></i> Projects </a>
</li>
</li> -->
<li class="right-sidebar-in">
<a href="javascript:0"> <i class="mdi mdi-settings-outline"></i> Setting </a>
</li>
@ -134,7 +135,8 @@ $allSignups = array_merge($all_customers, $all_vendors);
</li>
</ul>
</li>
<li class="dropdown notifications-menu custom-dropdown">
<!-- Commented out for future usage or functionality -->
<!-- <li class="dropdown notifications-menu custom-dropdown">
<button class="dropdown-toggle notify-toggler custom-dropdown-toggler">
<i class="mdi mdi-bell-outline"></i>
</button>
@ -697,7 +699,7 @@ $allSignups = array_merge($all_customers, $all_vendors);
<a class="text-center" href="#"> View All </a>
</li>
</ul>
</li>
</li> -->
<li class="right-sidebar-in right-sidebar-2-menu">
<i class="mdi mdi-settings-outline mdi-spin"></i>
</li>
@ -825,7 +827,7 @@ $allSignups = array_merge($all_customers, $all_vendors);
<div class="col-xl-4 col-md-12 p-b-15">
<!-- Doughnut Chart -->
<div class="card card-default">
<div class="card card-default" style="height: 100%">
<div class="card-header justify-content-center">
<h2>Orders Overview</h2>
</div>
@ -841,7 +843,7 @@ $allSignups = array_merge($all_customers, $all_vendors);
<li class="mb-2"><i class="mdi mdi-checkbox-blank-circle-outline mr-2"
style="color: #4c84ff"></i>Order Completed</li>
<li class="mb-2"><i class="mdi mdi-checkbox-blank-circle-outline mr-2"
style="color: #80e1c1 "></i>Order To Pay</li>
style="color: #80e1c1"></i>Order To Pay</li>
<li><i class="mdi mdi-checkbox-blank-circle-outline mr-2"
style="color: #ff7b7b "></i>Order Returned</li>
</ul>
@ -861,32 +863,35 @@ $allSignups = array_merge($all_customers, $all_vendors);
</div>
<div class="row">
<div class="col-xl-8 col-md-12 p-b-15">
<div class="col-xl-12 col-md-12 p-b-15">
<!-- User activity statistics -->
<div class="card card-default" id="user-activity">
<div class="no-gutters">
<div>
<div class="card-header justify-content-between">
<h2>User Activity</h2>
<div class="date-range-report ">
<h2>Monthly Users Registry</h2>
<!-- <div class="date-range-report ">
<span></span>
</div>
</div> -->
</div>
<div class="card-body">
<div class="tab-content" id="userActivityContent">
<div class="tab-pane fade show active" id="user" role="tabpanel">
<canvas id="activity" class="chartjs"></canvas>
<canvas id="registry" class="chartjs"></canvas>
</div>
<div>
<div id="actLegend" class="customLegend mb-2"></div>
</div>
</div>
</div>
<div class="card-footer d-flex flex-wrap bg-white border-top">
<!-- <div class="card-footer d-flex flex-wrap bg-white border-top">
<a href="#" class="text-uppercase py-3">In-Detail Overview</a>
</div>
</div> -->
</div>
</div>
</div>
</div>
<div class="col-xl-4 col-md-12 p-b-15">
<!-- <div class="col-xl-4 col-md-12 p-b-15">
<div class="card card-default">
<div class="card-header flex-column align-items-start">
<h2>Current Users</h2>
@ -898,11 +903,11 @@ $allSignups = array_merge($all_customers, $all_vendors);
<a href="#" class="text-uppercase py-3">In-Detail Overview</a>
</div>
</div>
</div>
</div> -->
</div>
<div class="row">
<div class="col-xl-8 col-12 p-b-15">
<div class="col-xl-12 col-md-12 p-b-15">
<!-- World Chart -->
<div class="card card-default" id="analytics-country">
<div class="card-header justify-content-between">
@ -933,8 +938,8 @@ $allSignups = array_merge($all_customers, $all_vendors);
</div>
</div>
</div>
<div class="col-xl-4 col-12 p-b-15">
<!-- Top Sell Table -->
<!-- Top Sell Table -->
<!-- <div class="col-xl-4 col-12 p-b-15">
<div class="card card-default Sold-card-table">
<div class="card-header justify-content-between">
<h2>Sold by Items</h2>
@ -1034,7 +1039,7 @@ $allSignups = array_merge($all_customers, $all_vendors);
<a href="#" class="text-uppercase py-3">View Report</a>
</div>
</div>
</div>
</div> -->
</div>
<div class="row">