From 6f27b3b652a0c2ce9ae59002e6e7f949c23742a9 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 9 Jun 2023 23:39:30 +0530
Subject: [PATCH 01/41] Roles interface with add role

---
 .../Controllers/Dashboard/RolesController.php |  68 +++++++
 resources/app/pages/Roles.vue                 | 171 ++++++++++++++++++
 routes/web.php                                |   7 +-
 3 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Controllers/Dashboard/RolesController.php
 create mode 100644 resources/app/pages/Roles.vue

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
new file mode 100644
index 0000000..5e20728
--- /dev/null
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Controllers\Dashboard;
+
+use App\Models\Role;
+use App\Models\Permission;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use App\Http\Controllers\Controller;
+use Inertia\Inertia;
+use Inertia\Response;
+class RolesController extends Controller
+{
+    public function index(): Response
+    {
+         /**
+     * Shows the role page
+     * @return Response
+     */
+
+        return Inertia::render('Roles',
+            [
+                'roles' => []
+            ]
+        );
+    }
+    public function store(Request $request)
+    {
+        // Validate the request input
+        $validator = Validator::make($request->all(), [
+            'name' => 'required|string',
+            'display_name' => 'required|string',
+            'description' => 'required|string',
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json($validator->errors(), 422);
+        }
+
+        // Create a new Role object and save it to the database
+        $role = new Role();
+        $role->name = $request->name;
+        $role->display_name = $request->display_name;
+        $role->description = $request->description;
+        $role->save();
+
+        // Return a success response with the new role object
+        return response()->json($role, 201);
+    }
+    public function getRoles()
+    {
+     // Get all roles from the database
+    //  $roles = Role::all();
+    $roles = Role::with('permissions')->get();
+     // Get the permissions associated with each role
+
+
+     // Embed the permissions into the roles
+
+//    foreach ($roles as $role) {
+//          $role->permissions = $role->permissions;
+//      }
+
+
+     // Return all roles as a JSON response
+     return response()->json($roles);
+    }
+}
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
new file mode 100644
index 0000000..1289391
--- /dev/null
+++ b/resources/app/pages/Roles.vue
@@ -0,0 +1,171 @@
+<template>
+    <div class="flex min-h-screen bg-white py-8 px-4">
+        <div class="w-1/2 mx-auto bg-white rounded shadow-md p-6">
+            <h2 class="text-2xl font-bold mb-4">Add Role</h2>
+            <form @submit.prevent="addRole">
+                <div class="mb-4">
+                    <label class="block font-bold mb-2" for="name">Name</label>
+                    <input
+                        v-model="name"
+                        type="text"
+                        id="name"
+                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                    />
+                </div>
+                <div class="mb-4">
+                    <label class="block font-bold mb-2" for="name"
+                        >Display Name</label
+                    >
+                    <input
+                        v-model="display_name"
+                        type="text"
+                        id="display_name"
+                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                    />
+                </div>
+                <div class="mb-4">
+                    <label class="block font-bold mb-2" for="description"
+                        >Description</label
+                    >
+                    <input
+                        v-model="description"
+                        id="description"
+                        rows="4"
+                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                    />
+                </div>
+                <div class="mb-4">
+                    <label class="block font-bold mb-2" for="permissions"
+                        >Permissions</label
+                    >
+                    <select
+                        v-model="selectedPermissions"
+                        multiple
+                        id="permissions"
+                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                    >
+                        <option
+                            v-for="permission in permissions"
+                            :key="permission.id"
+                            :value="permission.id"
+                        >
+                            {{ permission.name }}
+                        </option>
+                    </select>
+                </div>
+                <button
+                    type="submit"
+                    class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-2 px-4 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
+                >
+                    Add Role
+                </button>
+            </form>
+        </div>
+
+        <div class="w-1/2 mx-auto bg-white rounded shadow-md p-6">
+            <h2 class="text-2xl font-bold mb-4">Existing Roles</h2>
+            <div class="grid grid-cols-2 gap-4">
+                <div
+                    v-for="role in roles"
+                    :key="role.id"
+                    class="bg-white rounded-md p-4 shadow-lg"
+                >
+                    <h3 class="text-lg font-bold">{{ role.display_name }}</h3>
+                    <p class="text-gray-500">@{{ role.name }}</p>
+                    <p class="text-gray-500">{{ role.description }}</p>
+                    <div class="mt-2">
+                        <p class="font-bold">Permissions:</p>
+                        <span
+                            v-for="permission in role.permissions"
+                            :key="permission.id"
+                            class="inline-block bg-orange-100 rounded-full px-3 py-1 mb-2 text-xs font-semibold mr-2"
+                            >{{ permission.name }}</span
+                        >
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import DashboardLayout from "../layouts/DashboardLayout";
+export default {
+    name: "Roles",
+    layout: DashboardLayout,
+
+    data() {
+        return {
+            name: "",
+            display_name: "",
+            description: "",
+            permissions: [
+                { id: 1, name: "Permission 1" },
+                { id: 2, name: "Permission 2" },
+                { id: 3, name: "Permission 3" },
+            ],
+            selectedPermissions: [],
+            roles: [
+                {
+                    id: 1,
+                    name: "Admin",
+                    description: "Can do everything",
+                    permissions: [
+                        "create_posts",
+                        "edit_posts",
+                        "delete_posts",
+                        "create_roles",
+                    ],
+                },
+                {
+                    id: 2,
+                    name: "User",
+                    description: "Can view and create",
+                    permissions: ["create_posts", "view_posts"],
+                },
+            ],
+        };
+    },
+    mounted() {
+        this.getRoles();
+    },
+    methods: {
+        getRoles() {
+            axios.get("/dashboard/allRoles").then((response) => {
+                this.roles = response.data;
+            });
+        },
+        addRole() {
+            axios
+                .post("/dashboard/roles", {
+                    name: this.name,
+                    display_name: this.display_name,
+                    description: this.description,
+                })
+                .then((response) => {
+                    console.log(response);
+                    this.roles.push(response.data);
+                    this.name = "";
+                    this.description = "";
+                    this.permissions = [];
+                })
+                .catch((error) => {
+                    console.log(error);
+                });
+        },
+
+        // deleteRole(id) {
+        //     axios
+        //         .delete(`/roles/${id}`)
+        //         .then((response) => {
+        //             this.roles = this.roles.filter((role) => role.id !== id);
+        //         })
+        //         .catch((error) => {
+        //             console.log(error);
+        //         });
+        // },
+    },
+    created() {
+        this.$on("submit", this.addRole);
+    },
+};
+</script>
diff --git a/routes/web.php b/routes/web.php
index fcb27a9..0486d80 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,7 @@
 use App\Http\Controllers\Auth\ResetPasswordController;
 use App\Http\Controllers\Dashboard\Calendar\CalendarController;
 use App\Http\Controllers\Dashboard\DashboardController;
+use App\Http\Controllers\Dashboard\RolesController;
 use App\Http\Controllers\Dashboard\Facility\FacilityController;
 use App\Http\Controllers\Dashboard\FlowBoardController;
 use App\Http\Controllers\Dashboard\Patient\PatientAppointmentController;
@@ -109,7 +110,9 @@ function () {
 
             // ======== Calendar routes ========
             Route::get('calendar', [CalendarController::class, 'index'])->name('calendar');
-
+            Route::get('/roles', [RolesController::class, 'index']);
+            Route::post('/roles', [RolesController::class, 'store']);
+            Route::get('/allRoles', [RolesController::class, 'getRoles']);
             // ======== Users related routes ========
             Route::resource('users', UserController::class)->names([
                 'index' => 'users.index',
@@ -214,3 +217,5 @@ function () {
         });
     });
 });
+
+

From 6bc448aed5ac324c72a18801255906f54d0c667b Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 16 Jun 2023 21:38:33 +0530
Subject: [PATCH 02/41] =?UTF-8?q?=F0=9F=90=9B=20Minor=20fixes:=20used=20zi?=
 =?UTF-8?q?ggy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Dashboard/RolesController.php | 13 ++------
 app/Http/Requests/CreateRoleRequest.php       | 32 +++++++++++++++++++
 resources/app/pages/Roles.vue                 |  4 +--
 routes/web.php                                |  6 ++--
 4 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 app/Http/Requests/CreateRoleRequest.php

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index 5e20728..0a218a9 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -7,6 +7,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\CreateRoleRequest;
 use Inertia\Inertia;
 use Inertia\Response;
 class RolesController extends Controller
@@ -24,18 +25,8 @@ public function index(): Response
             ]
         );
     }
-    public function store(Request $request)
+    public function store(CreateRoleRequest $request)
     {
-        // Validate the request input
-        $validator = Validator::make($request->all(), [
-            'name' => 'required|string',
-            'display_name' => 'required|string',
-            'description' => 'required|string',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json($validator->errors(), 422);
-        }
 
         // Create a new Role object and save it to the database
         $role = new Role();
diff --git a/app/Http/Requests/CreateRoleRequest.php b/app/Http/Requests/CreateRoleRequest.php
new file mode 100644
index 0000000..f715d8f
--- /dev/null
+++ b/app/Http/Requests/CreateRoleRequest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreateRoleRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|string',
+            'display_name' => 'required|string',
+            'description' => 'required|string',
+        ];
+    }
+}
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
index 1289391..f889d61 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/Roles.vue
@@ -130,13 +130,13 @@ export default {
     },
     methods: {
         getRoles() {
-            axios.get("/dashboard/allRoles").then((response) => {
+            axios.get(this.route("dashboard.roles.all")).then((response) => {
                 this.roles = response.data;
             });
         },
         addRole() {
             axios
-                .post("/dashboard/roles", {
+                .post(this.route("dashboard.roles.store"), {
                     name: this.name,
                     display_name: this.display_name,
                     description: this.description,
diff --git a/routes/web.php b/routes/web.php
index 0486d80..464bfff 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -110,9 +110,9 @@ function () {
 
             // ======== Calendar routes ========
             Route::get('calendar', [CalendarController::class, 'index'])->name('calendar');
-            Route::get('/roles', [RolesController::class, 'index']);
-            Route::post('/roles', [RolesController::class, 'store']);
-            Route::get('/allRoles', [RolesController::class, 'getRoles']);
+            Route::get('/roles', [RolesController::class, 'index'])->name('roles.index');
+            Route::post('/roles', [RolesController::class, 'store'])->name('roles.store');
+            Route::get('/all-roles', [RolesController::class, 'getRoles'])->name('roles.all');
             // ======== Users related routes ========
             Route::resource('users', UserController::class)->names([
                 'index' => 'users.index',

From e4281e456f7f3aff57eabefa58b1128f8bad5d1c Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 16 Jun 2023 23:10:52 +0530
Subject: [PATCH 03/41] Added Laratrust Seeder for Roles

---
 config/laratrust_seeder.php          | 141 +++++++++++++++++++++++++++
 database/seeders/DatabaseSeeder.php  |   3 +
 database/seeders/LaratrustSeeder.php | 103 +++++++++++++++++++
 3 files changed, 247 insertions(+)
 create mode 100644 config/laratrust_seeder.php
 create mode 100644 database/seeders/LaratrustSeeder.php

diff --git a/config/laratrust_seeder.php b/config/laratrust_seeder.php
new file mode 100644
index 0000000..4c8ddba
--- /dev/null
+++ b/config/laratrust_seeder.php
@@ -0,0 +1,141 @@
+<?php
+
+return [
+    /**
+     * Control if the seeder should create a user per role while seeding the data.
+     */
+    'create_users' => false,
+
+    /**
+     * Control if all the laratrust tables should be truncated before running the seeder.
+     */
+    'truncate_tables' => true,
+
+    'roles_structure' => [
+        'superadministrator' => [
+            'calendar' => 'c,r,u,d',
+            'flow-board' => 'c,r,u,d',
+            'patient' => 'c,r,u,d',
+            'fees' => 'c,r,u,d',
+            'inventory' => 'c,r,u,d',
+            'procedures' => 'c,r,u,d',
+            'administration' => 'c,r,u,d',
+            'reports' => 'c,r,u,d',
+            'misc' => 'c,r,u,d',
+            'popups' => 'c,r,u,d',
+            'qa-measures' => 'c,r,u,d',
+            'help' => 'c,r,u,d',
+        ],
+        'administrators' => [
+            'calendar' => 'c,r,u,d',
+            'flow-board' => 'c,r,u,d',
+            'patient' => 'c,r,u,d',
+            'fees' => 'c,r,u,d',
+            'inventory' => 'c,r,u,d',
+            'procedures' => 'c,r,u,d',
+            'administration' => 'c,r',
+            'reports' => 'c,r,u,d',
+            'misc' => 'c,r,u,d',
+            'popups' => 'c,r,u,d',
+            'qa-measures' => 'c,r,u,d',
+            'help' => 'r',
+        ],
+        'lh-user' => [
+            'calendar' => 'r',
+            'patient' => 'r',
+            'fees' => 'r',
+            'inventory' => 'r',
+            'procedures' => 'r',
+            'administration' => 'r',
+            'reports' => 'r',
+            'misc' => 'r',
+            'popups' => 'r',
+            'qa-measures' => 'r',
+            'help' => 'r',
+        ],
+        'accounting' => [
+            'Calendar' => 'r',
+            'patient' => 'r',
+            'fees' => 'c,r,u,d',
+            'inventory' => 'r',
+            'procedures' => 'r',
+            'administration' => 'r,u',
+            'reports' => 'c,r,u,d',
+            'misc' => 'r,u',
+            'popups' => 'r,u',
+            'qa-measures' => 'r,u',
+            'help' => 'r',
+        ],
+        'clinicians' => [
+            'calendar' => 'c,r,u,d',
+            'patient' => 'c,r,u,d',
+            'fees' => 'c,r,u,d',
+            'inventory' => 'r,u',
+            'procedures' => 'r,u',
+            'administration' => 'r,u',
+            'reports' => 'r,u',
+            'misc' => 'r,u',
+            'popups' => 'r,u',
+            'qa-measures' => 'r,u',
+            'help' => 'r',
+        ],
+        'emergency_login' => [
+            'calendar' => 'r',
+            'patient' => 'c,r,u,d',
+            'fees' => 'r',
+            'inventory' => 'r',
+            'procedures' => 'r',
+            'administration' => 'r',
+            'reports' => 'r',
+            'misc' => 'r',
+            'popups' => 'r',
+            'qa-measures' => 'r',
+            'help' => 'r',
+        ],
+        'front_office' => [
+            'calendar' => 'r,u',
+            'patient' => 'r,u',
+            'fees' => 'r,u',
+            'inventory' => 'r',
+            'procedures' => 'r',
+            'administration' => 'r',
+            'reports' => 'r',
+            'misc' => 'r',
+            'popups' => 'r',
+            'qa-measures' => 'r',
+            'help' => 'r',
+        ],
+        'physicians' => [
+            'calendar' => 'c,r,u,d',
+            'patient' => 'c,r,u,d',
+            'fees' => 'r,u',
+            'inventory' => 'r',
+            'procedures' => 'c,r,u,d',
+            'administration' => 'c,r',
+            'reports' => 'c,r,u,d',
+            'misc' => 'c,r,u,d',
+            'popups' => 'c,r,u,d',
+            'qa-measures' => 'c,r,u,d',
+            'help' => 'r',
+        ],
+        'super_student' => [
+            'calendar' => 'r,u',
+            'patient' => 'r,u',
+            'fees' => 'r',
+            'inventory' => 'r',
+            'procedures' => 'r,u',
+            'administration' => 'r,u',
+            'reports' => 'r,u',
+            'misc' => 'r,u',
+            'popups' => 'r,u',
+            'qa-measures' => 'r,u',
+            'help' => 'r',
+        ],
+    ],
+    'permissions_map' => [
+        'c' => 'create',
+        'r' => 'read',
+        'u' => 'update',
+        'd' => 'delete'
+    ]
+    ];
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 9536bd2..60e407b 100755
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -42,6 +42,7 @@ public function truncateAndSeedData()
             DB::table($name)->truncate();
         }
         Schema::enableForeignKeyConstraints();
+
         $this->seedData();
         $this->complete();
     }
@@ -58,8 +59,10 @@ public function seedData()
         if (count($continents) < 1) {
             Artisan::call('world:init');
         }
+
         $this->call(CurrencySeeder::class);
         $this->call(UserTableSeeder::class);
+        $this->call(LaratrustSeeder::class);
         $this->call(AddressTableSeeder::class);
         $this->call(ContactTableSeeder::class);
         $this->call(FacilityTableSeeder::class);
diff --git a/database/seeders/LaratrustSeeder.php b/database/seeders/LaratrustSeeder.php
new file mode 100644
index 0000000..a85ffd4
--- /dev/null
+++ b/database/seeders/LaratrustSeeder.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Config;
+
+class LaratrustSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->truncateLaratrustTables();
+
+        $config = Config::get('laratrust_seeder.roles_structure');
+
+        if ($config === null) {
+            $this->command->error("The configuration has not been published. Did you run `php artisan vendor:publish --tag=\"laratrust-seeder\"`");
+            $this->command->line('');
+            return false;
+        }
+
+        $mapPermission = collect(config('laratrust_seeder.permissions_map'));
+
+        foreach ($config as $key => $modules) {
+
+            // Create a new role
+            $role = \App\Models\Role::firstOrCreate([
+                'name' => $key,
+                'display_name' => ucwords(str_replace('_', ' ', $key)),
+                'description' => ucwords(str_replace('_', ' ', $key))
+            ]);
+            $permissions = [];
+
+            $this->command->info('Creating Role '. strtoupper($key));
+
+            // Reading role permission modules
+            foreach ($modules as $module => $value) {
+
+                foreach (explode(',', $value) as $p => $perm) {
+
+                    $permissionValue = $mapPermission->get($perm);
+
+                    $permissions[] = \App\Models\Permission::firstOrCreate([
+                        'name' => $module . '-' . $permissionValue,
+                        'display_name' => ucfirst($permissionValue) . ' ' . ucfirst($module),
+                        'description' => ucfirst($permissionValue) . ' ' . ucfirst($module),
+                    ])->id;
+
+                    $this->command->info('Creating Permission to '.$permissionValue.' for '. $module);
+                }
+            }
+
+            // Attach all permissions to the role
+            $role->permissions()->sync($permissions);
+
+            if (Config::get('laratrust_seeder.create_users')) {
+                $this->command->info("Creating '{$key}' user");
+                // Create default user for each role
+                $user = \App\Models\User::create([
+                    'name' => ucwords(str_replace('_', ' ', $key)),
+                    'email' => $key.'@app.com',
+                    'password' => bcrypt('password')
+                ]);
+                $user->attachRole($role);
+            }
+
+        }
+    }
+
+    /**
+     * Truncates all the laratrust tables and the users table
+     *
+     * @return  void
+     */
+    public function truncateLaratrustTables()
+    {
+        $this->command->info('Truncating User, Role and Permission tables');
+        Schema::disableForeignKeyConstraints();
+
+        DB::table('permission_role')->truncate();
+        DB::table('permission_user')->truncate();
+        DB::table('role_user')->truncate();
+
+        if (Config::get('laratrust_seeder.truncate_tables')) {
+            DB::table('roles')->truncate();
+            DB::table('permissions')->truncate();
+            
+            if (Config::get('laratrust_seeder.create_users')) {
+                $usersTable = (new \App\Models\User)->getTable();
+                DB::table($usersTable)->truncate();
+            }
+        }
+
+        Schema::enableForeignKeyConstraints();
+    }
+}

From a819002c70ccb44f82d8f16f9317004444a8918f Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Tue, 20 Jun 2023 23:01:30 +0530
Subject: [PATCH 04/41] Minor updates

---
 .../Controllers/Dashboard/RolesController.php    | 16 +---------------
 config/laratrust_seeder.php                      |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index 0a218a9..cca11cf 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -28,32 +28,18 @@ public function index(): Response
     public function store(CreateRoleRequest $request)
     {
 
-        // Create a new Role object and save it to the database
         $role = new Role();
         $role->name = $request->name;
         $role->display_name = $request->display_name;
         $role->description = $request->description;
         $role->save();
-
-        // Return a success response with the new role object
         return response()->json($role, 201);
     }
     public function getRoles()
     {
-     // Get all roles from the database
-    //  $roles = Role::all();
-    $roles = Role::with('permissions')->get();
-     // Get the permissions associated with each role
-
-
-     // Embed the permissions into the roles
-
-//    foreach ($roles as $role) {
-//          $role->permissions = $role->permissions;
-//      }
 
+    $roles = Role::with('permissions')->get();
 
-     // Return all roles as a JSON response
      return response()->json($roles);
     }
 }
diff --git a/config/laratrust_seeder.php b/config/laratrust_seeder.php
index 4c8ddba..958ef18 100644
--- a/config/laratrust_seeder.php
+++ b/config/laratrust_seeder.php
@@ -40,7 +40,7 @@
             'qa-measures' => 'c,r,u,d',
             'help' => 'r',
         ],
-        'lh-user' => [
+        'users' => [
             'calendar' => 'r',
             'patient' => 'r',
             'fees' => 'r',

From 51ec886798e8cc9bdf617456131e8544d9096573 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sun, 25 Jun 2023 00:51:12 +0530
Subject: [PATCH 05/41] Role UI update and Permission Data fetched in form

---
 .../Dashboard/PermissionController.php        |  19 +++
 resources/app/pages/Roles.vue                 | 141 +++++++++++-------
 routes/web.php                                |   3 +
 3 files changed, 107 insertions(+), 56 deletions(-)
 create mode 100644 app/Http/Controllers/Dashboard/PermissionController.php

diff --git a/app/Http/Controllers/Dashboard/PermissionController.php b/app/Http/Controllers/Dashboard/PermissionController.php
new file mode 100644
index 0000000..34450ef
--- /dev/null
+++ b/app/Http/Controllers/Dashboard/PermissionController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Dashboard;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Models\Permission;
+
+class PermissionController extends Controller
+{
+    //
+    public function getPermissions()
+    {
+
+    $permissions = Permission::all();
+
+     return response()->json($permissions);
+    }
+}
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
index f889d61..cb346a4 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/Roles.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="flex min-h-screen bg-white py-8 px-4">
-        <div class="w-1/2 mx-auto bg-white rounded shadow-md p-6">
+        <div class="w-1/3 mx-auto bg-white rounded shadow-md p-6">
             <h2 class="text-2xl font-bold mb-4">Add Role</h2>
             <form @submit.prevent="addRole">
                 <div class="mb-4">
@@ -34,24 +34,41 @@
                         class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
                     />
                 </div>
+
                 <div class="mb-4">
                     <label class="block font-bold mb-2" for="permissions"
                         >Permissions</label
                     >
-                    <select
-                        v-model="selectedPermissions"
-                        multiple
-                        id="permissions"
-                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
-                    >
-                        <option
-                            v-for="permission in permissions"
-                            :key="permission.id"
-                            :value="permission.id"
+                    <div class="relative">
+                        <button
+                            id="permissions-dropdown"
+                            class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                            type="button"
+                            @click="togglePermissionList()"
                         >
-                            {{ permission.name }}
-                        </option>
-                    </select>
+                            {{
+                                selectedPermissions[0]
+                                    ? selectedPermissions[0].display_name
+                                    : "Permissions"
+                            }}
+                        </button>
+
+                        <ul
+                            v-if="permission_dropdown === true"
+                            class="absolute mt-2 py-2 bg-white rounded-md shadow-lg z-10"
+                        >
+                            <li
+                                v-for="permission in permissions"
+                                :key="permission.id"
+                                @click="selectPermission(permission)"
+                                class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                            >
+                                {{ permission.display_name }} @{{
+                                    permission.name
+                                }}
+                            </li>
+                        </ul>
+                    </div>
                 </div>
                 <button
                     type="submit"
@@ -62,7 +79,7 @@
             </form>
         </div>
 
-        <div class="w-1/2 mx-auto bg-white rounded shadow-md p-6">
+        <div class="w-2/3 mx-auto bg-white rounded shadow-md p-6">
             <h2 class="text-2xl font-bold mb-4">Existing Roles</h2>
             <div class="grid grid-cols-2 gap-4">
                 <div
@@ -74,13 +91,40 @@
                     <p class="text-gray-500">@{{ role.name }}</p>
                     <p class="text-gray-500">{{ role.description }}</p>
                     <div class="mt-2">
-                        <p class="font-bold">Permissions:</p>
-                        <span
-                            v-for="permission in role.permissions"
-                            :key="permission.id"
-                            class="inline-block bg-orange-100 rounded-full px-3 py-1 mb-2 text-xs font-semibold mr-2"
-                            >{{ permission.name }}</span
-                        >
+                        <div class="relative inline-block">
+                            <button
+                                @click="toggleDropdown(role.id)"
+                                class="inline-block px-1 py-1 mb-2 font-bold text-orange-400 mr-2"
+                            >
+                                <span class="mr-1"
+                                    >{{
+                                        role.permissions.length
+                                    }}
+                                    Permissions</span
+                                >
+                                <span
+                                    :class="{
+                                        'transform rotate-180':
+                                            openDropdown === role.id,
+                                    }"
+                                    class="inline-block transition-transform duration-300"
+                                >
+                                    &#9662;
+                                </span>
+                            </button>
+                            <ul
+                                v-if="openDropdown === role.id"
+                                class="absolute right-0 mt-2 py-2 bg-white rounded-md shadow-lg z-10"
+                            >
+                                <li
+                                    v-for="permission in role.permissions"
+                                    :key="permission.id"
+                                    class="px-4 py-2 hover:bg-gray-100 cursor-pointer"
+                                >
+                                    {{ permission.name }}
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -95,38 +139,19 @@ export default {
 
     data() {
         return {
+            openDropdown: null,
+            permission_dropdown: null,
             name: "",
             display_name: "",
             description: "",
-            permissions: [
-                { id: 1, name: "Permission 1" },
-                { id: 2, name: "Permission 2" },
-                { id: 3, name: "Permission 3" },
-            ],
+            permissions: [],
             selectedPermissions: [],
-            roles: [
-                {
-                    id: 1,
-                    name: "Admin",
-                    description: "Can do everything",
-                    permissions: [
-                        "create_posts",
-                        "edit_posts",
-                        "delete_posts",
-                        "create_roles",
-                    ],
-                },
-                {
-                    id: 2,
-                    name: "User",
-                    description: "Can view and create",
-                    permissions: ["create_posts", "view_posts"],
-                },
-            ],
+            roles: [],
         };
     },
     mounted() {
         this.getRoles();
+        this.getPermissions();
     },
     methods: {
         getRoles() {
@@ -134,6 +159,13 @@ export default {
                 this.roles = response.data;
             });
         },
+        getPermissions() {
+            axios
+                .get(this.route("dashboard.permissions.all"))
+                .then((response) => {
+                    this.permissions = response.data;
+                });
+        },
         addRole() {
             axios
                 .post(this.route("dashboard.roles.store"), {
@@ -153,17 +185,14 @@ export default {
                 });
         },
 
-        // deleteRole(id) {
-        //     axios
-        //         .delete(`/roles/${id}`)
-        //         .then((response) => {
-        //             this.roles = this.roles.filter((role) => role.id !== id);
-        //         })
-        //         .catch((error) => {
-        //             console.log(error);
-        //         });
-        // },
+        toggleDropdown(roleId) {
+            this.openDropdown = this.openDropdown === roleId ? null : roleId;
+        },
+        togglePermissionList() {
+            this.permission_dropdown = !this.permission_dropdown;
+        },
     },
+
     created() {
         this.$on("submit", this.addRole);
     },
diff --git a/routes/web.php b/routes/web.php
index 464bfff..e965bd3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,6 +12,7 @@
 use App\Http\Controllers\Dashboard\Patient\PatientAppointmentController;
 use App\Http\Controllers\Dashboard\Patient\PatientController;
 use App\Http\Controllers\Dashboard\Patient\PatientHistoryController;
+use App\Http\Controllers\Dashboard\PermissionController;
 use App\Http\Controllers\Dashboard\User\UserController;
 use App\Http\Controllers\Installer\InstallerController;
 use App\Http\Controllers\Installer\InstallerDatabaseController;
@@ -113,6 +114,8 @@ function () {
             Route::get('/roles', [RolesController::class, 'index'])->name('roles.index');
             Route::post('/roles', [RolesController::class, 'store'])->name('roles.store');
             Route::get('/all-roles', [RolesController::class, 'getRoles'])->name('roles.all');
+            Route::get('/all-permissions', [PermissionController::class, 'getPermissions'])->name('permissions.all');
+
             // ======== Users related routes ========
             Route::resource('users', UserController::class)->names([
                 'index' => 'users.index',

From f2c8e850a7ea02c572a856a7db553e1e61f50645 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sun, 25 Jun 2023 17:56:00 +0530
Subject: [PATCH 06/41] Seeder Temporary bug fix & Scrollable Dropdown UI

---
 database/seeders/LaratrustSeeder.php |  4 +--
 resources/app/pages/Roles.vue        | 38 ++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/database/seeders/LaratrustSeeder.php b/database/seeders/LaratrustSeeder.php
index a85ffd4..1d4f5dc 100644
--- a/database/seeders/LaratrustSeeder.php
+++ b/database/seeders/LaratrustSeeder.php
@@ -16,7 +16,7 @@ class LaratrustSeeder extends Seeder
      */
     public function run()
     {
-        $this->truncateLaratrustTables();
+        // $this->truncateLaratrustTables();
 
         $config = Config::get('laratrust_seeder.roles_structure');
 
@@ -91,7 +91,7 @@ public function truncateLaratrustTables()
         if (Config::get('laratrust_seeder.truncate_tables')) {
             DB::table('roles')->truncate();
             DB::table('permissions')->truncate();
-            
+
             if (Config::get('laratrust_seeder.create_users')) {
                 $usersTable = (new \App\Models\User)->getTable();
                 DB::table($usersTable)->truncate();
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
index cb346a4..666819d 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/Roles.vue
@@ -40,6 +40,19 @@
                         >Permissions</label
                     >
                     <div class="relative">
+                        <div
+                            v-if="selectedPermissions.length > 0"
+                            class="flex flex-wrap items-center mb-2"
+                        >
+                            <span
+                                v-for="permission in selectedPermissions"
+                                :key="permission.id"
+                                class="bg-orange-500 text-white rounded-full px-2 py-1 mr-2 mb-2"
+                            >
+                                {{ permission.display_name }}
+                            </span>
+                        </div>
+
                         <button
                             id="permissions-dropdown"
                             class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
@@ -49,13 +62,22 @@
                             {{
                                 selectedPermissions[0]
                                     ? selectedPermissions[0].display_name
-                                    : "Permissions"
+                                    : "Select Permissions"
                             }}
+                            <span
+                                :class="{
+                                    'transform rotate-180':
+                                        permission_dropdown === true,
+                                }"
+                                class="inline-block transition-transform duration-300"
+                            >
+                                &#9662;
+                            </span>
                         </button>
 
                         <ul
                             v-if="permission_dropdown === true"
-                            class="absolute mt-2 py-2 bg-white rounded-md shadow-lg z-10"
+                            class="absolute mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto"
                         >
                             <li
                                 v-for="permission in permissions"
@@ -79,7 +101,9 @@
             </form>
         </div>
 
-        <div class="w-2/3 mx-auto bg-white rounded shadow-md p-6">
+        <div
+            class="w-2/3 mx-auto bg-white rounded shadow-md p-6 pb-60 overflow-auto"
+        >
             <h2 class="text-2xl font-bold mb-4">Existing Roles</h2>
             <div class="grid grid-cols-2 gap-4">
                 <div
@@ -114,7 +138,7 @@
                             </button>
                             <ul
                                 v-if="openDropdown === role.id"
-                                class="absolute right-0 mt-2 py-2 bg-white rounded-md shadow-lg z-10"
+                                class="absolute right-0 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-56 overflow-y-scroll"
                             >
                                 <li
                                     v-for="permission in role.permissions"
@@ -184,7 +208,11 @@ export default {
                     console.log(error);
                 });
         },
-
+        selectPermission(permission) {
+            if (!this.selectedPermissions.includes(permission)) {
+                this.selectedPermissions.push(permission);
+            }
+        },
         toggleDropdown(roleId) {
             this.openDropdown = this.openDropdown === roleId ? null : roleId;
         },

From 4fb9808d83efef2f5773a01bc563d224a144a81d Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Tue, 27 Jun 2023 20:18:13 +0530
Subject: [PATCH 07/41] =?UTF-8?q?=F0=9F=90=9B=20Seeder=20updated=20&=20Bug?=
 =?UTF-8?q?=20solved?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/laratrust_seeder.php          |  4 +-
 database/seeders/DatabaseSeeder.php  |  2 +-
 database/seeders/UserTableSeeder.php | 56 ++++++++--------------------
 3 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/config/laratrust_seeder.php b/config/laratrust_seeder.php
index 958ef18..645d71c 100644
--- a/config/laratrust_seeder.php
+++ b/config/laratrust_seeder.php
@@ -12,7 +12,7 @@
     'truncate_tables' => true,
 
     'roles_structure' => [
-        'superadministrator' => [
+        'super_admin' => [
             'calendar' => 'c,r,u,d',
             'flow-board' => 'c,r,u,d',
             'patient' => 'c,r,u,d',
@@ -26,7 +26,7 @@
             'qa-measures' => 'c,r,u,d',
             'help' => 'c,r,u,d',
         ],
-        'administrators' => [
+        'admin' => [
             'calendar' => 'c,r,u,d',
             'flow-board' => 'c,r,u,d',
             'patient' => 'c,r,u,d',
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 60e407b..4e11240 100755
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -61,8 +61,8 @@ public function seedData()
         }
 
         $this->call(CurrencySeeder::class);
-        $this->call(UserTableSeeder::class);
         $this->call(LaratrustSeeder::class);
+        $this->call(UserTableSeeder::class);
         $this->call(AddressTableSeeder::class);
         $this->call(ContactTableSeeder::class);
         $this->call(FacilityTableSeeder::class);
diff --git a/database/seeders/UserTableSeeder.php b/database/seeders/UserTableSeeder.php
index a5392c2..82ac34c 100644
--- a/database/seeders/UserTableSeeder.php
+++ b/database/seeders/UserTableSeeder.php
@@ -22,38 +22,8 @@ public function run()
     {
         if (!User::count()) {
             $this->command->info('Truncating User, Role and Permission tables');
-            $this->truncateLaratrustTables();
+            $this->truncateUserTables();
 
-            // ===================
-            // CREATING ROLES
-            // ===================
-            $superAdminRole = new Role();
-            $superAdminRole->name = "super_admin";
-            $superAdminRole->display_name = "Super Administrator";
-            $superAdminRole->description  = 'User is the super admin of the system';
-            $superAdminRole->save();
-
-            $adminRole = new Role();
-            $adminRole->name = "admin";
-            $adminRole->display_name = "Administrator";
-            $adminRole->description  = 'User is the admin. They own/manage, but fewer privileges than super admins.';
-            $adminRole->save();
-
-
-            $userRole = new Role();
-            $userRole->name = "user";
-            $userRole->display_name = "User";
-            $userRole->description  = 'Regular/Default User of the system can be a front desk personnel';
-            $userRole->save();
-
-            // =======================
-            // CREATING PERMISSIONS
-            // =======================
-            $manageUsers = new Permission();
-            $manageUsers->name         = 'manage-users';
-            $manageUsers->display_name = 'Manage Loans';
-            $manageUsers->description  = 'Manage all users of the system';
-            $manageUsers->save();
 
             $faker = \Faker\Factory::create();
             $faker_tax1 = $faker->unique()->bothify('#####-????');
@@ -78,9 +48,14 @@ public function run()
                 'access_control' => 'Administrators',
                 'in_calendar' => 0,
             ]);
+            $role = Role::where('name', '=', 'super_admin')->first();
+            $permissions=$role->permissions;
+            $user->attachRole($role);
+            foreach ($permissions as $permission) {
+                $user->attachPermission($permission);
+            }
             $user->save();
-            $user->attachRole($superAdminRole);
-            $superAdminRole->attachPermissions([$manageUsers]);
+
 
             // Admin user (default user to login with)
             $user = User::create([
@@ -101,9 +76,13 @@ public function run()
                 'access_control' => 'Administrators',
                 'in_calendar' => 1,
             ]);
+            $role = Role::where('name', '=', 'admin')->first();
+            $permissions=$role->permissions;
+            $user->attachRole($role);
+            foreach ($permissions as $permission) {
+                $user->attachPermission($permission);
+            }
             $user->save();
-            $user->attachRole($adminRole);
-            $adminRole->attachPermissions([$manageUsers]);
 
         }
 
@@ -118,15 +97,10 @@ public function run()
      *
      * @return void
      */
-    public function truncateLaratrustTables()
+    public function truncateUserTables()
     {
         Schema::disableForeignKeyConstraints();
-        DB::table('permission_role')->truncate();
-        DB::table('permission_user')->truncate();
-        DB::table('role_user')->truncate();
         User::truncate();
-        Role::truncate();
-        Permission::truncate();
         Schema::enableForeignKeyConstraints();
     }
 }

From 1e7fcb489395c1a3b7ba1ac73717be9226e20bb5 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 1 Jul 2023 18:23:56 +0530
Subject: [PATCH 08/41] Seeder updated with sub modules

---
 config/laratrust_seeder.php | 47 +++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/config/laratrust_seeder.php b/config/laratrust_seeder.php
index 645d71c..7895236 100644
--- a/config/laratrust_seeder.php
+++ b/config/laratrust_seeder.php
@@ -16,10 +16,12 @@
             'calendar' => 'c,r,u,d',
             'flow-board' => 'c,r,u,d',
             'patient' => 'c,r,u,d',
-            'fees' => 'c,r,u,d',
+            'payments' => 'c,r,u,d',
             'inventory' => 'c,r,u,d',
             'procedures' => 'c,r,u,d',
-            'administration' => 'c,r,u,d',
+            'users' => 'c,r,u,d',
+            'facilities' => 'c,r,u,d',
+            'roles' => 'c,r,u,d',
             'reports' => 'c,r,u,d',
             'misc' => 'c,r,u,d',
             'popups' => 'c,r,u,d',
@@ -30,10 +32,12 @@
             'calendar' => 'c,r,u,d',
             'flow-board' => 'c,r,u,d',
             'patient' => 'c,r,u,d',
-            'fees' => 'c,r,u,d',
+            'payments' => 'c,r,u,d',
             'inventory' => 'c,r,u,d',
             'procedures' => 'c,r,u,d',
-            'administration' => 'c,r',
+            'users' => 'c,r',
+            'facilities' => 'c,r',
+            'roles' => 'c,r',
             'reports' => 'c,r,u,d',
             'misc' => 'c,r,u,d',
             'popups' => 'c,r,u,d',
@@ -43,10 +47,11 @@
         'users' => [
             'calendar' => 'r',
             'patient' => 'r',
-            'fees' => 'r',
+            'payments' => 'r',
             'inventory' => 'r',
             'procedures' => 'r',
-            'administration' => 'r',
+            'users' => 'r',
+            'facilities' => 'r',
             'reports' => 'r',
             'misc' => 'r',
             'popups' => 'r',
@@ -56,10 +61,11 @@
         'accounting' => [
             'Calendar' => 'r',
             'patient' => 'r',
-            'fees' => 'c,r,u,d',
+            'payments' => 'c,r,u,d',
             'inventory' => 'r',
             'procedures' => 'r',
-            'administration' => 'r,u',
+            'users' => 'r,u',
+            'facilities' => 'r,u',
             'reports' => 'c,r,u,d',
             'misc' => 'r,u',
             'popups' => 'r,u',
@@ -69,10 +75,11 @@
         'clinicians' => [
             'calendar' => 'c,r,u,d',
             'patient' => 'c,r,u,d',
-            'fees' => 'c,r,u,d',
+            'payments' => 'c,r,u,d',
             'inventory' => 'r,u',
             'procedures' => 'r,u',
-            'administration' => 'r,u',
+            'users' => 'r,u',
+            'facilities' => 'r,u',
             'reports' => 'r,u',
             'misc' => 'r,u',
             'popups' => 'r,u',
@@ -82,10 +89,11 @@
         'emergency_login' => [
             'calendar' => 'r',
             'patient' => 'c,r,u,d',
-            'fees' => 'r',
+            'payments' => 'r',
             'inventory' => 'r',
             'procedures' => 'r',
-            'administration' => 'r',
+            'users' => 'r',
+            'facilities' => 'r',
             'reports' => 'r',
             'misc' => 'r',
             'popups' => 'r',
@@ -95,10 +103,11 @@
         'front_office' => [
             'calendar' => 'r,u',
             'patient' => 'r,u',
-            'fees' => 'r,u',
+            'payments' => 'r,u',
             'inventory' => 'r',
             'procedures' => 'r',
-            'administration' => 'r',
+            'users' => 'r',
+            'facilities' => 'r',
             'reports' => 'r',
             'misc' => 'r',
             'popups' => 'r',
@@ -108,10 +117,11 @@
         'physicians' => [
             'calendar' => 'c,r,u,d',
             'patient' => 'c,r,u,d',
-            'fees' => 'r,u',
+            'payments' => 'r,u',
             'inventory' => 'r',
             'procedures' => 'c,r,u,d',
-            'administration' => 'c,r',
+            'users' => 'r',
+            'facilities' => 'r',
             'reports' => 'c,r,u,d',
             'misc' => 'c,r,u,d',
             'popups' => 'c,r,u,d',
@@ -121,10 +131,11 @@
         'super_student' => [
             'calendar' => 'r,u',
             'patient' => 'r,u',
-            'fees' => 'r',
+            'payments' => 'r',
             'inventory' => 'r',
             'procedures' => 'r,u',
-            'administration' => 'r,u',
+            'users' => 'r',
+            'facilities' => 'r',
             'reports' => 'r,u',
             'misc' => 'r,u',
             'popups' => 'r,u',

From 499cc6e6b6296df816387a4b87939e5d53f1ae20 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 1 Jul 2023 19:23:25 +0530
Subject: [PATCH 09/41] Customized Role Creation

---
 .../Controllers/Dashboard/RolesController.php |  4 ++
 app/Http/Requests/CreateRoleRequest.php       |  1 +
 resources/app/pages/Roles.vue                 | 59 ++++++++++---------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index cca11cf..c641cdb 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -33,6 +33,10 @@ public function store(CreateRoleRequest $request)
         $role->display_name = $request->display_name;
         $role->description = $request->description;
         $role->save();
+        foreach ($request->permissions as $permission) {
+            $role->permissions()->attach([$permission['id']]);
+        }
+        $role->save();
         return response()->json($role, 201);
     }
     public function getRoles()
diff --git a/app/Http/Requests/CreateRoleRequest.php b/app/Http/Requests/CreateRoleRequest.php
index f715d8f..58b93c5 100644
--- a/app/Http/Requests/CreateRoleRequest.php
+++ b/app/Http/Requests/CreateRoleRequest.php
@@ -27,6 +27,7 @@ public function rules()
             'name' => 'required|string',
             'display_name' => 'required|string',
             'description' => 'required|string',
+            'permissions' => 'required|array',
         ];
     }
 }
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
index 666819d..d572c64 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/Roles.vue
@@ -4,34 +4,30 @@
             <h2 class="text-2xl font-bold mb-4">Add Role</h2>
             <form @submit.prevent="addRole">
                 <div class="mb-4">
-                    <label class="block font-bold mb-2" for="name">Name</label>
-                    <input
-                        v-model="name"
-                        type="text"
-                        id="name"
-                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                    <ehr-input
+                        v-model="roleForm.name"
+                        :error="errors.name"
+                        :label="'Role Name'"
+                        :placeholder="'Enter Role Name'"
+                        required
                     />
                 </div>
                 <div class="mb-4">
-                    <label class="block font-bold mb-2" for="name"
-                        >Display Name</label
-                    >
-                    <input
-                        v-model="display_name"
-                        type="text"
-                        id="display_name"
-                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                    <ehr-input
+                        v-model="roleForm.display_name"
+                        :error="errors.display_name"
+                        :label="'Display Name'"
+                        :placeholder="'Enter Role Display Name'"
+                        required
                     />
                 </div>
                 <div class="mb-4">
-                    <label class="block font-bold mb-2" for="description"
-                        >Description</label
-                    >
-                    <input
-                        v-model="description"
-                        id="description"
-                        rows="4"
-                        class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                    <ehr-input
+                        v-model="roleForm.description"
+                        :error="errors.description"
+                        :label="'Role Description'"
+                        :placeholder="'Enter Role Description'"
+                        required
                     />
                 </div>
 
@@ -55,7 +51,7 @@
 
                         <button
                             id="permissions-dropdown"
-                            class="w-full px-4 py-2 rounded ring-2 ring-orange-500 focus:ring-orange-500"
+                            class="w-full px-4 py-2 rounded ring-2"
                             type="button"
                             @click="togglePermissionList()"
                         >
@@ -160,7 +156,9 @@ import DashboardLayout from "../layouts/DashboardLayout";
 export default {
     name: "Roles",
     layout: DashboardLayout,
-
+    props: {
+        errors: Object,
+    },
     data() {
         return {
             openDropdown: null,
@@ -170,7 +168,13 @@ export default {
             description: "",
             permissions: [],
             selectedPermissions: [],
+
             roles: [],
+            roleForm: this.$inertia.form({
+                name: null,
+                display_name: null,
+                description: null,
+            }),
         };
     },
     mounted() {
@@ -193,9 +197,10 @@ export default {
         addRole() {
             axios
                 .post(this.route("dashboard.roles.store"), {
-                    name: this.name,
-                    display_name: this.display_name,
-                    description: this.description,
+                    name: this.roleForm.name,
+                    display_name: this.roleForm.display_name,
+                    description: this.roleForm.description,
+                    permissions: this.selectedPermissions,
                 })
                 .then((response) => {
                     console.log(response);

From 66d9cf3ba176fb4e308b5f010929c77d421c052e Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 1 Jul 2023 21:00:49 +0530
Subject: [PATCH 10/41] Users in Roles UI

---
 .../Controllers/Dashboard/RolesController.php |  16 ++-
 resources/app/assets/sass/_global.scss        |  22 +++-
 resources/app/pages/Roles.vue                 | 109 +++++++++++-------
 3 files changed, 98 insertions(+), 49 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index c641cdb..20d7244 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -41,9 +41,21 @@ public function store(CreateRoleRequest $request)
     }
     public function getRoles()
     {
-
+    $result=[];
     $roles = Role::with('permissions')->get();
+    foreach ($roles as $role) {
+        $users = $role->users()->get();
+        $temp = [
+            'id' => $role->id,
+            'name' => $role->name,
+            'display_name' => $role->display_name,
+            'description' => $role->description,
+            'permissions' => $role->permissions,
+            'users' => $users,
+        ];
+        array_push($result, $temp);
+    }
 
-     return response()->json($roles);
+     return response()->json($result, 200);
     }
 }
diff --git a/resources/app/assets/sass/_global.scss b/resources/app/assets/sass/_global.scss
index f259f8f..b714281 100644
--- a/resources/app/assets/sass/_global.scss
+++ b/resources/app/assets/sass/_global.scss
@@ -3,7 +3,9 @@ html {
         @apply bg-dark-1 text-gray-100;
         body {
             @apply text-white;
-            *, ::before, ::after {
+            *,
+            ::before,
+            ::after {
                 @apply border-transparent;
             }
         }
@@ -39,8 +41,22 @@ html {
 .box {
     box-shadow: 0 3px 20px rgb(0 0 0 / 4%);
     position: relative;
-    border-radius: .375rem;
+    border-radius: 0.375rem;
     border-color: transparent;
-    background-color: rgba(255,255,255, var(--tw-bg-opacity));
+    background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
 }
 
+@layer utilities {
+    @variants responsive {
+        /* Hide scrollbar for Chrome, Safari and Opera */
+        .no-scrollbar::-webkit-scrollbar {
+            display: none;
+        }
+
+        /* Hide scrollbar for IE, Edge and Firefox */
+        .no-scrollbar {
+            -ms-overflow-style: none; /* IE and Edge */
+            scrollbar-width: none; /* Firefox */
+        }
+    }
+}
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
index d572c64..8129e35 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/Roles.vue
@@ -55,11 +55,8 @@
                             type="button"
                             @click="togglePermissionList()"
                         >
-                            {{
-                                selectedPermissions[0]
-                                    ? selectedPermissions[0].display_name
-                                    : "Select Permissions"
-                            }}
+                            Select Permissions
+
                             <span
                                 :class="{
                                     'transform rotate-180':
@@ -73,7 +70,7 @@
 
                         <ul
                             v-if="permission_dropdown === true"
-                            class="absolute mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto"
+                            class="absolute mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
                         >
                             <li
                                 v-for="permission in permissions"
@@ -98,54 +95,75 @@
         </div>
 
         <div
-            class="w-2/3 mx-auto bg-white rounded shadow-md p-6 pb-60 overflow-auto"
+            class="w-2/3 mx-auto bg-white rounded shadow-md p-6 pb-60 overflow-auto no-scrollbar"
         >
             <h2 class="text-2xl font-bold mb-4">Existing Roles</h2>
             <div class="grid grid-cols-2 gap-4">
                 <div
                     v-for="role in roles"
                     :key="role.id"
-                    class="bg-white rounded-md p-4 shadow-lg"
+                    class="bg-white rounded-md p-4 shadow-lg grid grid-cols-2 gap-4"
                 >
-                    <h3 class="text-lg font-bold">{{ role.display_name }}</h3>
-                    <p class="text-gray-500">@{{ role.name }}</p>
-                    <p class="text-gray-500">{{ role.description }}</p>
-                    <div class="mt-2">
-                        <div class="relative inline-block">
-                            <button
-                                @click="toggleDropdown(role.id)"
-                                class="inline-block px-1 py-1 mb-2 font-bold text-orange-400 mr-2"
-                            >
-                                <span class="mr-1"
-                                    >{{
-                                        role.permissions.length
-                                    }}
-                                    Permissions</span
-                                >
-                                <span
-                                    :class="{
-                                        'transform rotate-180':
-                                            openDropdown === role.id,
-                                    }"
-                                    class="inline-block transition-transform duration-300"
+                    <div>
+                        <h3 class="text-lg font-bold">
+                            {{ role.display_name }}
+                        </h3>
+                        <p class="text-gray-500">@{{ role.name }}</p>
+                        <p class="text-gray-500">
+                            Desc: {{ role.description }}
+                        </p>
+                        <div class="mt-2">
+                            <div class="relative inline-block">
+                                <button
+                                    @click="toggleDropdown(role.id)"
+                                    class="inline-block px-1 py-1 mb-2 font-bold text-orange-400 mr-2"
                                 >
-                                    &#9662;
-                                </span>
-                            </button>
-                            <ul
-                                v-if="openDropdown === role.id"
-                                class="absolute right-0 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-56 overflow-y-scroll"
-                            >
-                                <li
-                                    v-for="permission in role.permissions"
-                                    :key="permission.id"
-                                    class="px-4 py-2 hover:bg-gray-100 cursor-pointer"
+                                    <span class="mr-1"
+                                        >{{
+                                            role.permissions.length
+                                        }}
+                                        Permissions</span
+                                    >
+                                    <span
+                                        :class="{
+                                            'transform rotate-180':
+                                                openDropdown === role.id,
+                                        }"
+                                        class="inline-block transition-transform duration-300"
+                                    >
+                                        &#9662;
+                                    </span>
+                                </button>
+                                <ul
+                                    v-if="openDropdown === role.id"
+                                    class="absolute right-0 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-56 overflow-y-scroll no-scrollbar"
                                 >
-                                    {{ permission.name }}
-                                </li>
-                            </ul>
+                                    <li
+                                        v-for="permission in role.permissions"
+                                        :key="permission.id"
+                                        class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-auto"
+                                    >
+                                        {{ permission.name }}
+                                    </li>
+                                </ul>
+                            </div>
                         </div>
                     </div>
+                    <div>
+                        <h4 class="text-gray-500">
+                            {{ role.users.length }} Users
+                        </h4>
+
+                        <ul>
+                            <li
+                                v-for="user in role.users.slice(0, 5)"
+                                :key="user.id"
+                                class="text-gray-500 font-bold"
+                            >
+                                {{ user.first_name }} {{ user.last_name }}
+                            </li>
+                        </ul>
+                    </div>
                 </div>
             </div>
         </div>
@@ -162,6 +180,7 @@ export default {
     data() {
         return {
             openDropdown: null,
+            userDropdown: null,
             permission_dropdown: null,
             name: "",
             display_name: "",
@@ -203,7 +222,6 @@ export default {
                     permissions: this.selectedPermissions,
                 })
                 .then((response) => {
-                    console.log(response);
                     this.roles.push(response.data);
                     this.name = "";
                     this.description = "";
@@ -221,6 +239,9 @@ export default {
         toggleDropdown(roleId) {
             this.openDropdown = this.openDropdown === roleId ? null : roleId;
         },
+        toggleUserDropdown(roleId) {
+            this.userDropdown = this.userDropdown === roleId ? null : roleId;
+        },
         togglePermissionList() {
             this.permission_dropdown = !this.permission_dropdown;
         },

From 912493785af55320abaae8fbfe4b004a4cd215f7 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 1 Jul 2023 23:21:27 +0530
Subject: [PATCH 11/41] Roles Details Page

---
 .../Controllers/Dashboard/RolesController.php |  24 +++++
 resources/app/pages/Roles.vue                 |  14 +++
 resources/app/pages/RolesDetails.vue          | 100 ++++++++++++++++++
 routes/web.php                                |   1 +
 4 files changed, 139 insertions(+)
 create mode 100644 resources/app/pages/RolesDetails.vue

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index 20d7244..a8d2b1c 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -25,6 +25,30 @@ public function index(): Response
             ]
         );
     }
+    public function details($roleId): Response
+    {
+         /**
+     * Shows the role page
+     * @return Response
+     */
+        //get role with id = $roleId
+        $role = Role::with('permissions')->where('id', $roleId)->first();
+        $users = $role->users()->get();
+        $temp = [
+            'id' => $role->id,
+            'name' => $role->name,
+            'display_name' => $role->display_name,
+            'description' => $role->description,
+            'permissions' => $role->permissions,
+            'users' => $users,
+        ];
+        return Inertia::render('RolesDetails',
+            [
+                'roleDetails' => $temp
+            ]
+        );
+
+    }
     public function store(CreateRoleRequest $request)
     {
 
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
index 8129e35..65db0df 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/Roles.vue
@@ -163,6 +163,20 @@
                                 {{ user.first_name }} {{ user.last_name }}
                             </li>
                         </ul>
+
+                        <div class="flex items-end bottom-0 right-0">
+                            <a
+                                :href="
+                                    route('dashboard.roles.details', role.id)
+                                "
+                            >
+                                <button
+                                    class="inline-block px-1 py-1 mb-2 font-bold text-blue-400"
+                                >
+                                    More Details >>
+                                </button>
+                            </a>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/resources/app/pages/RolesDetails.vue b/resources/app/pages/RolesDetails.vue
new file mode 100644
index 0000000..a0d9823
--- /dev/null
+++ b/resources/app/pages/RolesDetails.vue
@@ -0,0 +1,100 @@
+<template>
+    <div class="flex justify-center h-screen">
+        <div class="w-full max-w-screen-xl p-4">
+            <div class="flex justify-center">
+                <h2 class="text-2xl font-bold mb-4">Role Details</h2>
+            </div>
+
+            <div class="bg-white rounded-md shadow-lg p-4">
+                <div class="flex flex-col justify-center items-center">
+                    <h3 class="text-lg font-bold">
+                        {{ roleDetails.display_name }}
+                    </h3>
+                    <p class="text-gray-500">@{{ roleDetails.name }}</p>
+                    <p class="text-gray-500">
+                        Description: {{ roleDetails.description }}
+                    </p>
+                </div>
+                <div class="grid grid-cols-2">
+                    <div class="mt-6">
+                        <table class="min-w-full">
+                            <thead>
+                                <tr>
+                                    <th class="py-2 px-4 bg-gray-100">
+                                        Permissions
+                                    </th>
+                                </tr>
+                            </thead>
+                            <div
+                                class="max-h-96 overflow-y-scroll no-scrollbar border-r-8"
+                            >
+                                <tbody>
+                                    <tr
+                                        v-for="permission in roleDetails.permissions"
+                                        :key="permission.id"
+                                    >
+                                        <td class="py-2 px-4">
+                                            {{ permission.name }}
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </div>
+                        </table>
+                    </div>
+
+                    <div class="mt-6">
+                        <table class="min-w-full">
+                            <thead>
+                                <tr>
+                                    <th class="py-2 px-4 bg-gray-100">Users</th>
+                                </tr>
+                            </thead>
+                            <div
+                                class="max-h-96 overflow-y-scroll no-scrollbar"
+                            >
+                                <tbody>
+                                    <tr
+                                        v-for="user in roleDetails.users"
+                                        :key="user.id"
+                                    >
+                                        <td class="py-2 px-4">
+                                            {{ user.first_name }}
+                                            {{ user.last_name }}
+                                        </td>
+                                        <td class="py-2 px-4">
+                                            {{ user.email }}
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </div>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import DashboardLayout from "../layouts/DashboardLayout";
+export default {
+    layout: DashboardLayout,
+    props: {
+        roleDetails: {
+            type: Object,
+        },
+    },
+    methods: {
+        editRole() {
+            // Handle edit role logic
+        },
+        deleteRole() {
+            // Handle delete role logic
+        },
+    },
+};
+</script>
+
+<style scoped>
+/* Add custom styles as needed */
+</style>
diff --git a/routes/web.php b/routes/web.php
index e965bd3..9765c2b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -112,6 +112,7 @@ function () {
             // ======== Calendar routes ========
             Route::get('calendar', [CalendarController::class, 'index'])->name('calendar');
             Route::get('/roles', [RolesController::class, 'index'])->name('roles.index');
+            Route::get('/roles/{rolesId}', [RolesController::class, 'details'])->name('roles.details');
             Route::post('/roles', [RolesController::class, 'store'])->name('roles.store');
             Route::get('/all-roles', [RolesController::class, 'getRoles'])->name('roles.all');
             Route::get('/all-permissions', [PermissionController::class, 'getPermissions'])->name('permissions.all');

From a8cf553649250e87529179e6470741b75172f3c0 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sun, 2 Jul 2023 20:37:44 +0530
Subject: [PATCH 12/41] Minor updates

---
 .../Controllers/Dashboard/RolesController.php | 29 ++++++++----------
 resources/app/pages/Roles.vue                 | 30 +++++--------------
 2 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index a8d2b1c..096450f 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -10,19 +10,17 @@
 use App\Http\Requests\CreateRoleRequest;
 use Inertia\Inertia;
 use Inertia\Response;
+use Redirect;
+
 class RolesController extends Controller
 {
     public function index(): Response
     {
-         /**
+    /**
      * Shows the role page
      * @return Response
      */
-
-        return Inertia::render('Roles',
-            [
-                'roles' => []
-            ]
+        return Inertia::render('Roles',['roles' => []]
         );
     }
     public function details($roleId): Response
@@ -31,7 +29,6 @@ public function details($roleId): Response
      * Shows the role page
      * @return Response
      */
-        //get role with id = $roleId
         $role = Role::with('permissions')->where('id', $roleId)->first();
         $users = $role->users()->get();
         $temp = [
@@ -42,16 +39,12 @@ public function details($roleId): Response
             'permissions' => $role->permissions,
             'users' => $users,
         ];
-        return Inertia::render('RolesDetails',
-            [
-                'roleDetails' => $temp
-            ]
+        return Inertia::render('RolesDetails',['roleDetails' => $temp]
         );
 
     }
     public function store(CreateRoleRequest $request)
     {
-
         $role = new Role();
         $role->name = $request->name;
         $role->display_name = $request->display_name;
@@ -61,13 +54,17 @@ public function store(CreateRoleRequest $request)
             $role->permissions()->attach([$permission['id']]);
         }
         $role->save();
-        return response()->json($role, 201);
+        if($role->save()){
+            return Inertia::location(route('dashboard.roles.index'));
+        }else{
+            return Redirect::back()->with(['error' => 'Something went wrong']);
+        }
     }
     public function getRoles()
     {
-    $result=[];
-    $roles = Role::with('permissions')->get();
-    foreach ($roles as $role) {
+        $result=[];
+        $roles = Role::with('permissions')->get();
+        foreach ($roles as $role) {
         $users = $role->users()->get();
         $temp = [
             'id' => $role->id,
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/Roles.vue
index 65db0df..5a44320 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/Roles.vue
@@ -2,7 +2,7 @@
     <div class="flex min-h-screen bg-white py-8 px-4">
         <div class="w-1/3 mx-auto bg-white rounded shadow-md p-6">
             <h2 class="text-2xl font-bold mb-4">Add Role</h2>
-            <form @submit.prevent="addRole">
+            <form @submit.prevent="addRole" method="post">
                 <div class="mb-4">
                     <ehr-input
                         v-model="roleForm.name"
@@ -37,11 +37,11 @@
                     >
                     <div class="relative">
                         <div
-                            v-if="selectedPermissions.length > 0"
+                            v-if="roleForm.permissions.length > 0"
                             class="flex flex-wrap items-center mb-2"
                         >
                             <span
-                                v-for="permission in selectedPermissions"
+                                v-for="permission in roleForm.permissions"
                                 :key="permission.id"
                                 class="bg-orange-500 text-white rounded-full px-2 py-1 mr-2 mb-2"
                             >
@@ -200,13 +200,12 @@ export default {
             display_name: "",
             description: "",
             permissions: [],
-            selectedPermissions: [],
-
             roles: [],
             roleForm: this.$inertia.form({
                 name: null,
                 display_name: null,
                 description: null,
+                permissions: [],
             }),
         };
     },
@@ -228,26 +227,11 @@ export default {
                 });
         },
         addRole() {
-            axios
-                .post(this.route("dashboard.roles.store"), {
-                    name: this.roleForm.name,
-                    display_name: this.roleForm.display_name,
-                    description: this.roleForm.description,
-                    permissions: this.selectedPermissions,
-                })
-                .then((response) => {
-                    this.roles.push(response.data);
-                    this.name = "";
-                    this.description = "";
-                    this.permissions = [];
-                })
-                .catch((error) => {
-                    console.log(error);
-                });
+            this.roleForm.post(this.route("dashboard.roles.store"));
         },
         selectPermission(permission) {
-            if (!this.selectedPermissions.includes(permission)) {
-                this.selectedPermissions.push(permission);
+            if (!this.roleForm.permissions.includes(permission)) {
+                this.roleForm.permissions.push(permission);
             }
         },
         toggleDropdown(roleId) {

From c4c3f833d6f3f651069154801fe82abc1534ced7 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 8 Jul 2023 06:21:09 +0530
Subject: [PATCH 13/41] Add User Form UI

---
 resources/app/pages/AddUsers.vue | 272 +++++++++++++++++++++++++++++++
 1 file changed, 272 insertions(+)
 create mode 100644 resources/app/pages/AddUsers.vue

diff --git a/resources/app/pages/AddUsers.vue b/resources/app/pages/AddUsers.vue
new file mode 100644
index 0000000..3c892e1
--- /dev/null
+++ b/resources/app/pages/AddUsers.vue
@@ -0,0 +1,272 @@
+<template>
+    <div class="flex min-h-screen bg-white py-8 px-4">
+        <div
+            class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
+        >
+            <h2 class="text-2xl font-bold mb-4">Add User</h2>
+            <div class="grid grid-cols-2 gap-4">
+                <div>
+                    <ehr-input
+                        v-model="userForm.username"
+                        :error="errors.username"
+                        :label="'Username'"
+                        :placeholder="'Enter Username'"
+                        required
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.tax_id"
+                        :label="'Tax ID'"
+                        :placeholder="'Enter Tax ID'"
+                    />
+                </div>
+                <ehr-input
+                    v-model="userForm.password"
+                    :error="errors.password"
+                    :label="'Password'"
+                    :placeholder="'Enter Password'"
+                    type="password"
+                    required
+                ></ehr-input>
+
+                <ehr-input
+                    v-model="userForm.confirmPassword"
+                    :error="errors.confirmPassword"
+                    :label="'Confirm Password'"
+                    :placeholder="'Confirm Password'"
+                    type="password"
+                    required
+                ></ehr-input>
+                <div>
+                    <ehr-input
+                        v-model="userForm.suffix"
+                        :label="'Suffix'"
+                        :placeholder="'Enter Suffix'"
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.full_name"
+                        :error="errors.full_name"
+                        :label="'Full Name'"
+                        :placeholder="'Enter Full Name'"
+                        required
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.dea_number"
+                        :label="'DEA Number'"
+                        :placeholder="'Enter DEA Number'"
+                    />
+                </div>
+
+                <div>
+                    <ehr-input
+                        v-model="userForm.npi"
+                        :label="'NPI'"
+                        :placeholder="'Enter NPI'"
+                    />
+                </div>
+
+                <div>
+                    <ehr-input
+                        v-model="userForm.taxonomy"
+                        :label="'Taxonomy'"
+                        :placeholder="'Enter Taxonomy'"
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.license_number"
+                        :label="'License No.'"
+                        :placeholder="'Enter License No.'"
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.provider_type"
+                        :label="'Provider Type'"
+                        :placeholder="'Enter Provider Type'"
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.default_warehouse"
+                        :label="'Default Warehouse'"
+                        :placeholder="'Enter Default Warehouse'"
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.job_description"
+                        :label="'Job Description'"
+                        :placeholder="'Enter Job Description'"
+                    />
+                </div>
+                <div>
+                    <ehr-input
+                        v-model="userForm.additional_details"
+                        :label="'Additional Details'"
+                        :placeholder="'Enter Additional Details'"
+                    />
+                </div>
+                <div>
+                    <ehr-dropdown
+                        v-model="userForm.default_facility"
+                        :options="facilityOptions"
+                        :label="'Default Facility'"
+                        :placeholder="'Select Default Facility'"
+                    />
+                </div>
+                <div>
+                    <ehr-dropdown
+                        v-model="userForm.role"
+                        :options="roleOptions"
+                        :label="'Role'"
+                        :placeholder="'Select Role'"
+                    />
+                </div>
+                <div>
+                    <button
+                        id="default-facility-dropdown"
+                        class="w-full px-4 py-2 rounded ring-2"
+                        type="button"
+                        @click="toggleDefaultFacilityList()"
+                    >
+                        Default Facility
+
+                        <span
+                            :class="{
+                                'transform rotate-180':
+                                    default_facility_dropdown === true,
+                            }"
+                            class="inline-block transition-transform duration-300"
+                        >
+                            &#9662;
+                        </span>
+                    </button>
+
+                    <ul
+                        v-if="default_facility_dropdown === true"
+                        class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
+                    >
+                        <li
+                            v-for="facility in facilityOptions"
+                            :key="facility.id"
+                            @click="selectDefaultFacility(facility)"
+                            class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                        >
+                            {{ facility.name }}
+                        </li>
+                    </ul>
+                </div>
+                <div>
+                    <button
+                        id="role-dropdown"
+                        class="w-full px-4 py-2 rounded ring-2"
+                        type="button"
+                        @click="toggleRoleList()"
+                    >
+                        Role
+
+                        <span
+                            :class="{
+                                'transform rotate-180': role_dropdown === true,
+                            }"
+                            class="inline-block transition-transform duration-300"
+                        >
+                            &#9662;
+                        </span>
+                    </button>
+
+                    <ul
+                        v-if="role_dropdown === true"
+                        class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
+                    >
+                        <li
+                            v-for="role in roleOptions"
+                            :key="role.id"
+                            @click="selectRole(role)"
+                            class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                        >
+                            {{ role.name }}
+                        </li>
+                    </ul>
+                </div>
+                <div class="col-span-2">
+                    <button
+                        type="submit"
+                        class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-2 px-4 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
+                    >
+                        Add User
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            role_dropdown: null,
+            default_facility_dropdown: false,
+            userForm: {
+                username: "",
+                password: "",
+                confirmPassword: "",
+                suffix: "",
+                full_name: "",
+                dea_number: "",
+                tax_id: "",
+                npi: "",
+                provider_type: "",
+                default_warehouse: "",
+                taxonomy: "",
+                license_number: "",
+                additional_details: "",
+                default_facility: "",
+                role: "",
+            },
+            errors: {
+                username: "",
+                full_name: "",
+            },
+            facilityOptions: [
+                {
+                    id: 1,
+                    name: "Facility 1",
+                },
+                {
+                    id: 2,
+                    name: "Facility 2",
+                },
+                {
+                    id: 3,
+                    name: "Facility 3",
+                },
+            ],
+            roleOptions: [],
+        };
+    },
+    mounted() {
+        this.getRoles();
+    },
+    methods: {
+        getRoles() {
+            axios.get(this.route("dashboard.roles.all")).then((response) => {
+                this.roleOptions = response.data;
+            });
+        },
+        addUser() {},
+        toggleRoleList() {
+            this.role_dropdown = !this.role_dropdown;
+        },
+        toggleDefaultFacilityList() {
+            this.default_facility_dropdown = !this.default_facility_dropdown;
+        },
+    },
+};
+</script>

From 1b249833b0cb29776927e9f68f7fa95f21c9ac7f Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 8 Jul 2023 06:21:23 +0530
Subject: [PATCH 14/41] Add User Form UI

---
 .../Dashboard/User/UserController.php            | 16 ++++++++--------
 routes/web.php                                   |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index 3bd8fff..1562866 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -4,18 +4,18 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
+use Inertia\Response;
+use Inertia\Inertia;
 class UserController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
+
+    public function index():Response
+    {
+       /**
+     * Shows the role page
      * @return Response
      */
-    public function index()
-    {
-        //
+    return Inertia::render('AddUsers');
     }
 
     /**
diff --git a/routes/web.php b/routes/web.php
index 9765c2b..ece53c5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -111,6 +111,8 @@ function () {
 
             // ======== Calendar routes ========
             Route::get('calendar', [CalendarController::class, 'index'])->name('calendar');
+
+            // ======== Roles & Permissions Routes ========
             Route::get('/roles', [RolesController::class, 'index'])->name('roles.index');
             Route::get('/roles/{rolesId}', [RolesController::class, 'details'])->name('roles.details');
             Route::post('/roles', [RolesController::class, 'store'])->name('roles.store');

From 5ddf478799723004c6d020284ab459d169f850b0 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 21 Jul 2023 06:11:14 +0530
Subject: [PATCH 15/41] =?UTF-8?q?=E2=9E=95=20Add=20User=20via=20Invitation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dashboard/User/UserController.php         |  84 +++-
 app/Mail/InvitationMail.php                   |  62 +++
 app/Models/User.php                           |   4 +-
 .../2017_06_14_000000_create_users_table.php  |  16 +-
 resources/app/pages/AddPassword.vue           |  80 ++++
 resources/app/pages/AddUsers.vue              | 401 +++++++++---------
 resources/views/emails/testMail.blade.php     |  15 +
 routes/web.php                                |   9 +
 8 files changed, 468 insertions(+), 203 deletions(-)
 create mode 100644 app/Mail/InvitationMail.php
 create mode 100644 resources/app/pages/AddPassword.vue
 create mode 100644 resources/views/emails/testMail.blade.php

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index 1562866..98b6ec0 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -3,9 +3,17 @@
 namespace App\Http\Controllers\Dashboard\User;
 
 use App\Http\Controllers\Controller;
+use App\Mail\InvitationMail;
+use App\Models\Role;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Inertia\Response;
 use Inertia\Inertia;
+use Mail;
+use Redirect;
+use Str;
+use URL;
+
 class UserController extends Controller
 {
 
@@ -17,7 +25,15 @@ public function index():Response
      */
     return Inertia::render('AddUsers');
     }
+    public function AddPassword():Response
+    {
+       /**
+     * Shows the role page
+     * @return Response
+     */
+    return Inertia::render('AddPassword');
 
+    }
     /**
      * Show the form for creating a new resource.
      *
@@ -36,9 +52,75 @@ public function create()
      */
     public function store(Request $request)
     {
-        //
+        //create user
+        $token = Str::random(40);
+        $user = User::create([
+            'username' => $request->username,
+            'email' => $request->email,
+            'password' =>bcrypt($token),
+            'first_name' => $request->first_name,
+            'middle_name' => $request->middle_name,
+            'last_name' => $request->last_name,
+            'federal_tax_id' => $request->tax_id,
+            'federal_drug_id' => $request->dea_number,
+            'npi' => $request->npi,
+            'suffix' => $request->suffix,
+            'taxonomy' => $request->taxonomy,
+            'info' => $request->job_description,
+            'access_control' => $request->role,
+            'warehouse' => $request->default_warehouse,
+            'facility'=> $request->default_facility,
+            'provider_type' => $request->provider_type,
+            'license' => $request->license_number,
+            'additional_details' => $request->additional_details,
+            'token' => $token,
+            'token_expiry' => now()->addDays(7),
+        ]);
+        $role = Role::where('name', '=', $request->role)->first();
+        $permissions=$role->permissions;
+        $user->attachRole($role);
+        foreach ($permissions as $permission) {
+            $user->attachPermission($permission);
+        }
+        $user->save();
+        $url = URL::temporarySignedRoute(
+            'users.confirm',
+            now()->addDays(7),
+            ['username' => $user->username,'token'=>$token]
+        );
+        $mailData = [
+            'title' => 'User Invitation Mail',
+            'url'=> $url,
+            'facility' => $request->default_facility,
+            'role'=> $request->role,
+            'username' => $request->username,
+
+        ];
+        Mail::to($request->email)->send(new InvitationMail($mailData));
+        if($user->save()){
+            return Inertia::location(route('dashboard.users.index'));
+        }else{
+            return Redirect::back()->with(['error' => 'Something went wrong']);
+        }
+
     }
 
+    public function verifyUser(Request $request)
+    {
+        $user = User::where('username', '=', $request->username)->first();
+        if($user->token_expiry < now()){
+            return Redirect::back()->with(['error' => 'Token Expired']);
+        }
+        if($user->token == $request->token){
+            $user->password = bcrypt($request->password);
+            $user->token = null;
+            $user->save();
+            return Inertia::location(route('login'));
+        }else{
+
+          return Redirect::back()->with(['error' => 'Token Mismatch']);
+        }
+    }
     /**
      * Display the specified resource.
      *
diff --git a/app/Mail/InvitationMail.php b/app/Mail/InvitationMail.php
new file mode 100644
index 0000000..ba331dc
--- /dev/null
+++ b/app/Mail/InvitationMail.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+use Inertia\Response;
+use Inertia\Inertia;
+class InvitationMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public $mailData;
+    public function __construct($mailData)
+    {
+        $this->mailData = $mailData;
+    }
+
+    /**
+     * Get the message envelope.
+     *
+     * @return \Illuminate\Mail\Mailables\Envelope
+     */
+    public function envelope()
+    {
+        return new Envelope(
+            subject: 'Test Mail',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     *
+     * @return \Illuminate\Mail\Mailables\Content
+     */
+    public function content()
+    {
+        return new Content(
+            view: 'emails.testMail',
+
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array
+     */
+    public function attachments()
+    {
+        return [];
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index 3ba9ec8..c5b7e74 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -30,8 +30,8 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'username', 'password', 'first_name', 'middle_name', 'last_name', 'federal_tax_id',
-        'federal_drug_id', 'see_auth', 'npi', 'suffix', 'taxonomy', 'calendar_ui', 'info',
+        'username', 'password','email', 'first_name', 'middle_name', 'last_name', 'federal_tax_id',
+        'federal_drug_id', 'see_auth', 'npi', 'suffix', 'taxonomy','license','provider_type','warehouse','additional_details','calendar_ui', 'info', 'token', 'token_expiry','facility',
         'new_crop_user_role', 'access_control', 'in_calendar', 'device_id', 'last_login_at',
         'last_login_ip', 'created_at', 'updated_at', 'deleted_at'
     ];
diff --git a/database/migrations/2017_06_14_000000_create_users_table.php b/database/migrations/2017_06_14_000000_create_users_table.php
index 974996c..626aaeb 100755
--- a/database/migrations/2017_06_14_000000_create_users_table.php
+++ b/database/migrations/2017_06_14_000000_create_users_table.php
@@ -28,6 +28,13 @@ public function up()
             $table->string('address_one')->nullable()->comment('Address One');
             $table->string('address_two')->nullable()->comment('Address Two');
             $table->string('zip')->nullable()->comment('Zip code');
+            $table->string('license')->nullable();
+            $table->string('provider_type')->nullable();
+            $table->string('warehouse')->nullable();
+            $table->string('facility')->nullable();
+            $table->text('additional_details')->nullable();
+            $table->string('token')->nullable()->comment('Token');
+            $table->timestamp('token_expiry')->comment('Token Expiry');
 
 
             // Miscellaneous properties
@@ -38,15 +45,16 @@ public function up()
             $table->boolean('in_calendar')->default(1)
                 ->comment('If user wants calendar or not. 0 -> No | 1 -> Yes');
             $table->integer('see_auth')
-                ->comment('See Authorization. 0 -> None | 1 -> All | 2 -> Only Mine');
-            $table->string('calendar_ui')
+                ->comment('See Authorization. 0 -> None | 1 -> All | 2 -> Only Mine')->default(0);
+            $table->string('calendar_ui')->default('Original')
                 ->comment('Calendar Preference. viz Outlook, Original and Fancy');
-	        $table->bigInteger('npi')->comment('National Provider Identifier.');
+	        $table->bigInteger('npi')->comment('National Provider Identifier.')->default(0);
 	        $table->longText('info')->nullable()->comment('About/Biography/Job Description');
 
+
 	        // TODO Move to ACL (laratrust)
 	        $table->string('new_crop_user_role')
-                ->comment('Role of created user. Like admin, nurse, doctor, etc.');
+                ->comment('Role of created user. Like admin, nurse, doctor, etc.')->default('NewCrop Admin');
 	        $table->string('access_control')
                 ->comment('Access Control of user. Viz Accounting, Administrators, Clinicians, etc.');
 
diff --git a/resources/app/pages/AddPassword.vue b/resources/app/pages/AddPassword.vue
new file mode 100644
index 0000000..74fabe6
--- /dev/null
+++ b/resources/app/pages/AddPassword.vue
@@ -0,0 +1,80 @@
+<template>
+    <div class="flex min-h-screen bg-white py-8 px-4">
+        <div
+            class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
+        >
+            <h2 class="text-2xl font-bold mb-4">Add Password</h2>
+            <form @submit.prevent="addPassword" method="post">
+                <div class="mb-4">
+                    <ehr-input
+                        v-model="passwordForm.username"
+                        :error="errors.username"
+                        :label="'User Name'"
+                        :placeholder="'Enter User Name'"
+                        required
+                        disabled
+                    />
+                </div>
+                <div class="mb-4">
+                    <ehr-input
+                        v-model="passwordForm.token"
+                        :error="errors.token"
+                        :label="'Token'"
+                        :placeholder="'Enter Token'"
+                        required
+                        disabled
+                    />
+                </div>
+                <div class="mb-4">
+                    <ehr-input
+                        v-model="passwordForm.password"
+                        :error="errors.password"
+                        :label="'Password'"
+                        :placeholder="'Enter Password'"
+                        type="password"
+                        required
+                    />
+                </div>
+                <button
+                    type="submit"
+                    class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-2 px-4 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
+                >
+                    Submit
+                </button>
+            </form>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "AddPassword",
+    props: {
+        errors: Object,
+    },
+    data() {
+        return {
+            passwordForm: this.$inertia.form({
+                expires: null,
+                username: null,
+                token: null,
+                password: null,
+            }),
+        };
+    },
+
+    mounted() {},
+    methods: {
+        addPassword() {
+            this.passwordForm.post(this.route("users.verify"));
+        },
+    },
+
+    created() {
+        this.passwordForm.username = this.route().params.username;
+        this.passwordForm.token = this.route().params.token;
+        this.passwordForm.expires = this.route().params.expires;
+        this.$on("submit", this.addPasswordPassword);
+    },
+};
+</script>
diff --git a/resources/app/pages/AddUsers.vue b/resources/app/pages/AddUsers.vue
index 3c892e1..eb9b665 100644
--- a/resources/app/pages/AddUsers.vue
+++ b/resources/app/pages/AddUsers.vue
@@ -4,206 +4,202 @@
             class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
         >
             <h2 class="text-2xl font-bold mb-4">Add User</h2>
-            <div class="grid grid-cols-2 gap-4">
-                <div>
-                    <ehr-input
-                        v-model="userForm.username"
-                        :error="errors.username"
-                        :label="'Username'"
-                        :placeholder="'Enter Username'"
-                        required
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.tax_id"
-                        :label="'Tax ID'"
-                        :placeholder="'Enter Tax ID'"
-                    />
-                </div>
-                <ehr-input
-                    v-model="userForm.password"
-                    :error="errors.password"
-                    :label="'Password'"
-                    :placeholder="'Enter Password'"
-                    type="password"
-                    required
-                ></ehr-input>
+            <form @submit.prevent="addUser" method="post">
+                <div class="grid grid-cols-2 gap-4">
+                    <div>
+                        <ehr-input
+                            v-model="userForm.username"
+                            :error="errors.username"
+                            :label="'Username'"
+                            :placeholder="'Enter Username'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.email"
+                            :error="errors.email"
+                            :label="'Email'"
+                            :placeholder="'Enter Email'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.tax_id"
+                            :label="'Tax ID'"
+                            :placeholder="'Enter Tax ID'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.suffix"
+                            :label="'Suffix'"
+                            :placeholder="'Enter Suffix'"
+                        />
+                    </div>
 
-                <ehr-input
-                    v-model="userForm.confirmPassword"
-                    :error="errors.confirmPassword"
-                    :label="'Confirm Password'"
-                    :placeholder="'Confirm Password'"
-                    type="password"
-                    required
-                ></ehr-input>
-                <div>
-                    <ehr-input
-                        v-model="userForm.suffix"
-                        :label="'Suffix'"
-                        :placeholder="'Enter Suffix'"
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.full_name"
-                        :error="errors.full_name"
-                        :label="'Full Name'"
-                        :placeholder="'Enter Full Name'"
-                        required
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.dea_number"
-                        :label="'DEA Number'"
-                        :placeholder="'Enter DEA Number'"
-                    />
-                </div>
-
-                <div>
-                    <ehr-input
-                        v-model="userForm.npi"
-                        :label="'NPI'"
-                        :placeholder="'Enter NPI'"
-                    />
-                </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.first_name"
+                            :error="errors.first_name"
+                            :label="'First Name'"
+                            :placeholder="'Enter First Name'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.middle_name"
+                            :error="errors.middle_name"
+                            :label="'Middle Name'"
+                            :placeholder="'Enter Middle Name'"
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.last_name"
+                            :error="errors.last_name"
+                            :label="'Last Name'"
+                            :placeholder="'Enter Last Name'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.dea_number"
+                            :label="'DEA Number'"
+                            :placeholder="'Enter DEA Number'"
+                            required
+                        />
+                    </div>
 
-                <div>
-                    <ehr-input
-                        v-model="userForm.taxonomy"
-                        :label="'Taxonomy'"
-                        :placeholder="'Enter Taxonomy'"
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.license_number"
-                        :label="'License No.'"
-                        :placeholder="'Enter License No.'"
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.provider_type"
-                        :label="'Provider Type'"
-                        :placeholder="'Enter Provider Type'"
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.default_warehouse"
-                        :label="'Default Warehouse'"
-                        :placeholder="'Enter Default Warehouse'"
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.job_description"
-                        :label="'Job Description'"
-                        :placeholder="'Enter Job Description'"
-                    />
-                </div>
-                <div>
-                    <ehr-input
-                        v-model="userForm.additional_details"
-                        :label="'Additional Details'"
-                        :placeholder="'Enter Additional Details'"
-                    />
-                </div>
-                <div>
-                    <ehr-dropdown
-                        v-model="userForm.default_facility"
-                        :options="facilityOptions"
-                        :label="'Default Facility'"
-                        :placeholder="'Select Default Facility'"
-                    />
-                </div>
-                <div>
-                    <ehr-dropdown
-                        v-model="userForm.role"
-                        :options="roleOptions"
-                        :label="'Role'"
-                        :placeholder="'Select Role'"
-                    />
-                </div>
-                <div>
-                    <button
-                        id="default-facility-dropdown"
-                        class="w-full px-4 py-2 rounded ring-2"
-                        type="button"
-                        @click="toggleDefaultFacilityList()"
-                    >
-                        Default Facility
+                    <div>
+                        <ehr-input
+                            v-model="userForm.npi"
+                            :label="'NPI'"
+                            :placeholder="'Enter NPI'"
+                            required
+                        />
+                    </div>
 
-                        <span
-                            :class="{
-                                'transform rotate-180':
-                                    default_facility_dropdown === true,
-                            }"
-                            class="inline-block transition-transform duration-300"
+                    <div>
+                        <ehr-input
+                            v-model="userForm.taxonomy"
+                            :label="'Taxonomy'"
+                            :placeholder="'Enter Taxonomy'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.license_number"
+                            :label="'License No.'"
+                            :placeholder="'Enter License No.'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.provider_type"
+                            :label="'Provider Type'"
+                            :placeholder="'Enter Provider Type'"
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.default_warehouse"
+                            :label="'Default Warehouse'"
+                            :placeholder="'Enter Default Warehouse'"
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.job_description"
+                            :label="'Job Description'"
+                            :placeholder="'Enter Job Description'"
+                        />
+                    </div>
+                    <div>
+                        <button
+                            id="default-facility-dropdown"
+                            class="w-full px-4 py-2 rounded ring-2"
+                            type="button"
+                            @click="toggleDefaultFacilityList()"
                         >
-                            &#9662;
-                        </span>
-                    </button>
+                            Default Facility:
+                            <b>{{ userForm.default_facility }}</b>
 
-                    <ul
-                        v-if="default_facility_dropdown === true"
-                        class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
-                    >
-                        <li
-                            v-for="facility in facilityOptions"
-                            :key="facility.id"
-                            @click="selectDefaultFacility(facility)"
-                            class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
-                        >
-                            {{ facility.name }}
-                        </li>
-                    </ul>
-                </div>
-                <div>
-                    <button
-                        id="role-dropdown"
-                        class="w-full px-4 py-2 rounded ring-2"
-                        type="button"
-                        @click="toggleRoleList()"
-                    >
-                        Role
+                            <span
+                                :class="{
+                                    'transform rotate-180':
+                                        default_facility_dropdown === true,
+                                }"
+                                class="inline-block transition-transform duration-300"
+                            >
+                                &#9662;
+                            </span>
+                        </button>
 
-                        <span
-                            :class="{
-                                'transform rotate-180': role_dropdown === true,
-                            }"
-                            class="inline-block transition-transform duration-300"
+                        <ul
+                            v-if="default_facility_dropdown === true"
+                            class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
                         >
-                            &#9662;
-                        </span>
-                    </button>
+                            <li
+                                v-for="facility in facilityOptions"
+                                :key="facility.id"
+                                @click="selectDefaultFacility(facility)"
+                                class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                            >
+                                {{ facility.name }}
+                            </li>
+                        </ul>
+                    </div>
+                    <div>
+                        <button
+                            id="role-dropdown"
+                            class="w-full px-4 py-2 rounded ring-2"
+                            type="button"
+                            @click="toggleRoleList()"
+                        >
+                            Role: <b> {{ userForm.role }}</b>
+
+                            <span
+                                :class="{
+                                    'transform rotate-180':
+                                        role_dropdown === true,
+                                }"
+                                class="inline-block transition-transform duration-300"
+                            >
+                                &#9662;
+                            </span>
+                        </button>
 
-                    <ul
-                        v-if="role_dropdown === true"
-                        class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
-                    >
-                        <li
-                            v-for="role in roleOptions"
-                            :key="role.id"
-                            @click="selectRole(role)"
-                            class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                        <ul
+                            v-if="role_dropdown === true"
+                            class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
                         >
-                            {{ role.name }}
-                        </li>
-                    </ul>
-                </div>
-                <div class="col-span-2">
-                    <button
-                        type="submit"
-                        class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-2 px-4 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
-                    >
-                        Add User
-                    </button>
+                            <li
+                                v-for="role in roleOptions"
+                                :key="role.id"
+                                @click="selectRole(role)"
+                                class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                            >
+                                {{ role.name }}
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="col-span-2">
+                        <button
+                            type="submit"
+                            class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-2 px-4 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
+                        >
+                            Add User
+                        </button>
+                    </div>
                 </div>
-            </div>
+            </form>
         </div>
     </div>
 </template>
@@ -213,15 +209,17 @@ export default {
         return {
             role_dropdown: null,
             default_facility_dropdown: false,
-            userForm: {
+            userForm: this.$inertia.form({
                 username: "",
-                password: "",
-                confirmPassword: "",
+                email: "",
                 suffix: "",
-                full_name: "",
+                first_name: "",
+                middle_name: "",
+                last_name: "",
                 dea_number: "",
                 tax_id: "",
                 npi: "",
+                job_description: "",
                 provider_type: "",
                 default_warehouse: "",
                 taxonomy: "",
@@ -229,7 +227,7 @@ export default {
                 additional_details: "",
                 default_facility: "",
                 role: "",
-            },
+            }),
             errors: {
                 username: "",
                 full_name: "",
@@ -260,7 +258,18 @@ export default {
                 this.roleOptions = response.data;
             });
         },
-        addUser() {},
+        addUser() {
+            console.log(this.userForm);
+            this.userForm.post(this.route("dashboard.users.store"));
+        },
+        selectDefaultFacility(facility) {
+            this.userForm.default_facility = facility.name;
+            this.default_facility_dropdown = false;
+        },
+        selectRole(role) {
+            this.userForm.role = role.name;
+            this.role_dropdown = false;
+        },
         toggleRoleList() {
             this.role_dropdown = !this.role_dropdown;
         },
diff --git a/resources/views/emails/testMail.blade.php b/resources/views/emails/testMail.blade.php
new file mode 100644
index 0000000..0e72a93
--- /dev/null
+++ b/resources/views/emails/testMail.blade.php
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=`device-width`, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    <h1>{{$mailData['title']}}</h1>
+
+    <p>Helllo,{{$mailData['username']}} <br> You have been invited to Librehealth as a <b>{{$mailData['role']}}</b> for the facility: <b>{{$mailData['facility']}}</b>  <br> Please click the linke bellow and activate you account</p>
+    <a href="{{$mailData['url']}}">Click here to activate your account</a>
+
+</body>
+</html>
diff --git a/routes/web.php b/routes/web.php
index ece53c5..628276d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,6 +19,7 @@
 use App\Http\Controllers\Installer\InstallerFilePermissionController;
 use App\Http\Controllers\Installer\InstallerRequirementsController;
 use App\Http\Controllers\LocaleController;
+use App\Http\Controllers\MailController;
 use App\Http\Controllers\PagesController;
 use Illuminate\Support\Facades\Route;
 
@@ -91,6 +92,7 @@
     /* =================================
         LH EHR PORTAL Routes
     ================================= */
+
     Route::group(
         [
             'as' => 'dashboard.',
@@ -129,6 +131,8 @@ function () {
                 'update' => 'users.update',
                 'destroy' => 'users.destroy',
             ]);
+            Route::post('/add-user', [UserController::class, 'store'])->name('users.add');
+
             Route::get('users/load/data', [UserController::class, 'getUserData'])
                 ->name('users.load.data');
 
@@ -202,7 +206,12 @@ function () {
             );
         }
     );
+    /* =================================
+        LH EHR New User Routes
+    ================================= */
 
+    Route::get('/add-password', [UserController::class, 'AddPassword'])->name('users.confirm');
+    Route::post('/verify-user', [UserController::class, 'verifyUser'])->name('users.verify');
 
     /* =================================
         LH EHR ADMIN Routes

From 4621bfabc7ef58d041e949e7f67a7f910b9543a0 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 21 Jul 2023 06:21:51 +0530
Subject: [PATCH 16/41] Added a  default value for token expiry

---
 database/migrations/2017_06_14_000000_create_users_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2017_06_14_000000_create_users_table.php b/database/migrations/2017_06_14_000000_create_users_table.php
index 626aaeb..45923c6 100755
--- a/database/migrations/2017_06_14_000000_create_users_table.php
+++ b/database/migrations/2017_06_14_000000_create_users_table.php
@@ -34,7 +34,7 @@ public function up()
             $table->string('facility')->nullable();
             $table->text('additional_details')->nullable();
             $table->string('token')->nullable()->comment('Token');
-            $table->timestamp('token_expiry')->comment('Token Expiry');
+            $table->timestamp('token_expiry')->default(now())->comment('Token Expiry');
 
 
             // Miscellaneous properties

From 3e3a4dde4bb1cd4af465744e9e3a6bb5aa711ee8 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 26 Jul 2023 05:51:24 +0530
Subject: [PATCH 17/41] User Invitation Updated

---
 .../Controllers/UserInvitationController.php  |  74 +++++++++
 app/Invite.php                                | 149 +++++++++++++++++
 app/Models/UserInvitation.php                 |  18 ++
 app/Models/UsersInvited.php                   |  18 ++
 ...7_25_201028_create_users_invited_table.php |  55 ++++++
 ...5_201052_create_user_invitations_table.php |  36 ++++
 resources/app/pages/AddPassword.vue           | 156 +++++++++++++-----
 resources/app/pages/AddUsers.vue              |   2 +-
 routes/web.php                                |  12 +-
 9 files changed, 474 insertions(+), 46 deletions(-)
 create mode 100644 app/Http/Controllers/UserInvitationController.php
 create mode 100644 app/Invite.php
 create mode 100644 app/Models/UserInvitation.php
 create mode 100644 app/Models/UsersInvited.php
 create mode 100644 database/migrations/2023_07_25_201028_create_users_invited_table.php
 create mode 100644 database/migrations/2023_07_25_201052_create_user_invitations_table.php

diff --git a/app/Http/Controllers/UserInvitationController.php b/app/Http/Controllers/UserInvitationController.php
new file mode 100644
index 0000000..9533e37
--- /dev/null
+++ b/app/Http/Controllers/UserInvitationController.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Invite;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Redirect;
+
+class UserInvitationController extends Controller
+{
+
+    public function sendInvite(Request $request)
+    {
+        $userData=[
+            'username' => $request->username,
+            'email' => $request->email,
+            'first_name' => $request->first_name,
+            'middle_name' => $request->middle_name,
+            'last_name' => $request->last_name,
+            'federal_tax_id' => $request->tax_id,
+            'federal_drug_id' => $request->dea_number,
+            'npi' => $request->npi,
+            'suffix' => $request->suffix,
+            'taxonomy' => $request->taxonomy,
+            'info' => $request->job_description,
+            'access_control' => $request->role,
+            'warehouse' => $request->default_warehouse,
+            'facility'=> $request->default_facility,
+            'provider_type' => $request->provider_type,
+            'license' => $request->license_number,
+            'additional_details' => $request->additional_details,
+        ];
+
+
+
+        Invite::send($userData, $request->email);
+        return Inertia::location(route('dashboard.users.index'));
+    }
+
+    public function acceptInvite(Request $request)
+    {
+        $code = $request->code;
+        $password = bcrypt($request->password);
+        $success=Invite::accept($code, $password);
+        if($success){
+            return Inertia::location(route('login'));
+        }else{
+            return Redirect::back()->with(['error' => 'Something went wrong']);
+        }
+
+    }
+
+    public function rejectInvite(Request $request)
+    {
+        $code = $request->code;
+        $success=Invite::reject($code);
+        if($success){
+            return response()->json(['status' => 'success']);
+        }else{
+            return Redirect::back()->with(['error' => 'Something went wrong']);
+        }
+
+    }
+
+    public function invitationStatus(Request $request)
+    {
+        $code = $request->code;
+        $status = Invite::status($code);
+        return response()->json(['status' => $status]);
+
+    }
+
+}
diff --git a/app/Invite.php b/app/Invite.php
new file mode 100644
index 0000000..e3a966c
--- /dev/null
+++ b/app/Invite.php
@@ -0,0 +1,149 @@
+<?php
+namespace App;
+
+use App\Mail\InvitationMail;
+use App\Mail\UserInvitationMail;
+use App\Models\Role;
+use App\Models\User;
+use App\Models\UsersInvited;
+use App\Models\UserInvitation;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Str;
+use Inertia\Inertia;
+use Redirect;
+use URL;
+
+class Invite
+{
+    public static function send($userData, $email,)
+    {
+
+
+        // Save the invitation data in the users_invited table
+        $userInvited = UsersInvited::create($userData);
+        // Generate a unique code for the invitation
+        $code = Str::random(10);
+
+        // Save the invitation data in the user_invitations table
+        $invitation=UserInvitation::create([
+            'for_user' => $userInvited->id,
+            'email' => $email,
+            'code' => $code,
+            'status' => 'pending',
+            'valid_till' => now()->addDays(7), // Invitation valid for 7 days
+        ]);
+
+        // Send the invitation email
+        $url = URL::temporarySignedRoute(
+            'users.confirm',
+            now()->addDays(7),
+            ['username' => $userData['username'],'code'=>$code]
+        );
+        $mailData = [
+            'title' => 'User Invitation Mail',
+            'url'=> $url,
+            'facility' => $userData['facility'],
+            'role'=> $userData['access_control'],
+            'username' => $userData['username'],
+
+        ];
+        Mail::to($userData['email'])->send(new InvitationMail($mailData));
+        if($invitation->save()){
+            return Inertia::location(route('dashboard.users.index'));
+        }else{
+            return Redirect::back()->with(['error' => 'Something went wrong']);
+        }
+    }
+
+    public static function accept($code, $password)
+    {
+        // Find the invitation by code
+        $invitation = UserInvitation::where('code', $code)->first();
+
+        if (!$invitation || $invitation->valid_till < now() || $invitation->status != 'pending') {
+            return false; // Invalid invitation code or invitation expired or invitation already accepted/rejected
+        }
+
+        // Create the new user in the real users table
+        $invitedUser=UsersInvited::find($invitation->for_user);
+
+        $user = User::create([
+            'username' => $invitedUser->username,
+            'email' => $invitedUser->email,
+            'password' =>$password,
+            'first_name' => $invitedUser->first_name,
+            'middle_name' => $invitedUser->middle_name,
+            'last_name' => $invitedUser->last_name,
+            'federal_tax_id' => $invitedUser->federal_tax_id,
+            'federal_drug_id' => $invitedUser->federal_drug_id,
+            'npi' => $invitedUser->npi,
+            'suffix' => $invitedUser->suffix,
+            'taxonomy' => $invitedUser->taxonomy,
+            'info' => $invitedUser->info,
+            'access_control' => $invitedUser->access_control,
+            'warehouse' => $invitedUser->warehouse,
+            'facility'=> $invitedUser->facility,
+            'provider_type' => $invitedUser->provider_type,
+            'license' => $invitedUser->license,
+        ]);
+        $role = Role::where('name', '=', $invitedUser->access_control)->first();
+        $permissions=$role->permissions;
+        $user->attachRole($role);
+        foreach ($permissions as $permission) {
+            $user->attachPermission($permission);
+        }
+        $invitation->update([
+            'status' => 'accepted',
+        ]);
+        $invitation->save();
+        if($user->save()){
+            return true;
+        }
+
+        return false; //if any error occurs
+    }
+
+    public static function reject($code)
+    {
+        // Find the invitation by code
+        $invitation = UserInvitation::where('code', $code)->first();
+
+        if (!$invitation) {
+            return false; // Invalid invitation code
+        }
+
+        // Update the invitation status
+        $invitation->update([
+            'status' => 'rejected',
+        ]);
+
+        $invitation->save();
+        return true; // Invitation rejected successfully
+    }
+
+    public static function isExpired($code)
+    {
+        // Find the invitation by code
+        $invitation = UserInvitation::where('code', $code)->first();
+        if($invitation->valid_till < now()){
+            $invitation->update([
+                'status' => 'expired',
+            ]);
+            $invitation->save();
+            return true;
+        }
+        return false;
+    }
+
+    public static function status($code)
+    {
+        // Find the invitation by code
+        $invitation = UserInvitation::where('code', $code)->first();
+
+        if (!$invitation) {
+            return 'invalid'; // Invalid invitation code
+        }
+
+        return $invitation->status;
+    }
+}
diff --git a/app/Models/UserInvitation.php b/app/Models/UserInvitation.php
new file mode 100644
index 0000000..3a9f03e
--- /dev/null
+++ b/app/Models/UserInvitation.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class UserInvitation extends Model
+{
+    use HasFactory;
+    protected $table = 'user_invitations';
+    protected $fillable = ['for_user', 'email', 'code', 'status', 'valid_till'];
+
+    public function user()
+    {
+        return $this->belongsTo(UsersInvited::class, 'for_user');
+    }
+}
diff --git a/app/Models/UsersInvited.php b/app/Models/UsersInvited.php
new file mode 100644
index 0000000..f9bc8ba
--- /dev/null
+++ b/app/Models/UsersInvited.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class UsersInvited extends Model
+{
+    use HasFactory;
+    protected $table = 'users_invited';
+    protected $fillable = [
+        'username','email', 'first_name', 'middle_name', 'last_name', 'federal_tax_id',
+        'federal_drug_id', 'npi', 'suffix', 'taxonomy','license','provider_type','warehouse', 'info','facility',
+     'access_control',
+    ];
+
+}
diff --git a/database/migrations/2023_07_25_201028_create_users_invited_table.php b/database/migrations/2023_07_25_201028_create_users_invited_table.php
new file mode 100644
index 0000000..63f3303
--- /dev/null
+++ b/database/migrations/2023_07_25_201028_create_users_invited_table.php
@@ -0,0 +1,55 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users_invited', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('first_name')->comment('User First Name.');
+            $table->string('middle_name')->nullable()->comment('User Middle Name.');
+            $table->string('last_name')->comment('User Last Name.');
+            $table->string('username')->unique();
+            $table->string('email')->unique()->nullable();
+            $table->string('license')->nullable();
+            $table->string('provider_type')->nullable();
+            $table->string('warehouse')->nullable();
+            $table->string('facility')->nullable();
+
+
+            // Miscellaneous properties
+            $table->string('suffix')->comment('User Suffix e.g Dr, PHD, Mr, Mrs');
+            $table->string('federal_tax_id')->unique()->comment('Federal Tax ID');
+            $table->string('federal_drug_id')->unique()->comment('Federal Drug ID. DEA Number');
+            $table->string('taxonomy')->comment('Taxonomy');
+	        $table->bigInteger('npi')->comment('National Provider Identifier.')->default(0);
+	        $table->longText('info')->nullable()->comment('About/Biography/Job Description');
+	        $table->string('access_control')
+                ->comment('Access Control of user. Viz Accounting, Administrators, Clinicians, etc.');
+
+            // remember tokens and timestamps
+            $table->softDeletes();
+            $table->rememberToken()->comment('Remember me token');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users_invited');
+    }
+};
diff --git a/database/migrations/2023_07_25_201052_create_user_invitations_table.php b/database/migrations/2023_07_25_201052_create_user_invitations_table.php
new file mode 100644
index 0000000..08d8d88
--- /dev/null
+++ b/database/migrations/2023_07_25_201052_create_user_invitations_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_invitations', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('for_user')->constrained('users_invited');
+            $table->string('email');
+            $table->string('code')->unique();
+            $table->string('status')->default('pending');
+            $table->timestamp('valid_till')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_invitations');
+    }
+};
diff --git a/resources/app/pages/AddPassword.vue b/resources/app/pages/AddPassword.vue
index 74fabe6..be06e79 100644
--- a/resources/app/pages/AddPassword.vue
+++ b/resources/app/pages/AddPassword.vue
@@ -3,50 +3,79 @@
         <div
             class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
         >
-            <h2 class="text-2xl font-bold mb-4">Add Password</h2>
-            <form @submit.prevent="addPassword" method="post">
-                <div class="mb-4">
-                    <ehr-input
-                        v-model="passwordForm.username"
-                        :error="errors.username"
-                        :label="'User Name'"
-                        :placeholder="'Enter User Name'"
-                        required
-                        disabled
-                    />
+            <div v-if="showExpiredMessage">
+                <!-- Show expired message if the token is expired -->
+                <div class="mb-4 text-center">
+                    <p class="text-3xl text-red-600 font-bold">
+                        Invitation {{ message }}
+                    </p>
                 </div>
-                <div class="mb-4">
-                    <ehr-input
-                        v-model="passwordForm.token"
-                        :error="errors.token"
-                        :label="'Token'"
-                        :placeholder="'Enter Token'"
-                        required
-                        disabled
-                    />
-                </div>
-                <div class="mb-4">
-                    <ehr-input
-                        v-model="passwordForm.password"
-                        :error="errors.password"
-                        :label="'Password'"
-                        :placeholder="'Enter Password'"
-                        type="password"
-                        required
-                    />
+            </div>
+            <div v-if="!showExpiredMessage && showOptions">
+                <!-- Show the Accept or Reject Invitation button -->
+                <h2 class="text-2xl font-bold mb-4 text-center">
+                    Accept Invitation
+                </h2>
+
+                <div class="mb-4 text-center">
+                    <button
+                        @click="acceptInvitation()"
+                        class="bg-green-500 hover:bg-green-600 text-white font-bold py-4 px-8 rounded focus:outline-none focus:ring-2 focus:ring-green-500"
+                    >
+                        Accept Invitation
+                    </button>
+                    <button
+                        @click="rejectInvitation()"
+                        class="bg-red-500 hover:bg-red-600 text-white font-bold py-4 px-8 rounded focus:outline-none focus:ring-2 focus:ring-red-500"
+                    >
+                        Reject Invitation
+                    </button>
                 </div>
-                <button
-                    type="submit"
-                    class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-2 px-4 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
-                >
-                    Submit
-                </button>
-            </form>
+            </div>
+
+            <div v-if="!showExpiredMessage && showAddPasswordForm">
+                <!-- Show the Add Password form -->
+                <h2 class="text-2xl font-bold mb-4 text-center">
+                    Add Password
+                </h2>
+                <form @submit.prevent="addPassword" method="post">
+                    <div class="mb-4">
+                        <ehr-input
+                            v-model="passwordForm.username"
+                            :error="errors.username"
+                            :label="'User Name'"
+                            :placeholder="'Enter User Name'"
+                            required
+                            disabled
+                        />
+                    </div>
+
+                    <div class="mb-4">
+                        <ehr-input
+                            v-model="passwordForm.password"
+                            :error="errors.password"
+                            :label="'Password'"
+                            :placeholder="'Enter Password'"
+                            type="password"
+                            required
+                        />
+                    </div>
+                    <div class="text-center">
+                        <button
+                            type="submit"
+                            class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-4 px-8 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
+                        >
+                            Submit
+                        </button>
+                    </div>
+                </form>
+            </div>
         </div>
     </div>
 </template>
 
 <script>
+import axios from "axios";
 export default {
     name: "AddPassword",
     props: {
@@ -54,27 +83,70 @@ export default {
     },
     data() {
         return {
+            code: null,
+            message: null,
             passwordForm: this.$inertia.form({
                 expires: null,
                 username: null,
-                token: null,
+                code: null,
                 password: null,
             }),
+            showExpiredMessage: true,
+            showAddPasswordForm: false,
+            showOptions: true,
         };
     },
 
-    mounted() {},
     methods: {
         addPassword() {
-            this.passwordForm.post(this.route("users.verify"));
+            this.passwordForm.post(this.route("invitation.accept"));
+        },
+
+        acceptInvitation() {
+            // Add logic to accept the invitation here
+            this.showOptions = false;
+            this.showAddPasswordForm = true;
+        },
+
+        rejectInvitation() {
+            console.log("reject invitation");
+            axios
+                .post(this.route("invitation.reject"), { code: this.code })
+                .then((response) => {
+                    if (response.data.status == "success") {
+                        this.message = "Rejected";
+                        this.showExpiredMessage = true;
+                        this.showOptions = false;
+                        this.showAddPasswordForm = false;
+                    }
+                });
+        },
+        tokenExpired(code) {
+            axios
+                .post(this.route("invitation.status"), { code: code })
+                .then((response) => {
+                    if (response.data.status != "pending") {
+                        this.message = response.data.status;
+                        this.showExpiredMessage = true;
+                        this.showOptions = false;
+                        this.showAddPasswordForm = false;
+                        return true;
+                    } else {
+                        this.showExpiredMessage = false;
+                        this.showOptions = true;
+                        return false;
+                    }
+                });
         },
     },
 
     created() {
         this.passwordForm.username = this.route().params.username;
-        this.passwordForm.token = this.route().params.token;
+        this.passwordForm.code = this.route().params.code;
+        this.code = this.route().params.code;
         this.passwordForm.expires = this.route().params.expires;
-        this.$on("submit", this.addPasswordPassword);
+        this.$on("submit", this.addPassword);
+        this.tokenExpired(this.code);
     },
 };
 </script>
diff --git a/resources/app/pages/AddUsers.vue b/resources/app/pages/AddUsers.vue
index eb9b665..7672a94 100644
--- a/resources/app/pages/AddUsers.vue
+++ b/resources/app/pages/AddUsers.vue
@@ -260,7 +260,7 @@ export default {
         },
         addUser() {
             console.log(this.userForm);
-            this.userForm.post(this.route("dashboard.users.store"));
+            this.userForm.post(this.route("dashboard.users.add"));
         },
         selectDefaultFacility(facility) {
             this.userForm.default_facility = facility.name;
diff --git a/routes/web.php b/routes/web.php
index 628276d..3f6c6b4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,7 +20,9 @@
 use App\Http\Controllers\Installer\InstallerRequirementsController;
 use App\Http\Controllers\LocaleController;
 use App\Http\Controllers\MailController;
+use App\Http\Controllers\MailSendingController;
 use App\Http\Controllers\PagesController;
+use App\Http\Controllers\UserInvitationController;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -110,6 +112,7 @@ function () {
             // ======== Flow Board routes ========
             Route::get('flow-board', [FlowBoardController::class, 'index'])->name('flow_board');
 
+            Route::get('mail', [MailSendingController::class, 'sendWelcomeEmail'])->name('mail');
 
             // ======== Calendar routes ========
             Route::get('calendar', [CalendarController::class, 'index'])->name('calendar');
@@ -131,7 +134,7 @@ function () {
                 'update' => 'users.update',
                 'destroy' => 'users.destroy',
             ]);
-            Route::post('/add-user', [UserController::class, 'store'])->name('users.add');
+            Route::post('/add-user', [UserInvitationController::class, 'sendInvite'])->name('users.add');
 
             Route::get('users/load/data', [UserController::class, 'getUserData'])
                 ->name('users.load.data');
@@ -209,9 +212,12 @@ function () {
     /* =================================
         LH EHR New User Routes
     ================================= */
-
     Route::get('/add-password', [UserController::class, 'AddPassword'])->name('users.confirm');
-    Route::post('/verify-user', [UserController::class, 'verifyUser'])->name('users.verify');
+    // User Invitation Routes
+    Route::post('/check-invitation-status',
+    [UserInvitationController::class, 'invitationStatus'])->name('invitation.status');
+    Route::post('/accept-invite', [UserInvitationController::class, 'acceptInvite'])->name('invitation.accept');
+    Route::post('/reject-invite', [UserInvitationController::class, 'rejectInvite'])->name('invitation.reject');
 
     /* =================================
         LH EHR ADMIN Routes

From 037543c55ddf287a52cf6232c26cb8023f0037fa Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 26 Jul 2023 21:03:08 +0530
Subject: [PATCH 18/41] Table Updates

---
 .../Controllers/UserInvitationController.php  | 15 +--
 app/Invite.php                                | 92 +++++++++----------
 app/Models/Invitation.php                     | 18 ++++
 app/Models/User.php                           |  2 +-
 app/Models/UserInvitation.php                 | 18 ----
 app/Models/UsersInvited.php                   | 18 ----
 .../2017_06_14_000000_create_users_table.php  |  4 +-
 ...7_25_201028_create_users_invited_table.php | 55 -----------
 ...07_25_201052_create_invitations_table.php} |  8 +-
 resources/app/pages/AddPassword.vue           | 16 ++--
 routes/web.php                                |  2 -
 11 files changed, 86 insertions(+), 162 deletions(-)
 create mode 100644 app/Models/Invitation.php
 delete mode 100644 app/Models/UserInvitation.php
 delete mode 100644 app/Models/UsersInvited.php
 delete mode 100644 database/migrations/2023_07_25_201028_create_users_invited_table.php
 rename database/migrations/{2023_07_25_201052_create_user_invitations_table.php => 2023_07_25_201052_create_invitations_table.php} (71%)

diff --git a/app/Http/Controllers/UserInvitationController.php b/app/Http/Controllers/UserInvitationController.php
index 9533e37..79bbfaa 100644
--- a/app/Http/Controllers/UserInvitationController.php
+++ b/app/Http/Controllers/UserInvitationController.php
@@ -6,14 +6,17 @@
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Redirect;
+use Str;
 
 class UserInvitationController extends Controller
 {
 
     public function sendInvite(Request $request)
     {
+        $temporaryPassword = Str::random(10);
         $userData=[
             'username' => $request->username,
+            'password'=> bcrypt($temporaryPassword),
             'email' => $request->email,
             'first_name' => $request->first_name,
             'middle_name' => $request->middle_name,
@@ -40,9 +43,9 @@ public function sendInvite(Request $request)
 
     public function acceptInvite(Request $request)
     {
-        $code = $request->code;
+        $token = $request->token;
         $password = bcrypt($request->password);
-        $success=Invite::accept($code, $password);
+        $success=Invite::accept($token, $password);
         if($success){
             return Inertia::location(route('login'));
         }else{
@@ -53,8 +56,8 @@ public function acceptInvite(Request $request)
 
     public function rejectInvite(Request $request)
     {
-        $code = $request->code;
-        $success=Invite::reject($code);
+        $token = $request->token;
+        $success=Invite::reject($token);
         if($success){
             return response()->json(['status' => 'success']);
         }else{
@@ -65,8 +68,8 @@ public function rejectInvite(Request $request)
 
     public function invitationStatus(Request $request)
     {
-        $code = $request->code;
-        $status = Invite::status($code);
+        $token = $request->token;
+        $status = Invite::status($token);
         return response()->json(['status' => $status]);
 
     }
diff --git a/app/Invite.php b/app/Invite.php
index e3a966c..e6607cc 100644
--- a/app/Invite.php
+++ b/app/Invite.php
@@ -2,11 +2,9 @@
 namespace App;
 
 use App\Mail\InvitationMail;
-use App\Mail\UserInvitationMail;
 use App\Models\Role;
 use App\Models\User;
-use App\Models\UsersInvited;
-use App\Models\UserInvitation;
+use App\Models\Invitation;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use Inertia\Inertia;
@@ -20,15 +18,15 @@ public static function send($userData, $email,)
 
 
         // Save the invitation data in the users_invited table
-        $userInvited = UsersInvited::create($userData);
-        // Generate a unique code for the invitation
-        $code = Str::random(10);
+        $userInvited = User::create($userData);
+        // Generate a unique token for the invitation
+        $token = Str::random(10);
 
         // Save the invitation data in the user_invitations table
-        $invitation=UserInvitation::create([
+        $invitation=Invitation::create([
             'for_user' => $userInvited->id,
             'email' => $email,
-            'code' => $code,
+            'token' => $token,
             'status' => 'pending',
             'valid_till' => now()->addDays(7), // Invitation valid for 7 days
         ]);
@@ -37,7 +35,7 @@ public static function send($userData, $email,)
         $url = URL::temporarySignedRoute(
             'users.confirm',
             now()->addDays(7),
-            ['username' => $userData['username'],'code'=>$code]
+            ['username' => $userData['username'],'token'=>$token]
         );
         $mailData = [
             'title' => 'User Invitation Mail',
@@ -55,93 +53,91 @@ public static function send($userData, $email,)
         }
     }
 
-    public static function accept($code, $password)
+    public static function accept($token, $password)
     {
-        // Find the invitation by code
-        $invitation = UserInvitation::where('code', $code)->first();
+        // Find the invitation by token
+        $invitation = Invitation::where('token', $token)->first();
 
         if (!$invitation || $invitation->valid_till < now() || $invitation->status != 'pending') {
-            return false; // Invalid invitation code or invitation expired or invitation already accepted/rejected
+            return false; // Invalid invitation token or invitation expired or invitation already accepted/rejected
         }
 
         // Create the new user in the real users table
-        $invitedUser=UsersInvited::find($invitation->for_user);
-
-        $user = User::create([
-            'username' => $invitedUser->username,
-            'email' => $invitedUser->email,
-            'password' =>$password,
-            'first_name' => $invitedUser->first_name,
-            'middle_name' => $invitedUser->middle_name,
-            'last_name' => $invitedUser->last_name,
-            'federal_tax_id' => $invitedUser->federal_tax_id,
-            'federal_drug_id' => $invitedUser->federal_drug_id,
-            'npi' => $invitedUser->npi,
-            'suffix' => $invitedUser->suffix,
-            'taxonomy' => $invitedUser->taxonomy,
-            'info' => $invitedUser->info,
-            'access_control' => $invitedUser->access_control,
-            'warehouse' => $invitedUser->warehouse,
-            'facility'=> $invitedUser->facility,
-            'provider_type' => $invitedUser->provider_type,
-            'license' => $invitedUser->license,
-        ]);
+        $invitedUser=User::find($invitation->for_user);
         $role = Role::where('name', '=', $invitedUser->access_control)->first();
         $permissions=$role->permissions;
-        $user->attachRole($role);
+        $invitedUser->attachRole($role);
         foreach ($permissions as $permission) {
-            $user->attachPermission($permission);
+            $invitedUser->attachPermission($permission);
         }
         $invitation->update([
             'status' => 'accepted',
         ]);
+        $invitedUser->update([
+            'password' => $password,
+            'invitation' => 'accepted',
+        ]);
         $invitation->save();
-        if($user->save()){
+        if($invitedUser->save()){
             return true;
         }
 
         return false; //if any error occurs
     }
 
-    public static function reject($code)
+    public static function reject($token)
     {
-        // Find the invitation by code
-        $invitation = UserInvitation::where('code', $code)->first();
+        // Find the invitation by token
+        $invitation = Invitation::where('token', $token)->first();
 
         if (!$invitation) {
-            return false; // Invalid invitation code
+            return false; // Invalid invitation token
         }
+        $invitedUser=User::where('id', $invitation->for_user)->first();
 
+        if (!$invitedUser) {
+            return false; // Invalid invitation token
+        }
+        $invitedUser->update([
+            'invitation' => 'rejected',
+        ]);
+        $invitedUser->save();
         // Update the invitation status
         $invitation->update([
             'status' => 'rejected',
         ]);
 
         $invitation->save();
+
         return true; // Invitation rejected successfully
     }
 
-    public static function isExpired($code)
+    public static function isExpired($token)
     {
-        // Find the invitation by code
-        $invitation = UserInvitation::where('code', $code)->first();
+        // Find the invitation by token
+        $invitation = Invitation::where('token', $token)->first();
+        $invitedUser=User::find($invitation->for_user);
         if($invitation->valid_till < now()){
             $invitation->update([
                 'status' => 'expired',
             ]);
+            $invitedUser->update([
+                'invitation' => 'expired',
+            ]);
             $invitation->save();
+            $invitedUser->save();
             return true;
         }
         return false;
     }
 
-    public static function status($code)
+    public static function status($token)
     {
-        // Find the invitation by code
-        $invitation = UserInvitation::where('code', $code)->first();
+        // Find the invitation by token
+        $invitation = Invitation::where('token', $token)->first();
 
         if (!$invitation) {
-            return 'invalid'; // Invalid invitation code
+            return 'invalid'; // Invalid invitation token
         }
 
         return $invitation->status;
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
new file mode 100644
index 0000000..17069d6
--- /dev/null
+++ b/app/Models/Invitation.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Invitation extends Model
+{
+    use HasFactory;
+    protected $table = 'invitations';
+    protected $fillable = ['for_user', 'email', 'token', 'status', 'valid_till'];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'for_user');
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index c5b7e74..894ec5f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -31,7 +31,7 @@ class User extends Authenticatable
      */
     protected $fillable = [
         'username', 'password','email', 'first_name', 'middle_name', 'last_name', 'federal_tax_id',
-        'federal_drug_id', 'see_auth', 'npi', 'suffix', 'taxonomy','license','provider_type','warehouse','additional_details','calendar_ui', 'info', 'token', 'token_expiry','facility',
+        'federal_drug_id', 'see_auth', 'npi', 'suffix', 'taxonomy','license','provider_type','warehouse','additional_details','calendar_ui', 'info','facility','invitation',
         'new_crop_user_role', 'access_control', 'in_calendar', 'device_id', 'last_login_at',
         'last_login_ip', 'created_at', 'updated_at', 'deleted_at'
     ];
diff --git a/app/Models/UserInvitation.php b/app/Models/UserInvitation.php
deleted file mode 100644
index 3a9f03e..0000000
--- a/app/Models/UserInvitation.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class UserInvitation extends Model
-{
-    use HasFactory;
-    protected $table = 'user_invitations';
-    protected $fillable = ['for_user', 'email', 'code', 'status', 'valid_till'];
-
-    public function user()
-    {
-        return $this->belongsTo(UsersInvited::class, 'for_user');
-    }
-}
diff --git a/app/Models/UsersInvited.php b/app/Models/UsersInvited.php
deleted file mode 100644
index f9bc8ba..0000000
--- a/app/Models/UsersInvited.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class UsersInvited extends Model
-{
-    use HasFactory;
-    protected $table = 'users_invited';
-    protected $fillable = [
-        'username','email', 'first_name', 'middle_name', 'last_name', 'federal_tax_id',
-        'federal_drug_id', 'npi', 'suffix', 'taxonomy','license','provider_type','warehouse', 'info','facility',
-     'access_control',
-    ];
-
-}
diff --git a/database/migrations/2017_06_14_000000_create_users_table.php b/database/migrations/2017_06_14_000000_create_users_table.php
index 45923c6..918c371 100755
--- a/database/migrations/2017_06_14_000000_create_users_table.php
+++ b/database/migrations/2017_06_14_000000_create_users_table.php
@@ -33,8 +33,8 @@ public function up()
             $table->string('warehouse')->nullable();
             $table->string('facility')->nullable();
             $table->text('additional_details')->nullable();
-            $table->string('token')->nullable()->comment('Token');
-            $table->timestamp('token_expiry')->default(now())->comment('Token Expiry');
+            $table->string('invitation')->default('pending')->comment('Invitation Status');
+
 
 
             // Miscellaneous properties
diff --git a/database/migrations/2023_07_25_201028_create_users_invited_table.php b/database/migrations/2023_07_25_201028_create_users_invited_table.php
deleted file mode 100644
index 63f3303..0000000
--- a/database/migrations/2023_07_25_201028_create_users_invited_table.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('users_invited', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('first_name')->comment('User First Name.');
-            $table->string('middle_name')->nullable()->comment('User Middle Name.');
-            $table->string('last_name')->comment('User Last Name.');
-            $table->string('username')->unique();
-            $table->string('email')->unique()->nullable();
-            $table->string('license')->nullable();
-            $table->string('provider_type')->nullable();
-            $table->string('warehouse')->nullable();
-            $table->string('facility')->nullable();
-
-
-            // Miscellaneous properties
-            $table->string('suffix')->comment('User Suffix e.g Dr, PHD, Mr, Mrs');
-            $table->string('federal_tax_id')->unique()->comment('Federal Tax ID');
-            $table->string('federal_drug_id')->unique()->comment('Federal Drug ID. DEA Number');
-            $table->string('taxonomy')->comment('Taxonomy');
-	        $table->bigInteger('npi')->comment('National Provider Identifier.')->default(0);
-	        $table->longText('info')->nullable()->comment('About/Biography/Job Description');
-	        $table->string('access_control')
-                ->comment('Access Control of user. Viz Accounting, Administrators, Clinicians, etc.');
-
-            // remember tokens and timestamps
-            $table->softDeletes();
-            $table->rememberToken()->comment('Remember me token');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('users_invited');
-    }
-};
diff --git a/database/migrations/2023_07_25_201052_create_user_invitations_table.php b/database/migrations/2023_07_25_201052_create_invitations_table.php
similarity index 71%
rename from database/migrations/2023_07_25_201052_create_user_invitations_table.php
rename to database/migrations/2023_07_25_201052_create_invitations_table.php
index 08d8d88..e13bb92 100644
--- a/database/migrations/2023_07_25_201052_create_user_invitations_table.php
+++ b/database/migrations/2023_07_25_201052_create_invitations_table.php
@@ -13,11 +13,11 @@
      */
     public function up()
     {
-        Schema::create('user_invitations', function (Blueprint $table) {
+        Schema::create('invitations', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('for_user')->constrained('users_invited');
+            $table->foreignId('for_user')->constrained('users');
             $table->string('email');
-            $table->string('code')->unique();
+            $table->string('token')->unique();
             $table->string('status')->default('pending');
             $table->timestamp('valid_till')->nullable();
             $table->timestamps();
@@ -31,6 +31,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('user_invitations');
+        Schema::dropIfExists('invitations');
     }
 };
diff --git a/resources/app/pages/AddPassword.vue b/resources/app/pages/AddPassword.vue
index be06e79..3b1b144 100644
--- a/resources/app/pages/AddPassword.vue
+++ b/resources/app/pages/AddPassword.vue
@@ -83,12 +83,12 @@ export default {
     },
     data() {
         return {
-            code: null,
+            token: null,
             message: null,
             passwordForm: this.$inertia.form({
                 expires: null,
                 username: null,
-                code: null,
+                token: null,
                 password: null,
             }),
             showExpiredMessage: true,
@@ -111,7 +111,7 @@ export default {
         rejectInvitation() {
             console.log("reject invitation");
             axios
-                .post(this.route("invitation.reject"), { code: this.code })
+                .post(this.route("invitation.reject"), { token: this.token })
                 .then((response) => {
                     if (response.data.status == "success") {
                         this.message = "Rejected";
@@ -121,9 +121,9 @@ export default {
                     }
                 });
         },
-        tokenExpired(code) {
+        tokenExpired(token) {
             axios
-                .post(this.route("invitation.status"), { code: code })
+                .post(this.route("invitation.status"), { token: token })
                 .then((response) => {
                     if (response.data.status != "pending") {
                         this.message = response.data.status;
@@ -142,11 +142,11 @@ export default {
 
     created() {
         this.passwordForm.username = this.route().params.username;
-        this.passwordForm.code = this.route().params.code;
-        this.code = this.route().params.code;
+        this.passwordForm.token = this.route().params.token;
+        this.token = this.route().params.token;
         this.passwordForm.expires = this.route().params.expires;
         this.$on("submit", this.addPassword);
-        this.tokenExpired(this.code);
+        this.tokenExpired(this.token);
     },
 };
 </script>
diff --git a/routes/web.php b/routes/web.php
index 3f6c6b4..869c6ec 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,8 +19,6 @@
 use App\Http\Controllers\Installer\InstallerFilePermissionController;
 use App\Http\Controllers\Installer\InstallerRequirementsController;
 use App\Http\Controllers\LocaleController;
-use App\Http\Controllers\MailController;
-use App\Http\Controllers\MailSendingController;
 use App\Http\Controllers\PagesController;
 use App\Http\Controllers\UserInvitationController;
 use Illuminate\Support\Facades\Route;

From 97f0a3353a9a2e99bc7e2d7f48e2ec850aa4b867 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 2 Aug 2023 03:49:37 +0530
Subject: [PATCH 19/41] Minor Updates

---
 .../Dashboard/User/UserController.php         |  46 ++++----
 .../Controllers/UserInvitationController.php  |  78 ++++++++------
 app/Invite.php                                |  57 +++++-----
 app/Models/Invitation.php                     |   7 +-
 app/Models/User.php                           |   4 +-
 .../2017_06_14_000000_create_users_table.php  |   2 +-
 ..._07_25_201052_create_invitations_table.php |   3 +-
 resources/app/pages/AddPassword.vue           | 100 +++++++++---------
 routes/web.php                                |  13 +--
 9 files changed, 148 insertions(+), 162 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index 98b6ec0..753c8d3 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -17,22 +17,13 @@
 class UserController extends Controller
 {
 
-    public function index():Response
+    public function index(): Response
     {
-       /**
-     * Shows the role page
-     * @return Response
-     */
-    return Inertia::render('AddUsers');
-    }
-    public function AddPassword():Response
-    {
-       /**
-     * Shows the role page
-     * @return Response
-     */
-    return Inertia::render('AddPassword');
-
+        /**
+         * Shows the role page
+         * @return Response
+         */
+        return Inertia::render('AddUsers');
     }
     /**
      * Show the form for creating a new resource.
@@ -57,7 +48,7 @@ public function store(Request $request)
         $user = User::create([
             'username' => $request->username,
             'email' => $request->email,
-            'password' =>bcrypt($token),
+            'password' => bcrypt($token),
             'first_name' => $request->first_name,
             'middle_name' => $request->middle_name,
             'last_name' => $request->last_name,
@@ -69,7 +60,7 @@ public function store(Request $request)
             'info' => $request->job_description,
             'access_control' => $request->role,
             'warehouse' => $request->default_warehouse,
-            'facility'=> $request->default_facility,
+            'facility' => $request->default_facility,
             'provider_type' => $request->provider_type,
             'license' => $request->license_number,
             'additional_details' => $request->additional_details,
@@ -77,7 +68,7 @@ public function store(Request $request)
             'token_expiry' => now()->addDays(7),
         ]);
         $role = Role::where('name', '=', $request->role)->first();
-        $permissions=$role->permissions;
+        $permissions = $role->permissions;
         $user->attachRole($role);
         foreach ($permissions as $permission) {
             $user->attachPermission($permission);
@@ -86,39 +77,38 @@ public function store(Request $request)
         $url = URL::temporarySignedRoute(
             'users.confirm',
             now()->addDays(7),
-            ['username' => $user->username,'token'=>$token]
+            ['username' => $user->username, 'token' => $token]
         );
         $mailData = [
             'title' => 'User Invitation Mail',
-            'url'=> $url,
+            'url' => $url,
             'facility' => $request->default_facility,
-            'role'=> $request->role,
+            'role' => $request->role,
             'username' => $request->username,
 
         ];
         Mail::to($request->email)->send(new InvitationMail($mailData));
-        if($user->save()){
+        if ($user->save()) {
             return Inertia::location(route('dashboard.users.index'));
-        }else{
+        } else {
             return Redirect::back()->with(['error' => 'Something went wrong']);
         }
-
     }
 
     public function verifyUser(Request $request)
     {
         $user = User::where('username', '=', $request->username)->first();
-        if($user->token_expiry < now()){
+        if ($user->token_expiry < now()) {
             return Redirect::back()->with(['error' => 'Token Expired']);
         }
-        if($user->token == $request->token){
+        if ($user->token == $request->token) {
             $user->password = bcrypt($request->password);
             $user->token = null;
             $user->save();
             return Inertia::location(route('login'));
-        }else{
+        } else {
 
-          return Redirect::back()->with(['error' => 'Token Mismatch']);
+            return Redirect::back()->with(['error' => 'Token Mismatch']);
         }
     }
     /**
diff --git a/app/Http/Controllers/UserInvitationController.php b/app/Http/Controllers/UserInvitationController.php
index 79bbfaa..04169df 100644
--- a/app/Http/Controllers/UserInvitationController.php
+++ b/app/Http/Controllers/UserInvitationController.php
@@ -3,20 +3,46 @@
 namespace App\Http\Controllers;
 
 use App\Invite;
+use App\Models\Invitation;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Redirect;
+use Inertia\Response;
 use Str;
 
 class UserInvitationController extends Controller
 {
 
+    public function index($token): Response
+    {
+        /**
+         * Shows the role page
+         * @return Response
+         */
+        $invite = Invitation::where('token', $token)->first();
+
+        //send a invalid token message if the invite is not found in the database.
+        if (!$invite) {
+            return Inertia::render('AddPassword', ['status' => 'invalid']);
+        }
+
+        //masking the username part of the email.
+        $email = $invite->email;
+        [$username, $domain] = explode('@', $email);
+        $usernameLength = strlen($username);
+        $firstHalf = substr($username, 0, ceil($usernameLength / 2));
+        $secondHalf = str_repeat('*', floor($usernameLength / 2));
+        $maskedEmail = $firstHalf . $secondHalf . '@' . $domain;
+
+        return Inertia::render('AddPassword', ['status' => $invite->status, 'email' => $maskedEmail]);
+    }
+
     public function sendInvite(Request $request)
     {
         $temporaryPassword = Str::random(10);
-        $userData=[
+        $userData = [
             'username' => $request->username,
-            'password'=> bcrypt($temporaryPassword),
+            'password' => bcrypt($temporaryPassword),
             'email' => $request->email,
             'first_name' => $request->first_name,
             'middle_name' => $request->middle_name,
@@ -29,7 +55,7 @@ public function sendInvite(Request $request)
             'info' => $request->job_description,
             'access_control' => $request->role,
             'warehouse' => $request->default_warehouse,
-            'facility'=> $request->default_facility,
+            'facility' => $request->default_facility,
             'provider_type' => $request->provider_type,
             'license' => $request->license_number,
             'additional_details' => $request->additional_details,
@@ -41,37 +67,27 @@ public function sendInvite(Request $request)
         return Inertia::location(route('dashboard.users.index'));
     }
 
-    public function acceptInvite(Request $request)
+    //single controller for both accept and reject based on reject parameter
+    public function acceptOrRejectInvite(Request $request)
     {
         $token = $request->token;
-        $password = bcrypt($request->password);
-        $success=Invite::accept($token, $password);
-        if($success){
-            return Inertia::location(route('login'));
-        }else{
-            return Redirect::back()->with(['error' => 'Something went wrong']);
-        }
-
-    }
 
-    public function rejectInvite(Request $request)
-    {
-        $token = $request->token;
-        $success=Invite::reject($token);
-        if($success){
-            return response()->json(['status' => 'success']);
-        }else{
-            return Redirect::back()->with(['error' => 'Something went wrong']);
+        $reject = $request->reject;
+        if ($reject) {
+            $success = Invite::reject($token);
+            if ($success) {
+                return Inertia::location(route('login'));
+            } else {
+                return Redirect::back()->with(['error' => 'Something went wrong']);
+            }
+        } else {
+            $password = bcrypt($request->password);
+            $success = Invite::accept($token, $password);
+            if ($success) {
+                return Inertia::location(route('login'));
+            } else {
+                return Redirect::back()->with(['error' => 'Something went wrong']);
+            }
         }
-
     }
-
-    public function invitationStatus(Request $request)
-    {
-        $token = $request->token;
-        $status = Invite::status($token);
-        return response()->json(['status' => $status]);
-
-    }
-
 }
diff --git a/app/Invite.php b/app/Invite.php
index e6607cc..8ccb2ed 100644
--- a/app/Invite.php
+++ b/app/Invite.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App;
 
 use App\Mail\InvitationMail;
@@ -17,38 +18,37 @@ public static function send($userData, $email,)
     {
 
 
-        // Save the invitation data in the users_invited table
+        // Create the user in the users table
         $userInvited = User::create($userData);
+
         // Generate a unique token for the invitation
         $token = Str::random(10);
 
-        // Save the invitation data in the user_invitations table
-        $invitation=Invitation::create([
-            'for_user' => $userInvited->id,
+        // Save the invitation data in the invitations table
+        $invitation = Invitation::create([
             'email' => $email,
             'token' => $token,
             'status' => 'pending',
+            'facility' => $userData['facility'],
             'valid_till' => now()->addDays(7), // Invitation valid for 7 days
         ]);
 
         // Send the invitation email
-        $url = URL::temporarySignedRoute(
-            'users.confirm',
-            now()->addDays(7),
-            ['username' => $userData['username'],'token'=>$token]
-        );
+        $url = url("/invitations/join/{$token}");
         $mailData = [
             'title' => 'User Invitation Mail',
-            'url'=> $url,
+            'url' => $url,
             'facility' => $userData['facility'],
-            'role'=> $userData['access_control'],
+            'role' => $userData['access_control'],
             'username' => $userData['username'],
 
         ];
+
         Mail::to($userData['email'])->send(new InvitationMail($mailData));
-        if($invitation->save()){
-            return Inertia::location(route('dashboard.users.index'));
-        }else{
+
+        if ($invitation->save()) {
+            return Inertia::location(route('dashboard.users.index'), ['success' => 'Invitation sent successfully']);
+        } else {
             return Redirect::back()->with(['error' => 'Something went wrong']);
         }
     }
@@ -63,22 +63,22 @@ public static function accept($token, $password)
         }
 
         // Create the new user in the real users table
-        $invitedUser=User::find($invitation->for_user);
+        $invitedUser = User::where('email', $invitation->email)->first();
         $role = Role::where('name', '=', $invitedUser->access_control)->first();
-        $permissions=$role->permissions;
+        $permissions = $role->permissions;
         $invitedUser->attachRole($role);
         foreach ($permissions as $permission) {
             $invitedUser->attachPermission($permission);
         }
         $invitation->update([
             'status' => 'accepted',
+            'accepted_at' => now(),
         ]);
         $invitedUser->update([
             'password' => $password,
-            'invitation' => 'accepted',
         ]);
         $invitation->save();
-        if($invitedUser->save()){
+        if ($invitedUser->save()) {
             return true;
         }
 
@@ -93,15 +93,7 @@ public static function reject($token)
         if (!$invitation) {
             return false; // Invalid invitation token
         }
-        $invitedUser=User::where('id', $invitation->for_user)->first();
 
-        if (!$invitedUser) {
-            return false; // Invalid invitation token
-        }
-        $invitedUser->update([
-            'invitation' => 'rejected',
-        ]);
-        $invitedUser->save();
         // Update the invitation status
         $invitation->update([
             'status' => 'rejected',
@@ -116,16 +108,15 @@ public static function isExpired($token)
     {
         // Find the invitation by token
         $invitation = Invitation::where('token', $token)->first();
-        $invitedUser=User::find($invitation->for_user);
-        if($invitation->valid_till < now()){
+        if (!$invitation) {
+            return true;
+        }
+        //checking invitation is expired or not based on valid_till
+        if ($invitation->valid_till < now()) {
             $invitation->update([
                 'status' => 'expired',
             ]);
-            $invitedUser->update([
-                'invitation' => 'expired',
-            ]);
             $invitation->save();
-            $invitedUser->save();
             return true;
         }
         return false;
@@ -135,10 +126,10 @@ public static function status($token)
     {
         // Find the invitation by token
         $invitation = Invitation::where('token', $token)->first();
-
         if (!$invitation) {
             return 'invalid'; // Invalid invitation token
         }
+        $expired = self::isExpired($token);
 
         return $invitation->status;
     }
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 17069d6..c8610d5 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -9,10 +9,5 @@ class Invitation extends Model
 {
     use HasFactory;
     protected $table = 'invitations';
-    protected $fillable = ['for_user', 'email', 'token', 'status', 'valid_till'];
-
-    public function user()
-    {
-        return $this->belongsTo(User::class, 'for_user');
-    }
+    protected $fillable = ['email', 'facility', 'token', 'status', 'valid_till', 'accepted_at'];
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 894ec5f..1777eb3 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -30,8 +30,8 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'username', 'password','email', 'first_name', 'middle_name', 'last_name', 'federal_tax_id',
-        'federal_drug_id', 'see_auth', 'npi', 'suffix', 'taxonomy','license','provider_type','warehouse','additional_details','calendar_ui', 'info','facility','invitation',
+        'username', 'password', 'email', 'first_name', 'middle_name', 'last_name', 'federal_tax_id',
+        'federal_drug_id', 'see_auth', 'npi', 'suffix', 'taxonomy', 'license', 'provider_type', 'warehouse', 'additional_details', 'calendar_ui', 'info', 'facility',
         'new_crop_user_role', 'access_control', 'in_calendar', 'device_id', 'last_login_at',
         'last_login_ip', 'created_at', 'updated_at', 'deleted_at'
     ];
diff --git a/database/migrations/2017_06_14_000000_create_users_table.php b/database/migrations/2017_06_14_000000_create_users_table.php
index 918c371..64d1845 100755
--- a/database/migrations/2017_06_14_000000_create_users_table.php
+++ b/database/migrations/2017_06_14_000000_create_users_table.php
@@ -33,7 +33,7 @@ public function up()
             $table->string('warehouse')->nullable();
             $table->string('facility')->nullable();
             $table->text('additional_details')->nullable();
-            $table->string('invitation')->default('pending')->comment('Invitation Status');
+
 
 
 
diff --git a/database/migrations/2023_07_25_201052_create_invitations_table.php b/database/migrations/2023_07_25_201052_create_invitations_table.php
index e13bb92..2394591 100644
--- a/database/migrations/2023_07_25_201052_create_invitations_table.php
+++ b/database/migrations/2023_07_25_201052_create_invitations_table.php
@@ -15,10 +15,11 @@ public function up()
     {
         Schema::create('invitations', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('for_user')->constrained('users');
             $table->string('email');
+            $table->string('facility');
             $table->string('token')->unique();
             $table->string('status')->default('pending');
+            $table->timestamp('accepted_at')->nullable();
             $table->timestamp('valid_till')->nullable();
             $table->timestamps();
         });
diff --git a/resources/app/pages/AddPassword.vue b/resources/app/pages/AddPassword.vue
index 3b1b144..dafc489 100644
--- a/resources/app/pages/AddPassword.vue
+++ b/resources/app/pages/AddPassword.vue
@@ -3,15 +3,15 @@
         <div
             class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
         >
-            <div v-if="showExpiredMessage">
+            <div v-if="status != 'pending'">
                 <!-- Show expired message if the token is expired -->
                 <div class="mb-4 text-center">
                     <p class="text-3xl text-red-600 font-bold">
-                        Invitation {{ message }}
+                        Invitation {{ status }}. Please Contact Admin.
                     </p>
                 </div>
             </div>
-            <div v-if="!showExpiredMessage && showOptions">
+            <div v-if="showOptions && status == 'pending'">
                 <!-- Show the Accept or Reject Invitation button -->
                 <h2 class="text-2xl font-bold mb-4 text-center">
                     Accept Invitation
@@ -33,22 +33,17 @@
                 </div>
             </div>
 
-            <div v-if="!showExpiredMessage && showAddPasswordForm">
+            <div v-if="showAddPasswordForm">
                 <!-- Show the Add Password form -->
                 <h2 class="text-2xl font-bold mb-4 text-center">
                     Add Password
                 </h2>
                 <form @submit.prevent="addPassword" method="post">
-                    <div class="mb-4">
-                        <ehr-input
-                            v-model="passwordForm.username"
-                            :error="errors.username"
-                            :label="'User Name'"
-                            :placeholder="'Enter User Name'"
-                            required
-                            disabled
-                        />
-                    </div>
+                    <p class="text-lg text-center mb-5">
+                        This invitation is for
+                        <span class="font-bold">{{ email }}</span
+                        >. Add a password to login into the account.
+                    </p>
 
                     <div class="mb-4">
                         <ehr-input
@@ -60,6 +55,21 @@
                             required
                         />
                     </div>
+                    <div class="mb-4">
+                        <ehr-input
+                            v-model="confirmPassword"
+                            :label="'Confirm Password'"
+                            :placeholder="'Confirm Password'"
+                            type="password"
+                            required
+                        />
+                    </div>
+                    <p
+                        v-if="showPasswordMismatchError"
+                        class="text-red-500 mb-5"
+                    >
+                        Password and Confirm Password must match.
+                    </p>
                     <div class="text-center">
                         <button
                             type="submit"
@@ -80,25 +90,42 @@ export default {
     name: "AddPassword",
     props: {
         errors: Object,
+        status: String,
+        email: String,
     },
     data() {
         return {
-            token: null,
             message: null,
             passwordForm: this.$inertia.form({
-                expires: null,
-                username: null,
                 token: null,
                 password: null,
+                reject: false,
             }),
-            showExpiredMessage: true,
+            confirmPassword: null,
+            passwordsMatch: true,
             showAddPasswordForm: false,
             showOptions: true,
         };
     },
-
+    computed: {
+        showPasswordMismatchError() {
+            return (
+                this.passwordForm.password !== this.confirmPassword &&
+                !this.passwordsMatch
+            );
+        },
+    },
     methods: {
         addPassword() {
+            this.passwordsMatch =
+                this.passwordForm.password === this.confirmPassword;
+
+            if (!this.passwordsMatch) {
+                this.errors.confirmPassword =
+                    "Password and Confirm Password must match.";
+                return;
+            }
+            this.errors.confirmPassword = null; // Reset the error if passwords match
             this.passwordForm.post(this.route("invitation.accept"));
         },
 
@@ -110,43 +137,14 @@ export default {
 
         rejectInvitation() {
             console.log("reject invitation");
-            axios
-                .post(this.route("invitation.reject"), { token: this.token })
-                .then((response) => {
-                    if (response.data.status == "success") {
-                        this.message = "Rejected";
-                        this.showExpiredMessage = true;
-                        this.showOptions = false;
-                        this.showAddPasswordForm = false;
-                    }
-                });
-        },
-        tokenExpired(token) {
-            axios
-                .post(this.route("invitation.status"), { token: token })
-                .then((response) => {
-                    if (response.data.status != "pending") {
-                        this.message = response.data.status;
-                        this.showExpiredMessage = true;
-                        this.showOptions = false;
-                        this.showAddPasswordForm = false;
-                        return true;
-                    } else {
-                        this.showExpiredMessage = false;
-                        this.showOptions = true;
-                        return false;
-                    }
-                });
+            this.passwordForm.reject = true;
+            this.passwordForm.post(this.route("invitation.accept"));
         },
     },
 
     created() {
-        this.passwordForm.username = this.route().params.username;
         this.passwordForm.token = this.route().params.token;
-        this.token = this.route().params.token;
-        this.passwordForm.expires = this.route().params.expires;
-        this.$on("submit", this.addPassword);
-        this.tokenExpired(this.token);
+        // this.$on("submit", this.addPassword);
     },
 };
 </script>
diff --git a/routes/web.php b/routes/web.php
index 869c6ec..67d76b1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -167,7 +167,7 @@ function () {
                     'prefix' => 'patients',
                     'namespace' => '\\',
                     // TODO (add a middleware for selected patients)
-                     'middleware' => 'select.patient',
+                    'middleware' => 'select.patient',
                 ],
                 function () {
                     Route::get('select/{pid}', [PatientController::class, 'selectPatient'])
@@ -210,12 +210,9 @@ function () {
     /* =================================
         LH EHR New User Routes
     ================================= */
-    Route::get('/add-password', [UserController::class, 'AddPassword'])->name('users.confirm');
-    // User Invitation Routes
-    Route::post('/check-invitation-status',
-    [UserInvitationController::class, 'invitationStatus'])->name('invitation.status');
-    Route::post('/accept-invite', [UserInvitationController::class, 'acceptInvite'])->name('invitation.accept');
-    Route::post('/reject-invite', [UserInvitationController::class, 'rejectInvite'])->name('invitation.reject');
+    Route::get('/invitations/join/{token}', [UserInvitationController::class, 'index'])->name('invitation.get');
+    Route::post('/invitations/accept', [UserInvitationController::class, 'acceptOrRejectInvite'])->name('invitation.accept');
+
 
     /* =================================
         LH EHR ADMIN Routes
@@ -236,5 +233,3 @@ function () {
         });
     });
 });
-
-

From 7e18c00a72c95e3190e908fddd975285c6541a86 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 2 Aug 2023 12:23:21 +0530
Subject: [PATCH 20/41] Minor updates on reviews

---
 .../Dashboard/User/SetupAccount.php           | 17 +++++
 .../Dashboard/User/UserController.php         | 70 +------------------
 ...ontroller.php => InvitationController.php} |  9 ++-
 app/Invite.php                                |  3 +-
 routes/web.php                                | 10 +--
 5 files changed, 30 insertions(+), 79 deletions(-)
 create mode 100644 app/Http/Controllers/Dashboard/User/SetupAccount.php
 rename app/Http/Controllers/{UserInvitationController.php => InvitationController.php} (89%)

diff --git a/app/Http/Controllers/Dashboard/User/SetupAccount.php b/app/Http/Controllers/Dashboard/User/SetupAccount.php
new file mode 100644
index 0000000..b901dfd
--- /dev/null
+++ b/app/Http/Controllers/Dashboard/User/SetupAccount.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Controllers\Dashboard\User;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+
+class SetupAccount extends Controller
+{
+    //
+    public function index()
+    {
+
+        return Inertia::render('AddUsers');
+    }
+}
diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index 753c8d3..295db01 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -17,13 +17,12 @@
 class UserController extends Controller
 {
 
-    public function index(): Response
+    public function index()
     {
         /**
          * Shows the role page
          * @return Response
          */
-        return Inertia::render('AddUsers');
     }
     /**
      * Show the form for creating a new resource.
@@ -43,73 +42,6 @@ public function create()
      */
     public function store(Request $request)
     {
-        //create user
-        $token = Str::random(40);
-        $user = User::create([
-            'username' => $request->username,
-            'email' => $request->email,
-            'password' => bcrypt($token),
-            'first_name' => $request->first_name,
-            'middle_name' => $request->middle_name,
-            'last_name' => $request->last_name,
-            'federal_tax_id' => $request->tax_id,
-            'federal_drug_id' => $request->dea_number,
-            'npi' => $request->npi,
-            'suffix' => $request->suffix,
-            'taxonomy' => $request->taxonomy,
-            'info' => $request->job_description,
-            'access_control' => $request->role,
-            'warehouse' => $request->default_warehouse,
-            'facility' => $request->default_facility,
-            'provider_type' => $request->provider_type,
-            'license' => $request->license_number,
-            'additional_details' => $request->additional_details,
-            'token' => $token,
-            'token_expiry' => now()->addDays(7),
-        ]);
-        $role = Role::where('name', '=', $request->role)->first();
-        $permissions = $role->permissions;
-        $user->attachRole($role);
-        foreach ($permissions as $permission) {
-            $user->attachPermission($permission);
-        }
-        $user->save();
-        $url = URL::temporarySignedRoute(
-            'users.confirm',
-            now()->addDays(7),
-            ['username' => $user->username, 'token' => $token]
-        );
-        $mailData = [
-            'title' => 'User Invitation Mail',
-            'url' => $url,
-            'facility' => $request->default_facility,
-            'role' => $request->role,
-            'username' => $request->username,
-
-        ];
-        Mail::to($request->email)->send(new InvitationMail($mailData));
-        if ($user->save()) {
-            return Inertia::location(route('dashboard.users.index'));
-        } else {
-            return Redirect::back()->with(['error' => 'Something went wrong']);
-        }
-    }
-
-    public function verifyUser(Request $request)
-    {
-        $user = User::where('username', '=', $request->username)->first();
-        if ($user->token_expiry < now()) {
-            return Redirect::back()->with(['error' => 'Token Expired']);
-        }
-        if ($user->token == $request->token) {
-            $user->password = bcrypt($request->password);
-            $user->token = null;
-            $user->save();
-            return Inertia::location(route('login'));
-        } else {
-
-            return Redirect::back()->with(['error' => 'Token Mismatch']);
-        }
     }
     /**
      * Display the specified resource.
diff --git a/app/Http/Controllers/UserInvitationController.php b/app/Http/Controllers/InvitationController.php
similarity index 89%
rename from app/Http/Controllers/UserInvitationController.php
rename to app/Http/Controllers/InvitationController.php
index 04169df..04c304c 100644
--- a/app/Http/Controllers/UserInvitationController.php
+++ b/app/Http/Controllers/InvitationController.php
@@ -10,7 +10,7 @@
 use Inertia\Response;
 use Str;
 
-class UserInvitationController extends Controller
+class InvitationController extends Controller
 {
 
     public function index($token): Response
@@ -29,10 +29,9 @@ public function index($token): Response
         //masking the username part of the email.
         $email = $invite->email;
         [$username, $domain] = explode('@', $email);
+        $emailLength = strlen($email);
         $usernameLength = strlen($username);
-        $firstHalf = substr($username, 0, ceil($usernameLength / 2));
-        $secondHalf = str_repeat('*', floor($usernameLength / 2));
-        $maskedEmail = $firstHalf . $secondHalf . '@' . $domain;
+        $maskedEmail = Str::mask($email, '*', - ($emailLength - $usernameLength / 2), $usernameLength / 2);
 
         return Inertia::render('AddPassword', ['status' => $invite->status, 'email' => $maskedEmail]);
     }
@@ -64,7 +63,7 @@ public function sendInvite(Request $request)
 
 
         Invite::send($userData, $request->email);
-        return Inertia::location(route('dashboard.users.index'));
+        return Inertia::location(route('dashboard.users.invite'));
     }
 
     //single controller for both accept and reject based on reject parameter
diff --git a/app/Invite.php b/app/Invite.php
index 8ccb2ed..f76f80e 100644
--- a/app/Invite.php
+++ b/app/Invite.php
@@ -34,7 +34,8 @@ public static function send($userData, $email,)
         ]);
 
         // Send the invitation email
-        $url = url("/invitations/join/{$token}");
+        // $url = url("/invitations/join/{$token}");
+        $url = route('invitation.get', ['token' => $token]);
         $mailData = [
             'title' => 'User Invitation Mail',
             'url' => $url,
diff --git a/routes/web.php b/routes/web.php
index 67d76b1..e08c9ed 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,6 +13,7 @@
 use App\Http\Controllers\Dashboard\Patient\PatientController;
 use App\Http\Controllers\Dashboard\Patient\PatientHistoryController;
 use App\Http\Controllers\Dashboard\PermissionController;
+use App\Http\Controllers\Dashboard\User\SetupAccount;
 use App\Http\Controllers\Dashboard\User\UserController;
 use App\Http\Controllers\Installer\InstallerController;
 use App\Http\Controllers\Installer\InstallerDatabaseController;
@@ -20,7 +21,7 @@
 use App\Http\Controllers\Installer\InstallerRequirementsController;
 use App\Http\Controllers\LocaleController;
 use App\Http\Controllers\PagesController;
-use App\Http\Controllers\UserInvitationController;
+use App\Http\Controllers\InvitationController;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -132,7 +133,8 @@ function () {
                 'update' => 'users.update',
                 'destroy' => 'users.destroy',
             ]);
-            Route::post('/add-user', [UserInvitationController::class, 'sendInvite'])->name('users.add');
+            Route::get('/add-user', [SetupAccount::class, 'index'])->name('users.invite');
+            Route::post('/add-user', [InvitationController::class, 'sendInvite'])->name('users.add');
 
             Route::get('users/load/data', [UserController::class, 'getUserData'])
                 ->name('users.load.data');
@@ -210,8 +212,8 @@ function () {
     /* =================================
         LH EHR New User Routes
     ================================= */
-    Route::get('/invitations/join/{token}', [UserInvitationController::class, 'index'])->name('invitation.get');
-    Route::post('/invitations/accept', [UserInvitationController::class, 'acceptOrRejectInvite'])->name('invitation.accept');
+    Route::get('/invitations/join/{token}', [InvitationController::class, 'index'])->name('invitation.get');
+    Route::post('/invitations/accept', [InvitationController::class, 'acceptOrRejectInvite'])->name('invitation.accept');
 
 
     /* =================================

From d796678118f554b92aa91a8b5cb2eaee6df1b45c Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 5 Aug 2023 01:15:10 +0530
Subject: [PATCH 21/41] Invitations List UI

---
 app/Http/Controllers/InvitationController.php |   7 +
 app/Models/Invitation.php                     |   4 +
 resources/app/pages/Invitations.vue           | 130 ++++++++++++++++++
 routes/web.php                                |   3 +
 4 files changed, 144 insertions(+)
 create mode 100644 resources/app/pages/Invitations.vue

diff --git a/app/Http/Controllers/InvitationController.php b/app/Http/Controllers/InvitationController.php
index 04c304c..4727e30 100644
--- a/app/Http/Controllers/InvitationController.php
+++ b/app/Http/Controllers/InvitationController.php
@@ -12,6 +12,13 @@
 
 class InvitationController extends Controller
 {
+    public function showInvitations(): Response
+    {
+        // Fetch invitation data from the database
+        $invitations = Invitation::with('user')->get();
+
+        return Inertia::render('Invitations', ['invitations' => $invitations]);
+    }
 
     public function index($token): Response
     {
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index c8610d5..c20fa83 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -10,4 +10,8 @@ class Invitation extends Model
     use HasFactory;
     protected $table = 'invitations';
     protected $fillable = ['email', 'facility', 'token', 'status', 'valid_till', 'accepted_at'];
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'email', 'email');
+    }
 }
diff --git a/resources/app/pages/Invitations.vue b/resources/app/pages/Invitations.vue
new file mode 100644
index 0000000..d8854f2
--- /dev/null
+++ b/resources/app/pages/Invitations.vue
@@ -0,0 +1,130 @@
+<template>
+    <div class="container mx-auto">
+        <div class="flex justify-center">
+            <h2 class="text-2xl font-bold mb-4">Invitation Details</h2>
+        </div>
+
+        <!-- Facility Filter -->
+        <div class="mb-4">
+            <label class="block mb-2 text-sm font-medium text-gray-700"
+                >Filter by Facility:</label
+            >
+            <select
+                v-model="selectedFacility"
+                class="w-full px-4 py-2 border rounded-md"
+            >
+                <option value="">All Facilities</option>
+                <option
+                    v-for="facility in uniqueFacilities"
+                    :key="facility"
+                    :value="facility"
+                >
+                    {{ facility }}
+                </option>
+            </select>
+        </div>
+
+        <table class="w-full border-collapse">
+            <!-- Table Headers -->
+            <thead>
+                <tr>
+                    <th class="p-4 bg-gray-200">Invitation ID</th>
+                    <th class="p-4 bg-gray-200">Name</th>
+                    <th class="p-4 bg-gray-200">Email</th>
+                    <th class="p-4 bg-gray-200">Facility</th>
+                    <th class="p-4 bg-gray-200">Role</th>
+                    <th class="p-4 bg-gray-200">Status</th>
+                    <th class="p-4 bg-gray-200">Additional Info</th>
+                </tr>
+            </thead>
+            <tbody>
+                <!-- Table Rows -->
+                <tr
+                    v-for="invitation in filteredInvitations"
+                    :key="invitation.id"
+                >
+                    <td class="p-4 border">{{ invitation.id }}</td>
+                    <td class="p-4 border">
+                        {{ invitation.user.first_name }}
+                        {{ invitation.user.last_name }}
+                    </td>
+                    <td class="p-4 border">{{ invitation.email }}</td>
+                    <td class="p-4 border">{{ invitation.facility }}</td>
+                    <td class="p-4 border">
+                        {{ invitation.user.access_control }}
+                    </td>
+                    <td class="p-4 border">
+                        <span
+                            :class="{
+                                'text-green-500':
+                                    invitation.status === 'accepted',
+                                ' text-red-500':
+                                    invitation.status === 'rejected',
+                                ' text-yellow-500':
+                                    invitation.status === 'pending',
+                            }"
+                            class="px-2 py-1 rounded"
+                        >
+                            {{ invitation.status }}
+                        </span>
+                    </td>
+                    <td class="p-4 border">
+                        <span
+                            v-if="invitation.status === 'accepted'"
+                            class="text-green-500 px-2 py-1 rounded"
+                        >
+                            Accepted at: {{ invitation.accepted_at }}
+                        </span>
+                        <span
+                            v-if="invitation.status === 'pending'"
+                            class="text-yellow-500 px-2 py-1 rounded"
+                        >
+                            Valid till: {{ invitation.valid_till }}
+                        </span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</template>
+
+<script>
+import DashboardLayout from "../layouts/DashboardLayout";
+export default {
+    layout: DashboardLayout,
+    props: {
+        invitations: Array, // Get the invitations data from the controller
+    },
+    data() {
+        return {
+            selectedFacility: "", // Holds the selected facility for filtering
+        };
+    },
+    computed: {
+        // Get a list of unique facilities from the invitations data
+        uniqueFacilities() {
+            console.log(this.invitations);
+            return [
+                ...new Set(
+                    this.invitations.map((invitation) => invitation.facility)
+                ),
+            ];
+        },
+        // Filter the invitations based on the selected facility
+        filteredInvitations() {
+            if (this.selectedFacility === "") {
+                // If no facility selected, show all invitations
+                return this.invitations;
+            } else {
+                // Filter the invitations based on the selected facility
+                return this.invitations.filter(
+                    (invitation) =>
+                        invitation.facility === this.selectedFacility
+                );
+            }
+        },
+    },
+};
+</script>
+
+<style></style>
diff --git a/routes/web.php b/routes/web.php
index e08c9ed..c3c4387 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -133,8 +133,10 @@ function () {
                 'update' => 'users.update',
                 'destroy' => 'users.destroy',
             ]);
+
             Route::get('/add-user', [SetupAccount::class, 'index'])->name('users.invite');
             Route::post('/add-user', [InvitationController::class, 'sendInvite'])->name('users.add');
+            Route::get('/invitations', [InvitationController::class, 'showInvitations'])->name('user.invitations');
 
             Route::get('users/load/data', [UserController::class, 'getUserData'])
                 ->name('users.load.data');
@@ -212,6 +214,7 @@ function () {
     /* =================================
         LH EHR New User Routes
     ================================= */
+
     Route::get('/invitations/join/{token}', [InvitationController::class, 'index'])->name('invitation.get');
     Route::post('/invitations/accept', [InvitationController::class, 'acceptOrRejectInvite'])->name('invitation.accept');
 

From c24064e724c6144c756866e8c407f856535d89cc Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 9 Aug 2023 03:39:16 +0530
Subject: [PATCH 22/41] Updates with Pagination.

---
 .../Dashboard/User/SetupAccount.php           |   6 +-
 app/Http/Controllers/InvitationController.php |  31 ++-
 resources/app/pages/AddUsers.vue              |  23 +-
 resources/app/pages/Invitations.vue           | 219 ++++++++++--------
 routes/web.php                                |   1 +
 5 files changed, 156 insertions(+), 124 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/User/SetupAccount.php b/app/Http/Controllers/Dashboard/User/SetupAccount.php
index b901dfd..5c100c9 100644
--- a/app/Http/Controllers/Dashboard/User/SetupAccount.php
+++ b/app/Http/Controllers/Dashboard/User/SetupAccount.php
@@ -3,15 +3,17 @@
 namespace App\Http\Controllers\Dashboard\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\Facilities\Facility;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
 class SetupAccount extends Controller
 {
-    //
+
     public function index()
     {
+        $facilities = Facility::pluck('name', 'id');
 
-        return Inertia::render('AddUsers');
+        return Inertia::render('AddUsers', ['facilities' => $facilities]);
     }
 }
diff --git a/app/Http/Controllers/InvitationController.php b/app/Http/Controllers/InvitationController.php
index 4727e30..262b5d9 100644
--- a/app/Http/Controllers/InvitationController.php
+++ b/app/Http/Controllers/InvitationController.php
@@ -3,21 +3,46 @@
 namespace App\Http\Controllers;
 
 use App\Invite;
+use App\Models\Facilities\Facility;
 use App\Models\Invitation;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Redirect;
 use Inertia\Response;
+use JamesDordoy\LaravelVueDatatable\Http\Resources\DataTableCollectionResource;
 use Str;
 
 class InvitationController extends Controller
 {
     public function showInvitations(): Response
     {
-        // Fetch invitation data from the database
-        $invitations = Invitation::with('user')->get();
 
-        return Inertia::render('Invitations', ['invitations' => $invitations]);
+        $facilities = Facility::pluck('name', 'id');
+
+        return Inertia::render('Invitations', ['facilities' => $facilities]);
+    }
+
+
+    //URL for datatable for invitations
+    public function getInvitations(Request $request)
+    {
+        $length = $request->input('length', 10);
+        $sortBy = $request->input('column');
+        $orderBy = $request->input('dir');
+        $facility = $request->input('facility');
+
+
+        $query = Invitation::with('user');
+
+        $query->orderBy($sortBy, $orderBy);
+
+        if ($facility != null) {
+            $query->where('facility', $facility);
+        }
+
+        $data = $query->paginate($length);
+
+        return new DataTableCollectionResource($data);
     }
 
     public function index($token): Response
diff --git a/resources/app/pages/AddUsers.vue b/resources/app/pages/AddUsers.vue
index 7672a94..60d2bcf 100644
--- a/resources/app/pages/AddUsers.vue
+++ b/resources/app/pages/AddUsers.vue
@@ -147,12 +147,12 @@
                             class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
                         >
                             <li
-                                v-for="facility in facilityOptions"
+                                v-for="facility in facilities"
                                 :key="facility.id"
                                 @click="selectDefaultFacility(facility)"
                                 class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
                             >
-                                {{ facility.name }}
+                                {{ facility }}
                             </li>
                         </ul>
                     </div>
@@ -205,6 +205,9 @@
 </template>
 <script>
 export default {
+    props: {
+        facilities: Object,
+    },
     data() {
         return {
             role_dropdown: null,
@@ -232,20 +235,6 @@ export default {
                 username: "",
                 full_name: "",
             },
-            facilityOptions: [
-                {
-                    id: 1,
-                    name: "Facility 1",
-                },
-                {
-                    id: 2,
-                    name: "Facility 2",
-                },
-                {
-                    id: 3,
-                    name: "Facility 3",
-                },
-            ],
             roleOptions: [],
         };
     },
@@ -263,7 +252,7 @@ export default {
             this.userForm.post(this.route("dashboard.users.add"));
         },
         selectDefaultFacility(facility) {
-            this.userForm.default_facility = facility.name;
+            this.userForm.default_facility = facility;
             this.default_facility_dropdown = false;
         },
         selectRole(role) {
diff --git a/resources/app/pages/Invitations.vue b/resources/app/pages/Invitations.vue
index d8854f2..a7955f3 100644
--- a/resources/app/pages/Invitations.vue
+++ b/resources/app/pages/Invitations.vue
@@ -4,125 +4,140 @@
             <h2 class="text-2xl font-bold mb-4">Invitation Details</h2>
         </div>
 
-        <!-- Facility Filter -->
-        <div class="mb-4">
-            <label class="block mb-2 text-sm font-medium text-gray-700"
-                >Filter by Facility:</label
+        <data-table :columns="columns" :url="url">
+            <div
+                class="flex justify-between mb-2"
+                slot="filters"
+                slot-scope="{ tableFilters, perPage }"
             >
-            <select
-                v-model="selectedFacility"
-                class="w-full px-4 py-2 border rounded-md"
-            >
-                <option value="">All Facilities</option>
-                <option
-                    v-for="facility in uniqueFacilities"
-                    :key="facility"
-                    :value="facility"
-                >
-                    {{ facility }}
-                </option>
-            </select>
-        </div>
-
-        <table class="w-full border-collapse">
-            <!-- Table Headers -->
-            <thead>
-                <tr>
-                    <th class="p-4 bg-gray-200">Invitation ID</th>
-                    <th class="p-4 bg-gray-200">Name</th>
-                    <th class="p-4 bg-gray-200">Email</th>
-                    <th class="p-4 bg-gray-200">Facility</th>
-                    <th class="p-4 bg-gray-200">Role</th>
-                    <th class="p-4 bg-gray-200">Status</th>
-                    <th class="p-4 bg-gray-200">Additional Info</th>
-                </tr>
-            </thead>
-            <tbody>
-                <!-- Table Rows -->
-                <tr
-                    v-for="invitation in filteredInvitations"
-                    :key="invitation.id"
-                >
-                    <td class="p-4 border">{{ invitation.id }}</td>
-                    <td class="p-4 border">
-                        {{ invitation.user.first_name }}
-                        {{ invitation.user.last_name }}
-                    </td>
-                    <td class="p-4 border">{{ invitation.email }}</td>
-                    <td class="p-4 border">{{ invitation.facility }}</td>
-                    <td class="p-4 border">
-                        {{ invitation.user.access_control }}
-                    </td>
-                    <td class="p-4 border">
-                        <span
-                            :class="{
-                                'text-green-500':
-                                    invitation.status === 'accepted',
-                                ' text-red-500':
-                                    invitation.status === 'rejected',
-                                ' text-yellow-500':
-                                    invitation.status === 'pending',
-                            }"
-                            class="px-2 py-1 rounded"
-                        >
-                            {{ invitation.status }}
-                        </span>
-                    </td>
-                    <td class="p-4 border">
-                        <span
-                            v-if="invitation.status === 'accepted'"
-                            class="text-green-500 px-2 py-1 rounded"
+                <div class="w-1/2 mr-5">
+                    <label class="block mb-2 text-sm font-medium text-gray-700"
+                        >Filter by Facility:</label
+                    >
+                    <select
+                        v-model="tableFilters.filters.facility"
+                        class="w-full px-4 py-2 border rounded-md"
+                    >
+                        <option :value="null">All Facilities</option>
+                        <option
+                            v-for="facility in facilities"
+                            :key="facility"
+                            :value="facility"
                         >
-                            Accepted at: {{ invitation.accepted_at }}
-                        </span>
-                        <span
-                            v-if="invitation.status === 'pending'"
-                            class="text-yellow-500 px-2 py-1 rounded"
-                        >
-                            Valid till: {{ invitation.valid_till }}
-                        </span>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
+                            {{ facility }}
+                        </option>
+                    </select>
+                </div>
+                <div class="w-1/2">
+                    <label class="block mb-2 text-sm font-medium text-gray-700"
+                        >Rows Per Page:</label
+                    >
+                    <select
+                        v-model="tableFilters.length"
+                        class="w-full px-4 py-2 border rounded-md"
+                    >
+                        <option :key="page" v-for="page in perPage">
+                            {{ page }}
+                        </option>
+                    </select>
+                </div>
+            </div>
+            <div
+                class="flex justify-center mt-4"
+                slot="pagination"
+                slot-scope="{ links = {}, meta = {} }"
+            >
+                <div class="flex items-center">
+                    <nav>
+                        <div class="inline-flex">
+                            <div class="mr-4 mt-2">
+                                <span class="text-gray-600">
+                                    Showing {{ meta.from }} to {{ meta.to }} of
+                                    {{ meta.total }} Entries
+                                </span>
+                            </div>
+                            <div>
+                                <button
+                                    :disabled="!links.prev"
+                                    class="px-4 py-2 rounded-md border border-gray-300 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50"
+                                    @click="url = links.prev"
+                                >
+                                    Prev
+                                </button>
+                                <button
+                                    :disabled="!links.next"
+                                    class="ml-2 px-4 py-2 rounded-md border border-gray-300 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50"
+                                    @click="url = links.next"
+                                >
+                                    Next
+                                </button>
+                            </div>
+                        </div>
+                    </nav>
+                </div>
+            </div>
+        </data-table>
     </div>
 </template>
 
 <script>
-import DashboardLayout from "../layouts/DashboardLayout";
 export default {
-    layout: DashboardLayout,
     props: {
-        invitations: Array, // Get the invitations data from the controller
+        facilities: Object,
     },
     data() {
         return {
-            selectedFacility: "", // Holds the selected facility for filtering
+            filters: {
+                facility: null,
+            },
+            url: "",
         };
     },
     computed: {
-        // Get a list of unique facilities from the invitations data
-        uniqueFacilities() {
-            console.log(this.invitations);
+        columns() {
             return [
-                ...new Set(
-                    this.invitations.map((invitation) => invitation.facility)
-                ),
+                { label: "Invitation ID", name: "id", orderable: true },
+                {
+                    label: "Name",
+                    name: "user.first_name",
+                    transform: ({ data, name }) =>
+                        `${data.user.first_name} ${data.user.last_name}`,
+                },
+                { label: "Email", name: "email", orderable: true },
+                { label: "Facility", name: "facility", orderable: true },
+                { label: "Role", name: "user.access_control" },
+                {
+                    label: "Status",
+                    name: "status",
+                    transform: ({ data, name }) => {
+                        const status = data[name];
+                        let className = "";
+                        if (status === "accepted") className = "text-green-500";
+                        else if (status === "rejected")
+                            className = "text-red-500";
+                        else if (status === "pending")
+                            className = "text-yellow-500";
+                        return `<span class="px-2 py-1 rounded ${className}">${status}</span>`;
+                    },
+                },
+                {
+                    label: "Additional Info",
+                    name: "status_info",
+                    transform: ({ data, name }) => {
+                        const status = data.status;
+                        if (status === "accepted") {
+                            return `<span class="text-green-500 px-2 py-1 rounded">Accepted at: ${data.accepted_at}</span>`;
+                        } else if (status === "pending") {
+                            return `<span class="text-yellow-500 px-2 py-1 rounded">Valid till: ${data.valid_till}</span>`;
+                        }
+                        return "";
+                    },
+                },
             ];
         },
-        // Filter the invitations based on the selected facility
-        filteredInvitations() {
-            if (this.selectedFacility === "") {
-                // If no facility selected, show all invitations
-                return this.invitations;
-            } else {
-                // Filter the invitations based on the selected facility
-                return this.invitations.filter(
-                    (invitation) =>
-                        invitation.facility === this.selectedFacility
-                );
-            }
-        },
+    },
+    mounted() {
+        this.url = route("invitation.fetch");
     },
 };
 </script>
diff --git a/routes/web.php b/routes/web.php
index c3c4387..65569d9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -217,6 +217,7 @@ function () {
 
     Route::get('/invitations/join/{token}', [InvitationController::class, 'index'])->name('invitation.get');
     Route::post('/invitations/accept', [InvitationController::class, 'acceptOrRejectInvite'])->name('invitation.accept');
+    Route::get('/invitations', [InvitationController::class, 'getInvitations'])->name('invitation.fetch');
 
 
     /* =================================

From 811dd08ff9b601424641c960eefb95d8105f901e Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 9 Aug 2023 20:50:42 +0530
Subject: [PATCH 23/41] Proper Folder Structure Update

---
 .../Controllers/Dashboard/RolesController.php | 55 ++++++++++---------
 .../Dashboard/User/SetupAccount.php           |  2 +-
 app/Http/Controllers/InvitationController.php |  6 +-
 .../app/pages/{ => AccessControl}/Roles.vue   |  2 +-
 .../{ => AccessControl}/RolesDetails.vue      |  2 +-
 .../app/pages/{ => Users}/AddPassword.vue     |  5 +-
 resources/app/pages/{ => Users}/AddUsers.vue  |  2 +
 .../app/pages/{ => Users}/Invitations.vue     |  2 +
 8 files changed, 42 insertions(+), 34 deletions(-)
 rename resources/app/pages/{ => AccessControl}/Roles.vue (99%)
 rename resources/app/pages/{ => AccessControl}/RolesDetails.vue (98%)
 rename resources/app/pages/{ => Users}/AddPassword.vue (97%)
 rename resources/app/pages/{ => Users}/AddUsers.vue (99%)
 rename resources/app/pages/{ => Users}/Invitations.vue (98%)

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index 096450f..0ab7464 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -16,19 +16,21 @@ class RolesController extends Controller
 {
     public function index(): Response
     {
-    /**
-     * Shows the role page
-     * @return Response
-     */
-        return Inertia::render('Roles',['roles' => []]
+        /**
+         * Shows the role page
+         * @return Response
+         */
+        return Inertia::render(
+            'AccessControl/Roles',
+            ['roles' => []]
         );
     }
     public function details($roleId): Response
     {
-         /**
-     * Shows the role page
-     * @return Response
-     */
+        /**
+         * Shows the role page
+         * @return Response
+         */
         $role = Role::with('permissions')->where('id', $roleId)->first();
         $users = $role->users()->get();
         $temp = [
@@ -39,9 +41,10 @@ public function details($roleId): Response
             'permissions' => $role->permissions,
             'users' => $users,
         ];
-        return Inertia::render('RolesDetails',['roleDetails' => $temp]
+        return Inertia::render(
+            'AccessControl/RolesDetails',
+            ['roleDetails' => $temp]
         );
-
     }
     public function store(CreateRoleRequest $request)
     {
@@ -54,29 +57,29 @@ public function store(CreateRoleRequest $request)
             $role->permissions()->attach([$permission['id']]);
         }
         $role->save();
-        if($role->save()){
+        if ($role->save()) {
             return Inertia::location(route('dashboard.roles.index'));
-        }else{
+        } else {
             return Redirect::back()->with(['error' => 'Something went wrong']);
         }
     }
     public function getRoles()
     {
-        $result=[];
+        $result = [];
         $roles = Role::with('permissions')->get();
         foreach ($roles as $role) {
-        $users = $role->users()->get();
-        $temp = [
-            'id' => $role->id,
-            'name' => $role->name,
-            'display_name' => $role->display_name,
-            'description' => $role->description,
-            'permissions' => $role->permissions,
-            'users' => $users,
-        ];
-        array_push($result, $temp);
-    }
+            $users = $role->users()->get();
+            $temp = [
+                'id' => $role->id,
+                'name' => $role->name,
+                'display_name' => $role->display_name,
+                'description' => $role->description,
+                'permissions' => $role->permissions,
+                'users' => $users,
+            ];
+            array_push($result, $temp);
+        }
 
-     return response()->json($result, 200);
+        return response()->json($result, 200);
     }
 }
diff --git a/app/Http/Controllers/Dashboard/User/SetupAccount.php b/app/Http/Controllers/Dashboard/User/SetupAccount.php
index 5c100c9..1cace8c 100644
--- a/app/Http/Controllers/Dashboard/User/SetupAccount.php
+++ b/app/Http/Controllers/Dashboard/User/SetupAccount.php
@@ -14,6 +14,6 @@ public function index()
     {
         $facilities = Facility::pluck('name', 'id');
 
-        return Inertia::render('AddUsers', ['facilities' => $facilities]);
+        return Inertia::render('Users/AddUsers', ['facilities' => $facilities]);
     }
 }
diff --git a/app/Http/Controllers/InvitationController.php b/app/Http/Controllers/InvitationController.php
index 262b5d9..a0a6e5b 100644
--- a/app/Http/Controllers/InvitationController.php
+++ b/app/Http/Controllers/InvitationController.php
@@ -19,7 +19,7 @@ public function showInvitations(): Response
 
         $facilities = Facility::pluck('name', 'id');
 
-        return Inertia::render('Invitations', ['facilities' => $facilities]);
+        return Inertia::render('Users/Invitations', ['facilities' => $facilities]);
     }
 
 
@@ -55,7 +55,7 @@ public function index($token): Response
 
         //send a invalid token message if the invite is not found in the database.
         if (!$invite) {
-            return Inertia::render('AddPassword', ['status' => 'invalid']);
+            return Inertia::render('Users/AddPassword', ['status' => 'invalid']);
         }
 
         //masking the username part of the email.
@@ -65,7 +65,7 @@ public function index($token): Response
         $usernameLength = strlen($username);
         $maskedEmail = Str::mask($email, '*', - ($emailLength - $usernameLength / 2), $usernameLength / 2);
 
-        return Inertia::render('AddPassword', ['status' => $invite->status, 'email' => $maskedEmail]);
+        return Inertia::render('Users/AddPassword', ['status' => $invite->status, 'email' => $maskedEmail]);
     }
 
     public function sendInvite(Request $request)
diff --git a/resources/app/pages/Roles.vue b/resources/app/pages/AccessControl/Roles.vue
similarity index 99%
rename from resources/app/pages/Roles.vue
rename to resources/app/pages/AccessControl/Roles.vue
index 5a44320..6b43eb9 100644
--- a/resources/app/pages/Roles.vue
+++ b/resources/app/pages/AccessControl/Roles.vue
@@ -184,7 +184,7 @@
     </div>
 </template>
 <script>
-import DashboardLayout from "../layouts/DashboardLayout";
+import DashboardLayout from "../../layouts/DashboardLayout";
 export default {
     name: "Roles",
     layout: DashboardLayout,
diff --git a/resources/app/pages/RolesDetails.vue b/resources/app/pages/AccessControl/RolesDetails.vue
similarity index 98%
rename from resources/app/pages/RolesDetails.vue
rename to resources/app/pages/AccessControl/RolesDetails.vue
index a0d9823..3dee409 100644
--- a/resources/app/pages/RolesDetails.vue
+++ b/resources/app/pages/AccessControl/RolesDetails.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import DashboardLayout from "../layouts/DashboardLayout";
+import DashboardLayout from "../../layouts/DashboardLayout";
 export default {
     layout: DashboardLayout,
     props: {
diff --git a/resources/app/pages/AddPassword.vue b/resources/app/pages/Users/AddPassword.vue
similarity index 97%
rename from resources/app/pages/AddPassword.vue
rename to resources/app/pages/Users/AddPassword.vue
index dafc489..e6a6645 100644
--- a/resources/app/pages/AddPassword.vue
+++ b/resources/app/pages/Users/AddPassword.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="flex min-h-screen bg-white py-8 px-4">
         <div
-            class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
+            class="mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
         >
             <div v-if="status != 'pending'">
                 <!-- Show expired message if the token is expired -->
@@ -85,9 +85,10 @@
 </template>
 
 <script>
-import axios from "axios";
+import AuthLayout from "../../layouts/AuthLayout";
 export default {
     name: "AddPassword",
+    layout: AuthLayout,
     props: {
         errors: Object,
         status: String,
diff --git a/resources/app/pages/AddUsers.vue b/resources/app/pages/Users/AddUsers.vue
similarity index 99%
rename from resources/app/pages/AddUsers.vue
rename to resources/app/pages/Users/AddUsers.vue
index 60d2bcf..bcbd4bb 100644
--- a/resources/app/pages/AddUsers.vue
+++ b/resources/app/pages/Users/AddUsers.vue
@@ -204,7 +204,9 @@
     </div>
 </template>
 <script>
+import DashboardLayout from "../../layouts/DashboardLayout";
 export default {
+    layout: DashboardLayout,
     props: {
         facilities: Object,
     },
diff --git a/resources/app/pages/Invitations.vue b/resources/app/pages/Users/Invitations.vue
similarity index 98%
rename from resources/app/pages/Invitations.vue
rename to resources/app/pages/Users/Invitations.vue
index a7955f3..edd03bd 100644
--- a/resources/app/pages/Invitations.vue
+++ b/resources/app/pages/Users/Invitations.vue
@@ -81,7 +81,9 @@
 </template>
 
 <script>
+import DashboardLayout from "../../layouts/DashboardLayout";
 export default {
+    layout: DashboardLayout,
     props: {
         facilities: Object,
     },

From c8420ae320b96ed3611d0273888bb79ea4f61fbe Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Mon, 14 Aug 2023 04:25:46 +0530
Subject: [PATCH 24/41] User Profile Page

---
 .../Dashboard/User/UserController.php         |  15 ++
 resources/app/pages/Users/Invitations.vue     |   9 +-
 resources/app/pages/Users/UserProfile.vue     | 173 ++++++++++++++++++
 routes/web.php                                |   5 +-
 4 files changed, 198 insertions(+), 4 deletions(-)
 create mode 100644 resources/app/pages/Users/UserProfile.vue

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index 295db01..44b83e2 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Mail\InvitationMail;
+use App\Models\Invitation;
 use App\Models\Role;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -54,6 +55,20 @@ public function show($id)
         //
     }
 
+
+    public function profile($userId): Response
+    {
+        /**
+         * Shows the user profile page
+         * @return Response
+         */
+        $user = User::where('id', $userId)->first();
+        $invitation_details = Invitation::where('email', $user->email)->first();
+        $user->invitation_details = $invitation_details;
+
+        return Inertia::render('Users/UserProfile', ['userData' => $user]);
+    }
+
     /**
      * Show the form for editing the specified resource.
      *
diff --git a/resources/app/pages/Users/Invitations.vue b/resources/app/pages/Users/Invitations.vue
index edd03bd..67c3ebc 100644
--- a/resources/app/pages/Users/Invitations.vue
+++ b/resources/app/pages/Users/Invitations.vue
@@ -102,8 +102,13 @@ export default {
                 {
                     label: "Name",
                     name: "user.first_name",
-                    transform: ({ data, name }) =>
-                        `${data.user.first_name} ${data.user.last_name}`,
+                    transform: ({ data, name }) => {
+                        const userId = data.user.id;
+                        const fullName = `${data.user.first_name} ${data.user.last_name}`;
+                        return `<a href="${route("dashboard.users.profile", {
+                            id: userId,
+                        })}" class="text-blue-500 hover:underline">${fullName}</a>`;
+                    },
                 },
                 { label: "Email", name: "email", orderable: true },
                 { label: "Facility", name: "facility", orderable: true },
diff --git a/resources/app/pages/Users/UserProfile.vue b/resources/app/pages/Users/UserProfile.vue
new file mode 100644
index 0000000..39cd974
--- /dev/null
+++ b/resources/app/pages/Users/UserProfile.vue
@@ -0,0 +1,173 @@
+<template>
+    <div class="min-h-screen bg-gray-100">
+        <div class="max-w-7xl mx-auto px-4 py-8">
+            <div class="flex justify-center">
+                <h1 class="text-3xl font-semibold mb-6">User Profile</h1>
+            </div>
+
+            <div
+                class="bg-white rounded-lg shadow-lg p-8 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6"
+            >
+                <!-- General Details -->
+                <div class="bg-gray-200 rounded-lg p-6 text-xl">
+                    <h2 class="text-2xl font-semibold mb-4">General Details</h2>
+                    <p class="font-semibold text-2xl">
+                        {{ userData.suffix ? " " + userData.suffix : "" }}
+                        {{ userData.first_name }} {{ userData.last_name }}
+                    </p>
+                    <p class="mb-2">
+                        <span class="font-semibold">Username:</span> @{{
+                            userData.username
+                        }}
+                    </p>
+                    <p class="mb-2">
+                        <span class="font-semibold">Email:</span>
+                        {{ userData.email }}
+                    </p>
+                </div>
+
+                <!-- ID Details -->
+                <div
+                    class="bg-gray-200 rounded-lg p-6 text-xl col-span-3 md:col-span-2 lg:col-span-2"
+                >
+                    <h2 class="text-2xl font-semibold mb-4">ID Details</h2>
+                    <div
+                        class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-2 gap-2"
+                    >
+                        <p class="mb-2">
+                            <span class="font-semibold">NPI:</span>
+                            {{ userData.npi }}
+                        </p>
+                        <p class="mb-2">
+                            <span class="font-semibold">Federal Tax ID:</span>
+                            {{ userData.federal_tax_id }}
+                        </p>
+                        <p class="mb-2">
+                            <span class="font-semibold">Federal Drug ID:</span>
+                            {{ userData.federal_drug_id }}
+                        </p>
+                        <p class="mb-2">
+                            <span class="font-semibold">Taxonomy:</span>
+                            {{ userData.taxonomy }}
+                        </p>
+                    </div>
+                </div>
+
+                <!-- Roles and Facility -->
+                <div class="bg-gray-200 rounded-lg p-6 text-xl">
+                    <h2 class="text-2xl font-semibold mb-4">
+                        Roles and Facility
+                    </h2>
+                    <p class="mb-2">
+                        <span class="font-semibold">Invitation Status:</span>
+                        <span
+                            :class="{
+                                'text-green-500 font-semibold':
+                                    userData.invitation_details.status ===
+                                    'accepted',
+                                'text-yellow-500 font-semibold':
+                                    userData.invitation_details.status ===
+                                    'pending',
+                                'text-red-500 font-semibold':
+                                    userData.invitation_details.status ===
+                                    'rejected',
+                            }"
+                        >
+                            {{ userData.invitation_details.status }}
+                        </span>
+                    </p>
+                    <p class="mb-2">
+                        <span
+                            class="font-semibold"
+                            v-if="
+                                userData.invitation_details.status ===
+                                'accepted'
+                            "
+                        >
+                            Accepted at:
+                        </span>
+                        <span
+                            class="text-green-500"
+                            v-if="
+                                userData.invitation_details.status ===
+                                'accepted'
+                            "
+                        >
+                            {{ userData.invitation_details.accepted_at }}
+                        </span>
+                        <span
+                            v-if="
+                                userData.invitation_details.status === 'pending'
+                            "
+                            class="font-semibold"
+                        >
+                            Valid till:
+                        </span>
+                        <span
+                            class="text-yellow-500"
+                            v-if="
+                                userData.invitation_details.status === 'pending'
+                            "
+                        >
+                            {{ userData.invitation_details.valid_till }}
+                        </span>
+                    </p>
+                    <p class="mb-2">
+                        <span class="font-semibold"
+                            >Access Control (Role):</span
+                        >
+                        {{ userData.access_control }}
+                    </p>
+
+                    <p class="mb-2">
+                        <span class="font-semibold">Default Facility:</span>
+                        {{ userData.facility }}
+                    </p>
+                </div>
+
+                <!-- Job Description and Additional Details -->
+                <div
+                    class="bg-gray-200 rounded-lg p-6 text-xl col-span-3 md:col-span-2 lg:col-span-2"
+                >
+                    <h2 class="text-2xl font-semibold mb-4">
+                        Job Description and Additional Details
+                    </h2>
+                    <p class="mb-2">
+                        <span class="font-semibold">Job Description:</span>
+                        {{ userData.info }}
+                    </p>
+                    <p class="mb-2">
+                        <span class="font-semibold">Additional Details:</span>
+                        {{ userData.additional_details }}
+                    </p>
+                    <p class="mb-2">
+                        <span class="font-semibold">Default Warehouse:</span>
+                        {{ userData.warehouse }}
+                    </p>
+                    <p class="mb-2">
+                        <span class="font-semibold">Provider Type:</span>
+                        {{ userData.provider_type }}
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import DashboardLayout from "../../layouts/DashboardLayout";
+
+export default {
+    layout: DashboardLayout,
+    props: {
+        userData: Object, // Pass the user data as a prop
+    },
+    data() {
+        return {};
+    },
+};
+</script>
+
+<style>
+/* Add custom styles here if needed */
+</style>
diff --git a/routes/web.php b/routes/web.php
index 65569d9..e54cd63 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -137,9 +137,10 @@ function () {
             Route::get('/add-user', [SetupAccount::class, 'index'])->name('users.invite');
             Route::post('/add-user', [InvitationController::class, 'sendInvite'])->name('users.add');
             Route::get('/invitations', [InvitationController::class, 'showInvitations'])->name('user.invitations');
+            Route::get('/users/profile/{userId}', [UserController::class, 'profile'])->name('users.profile');
+
+
 
-            Route::get('users/load/data', [UserController::class, 'getUserData'])
-                ->name('users.load.data');
 
             // ======== Facility related routes ========
             Route::resource('facilities', FacilityController::class)->names([

From 9b4261fb8d32ff291beab4a4469b803ad02fd3ce Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Tue, 15 Aug 2023 02:56:23 +0530
Subject: [PATCH 25/41] Edit Profile Functionality

---
 .../Dashboard/User/UserController.php         |  58 +++-
 resources/app/pages/Users/EditUser.vue        | 276 ++++++++++++++++++
 resources/app/pages/Users/UserProfile.vue     |  22 +-
 routes/web.php                                |   4 +-
 4 files changed, 353 insertions(+), 7 deletions(-)
 create mode 100644 resources/app/pages/Users/EditUser.vue

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index 44b83e2..201365f 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Mail\InvitationMail;
+use App\Models\Facilities\Facility;
 use App\Models\Invitation;
 use App\Models\Role;
 use App\Models\User;
@@ -69,15 +70,27 @@ public function profile($userId): Response
         return Inertia::render('Users/UserProfile', ['userData' => $user]);
     }
 
+    public function showEditPage($userId): Response
+    {
+        /**
+         * Shows the user edit page
+         * @return Response
+         */
+        $user = User::where('id', $userId)->first();
+        $facilities = Facility::pluck('name', 'id');
+
+        return Inertia::render('Users/EditUser', ['userData' => $user, 'facilities' => $facilities]);
+    }
+
+
     /**
      * Show the form for editing the specified resource.
      *
      * @param  int  $id
      * @return Response
      */
-    public function edit($id)
+    public function edit()
     {
-        //
     }
 
     /**
@@ -87,9 +100,48 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $userId)
     {
         //
+
+
+        //
+        // Get the existing user data
+        $user = User::findOrFail($userId);
+
+        // Update user data
+        $user->username = $request->username;
+        $user->email = $request->email;
+        $user->first_name = $request->first_name;
+        $user->middle_name = $request->middle_name;
+        $user->last_name = $request->last_name;
+        $user->federal_tax_id = $request->tax_id;
+        $user->federal_drug_id = $request->dea_number;
+        $user->npi = $request->npi;
+        $user->suffix = $request->suffix;
+        $user->taxonomy = $request->taxonomy;
+        $user->info = $request->job_description;
+        $user->warehouse = $request->default_warehouse;
+        $user->facility = $request->default_facility;
+        $user->provider_type = $request->provider_type;
+        $user->license = $request->license_number;
+        $user->additional_details = $request->additional_details;
+
+        $user->save();
+        //update the roles if role is changed
+        if ($user->access_control != $request->role) {
+            $user->roles()->detach();
+            $user->permissions()->detach();
+            $user->access_control = $request->role;
+            $role = Role::where('name', '=', $request->role)->first();
+            $permissions = $role->permissions;
+            $user->attachRole($role);
+            foreach ($permissions as $permission) {
+                $user->attachPermission($permission);
+            }
+        }
+        $user->save();
+        return Inertia::location(route('dashboard.users.edit', ['userId' => $user->id]));
     }
 
     /**
diff --git a/resources/app/pages/Users/EditUser.vue b/resources/app/pages/Users/EditUser.vue
new file mode 100644
index 0000000..afa118c
--- /dev/null
+++ b/resources/app/pages/Users/EditUser.vue
@@ -0,0 +1,276 @@
+<template>
+    <div class="flex min-h-screen bg-white py-8 px-4">
+        <div
+            class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
+        >
+            <h2 class="text-2xl font-bold mb-4">Edit User</h2>
+            <form @submit.prevent="updateUser" method="post">
+                <div class="grid grid-cols-2 gap-4">
+                    <div>
+                        <ehr-input
+                            v-model="userForm.username"
+                            :error="errors.username"
+                            :label="'Username'"
+                            :placeholder="'Enter Username'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.email"
+                            :error="errors.email"
+                            :label="'Email'"
+                            :placeholder="'Enter Email'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.tax_id"
+                            :label="'Tax ID'"
+                            :placeholder="'Enter Tax ID'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.suffix"
+                            :label="'Suffix'"
+                            :placeholder="'Enter Suffix'"
+                        />
+                    </div>
+
+                    <div>
+                        <ehr-input
+                            v-model="userForm.first_name"
+                            :error="errors.first_name"
+                            :label="'First Name'"
+                            :placeholder="'Enter First Name'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.middle_name"
+                            :error="errors.middle_name"
+                            :label="'Middle Name'"
+                            :placeholder="'Enter Middle Name'"
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.last_name"
+                            :error="errors.last_name"
+                            :label="'Last Name'"
+                            :placeholder="'Enter Last Name'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.dea_number"
+                            :label="'DEA Number'"
+                            :placeholder="'Enter DEA Number'"
+                            required
+                        />
+                    </div>
+
+                    <div>
+                        <ehr-input
+                            v-model="userForm.npi"
+                            :label="'NPI'"
+                            :placeholder="'Enter NPI'"
+                            required
+                        />
+                    </div>
+
+                    <div>
+                        <ehr-input
+                            v-model="userForm.taxonomy"
+                            :label="'Taxonomy'"
+                            :placeholder="'Enter Taxonomy'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.license_number"
+                            :label="'License No.'"
+                            :placeholder="'Enter License No.'"
+                            required
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.provider_type"
+                            :label="'Provider Type'"
+                            :placeholder="'Enter Provider Type'"
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.default_warehouse"
+                            :label="'Default Warehouse'"
+                            :placeholder="'Enter Default Warehouse'"
+                        />
+                    </div>
+                    <div>
+                        <ehr-input
+                            v-model="userForm.job_description"
+                            :label="'Job Description'"
+                            :placeholder="'Enter Job Description'"
+                        />
+                    </div>
+                    <div>
+                        <button
+                            id="default-facility-dropdown"
+                            class="w-full px-4 py-2 rounded ring-2"
+                            type="button"
+                            @click="toggleDefaultFacilityList()"
+                        >
+                            Default Facility:
+                            <b>{{ userForm.default_facility }}</b>
+
+                            <span
+                                :class="{
+                                    'transform rotate-180':
+                                        default_facility_dropdown === true,
+                                }"
+                                class="inline-block transition-transform duration-300"
+                            >
+                                &#9662;
+                            </span>
+                        </button>
+
+                        <ul
+                            v-if="default_facility_dropdown === true"
+                            class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
+                        >
+                            <li
+                                v-for="facility in facilities"
+                                :key="facility.id"
+                                @click="selectDefaultFacility(facility)"
+                                class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                            >
+                                {{ facility }}
+                            </li>
+                        </ul>
+                    </div>
+                    <div>
+                        <button
+                            id="role-dropdown"
+                            class="w-full px-4 py-2 rounded ring-2"
+                            type="button"
+                            @click="toggleRoleList()"
+                        >
+                            Role: <b> {{ userForm.role }}</b>
+
+                            <span
+                                :class="{
+                                    'transform rotate-180':
+                                        role_dropdown === true,
+                                }"
+                                class="inline-block transition-transform duration-300"
+                            >
+                                &#9662;
+                            </span>
+                        </button>
+
+                        <ul
+                            v-if="role_dropdown === true"
+                            class="absolute w-72 mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
+                        >
+                            <li
+                                v-for="role in roleOptions"
+                                :key="role.id"
+                                @click="selectRole(role)"
+                                class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
+                            >
+                                {{ role.name }}
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="col-span-2">
+                        <button
+                            type="submit"
+                            class="bg-orange-500 hover:bg-orange-600 text-white font-bold py-2 px-4 rounded focus:outline-none focus:ring-2 focus:ring-orange-500"
+                        >
+                            Edit User
+                        </button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</template>
+<script>
+import DashboardLayout from "../../layouts/DashboardLayout";
+export default {
+    layout: DashboardLayout,
+    props: {
+        facilities: Object,
+        userData: Object,
+    },
+    data() {
+        return {
+            role_dropdown: null,
+            default_facility_dropdown: false,
+            userForm: this.$inertia.form({
+                // Initialize the form fields with userData
+                username: this.userData.username,
+                email: this.userData.email,
+                suffix: this.userData.suffix,
+                first_name: this.userData.first_name,
+                middle_name: this.userData.middle_name,
+                last_name: this.userData.last_name,
+                dea_number: this.userData.federal_drug_id,
+                tax_id: this.userData.federal_tax_id,
+                npi: this.userData.npi.toString(),
+                job_description: this.userData.info,
+                provider_type: this.userData.provider_type,
+                default_warehouse: this.userData.warehouse,
+                taxonomy: this.userData.taxonomy.toString(),
+                license_number: this.userData.license,
+                additional_details: this.userData.additional_details,
+                default_facility: this.userData.facility,
+                role: this.userData.access_control,
+            }),
+            errors: {
+                username: "",
+                full_name: "",
+            },
+            roleOptions: [],
+        };
+    },
+    mounted() {
+        this.getRoles();
+    },
+    methods: {
+        getRoles() {
+            axios.get(this.route("dashboard.roles.all")).then((response) => {
+                this.roleOptions = response.data;
+            });
+        },
+        updateUser() {
+            console.log(this.userForm);
+            this.userForm.post(
+                this.route("dashboard.users.update", this.userData.id)
+            );
+        },
+        selectDefaultFacility(facility) {
+            this.userForm.default_facility = facility;
+            this.default_facility_dropdown = false;
+        },
+        selectRole(role) {
+            this.userForm.role = role.name;
+            this.role_dropdown = false;
+        },
+        toggleRoleList() {
+            this.role_dropdown = !this.role_dropdown;
+        },
+        toggleDefaultFacilityList() {
+            this.default_facility_dropdown = !this.default_facility_dropdown;
+        },
+    },
+};
+</script>
diff --git a/resources/app/pages/Users/UserProfile.vue b/resources/app/pages/Users/UserProfile.vue
index 39cd974..2433093 100644
--- a/resources/app/pages/Users/UserProfile.vue
+++ b/resources/app/pages/Users/UserProfile.vue
@@ -1,8 +1,16 @@
 <template>
     <div class="min-h-screen bg-gray-100">
-        <div class="max-w-7xl mx-auto px-4 py-8">
+        <Breadcrumb :active-link="activeLink" />
+        <div class="max-w-7xl mx-auto px-4 py-8 relative">
             <div class="flex justify-center">
                 <h1 class="text-3xl font-semibold mb-6">User Profile</h1>
+                <a :href="editLink()">
+                    <button
+                        class="absolute top-3 right-0 mt-8 mr-4 bg-gray-900 hover:bg-gray-600 text-white font-semibold py-2 px-4 rounded shadow"
+                    >
+                        Edit Profile
+                    </button>
+                </a>
             </div>
 
             <div
@@ -156,14 +164,24 @@
 
 <script>
 import DashboardLayout from "../../layouts/DashboardLayout";
+import i18n from "../../i18n";
 
 export default {
     layout: DashboardLayout,
     props: {
         userData: Object, // Pass the user data as a prop
     },
+
     data() {
-        return {};
+        return {
+            activeLink: i18n.t("userProfile"),
+        };
+    },
+    methods: {
+        editLink() {
+            console.log(this.userData.id);
+            return this.route("dashboard.users.edit", this.userData.id);
+        },
     },
 };
 </script>
diff --git a/routes/web.php b/routes/web.php
index e54cd63..f4b78fa 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -129,8 +129,6 @@ function () {
                 'create' => 'users.create',
                 'show' => 'users.show',
                 'store' => 'users.store',
-                'edit' => 'users.edit',
-                'update' => 'users.update',
                 'destroy' => 'users.destroy',
             ]);
 
@@ -138,6 +136,8 @@ function () {
             Route::post('/add-user', [InvitationController::class, 'sendInvite'])->name('users.add');
             Route::get('/invitations', [InvitationController::class, 'showInvitations'])->name('user.invitations');
             Route::get('/users/profile/{userId}', [UserController::class, 'profile'])->name('users.profile');
+            Route::get('/users/edit/{userId}', [UserController::class, 'showEditPage'])->name('users.edit');
+            Route::post('/users/edit/{userId}', [UserController::class, 'update'])->name('users.update');
 
 
 

From c6033fd64706bb03257d119fa66c8fb66a5e03de Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Tue, 15 Aug 2023 03:05:58 +0530
Subject: [PATCH 26/41] Minor update

---
 routes/web.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index f4b78fa..8e045aa 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -124,13 +124,6 @@ function () {
             Route::get('/all-permissions', [PermissionController::class, 'getPermissions'])->name('permissions.all');
 
             // ======== Users related routes ========
-            Route::resource('users', UserController::class)->names([
-                'index' => 'users.index',
-                'create' => 'users.create',
-                'show' => 'users.show',
-                'store' => 'users.store',
-                'destroy' => 'users.destroy',
-            ]);
 
             Route::get('/add-user', [SetupAccount::class, 'index'])->name('users.invite');
             Route::post('/add-user', [InvitationController::class, 'sendInvite'])->name('users.add');

From d4de97773931cdd2ac9dcb9fffc303d82475b68a Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Tue, 15 Aug 2023 16:37:13 +0530
Subject: [PATCH 27/41] Routes Update, Clean file names

---
 .../Dashboard/User/UserController.php         | 75 ++++++++++++-------
 app/Http/Controllers/InvitationController.php | 37 ---------
 .../app/pages/Users/{AddUsers.vue => Add.vue} | 15 +++-
 .../pages/Users/{EditUser.vue => Edit.vue}    | 21 +++++-
 resources/app/pages/Users/Invitations.vue     |  5 +-
 .../Users/{UserProfile.vue => Profile.vue}    | 23 +++---
 routes/web.php                                | 18 ++---
 7 files changed, 106 insertions(+), 88 deletions(-)
 rename resources/app/pages/Users/{AddUsers.vue => Add.vue} (95%)
 rename resources/app/pages/Users/{EditUser.vue => Edit.vue} (93%)
 rename resources/app/pages/Users/{UserProfile.vue => Profile.vue} (93%)

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index 201365f..c2c9f88 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Dashboard\User;
 
 use App\Http\Controllers\Controller;
+use App\Invite;
 use App\Mail\InvitationMail;
 use App\Models\Facilities\Facility;
 use App\Models\Invitation;
@@ -22,18 +23,24 @@ class UserController extends Controller
     public function index()
     {
         /**
-         * Shows the role page
+         * Shows the Users/Invitations page
          * @return Response
          */
+        $facilities = Facility::pluck('name', 'id');
+
+        return Inertia::render('Users/Invitations', ['facilities' => $facilities]);
     }
     /**
      * Show the form for creating a new resource.
      *
      * @return Response
      */
-    public function create()
+    public function create(): Response
     {
         //
+        $facilities = Facility::pluck('name', 'id');
+
+        return Inertia::render('Users/Add', ['facilities' => $facilities]);
     }
 
     /**
@@ -44,20 +51,42 @@ public function create()
      */
     public function store(Request $request)
     {
+        $temporaryPassword = Str::random(10);
+        $userData = [
+            'username' => $request->username,
+            'password' => bcrypt($temporaryPassword),
+            'email' => $request->email,
+            'first_name' => $request->first_name,
+            'middle_name' => $request->middle_name,
+            'last_name' => $request->last_name,
+            'federal_tax_id' => $request->tax_id,
+            'federal_drug_id' => $request->dea_number,
+            'npi' => $request->npi,
+            'suffix' => $request->suffix,
+            'taxonomy' => $request->taxonomy,
+            'info' => $request->job_description,
+            'access_control' => $request->role,
+            'warehouse' => $request->default_warehouse,
+            'facility' => $request->default_facility,
+            'provider_type' => $request->provider_type,
+            'license' => $request->license_number,
+            'additional_details' => $request->additional_details,
+        ];
+
+
+
+        Invite::send($userData, $request->email);
+        return Inertia::location(route('dashboard.users.create'));
     }
+
+
     /**
      * Display the specified resource.
      *
      * @param  int  $id
      * @return Response
      */
-    public function show($id)
-    {
-        //
-    }
-
-
-    public function profile($userId): Response
+    public function show($userId): Response
     {
         /**
          * Shows the user profile page
@@ -67,10 +96,17 @@ public function profile($userId): Response
         $invitation_details = Invitation::where('email', $user->email)->first();
         $user->invitation_details = $invitation_details;
 
-        return Inertia::render('Users/UserProfile', ['userData' => $user]);
+        return Inertia::render('Users/Profile', ['userData' => $user]);
     }
 
-    public function showEditPage($userId): Response
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function edit($userId): Response
     {
         /**
          * Shows the user edit page
@@ -79,20 +115,10 @@ public function showEditPage($userId): Response
         $user = User::where('id', $userId)->first();
         $facilities = Facility::pluck('name', 'id');
 
-        return Inertia::render('Users/EditUser', ['userData' => $user, 'facilities' => $facilities]);
+        return Inertia::render('Users/Edit', ['userData' => $user, 'facilities' => $facilities]);
     }
 
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return Response
-     */
-    public function edit()
-    {
-    }
-
     /**
      * Update the specified resource in storage.
      *
@@ -102,10 +128,7 @@ public function edit()
      */
     public function update(Request $request, $userId)
     {
-        //
-
 
-        //
         // Get the existing user data
         $user = User::findOrFail($userId);
 
@@ -141,7 +164,7 @@ public function update(Request $request, $userId)
             }
         }
         $user->save();
-        return Inertia::location(route('dashboard.users.edit', ['userId' => $user->id]));
+        return Inertia::location(route('dashboard.users.edit', ['user' => $user->id]));
     }
 
     /**
diff --git a/app/Http/Controllers/InvitationController.php b/app/Http/Controllers/InvitationController.php
index a0a6e5b..f61dfcd 100644
--- a/app/Http/Controllers/InvitationController.php
+++ b/app/Http/Controllers/InvitationController.php
@@ -14,14 +14,6 @@
 
 class InvitationController extends Controller
 {
-    public function showInvitations(): Response
-    {
-
-        $facilities = Facility::pluck('name', 'id');
-
-        return Inertia::render('Users/Invitations', ['facilities' => $facilities]);
-    }
-
 
     //URL for datatable for invitations
     public function getInvitations(Request $request)
@@ -68,35 +60,6 @@ public function index($token): Response
         return Inertia::render('Users/AddPassword', ['status' => $invite->status, 'email' => $maskedEmail]);
     }
 
-    public function sendInvite(Request $request)
-    {
-        $temporaryPassword = Str::random(10);
-        $userData = [
-            'username' => $request->username,
-            'password' => bcrypt($temporaryPassword),
-            'email' => $request->email,
-            'first_name' => $request->first_name,
-            'middle_name' => $request->middle_name,
-            'last_name' => $request->last_name,
-            'federal_tax_id' => $request->tax_id,
-            'federal_drug_id' => $request->dea_number,
-            'npi' => $request->npi,
-            'suffix' => $request->suffix,
-            'taxonomy' => $request->taxonomy,
-            'info' => $request->job_description,
-            'access_control' => $request->role,
-            'warehouse' => $request->default_warehouse,
-            'facility' => $request->default_facility,
-            'provider_type' => $request->provider_type,
-            'license' => $request->license_number,
-            'additional_details' => $request->additional_details,
-        ];
-
-
-
-        Invite::send($userData, $request->email);
-        return Inertia::location(route('dashboard.users.invite'));
-    }
 
     //single controller for both accept and reject based on reject parameter
     public function acceptOrRejectInvite(Request $request)
diff --git a/resources/app/pages/Users/AddUsers.vue b/resources/app/pages/Users/Add.vue
similarity index 95%
rename from resources/app/pages/Users/AddUsers.vue
rename to resources/app/pages/Users/Add.vue
index bcbd4bb..879cb0b 100644
--- a/resources/app/pages/Users/AddUsers.vue
+++ b/resources/app/pages/Users/Add.vue
@@ -1,5 +1,6 @@
 <template>
-    <div class="flex min-h-screen bg-white py-8 px-4">
+    <div class="min-h-screen bg-white py-8 px-4">
+        <Breadcrumb :page-routes="pagesRoutes" :active-link="activeLink" />
         <div
             class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
         >
@@ -205,6 +206,8 @@
 </template>
 <script>
 import DashboardLayout from "../../layouts/DashboardLayout";
+import i18n from "../../i18n";
+
 export default {
     layout: DashboardLayout,
     props: {
@@ -238,6 +241,14 @@ export default {
                 full_name: "",
             },
             roleOptions: [],
+
+            pagesRoutes: [
+                {
+                    title: i18n.t("user/invitations"),
+                    link: this.route("dashboard.users.index"),
+                },
+            ],
+            activeLink: i18n.t("add"),
         };
     },
     mounted() {
@@ -251,7 +262,7 @@ export default {
         },
         addUser() {
             console.log(this.userForm);
-            this.userForm.post(this.route("dashboard.users.add"));
+            this.userForm.post(this.route("dashboard.users.store"));
         },
         selectDefaultFacility(facility) {
             this.userForm.default_facility = facility;
diff --git a/resources/app/pages/Users/EditUser.vue b/resources/app/pages/Users/Edit.vue
similarity index 93%
rename from resources/app/pages/Users/EditUser.vue
rename to resources/app/pages/Users/Edit.vue
index afa118c..c5c5989 100644
--- a/resources/app/pages/Users/EditUser.vue
+++ b/resources/app/pages/Users/Edit.vue
@@ -1,5 +1,6 @@
 <template>
-    <div class="flex min-h-screen bg-white py-8 px-4">
+    <div class="min-h-screen bg-white py-4 px-4">
+        <Breadcrumb :page-routes="pagesRoutes" :active-link="activeLink" />
         <div
             class="w-1/2 mx-auto bg-white rounded shadow-md p-6 overflow-y-auto no-scrollbar"
         >
@@ -205,6 +206,7 @@
 </template>
 <script>
 import DashboardLayout from "../../layouts/DashboardLayout";
+import i18n from "../../i18n";
 export default {
     layout: DashboardLayout,
     props: {
@@ -240,6 +242,21 @@ export default {
                 full_name: "",
             },
             roleOptions: [],
+
+            pagesRoutes: [
+                {
+                    title: i18n.t("user/invitations"),
+                    link: this.route("dashboard.users.index"),
+                },
+                {
+                    title:
+                        this.userData.first_name +
+                        " " +
+                        this.userData.last_name,
+                    link: this.route("dashboard.users.show", this.userData.id),
+                },
+            ],
+            activeLink: i18n.t("edit"),
         };
     },
     mounted() {
@@ -253,7 +270,7 @@ export default {
         },
         updateUser() {
             console.log(this.userForm);
-            this.userForm.post(
+            this.userForm.put(
                 this.route("dashboard.users.update", this.userData.id)
             );
         },
diff --git a/resources/app/pages/Users/Invitations.vue b/resources/app/pages/Users/Invitations.vue
index 67c3ebc..fc3cd9f 100644
--- a/resources/app/pages/Users/Invitations.vue
+++ b/resources/app/pages/Users/Invitations.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="container mx-auto">
+        <Breadcrumb :active-link="activeLink" />
         <div class="flex justify-center">
             <h2 class="text-2xl font-bold mb-4">Invitation Details</h2>
         </div>
@@ -82,6 +83,7 @@
 
 <script>
 import DashboardLayout from "../../layouts/DashboardLayout";
+import i18n from "../../i18n";
 export default {
     layout: DashboardLayout,
     props: {
@@ -93,6 +95,7 @@ export default {
                 facility: null,
             },
             url: "",
+            activeLink: i18n.t("users/invitations"),
         };
     },
     computed: {
@@ -105,7 +108,7 @@ export default {
                     transform: ({ data, name }) => {
                         const userId = data.user.id;
                         const fullName = `${data.user.first_name} ${data.user.last_name}`;
-                        return `<a href="${route("dashboard.users.profile", {
+                        return `<a href="${route("dashboard.users.show", {
                             id: userId,
                         })}" class="text-blue-500 hover:underline">${fullName}</a>`;
                     },
diff --git a/resources/app/pages/Users/UserProfile.vue b/resources/app/pages/Users/Profile.vue
similarity index 93%
rename from resources/app/pages/Users/UserProfile.vue
rename to resources/app/pages/Users/Profile.vue
index 2433093..f2c7ae0 100644
--- a/resources/app/pages/Users/UserProfile.vue
+++ b/resources/app/pages/Users/Profile.vue
@@ -1,16 +1,18 @@
 <template>
     <div class="min-h-screen bg-gray-100">
-        <Breadcrumb :active-link="activeLink" />
+        <Breadcrumb :page-routes="pagesRoutes" :active-link="activeLink" />
         <div class="max-w-7xl mx-auto px-4 py-8 relative">
             <div class="flex justify-center">
                 <h1 class="text-3xl font-semibold mb-6">User Profile</h1>
-                <a :href="editLink()">
+                <inertia-link
+                    :href="route('dashboard.users.edit', userData.id)"
+                >
                     <button
                         class="absolute top-3 right-0 mt-8 mr-4 bg-gray-900 hover:bg-gray-600 text-white font-semibold py-2 px-4 rounded shadow"
                     >
                         Edit Profile
                     </button>
-                </a>
+                </inertia-link>
             </div>
 
             <div
@@ -174,15 +176,16 @@ export default {
 
     data() {
         return {
-            activeLink: i18n.t("userProfile"),
+            pagesRoutes: [
+                {
+                    title: i18n.t("user/invitations"),
+                    link: this.route("dashboard.users.index"),
+                },
+            ],
+            activeLink:
+                this.userData.first_name + " " + this.userData.last_name,
         };
     },
-    methods: {
-        editLink() {
-            console.log(this.userData.id);
-            return this.route("dashboard.users.edit", this.userData.id);
-        },
-    },
 };
 </script>
 
diff --git a/routes/web.php b/routes/web.php
index 8e045aa..832ffa8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -124,16 +124,14 @@ function () {
             Route::get('/all-permissions', [PermissionController::class, 'getPermissions'])->name('permissions.all');
 
             // ======== Users related routes ========
-
-            Route::get('/add-user', [SetupAccount::class, 'index'])->name('users.invite');
-            Route::post('/add-user', [InvitationController::class, 'sendInvite'])->name('users.add');
-            Route::get('/invitations', [InvitationController::class, 'showInvitations'])->name('user.invitations');
-            Route::get('/users/profile/{userId}', [UserController::class, 'profile'])->name('users.profile');
-            Route::get('/users/edit/{userId}', [UserController::class, 'showEditPage'])->name('users.edit');
-            Route::post('/users/edit/{userId}', [UserController::class, 'update'])->name('users.update');
-
-
-
+            Route::resource('users', UserController::class)->names([
+                'index' => 'users.index',
+                'create' => 'users.create',
+                'edit' => 'users.edit',
+                'update' => 'users.update',
+                'show' => 'users.show',
+                'destroy' => 'users.destroy',
+            ]);
 
             // ======== Facility related routes ========
             Route::resource('facilities', FacilityController::class)->names([

From a75e3deb2baee69b10bd69136a89c8fc84bc2593 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Tue, 15 Aug 2023 16:39:49 +0530
Subject: [PATCH 28/41] Removed redundant file

---
 .../Dashboard/User/SetupAccount.php           | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 app/Http/Controllers/Dashboard/User/SetupAccount.php

diff --git a/app/Http/Controllers/Dashboard/User/SetupAccount.php b/app/Http/Controllers/Dashboard/User/SetupAccount.php
deleted file mode 100644
index 1cace8c..0000000
--- a/app/Http/Controllers/Dashboard/User/SetupAccount.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Dashboard\User;
-
-use App\Http\Controllers\Controller;
-use App\Models\Facilities\Facility;
-use Illuminate\Http\Request;
-use Inertia\Inertia;
-
-class SetupAccount extends Controller
-{
-
-    public function index()
-    {
-        $facilities = Facility::pluck('name', 'id');
-
-        return Inertia::render('Users/AddUsers', ['facilities' => $facilities]);
-    }
-}

From 1e66f617755cd1e0d7c83e129a91ca57c540dcaf Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 23 Aug 2023 14:22:05 +0530
Subject: [PATCH 29/41] multiselect component for permissions select

---
 .../Controllers/Dashboard/RolesController.php |  2 +-
 resources/app/global-components/EhrInput.vue  | 74 +++++++++---------
 resources/app/pages/AccessControl/Roles.vue   | 77 +++----------------
 3 files changed, 50 insertions(+), 103 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index 0ab7464..fba047e 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -54,7 +54,7 @@ public function store(CreateRoleRequest $request)
         $role->description = $request->description;
         $role->save();
         foreach ($request->permissions as $permission) {
-            $role->permissions()->attach([$permission['id']]);
+            $role->permissions()->attach([$permission]);
         }
         $role->save();
         if ($role->save()) {
diff --git a/resources/app/global-components/EhrInput.vue b/resources/app/global-components/EhrInput.vue
index 7c3c457..7e5494f 100644
--- a/resources/app/global-components/EhrInput.vue
+++ b/resources/app/global-components/EhrInput.vue
@@ -1,52 +1,46 @@
 <template>
-    <div :class="error ? 'has-error' : '' " class="flex flex-col capitalize">
-        <ehr-label
-            v-if="label"
-            :id="id"
-            :required="required"
-            :label="label"
-        />
+    <div :class="error ? 'has-error' : ''" class="flex flex-col capitalize">
+        <ehr-label v-if="label" :id="id" :required="required" :label="label" />
         <div v-if="type === 'text-area'" class="relative">
-          <textarea
-              class="py-2.5 px-3 outline-none focus:outline-none focus:border-green-500 focus:ring block w-full border border-gray-300 rounded leading-normal appearance-none placeholder:text-gray-500 placeholder:opacity-100"
-              :class="customClass"
-              :disabled="disabled"
-              :readonly="read_only"
-              @input="$emit('input', $event.target.value)"
-              :id="id" :cols="cols" :rows="rows"
-              v-bind="$attrs" :minlength="minLength"
-              :maxlength="maxLength" :placeholder="placeholder"
-              :required="required">{{ value }}</textarea>
+            <textarea
+                class="py-2.5 px-3 outline-none focus:outline-none focus:border-green-500 focus:ring block w-full border border-gray-300 rounded leading-normal appearance-none placeholder:text-gray-500 placeholder:opacity-100"
+                :class="customClass" :disabled="disabled" :readonly="read_only" @input="$emit('input', $event.target.value)"
+                :id="id" :cols="cols" :rows="rows" v-bind="$attrs" :minlength="minLength" :maxlength="maxLength"
+                :placeholder="placeholder" :required="required">{{ value }}</textarea>
         </div>
         <div v-else-if="type === 'select'" class="relative">
-            <select
-                :disabled="disabled"
-                :required="required"
-                @input="$emit('input', $event.target.value)"
-                v-if="options.length >= 0" id="underline_select" class="block py-2.5 px-3 w-full bg-transparent focus:border-green-500 border border-gray-300 appearance-none dark:text-gray-400 dark:border-gray-700 focus:outline-none leading-normal placeholder:text-gray-500 placeholder:opacity-100">
-                <option selected class="text-gray-100">{{ placeholder ? placeholder : 'Choose a value' }}</option>
+            <select :disabled="disabled" :required="required" @input="$emit('input', $event.target.value)"
+                v-if="options.length >= 0" id="underline_select"
+                class="block py-2.5 px-3 w-full bg-transparent focus:border-green-500 border border-gray-300 appearance-none dark:text-gray-400 dark:border-gray-700 focus:outline-none leading-normal placeholder:text-gray-500 placeholder:opacity-100">
+                <option select class="text-gray-100">{{ placeholder ? placeholder : 'Choose a value' }}</option>
                 <option v-for="option in options" :key="option.id" :value="option.id">
                     {{ option.name }}
                 </option>
             </select>
         </div>
+
+        <div v-if="type === 'multiselect'" class="relative">
+            <select :disabled="disabled" :required="required" multiple="true" @input="handleSelectChange($event.target)"
+                v-if="options.length >= 0" id="underline_select"
+                class="block py-2.5 px-3 w-full bg-transparent focus:border-green-500 border border-gray-300 appearance-none dark:text-gray-400 dark:border-gray-700 focus:outline-none leading-normal placeholder:text-gray-500 placeholder:opacity-100">
+                <option v-for="option in options" :key="option.id" :value="option.id">
+                    {{ option.name }}
+                </option>
+            </select>
+        </div>
+
         <div v-else class="relative">
-            <input
-                :id="id"
-                ref="input"
-                :disabled="disabled"
-                :readonly="read_only"
-                v-bind="$attrs" :minlength="minLength" :placeholder="placeholder" :required="required" :type="this.isPassword ? this.togglePassword ? 'password' : 'text' : this.type"
-                :value="value"
+            <input :id="id" ref="input" :disabled="disabled" :readonly="read_only" v-bind="$attrs" :minlength="minLength"
+                :placeholder="placeholder" :required="required"
+                :type="this.isPassword ? this.togglePassword ? 'password' : 'text' : this.type" :value="value"
                 class="py-2.5 px-3 focus:outline-none outline-none block w-full border border-gray-300 rounded leading-normal appearance-none placeholder:text-gray-500 placeholder:opacity-100"
-                :class="customClass"
-                @input="$emit('input', $event.target.value)"/>
+                :class="customClass" @input="$emit('input', $event.target.value)" />
             <div v-if="isPassword" class="absolute right-1 bottom-2.5 px-3 cursor-pointer"
-                 @click="changeType(togglePassword)">
+                @click="changeType(togglePassword)">
                 <icon :name="togglePassword ? 'eye' : 'eye-off'" class="w-5 h-5" />
             </div>
         </div>
-        <div v-if="description" v-html="description" class="text-xs lowercase p-1"/>
+        <div v-if="description" v-html="description" class="text-xs lowercase p-1" />
         <div v-if="error" class="text-xs text-red-700 mt-2">{{ error }}</div>
     </div>
 </template>
@@ -78,7 +72,7 @@ export default {
             type: Number,
             default: 7
         },
-        value: String,
+        value: [String, Array],
         label: String,
         description: String,
         error: String,
@@ -100,6 +94,7 @@ export default {
     },
     data() {
         return {
+            selectedVal: [],
             isPassword: this.type === "password",
             togglePassword: true
         }
@@ -113,7 +108,14 @@ export default {
         },
         changeType() {
             this.togglePassword = !this.togglePassword
-        }
+        },
+        handleSelectChange(selectElement) {
+            const selectedOptions = Array.from(selectElement.options)
+                .filter(option => option.selected)
+                .map(option => option.value);
+
+            this.$emit('input', selectedOptions);
+        },
     }
 }
 </script>
diff --git a/resources/app/pages/AccessControl/Roles.vue b/resources/app/pages/AccessControl/Roles.vue
index 6b43eb9..8595152 100644
--- a/resources/app/pages/AccessControl/Roles.vue
+++ b/resources/app/pages/AccessControl/Roles.vue
@@ -30,60 +30,16 @@
                         required
                     />
                 </div>
-
                 <div class="mb-4">
-                    <label class="block font-bold mb-2" for="permissions"
-                        >Permissions</label
-                    >
-                    <div class="relative">
-                        <div
-                            v-if="roleForm.permissions.length > 0"
-                            class="flex flex-wrap items-center mb-2"
-                        >
-                            <span
-                                v-for="permission in roleForm.permissions"
-                                :key="permission.id"
-                                class="bg-orange-500 text-white rounded-full px-2 py-1 mr-2 mb-2"
-                            >
-                                {{ permission.display_name }}
-                            </span>
-                        </div>
-
-                        <button
-                            id="permissions-dropdown"
-                            class="w-full px-4 py-2 rounded ring-2"
-                            type="button"
-                            @click="togglePermissionList()"
-                        >
-                            Select Permissions
-
-                            <span
-                                :class="{
-                                    'transform rotate-180':
-                                        permission_dropdown === true,
-                                }"
-                                class="inline-block transition-transform duration-300"
-                            >
-                                &#9662;
-                            </span>
-                        </button>
-
-                        <ul
-                            v-if="permission_dropdown === true"
-                            class="absolute mt-2 py-2 bg-white rounded-md shadow-lg z-10 max-h-72 overflow-y-auto no-scrollbar"
-                        >
-                            <li
-                                v-for="permission in permissions"
-                                :key="permission.id"
-                                @click="selectPermission(permission)"
-                                class="px-4 py-2 hover:bg-gray-100 cursor-pointer w-full"
-                            >
-                                {{ permission.display_name }} @{{
-                                    permission.name
-                                }}
-                            </li>
-                        </ul>
-                    </div>
+                    <ehr-input
+                        type="multiselect"
+                        :options="permissions"
+                        v-model="roleForm.permissions"
+                        :error="errors.permissions"
+                        :label="'Select Permissions'"
+                        :placeholder="'Select Permissions'"
+                        required
+                    />
                 </div>
                 <button
                     type="submit"
@@ -194,8 +150,6 @@ export default {
     data() {
         return {
             openDropdown: null,
-            userDropdown: null,
-            permission_dropdown: null,
             name: "",
             display_name: "",
             description: "",
@@ -224,25 +178,16 @@ export default {
                 .get(this.route("dashboard.permissions.all"))
                 .then((response) => {
                     this.permissions = response.data;
+                    console.log(this.permissions);
                 });
         },
         addRole() {
             this.roleForm.post(this.route("dashboard.roles.store"));
         },
-        selectPermission(permission) {
-            if (!this.roleForm.permissions.includes(permission)) {
-                this.roleForm.permissions.push(permission);
-            }
-        },
         toggleDropdown(roleId) {
             this.openDropdown = this.openDropdown === roleId ? null : roleId;
         },
-        toggleUserDropdown(roleId) {
-            this.userDropdown = this.userDropdown === roleId ? null : roleId;
-        },
-        togglePermissionList() {
-            this.permission_dropdown = !this.permission_dropdown;
-        },
+
     },
 
     created() {

From 066983cb0f455631c6babd6fd9e872142a4784f1 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Thu, 24 Aug 2023 00:32:27 +0530
Subject: [PATCH 30/41] Revert last changes and used MultiSelect

---
 .../Controllers/Dashboard/RolesController.php |  2 +-
 resources/app/global-components/EhrInput.vue  | 18 ----------
 resources/app/pages/AccessControl/Roles.vue   | 36 ++++++++++++++-----
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/RolesController.php b/app/Http/Controllers/Dashboard/RolesController.php
index fba047e..0ab7464 100644
--- a/app/Http/Controllers/Dashboard/RolesController.php
+++ b/app/Http/Controllers/Dashboard/RolesController.php
@@ -54,7 +54,7 @@ public function store(CreateRoleRequest $request)
         $role->description = $request->description;
         $role->save();
         foreach ($request->permissions as $permission) {
-            $role->permissions()->attach([$permission]);
+            $role->permissions()->attach([$permission['id']]);
         }
         $role->save();
         if ($role->save()) {
diff --git a/resources/app/global-components/EhrInput.vue b/resources/app/global-components/EhrInput.vue
index 7e5494f..4a09745 100644
--- a/resources/app/global-components/EhrInput.vue
+++ b/resources/app/global-components/EhrInput.vue
@@ -19,16 +19,6 @@
             </select>
         </div>
 
-        <div v-if="type === 'multiselect'" class="relative">
-            <select :disabled="disabled" :required="required" multiple="true" @input="handleSelectChange($event.target)"
-                v-if="options.length >= 0" id="underline_select"
-                class="block py-2.5 px-3 w-full bg-transparent focus:border-green-500 border border-gray-300 appearance-none dark:text-gray-400 dark:border-gray-700 focus:outline-none leading-normal placeholder:text-gray-500 placeholder:opacity-100">
-                <option v-for="option in options" :key="option.id" :value="option.id">
-                    {{ option.name }}
-                </option>
-            </select>
-        </div>
-
         <div v-else class="relative">
             <input :id="id" ref="input" :disabled="disabled" :readonly="read_only" v-bind="$attrs" :minlength="minLength"
                 :placeholder="placeholder" :required="required"
@@ -94,7 +84,6 @@ export default {
     },
     data() {
         return {
-            selectedVal: [],
             isPassword: this.type === "password",
             togglePassword: true
         }
@@ -109,13 +98,6 @@ export default {
         changeType() {
             this.togglePassword = !this.togglePassword
         },
-        handleSelectChange(selectElement) {
-            const selectedOptions = Array.from(selectElement.options)
-                .filter(option => option.selected)
-                .map(option => option.value);
-
-            this.$emit('input', selectedOptions);
-        },
     }
 }
 </script>
diff --git a/resources/app/pages/AccessControl/Roles.vue b/resources/app/pages/AccessControl/Roles.vue
index 8595152..a9e8b4e 100644
--- a/resources/app/pages/AccessControl/Roles.vue
+++ b/resources/app/pages/AccessControl/Roles.vue
@@ -31,15 +31,30 @@
                     />
                 </div>
                 <div class="mb-4">
-                    <ehr-input
-                        type="multiselect"
-                        :options="permissions"
+                    <label class="typo__label">Select Permissions</label>
+                    <multiselect
                         v-model="roleForm.permissions"
-                        :error="errors.permissions"
-                        :label="'Select Permissions'"
-                        :placeholder="'Select Permissions'"
-                        required
-                    />
+                        :options="permissions"
+                        :multiple="true"
+                        :close-on-select="false"
+                        :clear-on-select="false"
+                        :preserve-search="true"
+                        placeholder="Pick some"
+                        label="name"
+                        track-by="name"
+                        :preselect-first="true"
+                    >
+                        <template
+                            slot="selection"
+                            slot-scope="{ values, search, isOpen }"
+                            ><span
+                                class="multiselect__single"
+                                v-if="values.length"
+                                v-show="!isOpen"
+                                >{{ values.length }} permissions selected</span
+                            ></template
+                        >
+                    </multiselect>
                 </div>
                 <button
                     type="submit"
@@ -141,12 +156,16 @@
 </template>
 <script>
 import DashboardLayout from "../../layouts/DashboardLayout";
+import Multiselect from "vue-multiselect";
 export default {
     name: "Roles",
     layout: DashboardLayout,
     props: {
         errors: Object,
     },
+    components: {
+        Multiselect,
+    },
     data() {
         return {
             openDropdown: null,
@@ -187,7 +206,6 @@ export default {
         toggleDropdown(roleId) {
             this.openDropdown = this.openDropdown === roleId ? null : roleId;
         },
-
     },
 
     created() {

From e02194a7c0d1b6f2e44a68d57571b7bcd35c1bd7 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 1 Apr 2023 20:58:39 +0530
Subject: [PATCH 31/41] fixed head for mobile devices

---
 resources/app/shared/includes/Header.vue | 1508 +++++++++++++++-------
 1 file changed, 1036 insertions(+), 472 deletions(-)

diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index 475b595..accf735 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -1,380 +1,830 @@
 <template>
-    <nav class="sticky top-0 h-32 flex flex-col w-full text-gray-100 bg-gray-900 border-t border-t-2 border-r border-theme-2 body-font shadow z-50">
+    <nav
+        class="sticky top-0 flex flex-col w-full text-gray-100 bg-gray-900 border-t border-t-2 border-r border-theme-2 body-font shadow z-50"
+    >
         <div class="w-full items-center">
             <div class="transition duration-500 ease-in-out transform">
-                <div class="flex flex-col flex-wrap p-2 md:items-center md:flex-row">
-                    <inertia-link :href="route('dashboard.index')" class="p-1 mx-2 border-transparent text-gray-400 rounded-full hover:text-white bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700">
-                        <svg class="h-5 w-5" stroke="currentColor" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
+                <div
+                    class="flex sm:flex-row flex-wrap p-2 md:items-center md:flex-row"
+                >
+                    <inertia-link
+                        :href="route('dashboard.index')"
+                        class="p-1 mx-2 border-transparent text-gray-400 rounded-full hover:text-white bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700"
+                    >
+                        <svg
+                            class="h-5 w-5"
+                            stroke="currentColor"
+                            xmlns="http://www.w3.org/2000/svg"
+                            fill="none"
+                            viewBox="0 0 24 24"
+                        >
+                            <path
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                stroke-width="2"
+                                d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"
+                            />
                         </svg>
                     </inertia-link>
-                    <nav class="flex flex-wrap items-center text-base md:ml-0 space-x-1">
-                        <inertia-link :href="route('dashboard.calendar')" :class="isActiveClass('dashboard.calendar')">
-                            {{ $t('menu.calendar') }}
-                        </inertia-link>
-                        <inertia-link :href="route('dashboard.flow_board')" :class="isActiveClass('dashboard.flow_board')">
-                            {{ $t('menu.flow_board') }}
-                        </inertia-link>
-                        <ehr-header-menu :label="$t('menu.patient_client')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="route('dashboard.patients.index')"
-                                    :class="isSubMenuActive('dashboard.patients.index')">Finder
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.patients.create')"
-                                    :class="isSubMenuActive('dashboard.patients.create')">Add New/Search
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Recycle Bin
-                                </inertia-link>
-                                <inertia-link v-if="$page.props.ehr_patient.patient != null"
-                                              :href="route('dashboard.patients.select', $page.props.ehr_patient.patient.id)"
-                                              :class="isSubMenuActive('dashboard.settings')">Summary
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Track Appointments
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Visits
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Records
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Visit Forms
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Imports
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu>
-                        <ehr-header-menu :label="$t('menu.fees')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">Fee Sheet
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Payment
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Checkout
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Billing
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Posting
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Batch Payments
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Verify Patient Data
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">EDI History
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu>
-                        <ehr-header-menu :label="$t('menu.inventory')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">Management
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Destroyed
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
-                        <ehr-header-menu :label="$t('menu.procedures')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">Providers
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Configuration
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Load Compendium
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Pending Review
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Patient Results
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Lab Results
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Electronic Reports
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Lab Documents
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
-                        <ehr-header-menu :label="$t('menu.administration')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">Providers
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Configuration
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Load Compendium
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Pending Review
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Patient Results
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Lab Results
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Electronic Reports
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Lab Documents
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
-                        <ehr-header-menu :label="$t('menu.reports')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">Clients
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Visits
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Financial
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Inventory
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Procedures
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Insurance
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Blank Forms
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Services
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
-                        <ehr-header-menu :label="$t('menu.miscellaneous')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">Patient Education
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Patient Portal
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Authorizations
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Address Book
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Order Catalog
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">BatchCom
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Preferences
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">New Documents
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Utilities
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Document Templates
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
-                        <ehr-header-menu :label="$t('menu.popups')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">Issues
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Appts
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Superbill
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Payment
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Letter
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.patients.chart_label', patient_id)"
-                                    :class="isSubMenuActive('dashboard.patients.chart_label')">Chart Label
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Barcode Label
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Address Label
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
-                        <ehr-header-menu :label="$t('menu.qa_measures')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.index')">View Reports
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Create MIPS Report
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Select Measures
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Upload Claim Files
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Instance Counts
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Remove Provider Assignments
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Provider Encounter Counts
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Database Imports
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Database Inserts
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">MIPS Module Installer
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Alert Logs
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
-                        <ehr-header-menu :label="$t('menu.help')">
-                            <div class="flex flex-col">
-                                <inertia-link
-                                    :href="route('about')"
-                                    :class="isSubMenuActive('about')">About
-                                </inertia-link>
-                                <inertia-link
-                                    :href="'#'"
-                                    :class="isSubMenuActive('patients.create')">Forums
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('dashboard.settings')"
-                                    :class="isSubMenuActive('dashboard.settings')">Chat
-                                </inertia-link>
-                                <inertia-link
-                                    :href="route('contact')"
-                                    :class="isSubMenuActive('contact')">Contact
-                                </inertia-link>
-                            </div>
-                        </ehr-header-menu >
+
+                    <nav
+                        class="flex flex-wrap items-center text-base md:ml-0 space-x-1"
+                    >
+                        <button
+                            @click="isMenuOpen = !isMenuOpen"
+                            class="block lg:hidden text-white hover:text-gray-200 focus:text-gray-200 focus:outline-none"
+                        >
+                            <span class="inline-block align-middle">
+                                <svg
+                                    class="h-6 w-6 fill-current"
+                                    viewBox="0 0 24 24"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                >
+                                    <path
+                                        v-if="isMenuOpen"
+                                        fill-rule="evenodd"
+                                        clip-rule="evenodd"
+                                        d="M19.293 16.707a1 1 0 0 1-1.414 1.414l-6.293-6.293-6.293 6.293a1 1 0 1 1-1.414-1.414l6.293-6.293-6.293-6.293a1 1 0 1 1 1.414-1.414l6.293 6.293 6.293-6.293a1 1 0 1 1 1.414 1.414l-6.293 6.293 6.293 6.293z"
+                                        style="
+                                            transition: transform 0.3s
+                                                ease-in-out;
+                                        "
+                                    ></path>
+                                    <path
+                                        v-if="!isMenuOpen"
+                                        fill-rule="evenodd"
+                                        clip-rule="evenodd"
+                                        d="M4 6h16v2H4V6zm0 5h16v2H4v-2zm0 5h16v2H4v-2z"
+                                        style="
+                                            transition: transform 0.3s
+                                                ease-in-out;
+                                        "
+                                    ></path>
+                                </svg>
+                            </span>
+                        </button>
+                        <div
+                            class="md:flex md:items-center md:w-auto w-full bg-gray-700 flex flex-wrap p-2 m-2 gap-1"
+                            :class="{ hidden: !isMenuOpen, block: isMenuOpen }"
+                        >
+                            <inertia-link
+                                :href="route('dashboard.calendar')"
+                                :class="isActiveClass('dashboard.calendar')"
+                            >
+                                {{ $t("menu.calendar") }}
+                            </inertia-link>
+                            <inertia-link
+                                :href="route('dashboard.flow_board')"
+                                :class="isActiveClass('dashboard.flow_board')"
+                            >
+                                {{ $t("menu.flow_board") }}
+                            </inertia-link>
+                            <ehr-header-menu :label="$t('menu.patient_client')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="
+                                            route('dashboard.patients.index')
+                                        "
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.patients.index'
+                                            )
+                                        "
+                                        >Finder
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="
+                                            route('dashboard.patients.create')
+                                        "
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.patients.create'
+                                            )
+                                        "
+                                        >Add New/Search
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Recycle Bin
+                                    </inertia-link>
+                                    <inertia-link
+                                        v-if="
+                                            $page.props.ehr_patient.patient !=
+                                            null
+                                        "
+                                        :href="
+                                            route(
+                                                'dashboard.patients.select',
+                                                $page.props.ehr_patient.patient
+                                                    .id
+                                            )
+                                        "
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Summary
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Track Appointments
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Visits
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Records
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Visit Forms
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Imports
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.fees')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Fee Sheet
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Payment
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Checkout
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Billing
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Posting
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Batch Payments
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Verify Patient Data
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >EDI History
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.inventory')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Management
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Destroyed
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.procedures')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Providers
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Configuration
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Load Compendium
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Pending Review
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Patient Results
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Lab Results
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Electronic Reports
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Lab Documents
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.administration')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Providers
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Configuration
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Load Compendium
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Pending Review
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Patient Results
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Lab Results
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Electronic Reports
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Lab Documents
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.reports')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Clients
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Visits
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Financial
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Inventory
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Procedures
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Insurance
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Blank Forms
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Services
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.miscellaneous')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Patient Education
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Patient Portal
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Authorizations
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Address Book
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Order Catalog
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >BatchCom
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Preferences
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >New Documents
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Utilities
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Document Templates
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.popups')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Issues
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Appts
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Superbill
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Payment
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Letter
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="
+                                            route(
+                                                'dashboard.patients.chart_label',
+                                                patient_id
+                                            )
+                                        "
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.patients.chart_label'
+                                            )
+                                        "
+                                        >Chart Label
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Barcode Label
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Address Label
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.qa_measures')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >View Reports
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Create MIPS Report
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Select Measures
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Upload Claim Files
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Instance Counts
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Remove Provider Assignments
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Provider Encounter Counts
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Database Imports
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Database Inserts
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >MIPS Module Installer
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Alert Logs
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                            <ehr-header-menu :label="$t('menu.help')">
+                                <div class="flex flex-col">
+                                    <inertia-link
+                                        :href="route('about')"
+                                        :class="isSubMenuActive('about')"
+                                        >About
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')
+                                        "
+                                        >Forums
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Chat
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('contact')"
+                                        :class="isSubMenuActive('contact')"
+                                        >Contact
+                                    </inertia-link>
+                                </div>
+                            </ehr-header-menu>
+                        </div>
                     </nav>
-                    <div class="flex flex-wrap ltr:justify-end rtl:justify-end ml-auto xl:flex-nowrap md:flex-nowrap lg:flex-wrap">
+                    <div
+                        class="absolute right-10 flex flex-wrap ltr:justify-end rtl:justify-end ml-auto xl:flex-nowrap md:flex-nowrap lg:flex-wrap"
+                    >
                         <div class="md:block ml-2">
                             <div class="flex items-center md:ml-4">
-                                <LanguageSwitcher :drop-down-color="'text-white'"/>
-                                <button class="p-2 border-transparent text-gray-400 rounded-full hover:text-white focus:outline-none focus:text-white focus:bg-gray-700">
-                                    <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z" />
+                                <LanguageSwitcher
+                                    :drop-down-color="'text-white'"
+                                />
+                                <button
+                                    class="p-2 border-transparent text-gray-400 rounded-full hover:text-white focus:outline-none focus:text-white focus:bg-gray-700"
+                                >
+                                    <svg
+                                        class="h-6 w-6"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        fill="none"
+                                        viewBox="0 0 24 24"
+                                        stroke="currentColor"
+                                    >
+                                        <path
+                                            strokeLinecap="round"
+                                            strokeLinejoin="round"
+                                            strokeWidth="{2}"
+                                            d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z"
+                                        />
                                     </svg>
                                 </button>
                                 <div class="ml-1 relative">
                                     <div>
-                                        <div v-if="open" @click="open = false" class="fixed inset-0"></div>
-                                        <button @click="open = !open" class="max-w-xs flex items-center text-sm rounded-full text-white focus:outline-none outline-none">
+                                        <div
+                                            v-if="open"
+                                            @click="open = false"
+                                            class="fixed inset-0"
+                                        ></div>
+                                        <button
+                                            @click="open = !open"
+                                            class="max-w-xs flex items-center text-sm rounded-full text-white focus:outline-none outline-none"
+                                        >
                                             <div class="relative w-8 h-8">
-                                                <img class="rounded-full border border-1 border-gray-50 shadow-sm" src="/images/avatars/admin.png" alt="user image">
+                                                <img
+                                                    class="rounded-full border border-1 border-gray-50 shadow-sm"
+                                                    src="/images/avatars/admin.png"
+                                                    alt="user image"
+                                                />
                                             </div>
                                         </button>
                                     </div>
@@ -384,26 +834,74 @@
                                         enter-class="opacity-0 scale-70"
                                         enter-to-class="opacity-100 scale-100"
                                         leave-class="opacity-100 scale-100"
-                                        leave-to-class="opacity-0 scale-70">
-                                        <div v-if="open" class="origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg z-9999">
-                                            <div class="py-1 rounded-md bg-white shadow-xs z-9999">
+                                        leave-to-class="opacity-0 scale-70"
+                                    >
+                                        <div
+                                            v-if="open"
+                                            class="origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg z-9999"
+                                        >
+                                            <div
+                                                class="py-1 rounded-md bg-white shadow-xs z-9999"
+                                            >
                                                 <inertia-link
-                                                    :href="route('dashboard.profile')"
-                                                    :class="isSubMenuActive('dashboard.profile')">
-                                                    {{ $page.props.auth.user.first_name + " " + $page.props.auth.user.last_name }}
+                                                    :href="
+                                                        route(
+                                                            'dashboard.profile'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.profile'
+                                                        )
+                                                    "
+                                                >
+                                                    {{
+                                                        $page.props.auth.user
+                                                            .first_name +
+                                                        " " +
+                                                        $page.props.auth.user
+                                                            .last_name
+                                                    }}
                                                 </inertia-link>
                                                 <inertia-link
-                                                    :href="route('dashboard.profile')"
-                                                    :class="isSubMenuActive('dashboard.profile')"> Your Profile
+                                                    :href="
+                                                        route(
+                                                            'dashboard.profile'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.profile'
+                                                        )
+                                                    "
+                                                >
+                                                    Your Profile
                                                 </inertia-link>
 
                                                 <inertia-link
-                                                    :href="route('dashboard.settings')"
-                                                    :class="isSubMenuActive('dashboard.settings')"> Settings
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                >
+                                                    Settings
                                                 </inertia-link>
                                                 <inertia-link
-                                                    :href="route('logout')" method="post"
-                                                    :class="isSubMenuActive('logout')"> Sign out
+                                                    :href="route('logout')"
+                                                    method="post"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'logout'
+                                                        )
+                                                    "
+                                                >
+                                                    Sign out
                                                 </inertia-link>
                                             </div>
                                         </div>
@@ -414,61 +912,126 @@
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="flex flex-row justify-between text-base py-2 px-4 mb-2">
-            <div class="text-sm uppercase" style="font-size: 12px">
-                <div v-if="$page.props.ehr_patient.patient === null">
-                    <span>{{ $t('menu.patient_client') }}:</span> <span class="font-bold">None</span>
-                </div>
-                <div v-else class="flex flex-row items-center space-x-2">
-                    <div class="flex-shrink-0">
-                        <img class="w-10 h-10 rounded-full border border-gray-100" src="/images/logo.png" alt="Logo">
+            <div
+                class="flex flex-row sm:flex-row justify-between text-base py-2 px-4 mb-2 sm:mb-0"
+            >
+                <div class="flex flex-row mb-2 sm:mb-0">
+                    <div
+                        v-if="$page.props.ehr_patient.patient === null"
+                        class="relative text-sm uppercase w-full sm:w-50"
+                    >
+                        <span>{{ $t("menu.patient_client") }}:</span>
+                        <span class="font-bold">None</span>
                     </div>
-                    <div class="flex flex-col">
-                        <div class="flex flex-row">
-                            <span>{{ $t('menu.patient_client') }}:</span>
-                            <inertia-link :href="route('dashboard.patients.select', $page.props.ehr_patient.patient.pid)"
-                                          class="hover:text-teal-500 hover:underline">
-                                <span class="font-bold">
-                                    {{ $page.props.ehr_patient.patient.first_name }}
-                                    {{ $page.props.ehr_patient.patient.last_name }}
-                                    ({{ $page.props.ehr_patient.patient.pid }})
-                                </span>
-                            </inertia-link>
+                    <div v-else class="flex flex-row items-center space-x-2">
+                        <div class="flex-shrink-0">
+                            <img
+                                class="w-10 h-10 rounded-full border border-gray-100"
+                                src="/images/logo.png"
+                                alt="Logo"
+                            />
                         </div>
-                        <div class="flex flex-row">
-                            <span>{{ $t('forms.date_of_birth') }}:&nbsp;</span>
-                            <span class="font-bold">{{ $page.props.ehr_patient.patient.date_of_birth }}</span> &nbsp;&nbsp;
-                            <span>{{ $t('forms.age') }}:&nbsp;</span>
-                            <span class="font-bold">{{ $page.props.ehr_patient.patient.age }}</span>
+                        <div class="flex flex-col">
+                            <div class="flex flex-row">
+                                <span>{{ $t("menu.patient_client") }}:</span>
+                                <inertia-link
+                                    :href="
+                                        route(
+                                            'dashboard.patients.select',
+                                            $page.props.ehr_patient.patient.pid
+                                        )
+                                    "
+                                    class="hover:text-teal-500 hover:underline"
+                                >
+                                    <span class="font-bold">
+                                        {{
+                                            $page.props.ehr_patient.patient
+                                                .first_name
+                                        }}
+                                        {{
+                                            $page.props.ehr_patient.patient
+                                                .last_name
+                                        }}
+                                        ({{
+                                            $page.props.ehr_patient.patient.pid
+                                        }})
+                                    </span>
+                                </inertia-link>
+                            </div>
+                            <div class="flex flex-row">
+                                <span
+                                    >{{
+                                        $t("forms.date_of_birth")
+                                    }}:&nbsp;</span
+                                >
+                                <span class="font-bold">{{
+                                    $page.props.ehr_patient.patient
+                                        .date_of_birth
+                                }}</span>
+                                &nbsp;&nbsp;
+                                <span>{{ $t("forms.age") }}:&nbsp;</span>
+                                <span class="font-bold">{{
+                                    $page.props.ehr_patient.patient.age
+                                }}</span>
+                            </div>
                         </div>
+                        <inertia-link
+                            :href="
+                                route(
+                                    'dashboard.patients.clear',
+                                    $page.props.ehr_patient.patient.pid
+                                )
+                            "
+                            class="mr-1.5 mb-1 ml-1.5 px-2 py-1 rounded-md text-xs font-small text-gray-300 hover:text-white inline-flex items-center bg-gray-700 font-bold hover:bg-gray-800 focus:outline-none focus:text-white focus:bg-gray-700 uppercase pointer"
+                        >
+                            Clear
+                        </inertia-link>
                     </div>
-                    <inertia-link :href="route('dashboard.patients.clear', $page.props.ehr_patient.patient.pid)" class="mr-1.5 mb-1 ml-1.5 px-2 py-1 rounded-md text-xs
-                        font-small text-gray-300 hover:text-white inline-flex items-center bg-gray-700 font-bold
-                        hover:bg-gray-800 focus:outline-none focus:text-white focus:bg-gray-700 uppercase pointer">
-                        Clear
-                    </inertia-link>
                 </div>
-            </div>
-            <div class="flex flex-row mr-5 justify-end">
-                <div class="relative text-sm uppercase w-64" style="font-size: 12px">
-                    <div v-if="$page.props.ehr_patient.patient === null" class="mb-1">
-                        <span>{{ $t('general.selected_encounter') }}:</span> <span class="font-bold">None</span>
-                    </div>
-                    <div v-else class="mb-1">
-                        <span>{{ $t('general.selected_encounter') }}:</span> <span class="font-bold text-teal-300">2020-11-18</span>
-                        <select class="appearance-none block w-full bg-transparent text-gray-400 border border-gray-500
-                        rounded mt-1.5 py-1 px-4 mb-3 leading-tight text-xs focus:outline-none focus:bg-transparent focus:border-gray-500">
-                            <option>Choose Encounter</option>
-                            <option>New Encounter</option>
-                            <option>Past Encounter List (3)</option>
-                            <option>2020-11-02 / New Patient ----> Review</option>
-                            <option>2020-11-04 / Preventive Care Services ----> Review</option>
-                        </select>
-                        <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center mt-3 px-2 text-gray-700">
-                            <svg class="fill-current h-4 w-4 text-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-                                <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"/>
-                            </svg>
+                <div class="flex flex-row justify-end">
+                    <div
+                        class="relative text-sm uppercase w-full sm:w-64"
+                        style="font-size: 12px"
+                    >
+                        <div
+                            v-if="$page.props.ehr_patient.patient === null"
+                            class="mb-1"
+                        >
+                            <span>{{ $t("general.selected_encounter") }}:</span>
+                            <span class="font-bold">None</span>
+                        </div>
+                        <div v-else class="mb-1">
+                            <span>{{ $t("general.selected_encounter") }}:</span>
+                            <span class="font-bold text-teal-300"
+                                >2020-11-18</span
+                            >
+                            <select
+                                class="appearance-none block w-full bg-transparent text-gray-400 border border-gray-500 rounded mt-1.5 py-1 px-4 mb-3 leading-tight text-xs focus:outline-none focus:bg-transparent focus:border-gray-500"
+                            >
+                                <option>Choose Encounter</option>
+                                <option>New Encounter</option>
+                                <option>Past Encounter List (3)</option>
+                                <option>
+                                    2020-11-02 / New Patient ----> Review
+                                </option>
+                                <option>
+                                    2020-11-04 / Preventive Care Services ---->
+                                    Review
+                                </option>
+                            </select>
+                            <div
+                                class="pointer-events-none absolute inset-y-0 right-0 flex items-center mt-3 px-2 text-gray-700"
+                            >
+                                <svg
+                                    class="fill-current h-4 w-4 text-white"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 20 20"
+                                >
+                                    <path
+                                        d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"
+                                    />
+                                </svg>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -478,57 +1041,58 @@
 </template>
 
 <script>
-    import LanguageSwitcher from "../../components/LanguageSwitcher"
+import LanguageSwitcher from "../../components/LanguageSwitcher";
 
-    export default {
-        name: "Header",
-        watch: {
-            "$page.props.ehr_patient": {
-                handler() {
-                    if (this.$page.props.ehr_patient.patient) {
-                        this.patient_id = this.$page.props.ehr_patient.patient.pid
-                    } else {
-                        this.patient_id = "#"
-                    }
-                },
-                deep: true
+export default {
+    name: "Header",
+    watch: {
+        "$page.props.ehr_patient": {
+            handler() {
+                if (this.$page.props.ehr_patient.patient) {
+                    this.patient_id = this.$page.props.ehr_patient.patient.pid;
+                } else {
+                    this.patient_id = "#";
+                }
             },
+            deep: true,
+        },
+    },
+    data() {
+        return {
+            patient_id: this.$page.props.ehr_patient.patient
+                ? this.$page.props.ehr_patient.patient.pid
+                : "#",
+            open: false,
+            isMenuOpen: false,
+        };
+    },
+    components: {
+        LanguageSwitcher,
+    },
+    methods: {
+        url() {
+            return location.pathname.substr(1);
         },
-        data() {
-            return {
-                patient_id: this.$page.props.ehr_patient.patient ?
-                    this.$page.props.ehr_patient.patient.pid : "#",
-                open: false,
+        isUrl(...urls) {
+            if (urls[0] === "") {
+                return this.url() === "";
             }
+            return urls.filter((url) => this.url().startsWith(url)).length;
         },
-        components: {
-            LanguageSwitcher,
+        isActiveClass: function (url) {
+            return this.isUrl(url)
+                ? "mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white " +
+                      "inline-flex items-center bg-theme-1 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-theme-1" +
+                      "transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer"
+                : "mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white " +
+                      "inline-flex items-center bg-gray-800 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700 " +
+                      "transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer";
         },
-        methods: {
-            url() {
-                return location.pathname.substr(1);
-            },
-            isUrl(...urls) {
-                if (urls[0] === '') {
-                    return this.url() === ''
-                }
-                return urls.filter(url => this.url().startsWith(url)).length
-            },
-            isActiveClass: function(url) {
-                return this.isUrl(url) ?
-                    'mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white ' +
-                    'inline-flex items-center bg-theme-1 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-theme-1' +
-                    'transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer':
-
-                    'mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white ' +
-                    'inline-flex items-center bg-gray-800 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700 ' +
-                    'transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer'
-            },
-            isSubMenuActive: function (url) {
-                return this.isUrl(url) ?
-                    'block px-4 py-2 text-sm text-gray-700 bg-gray-100 hover:bg-gray-100' :
-                    'block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100'
-            }
+        isSubMenuActive: function (url) {
+            return this.isUrl(url)
+                ? "block px-4 py-2 text-sm text-gray-700 bg-gray-100 hover:bg-gray-100"
+                : "block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100";
         },
-    }
+    },
+};
 </script>

From 3ecdb065781b62761542ca6d0416beecb4518d59 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Mon, 3 Apr 2023 01:58:43 +0530
Subject: [PATCH 32/41] Added icon template for svg icons

---
 resources/app/global-components/Icon.vue | 16 +++++-
 resources/app/shared/includes/Header.vue | 67 ++----------------------
 2 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/resources/app/global-components/Icon.vue b/resources/app/global-components/Icon.vue
index bd3bfd0..972c3c9 100644
--- a/resources/app/global-components/Icon.vue
+++ b/resources/app/global-components/Icon.vue
@@ -681,13 +681,27 @@
          viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
         <path d="M13 5l7 7-7 7M5 5l7 7-7 7" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
     </svg>
+    <svg v-else-if="name === 'home-icon'" class="h-5 w-5" stroke="currentColor" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+    >
+    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"/>
+    </svg>
+    <svg v-else-if="name === 'hamburger'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+  <path v-if="!isMenuOpen" stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
+  <path v-if="isMenuOpen" stroke-linecap="round" stroke-linejoin="round" d="M9.75 9.75l4.5 4.5m0-4.5l-4.5 4.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+</svg>
+<svg v-else-if="name === 'chat-bubble'" class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" >
+    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="{2}" d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z" />
+ </svg>
+
 </template>
 <script>
 export default {
     name: 'Icon',
     props: {
         name: String,
-    }
+        isMenuOpen: Boolean,
+    },
+
 }
 
 </script>
diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index accf735..a12ff4b 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -11,20 +11,7 @@
                         :href="route('dashboard.index')"
                         class="p-1 mx-2 border-transparent text-gray-400 rounded-full hover:text-white bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700"
                     >
-                        <svg
-                            class="h-5 w-5"
-                            stroke="currentColor"
-                            xmlns="http://www.w3.org/2000/svg"
-                            fill="none"
-                            viewBox="0 0 24 24"
-                        >
-                            <path
-                                stroke-linecap="round"
-                                stroke-linejoin="round"
-                                stroke-width="2"
-                                d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"
-                            />
-                        </svg>
+                     <icon name="home-icon" class="w-6 h-6" />
                     </inertia-link>
 
                     <nav
@@ -35,32 +22,7 @@
                             class="block lg:hidden text-white hover:text-gray-200 focus:text-gray-200 focus:outline-none"
                         >
                             <span class="inline-block align-middle">
-                                <svg
-                                    class="h-6 w-6 fill-current"
-                                    viewBox="0 0 24 24"
-                                    xmlns="http://www.w3.org/2000/svg"
-                                >
-                                    <path
-                                        v-if="isMenuOpen"
-                                        fill-rule="evenodd"
-                                        clip-rule="evenodd"
-                                        d="M19.293 16.707a1 1 0 0 1-1.414 1.414l-6.293-6.293-6.293 6.293a1 1 0 1 1-1.414-1.414l6.293-6.293-6.293-6.293a1 1 0 1 1 1.414-1.414l6.293 6.293 6.293-6.293a1 1 0 1 1 1.414 1.414l-6.293 6.293 6.293 6.293z"
-                                        style="
-                                            transition: transform 0.3s
-                                                ease-in-out;
-                                        "
-                                    ></path>
-                                    <path
-                                        v-if="!isMenuOpen"
-                                        fill-rule="evenodd"
-                                        clip-rule="evenodd"
-                                        d="M4 6h16v2H4V6zm0 5h16v2H4v-2zm0 5h16v2H4v-2z"
-                                        style="
-                                            transition: transform 0.3s
-                                                ease-in-out;
-                                        "
-                                    ></path>
-                                </svg>
+                                <icon name="hamburger" class="w-6 h-6" :isMenuOpen="isMenuOpen"/>
                             </span>
                         </button>
                         <div
@@ -793,20 +755,7 @@
                                 <button
                                     class="p-2 border-transparent text-gray-400 rounded-full hover:text-white focus:outline-none focus:text-white focus:bg-gray-700"
                                 >
-                                    <svg
-                                        class="h-6 w-6"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                        fill="none"
-                                        viewBox="0 0 24 24"
-                                        stroke="currentColor"
-                                    >
-                                        <path
-                                            strokeLinecap="round"
-                                            strokeLinejoin="round"
-                                            strokeWidth="{2}"
-                                            d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z"
-                                        />
-                                    </svg>
+                                   <icon name="chat-bubble" />
                                 </button>
                                 <div class="ml-1 relative">
                                     <div>
@@ -1022,15 +971,7 @@
                             <div
                                 class="pointer-events-none absolute inset-y-0 right-0 flex items-center mt-3 px-2 text-gray-700"
                             >
-                                <svg
-                                    class="fill-current h-4 w-4 text-white"
-                                    xmlns="http://www.w3.org/2000/svg"
-                                    viewBox="0 0 20 20"
-                                >
-                                    <path
-                                        d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"
-                                    />
-                                </svg>
+                               <icon name="chevron-down" class="w-4 h-4" />
                             </div>
                         </div>
                     </div>

From 1eb766104ff8c63b6288f8fbc4d42a613e53e583 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Wed, 19 Apr 2023 03:54:31 +0530
Subject: [PATCH 33/41] =?UTF-8?q?=E2=9C=A8=20Drawer=20Navigation=20Menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             |    1 +
 resources/app/global-components/Icon.vue |   22 +
 resources/app/shared/includes/Header.vue | 1006 +++++++++++++++++++++-
 tailwind.config.js                       |  142 +--
 4 files changed, 1095 insertions(+), 76 deletions(-)

diff --git a/package.json b/package.json
index 46e8f52..2b6f8ab 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
         "axios": "^0.25.0",
         "cash-dom": "^8.1.0",
         "dayjs": "^1.10.7",
+        "flowbite": "^1.6.5",
         "laravel-echo": "^1.11.3",
         "laravel-mix": "^6.0.41",
         "laravel-vue-datatable": "^0.6.0",
diff --git a/resources/app/global-components/Icon.vue b/resources/app/global-components/Icon.vue
index 972c3c9..f6d59f6 100644
--- a/resources/app/global-components/Icon.vue
+++ b/resources/app/global-components/Icon.vue
@@ -692,6 +692,28 @@
 <svg v-else-if="name === 'chat-bubble'" class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" >
     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="{2}" d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z" />
  </svg>
+ <svg v-else-if="name === 'inventory'" class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C1.55228 0 2 0.447715 2 1V8H5C4.44772 8 4 7.55228 4 7V5C4 4.44772 4.44772 4 5 4H9C9.55228 4 10 4.44772 10 5V7C10 7.55228 9.55228 8 9 8H13C12.4477 8 12 7.55228 12 7V3C12 2.44772 12.4477 2 13 2H19C19.5523 2 20 2.44772 20 3V7C20 7.55228 19.5523 8 19 8H22V1C22 0.447715 22.4477 0 23 0C23.5523 0 24 0.447715 24 1V23C24 23.5523 23.5523 24 23 24C22.4477 24 22 23.5523 22 23V22H2V23C2 23.5523 1.55228 24 1 24C0.447715 24 0 23.5523 0 23V1C0 0.447715 0.447715 0 1 0ZM22 20H19C19.5523 20 20 19.5523 20 19V15C20 14.4477 19.5523 14 19 14H14C13.4477 14 13 14.4477 13 15V19C13 19.5523 13.4477 20 14 20H10C10.5523 20 11 19.5523 11 19V13C11 12.4477 10.5523 12 10 12H5C4.44772 12 4 12.4477 4 13V19C4 19.5523 4.44772 20 5 20H2V10H22V20Z" fill="#758CA3"/>
+ </svg>
+ <svg v-else-if="name === 'procedures'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M9 12h3.75M9 15h3.75M9 18h3.75m3 .75H18a2.25 2.25 0 002.25-2.25V6.108c0-1.135-.845-2.098-1.976-2.192a48.424 48.424 0 00-1.123-.08m-5.801 0c-.065.21-.1.433-.1.664 0 .414.336.75.75.75h4.5a.75.75 0 00.75-.75 2.25 2.25 0 00-.1-.664m-5.8 0A2.251 2.251 0 0113.5 2.25H15c1.012 0 1.867.668 2.15 1.586m-5.8 0c-.376.023-.75.05-1.124.08C9.095 4.01 8.25 4.973 8.25 6.108V8.25m0 0H4.875c-.621 0-1.125.504-1.125 1.125v11.25c0 .621.504 1.125 1.125 1.125h9.75c.621 0 1.125-.504 1.125-1.125V9.375c0-.621-.504-1.125-1.125-1.125H8.25zM6.75 12h.008v.008H6.75V12zm0 3h.008v.008H6.75V15zm0 3h.008v.008H6.75V18z" />
+</svg>
+
+<svg v-else-if="name === 'admin'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z" />
+</svg>
+<svg v-else-if="name === 'misc'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h8v4c.341.035.677.112 1 .23V1H3v8.48l1-1.75V2zm2.14 8L5 8 4 9.75 3.29 11 1 15h8l-2.29-4-.57-1zm-3.42 4l1.72-3L5 10l.56 1 1.72 3H2.72zm6.836-6.41a3.5 3.5 0 1 1 3.888 5.82 3.5 3.5 0 0 1-3.888-5.82zm.555 4.989a2.5 2.5 0 1 0 2.778-4.157 2.5 2.5 0 0 0-2.778 4.157z"/>
+</svg>
+<svg v-else-if="name === 'pop-ups'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+    <path d="M5 8v7h14V8zm13 6H6V9h12zm-7-8H5V5h6zm7-1h1v1h-1zm-6 17.207L15.207 18H20.5a1.502 1.502 0 0 0 1.5-1.5v-13A1.502 1.502 0 0 0 20.5 2h-17A1.502 1.502 0 0 0 2 3.5v13A1.502 1.502 0 0 0 3.5 18h5.293zm9-5.707a.5.5 0 0 1-.5.5h-5.788L12 20.558 9.288 17H3.5a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 .5-.5h17a.5.5 0 0 1 .5.5z"/><path fill="none" d="M0 0h24v24H0z"/>
+</svg>
+<svg v-else-if="name === 'QnA'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9 5.25h.008v.008H12v-.008z" />
+</svg>
+<svg v-else-if="name === 'help'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z" />
+</svg>
 
 </template>
 <script>
diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index a12ff4b..1cdac98 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -15,19 +15,997 @@
                     </inertia-link>
 
                     <nav
-                        class="flex flex-wrap items-center text-base md:ml-0 space-x-1"
+                        class=" dark flex flex-wrap items-center text-base md:ml-0 space-x-1"
                     >
-                        <button
+                    <button
                             @click="isMenuOpen = !isMenuOpen"
                             class="block lg:hidden text-white hover:text-gray-200 focus:text-gray-200 focus:outline-none"
+                            type="button" data-drawer-target="drawer-navigation" data-drawer-show="drawer-navigation" aria-controls="drawer-navigation"
                         >
                             <span class="inline-block align-middle">
                                 <icon name="hamburger" class="w-6 h-6" :isMenuOpen="isMenuOpen"/>
                             </span>
                         </button>
+
+
+
+<!-- drawer init and show -->
+<!-- <div class="text-center">
+   <button class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800" type="button" data-drawer-target="drawer-navigation" data-drawer-show="drawer-navigation" aria-controls="drawer-navigation">
+   Show navigation
+   </button>
+</div> -->
+
+<!-- drawer component -->
+<div id="drawer-navigation" class="dark fixed top-0 left-0 z-40 h-screen p-4 overflow-y-auto transition-transform -translate-x-full bg-white w-80 dark:bg-gray-800" tabindex="-1" aria-labelledby="drawer-navigation-label">
+    <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400">Menu</h5>
+    <button  @click="isMenuOpen = !isMenuOpen" type="button" data-drawer-hide="drawer-navigation" aria-controls="drawer-navigation" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute top-2.5 right-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" >
+        <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
+        <span class="sr-only">Close menu</span>
+    </button>
+  <div class="py-4 overflow-y-auto">
+      <ul class="space-y-2 font-medium ">
+<li>
+   <div class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">
+      <span class="inline-block align-middle mr-3">
+         <icon name="calendar" class="w-6 h-6" />
+      </span>
+      <inertia-link
+         :href="route('dashboard.calendar')"
+         :class="isActiveClass('dashboard.calendar') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+         >
+         {{ $t("menu.calendar") }}
+      </inertia-link>
+   </div>
+</li>
+<li>
+   <div class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">
+      <span class="inline-block align-middle mr-3">
+         <icon name="dashboard" class="w-6 h-6" />
+      </span>
+      <inertia-link
+                                :href="route('dashboard.flow_board')"
+                                :class="isActiveClass('dashboard.flow_board')? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+                            >
+                                {{ $t("menu.flow_board") }}
+                            </inertia-link>
+   </div>
+</li>
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-patient" data-collapse-toggle="dropdown-patient">
+                 <icon name="users" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.patient_client") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-patient" class="hidden py-2 space-y-2 ml-2">
+                  <li>
+                    <inertia-link
+                                        :href="
+                                            route('dashboard.patients.index')
+                                        "
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.patients.index'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Finder
+                                    </inertia-link>
+                  </li>
+                  <li>
+                    <inertia-link
+                                        :href="
+                                            route('dashboard.patients.create')
+                                        "
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.patients.create'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Add New/Search
+                                    </inertia-link>
+                  </li>
+                  <li>
+                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Recycle Bin
+                                    </inertia-link>
+                  </li>
+                  <li>
+                    <inertia-link
+                                        v-if="
+                                            $page.props.ehr_patient.patient !=
+                                            null
+                                        "
+                                        :href="
+                                            route(
+                                                'dashboard.patients.select',
+                                                $page.props.ehr_patient.patient
+                                                    .id
+                                            )
+                                        "
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Summary
+                                    </inertia-link>
+
+                  </li>
+                  <li>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Track Appointments
+                                    </inertia-link>
+                                </li>
+                            <li>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Visits
+                                    </inertia-link>
+                                </li>
+                            <li>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Records
+                                    </inertia-link>
+                                </li>
+                            <li>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Visit Forms
+                                    </inertia-link>
+                                </li>
+                                <li>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Imports
+                                    </inertia-link>
+                                </li>
+            </ul>
+         </li>
+
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-fees" data-collapse-toggle="dropdown-fees">
+                 <icon name="money" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.fees") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-fees" class="hidden py-2 space-y-2 ml-2">
+
+  <li>
+    <inertia-link
+      :href="'#'"
+      :class="isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Fee Sheet
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="'#'"
+      :class="isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Payment
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Checkout
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Billing
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Posting
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Batch Payments
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Verify Patient Data
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      EDI History
+    </inertia-link>
+  </li>
+</ul>
+
+
+         </li>
+
+
+
+
+
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-inventory" data-collapse-toggle="dropdown-inventory">
+                 <icon name="inventory" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.inventory") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-inventory" class="hidden py-2 space-y-2 ml-2">
+
+
+  <li>
+    <inertia-link
+      :href="'#'"
+      :class="isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Management
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="'#'"
+      :class="isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Destroyed
+    </inertia-link>
+  </li>
+</ul>
+         </li>
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-procedures" data-collapse-toggle="dropdown-procedures">
+                 <icon name="procedures" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.procedures") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-procedures" class="hidden py-2 space-y-2 ml-2">
+
+
+                <li>
+    <inertia-link
+      :href="'#'"
+      :class="isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Providers
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="'#'"
+      :class="isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Configuration
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Load Compendium
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Pending Review
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Patient Results
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Lab Results
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Electronic Reports
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+    >
+      Lab Documents
+    </inertia-link>
+  </li>
+</ul>
+         </li>
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-admin" data-collapse-toggle="dropdown-admin">
+                 <icon name="admin" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.administration") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-admin" class="hidden py-2 space-y-2 ml-2">
+
+
+                <li>
+    <inertia-link
+      :href="'#'"
+      :class="
+        isSubMenuActive('patients.index')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Providers
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="'#'"
+      :class="
+        isSubMenuActive('patients.create')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Configuration
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Load Compendium
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Pending Review
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Patient Results
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Lab Results
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Electronic Reports
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+      Lab Documents
+    </inertia-link>
+  </li>
+</ul>
+         </li>
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-reports" data-collapse-toggle="dropdown-reports">
+                 <icon name="procedures" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.reports") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-reports" class="hidden py-2 space-y-2 ml-2">
+
+
+                <li>
+        <inertia-link
+            :href="'#'"
+            :class="
+                isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Clients
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="'#'"
+            :class="
+                isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Visits
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Financial
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Inventory
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Procedures
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Insurance
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Blank Forms
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
+            "
+        >Services
+        </inertia-link>
+    </li>
+</ul>
+         </li>
+
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-misc" data-collapse-toggle="dropdown-misc">
+                 <icon name="misc" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.miscellaneous") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-misc" class="hidden py-2 space-y-2 ml-2">
+
+
+                <li>
+        <inertia-link
+            :href="'#'"
+            :class="
+                isSubMenuActive('patients.index')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Patient Education
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="'#'"
+            :class="
+                isSubMenuActive('patients.create')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Patient Portal
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Authorizations
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Address Book
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Order Catalog
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            BatchCom
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Preferences
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            New Documents
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Utilities
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Document Templates
+        </inertia-link>
+    </li>
+</ul>
+         </li>
+
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-popups" data-collapse-toggle="dropdown-popups">
+                 <icon name="pop-ups" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.popups") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-popups" class="hidden py-2 space-y-2 ml-2">
+
+
+                <li>
+    <inertia-link
+        :href="'#'"
+        :class="
+            isSubMenuActive('patients.index')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Issues
+    </inertia-link>
+</li>
+<li>
+    <inertia-link
+        :href="'#'"
+        :class="
+            isSubMenuActive('patients.create')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Appts
+    </inertia-link>
+</li>
+<li>
+    <inertia-link
+        :href="route('dashboard.settings')"
+        :class="
+            isSubMenuActive('dashboard.settings')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Superbill
+    </inertia-link>
+</li>
+<li>
+    <inertia-link
+        :href="route('dashboard.settings')"
+        :class="
+            isSubMenuActive('dashboard.settings')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Payment
+    </inertia-link>
+</li>
+<li>
+    <inertia-link
+        :href="route('dashboard.settings')"
+        :class="
+            isSubMenuActive('dashboard.settings')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Letter
+    </inertia-link>
+</li>
+<li>
+    <inertia-link
+        :href="route('dashboard.patients.chart_label', patient_id)"
+        :class="
+            isSubMenuActive('dashboard.patients.chart_label')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Chart Label
+    </inertia-link>
+</li>
+<li>
+    <inertia-link
+        :href="route('dashboard.settings')"
+        :class="
+            isSubMenuActive('dashboard.settings')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Barcode Label
+    </inertia-link>
+</li>
+<li>
+    <inertia-link
+        :href="route('dashboard.settings')"
+        :class="
+            isSubMenuActive('dashboard.settings')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Address Label
+    </inertia-link>
+</li>
+</ul>
+         </li>
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-qa" data-collapse-toggle="dropdown-qa">
+                 <icon name="QnA" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.qa_measures") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-qa" class="hidden py-2 space-y-2 ml-2">
+
+
+                <li>
+        <inertia-link
+            :href="'#'"
+            :class="
+                isSubMenuActive('patients.index')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >View Reports
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="'#'"
+            :class="
+                isSubMenuActive('patients.create')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Create MIPS Report
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Select Measures
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Upload Claim Files
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Instance Counts
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Remove Provider Assignments
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Provider Encounter Counts
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Database Imports
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >Database Inserts
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >MIPS Module Installer
+        </inertia-link>
+    </li>
+    <li>
+        <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white'
+                                            : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Alert Logs
+                                    </inertia-link>
+    </li>
+</ul>
+         </li>
+
+         <li>
+            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-help" data-collapse-toggle="dropdown-help">
+                 <icon name="help" class="w-6 h-6" />
+                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.help") }}</span>
+                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+            </button>
+            <ul id="dropdown-help" class="hidden py-2 space-y-2 ml-2">
+
+<li>
+                <inertia-link
+                                        :href="route('about')"
+                                        :class="isSubMenuActive('about')? 'text-gray-900 dark:text-white'
+                                            : 'text-gray-400 dark:text-gray-400'"
+                                        >About
+                                    </inertia-link></li><li>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.create')? 'text-gray-900 dark:text-white'
+                                            : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Forums
+                                    </inertia-link></li><li>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white'
+                                            : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >Chat
+                                    </inertia-link></li><li>
+                                    <inertia-link
+                                        :href="route('contact')"
+                                        :class="isSubMenuActive('contact')? 'text-gray-900 dark:text-white'
+                                            : 'text-gray-400 dark:text-gray-400'"
+                                        >Contact
+                                    </inertia-link></li>
+</ul>
+         </li>
+
+
+
+      </ul>
+   </div>
+</div>
+
+
+
+
+
+
                         <div
-                            class="md:flex md:items-center md:w-auto w-full bg-gray-700 flex flex-wrap p-2 m-2 gap-1"
-                            :class="{ hidden: !isMenuOpen, block: isMenuOpen }"
+                            class="hidden md:block sm:block w-full bg-gray-700 flex flex-wrap p-2 m-2 gap-1"
+
                         >
                             <inertia-link
                                 :href="route('dashboard.calendar')"
@@ -859,10 +1837,11 @@
                             </div>
                         </div>
                     </div>
+
+
                 </div>
-            </div>
-            <div
-                class="flex flex-row sm:flex-row justify-between text-base py-2 px-4 mb-2 sm:mb-0"
+                <div
+                class="flex flex-wrap sm:flex-row justify-between text-base py-2 px-4 mb-2 sm:mb-0"
             >
                 <div class="flex flex-row mb-2 sm:mb-0">
                     <div
@@ -977,10 +1956,13 @@
                     </div>
                 </div>
             </div>
+            </div>
+
         </div>
     </nav>
 </template>
 
+
 <script>
 import LanguageSwitcher from "../../components/LanguageSwitcher";
 
@@ -1037,3 +2019,13 @@ export default {
     },
 };
 </script>
+<script setup>
+import { onMounted } from 'vue'
+import { initFlowbite } from 'flowbite'
+
+// initialize components based on data attribute selectors
+onMounted(() => {
+    initFlowbite();
+});
+
+</script>
diff --git a/tailwind.config.js b/tailwind.config.js
index 5c9f072..6769c41 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,42 +1,44 @@
-const colors = require('tailwindcss/colors');
-const plugin = require('tailwindcss/plugin');
+const colors = require("tailwindcss/colors");
+const plugin = require("tailwindcss/plugin");
 
 module.exports = {
-    mode: 'jit',
+    mode: "jit",
     content: [
-        './resources/**/*.{html,js,vue,php}',
+        "./resources/**/*.{html,js,vue,php}",
+
+        "./node_modules/flowbite/**/*.js",
     ],
-    darkMode: 'class',
+    darkMode: "class",
     theme: {
         zIndex: {
-            '5': 5,
-            '10': 10,
-            '15': 15,
-            '20': 20,
-            '25': 25,
-            '30': 30,
-            '35': 35,
-            '40': 40,
-            '45': 45,
-            '50': 50,
-            '75': 75,
-            '100': 100,
-            '200': 200,
-            '999': 999,
-            '1000': 1000,
-            '9999': 9999,
-            'auto': 'auto',
+            5: 5,
+            10: 10,
+            15: 15,
+            20: 20,
+            25: 25,
+            30: 30,
+            35: 35,
+            40: 40,
+            45: 45,
+            50: 50,
+            75: 75,
+            100: 100,
+            200: 200,
+            999: 999,
+            1000: 1000,
+            9999: 9999,
+            auto: "auto",
         },
         extend: {
             keyframes: {
-                'wiggle': {
-                    '0%, 100%': {transform: 'rotate(-4deg)'},
-                    '50%': {transform: 'rotate(4deg)'},
-                }
+                wiggle: {
+                    "0%, 100%": { transform: "rotate(-4deg)" },
+                    "50%": { transform: "rotate(4deg)" },
+                },
             },
             animation: {
-                'fade-in-down': 'fade-in-down 0.5s ease-out',
-                'wiggle': 'wiggle 0.4s ease-in-out infinite',
+                "fade-in-down": "fade-in-down 0.5s ease-out",
+                wiggle: "wiggle 0.4s ease-in-out infinite",
             },
             colors: {
                 yellow: colors.amber,
@@ -52,11 +54,11 @@ module.exports = {
                     linkedin: "#007BB5",
                     github: "#333",
                     feedback: "#c0916f",
-                    'success': "#00B74A",
-                    'danger': "#F93154",
-                    'warning': "#FFA900",
-                    'info': "#39C0ED",
-                    'light': "#98AFF5",
+                    success: "#00B74A",
+                    danger: "#F93154",
+                    warning: "#FFA900",
+                    info: "#39C0ED",
+                    light: "#98AFF5",
                 },
                 theme: {
                     1: "#f59031",
@@ -77,70 +79,72 @@ module.exports = {
                     4: "#1e2533",
                     5: "#3f4865",
                     6: "#2b3348",
-                    7: "#181f29"
+                    7: "#181f29",
                 },
                 fontFamily: {
-                    'nunito': ['Nunito', 'sans-serif']
+                    nunito: ["Nunito", "sans-serif"],
                 },
                 container: {
-                    center: true
+                    center: true,
                 },
                 maxWidth: {
                     "1/4": "25%",
                     "1/2": "50%",
-                    "3/4": "75%"
+                    "3/4": "75%",
                 },
                 maxHeight: {
-                    '0': '0',
-                    '98': '32rem',
-                    '1/4': '25%',
-                    '1/2': '50%',
-                    '3/4': '75%',
-                    'full': '100%',
+                    0: "0",
+                    98: "32rem",
+                    "1/4": "25%",
+                    "1/2": "50%",
+                    "3/4": "75%",
+                    full: "100%",
                 },
                 strokeWidth: {
-                    "0.5": 0.5,
-                    "1.5": 1.5,
-                    "2.5": 2.5
+                    0.5: 0.5,
+                    1.5: 1.5,
+                    2.5: 2.5,
                 },
                 margin: {
-                    '78': '19.5rem',
-                }
+                    78: "19.5rem",
+                },
             },
             boxShadow: {
-                sm: '0 1px 2px 0 rgba(0, 0, 0, 0.05)',
-                DEFAULT: '0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06)',
-                md: '0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)',
-                lg: '0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)',
-                xl: '0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)',
-                '2xl': '0 25px 50px -12px rgba(0, 0, 0, 0.25)',
-                '3xl': '0 35px 60px -15px rgba(0, 0, 0, 0.3)',
-                inner: 'inset 0 2px 4px 0 rgba(0, 0, 0, 0.06)',
-                none: 'none',
+                sm: "0 1px 2px 0 rgba(0, 0, 0, 0.05)",
+                DEFAULT:
+                    "0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06)",
+                md: "0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)",
+                lg: "0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)",
+                xl: "0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)",
+                "2xl": "0 25px 50px -12px rgba(0, 0, 0, 0.25)",
+                "3xl": "0 35px 60px -15px rgba(0, 0, 0, 0.3)",
+                inner: "inset 0 2px 4px 0 rgba(0, 0, 0, 0.06)",
+                none: "none",
             },
-            backgroundImage: theme => ({
-                'ehr-template__bg': "url('/images/logo.png') !important",
-            })
+            backgroundImage: (theme) => ({
+                "ehr-template__bg": "url('/images/logo.png') !important",
+            }),
         },
         variants: {
-            gradients: ['responsive', 'hover'],
+            gradients: ["responsive", "hover"],
         },
         plugins: [
-            plugin(function ({addVariant, e}) {
-                addVariant("dark", ({modifySelectors, separator}) => {
-                    modifySelectors(({className}) => {
+            plugin(function ({ addVariant, e }) {
+                addVariant("dark", ({ modifySelectors, separator }) => {
+                    modifySelectors(({ className }) => {
                         return `.dark .${e(`dark${separator}${className}`)}`;
                     });
                 });
-                addVariant("dark-hover", ({modifySelectors, separator}) => {
-                    modifySelectors(({className}) => {
+                addVariant("dark-hover", ({ modifySelectors, separator }) => {
+                    modifySelectors(({ className }) => {
                         return `.dark .${e(
                             `dark${separator}hover${separator}${className}`
                         )}:hover`;
                     });
                 });
             }),
-        ],
-    }
-}
 
+            require("flowbite/plugin"),
+        ],
+    },
+};

From 5679a2327328edec486e88a2f02e87c5cff3b3e9 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 21 Apr 2023 12:25:10 +0530
Subject: [PATCH 34/41] Fixed chevron icon color

---
 resources/app/global-components/Icon.vue |  4 ++--
 resources/app/shared/includes/Header.vue | 26 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/app/global-components/Icon.vue b/resources/app/global-components/Icon.vue
index f6d59f6..beca892 100644
--- a/resources/app/global-components/Icon.vue
+++ b/resources/app/global-components/Icon.vue
@@ -686,8 +686,8 @@
     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"/>
     </svg>
     <svg v-else-if="name === 'hamburger'" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-  <path v-if="!isMenuOpen" stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
-  <path v-if="isMenuOpen" stroke-linecap="round" stroke-linejoin="round" d="M9.75 9.75l4.5 4.5m0-4.5l-4.5 4.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+  <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
+
 </svg>
 <svg v-else-if="name === 'chat-bubble'" class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" >
     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="{2}" d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z" />
diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index 1cdac98..d9bbe9e 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -18,12 +18,12 @@
                         class=" dark flex flex-wrap items-center text-base md:ml-0 space-x-1"
                     >
                     <button
-                            @click="isMenuOpen = !isMenuOpen"
+
                             class="block lg:hidden text-white hover:text-gray-200 focus:text-gray-200 focus:outline-none"
                             type="button" data-drawer-target="drawer-navigation" data-drawer-show="drawer-navigation" aria-controls="drawer-navigation"
                         >
                             <span class="inline-block align-middle">
-                                <icon name="hamburger" class="w-6 h-6" :isMenuOpen="isMenuOpen"/>
+                                <icon name="hamburger" class="w-6 h-6"/>
                             </span>
                         </button>
 
@@ -39,7 +39,7 @@
 <!-- drawer component -->
 <div id="drawer-navigation" class="dark fixed top-0 left-0 z-40 h-screen p-4 overflow-y-auto transition-transform -translate-x-full bg-white w-80 dark:bg-gray-800" tabindex="-1" aria-labelledby="drawer-navigation-label">
     <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400">Menu</h5>
-    <button  @click="isMenuOpen = !isMenuOpen" type="button" data-drawer-hide="drawer-navigation" aria-controls="drawer-navigation" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute top-2.5 right-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" >
+    <button type="button" data-drawer-hide="drawer-navigation" aria-controls="drawer-navigation" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute top-2.5 right-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" >
         <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
         <span class="sr-only">Close menu</span>
     </button>
@@ -75,7 +75,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-patient" data-collapse-toggle="dropdown-patient">
                  <icon name="users" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.patient_client") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-patient" class="hidden py-2 space-y-2 ml-2">
                   <li>
@@ -200,7 +200,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-fees" data-collapse-toggle="dropdown-fees">
                  <icon name="money" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.fees") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-fees" class="hidden py-2 space-y-2 ml-2">
 
@@ -282,7 +282,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-inventory" data-collapse-toggle="dropdown-inventory">
                  <icon name="inventory" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.inventory") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-inventory" class="hidden py-2 space-y-2 ml-2">
 
@@ -310,7 +310,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-procedures" data-collapse-toggle="dropdown-procedures">
                  <icon name="procedures" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.procedures") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-procedures" class="hidden py-2 space-y-2 ml-2">
 
@@ -386,7 +386,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-admin" data-collapse-toggle="dropdown-admin">
                  <icon name="admin" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.administration") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-admin" class="hidden py-2 space-y-2 ml-2">
 
@@ -494,7 +494,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-reports" data-collapse-toggle="dropdown-reports">
                  <icon name="procedures" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.reports") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-reports" class="hidden py-2 space-y-2 ml-2">
 
@@ -579,7 +579,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-misc" data-collapse-toggle="dropdown-misc">
                  <icon name="misc" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.miscellaneous") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-misc" class="hidden py-2 space-y-2 ml-2">
 
@@ -712,7 +712,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-popups" data-collapse-toggle="dropdown-popups">
                  <icon name="pop-ups" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.popups") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-popups" class="hidden py-2 space-y-2 ml-2">
 
@@ -820,7 +820,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-qa" data-collapse-toggle="dropdown-qa">
                  <icon name="QnA" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.qa_measures") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-qa" class="hidden py-2 space-y-2 ml-2">
 
@@ -954,7 +954,7 @@
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-help" data-collapse-toggle="dropdown-help">
                  <icon name="help" class="w-6 h-6" />
                   <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.help") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 text-white bg-white" />
+                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
             </button>
             <ul id="dropdown-help" class="hidden py-2 space-y-2 ml-2">
 

From a4b7c1aa3e030a59fd7038bd453b7883f1ebfbd2 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 22 Apr 2023 04:06:26 +0530
Subject: [PATCH 35/41] =?UTF-8?q?=F0=9F=90=9B=20fixed=20the=20backdrop=20b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/app/shared/includes/Header.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index d9bbe9e..d0081bd 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -2020,12 +2020,15 @@ export default {
 };
 </script>
 <script setup>
+
 import { onMounted } from 'vue'
-import { initFlowbite } from 'flowbite'
+import { Drawer } from 'flowbite'
 
-// initialize components based on data attribute selectors
 onMounted(() => {
-    initFlowbite();
+    const $targetEl = document.getElementById('drawer-navigation');
+
+    const drawer = new Drawer($targetEl);
+    drawer.init();
 });
 
 </script>

From e877ac6cc46ae28dd9039d89c29a36259a2339ef Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 27 May 2023 02:07:10 +0530
Subject: [PATCH 36/41] added all nav menu

---
 resources/app/shared/includes/Header.vue | 314 +++++++++++++++++++++--
 1 file changed, 296 insertions(+), 18 deletions(-)

diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index d0081bd..cc55f74 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -70,6 +70,19 @@
                                 {{ $t("menu.flow_board") }}
                             </inertia-link>
    </div>
+</li>
+<li>
+   <div class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">
+      <span class="inline-block align-middle mr-3">
+         <icon name="procedures" class="w-6 h-6" />
+      </span>
+      <inertia-link
+                                :href="'#'"
+                                :class="isActiveClass('dashboard.flow_board')? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+                            >
+                              Messages  <!-- {{ $t("menu.messages") }} -->
+                            </inertia-link>
+   </div>
 </li>
          <li>
             <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-patient" data-collapse-toggle="dropdown-patient">
@@ -360,7 +373,7 @@
       :href="route('dashboard.settings')"
       :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
     >
-      Lab Results
+      Lab Overview
     </inertia-link>
   </li>
   <li>
@@ -400,7 +413,7 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Providers
+    Globals
     </inertia-link>
   </li>
   <li>
@@ -412,7 +425,7 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Configuration
+    Edit Menu
     </inertia-link>
   </li>
   <li>
@@ -424,7 +437,7 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Load Compendium
+    Facilities
     </inertia-link>
   </li>
   <li>
@@ -436,7 +449,7 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Pending Review
+    Users
     </inertia-link>
   </li>
   <li>
@@ -448,7 +461,7 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Patient Results
+    Addr Book
     </inertia-link>
   </li>
   <li>
@@ -460,7 +473,7 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Lab Results
+    Practice
     </inertia-link>
   </li>
   <li>
@@ -472,7 +485,7 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Electronic Reports
+    Codes
     </inertia-link>
   </li>
   <li>
@@ -484,7 +497,103 @@
         : 'text-gray-400 dark:text-gray-400'
       "
     >
-      Lab Documents
+    Layouts
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    Lists
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    ACL
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    Files
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    Backup
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    Rules
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    Alerts
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    Patient Reminder
+    </inertia-link>
+  </li>
+  <li>
+    <inertia-link
+      :href="route('dashboard.settings')"
+      :class="
+        isSubMenuActive('dashboard.settings')
+        ? 'text-gray-900 dark:text-white'
+        : 'text-gray-400 dark:text-gray-400'
+      "
+    >
+    Other
     </inertia-link>
   </li>
 </ul>
@@ -656,6 +765,18 @@
             BatchCom
         </inertia-link>
     </li>
+    <li>
+        <inertia-link
+            :href="route('dashboard.settings')"
+            :class="
+                isSubMenuActive('dashboard.settings')
+                    ? 'text-gray-900 dark:text-white'
+                    : 'text-gray-400 dark:text-gray-400'
+            "
+        >
+            Pass Phrase
+        </inertia-link>
+    </li>
     <li>
         <inertia-link
             :href="route('dashboard.settings')"
@@ -729,6 +850,32 @@
         Issues
     </inertia-link>
 </li>
+
+<li>
+    <inertia-link
+        :href="'#'"
+        :class="
+            isSubMenuActive('patients.index')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Export
+    </inertia-link>
+</li>
+
+<li>
+    <inertia-link
+        :href="'#'"
+        :class="
+            isSubMenuActive('patients.index')
+                ? 'text-gray-900 dark:text-white'
+                : 'text-gray-400 dark:text-gray-400'
+        "
+    >
+        Import
+    </inertia-link>
+</li>
 <li>
     <inertia-link
         :href="'#'"
@@ -935,6 +1082,18 @@
         >MIPS Module Installer
         </inertia-link>
     </li>
+    <li>
+        <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )? 'text-gray-900 dark:text-white'
+                                            : 'text-gray-400 dark:text-gray-400'
+                                        "
+                                        >XML Editor
+                                    </inertia-link>
+    </li>
     <li>
         <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1019,6 +1178,12 @@
                             >
                                 {{ $t("menu.flow_board") }}
                             </inertia-link>
+                            <inertia-link
+                                :href="'#'"
+                                :class="isActiveClass('dashboard.flow_board')"
+                            >
+                              Messages  <!-- {{ $t("menu.flow_board") }} -->
+                            </inertia-link>
                             <ehr-header-menu :label="$t('menu.patient_client')">
                                 <div class="flex flex-col">
                                     <inertia-link
@@ -1258,7 +1423,16 @@
                                                 'dashboard.settings'
                                             )
                                         "
-                                        >Lab Results
+                                        >Lab Overview
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Batch Results
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1287,14 +1461,14 @@
                                         :class="
                                             isSubMenuActive('patients.index')
                                         "
-                                        >Providers
+                                        >Globals
                                     </inertia-link>
                                     <inertia-link
                                         :href="'#'"
                                         :class="
                                             isSubMenuActive('patients.create')
                                         "
-                                        >Configuration
+                                        >Edit Menu
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1303,7 +1477,7 @@
                                                 'dashboard.settings'
                                             )
                                         "
-                                        >Load Compendium
+                                        >Facilities
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1312,7 +1486,7 @@
                                                 'dashboard.settings'
                                             )
                                         "
-                                        >Pending Review
+                                        >Users
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1321,7 +1495,7 @@
                                                 'dashboard.settings'
                                             )
                                         "
-                                        >Patient Results
+                                        >Addr Book
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1330,7 +1504,7 @@
                                                 'dashboard.settings'
                                             )
                                         "
-                                        >Lab Results
+                                        >Practice
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1339,7 +1513,7 @@
                                                 'dashboard.settings'
                                             )
                                         "
-                                        >Electronic Reports
+                                        >Codes
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -1348,7 +1522,79 @@
                                                 'dashboard.settings'
                                             )
                                         "
-                                        >Lab Documents
+                                        >Layouts
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Lists
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >ACL
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Files
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Backup
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Rules
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Alerts
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Patient Reminders
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Other
                                     </inertia-link>
                                 </div>
                             </ehr-header-menu>
@@ -1476,6 +1722,15 @@
                                         "
                                         >BatchCom
                                     </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Pass Phrase
+                                    </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
                                         :class="
@@ -1523,6 +1778,20 @@
                                         "
                                         >Issues
                                     </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Export
+                                    </inertia-link>
+                                    <inertia-link
+                                        :href="'#'"
+                                        :class="
+                                            isSubMenuActive('patients.index')
+                                        "
+                                        >Import
+                                    </inertia-link>
                                     <inertia-link
                                         :href="'#'"
                                         :class="
@@ -1679,6 +1948,15 @@
                                         "
                                         >MIPS Module Installer
                                     </inertia-link>
+                                    <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >XML Editor
+                                    </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
                                         :class="

From 2a621a640d4cfbb75c14225e053b01f89d0ada96 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 2 Jun 2023 21:39:37 +0530
Subject: [PATCH 37/41] Added L2 submenus

---
 .../app/global-components/EhrHeaderMenu.vue   |   86 +-
 resources/app/shared/includes/Header.vue      | 4251 +++++++++++------
 2 files changed, 2952 insertions(+), 1385 deletions(-)

diff --git a/resources/app/global-components/EhrHeaderMenu.vue b/resources/app/global-components/EhrHeaderMenu.vue
index 0ad9a5f..72951bc 100644
--- a/resources/app/global-components/EhrHeaderMenu.vue
+++ b/resources/app/global-components/EhrHeaderMenu.vue
@@ -1,10 +1,23 @@
 <template>
     <div
         :id="id"
-        class="dropdown inline-block relative" @mouseleave="is_open = false">
-        <div @mouseover="is_open = true" :class="isActiveClass('dashboard.calendar')">
+        class="dropdown inline-block relative"
+        @mouseleave="is_open = false"
+    >
+        <div
+            @mouseover="is_open = true"
+            :class="isActiveClass('dashboard.calendar')"
+        >
             <span class="mr-0.5">{{ label }}</span>
-            <svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"/> </svg>
+            <svg
+                class="fill-current h-4 w-4"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 20 20"
+            >
+                <path
+                    d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"
+                />
+            </svg>
         </div>
         <transition
             enter-active-class="transition ease-out duration-100"
@@ -12,55 +25,76 @@
             enter-to-class="transform opacity-100 scale-100"
             leave-active-class="transition ease-in duration-75"
             leave-class="transform opacity-100 scale-100"
-            leave-to-class="transform opacity-0 scale-95">
+            leave-to-class="transform opacity-0 scale-95"
+        >
             <div
                 v-show="is_open"
-                class="dropdown-menu absolute border-t-2 border-theme-1 py-1 w-48 bg-white shadow-lg z-50">
+                :class="{
+                    'dropdown-menu': true,
+                    absolute: true,
+                    'border-t-2': true,
+                    'border-theme-1': true,
+                    'py-1': true,
+                    'w-48': true,
+                    'bg-white': true,
+                    'shadow-lg': true,
+                    'z-50': true,
+                    'left-full': subMenu,
+                    'top-0': subMenu,
+                    'mt-[-6px]': subMenu,
+                    'ml-[-1px]': subMenu,
+                }"
+            >
                 <div class="relative bg-white">
-                    <slot/>
+                    <slot />
                 </div>
             </div>
         </transition>
     </div>
 </template>
-
+<!-- class="dropdown-menu absolute border-t-2 border-theme-1 py-1 w-48 bg-white
+shadow-lg z-50" -->
 <script>
 export default {
     name: "EhrHeaderMenu",
     props: {
         label: String,
         id: String,
+        subMenu: Boolean,
     },
     data() {
         return {
-            is_open: false
-        }
+            is_open: false,
+        };
     },
     methods: {
         url() {
             return location.pathname.substr(1);
         },
         isUrl(...urls) {
-            if (urls[0] === '') {
-                return this.url() === ''
+            if (urls[0] === "") {
+                return this.url() === "";
             }
-            return urls.filter(url => this.url().startsWith(url)).length
+            return urls.filter((url) => this.url().startsWith(url)).length;
         },
-        isActiveClass: function(url) {
-            return this.isUrl(url) ?
-                'mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white ' +
-                'inline-flex items-center bg-theme-1 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-theme-1' +
-                'transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer':
-
-                'mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white ' +
-                'inline-flex items-center bg-gray-800 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700 ' +
-                'transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer'
+        isActiveClass: function (url) {
+            return this.isUrl(url)
+                ? "mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white " +
+                      "inline-flex items-center bg-theme-1 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-theme-1" +
+                      "transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer"
+                : this.subMenu
+                ? "mr-1 ml-1 px-3 py-2 rounded-md text-sm font-small text-black hover:text-black-800 " +
+                  "inline-flex items-center bg-white-800 hover:bg-white-700 focus:outline-none focus:text-black focus:bg-white-700 " +
+                  "transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer inset-x-full"
+                : "mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white " +
+                  "inline-flex items-center bg-gray-800 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700 " +
+                  "transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer";
         },
         isSubMenuActive: function (url) {
-            return this.isUrl(url) ?
-                'block px-4 py-2 text-sm text-gray-700 bg-gray-100 hover:bg-gray-100' :
-                'block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100'
-        }
+            return this.isUrl(url) && this.subMenu
+                ? "block px-4 py-2 text-sm text-gray-700 bg-white hover:bg-white"
+                : "block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100";
+        },
     },
-}
+};
 </script>
diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index cc55f74..3b7cb70 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -11,1160 +11,1905 @@
                         :href="route('dashboard.index')"
                         class="p-1 mx-2 border-transparent text-gray-400 rounded-full hover:text-white bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700"
                     >
-                     <icon name="home-icon" class="w-6 h-6" />
+                        <icon name="home-icon" class="w-6 h-6" />
                     </inertia-link>
 
                     <nav
-                        class=" dark flex flex-wrap items-center text-base md:ml-0 space-x-1"
+                        class="dark flex flex-wrap items-center text-base md:ml-0 space-x-1"
                     >
-                    <button
-
+                        <button
                             class="block lg:hidden text-white hover:text-gray-200 focus:text-gray-200 focus:outline-none"
-                            type="button" data-drawer-target="drawer-navigation" data-drawer-show="drawer-navigation" aria-controls="drawer-navigation"
+                            type="button"
+                            data-drawer-target="drawer-navigation"
+                            data-drawer-show="drawer-navigation"
+                            aria-controls="drawer-navigation"
                         >
                             <span class="inline-block align-middle">
-                                <icon name="hamburger" class="w-6 h-6"/>
+                                <icon name="hamburger" class="w-6 h-6" />
                             </span>
                         </button>
 
-
-
-<!-- drawer init and show -->
-<!-- <div class="text-center">
+                        <!-- drawer init and show -->
+                        <!-- <div class="text-center">
    <button class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800" type="button" data-drawer-target="drawer-navigation" data-drawer-show="drawer-navigation" aria-controls="drawer-navigation">
    Show navigation
    </button>
 </div> -->
 
-<!-- drawer component -->
-<div id="drawer-navigation" class="dark fixed top-0 left-0 z-40 h-screen p-4 overflow-y-auto transition-transform -translate-x-full bg-white w-80 dark:bg-gray-800" tabindex="-1" aria-labelledby="drawer-navigation-label">
-    <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400">Menu</h5>
-    <button type="button" data-drawer-hide="drawer-navigation" aria-controls="drawer-navigation" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute top-2.5 right-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" >
-        <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
-        <span class="sr-only">Close menu</span>
-    </button>
-  <div class="py-4 overflow-y-auto">
-      <ul class="space-y-2 font-medium ">
-<li>
-   <div class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">
-      <span class="inline-block align-middle mr-3">
-         <icon name="calendar" class="w-6 h-6" />
-      </span>
-      <inertia-link
-         :href="route('dashboard.calendar')"
-         :class="isActiveClass('dashboard.calendar') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-         >
-         {{ $t("menu.calendar") }}
-      </inertia-link>
-   </div>
-</li>
-<li>
-   <div class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">
-      <span class="inline-block align-middle mr-3">
-         <icon name="dashboard" class="w-6 h-6" />
-      </span>
-      <inertia-link
-                                :href="route('dashboard.flow_board')"
-                                :class="isActiveClass('dashboard.flow_board')? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+                        <!-- drawer component -->
+                        <div
+                            id="drawer-navigation"
+                            class="dark fixed top-0 left-0 z-40 h-screen p-4 overflow-y-auto transition-transform -translate-x-full bg-white w-80 dark:bg-gray-800"
+                            tabindex="-1"
+                            aria-labelledby="drawer-navigation-label"
+                        >
+                            <h5
+                                id="drawer-navigation-label"
+                                class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400"
                             >
-                                {{ $t("menu.flow_board") }}
-                            </inertia-link>
-   </div>
-</li>
-<li>
-   <div class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">
-      <span class="inline-block align-middle mr-3">
-         <icon name="procedures" class="w-6 h-6" />
-      </span>
-      <inertia-link
-                                :href="'#'"
-                                :class="isActiveClass('dashboard.flow_board')? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
+                                Menu
+                            </h5>
+                            <button
+                                type="button"
+                                data-drawer-hide="drawer-navigation"
+                                aria-controls="drawer-navigation"
+                                class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute top-2.5 right-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
                             >
-                              Messages  <!-- {{ $t("menu.messages") }} -->
-                            </inertia-link>
-   </div>
-</li>
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-patient" data-collapse-toggle="dropdown-patient">
-                 <icon name="users" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.patient_client") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-patient" class="hidden py-2 space-y-2 ml-2">
-                  <li>
-                    <inertia-link
-                                        :href="
-                                            route('dashboard.patients.index')
-                                        "
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.patients.index'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Finder
-                                    </inertia-link>
-                  </li>
-                  <li>
-                    <inertia-link
-                                        :href="
-                                            route('dashboard.patients.create')
-                                        "
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.patients.create'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Add New/Search
-                                    </inertia-link>
-                  </li>
-                  <li>
-                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Recycle Bin
-                                    </inertia-link>
-                  </li>
-                  <li>
-                    <inertia-link
-                                        v-if="
-                                            $page.props.ehr_patient.patient !=
-                                            null
-                                        "
-                                        :href="
-                                            route(
-                                                'dashboard.patients.select',
-                                                $page.props.ehr_patient.patient
-                                                    .id
-                                            )
-                                        "
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Summary
-                                    </inertia-link>
-
-                  </li>
-                  <li>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Track Appointments
-                                    </inertia-link>
-                                </li>
-                            <li>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Visits
-                                    </inertia-link>
-                                </li>
-                            <li>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Records
-                                    </inertia-link>
-                                </li>
-                            <li>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Visit Forms
-                                    </inertia-link>
-                                </li>
-                                <li>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Imports
-                                    </inertia-link>
-                                </li>
-            </ul>
-         </li>
-
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-fees" data-collapse-toggle="dropdown-fees">
-                 <icon name="money" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.fees") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-fees" class="hidden py-2 space-y-2 ml-2">
-
-  <li>
-    <inertia-link
-      :href="'#'"
-      :class="isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Fee Sheet
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="'#'"
-      :class="isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Payment
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Checkout
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Billing
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Posting
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Batch Payments
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Verify Patient Data
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      EDI History
-    </inertia-link>
-  </li>
-</ul>
-
-
-         </li>
-
-
-
-
-
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-inventory" data-collapse-toggle="dropdown-inventory">
-                 <icon name="inventory" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.inventory") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-inventory" class="hidden py-2 space-y-2 ml-2">
-
+                                <svg
+                                    aria-hidden="true"
+                                    class="w-5 h-5"
+                                    fill="currentColor"
+                                    viewBox="0 0 20 20"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                >
+                                    <path
+                                        fill-rule="evenodd"
+                                        d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+                                        clip-rule="evenodd"
+                                    ></path>
+                                </svg>
+                                <span class="sr-only">Close menu</span>
+                            </button>
+                            <div class="py-4 overflow-y-auto">
+                                <ul class="space-y-2 font-medium">
+                                    <li>
+                                        <div
+                                            class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                        >
+                                            <span
+                                                class="inline-block align-middle mr-3"
+                                            >
+                                                <icon
+                                                    name="calendar"
+                                                    class="w-6 h-6"
+                                                />
+                                            </span>
+                                            <inertia-link
+                                                :href="
+                                                    route('dashboard.calendar')
+                                                "
+                                                :class="
+                                                    isActiveClass(
+                                                        'dashboard.calendar'
+                                                    )
+                                                        ? 'text-gray-900 dark:text-white'
+                                                        : 'text-gray-400 dark:text-gray-400'
+                                                "
+                                            >
+                                                {{ $t("menu.calendar") }}
+                                            </inertia-link>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div
+                                            class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                        >
+                                            <span
+                                                class="inline-block align-middle mr-3"
+                                            >
+                                                <icon
+                                                    name="dashboard"
+                                                    class="w-6 h-6"
+                                                />
+                                            </span>
+                                            <inertia-link
+                                                :href="
+                                                    route(
+                                                        'dashboard.flow_board'
+                                                    )
+                                                "
+                                                :class="
+                                                    isActiveClass(
+                                                        'dashboard.flow_board'
+                                                    )
+                                                        ? 'text-gray-900 dark:text-white'
+                                                        : 'text-gray-400 dark:text-gray-400'
+                                                "
+                                            >
+                                                {{ $t("menu.flow_board") }}
+                                            </inertia-link>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div
+                                            class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                        >
+                                            <span
+                                                class="inline-block align-middle mr-3"
+                                            >
+                                                <icon
+                                                    name="procedures"
+                                                    class="w-6 h-6"
+                                                />
+                                            </span>
+                                            <inertia-link
+                                                :href="'#'"
+                                                :class="
+                                                    isActiveClass(
+                                                        'dashboard.flow_board'
+                                                    )
+                                                        ? 'text-gray-900 dark:text-white'
+                                                        : 'text-gray-400 dark:text-gray-400'
+                                                "
+                                            >
+                                                Messages
+                                                <!-- {{ $t("menu.messages") }} -->
+                                            </inertia-link>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-patient"
+                                            data-collapse-toggle="dropdown-patient"
+                                        >
+                                            <icon
+                                                name="users"
+                                                class="w-6 h-6"
+                                            />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{
+                                                    $t("menu.patient_client")
+                                                }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-patient"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.patients.index'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Finder
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.patients.create'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Add New/Search
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Recycle Bin
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    v-if="
+                                                        $page.props.ehr_patient
+                                                            .patient != null
+                                                    "
+                                                    :href="
+                                                        route(
+                                                            'dashboard.patients.select',
+                                                            $page.props
+                                                                .ehr_patient
+                                                                .patient.id
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Summary
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Track Appointments
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Visits
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Records
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Visit Forms
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Imports
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
-  <li>
-    <inertia-link
-      :href="'#'"
-      :class="isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Management
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="'#'"
-      :class="isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Destroyed
-    </inertia-link>
-  </li>
-</ul>
-         </li>
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-procedures" data-collapse-toggle="dropdown-procedures">
-                 <icon name="procedures" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.procedures") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-procedures" class="hidden py-2 space-y-2 ml-2">
-
-
-                <li>
-    <inertia-link
-      :href="'#'"
-      :class="isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Providers
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="'#'"
-      :class="isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Configuration
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Load Compendium
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Pending Review
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Patient Results
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Lab Overview
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Electronic Reports
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'"
-    >
-      Lab Documents
-    </inertia-link>
-  </li>
-</ul>
-         </li>
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-admin" data-collapse-toggle="dropdown-admin">
-                 <icon name="admin" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.administration") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-admin" class="hidden py-2 space-y-2 ml-2">
-
-
-                <li>
-    <inertia-link
-      :href="'#'"
-      :class="
-        isSubMenuActive('patients.index')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Globals
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="'#'"
-      :class="
-        isSubMenuActive('patients.create')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Edit Menu
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Facilities
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Users
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Addr Book
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Practice
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Codes
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Layouts
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Lists
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    ACL
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Files
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Backup
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Rules
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Alerts
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Patient Reminder
-    </inertia-link>
-  </li>
-  <li>
-    <inertia-link
-      :href="route('dashboard.settings')"
-      :class="
-        isSubMenuActive('dashboard.settings')
-        ? 'text-gray-900 dark:text-white'
-        : 'text-gray-400 dark:text-gray-400'
-      "
-    >
-    Other
-    </inertia-link>
-  </li>
-</ul>
-         </li>
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-reports" data-collapse-toggle="dropdown-reports">
-                 <icon name="procedures" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.reports") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-reports" class="hidden py-2 space-y-2 ml-2">
-
-
-                <li>
-        <inertia-link
-            :href="'#'"
-            :class="
-                isSubMenuActive('patients.index') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Clients
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="'#'"
-            :class="
-                isSubMenuActive('patients.create') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Visits
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Financial
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Inventory
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Procedures
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Insurance
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Blank Forms
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings') ? 'text-gray-900 dark:text-white' : 'text-gray-400 dark:text-gray-400'
-            "
-        >Services
-        </inertia-link>
-    </li>
-</ul>
-         </li>
-
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-misc" data-collapse-toggle="dropdown-misc">
-                 <icon name="misc" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.miscellaneous") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-misc" class="hidden py-2 space-y-2 ml-2">
-
-
-                <li>
-        <inertia-link
-            :href="'#'"
-            :class="
-                isSubMenuActive('patients.index')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Patient Education
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="'#'"
-            :class="
-                isSubMenuActive('patients.create')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Patient Portal
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Authorizations
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Address Book
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Order Catalog
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            BatchCom
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Pass Phrase
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Preferences
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            New Documents
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Utilities
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >
-            Document Templates
-        </inertia-link>
-    </li>
-</ul>
-         </li>
-
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-popups" data-collapse-toggle="dropdown-popups">
-                 <icon name="pop-ups" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.popups") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-popups" class="hidden py-2 space-y-2 ml-2">
-
-
-                <li>
-    <inertia-link
-        :href="'#'"
-        :class="
-            isSubMenuActive('patients.index')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Issues
-    </inertia-link>
-</li>
-
-<li>
-    <inertia-link
-        :href="'#'"
-        :class="
-            isSubMenuActive('patients.index')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Export
-    </inertia-link>
-</li>
-
-<li>
-    <inertia-link
-        :href="'#'"
-        :class="
-            isSubMenuActive('patients.index')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Import
-    </inertia-link>
-</li>
-<li>
-    <inertia-link
-        :href="'#'"
-        :class="
-            isSubMenuActive('patients.create')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Appts
-    </inertia-link>
-</li>
-<li>
-    <inertia-link
-        :href="route('dashboard.settings')"
-        :class="
-            isSubMenuActive('dashboard.settings')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Superbill
-    </inertia-link>
-</li>
-<li>
-    <inertia-link
-        :href="route('dashboard.settings')"
-        :class="
-            isSubMenuActive('dashboard.settings')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Payment
-    </inertia-link>
-</li>
-<li>
-    <inertia-link
-        :href="route('dashboard.settings')"
-        :class="
-            isSubMenuActive('dashboard.settings')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Letter
-    </inertia-link>
-</li>
-<li>
-    <inertia-link
-        :href="route('dashboard.patients.chart_label', patient_id)"
-        :class="
-            isSubMenuActive('dashboard.patients.chart_label')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Chart Label
-    </inertia-link>
-</li>
-<li>
-    <inertia-link
-        :href="route('dashboard.settings')"
-        :class="
-            isSubMenuActive('dashboard.settings')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Barcode Label
-    </inertia-link>
-</li>
-<li>
-    <inertia-link
-        :href="route('dashboard.settings')"
-        :class="
-            isSubMenuActive('dashboard.settings')
-                ? 'text-gray-900 dark:text-white'
-                : 'text-gray-400 dark:text-gray-400'
-        "
-    >
-        Address Label
-    </inertia-link>
-</li>
-</ul>
-         </li>
-
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-qa" data-collapse-toggle="dropdown-qa">
-                 <icon name="QnA" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.qa_measures") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-qa" class="hidden py-2 space-y-2 ml-2">
-
-
-                <li>
-        <inertia-link
-            :href="'#'"
-            :class="
-                isSubMenuActive('patients.index')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >View Reports
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="'#'"
-            :class="
-                isSubMenuActive('patients.create')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Create MIPS Report
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Select Measures
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Upload Claim Files
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Instance Counts
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Remove Provider Assignments
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Provider Encounter Counts
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Database Imports
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >Database Inserts
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-            :href="route('dashboard.settings')"
-            :class="
-                isSubMenuActive('dashboard.settings')
-                    ? 'text-gray-900 dark:text-white'
-                    : 'text-gray-400 dark:text-gray-400'
-            "
-        >MIPS Module Installer
-        </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white'
-                                            : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >XML Editor
-                                    </inertia-link>
-    </li>
-    <li>
-        <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white'
-                                            : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Alert Logs
-                                    </inertia-link>
-    </li>
-</ul>
-         </li>
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-fees"
+                                            data-collapse-toggle="dropdown-fees"
+                                        >
+                                            <icon
+                                                name="money"
+                                                class="w-6 h-6"
+                                            />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{ $t("menu.fees") }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-fees"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Fee Sheet
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Payment
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Checkout
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Billing
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Posting
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Batch Payments
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Verify Patient Data
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    EDI History
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
-         <li>
-            <button type="button" class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-help" data-collapse-toggle="dropdown-help">
-                 <icon name="help" class="w-6 h-6" />
-                  <span class="flex-1 ml-3 text-left whitespace-nowrap">{{ $t("menu.help") }}</span>
-                  <icon name="chevron-down" class="w-6 h-6 fill-current" />
-            </button>
-            <ul id="dropdown-help" class="hidden py-2 space-y-2 ml-2">
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-inventory"
+                                            data-collapse-toggle="dropdown-inventory"
+                                        >
+                                            <icon
+                                                name="inventory"
+                                                class="w-6 h-6"
+                                            />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{
+                                                    $t("menu.inventory")
+                                                }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-inventory"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Management
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Destroyed
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
-<li>
-                <inertia-link
-                                        :href="route('about')"
-                                        :class="isSubMenuActive('about')? 'text-gray-900 dark:text-white'
-                                            : 'text-gray-400 dark:text-gray-400'"
-                                        >About
-                                    </inertia-link></li><li>
-                                    <inertia-link
-                                        :href="'#'"
-                                        :class="
-                                            isSubMenuActive('patients.create')? 'text-gray-900 dark:text-white'
-                                            : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Forums
-                                    </inertia-link></li><li>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )? 'text-gray-900 dark:text-white'
-                                            : 'text-gray-400 dark:text-gray-400'
-                                        "
-                                        >Chat
-                                    </inertia-link></li><li>
-                                    <inertia-link
-                                        :href="route('contact')"
-                                        :class="isSubMenuActive('contact')? 'text-gray-900 dark:text-white'
-                                            : 'text-gray-400 dark:text-gray-400'"
-                                        >Contact
-                                    </inertia-link></li>
-</ul>
-         </li>
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-procedures"
+                                            data-collapse-toggle="dropdown-procedures"
+                                        >
+                                            <icon
+                                                name="procedures"
+                                                class="w-6 h-6"
+                                            />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{
+                                                    $t("menu.procedures")
+                                                }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-procedures"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Providers
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Configuration
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Load Compendium
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Pending Review
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Patient Results
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Lab Overview
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Electronic Reports
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Lab Documents
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-admin"
+                                            data-collapse-toggle="dropdown-admin"
+                                        >
+                                            <icon
+                                                name="admin"
+                                                class="w-6 h-6"
+                                            />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{
+                                                    $t("menu.administration")
+                                                }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-admin"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Globals
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Edit Menu
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Facilities
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Users
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Addr Book
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Practice
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Codes
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Layouts
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Lists
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    ACL
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Files
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Backup
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Rules
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Alerts
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Patient Reminder
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Other
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-reports"
+                                            data-collapse-toggle="dropdown-reports"
+                                        >
+                                            <icon
+                                                name="procedures"
+                                                class="w-6 h-6"
+                                            />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{ $t("menu.reports") }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-reports"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Clients
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Visits
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Financial
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Inventory
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Procedures
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Insurance
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Blank Forms
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Services
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
-      </ul>
-   </div>
-</div>
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-misc"
+                                            data-collapse-toggle="dropdown-misc"
+                                        >
+                                            <icon name="misc" class="w-6 h-6" />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{
+                                                    $t("menu.miscellaneous")
+                                                }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-misc"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Patient Education
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Patient Portal
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Authorizations
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Address Book
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Order Catalog
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    BatchCom
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Pass Phrase
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Preferences
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    New Documents
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Utilities
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Document Templates
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-popups"
+                                            data-collapse-toggle="dropdown-popups"
+                                        >
+                                            <icon
+                                                name="pop-ups"
+                                                class="w-6 h-6"
+                                            />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{ $t("menu.popups") }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-popups"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Issues
+                                                </inertia-link>
+                                            </li>
 
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Export
+                                                </inertia-link>
+                                            </li>
 
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Import
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Appts
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Superbill
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Payment
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Letter
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.patients.chart_label',
+                                                            patient_id
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.patients.chart_label'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Chart Label
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Barcode Label
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Address Label
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-qa"
+                                            data-collapse-toggle="dropdown-qa"
+                                        >
+                                            <icon name="QnA" class="w-6 h-6" />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{
+                                                    $t("menu.qa_measures")
+                                                }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-qa"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.index'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >View Reports
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Create MIPS Report
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Select Measures
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Upload Claim Files
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Instance Counts
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Remove Provider Assignments
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Provider Encounter Counts
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Database Imports
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Database Inserts
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >MIPS Module Installer
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >XML Editor
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Alert Logs
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
 
+                                    <li>
+                                        <button
+                                            type="button"
+                                            class="flex p-2 items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                            aria-controls="dropdown-help"
+                                            data-collapse-toggle="dropdown-help"
+                                        >
+                                            <icon name="help" class="w-6 h-6" />
+                                            <span
+                                                class="flex-1 ml-3 text-left whitespace-nowrap"
+                                                >{{ $t("menu.help") }}</span
+                                            >
+                                            <icon
+                                                name="chevron-down"
+                                                class="w-6 h-6 fill-current"
+                                            />
+                                        </button>
+                                        <ul
+                                            id="dropdown-help"
+                                            class="hidden py-2 space-y-2 ml-2"
+                                        >
+                                            <li>
+                                                <inertia-link
+                                                    :href="route('about')"
+                                                    :class="
+                                                        isSubMenuActive('about')
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >About
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="'#'"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'patients.create'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Forums
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Chat
+                                                </inertia-link>
+                                            </li>
+                                            <li>
+                                                <inertia-link
+                                                    :href="route('contact')"
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'contact'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                    >Contact
+                                                </inertia-link>
+                                            </li>
+                                        </ul>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
 
                         <div
                             class="hidden md:block sm:block w-full bg-gray-700 flex flex-wrap p-2 m-2 gap-1"
-
                         >
                             <inertia-link
                                 :href="route('dashboard.calendar')"
@@ -1182,10 +1927,214 @@
                                 :href="'#'"
                                 :class="isActiveClass('dashboard.flow_board')"
                             >
-                              Messages  <!-- {{ $t("menu.flow_board") }} -->
+                                Messages
+                                <!-- {{ $t("menu.flow_board") }} -->
                             </inertia-link>
                             <ehr-header-menu :label="$t('menu.patient_client')">
-                                <div class="flex flex-col">
+                                <div class="flex flex-col" style="left: 100%">
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Visit Forms')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Aftercare Plan
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Ankle Evaluation Form
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Annotatable Diagrams
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Bronchitis Form
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Care Plan
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Clinical Instructions
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Functional and Cognitive Status
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Misc Billing Options HCFA
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Observation
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Physical Exam
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Procedure Order
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Review Of Systems
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Review of Systems Checks
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            SOAP
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Speech Dictation
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Transfer Summary
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Treatment Plan
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Vitals
+                                        </inertia-link>
+                                    </ehr-header-menu>
                                     <inertia-link
                                         :href="
                                             route('dashboard.patients.index')
@@ -1245,42 +2194,78 @@
                                         "
                                         >Track Appointments
                                     </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Visits
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Records
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Visit Forms
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Imports
-                                    </inertia-link>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Visits')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="'#'"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'patients.create'
+                                                )
+                                            "
+                                            >Create Visit
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="'#'"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'patients.create'
+                                                )
+                                            "
+                                            >Current
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="'#'"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'patients.create'
+                                                )
+                                            "
+                                            >Visit History
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Records')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Patient Record Request
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Import')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Upload
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Pending Approval
+                                        </inertia-link>
+                                    </ehr-header-menu>
                                 </div>
                             </ehr-header-menu>
                             <ehr-header-menu :label="$t('menu.fees')">
@@ -1542,6 +2527,122 @@
                                         "
                                         >ACL
                                     </inertia-link>
+
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Other')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Language
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Forms
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Calendar Administration
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Logs
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Users Activity Report
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Certificates
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Native Data Loads
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            External Data Loads
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Merge Encounters
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Merge Patients
+                                        </inertia-link>
+                                    </ehr-header-menu>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
                                         :class="
@@ -1587,87 +2688,504 @@
                                         "
                                         >Patient Reminders
                                     </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Other
-                                    </inertia-link>
                                 </div>
                             </ehr-header-menu>
                             <ehr-header-menu :label="$t('menu.reports')">
                                 <div class="flex flex-col">
-                                    <inertia-link
-                                        :href="'#'"
-                                        :class="
-                                            isSubMenuActive('patients.index')
-                                        "
-                                        >Clients
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="'#'"
-                                        :class="
-                                            isSubMenuActive('patients.create')
-                                        "
-                                        >Visits
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Financial
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Inventory
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Procedures
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Insurance
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Blank Forms
-                                    </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Services
-                                    </inertia-link>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Clients')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Patient List
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Clinical Statistics: Demographics
+                                            vs. Diagnosis
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Clinical Statistics: Demographics
+                                            vs. Lab Results
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Patient List By Referrer
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Prescriptions and Dispensations
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Patient List Creation
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Clinical
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Immunization Registry
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Visits')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Appointments
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Patient Flow Board
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Encounters
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Patient Billing Encounter by Carrier
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Appointments and Encounters
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Superbill
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Eligibility
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Eligibility Response
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Claim Status Request
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Chart Location Activity
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Charts Checked Out
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Chart Tracker
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Services by Category
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Syndromic Surveillance
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Financial')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Sales by Item
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Cash Receipts by Provider
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Front Office Receipts
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Receipts Summary
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Collections
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Patient Ledger by Date
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Adjustments
+                                        </inertia-link>
+
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                        >
+                                            Financial Summary by Service Code
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Inventory')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >List
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Activity
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Transaction
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Procedures')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Pending Order
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Procedure Statistics
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Insurance')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Patient Insurance Distribution
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Indigent Patients
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Unique Seen Patients
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Blank Forms')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Demographics
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Superbill/Fee Sheet
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Referral
+                                        </inertia-link>
+                                    </ehr-header-menu>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Services')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Background Services
+                                        </inertia-link>
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Direct Message Log
+                                        </inertia-link>
+                                    </ehr-header-menu>
                                 </div>
                             </ehr-header-menu>
                             <ehr-header-menu :label="$t('menu.miscellaneous')">
@@ -1749,15 +3267,21 @@
                                         "
                                         >New Documents
                                     </inertia-link>
-                                    <inertia-link
-                                        :href="route('dashboard.settings')"
-                                        :class="
-                                            isSubMenuActive(
-                                                'dashboard.settings'
-                                            )
-                                        "
-                                        >Utilities
-                                    </inertia-link>
+                                    <ehr-header-menu
+                                        style="background-color: white"
+                                        :label="$t('Utilities')"
+                                        subMenu="true"
+                                    >
+                                        <inertia-link
+                                            :href="route('dashboard.settings')"
+                                            :class="
+                                                isSubMenuActive(
+                                                    'dashboard.settings'
+                                                )
+                                            "
+                                            >Validate Attached Documents
+                                        </inertia-link>
+                                    </ehr-header-menu>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
                                         :class="
@@ -2011,7 +3535,7 @@
                                 <button
                                     class="p-2 border-transparent text-gray-400 rounded-full hover:text-white focus:outline-none focus:text-white focus:bg-gray-700"
                                 >
-                                   <icon name="chat-bubble" />
+                                    <icon name="chat-bubble" />
                                 </button>
                                 <div class="ml-1 relative">
                                     <div>
@@ -2115,132 +3639,143 @@
                             </div>
                         </div>
                     </div>
-
-
                 </div>
                 <div
-                class="flex flex-wrap sm:flex-row justify-between text-base py-2 px-4 mb-2 sm:mb-0"
-            >
-                <div class="flex flex-row mb-2 sm:mb-0">
-                    <div
-                        v-if="$page.props.ehr_patient.patient === null"
-                        class="relative text-sm uppercase w-full sm:w-50"
-                    >
-                        <span>{{ $t("menu.patient_client") }}:</span>
-                        <span class="font-bold">None</span>
-                    </div>
-                    <div v-else class="flex flex-row items-center space-x-2">
-                        <div class="flex-shrink-0">
-                            <img
-                                class="w-10 h-10 rounded-full border border-gray-100"
-                                src="/images/logo.png"
-                                alt="Logo"
-                            />
+                    class="flex flex-wrap sm:flex-row justify-between text-base py-2 px-4 mb-2 sm:mb-0"
+                >
+                    <div class="flex flex-row mb-2 sm:mb-0">
+                        <div
+                            v-if="$page.props.ehr_patient.patient === null"
+                            class="relative text-sm uppercase w-full sm:w-50"
+                        >
+                            <span>{{ $t("menu.patient_client") }}:</span>
+                            <span class="font-bold">None</span>
                         </div>
-                        <div class="flex flex-col">
-                            <div class="flex flex-row">
-                                <span>{{ $t("menu.patient_client") }}:</span>
-                                <inertia-link
-                                    :href="
-                                        route(
-                                            'dashboard.patients.select',
-                                            $page.props.ehr_patient.patient.pid
-                                        )
-                                    "
-                                    class="hover:text-teal-500 hover:underline"
-                                >
-                                    <span class="font-bold">
-                                        {{
-                                            $page.props.ehr_patient.patient
-                                                .first_name
-                                        }}
-                                        {{
-                                            $page.props.ehr_patient.patient
-                                                .last_name
-                                        }}
-                                        ({{
-                                            $page.props.ehr_patient.patient.pid
-                                        }})
-                                    </span>
-                                </inertia-link>
+                        <div
+                            v-else
+                            class="flex flex-row items-center space-x-2"
+                        >
+                            <div class="flex-shrink-0">
+                                <img
+                                    class="w-10 h-10 rounded-full border border-gray-100"
+                                    src="/images/logo.png"
+                                    alt="Logo"
+                                />
                             </div>
-                            <div class="flex flex-row">
-                                <span
-                                    >{{
-                                        $t("forms.date_of_birth")
-                                    }}:&nbsp;</span
-                                >
-                                <span class="font-bold">{{
-                                    $page.props.ehr_patient.patient
-                                        .date_of_birth
-                                }}</span>
-                                &nbsp;&nbsp;
-                                <span>{{ $t("forms.age") }}:&nbsp;</span>
-                                <span class="font-bold">{{
-                                    $page.props.ehr_patient.patient.age
-                                }}</span>
+                            <div class="flex flex-col">
+                                <div class="flex flex-row">
+                                    <span
+                                        >{{ $t("menu.patient_client") }}:</span
+                                    >
+                                    <inertia-link
+                                        :href="
+                                            route(
+                                                'dashboard.patients.select',
+                                                $page.props.ehr_patient.patient
+                                                    .pid
+                                            )
+                                        "
+                                        class="hover:text-teal-500 hover:underline"
+                                    >
+                                        <span class="font-bold">
+                                            {{
+                                                $page.props.ehr_patient.patient
+                                                    .first_name
+                                            }}
+                                            {{
+                                                $page.props.ehr_patient.patient
+                                                    .last_name
+                                            }}
+                                            ({{
+                                                $page.props.ehr_patient.patient
+                                                    .pid
+                                            }})
+                                        </span>
+                                    </inertia-link>
+                                </div>
+                                <div class="flex flex-row">
+                                    <span
+                                        >{{
+                                            $t("forms.date_of_birth")
+                                        }}:&nbsp;</span
+                                    >
+                                    <span class="font-bold">{{
+                                        $page.props.ehr_patient.patient
+                                            .date_of_birth
+                                    }}</span>
+                                    &nbsp;&nbsp;
+                                    <span>{{ $t("forms.age") }}:&nbsp;</span>
+                                    <span class="font-bold">{{
+                                        $page.props.ehr_patient.patient.age
+                                    }}</span>
+                                </div>
                             </div>
+                            <inertia-link
+                                :href="
+                                    route(
+                                        'dashboard.patients.clear',
+                                        $page.props.ehr_patient.patient.pid
+                                    )
+                                "
+                                class="mr-1.5 mb-1 ml-1.5 px-2 py-1 rounded-md text-xs font-small text-gray-300 hover:text-white inline-flex items-center bg-gray-700 font-bold hover:bg-gray-800 focus:outline-none focus:text-white focus:bg-gray-700 uppercase pointer"
+                            >
+                                Clear
+                            </inertia-link>
                         </div>
-                        <inertia-link
-                            :href="
-                                route(
-                                    'dashboard.patients.clear',
-                                    $page.props.ehr_patient.patient.pid
-                                )
-                            "
-                            class="mr-1.5 mb-1 ml-1.5 px-2 py-1 rounded-md text-xs font-small text-gray-300 hover:text-white inline-flex items-center bg-gray-700 font-bold hover:bg-gray-800 focus:outline-none focus:text-white focus:bg-gray-700 uppercase pointer"
-                        >
-                            Clear
-                        </inertia-link>
                     </div>
-                </div>
-                <div class="flex flex-row justify-end">
-                    <div
-                        class="relative text-sm uppercase w-full sm:w-64"
-                        style="font-size: 12px"
-                    >
+                    <div class="flex flex-row justify-end">
                         <div
-                            v-if="$page.props.ehr_patient.patient === null"
-                            class="mb-1"
+                            class="relative text-sm uppercase w-full sm:w-64"
+                            style="font-size: 12px"
                         >
-                            <span>{{ $t("general.selected_encounter") }}:</span>
-                            <span class="font-bold">None</span>
-                        </div>
-                        <div v-else class="mb-1">
-                            <span>{{ $t("general.selected_encounter") }}:</span>
-                            <span class="font-bold text-teal-300"
-                                >2020-11-18</span
-                            >
-                            <select
-                                class="appearance-none block w-full bg-transparent text-gray-400 border border-gray-500 rounded mt-1.5 py-1 px-4 mb-3 leading-tight text-xs focus:outline-none focus:bg-transparent focus:border-gray-500"
-                            >
-                                <option>Choose Encounter</option>
-                                <option>New Encounter</option>
-                                <option>Past Encounter List (3)</option>
-                                <option>
-                                    2020-11-02 / New Patient ----> Review
-                                </option>
-                                <option>
-                                    2020-11-04 / Preventive Care Services ---->
-                                    Review
-                                </option>
-                            </select>
                             <div
-                                class="pointer-events-none absolute inset-y-0 right-0 flex items-center mt-3 px-2 text-gray-700"
+                                v-if="$page.props.ehr_patient.patient === null"
+                                class="mb-1"
                             >
-                               <icon name="chevron-down" class="w-4 h-4" />
+                                <span
+                                    >{{
+                                        $t("general.selected_encounter")
+                                    }}:</span
+                                >
+                                <span class="font-bold">None</span>
+                            </div>
+                            <div v-else class="mb-1">
+                                <span
+                                    >{{
+                                        $t("general.selected_encounter")
+                                    }}:</span
+                                >
+                                <span class="font-bold text-teal-300"
+                                    >2020-11-18</span
+                                >
+                                <select
+                                    class="appearance-none block w-full bg-transparent text-gray-400 border border-gray-500 rounded mt-1.5 py-1 px-4 mb-3 leading-tight text-xs focus:outline-none focus:bg-transparent focus:border-gray-500"
+                                >
+                                    <option>Choose Encounter</option>
+                                    <option>New Encounter</option>
+                                    <option>Past Encounter List (3)</option>
+                                    <option>
+                                        2020-11-02 / New Patient ----> Review
+                                    </option>
+                                    <option>
+                                        2020-11-04 / Preventive Care Services
+                                        ----> Review
+                                    </option>
+                                </select>
+                                <div
+                                    class="pointer-events-none absolute inset-y-0 right-0 flex items-center mt-3 px-2 text-gray-700"
+                                >
+                                    <icon name="chevron-down" class="w-4 h-4" />
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            </div>
-
         </div>
     </nav>
 </template>
 
-
 <script>
 import LanguageSwitcher from "../../components/LanguageSwitcher";
 
@@ -2298,15 +3833,13 @@ export default {
 };
 </script>
 <script setup>
-
-import { onMounted } from 'vue'
-import { Drawer } from 'flowbite'
+import { onMounted } from "vue";
+import { Drawer } from "flowbite";
 
 onMounted(() => {
-    const $targetEl = document.getElementById('drawer-navigation');
+    const $targetEl = document.getElementById("drawer-navigation");
 
     const drawer = new Drawer($targetEl);
     drawer.init();
 });
-
 </script>

From 047b2dc711b4bb6986901f59c657ff2175532389 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Fri, 2 Jun 2023 22:57:11 +0530
Subject: [PATCH 38/41] Added L2 submenus for small devices

---
 resources/app/shared/includes/Header.vue | 1921 +++++++++++++++++++---
 1 file changed, 1719 insertions(+), 202 deletions(-)

diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index 3b7cb70..7dde9e2 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -276,72 +276,542 @@
                                                 </inertia-link>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Visits
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-visits"
+                                                    data-collapse-toggle="dropdown-visits"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Visits</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-visits"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Create Visit
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Current
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Visit History
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Records
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-records"
+                                                    data-collapse-toggle="dropdown-records"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Record</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-records"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Patient Record
+                                                            Request
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
+
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Visit Forms
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-visit_form"
+                                                    data-collapse-toggle="dropdown-visit_form"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Visit Form</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-visit_form"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Aftercare Plan
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Ankle Evaluation
+                                                            Form
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Annotatable Diagrams
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Bronchitis Form
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Care Plan
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Clinical
+                                                            Instructions
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Functional and
+                                                            Cognitive Status
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Misc Billing Options
+                                                            HCFA
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Observation
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Physical Exam
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Procedure Order
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Review Of Systems
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Review of Systems
+                                                            Checks
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            SOAP
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Speech Dictation
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Transfer Summary
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Treatment Plan
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Vitals
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Imports
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-import"
+                                                    data-collapse-toggle="dropdown-import"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Import</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-import"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Upload
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Pending Approval
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Visit History
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                         </ul>
                                     </li>
@@ -1020,22 +1490,208 @@
                                                 </inertia-link>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-other"
+                                                    data-collapse-toggle="dropdown-other"
                                                 >
-                                                    Other
-                                                </inertia-link>
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Other</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-other"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Language
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Forms
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Calendar
+                                                            Administration
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Logs
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Users Activity
+                                                            Report
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Certificates
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Native Data Loads
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            External Data Loads
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Merge Encounters
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Merge Patients
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                         </ul>
                                     </li>
@@ -1065,132 +1721,971 @@
                                             class="hidden py-2 space-y-2 ml-2"
                                         >
                                             <li>
-                                                <inertia-link
-                                                    :href="'#'"
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'patients.index'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Clients
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-clients"
+                                                    data-collapse-toggle="dropdown-clients"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Clients</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-clients"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Patient List
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Clinical Statistics:
+                                                            Demographics vs.
+                                                            Diagnosis
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Clinical Statistics:
+                                                            Demographics vs. Lab
+                                                            Results
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Patient List By
+                                                            Referrer
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Prescriptions and
+                                                            Dispensations
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Patient List
+                                                            Creation
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Clinical
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Immunization
+                                                            Registry
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="'#'"
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'patients.create'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Visits
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-visits2"
+                                                    data-collapse-toggle="dropdown-visits2"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Visits</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-visits2"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Appointments
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Patient Flow Board
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Encounters
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Patient Billing
+                                                            Encounter by Carrier
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Appointments and
+                                                            Encounters
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Superbill
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Eligibility
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Eligibility Response
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Claim Status Request
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Chart Location
+                                                            Activity
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Charts Checked Out
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Chart Tracker
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Services by Category
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Syndromic
+                                                            Surveillance
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Financial
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-financial"
+                                                    data-collapse-toggle="dropdown-financial"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Financial</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-financial"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Sales by Item
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Cash Receipts by
+                                                            Provider
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Front Office
+                                                            Receipts
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Receipts Summary
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Collections
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Patient Ledger by
+                                                            Date
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Adjustments
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Financial Summary by
+                                                            Service Code
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Inventory
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-inventory"
+                                                    data-collapse-toggle="dropdown-inventory"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Inventory</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-inventory"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            List
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Activity
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Transactions
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Procedures
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-procedures2"
+                                                    data-collapse-toggle="dropdown-procedures2"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Procedures</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-procedures2"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Pending Orders
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Procedure Statistics
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Insurance
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-insurance"
+                                                    data-collapse-toggle="dropdown-insurance"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Insurance</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-insurance"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Patient Insurance
+                                                            Distribution
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Indigent Patients
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Unique Seen Patients
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Blank Forms
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-blankForms"
+                                                    data-collapse-toggle="dropdown-blankForms"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Blank Forms</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-blankForms"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Demographics
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Superbill/Fee Sheet
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Referral
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
-                                                    >Services
-                                                </inertia-link>
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-services"
+                                                    data-collapse-toggle="dropdown-services"
+                                                >
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Services</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-services"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Background Services
+                                                        </inertia-link>
+                                                    </li>
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                        >
+                                                            Direct Message Log
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                         </ul>
                                     </li>
@@ -1373,22 +2868,44 @@
                                                 </inertia-link>
                                             </li>
                                             <li>
-                                                <inertia-link
-                                                    :href="
-                                                        route(
-                                                            'dashboard.settings'
-                                                        )
-                                                    "
-                                                    :class="
-                                                        isSubMenuActive(
-                                                            'dashboard.settings'
-                                                        )
-                                                            ? 'text-gray-900 dark:text-white'
-                                                            : 'text-gray-400 dark:text-gray-400'
-                                                    "
+                                                <button
+                                                    type="button"
+                                                    class="flex items-center w-full text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
+                                                    aria-controls="dropdown-utilities"
+                                                    data-collapse-toggle="dropdown-utilities"
                                                 >
-                                                    Utilities
-                                                </inertia-link>
+                                                    <span
+                                                        class="flex-1 text-left whitespace-nowrap"
+                                                        >Utilities</span
+                                                    >
+                                                    <icon
+                                                        name="chevron-down"
+                                                        class="w-6 h-6 fill-current"
+                                                    />
+                                                </button>
+                                                <ul
+                                                    id="dropdown-utilities"
+                                                    class="hidden py-2 space-y-2 ml-2"
+                                                >
+                                                    <li>
+                                                        <inertia-link
+                                                            :href="
+                                                                route(
+                                                                    'dashboard.settings'
+                                                                )
+                                                            "
+                                                            :class="
+                                                                isSubMenuActive(
+                                                                    'dashboard.settings'
+                                                                )
+                                                                    ? 'text-gray-900 dark:text-white'
+                                                                    : 'text-gray-400 dark:text-gray-400'
+                                                            "
+                                                            >Validate Attached
+                                                            Documents
+                                                        </inertia-link>
+                                                    </li>
+                                                </ul>
                                             </li>
                                             <li>
                                                 <inertia-link

From 5ace6ba5a20cd4c6ea3e51dbbe1dd72384aafe82 Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 26 Aug 2023 23:05:37 +0530
Subject: [PATCH 39/41] access controlled routes

---
 resources/app/shared/includes/Header.vue | 70 ++++++++++++++++--------
 routes/web.php                           | 50 +++++++++--------
 2 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index 7dde9e2..a2a2b5e 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -29,12 +29,7 @@
                             </span>
                         </button>
 
-                        <!-- drawer init and show -->
-                        <!-- <div class="text-center">
-   <button class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800" type="button" data-drawer-target="drawer-navigation" data-drawer-show="drawer-navigation" aria-controls="drawer-navigation">
-   Show navigation
-   </button>
-</div> -->
+
 
                         <!-- drawer component -->
                         <div
@@ -72,7 +67,7 @@
                             </button>
                             <div class="py-4 overflow-y-auto">
                                 <ul class="space-y-2 font-medium">
-                                    <li>
+                                    <li >
                                         <div
                                             class="flex items-center p-2 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
                                         >
@@ -1272,6 +1267,24 @@
                                                 >
                                                     Facilities
                                                 </inertia-link>
+                                            </li>
+                                               <li>
+                                                <inertia-link
+                                                    :href="
+                                                        route(
+                                                            'dashboard.settings'
+                                                        )
+                                                    "
+                                                    :class="
+                                                        isSubMenuActive(
+                                                            'dashboard.settings'
+                                                        )
+                                                            ? 'text-gray-900 dark:text-white'
+                                                            : 'text-gray-400 dark:text-gray-400'
+                                                    "
+                                                >
+                                                    Invitations
+                                                </inertia-link>
                                             </li>
                                             <li>
                                                 <inertia-link
@@ -1385,7 +1398,7 @@
                                                 <inertia-link
                                                     :href="
                                                         route(
-                                                            'dashboard.settings'
+                                                            'dashboard.roles.index'
                                                         )
                                                     "
                                                     :class="
@@ -3452,7 +3465,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Visit Forms')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -3714,7 +3727,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Visits')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="'#'"
@@ -3747,7 +3760,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Records')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -3762,7 +3775,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Import')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -3980,6 +3993,15 @@
                                             )
                                         "
                                         >Facilities
+                                    </inertia-link>
+                                        <inertia-link
+                                        :href="route('dashboard.settings')"
+                                        :class="
+                                            isSubMenuActive(
+                                                'dashboard.settings'
+                                            )
+                                        "
+                                        >Invitations
                                     </inertia-link>
                                     <inertia-link
                                         :href="route('dashboard.settings')"
@@ -4036,7 +4058,7 @@
                                         >Lists
                                     </inertia-link>
                                     <inertia-link
-                                        :href="route('dashboard.settings')"
+                                        :href="route('dashboard.roles.index')"
                                         :class="
                                             isSubMenuActive(
                                                 'dashboard.settings'
@@ -4048,7 +4070,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Other')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4212,7 +4234,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Clients')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4307,7 +4329,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Visits')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4466,7 +4488,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Financial')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4559,7 +4581,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Inventory')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4592,7 +4614,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Procedures')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4616,7 +4638,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Insurance')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4649,7 +4671,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Blank Forms')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4682,7 +4704,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Services')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -4787,7 +4809,7 @@
                                     <ehr-header-menu
                                         style="background-color: white"
                                         :label="$t('Utilities')"
-                                        subMenu="true"
+                                        :subMenu="true"
                                     >
                                         <inertia-link
                                             :href="route('dashboard.settings')"
@@ -5357,6 +5379,6 @@ onMounted(() => {
     const $targetEl = document.getElementById("drawer-navigation");
 
     const drawer = new Drawer($targetEl);
-    drawer.init();
+
 });
 </script>
diff --git a/routes/web.php b/routes/web.php
index 832ffa8..e62e324 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -98,7 +98,6 @@
         [
             'as' => 'dashboard.',
             'prefix' => 'dashboard',
-            'middleware' => ['role:super_admin|admin|user'],
             'namespace' => '\\',
         ],
         function () {
@@ -109,29 +108,32 @@ function () {
             Route::get('settings', [DashboardController::class, 'settings'])->name('settings');
 
             // ======== Flow Board routes ========
-            Route::get('flow-board', [FlowBoardController::class, 'index'])->name('flow_board');
+            Route::get('flow-board',[FlowBoardController::class, 'index'])->name('flow_board')->middleware('permission:flow-board-read');
 
             Route::get('mail', [MailSendingController::class, 'sendWelcomeEmail'])->name('mail');
 
             // ======== Calendar routes ========
-            Route::get('calendar', [CalendarController::class, 'index'])->name('calendar');
-
-            // ======== Roles & Permissions Routes ========
-            Route::get('/roles', [RolesController::class, 'index'])->name('roles.index');
-            Route::get('/roles/{rolesId}', [RolesController::class, 'details'])->name('roles.details');
-            Route::post('/roles', [RolesController::class, 'store'])->name('roles.store');
-            Route::get('/all-roles', [RolesController::class, 'getRoles'])->name('roles.all');
-            Route::get('/all-permissions', [PermissionController::class, 'getPermissions'])->name('permissions.all');
-
-            // ======== Users related routes ========
-            Route::resource('users', UserController::class)->names([
-                'index' => 'users.index',
-                'create' => 'users.create',
-                'edit' => 'users.edit',
-                'update' => 'users.update',
-                'show' => 'users.show',
-                'destroy' => 'users.destroy',
-            ]);
+            Route::get('calendar', [CalendarController::class, 'index'])->name('calendar')->middleware('permission:calendar-read');
+
+            Route::middleware(['role:super_admin|admin'])->group(function () {
+                Route::get('/roles', [RolesController::class, 'index'])->name('roles.index');
+                Route::get('/roles/{rolesId}', [RolesController::class, 'details'])->name('roles.details');
+                Route::post('/roles', [RolesController::class, 'store'])->name('roles.store');
+                Route::get('/all-roles', [RolesController::class, 'getRoles'])->name('roles.all');
+                Route::get('/all-permissions', [PermissionController::class, 'getPermissions'])->name('permissions.all');
+
+
+                // ======== Users related routes ========
+                Route::resource('users', UserController::class)->names([
+                    'index' => 'users.index',
+                    'create' => 'users.create',
+                    'edit' => 'users.edit',
+                    'update' => 'users.update',
+                    'show' => 'users.show',
+                    'destroy' => 'users.destroy',
+                ]);
+
+            });
 
             // ======== Facility related routes ========
             Route::resource('facilities', FacilityController::class)->names([
@@ -142,7 +144,7 @@ function () {
                 'edit' => 'facilities.edit',
                 'update' => 'facilities.update',
                 'destroy' => 'facilities.destroy',
-            ]);
+            ])->middleware('permission:facility-read');
 
             // ======== Patient related routes ========
             Route::resource('patients', PatientController::class)->names([
@@ -153,7 +155,7 @@ function () {
                 'edit' => 'patients.edit',
                 'update' => 'patients.update',
                 'destroy' => 'patients.destroy',
-            ]);
+            ])->middleware('permission:patient-read');
             Route::get('patients/load/data', [PatientController::class, 'getPatientData'])
                 ->name('patients.load.data');
 
@@ -162,8 +164,8 @@ function () {
                     'as' => 'patients.',
                     'prefix' => 'patients',
                     'namespace' => '\\',
-                    // TODO (add a middleware for selected patients)
-                    'middleware' => 'select.patient',
+
+                    'middleware' => ['select.patient', 'permission:patient-read']
                 ],
                 function () {
                     Route::get('select/{pid}', [PatientController::class, 'selectPatient'])

From 43743612fc2070542d4bd8acd139e97380d7c14f Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sun, 27 Aug 2023 00:30:26 +0530
Subject: [PATCH 40/41] Users datatable

---
 .../Dashboard/User/UserController.php         |  26 ++-
 app/Http/Controllers/InvitationController.php |  10 ++
 resources/app/pages/Users/Index.vue           | 162 ++++++++++++++++++
 resources/app/pages/Users/Invitations.vue     |   2 +-
 resources/app/shared/includes/Header.vue      |   8 +-
 routes/web.php                                |   8 +-
 6 files changed, 208 insertions(+), 8 deletions(-)
 create mode 100644 resources/app/pages/Users/Index.vue

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index c2c9f88..f11a2aa 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -12,6 +12,7 @@
 use Illuminate\Http\Request;
 use Inertia\Response;
 use Inertia\Inertia;
+use JamesDordoy\LaravelVueDatatable\Http\Resources\DataTableCollectionResource;
 use Mail;
 use Redirect;
 use Str;
@@ -28,7 +29,30 @@ public function index()
          */
         $facilities = Facility::pluck('name', 'id');
 
-        return Inertia::render('Users/Invitations', ['facilities' => $facilities]);
+        return Inertia::render('Users/Index', ['facilities' => $facilities]);
+    }
+
+    //URL for datatable for users
+    public function getUsers(Request $request)
+    {
+        $length = $request->input('length', 10);
+        $sortBy = $request->input('column');
+        $orderBy = $request->input('dir');
+        $facility = $request->input('facility');
+
+
+        //get User
+        $query = User::query();
+
+        $query->orderBy($sortBy, $orderBy);
+
+        if ($facility != null) {
+            $query->where('facility', $facility);
+        }
+
+        $data = $query->paginate($length);
+
+        return new DataTableCollectionResource($data);
     }
     /**
      * Show the form for creating a new resource.
diff --git a/app/Http/Controllers/InvitationController.php b/app/Http/Controllers/InvitationController.php
index f61dfcd..a2edaf2 100644
--- a/app/Http/Controllers/InvitationController.php
+++ b/app/Http/Controllers/InvitationController.php
@@ -15,6 +15,16 @@
 class InvitationController extends Controller
 {
 
+    public function show()
+    {
+        /**
+         * Shows the Users/Invitations page
+         * @return Response
+         */
+        $facilities = Facility::pluck('name', 'id');
+
+        return Inertia::render('Users/Invitations', ['facilities' => $facilities]);
+    }
     //URL for datatable for invitations
     public function getInvitations(Request $request)
     {
diff --git a/resources/app/pages/Users/Index.vue b/resources/app/pages/Users/Index.vue
new file mode 100644
index 0000000..1bcf287
--- /dev/null
+++ b/resources/app/pages/Users/Index.vue
@@ -0,0 +1,162 @@
+<template>
+    <div class="container mx-auto">
+        <Breadcrumb :active-link="activeLink" />
+        <div class="flex justify-center">
+            <h2 class="text-2xl font-bold mb-4">User Details</h2>
+        </div>
+
+        <data-table :columns="columns" :url="url">
+            <div
+                class="flex justify-between mb-2"
+                slot="filters"
+                slot-scope="{ tableFilters, perPage }"
+            >
+                <div class="w-1/2 mr-5">
+                    <label class="block mb-2 text-sm font-medium text-gray-700"
+                        >Filter by Facility:</label
+                    >
+                    <select
+                        v-model="tableFilters.filters.facility"
+                        class="w-full px-4 py-2 border rounded-md"
+                    >
+                        <option :value="null">All Facilities</option>
+                        <option
+                            v-for="facility in facilities"
+                            :key="facility"
+                            :value="facility"
+                        >
+                            {{ facility }}
+                        </option>
+                    </select>
+                </div>
+                <div class="w-1/2">
+                    <label class="block mb-2 text-sm font-medium text-gray-700"
+                        >Rows Per Page:</label
+                    >
+                    <select
+                        v-model="tableFilters.length"
+                        class="w-full px-4 py-2 border rounded-md"
+                    >
+                        <option :key="page" v-for="page in perPage">
+                            {{ page }}
+                        </option>
+                    </select>
+                </div>
+            </div>
+            <div
+                class="flex justify-center mt-4"
+                slot="pagination"
+                slot-scope="{ links = {}, meta = {} }"
+            >
+                <div class="flex items-center">
+                    <nav>
+                        <div class="inline-flex">
+                            <div class="mr-4 mt-2">
+                                <span class="text-gray-600">
+                                    Showing {{ meta.from }} to {{ meta.to }} of
+                                    {{ meta.total }} Entries
+                                </span>
+                            </div>
+                            <div>
+                                <button
+                                    :disabled="!links.prev"
+                                    class="px-4 py-2 rounded-md border border-gray-300 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50"
+                                    @click="url = links.prev"
+                                >
+                                    Prev
+                                </button>
+                                <button
+                                    :disabled="!links.next"
+                                    class="ml-2 px-4 py-2 rounded-md border border-gray-300 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50"
+                                    @click="url = links.next"
+                                >
+                                    Next
+                                </button>
+                            </div>
+                        </div>
+                    </nav>
+                </div>
+            </div>
+        </data-table>
+    </div>
+</template>
+
+<script>
+import DashboardLayout from "../../layouts/DashboardLayout";
+import i18n from "../../i18n";
+
+export default {
+    layout: DashboardLayout,
+    props: {
+        users: Array,
+        facilities: Object,
+    },
+    data() {
+        return {
+            url: "",
+            activeLink: i18n.t("users"),
+        };
+    },
+    computed: {
+        columns() {
+            return [
+                { label: "ID", name: "id", orderable: true },
+                { label: "Suffix", name: "suffix", orderable: true },
+                { label: "First Name", name: "first_name", orderable: true },
+                { label: "Middle Name", name: "middle_name", orderable: true },
+                { label: "Last Name", name: "last_name", orderable: true },
+                {
+                    label: "Username",
+                    name: "username",
+                    orderable: true,
+                    transform: ({ data, name }) => {
+                        const userId = data.id;
+
+                        return `<a href="${route("dashboard.users.show", {
+                            id: userId,
+                        })}" class="text-blue-500 hover:underline">${
+                            data.username
+                        }</a>`;
+                    },
+                },
+                { label: "License", name: "license", orderable: true },
+                {
+                    label: "Provider Type",
+                    name: "provider_type",
+                    orderable: true,
+                },
+                { label: "Warehouse", name: "warehouse", orderable: true },
+                { label: "Facility", name: "facility", orderable: true },
+                {
+                    label: "Additional Details",
+                    name: "additional_details",
+                    orderable: true,
+                },
+                {
+                    label: "Federal Tax ID",
+                    name: "federal_tax_id",
+                    orderable: true,
+                },
+                {
+                    label: "Federal Drug ID",
+                    name: "federal_drug_id",
+                    orderable: true,
+                },
+                { label: "Taxonomy", name: "taxonomy", orderable: true },
+                { label: "NPI", name: "npi", orderable: true },
+                { label: "Info", name: "info", orderable: true },
+                {
+                    label: "Access Control",
+                    name: "access_control",
+                    orderable: true,
+                },
+            ];
+        },
+    },
+    mounted() {
+        this.url = route("dashboard.users.fetch");
+    },
+};
+</script>
+
+<style></style>
diff --git a/resources/app/pages/Users/Invitations.vue b/resources/app/pages/Users/Invitations.vue
index fc3cd9f..b1a227f 100644
--- a/resources/app/pages/Users/Invitations.vue
+++ b/resources/app/pages/Users/Invitations.vue
@@ -147,7 +147,7 @@ export default {
         },
     },
     mounted() {
-        this.url = route("invitation.fetch");
+        this.url = route("dashboard.invitations.fetch");
     },
 };
 </script>
diff --git a/resources/app/shared/includes/Header.vue b/resources/app/shared/includes/Header.vue
index a2a2b5e..24b91a7 100644
--- a/resources/app/shared/includes/Header.vue
+++ b/resources/app/shared/includes/Header.vue
@@ -1272,7 +1272,7 @@
                                                 <inertia-link
                                                     :href="
                                                         route(
-                                                            'dashboard.settings'
+                                                            'dashboard.invitations.index'
                                                         )
                                                     "
                                                     :class="
@@ -1290,7 +1290,7 @@
                                                 <inertia-link
                                                     :href="
                                                         route(
-                                                            'dashboard.settings'
+                                                            'dashboard.users.index'
                                                         )
                                                     "
                                                     :class="
@@ -3995,7 +3995,7 @@
                                         >Facilities
                                     </inertia-link>
                                         <inertia-link
-                                        :href="route('dashboard.settings')"
+                                        :href="route('dashboard.invitations.index')"
                                         :class="
                                             isSubMenuActive(
                                                 'dashboard.settings'
@@ -4004,7 +4004,7 @@
                                         >Invitations
                                     </inertia-link>
                                     <inertia-link
-                                        :href="route('dashboard.settings')"
+                                        :href="route('dashboard.users.index')"
                                         :class="
                                             isSubMenuActive(
                                                 'dashboard.settings'
diff --git a/routes/web.php b/routes/web.php
index e62e324..370e760 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -132,7 +132,11 @@ function () {
                     'show' => 'users.show',
                     'destroy' => 'users.destroy',
                 ]);
-
+                Route::get('/users-fetch', [UserController::class, 'getUsers'])
+                    ->name('users.fetch');
+                Route::get('/invitations-fetch', [InvitationController::class, 'getInvitations'])->name('invitations.fetch');
+                Route::get('/invitations', [InvitationController::class, 'show'])
+                    ->name('invitations.index');
             });
 
             // ======== Facility related routes ========
@@ -211,7 +215,7 @@ function () {
 
     Route::get('/invitations/join/{token}', [InvitationController::class, 'index'])->name('invitation.get');
     Route::post('/invitations/accept', [InvitationController::class, 'acceptOrRejectInvite'])->name('invitation.accept');
-    Route::get('/invitations', [InvitationController::class, 'getInvitations'])->name('invitation.fetch');
+
 
 
     /* =================================

From 2b6b772ee76a5062eedfde0712443c91fe5967ab Mon Sep 17 00:00:00 2001
From: chaitak-gorai <chaitakgorai@gmail.com>
Date: Sat, 23 Sep 2023 02:37:58 +0530
Subject: [PATCH 41/41] Validations for Add User

---
 .../Dashboard/User/UserController.php         |  5 ++-
 app/Http/Requests/CreateUserRequest.php       | 45 +++++++++++++++++++
 resources/app/pages/Users/Add.vue             | 16 ++++++-
 resources/app/pages/Users/Invitations.vue     |  8 ++++
 4 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 app/Http/Requests/CreateUserRequest.php

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
index f11a2aa..e1ded7c 100644
--- a/app/Http/Controllers/Dashboard/User/UserController.php
+++ b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Dashboard\User;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\CreateUserRequest;
 use App\Invite;
 use App\Mail\InvitationMail;
 use App\Models\Facilities\Facility;
@@ -73,7 +74,7 @@ public function create(): Response
      * @param Request $request
      * @return Response
      */
-    public function store(Request $request)
+    public function store(CreateUserRequest $request)
     {
         $temporaryPassword = Str::random(10);
         $userData = [
@@ -100,7 +101,7 @@ public function store(Request $request)
 
 
         Invite::send($userData, $request->email);
-        return Inertia::location(route('dashboard.users.create'));
+        return Inertia::location(route('dashboard.invitations.index'));
     }
 
 
diff --git a/app/Http/Requests/CreateUserRequest.php b/app/Http/Requests/CreateUserRequest.php
new file mode 100644
index 0000000..5cf285b
--- /dev/null
+++ b/app/Http/Requests/CreateUserRequest.php
@@ -0,0 +1,45 @@
+<?php
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreateUserRequest extends FormRequest
+{
+/**
+* Determine if the user is authorized to make this request.
+*
+* @return bool
+*/
+public function authorize()
+{
+return true;
+}
+
+/**
+* Get the validation rules that apply to the request.
+*
+* @return array<string, mixed>
+    */
+    public function rules()
+    {
+    return [
+    'username' => 'required|string|unique:users,username',
+    'email' => 'nullable|email|unique:users,email',
+    'first_name' => 'required|string',
+    'middle_name' => 'nullable|string',
+    'last_name' => 'required|string',
+    'tax_id' => 'required|string|unique:users,federal_tax_id',
+    'dea_number' => 'required|string|unique:users,federal_drug_id',
+    'npi' => 'required|integer|unique:users,npi',
+    'suffix' => 'required|string',
+    'taxonomy' => 'required|string',
+    'job_description' => 'nullable|string',
+    'role' => 'required|string',
+    'default_warehouse' => 'nullable|string',
+    'default_facility' => 'required|string',
+    'provider_type' => 'nullable|string',
+    'license_number' => 'nullable|string',
+    'additional_details' => 'nullable|string',
+    ];
+    }
+    }
diff --git a/resources/app/pages/Users/Add.vue b/resources/app/pages/Users/Add.vue
index 879cb0b..f45f8ad 100644
--- a/resources/app/pages/Users/Add.vue
+++ b/resources/app/pages/Users/Add.vue
@@ -29,6 +29,7 @@
                         <ehr-input
                             v-model="userForm.tax_id"
                             :label="'Tax ID'"
+                            :error="errors.tax_id"
                             :placeholder="'Enter Tax ID'"
                             required
                         />
@@ -37,7 +38,9 @@
                         <ehr-input
                             v-model="userForm.suffix"
                             :label="'Suffix'"
+                            :error="errors.suffix"
                             :placeholder="'Enter Suffix'"
+                            required
                         />
                     </div>
 
@@ -70,6 +73,7 @@
                     <div>
                         <ehr-input
                             v-model="userForm.dea_number"
+                            :error="errors.dea_number"
                             :label="'DEA Number'"
                             :placeholder="'Enter DEA Number'"
                             required
@@ -79,6 +83,7 @@
                     <div>
                         <ehr-input
                             v-model="userForm.npi"
+                            :error="errors.npi"
                             :label="'NPI'"
                             :placeholder="'Enter NPI'"
                             required
@@ -88,6 +93,7 @@
                     <div>
                         <ehr-input
                             v-model="userForm.taxonomy"
+                            :error="errors.taxonomy"
                             :label="'Taxonomy'"
                             :placeholder="'Enter Taxonomy'"
                             required
@@ -96,6 +102,7 @@
                     <div>
                         <ehr-input
                             v-model="userForm.license_number"
+                            :error="errors.license_number"
                             :label="'License No.'"
                             :placeholder="'Enter License No.'"
                             required
@@ -104,6 +111,7 @@
                     <div>
                         <ehr-input
                             v-model="userForm.provider_type"
+                            :error="errors.provider_type"
                             :label="'Provider Type'"
                             :placeholder="'Enter Provider Type'"
                         />
@@ -111,6 +119,7 @@
                     <div>
                         <ehr-input
                             v-model="userForm.default_warehouse"
+                            :error="errors.default_warehouse"
                             :label="'Default Warehouse'"
                             :placeholder="'Enter Default Warehouse'"
                         />
@@ -118,18 +127,21 @@
                     <div>
                         <ehr-input
                             v-model="userForm.job_description"
+                            :error="errors.job_description"
                             :label="'Job Description'"
                             :placeholder="'Enter Job Description'"
                         />
                     </div>
                     <div>
+                       <p class="text-red-500 pb-4"> {{ errors.default_facility }}</p>
+
                         <button
                             id="default-facility-dropdown"
                             class="w-full px-4 py-2 rounded ring-2"
                             type="button"
                             @click="toggleDefaultFacilityList()"
                         >
-                            Default Facility:
+                           Facility:
                             <b>{{ userForm.default_facility }}</b>
 
                             <span
@@ -158,6 +170,7 @@
                         </ul>
                     </div>
                     <div>
+                          <p class="text-red-500 pb-4"> {{ errors.role }}</p>
                         <button
                             id="role-dropdown"
                             class="w-full px-4 py-2 rounded ring-2"
@@ -212,6 +225,7 @@ export default {
     layout: DashboardLayout,
     props: {
         facilities: Object,
+        errors: Object,
     },
     data() {
         return {
diff --git a/resources/app/pages/Users/Invitations.vue b/resources/app/pages/Users/Invitations.vue
index b1a227f..5983e86 100644
--- a/resources/app/pages/Users/Invitations.vue
+++ b/resources/app/pages/Users/Invitations.vue
@@ -5,6 +5,14 @@
             <h2 class="text-2xl font-bold mb-4">Invitation Details</h2>
         </div>
 
+        <div class="flex justify-end">
+            <inertia-link :href="route('dashboard.users.create')">
+            <button class="bg-gray-900 hover:bg-gray-600 text-white font-semibold py-2 px-4 rounded shadow ml-auto">
+              Add User
+            </button>
+        </inertia-link>
+        </div>
+
         <data-table :columns="columns" :url="url">
             <div
                 class="flex justify-between mb-2"