Conflicts:
	www/application/controllers/Auth.php
This commit is contained in:
2020-02-07 12:44:55 -05:00
53 changed files with 4718 additions and 3373 deletions
+2 -1
View File
@@ -59,7 +59,8 @@ $autoload['packages'] = array();
| $autoload['libraries'] = array('user_agent' => 'ua');
*/
//$autoload['libraries'] = array();
$autoload['libraries'] = array('session','form_validation');
//$autoload['libraries'] = array('session','form_validation');
$autoload['libraries'] = array('database','session','form_validation');
/*
| -------------------------------------------------------------------
| Auto-load Drivers
+2 -1
View File
@@ -90,4 +90,5 @@ define('COREGRADE_ACCOUNT_TESTEMAIL',11001);
define('COREGRADE_ACCOUNT_PENDING',11010);
define('COREGRADE_VERIFY_PENDING_LINK',11015);
define('COREGRADE_ACCOUNT_CREATEACC',11020);
define('COREGRADE_ACCOUNT_LOGIN',11025);
define('COREGRADE_ACCOUNT_LOGIN',11025);
define('COREGRADE_ACCOUNT_ADDCARD', 11027);
+25
View File
@@ -73,7 +73,32 @@ defined('BASEPATH') OR exit('No direct script access allowed');
$active_group = 'default';
$query_builder = TRUE;
global $coregrade;
$db['default'] = array(
'dsn' => '',
'hostname' => $coregrade->cfgReadChar('database.host'), /* '10.142.0.10', */
'username' => $coregrade->cfgReadChar('database.user'), /* 'savvy', */
'password' => $coregrade->cfgReadChar('database.pass'), /* 'savvy001!', */
'database' => $coregrade->cfgReadChar('database.name'), /* 'savvy', */
'dbdriver' => 'postgre',
'dbprefix' => '',
'pconnect' => FALSE,
'db_debug' => (ENVIRONMENT !== 'production'),
'cache_on' => FALSE,
'cachedir' => '',
'char_set' => 'utf8',
'dbcollat' => 'utf8_general_ci',
'swap_pre' => '',
'encrypt' => FALSE,
'compress' => FALSE,
'stricton' => FALSE,
'failover' => array(),
'save_queries' => TRUE
);
$db['defaultBAK'] = array(
'dsn' => '',
'hostname' => 'localhost',
'username' => '',
-118
View File
@@ -1,118 +0,0 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
class Auth extends Start_Controller {
public function index() {
$login_done = false;
$data = array();
$username = '';
$password = '';
$error_message = '';
$valid_entry = false;
$valid_login = false;
$out = [];
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->testLoginInput($username, $password, $error_message, $valid_entry);
if (true == $valid_entry) {
if ($username != '' && $password != '') {
$data["page_title"] = "";
$data["username"] = $username; //"auxsupport";
$data["password"] = $password;
$out = [];
$this->coregrade_webapi(COREGRADE_ACCOUNT_LOGIN, $data, $out);
//print_r( $data );
//print_r( $out );
if (count($out) > 0 && isset($out["session"])) {
//print_r($out);
//$this->getSessionData($out[0], $session_data); // just for testing
$this->buildUserSession(PHP_API_OK, $out);
$valid_login = true;
$this->session->set_flashdata('in', $out);
// redirect("page/index");
} else {
$error_message = "Invalid Username/Password";
}
}
}
$this->renderMemberPages('view_dash', $data);
$login_done = true;
// exit();
}
echo 'Welcome on board!';
$this->coregrade_webapi(100, $data, $out);
print_r($out);
if (false == $login_done) {
$this->renderAuthPages('view_login', $data);
}
}
public function newuser() {
//$this->load->view('home/home');
$data["firstname"] = $data["lastname"] = $data["password"] = $data["email"] = "";
$valid_entry = true;
$valid_login = false;
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$data['firstname'] = trim($this->input->post('firstname'));
$data['lastname'] = trim($this->input->post('lastname'));
$data['username'] = trim($this->input->post('username'));
$data['password'] = trim($this->input->post('pass1'));
$data['email'] = $data['username'];
if (true == $valid_entry) {
if ($data['username'] != '' && $data['password'] != '') {
$out = [];
$this->coregrade_webapi(COREGRADE_ACCOUNT_PENDING, $data, $out);
//print_r( $data );
// print_r($out);
if (count($out) > 0 && isset($out["pending_id"]) && $out["pending_id"] > 0) {
//print_r($out);
//$this->getSessionData($out[0], $session_data); // just for testing
$this->renderAuthPages('view_pending', $data);
$login_done = true;
// redirect("page/index");
} else {
$error_message = "Invalid Username/Password";
}
}
}
// exit();
}
$this->load->view('auth/view_head');
$this->load->view('auth/view_register');
$this->load->view('auth/view_foot');
}
public function resetpass() {
//$this->load->view('home/home');
//echo "START RESET 1";
$this->load->view('auth/view_head');
$this->load->view('auth/view_reset_password');
$this->load->view('auth/view_foot');
}
public function logout() {
$this->index();
}
}
+63 -4
View File
@@ -5,16 +5,75 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class Member extends Member_Controller {
public function index() {
$data = array();
$mysql = "SELECT * FROM members_pages WHERE member_id = " . $_SESSION["member_id"];
$r = $this->db->query($mysql);
$data["page_card"] = $r->result();
$this->renderMemberPages('view_dash', $data);
}
public function mycalendar(){
public function page() {
// echo 'yes'; view_mypage
$data = array();
//$mysql = "SELECT * FROM members_pages WHERE member_id = " . $_SESSION["member_id"];
// $r = $this->db->query($mysql);
// $data["page_card"] = $r->result();
$this->renderMemberPages('view_mypage', $data);
}
public function configure() {
// echo 'yes'; view_mypage
$data = array();
$mysql = "SELECT * FROM members_pages WHERE member_id = " . $_SESSION["member_id"];
$r = $this->db->query($mysql);
$data["page_card"] = $r->result();
//$mysql = "SELECT * FROM members_pages WHERE member_id = " . $_SESSION["member_id"];
// $r = $this->db->query($mysql);
// $data["page_card"] = $r->result();
$this->renderMemberPages('view_configure', $data);
}
public function addcard() {
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$data['description'] = trim($this->input->post('description'));
$data['title'] = trim($this->input->post('title'));
$data['member_id'] = $_SESSION["member_id"];
$data['session'] = $_SESSION["sessionid"];
if ($data['description'] != '' && $data['title'] != '') {
$out = [];
$this->coregrade_webapi(COREGRADE_ACCOUNT_ADDCARD, $data, $out);
}
// exit();
}
$this->configure();
}
public function mycalendar() {
$data = array();
$this->renderMemberPages('view_mycalendar', $data);
}
}
+5 -12
View File
@@ -8,6 +8,7 @@ class Vemail extends Start_Controller {
//$this->load->view('home/home');
$valid_entry = true;
$valid_login = false;
$data = [];
if ($_SERVER['REQUEST_METHOD'] == 'GET') {
@@ -19,16 +20,10 @@ class Vemail extends Start_Controller {
$this->coregrade_webapi(COREGRADE_ACCOUNT_CREATEACC, $data, $out);
//print_r( $data );
//print_r( $out );
if (count($out) > 0 && isset($out["session"])) {
//print_r($out);
//$this->getSessionData($out[0], $session_data); // just for testing
if (count($out) > 0 && isset($out["member_id"]) && $out["member_id"] > 0) {
// $this->renderAuthPages('view_login', $data);
$this->buildUserSession(PHP_API_OK, $out);
$valid_login = true;
$this->session->set_flashdata('in', $out);
$this->renderMemberPages('view_dash', $data);
$login_done = true;
// redirect("page/index");
} else {
@@ -44,9 +39,7 @@ class Vemail extends Start_Controller {
}
$this->load->view('auth/view_head');
$this->load->view('auth/view_register');
$this->load->view('auth/view_foot');
$this->renderAuthPages('view_login', $data);
}
public function resetpass() {
@@ -29,7 +29,7 @@ class Start_Controller extends COR_Controller {
$_SESSION['firstname'] = $out["firstname"]; // $ret->firstname;
$_SESSION['lastname'] = $out["lastname"]; // $ret->lastname;
$_SESSION['email'] = $out["email"]; // $ret->email;
$_SESSION['user_id'] = $out["member_id"]; // $ret->id;
$_SESSION['member_id'] = $out["member_id"]; // $ret->id;
$_SESSION['loc'] = $out["loc"];
$_SESSION['mypage'] = $out["mypage"];
}
@@ -46,7 +46,7 @@ class Start_Controller extends COR_Controller {
protected function testLoginInput(&$username, &$password, &$error_message, &$valid_entry) {
$valid_entry = true;
$username = trim($this->input->post('username'));
$password = trim($this->input->post('password'));
$password = trim($this->input->post('pass1'));
if ($username == '' or $password == '') {
$valid_entry = false;
$error_message = 'Enter a Username/Password & PracticeID to continue';
+2 -2
View File
@@ -27,7 +27,7 @@
<div class="card-body pt-1">
<form action="/auth" method="POST">
<fieldset class="form-label-group form-group position-relative has-icon-left">
<input type="text" class="form-control" id="user-name" placeholder="Username" required>
<input type="text" class="form-control" name='username' id="user-name" placeholder="Username" required>
<div class="form-control-position">
<i class="feather icon-user"></i>
</div>
@@ -35,7 +35,7 @@
</fieldset>
<fieldset class="form-label-group position-relative has-icon-left">
<input type="password" class="form-control" id="user-password" placeholder="Password" required>
<input type="password" class="form-control" name='pass1' id="user-password" placeholder="Password" required>
<div class="form-control-position">
<i class="feather icon-lock"></i>
</div>
@@ -1,11 +1,11 @@
<div class="main-menu-content">
<ul class="navigation navigation-main" id="main-menu-navigation" data-menu="menu-navigation">
<li class=" nav-item"><a href="#"><i class="feather icon-home"></i><span class="menu-title" data-i18n="Dashboard">Dashboard</span><span class="badge badge badge-warning badge-pill float-right mr-2">2</span></a>
<li class=" nav-item"><a href="/member"><i class="feather icon-home"></i><span class="menu-title" data-i18n="Dashboard">Dashboard</span><span class="badge badge badge-warning badge-pill float-right mr-2">2</span></a>
<ul class="menu-content">
<li class="active"><a href="#"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="Analytics">Analytics</span></a>
<li class="active"><a href="/member"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="my cards">My Cards</span></a>
</li>
<li><a href="#"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="eCommerce">eCommerce</span></a>
<li><a href="/member/configure"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="eCommerce">Configure</span></a>
</li>
</ul>
</li>
@@ -41,27 +41,7 @@
</li>
</ul>
</li>
<li class=" navigation-header"><span>Administration</span>
</li>
<li class=" nav-item"><a href="#"><i class="feather icon-list"></i><span class="menu-title" data-i18n="Data List">Data List</span><span class="badge badge badge-primary badge-pill float-right mr-2">New</span></a>
<ul class="menu-content">
<li><a href="#"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="List View">List View</span></a>
</li>
<li><a href="#"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="Thumb View">Thumb View</span></a>
</li>
</ul>
</li>
<li class=" nav-item"><a href="#"><i class="feather icon-layout"></i><span class="menu-title" data-i18n="Content">Content</span></a>
<ul class="menu-content">
<li><a href="#"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="Grid">Grid</span></a>
</li>
<li><a href="#"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="Typography">Typography</span></a>
</li>
<li><a href="#"><i class="feather icon-circle"></i><span class="menu-item" data-i18n="Text Utilities">Text Utilities</span></a>
</li>
</ul>
</li>
@@ -0,0 +1,123 @@
<?
print_r($page_card);
?>
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
<div class="header-navbar-shadow"></div>
<div class="content-wrapper">
<div class="content-header row">
</div>
<div class="content-body">
<!-- Dashboard Analytics Start -->
<section id="dashboard-analytics">
<div class="row">
<div class="col-xl-4 col-md-12 col-sm-12">
<div class="card">
<div class="card-content">
<div class="card-body">
<h4 class="card-title">Add New Card</h4>
</div>
<div class="card-body">
<form class="form" method="POST" action="/member/addcard">
<div class="form-body">
<div class="form-group">
<label for="feedback1" class="sr-only">Card Name</label>
<input type="text" id="feedback1" class="form-control" placeholder="Title" name="title" value="<?=isset($title)?$title:''?>" maxlength="49">
</div>
<div class="form-group">
<label for="feedback3" class="sr-only">Description</label>
<textarea id="feedback3" rows="3" class="form-control" name="description" placeholder="Description"><?=isset($description)?$description:''?></textarea>
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary mr-1">Add Card</button>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="col-xl-4 col-md-6 col-sm-12">
<div class="card collapse-icon accordion-icon-rotate">
<div class="card-body">
<div class="card-body">
<h4 class="card-title">My Cards</h4>
</div>
<div class="accordion" id="accordionExample" data-toggle-hover="true">
<?php
foreach ($page_card AS $drow) {
// print_r($drow);
?>
<div class="collapse-margin">
<div class="card-header" id="headingOne" data-toggle="collapse" role="button" data-target="#collapseOne<?=$drow->id?>" aria-expanded="false" aria-controls="collapseOne">
<span class="lead collapse-title collapsed">
<?=$drow->title?>
</span>
</div>
<div id="collapseOne<?=$drow->id?>" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
<div class="card-body">
<?=$drow->description?>
</div>
</div>
</div>
<?php }
?>
</div>
</div>
</div>
</div>
<div class="col-xl-4 col-md-6 col-sm-12">
<div class="card">
<div class="card-content">
<div class="card-body">
<h4 class="card-title">Video Card</h4>
</div>
<div class="embed-responsive embed-responsive-item embed-responsive-16by9">
<iframe class="img-thumbnail" src="https://www.youtube.com/embed/vTlSEMdC5qw" allowfullscreen></iframe>
</div>
<div class="card-body">
<p class="card-text">Candy cupcake sugar plum oat cake wafer marzipan jujubes.</p>
<a href="#" class="card-link">Card link</a>
<a href="#" class="card-link">Another link</a>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- Dashboard Analytics end -->
</div>
</div>
</div>
<!-- END: Content-->
+45 -48
View File
@@ -1,61 +1,58 @@
<?
print_r($page_card);
?>
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
<div class="header-navbar-shadow"></div>
<div class="content-wrapper">
<div class="content-header row">
</div>
<div class="content-body">
<!-- Dashboard Analytics Start -->
<section id="dashboard-analytics">
<div class="row">
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
<div class="header-navbar-shadow"></div>
<div class="content-wrapper">
<div class="content-header row">
</div>
<div class="content-body">
<!-- Dashboard Analytics Start -->
<section id="dashboard-analytics">
<div class="row">
<div class="col-lg-3 col-md-6 col-12">
<div class="card">
<?php
foreach ($page_card AS $drow) {
// print_r($drow);
?>
<div class="col-lg-3 col-md-6 col-12">
<a href='/member/page?pgname=<?= $drow->page_key ?>'
<div class="card">
<div class="card-header d-flex flex-column align-items-start pb-0">
<div class="avatar bg-rgba-primary p-50 m-0">
<div class="avatar-content">
<i class="feather icon-users text-primary font-medium-5"></i>
</div>
</div>
<h2 class="text-bold-700 mt-1 mb-25">92.6k</h2>
<p class="mb-0">Subscribers Gained</p>
</div>
<div class="card-content">
<div id="subscribe-gain-chart"></div>
<h2 class="text-bold-700 mt-1 mb-25"><?= $drow->title ?></h2>
</div>
<div class="card-content" style="height: 80px; padding:20px;">
<?=$drow->description?>
</div>
</a>
</div>
</div>
<div class="col-lg-3 col-md-6 col-12">
<div class="card">
<div class="card-header d-flex flex-column align-items-start pb-0">
<div class="avatar bg-rgba-warning p-50 m-0">
<div class="avatar-content">
<i class="feather icon-package text-warning font-medium-5"></i>
</div>
</div>
<h2 class="text-bold-700 mt-1 mb-25">97.5K</h2>
<p class="mb-0">Orders Received</p>
</div>
<div class="card-content">
<div id="orders-received-chart"></div>
</div>
</div>
</div>
</div>
</section>
<!-- Dashboard Analytics end -->
<?php
}
?>
</div>
</div>
</div>
<!-- END: Content-->
</section>
<!-- Dashboard Analytics end -->
</div>
</div>
</div>
<!-- END: Content-->
@@ -0,0 +1,192 @@
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
<div class="header-navbar-shadow"></div>
<div class="content-wrapper">
<div class="content-header row">
</div>
<div class="content-body">
<!-- Nav Centered And Nav End Starts -->
<section id="nav-tabs-centered">
<div class="row">
<div class="col-sm-12">
<div class="card overflow-hidden">
<div class="card-content">
<div class="card-body">
<ul class="nav nav-tabs justify-content-center" role="tablist">
<li class="nav-item">
<a class="nav-link" id="home-tab-center" data-toggle="tab" href="#home-center" aria-controls="home-center" role="tab" aria-selected="true"><h4 class="card-title">The Best Page In the world</h4></a>
</li>
<li class="nav-item">
<a class="nav-link active" id="service-tab-center" data-toggle="tab" href="#service-center" aria-controls="service-center" role="tab" aria-selected="false">Manage</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane" id="home-center" aria-labelledby="home-tab-center" role="tabpanel">
<p>Candy canes donut chupa chups candy canes lemon drops oat cake wafer. Cotton candy candy canes
marzipan carrot cake. Sesame snaps lemon drops candy marzipan donut brownie tootsie roll. Icing
croissant bonbon biscuit gummi bears.</p>
<div class="row">
<div class="col-xl-4 col-md-6 col-sm-12">
<div class="card collapse-icon accordion-icon-rotate">
<div class="card-body">
<div class="accordion" id="accordionExample" data-toggle-hover="true">
<div class="collapse-margin">
<div class="card-header" id="headingOne" data-toggle="collapse" role="button" data-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
<span class="lead collapse-title collapsed">
Accordion Item 1
</span>
</div>
<div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
<div class="card-body">
Pastry pudding cookie toffee bonbon jujubes jujubes powder topping. Jelly beans gummi bears sweet roll
bonbon muffin liquorice. Wafer lollipop sesame snaps.
</div>
</div>
</div>
<div class="collapse-margin">
<div class="card-header" id="headingTwo" data-toggle="collapse" role="button" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
<span class="lead collapse-title collapsed">
Accordion Item 2
</span>
</div>
<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionExample">
<div class="card-body">
Sweet pie candy jelly. Sesame snaps biscuit sugar plum. Sweet roll topping fruitcake. Caramels
liquorice biscuit ice cream fruitcake cotton candy tart.
</div>
</div>
</div>
<div class="collapse-margin">
<div class="card-header" id="headingThree" data-toggle="collapse" role="button" data-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
<span class="lead collapse-title">
Accordion Item 3
</span>
</div>
<div id="collapseThree" class="collapse" aria-labelledby="headingThree" data-parent="#accordionExample">
<div class="card-body">
Tart gummies dragée lollipop fruitcake pastry oat cake. Cookie jelly jelly macaroon icing jelly beans
soufflé cake sweet. Macaroon sesame snaps cheesecake tart cake sugar plum.
</div>
</div>
</div>
<div class="collapse-margin">
<div class="card-header" id="headingFour" data-toggle="collapse" role="button" data-target="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
<span class="lead collapse-title">
Accordion Item 4
</span>
</div>
<div id="collapseFour" class="collapse show" aria-labelledby="headingFour" data-parent="#accordionExample">
<div class="card-body">
Cheesecake muffin cupcake dragée lemon drops tiramisu cake gummies chocolate cake. Marshmallow tart
croissant. Tart dessert tiramisu marzipan lollipop lemon drops.
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-xl-4 col-md-6 col-sm-12">
<div class="card">
<div class="card-content">
<div class="card-body">
<h4 class="card-title">Video Card</h4>
</div>
<div class="embed-responsive embed-responsive-item embed-responsive-16by9">
<iframe class="img-thumbnail" src="https://www.youtube.com/embed/vTlSEMdC5qw" allowfullscreen></iframe>
</div>
<div class="card-body">
<p class="card-text">Candy cupcake sugar plum oat cake wafer marzipan jujubes.</p>
<a href="#" class="card-link">Card link</a>
<a href="#" class="card-link">Another link</a>
</div>
</div>
</div>
</div>
<div class="col-xl-4 col-md-12 col-sm-12">
<div class="card">
<div class="card-content">
<div class="card-body">
<h4 class="card-title">Feedback Form</h4>
</div>
<div class="card-body">
<form class="form">
<div class="form-body">
<div class="form-group">
<label for="feedback1" class="sr-only">Name</label>
<input type="text" id="feedback1" class="form-control" placeholder="Name" name="name">
</div>
<div class="form-group">
<label for="feedback2" class="sr-only">Email</label>
<input type="email" id="feedback2" class="form-control" placeholder="Email" name="email">
</div>
<div class="form-group">
<label for="feedback3" class="sr-only">Suggestion</label>
<textarea id="feedback3" rows="3" class="form-control" name="message" placeholder="Suggestion"></textarea>
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary mr-1">Submit</button>
<button type="reset" class="btn btn-outline-warning">Cancel</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="tab-pane active" id="service-center" aria-labelledby="service-tab-center" role="tabpanel">
<p>Pudding candy canes sugar plum cookie chocolate cake powder croissant. Carrot cake tiramisu danish
candy cake muffin croissant tart dessert. Tiramisu caramels candy canes chocolate cake sweet roll
liquorice icing cupcake.</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- Nav Centered And Nav End Ends -->
<!-- Dashboard Analytics Start -->
<section id="dashboard-analytics">
<div class="row">
</div>
</section>
<!-- Dashboard Analytics end -->
</div>
</div>
</div>
<!-- END: Content-->
@@ -23,13 +23,13 @@
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/extensions/shepherd-theme-default.css">
<!-- END: Vendor CSS-->
<!-- BEGIN: Vendor CSS-->
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/vendors.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/calendars/fullcalendar.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/calendars/extensions/daygrid.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/calendars/extensions/timegrid.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/pickers/pickadate/pickadate.css">
<!-- END: Vendor CSS-->
<!-- BEGIN: Vendor CSS-->
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/vendors.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/calendars/fullcalendar.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/calendars/extensions/daygrid.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/calendars/extensions/timegrid.min.css">
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/pickers/pickadate/pickadate.css">
<!-- END: Vendor CSS-->
<!-- BEGIN: Theme CSS-->
<link rel="stylesheet" type="text/css" href="/assets2/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="/assets2/css/bootstrap-extended.css">
@@ -70,18 +70,20 @@
<!-- li.nav-item.mobile-menu.d-xl-none.mr-auto-->
<!-- a.nav-link.nav-menu-main.menu-toggle.hidden-xs(href='#')-->
<!-- i.ficon.feather.icon-menu-->
<!--
<li class="nav-item d-none d-lg-block"><a class="nav-link" href="app-todo.html" data-toggle="tooltip" data-placement="top" title="Todo"><i class="ficon feather icon-check-square"></i></a></li>
<li class="nav-item d-none d-lg-block"><a class="nav-link" href="app-chat.html" data-toggle="tooltip" data-placement="top" title="Chat"><i class="ficon feather icon-message-square"></i></a></li>
<li class="nav-item d-none d-lg-block"><a class="nav-link" href="app-email.html" data-toggle="tooltip" data-placement="top" title="Email"><i class="ficon feather icon-mail"></i></a></li>
<li class="nav-item d-none d-lg-block"><a class="nav-link" href="app-calender.html" data-toggle="tooltip" data-placement="top" title="Calendar"><i class="ficon feather icon-calendar"></i></a></li>
-->
</ul>
<ul class="nav navbar-nav">
<li class="nav-item d-none d-lg-block"><a class="nav-link bookmark-star"><i class="ficon feather icon-star warning"></i></a>
<div class="bookmark-input search-input">
<!-- div class="bookmark-input search-input">
<div class="bookmark-input-icon"><i class="feather icon-search primary"></i></div>
<input class="form-control input" type="text" placeholder="Explore Vuexy..." tabindex="0" data-search="template-list">
<ul class="search-list search-list-bookmark"></ul>
</div>
</div -->
<!-- select.bookmark-select-->
<!-- option Chat-->
<!-- option email-->
@@ -91,12 +93,12 @@
</ul>
</div>
<ul class="nav navbar-nav float-right">
<li class="dropdown dropdown-language nav-item"><a class="dropdown-toggle nav-link" id="dropdown-flag" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="flag-icon flag-icon-us"></i><span class="selected-language">English</span></a>
<!-- li class="dropdown dropdown-language nav-item"><a class="dropdown-toggle nav-link" id="dropdown-flag" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="flag-icon flag-icon-us"></i><span class="selected-language">English</span></a>
<div class="dropdown-menu" aria-labelledby="dropdown-flag"><a class="dropdown-item" href="#" data-language="en"><i class="flag-icon flag-icon-us"></i> English</a><a class="dropdown-item" href="#" data-language="fr"><i class="flag-icon flag-icon-fr"></i> French</a><a class="dropdown-item" href="#" data-language="de"><i class="flag-icon flag-icon-de"></i> German</a><a class="dropdown-item" href="#" data-language="pt"><i class="flag-icon flag-icon-pt"></i> Portuguese</a></div>
</li>
<li class="nav-item d-none d-lg-block"><a class="nav-link nav-link-expand"><i class="ficon feather icon-maximize"></i></a></li>
<li class="nav-item d-none d-lg-block"><a class="nav-link nav-link-expand"><i class="ficon feather icon-maximize"></i></a></li -->
<li class="dropdown dropdown-notification nav-item"><a class="nav-link nav-link-label" href="#" data-toggle="dropdown"><i class="ficon feather icon-shopping-cart"></i><span class="badge badge-pill badge-primary badge-up cart-item-count">6</span></a>
<!--- li class="dropdown dropdown-notification nav-item"><a class="nav-link nav-link-label" href="#" data-toggle="dropdown"><i class="ficon feather icon-shopping-cart"></i><span class="badge badge-pill badge-primary badge-up cart-item-count">6</span></a>
<ul class="dropdown-menu dropdown-menu-media dropdown-cart dropdown-menu-right">
<li class="dropdown-menu-header">
<div class="dropdown-header m-0 p-2">
@@ -149,8 +151,10 @@
<li class="dropdown-menu-footer"><a class="dropdown-item p-1 text-center text-primary" href="app-ecommerce-checkout.html"><i class="feather icon-shopping-cart align-middle"></i><span class="align-middle text-bold-600">Checkout</span></a></li>
<li class="empty-cart d-none p-2">Your Cart Is Empty.</li>
</ul>
</li>
<li class="dropdown dropdown-notification nav-item"><a class="nav-link nav-link-label" href="#" data-toggle="dropdown"><i class="ficon feather icon-bell"></i><span class="badge badge-pill badge-primary badge-up">5</span></a>
</li -->
<!-- li class="dropdown dropdown-notification nav-item"><a class="nav-link nav-link-label" href="#" data-toggle="dropdown"><i class="ficon feather icon-bell"></i><span class="badge badge-pill badge-primary badge-up">5</span></a>
<ul class="dropdown-menu dropdown-menu-media dropdown-menu-right">
<li class="dropdown-menu-header">
<div class="dropdown-header m-0 p-2">
@@ -200,9 +204,9 @@
</a></li>
<li class="dropdown-menu-footer"><a class="dropdown-item p-1 text-center" href="javascript:void(0)">View all notifications</a></li>
</ul>
</li>
</li -->
<li class="dropdown dropdown-user nav-item"><a class="dropdown-toggle nav-link dropdown-user-link" href="#" data-toggle="dropdown">
<div class="user-nav d-sm-flex d-none"><span class="user-name text-bold-600">John Doe</span><span class="user-status">Available</span></div><span><img class="round" src="/assets2/images/portrait/small/avatar-s-11.jpg" alt="avatar" height="40" width="40"></span>
<div class="user-nav d-sm-flex d-none"><span class="user-name text-bold-600"> <?= isset($_SESSION['firstname']) ? $_SESSION['firstname'] : '' ?> <?= isset($_SESSION['lastname']) ? $_SESSION['lastname'] : '' ?></span><!-- span class="user-status">Available</span --></div><span><img class="round" src="/assets2/images/portrait/small/avatar-s-11.jpg" alt="avatar" height="40" width="40"></span>
</a>
<div class="dropdown-menu dropdown-menu-right"><a class="dropdown-item" href="page-user-profile.html"><i class="feather icon-user"></i> Edit Profile</a><a class="dropdown-item" href="app-email.html"><i class="feather icon-mail"></i> My Inbox</a><a class="dropdown-item" href="app-todo.html"><i class="feather icon-check-square"></i> Task</a><a class="dropdown-item" href="app-chat.html"><i class="feather icon-message-square"></i> Chats</a>
<div class="dropdown-divider"></div><a class="dropdown-item" href="/auth/logout"><i class="feather icon-power"></i> Logout</a>
@@ -305,9 +309,9 @@
</ul>
</div>
<div class="shadow-bottom"></div>
<?php include("common/side_menu.php"); ?>
</div>
<!-- END: Main Menu-->