File Merger : ps

app/Config/App.php

@@ -17,13 +17,9 @@ class App extends BaseConfig
      *
      *    http://example.com/
      */
-<<<<<<< HEAD
-    public string $baseURL = 'http://localhost/vb_book/public/';
-=======
     // public string $baseURL = 'http://localhost:8080/';
     public string $baseURL = 'http://localhost/vb_book/';
     // public string $baseURL = 'http://localhost/vb_book/public/';
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
     /**
      * Allowed Hostnames in the Site URL other than the hostname in the baseURL.
@@ -48,12 +44,8 @@ class App extends BaseConfig
      * something else. If you are using mod_rewrite to remove the page set this
      * variable so that it is blank.
      */
-<<<<<<< HEAD
-    public string $indexPage = 'index.php';
-=======
     // public string $indexPage = 'index.php';
     public string $indexPage = '';
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
     /**
      * --------------------------------------------------------------------------
@@ -70,13 +62,9 @@ class App extends BaseConfig
      *
      * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
      */
-<<<<<<< HEAD
-    public string $uriProtocol = 'REQUEST_URI';
-=======
     // public string $uriProtocol = 'REQUEST_URI';
     public $uriProtocol = 'PATH_INFO';
 
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
     /**
      * --------------------------------------------------------------------------

app/Config/Database.php

@@ -26,11 +26,7 @@ class Database extends Config
      */
     public array $default = [
         'DSN'      => '',
-<<<<<<< HEAD
-        'hostname' => '',
-=======
         'hostname' => 'localhost',
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
         'username' => '',
         'password' => '',
         'database' => '',

app/Config/Routes.php

@@ -11,11 +11,7 @@ $routes = Services::routes();
  * --------------------------------------------------------------------
  */
 $routes->setDefaultNamespace('App\Controllers');
-<<<<<<< HEAD
-$routes->setDefaultController('Home');
-=======
 $routes->setDefaultController('Authentication');
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 $routes->setDefaultMethod('index');
 $routes->setTranslateURIDashes(false);
 $routes->set404Override();
@@ -33,16 +29,6 @@ $routes->set404Override();
 
 // We get a performance increase by specifying the default
 // route since we don't have to scan directories.
-<<<<<<< HEAD
-$routes->get('/', 'Home::index');
-$routes->get('dashboard/', 'Home::index');
-$routes->get("user_list/", "Home::user_list");
-$routes->get("add_user/", "Home::add_user");
-$routes->get("edit_user/", "Home::edit_user");
-$routes->get("book_list/", "Home::book_list");
-$routes->get("add_book/", "Home::add_book");
-$routes->get("edit_book/", "Home::edit_book");
-=======
 
 # Authentication Routes 
 $routes->get('/', 'Authentication::index');
@@ -63,16 +49,16 @@ $routes->get("book_list/", "Books::index");
 $routes->get("add_book/", "Books::add_book");
 $routes->get("edit_book/", "Books::edit_book");
 
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
+# Business Routes 
+$routes->get("business_list/", "Business::index");
+$routes->get("new_bussiness/", "Business::new_bussiness");
+$routes->post("insert_business/", "Business::insert_business");
+
+
 $routes->get("subscribers_list/", "Home::subscribers_list");
 $routes->get("add_subscribers/", "Home::add_subscribers");
 $routes->get("edit_subscribers/", "Home::edit_subscribers");
-$routes->get("business_list/", "Business::add_bussiness");
+
-$routes->get("new_bussiness/", "Business::new_bussiness");
-<<<<<<< HEAD
-$routes->post("insert_business/", "Business::insert_business");
-=======
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
 
 

app/Controllers/Authentication.php

@@ -33,13 +33,13 @@ class Authentication extends BaseController
 
             $user = $auth_model->where('email', $username)->first();
 
-            if(is_null($user)) {
+            if (is_null($user)) {
                 return redirect()->back()->with('error', 'Invalid username or password.');
             }
 
             $pwd_verify = password_verify((string)$password, $user['password']);
 
-            if(!$pwd_verify) {
+            if (!$pwd_verify) {
                 return redirect()->back()->with('error', 'Invalid username or password.');
             }
 
@@ -50,7 +50,7 @@ class Authentication extends BaseController
                 // Redirect to a dashboard or other protected area
                 $session = \Config\Services::session();
                 $session->set('user_id', $user['user_id']);
-                $session->set('user_name', $user['first_name']." ".$user['last_name']);
+                $session->set('user_name', $user['first_name'] . " " . $user['last_name']);
                 $session->set('user_role', $user['role']);
                 $session->set('business_id', $user['business_id']);
 
@@ -62,7 +62,7 @@ class Authentication extends BaseController
                 // Invalid credentials, display error message
                 return redirect()->back()->with('error', 'Invalid username or password.');
             }
-        }else {
+        } else {
             // Validation failed, display errors
             return redirect()->back()->withInput()->with('validation', $validation);
         }
@@ -137,6 +137,4 @@ class Authentication extends BaseController
         // For example, compare against a stored hash
         return $password === 'correct_password';
     }
-
-
 }

app/Controllers/BaseController.php

@@ -8,10 +8,7 @@ use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
-<<<<<<< HEAD
-=======
 use App\Models\AuthenticationModel;
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
 /**
  * Class BaseController
@@ -62,21 +59,14 @@ abstract class BaseController extends Controller
 
     public function render_page($viewpage, $data)
     {
-<<<<<<< HEAD
-
-        $data['company_name']    = 'publishing';
-        $data['company_short_name']    = 'VBP';
-        $data['loggedin_person']    = 'Charles Deakin';
-        $data['loggedin_person_role']    = 'VBP CEO';
-        $data['browser_title']         = $data['company_name'].' | '.$data['company_short_name'] .' '. $data['page_name'];
-        $data['heading']    = $data['page_name'] == "Dashboard" ? 'Welcome to VijayabharathamPublishing.com' : "";
-=======
         $session = \Config\Services::session();
+        //  print_r($session);die();
         $session_uid = $session->get('user_id');
         $session_uname = $session->get('user_name');
         $session_role = $session->get('user_role');
 
         $auth_model = new AuthenticationModel();
+
         $details = $auth_model->getheringDetailsForHeader($session_uid);
         $data['company_name']    = $details[0]['site_name'];
         $data['company_short_name']    = $details[0]['site_title'];
@@ -84,17 +74,14 @@ abstract class BaseController extends Controller
         $data['loggedin_person_role']    = $details[0]['role'];
         $data['favicon']    = $details[0]['favicon'];
         $data['profile_picture']    = $details[0]['profile_picture'];
-            $data['browser_title']         = $data['company_name'].' | '.$data['company_short_name'] .' '. $data['page_name'];
+        $data['browser_title']         = $data['company_name'] . ' | ' . $data['company_short_name'] . ' ' . $data['page_name'];
-            $data['heading']    = $data['page_name'] == "Dashboard" ? 'Welcome to '.$data['company_name'] : "";
+        $data['heading']    = $data['page_name'] == "Dashboard" ? 'Welcome to ' . $data['company_name'] : "";
 
 
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
         echo view('template/header.php', $data);
         echo view('template/topbar.php', $data);
         echo view($viewpage, $data);
         echo view('template/footer.php', $data);
-<<<<<<< HEAD
-=======
 
         // $header = view('template/header.php', $data);
         // $topbar = view('template/topbar.php', $data);
@@ -103,7 +90,5 @@ abstract class BaseController extends Controller
 
         // return $header . $topbar. $content . $footer;
 
-        
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
     }
 }

app/Controllers/Books.php

@@ -1,7 +1,9 @@
 <?php
 
 namespace App\Controllers;
+
 use App\Models\BooksModel;
+
 class Books extends BaseController
 {
     public function index()
@@ -10,8 +12,8 @@ class Books extends BaseController
         $session_role = $session->get('user_role');
         $session_bid = $session->get('business_id');
         $where = ['books.isactive' => 1];
-        if (!empty($session_role) && $session_role !== "sadmin" ) {
+        if (!empty($session_role) && $session_role !== "sadmin") {
-            $where = ['books.business_id' => $session_bid,'books.isactive' => 1];    
+            $where = ['books.business_id' => $session_bid, 'books.isactive' => 1];
         }
 
         $model = new BooksModel();
@@ -21,5 +23,4 @@ class Books extends BaseController
         $data['details'] = $book_details;
         $this->render_page('book_list', $data);
     }
-
 }

app/Controllers/Business.php

@@ -2,33 +2,32 @@
 
 namespace App\Controllers;
 
-<<<<<<< HEAD
-
 use App\Models\BusinessModel;
 
-=======
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 class Business extends BaseController
 {
-    public function add_bussiness()
+
+    ## For Business Listing 
+    public function index()
     {
-<<<<<<< HEAD
+        $session = \Config\Services::session();
+        $session_role = $session->get('user_role');
+        $session_bid = $session->get('business_id');
+
         $BusinessModel = new BusinessModel();
-        $data['page_name']='SAME    ';
+        $data['page_name'] = 'Buiness Listing';
         $data['businesses'] = $BusinessModel->findAll();
-=======
+        $this->render_page('business_list', $data);
-        $data['page_name']='Bussiness Details';
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
-        $this->render_page('business_list',$data);
     }
+
+    ## For Business page load add and Update
     public function new_bussiness()
     {
-        $data['page_name']= 'Add Business';
+        $data['page_name'] = 'Add Business';
-<<<<<<< HEAD
-        $data['busi_name']= 'sample';
         $this->render_page('business', $data);
     }
 
+    ## For inserting/updating details of business
     public function insert_business()
     {
         //  print_r($_FILES);die();
@@ -43,14 +42,14 @@ class Business extends BaseController
                 ],
             ],
         ];
-        if (! $this->validate($validationRule)) {
+        if (!$this->validate($validationRule)) {
             $data = ['errors' => $this->validator->getErrors()];
             print_r($data);
             return 'hello';
         }
         $img = $this->request->getFile('bfile');
 
-        if (! $img->hasMoved()) {
+        if (!$img->hasMoved()) {
             $filepath = WRITEPATH . 'uploads/' . $img->store();
 
             $BusinessModel = new BusinessModel();
@@ -62,7 +61,7 @@ class Business extends BaseController
                 'city' => $this->request->getPost('bcity'),
                 'state' => $this->request->getPost('bstate'),
                 'postal_code' => $this->request->getPost('bzip'),
-                 'business_logo'=>$this->request->getPost('bfile'),
+                'business_logo' => $this->request->getPost('bfile'),
                 'isactive' => $this->request->getPost('bcheckbox') ? 1 : 0
             ];
             $business_id = $this->request->getPost('business_id'); // Get the business ID for update
@@ -74,25 +73,8 @@ class Business extends BaseController
                 // It's an update operation
                 $BusinessModel->update($business_id, $data);
             }
-        
-            $this->add_bussiness();
-        }    
         }
 
-}
+        // business_list
-          
-        
-    
-    
-
-
-    
-    
-    
-    
-   
-=======
-        $this->render_page('business', $data);
     }
 }
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815

app/Controllers/Home.php

@@ -1,11 +1,7 @@
 <?php
 
 namespace App\Controllers;
-<<<<<<< HEAD
-
-=======
 ## Home Controllers only for Dashboards,Report Modules
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 class Home extends BaseController
 {
     public function index()
@@ -13,87 +9,4 @@ class Home extends BaseController
         $data['page_name']    = 'Dashboard';
         $this->render_page('dashboard', $data);
     }
-
+}
-    // public function index(): string
-    // {
-    //     return view('template');
-    // }
-
-<<<<<<< HEAD
-    public function render_page($viewpage, $data)
-    {
-
-        $data['company_name']    = 'publishing';
-        $data['company_short_name']    = 'VBP';
-        $data['loggedin_person']    = 'Charles Deakin';
-        $data['loggedin_person_role']    = 'VBP CEO';
-        $data['browser_title']         = $data['company_name'].' | '.$data['company_short_name'] .' '. $data['page_name'];
-        $data['heading']    = $data['page_name'] == "Dashboard" ? 'Welcome to VijayabharathamPublishing.com' : "";
-        echo view('template/header.php', $data);
-        echo view('template/topbar.php', $data);
-        echo view($viewpage, $data);
-        echo view('template/footer.php', $data);
-    }
-
-    public function user_list()
-    {
-        $data['page_name']    = 'User Details';
-        $this->render_page('user_list', $data);
-    }
-
-    public function add_user()
-    {
-        $data['page_name']    = 'Add User';
-        $this->render_page('user', $data);
-    }
-
-    public function edit_user()
-    {
-        $data['page_name']    = 'Edit User';
-        $this->render_page('user', $data);
-    }
-
-    public function book_list()
-    {
-        $data['page_name']    = 'Book Details';
-        $this->render_page('book_list', $data);
-    }
-
-    public function add_book()
-    {
-        $data['page_name']    = 'Add Book';
-        $this->render_page('book', $data);
-    }
-   
-    public function edit_book()
-    {
-        $data['page_name']    = 'Edit Book';
-        $this->render_page('book', $data);
-    }
-
-=======
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
-    public function subscribers_list()
-    {
-        $data['page_name']    = 'Subscribers Details';
-        $this->render_page('subscribers_list', $data);
-    }
-
-    public function add_subscribers()
-    {
-        $data['page_name']    = 'Add Subscribers';
-        $this->render_page('subscribers', $data);
-    }
-
-    public function edit_subscribers()
-    {
-        $data['page_name']    = 'Edit Subscribers';
-        $this->render_page('subscribers', $data);
-    }
-
-    public function add_bussiness()
-    {
-        $data['page_name']='Bussiness Details';
-        $this->render_page('business_list',$data);
-    }
- }

app/Controllers/Users.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\Controllers;
+
 use App\Models\UsersModel;
 
 class Users extends BaseController
@@ -13,8 +14,8 @@ class Users extends BaseController
         $session_bid = $session->get('business_id');
 
         $where = ['users.isactive' => 1];
-        if (!empty($session_role) && $session_role !== "sadmin" ) {
+        if (!empty($session_role) && $session_role !== "sadmin") {
-            $where = ['users.business_id' => (int)$session_bid,'users.isactive' => 1];    
+            $where = ['users.business_id' => (int)$session_bid, 'users.isactive' => 1];
         }
         $model = new UsersModel();
         $model->setTable('users');
@@ -27,15 +28,14 @@ class Users extends BaseController
     ## To Load User Add/Update page
     public function user_page($id)
     {
-        if($id === '0') {
+        if ($id === '0') {
             $data['page_name']    = 'Add User';
             $data['details'] = [];
-        }
+        } else if ($id !== '0') {
-        else if($id !== '0') {
             $data['page_name']    = 'Edit User';
             $model = new UsersModel();
             $model->setTable('users');
-            $edit_user_details = $model->where(['user_id'=>$id,'isactive' => 1])->first();
+            $edit_user_details = $model->where(['user_id' => $id, 'isactive' => 1])->first();
             $data['details'] = $edit_user_details;
         }
         $this->render_page('user', $data);
@@ -48,27 +48,24 @@ class Users extends BaseController
         $session = \Config\Services::session();
         $model = new UsersModel();
         $model->setTable('users');
-        if($this->request->is('post')){ 
+        if ($this->request->is('post')) {
             $requestData = $this->request->getVar();
         }
         $requestData['business_id'] = $session->get('business_id');
-        if($requestData['user_id']){
+        if ($requestData['user_id']) {
             #edit
             $requestData['updated_by'] = $session->get('user_id');
             $requestData['isactive'] = isset($requestData['isactive']) && $requestData['isactive'] == 'on' ? 1 : 0;
             unset($requestData['password']);
             $model->saveData($requestData, $requestData['user_id']);
-
+        } else {
-        }else{
             #add
             $hash_password = password_hash($requestData['password'], PASSWORD_DEFAULT);
             $requestData['password'] = $hash_password;
             $requestData['created_by'] = $session->get('user_id');
-            $requestData['isactive'] = 1 ;
+            $requestData['isactive'] = 1;
             $model->saveData($requestData, null);
-
         }
         return redirect()->route('user_list');
     }
-
 }

app/Controllers/vb_book.code-workspace

@@ -1,14 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "../.."
-		},
-		{
-			"path": "../../../curd"
-		},
-		{
-			"path": "../../../id_card_generator"
-		}
-	],
-	"settings": {}
-}

app/Views/book_list.php

@@ -17,55 +17,15 @@
                             <tr>
                                 <th>Name</th>
                                 <th>Author</th>
-<<<<<<< HEAD
-                                <th>Edition/Language</th>
-                                <th>Year Of Release</th>
-                                <th>State/Country</th>
-                                <th>Price of the Book</th>
-                                <th>Book Avaialble Count</th>
-=======
                                 <th>Category</th>
                                 <th>Language</th>
                                 <th>Year Of Release</th>
                                 <th>Price of the Book</th>
                                 <th>Description</th>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                 <th>Status</th>
                             </tr>
                         </thead>
                         <tbody>
-<<<<<<< HEAD
-                            <tr>
-                                <td>Cyber Crime</td>
-                                <td>Tiger Nixon</td>
-                                <td>7th / English</td>
-                                <td>2023</td>
-                                <td>TamilNadu/India</td>
-                                <td> ₹ <span data-plugin="counterup">450</span> </td>
-                                <td> <span data-plugin="counterup">200</span> Copies </td>
-                                <td> <span class="badge badge-soft-danger">In-Active</span> </td>
-                            </tr>
-                            <tr>
-                                <td>Reinforced Concrete Design</td>
-                                <td>Rory Dalyell</td>
-                                <td>1st / English</td>
-                                <td>1998 </td>
-                                <td>Kerala/India</td>
-                                <td> ₹ <span data-plugin="counterup">730</span> </td>
-                                <td> <span data-plugin="counterup">20</span> Copies </td>
-                                <td> <span class="badge badge-soft-success">Active</span> </td>
-                            </tr>
-                            <tr>
-                                <td>The big bull</td>
-                                <td>Garrett</td>
-                                <td>2nd / Tamil</td>
-                                <td>2002</td>
-                                <td>TamilNadu/India</td>
-                                <td> ₹ <span data-plugin="counterup">1000</span> </td>
-                                <td> <span data-plugin="counterup">150</span> Copies </td>
-                                <td> <span class="badge badge-soft-success">Active</span> </td>
-                            </tr>
-=======
                         <?php foreach ($details as $row): 
                             if ($row['isactive']) {
                                 $class = 'badge badge-soft-success';
@@ -89,7 +49,6 @@
                                
                             </tr>
                         <?php endforeach; ?> 
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                         </tbody>
                     </table>
                 </div>

app/Views/business.php

@@ -4,144 +4,82 @@
             <div class="card-body">
                 <h4 class="header-title"><?= $page_name; ?></h4>
                 <p class="sub-header"> </p>
-<<<<<<< HEAD
                 <form method="POST" enctype="multipart/form-data" action="<?php echo base_url(); ?>insert_business">
                 <div class="form-group">
                         <div class="form-row">
                             <div class="form-group col-md-6">
                                 <label for="bname" class="col-form-label">Business Name<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" name="bname" placeholder="Name" value = <?= $busi_name; ?> required />
+                                <input type="text" class="form-control" id="bname" name="bname" value="<?= isset($busi_name) ? $busi_name : '' ?>" placeholder="Business Name" required />
                             </div>
                             <div class="form-group col-md-6">
                                 <label for="bmail" class="col-form-label">Email<span class="text-danger">*</span></label>
                                 <input type="email" class="form-control" name="bmail" placeholder="Email" required />
-=======
-                <form>
-                    <div class="form-group">
-                        <div class="form-row">
-                            <div class="form-group col-md-6">
-                                <label for="bname" class="col-form-label">Name<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="bname" placeholder="Name" required />
-                            </div>
-                            <div class="form-group col-md-6">
-                                <label for="bmail" class="col-form-label">Email<span class="text-danger">*</span></label>
-                                <input type="email" class="form-control" id="bmail" placeholder="Email" required />
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                             </div>                            
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-6">
                                 <label for="bmobile" class="col-form-label">Mobile Number<span class="text-danger">*</span></label>
-<<<<<<< HEAD
                                 <input type="text" class="form-control" name="bmobile" placeholder="Enter only numbers" required data-parsley-type="number" />
-=======
-                                <input type="text" class="form-control" id="bmobile" placeholder="Enter only numbers" required data-parsley-type="number" />
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                             </div>
-                        
                             <div class="form-group col-md-6">
                                 <label for="baddress" class="col-form-label">Address<span class="text-danger">*</span></label>
-<<<<<<< HEAD
                                 <input type="text" class="form-control" name="baddress" placeholder="1234 Main St" required />
-=======
-                            <input type="text" class="form-control" id="baddress" placeholder="1234 Main St" required />
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                             </div>
                         </div>
-                       
                         <div class="form-row">
-                            <div class="form-group col-md-6">
+                            <div class="form-group col-md-4">
                                 <label for="bcity" class="col-form-label">City<span class="text-danger">*</span></label>
-<<<<<<< HEAD
                                 <input type="text" class="form-control" name="bcity" placeholder="city" required />
                             </div>
-                            <div class="form-group col-md-6">
+                            <div class="form-group col-md-4">
                                 <label for="bstate" class="col-form-label">State<span class="text-danger">*</span></label>
                                 <select name="bstate" class="form-control" required >
-=======
-                                <input type="text" class="form-control" id="bcity" placeholder="city" required />
-                            </div>
-                            <div class="form-group col-md-6">
-                                <label for="bstate" class="col-form-label">State<span class="text-danger">*</span></label>
-                                <select id="bstate" class="form-control" required >
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                 <option>Choose</option>
                                 <option> 1</option>
                                 <option> 2</option>
                                 <option> 3</option>
-
                                 </select>
                             </div>
-                            
+                            <div class="form-group col-md-4">
-                            <div class="form-group col-md-6">
                                 <label for="bzip" class="col-form-label">Zip<span class="text-danger">*</span></label>
-<<<<<<< HEAD
                                 <input type="text" class="form-control" name="bzip" placeholder="Zip" required />
-=======
-                                <input type="text" class="form-control" id="bzip" placeholder="Zip" required />
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                             </div>
-                        
+                        </div>
-                       
+                        <div class="form-row">
-                        <div class="form-group col-md-6">
+                            <div class="form-group col-md-12">
                             <label for="bfile" class="col-form-label">File<span class="text-danger">*</span></label>
-<<<<<<< HEAD
                             <div class="form-control">
                                 <input type="file" name="bfile" multiple />
-=======
-
-            
-                                        <form action="/" method="post" class="form-control" id="myAwesomeDropzone" data-plugin="dropzone" data-previews-container="#file-previews"
-                                            data-upload-preview-template="#uploadPreviewTemplate">
-                                            <div class="form-control">
-                                                <input name="file" type="file" multiple />
                             </div>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
-
-                                           
-                                        </form>
                             </div>
                         </div>
 
+                        <?php if(!empty($details)){ ?>
                         <div class="form-group text-right m-b-0 checkbox checkbox-purple">
-                            <input type="checkbox" id="bcheckbox" class="form-control" checked="true">
+                            <input type="checkbox" id="isactive" name="isactive" class="form-control" <?= isset($details) && $details['isactive'] == 1 ? 'checked' : '' ?>>
-                            <label for="bcheckbox">Is Active</label>
+                            <label for="isactive"> Is Active</label>
                         </div>
                         <br>
-
+                        <?php } ?>
-
                         <div class="form-group text-right m-b-0">
-<<<<<<< HEAD
+                            <button class="btn btn-success waves-effect waves-light mr-1" type="submit">
-                            <button class="btn btn-primary waves-effect waves-light mr-1" id="bsubmit"type="submit">
-=======
-                            <button class="btn btn-primary waves-effect waves-light mr-1" type="submit">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                 Submit
                             </button>
-                            <button type="reset" class="btn btn-secondary waves-effect">
+                            <button type="reset" class="btn btn-primary waves-effect mr-1">
-                                Cancel
+                                Reset
                             </button>
+                            <button type="button" class="btn btn-secondary waves-effect">Cancel</button>
+                        </div>
                     </div>   
                 </form>
-
-           
-
             </div> <!-- end card-body-->
         </div> <!-- end card-->
     </div> <!-- end col-->
 </div>
 <!-- end row -->
-<script src="../assets/js/vendor.min.js"></script>
+<script src="<?= base_url()."public/assets/js/vendor.min.js"?>"></script>
 
 <!-- Plugins js -->
-<<<<<<< HEAD
-
-=======
-<script src="../assets/libs/dropzone/min/dropzone.min.js"></script>
-
-<!-- Init js-->
-<script src="../assets/js/pages/form-fileuploads.init.js"></script>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
 <!-- App js -->
-<script src="../assets/js/app.min.js"></script>
+<script src="<?= base_url()."public/assets/js/app.min.js"?>"></script>

app/Views/business_list.php

@@ -2,7 +2,6 @@
     <div class="col-12">
         <div class="card">
             <div class="card-body">
-<<<<<<< HEAD
                 <form>
                
 
@@ -69,29 +68,3 @@ $(document).ready(function() {
     });
 });
 </script>
-=======
-            <div class="float-right">
-                    <a href="new_bussiness" class="btn btn-primary"><i class="ri-user-add-line"></i> Add New </a>
-                </div>
-            <br>
-                
-                <div class="table-responsive">
-                <table id="datatable-buttons" class="table dt-responsive w-100">
-                        <thead class="thead-light">
-                            <tr>
-                                <th>Business Name</th>
-                                <th>Business ID</th>
-                                <th>Contact</th>
-                                <th>Email</th>
-                                <th>Address</th>
-                                
-                            </tr>
-                        </thead>
-                       
-                 </table>    
-</div>
-</div>
-</div>
-</div>
-</div>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815

app/Views/template/footer.php

@@ -100,11 +100,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-10.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-10.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Andrew Mackie</h6>
@@ -119,11 +115,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-1.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-1.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Rory Dalyell</h6>
@@ -138,11 +130,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status busy"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-9.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-9.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Jaxon Dunhill</h6>
@@ -161,11 +149,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status online"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-2.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-2.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Jackson Therry</h6>
@@ -180,11 +164,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status away"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-4.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-4.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Charles Deakin</h6>
@@ -199,11 +179,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status online"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-5.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-5.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Ryan Salting</h6>
@@ -218,11 +194,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status online"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-6.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-6.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Sean Howse</h6>
@@ -237,11 +209,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status busy"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-7.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-7.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Dean Coward</h6>
@@ -256,11 +224,7 @@
                                 <div class="media">
                                     <div class="position-relative mr-2">
                                         <span class="user-status away"></span>
-<<<<<<< HEAD
-                                        <img src="./assets/images/users/avatar-8.jpg" class="rounded-circle avatar-sm" alt="user-pic">
-=======
                                         <img src="<?= base_url()."public/assets/images/users/avatar-8.jpg" ?>" class="rounded-circle avatar-sm" alt="user-pic">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     </div>
                                     <div class="media-body overflow-hidden">
                                         <h6 class="mt-0 mb-1 font-14">Hayley East</h6>
@@ -467,43 +431,6 @@
         <div class="rightbar-overlay"></div>
 
         <!-- Vendor js -->
-<<<<<<< HEAD
-        <script src="./assets/js/vendor.min.js"></script>
-
-        <!-- KNOB JS -->
-        <script src="./assets/libs/jquery-knob/jquery.knob.min.js"></script>
-        <!-- Apex js-->
-        <script src="./assets/libs/apexcharts/apexcharts.min.js"></script>
-
-        <!-- Plugins js-->
-        <script src="./assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.min.js"></script>
-        <script src="./assets/libs/admin-resources/jquery.vectormap/maps/jquery-jvectormap-world-mill-en.js"></script>
-
-        <!-- Dashboard init-->
-        <script src="./assets/js/pages/dashboard-sales.init.js"></script>
-
-        <!-- third party js -->
-        <script src="./assets/libs/datatables.net/js/jquery.dataTables.min.js"></script>
-        <script src="./assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"></script>
-        <script src="./assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
-        <script src="./assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"></script>
-        <script src="./assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
-        <script src="./assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
-        <script src="./assets/libs/datatables.net-buttons/js/buttons.html5.min.js"></script>
-        <script src="./assets/libs/datatables.net-buttons/js/buttons.flash.min.js"></script>
-        <script src="./assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
-        <script src="./assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
-        <script src="./assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
-        <script src="./assets/libs/pdfmake/build/pdfmake.min.js"></script>
-        <script src="./assets/libs/pdfmake/build/vfs_fonts.js"></script>
-        <!-- third party js ends -->
-
-        <!-- Datatables init -->
-        <script src="./assets/js/pages/datatables.init.js"></script>
-
-        <!-- App js -->
-        <script src="./assets/js/app.min.js"></script>
-=======
         <script src="<?= base_url()."public/assets/js/vendor.min.js" ?>"></script>
 
         <!-- KNOB JS -->
@@ -539,7 +466,6 @@
 
         <!-- App js -->
         <script src="<?= base_url()."public/assets/js/app.min.js" ?>"></script>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
     </body>
 </html>

app/Views/template/header.php

@@ -8,29 +8,6 @@
         <meta content="Coderthemes" name="author" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <!-- App favicon -->
-<<<<<<< HEAD
-    	<link rel="shortcut icon" type="image/png" href="/favicon.ico">
-
-        <!-- plugin css -->
-        <link href="./assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.css" rel="stylesheet" type="text/css" />
-        
-        <!-- third party css -->
-        <link href="./assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="./assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="./assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="./assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <!-- third party css end -->
-
-		<!-- App css -->
-		<link href="./assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
-		<link href="./assets/css/app.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
-
-		<link href="./assets/css/bootstrap-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
-		<link href="./assets/css/app-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
-
-		<!-- icons -->
-		<link href="./assets/css/icons.min.css" rel="stylesheet" type="text/css" />
-=======
         <link rel="shortcut icon" href="<?= base_url()."public/assets/images/company/".$favicon ?>" >
         
         <!-- plugin css -->
@@ -52,7 +29,6 @@
 
 		<!-- icons -->
 		<link href="<?= base_url()."public/assets/css/icons.min.css" ?>" rel="stylesheet" type="text/css" />
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
 
     </head>
 
@@ -95,11 +71,7 @@
 
                     <!-- User box -->
                     <div class="user-box text-center">
-<<<<<<< HEAD
-                        <img src="./assets/images/users/avatar-1.jpg" alt="user-img" title="Mat Helme"
-=======
                         <img src="<?= base_url()."public/assets/images/users/".$profile_picture; ?>" alt="user-img" title="Mat Helme"
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                             class="rounded-circle avatar-md">
                         <div class="dropdown">
                             <a href="javascript: void(0);" class="text-reset dropdown-toggle h5 mt-2 mb-1 d-block"
@@ -125,11 +97,7 @@
                                 </a>
 
                                 <!-- item-->
-<<<<<<< HEAD
-                                <a href="javascript:void(0);" class="dropdown-item notify-item">
-=======
                                 <a href="logout" class="dropdown-item notify-item">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                     <i class="fe-log-out mr-1"></i>
                                     <span>Logout</span>
                                 </a>
@@ -164,14 +132,9 @@
                             </li>
                             <li>
                                 <a href="business_list">
-<<<<<<< HEAD
-                                <i class="fa fa-industry"></i>
-                                <span> Business </span>
-=======
                                     <i class="fa fa-industry"></i>
                                     <span> Business </span>
                                 </a>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                             <li>
                                 <a href="#sidebarIcons" data-toggle="collapse">
                                     <i class="ri-shield-user-line"></i>

app/Views/template/topbar.php

@@ -48,11 +48,7 @@
                                     <!-- item-->
                                     <a href="javascript:void(0);" class="dropdown-item notify-item">
                                         <div class="media">
-<<<<<<< HEAD
-                                            <img class="d-flex mr-2 rounded-circle" src="./assets/images/users/avatar-2.jpg" alt="Generic placeholder image" height="32">
-=======
                                             <img class="d-flex mr-2 rounded-circle" src="<?= base_url()."public/assets/images/users/avatar-2.jpg" ?>" alt="Generic placeholder image" height="32">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                             <div class="media-body">
                                                 <h5 class="m-0 font-14">Erwin E. Brown</h5>
                                                 cat<span class="font-12 mb-0">UI Designer</span>
@@ -63,11 +59,7 @@
                                     <!-- item-->
                                     <a href="javascript:void(0);" class="dropdown-item notify-item">
                                         <div class="media">
-<<<<<<< HEAD
-                                            <img class="d-flex mr-2 rounded-circle" src="./assets/images/users/avatar-5.jpg" alt="Generic placeholder image" height="32">
-=======
                                             <img class="d-flex mr-2 rounded-circle" src="<?= base_url()."public/assets/images/users/avatar-5.jpg" ?>" alt="Generic placeholder image" height="32">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                             <div class="media-body">
                                                 <h5 class="m-0 font-14">Jacob Deo</h5>
                                                 <span class="font-12 mb-0">Developer</span>
@@ -108,33 +100,21 @@
                             <div class="row no-gutters">
                                 <div class="col">
                                     <a class="dropdown-icon-item" href="https://web.whatsapp.com/" target="_blank">
-<<<<<<< HEAD
-                                        <img src="./assets/images/brands/whatsapp.png" alt="whatsapp">
-=======
                                         <img src="<?= base_url()."public/assets/images/brands/whatsapp.png" ?>" alt="whatsapp">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                         <span>Whatsapp</span>
                                     </a>
 
                                 </div>
                                 <div class="col">
                                     <a class="dropdown-icon-item" href="https://meet.google.com" target="_blank">
-<<<<<<< HEAD
-                                        <img src="./assets/images/brands/meet.png" alt="G meet">
-=======
                                         <img src="<?= base_url()."public/assets/images/brands/meet.png" ?>" alt="G meet">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                         <span>G Meet</span>
                                     </a>
                                 </div>
                                 <div class="col">
                                     <a class="dropdown-icon-item" href="https://mail.google.com" target="_blank">
                                         <!-- <img src="https://ssl.gstatic.com/ui/v1/icons/mail/rfr/logo_gmail_lockup_default_1x_r5.png" alt="G Suite"> -->
-<<<<<<< HEAD
-                                        <img src="./assets/images/brands/gmail.png" alt="G mail">
-=======
                                         <img src="<?= base_url()."public/assets/images/brands/gmail.png" ?>" alt="G mail">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                         <span>G Mail</span>
                                     </a>
                                 </div>
@@ -178,11 +158,7 @@
                             <!-- item-->
                             <a href="javascript:void(0);" class="dropdown-item notify-item">
                                 <div class="notify-icon">
-<<<<<<< HEAD
-                                    <img src="./assets/images/users/avatar-2.jpg" class="img-fluid rounded-circle" alt="" />
-=======
                                     <img src="<?= base_url()."public/assets/images/users/avatar-2.jpg" ?>" class="img-fluid rounded-circle" alt="" />
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                 </div>
                                 <p class="notify-details">Mario Drummond</p>
                                 <p class="text-muted mb-0 user-msg">
@@ -193,11 +169,7 @@
                             <!-- item-->
                             <a href="javascript:void(0);" class="dropdown-item notify-item">
                                 <div class="notify-icon">
-<<<<<<< HEAD
-                                    <img src="./assets/images/users/avatar-4.jpg" class="img-fluid rounded-circle" alt="" />
-=======
                                     <img src="<?= base_url()."public/assets/images/users/avatar-4.jpg" ?>" class="img-fluid rounded-circle" alt="" />
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                 </div>
                                 <p class="notify-details">Rory Dalyell</p>
                                 <p class="text-muted mb-0 user-msg">
@@ -249,11 +221,7 @@
 
                 <li class="dropdown notification-list topbar-dropdown">
                     <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-<<<<<<< HEAD
-                        <img src="./assets/images/users/avatar-1.jpg" alt="user-image" class="rounded-circle">
-=======
                         <img src="<?= base_url()."public/assets/images/users/".$profile_picture; ?>" alt="user-image" class="rounded-circle">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                         <span class="pro-user-name ml-1"><?= $loggedin_person; ?><i class="mdi mdi-chevron-down"></i>
                         </span>
                     </a>
@@ -284,11 +252,7 @@
                         <div class="dropdown-divider"></div>
 
                         <!-- item-->
-<<<<<<< HEAD
-                        <a href="javascript:void(0);" class="dropdown-item notify-item">
-=======
                         <a href="logout" class="dropdown-item notify-item">
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                             <i class="ri-logout-box-line"></i>
                             <span>Logout</span>
                         </a>

app/Views/user.php

@@ -4,137 +4,6 @@
             <div class="card-body">
                 <h4 class="header-title"><?= $page_name; ?></h4>
                 <p class="sub-header"> </p>
-<<<<<<< HEAD
-                <form>
-                    <div class="form-group">
-                        <div class="form-row">
-                            <div class="form-group col-md-6">
-                                <label for="inputName" class="col-form-label">Name<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="inputName" placeholder="Name" required />
-                            </div>
-                            <div class="form-group col-md-6">
-                                <label for="inputEmail" class="col-form-label">Email<span class="text-danger">*</span></label>
-                                <input type="email" class="form-control" id="inputEmail" placeholder="Email" required />
-                            </div>
-                        </div>
-                        <div class="form-row">
-                            <div class="form-group col-md-6">
-                                <label for="inputDOB" class="col-form-label">Date Of Birth<span class="text-danger">*</span></label>
-                                <input type="date" class="form-control" id="inputDOB" placeholder="DD/MM/YYYY" required data-toggle="input-mask" data-mask-format="00/00/0000" />
-                            </div>
-                            <div class="form-group col-md-6">
-                                <label for="inputMobile" class="col-form-label">Mobile Number<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="inputMobile" placeholder="Enter only numbers" required data-parsley-type="number" />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="inputAddress" class="col-form-label">Address<span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="inputAddress" placeholder="1234 Main St" required />
-                        </div>
-                        <div class="form-group">
-                            <label for="inputAddress2" class="col-form-label">Address 2</label>
-                            <input type="text" class="form-control" id="inputAddress2" placeholder="Apartment, studio, or floor" />
-                        </div>
-                        <div class="form-row">
-                            <div class="form-group col-md-6">
-                                <label for="inputCity" class="col-form-label">City<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="inputCity" placeholder="city" required />
-                            </div>
-                            <div class="form-group col-md-4">
-                                <label for="inputState" class="col-form-label">State<span class="text-danger">*</span></label>
-                                <select id="inputState" class="form-control" required />
-                                <option>Choose</option>
-                                <option>Option 1</option>
-                                <option>Option 2</option>
-                                <option>Option 3</option>
-
-                                </select>
-                            </div>
-                            <div class="form-group col-md-2">
-                                <label for="inputZip" class="col-form-label">Zip<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="inputZip" placeholder="Zip" required />
-                            </div>
-                        </div>
-
-                        <div class="form-group text-right m-b-0 checkbox checkbox-purple">
-                            <input type="checkbox" id="inputCheckbox" class="form-control" checked="true">
-                            <label for="inputCheckbox">Is Active</label>
-                        </div>
-                        <br>
-
-
-                        <div class="form-group text-right m-b-0">
-                            <button class="btn btn-primary waves-effect waves-light mr-1" type="submit">
-                                Submit
-                            </button>
-                            <button type="reset" class="btn btn-secondary waves-effect">
-                                Cancel
-                            </button>
-                        </div>
-                </form>
-
-                <!-- <form class="needs-validation" novalidate>
-                                            <div class="form-group mb-3">
-                                                <label for="userName">User Name<span class="text-danger">*</span></label>
-                                                <input type="text" class="form-control" id="validationCustom01" placeholder="First name" required>
-                                                <div class="<?php if ("valid-feedback") {
-                                                                echo "valid-feedback";
-                                                            } ?>" >Looks good!</div>
-                                                <div class="<?php if ("invalid-feedback") {
-                                                                echo "invalid-feedback";
-                                                            } ?>" >Please provide a valid User name.</div>
-                                            </div>
-                                            <div class="form-group mb-3">
-                                                <label for="address">Address<span class="text-danger">*</span></label>
-                                                <div><textarea required class="form-control"></textarea></div>
-                                                <div class="<?php if ("valid-feedback") {
-                                                                echo "valid-feedback";
-                                                            } ?>" >Looks good!</div>
-                                                <div class="<?php if ("invalid-feedback") {
-                                                                echo "invalid-feedback";
-                                                            } ?>" >Please provide a valid Adress.</div>
-                                            </div>
-                                            <div class="form-group mb-1">
-                                                <label for="validationCustom03">City</label>
-                                                <input type="text" class="form-control" id="validationCustom03" placeholder="City" required>
-                                                <div class="<?php if ("valid-feedback") {
-                                                                echo "valid-feedback";
-                                                            } ?>" >Looks good!</div>
-                                                <div class="<?php if ("invalid-feedback") {
-                                                                echo "invalid-feedback";
-                                                            } ?>" >Please provide a valid city.</div>
-                                            </div>
-                                            <div class="form-group mb-1">
-                                                <label for="validationCustom04">State</label>
-                                                <input type="text" class="form-control" id="validationCustom04" placeholder="State" required>
-                                                <div class="<?php if ("valid-feedback") {
-                                                                echo "valid-feedback";
-                                                            } ?>" >Looks good!</div>
-                                                <div class="<?php if ("invalid-feedback") {
-                                                                echo "invalid-feedback";
-                                                            } ?>" >Please provide a valid state.</div>
-                                            </div>
-                                            <div class="form-group mb-1">
-                                                <label for="validationCustom05">Zip</label>
-                                                <input type="text" class="form-control" id="validationCustom05" placeholder="Zip" required>
-                                                <div class="<?php if ("valid-feedback") {
-                                                                echo "valid-feedback";
-                                                            } ?>" >Looks good!</div>
-                                                <div class="<?php if ("invalid-feedback") {
-                                                                echo "invalid-feedback";
-                                                            } ?>" >Please provide a valid Zip.</div>
-                                            </div>
-                                            <div class="form-group mb-3">
-                                            
-                                            </div>
-                                            <div class="form-group mb-3">
-                                                <label>E-Mail</label>
-                                                <input type="email" class="form-control" required parsley-type="email" placeholder="Enter a valid e-mail"/>
-                                            </div>
-                                            <button class="btn btn-primary" type="submit">Submit form</button>
-                                        </form> -->
-
-=======
                 <form action="<?= base_url()."user_synchronization"; ?>" method="post">
                 
                     <div class="form-group">
@@ -228,7 +97,6 @@
                         </div>
                     </div>
                 </form>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
             </div> <!-- end card-body-->
         </div> <!-- end card-->
     </div> <!-- end col-->

app/Views/user_list.php

@@ -2,14 +2,8 @@
     <div class="col-12">
         <div class="card">
             <div class="card-body">
-<<<<<<< HEAD
-
-                <div class="float-right">
-                    <a href="add_user" class="btn btn-primary"><i class="ri-user-add-line"></i> Add New </a>
-=======
                 <div class="float-right">
                     <a href="user_page/0" class="btn btn-primary"><i class="ri-user-add-line"></i> Add New </a>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                 </div><!-- end col-->
                 <br>
                 <h4 class="header-title mb-3"><?= $page_name; ?></h4>
@@ -22,53 +16,15 @@
                         <thead class="thead-light">
                             <tr>
                                 <th>Name</th>
-<<<<<<< HEAD
-                                <th>Address</th>
-                                <th>State</th>
-                                <th>City</th>
-                                <th>Pincode</th>
-=======
                                 <th>Email</th>
                                 <th>Role</th>
                                 <th>Mobile Number</th>
                                 <th>Address</th>
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                                 <th>Status</th>
                                 <th>Action</th>
                             </tr>
                         </thead>
 
-<<<<<<< HEAD
-
-                        <tbody>
-                            <tr>
-                                <td>Tiger Nixon</td>
-                                <td>New-50,Old-09 Sri K.B. Hardwares and paints 1st floor nanganallur,</td>
-                                <td>TamilNadu</td>
-                                <td>Chennai</td>
-                                <td>600061</td>
-                                <td>
-                                    <span class="badge badge-soft-danger">In-Active</span>
-                                </td>
-                                <td>
-                                    <a href="edit_user" class="btn btn-xs btn-secondary"><i class="ri-pencil-line"></i></a>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>Garrett Winters</td>
-                                <td>Door No 1/69 B3 JaiFlats Meenampakkam,</td>
-                                <td>TamilNadu</td>
-                                <td>Chennai</td>
-                                <td>600041</td>
-                                <td>
-                                    <span class="badge badge-soft-success">Active</span>
-                                </td>
-                                <td>
-                                    <a href="edit_user" class="btn btn-xs btn-secondary"><i class="ri-pencil-line"></i></a>
-                                </td>
-                            </tr>
-
-=======
                         
                         <tbody>
                         <?php foreach ($details as $row): 
@@ -95,7 +51,6 @@
                                 </td>
                             </tr>
                         <?php endforeach; ?> 
->>>>>>> 4ea78124915fbe2bb19a0c3355584ce7f2dfc815
                         </tbody>
                     </table>
                 </div>