Merge branch 'omis_ranjan' of http://bibgit.com/dharmaraj/New-OMIS into omis_dharma

Modules/Employee/Http/Controllers/EmployeeController.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Modules\Employee\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class EmployeeController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('employee::index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('employee::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        return view('employee::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('employee::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

Modules/Employee/Providers/EmployeeServiceProvider.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Modules\Employee\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+
+class EmployeeServiceProvider extends ServiceProvider
+{
+    protected string $moduleName = 'Employee';
+
+    protected string $moduleNameLower = 'employee';
+
+    /**
+     * Boot the application events.
+     */
+    public function boot(): void
+    {
+        $this->registerCommands();
+        $this->registerCommandSchedules();
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+        $this->loadMigrationsFrom(module_path($this->moduleName, 'database/migrations'));
+    }
+
+    /**
+     * Register the service provider.
+     */
+    public function register(): void
+    {
+        $this->app->register(RouteServiceProvider::class);
+    }
+
+    /**
+     * Register commands in the format of Command::class
+     */
+    protected function registerCommands(): void
+    {
+        // $this->commands([]);
+    }
+
+    /**
+     * Register command Schedules.
+     */
+    protected function registerCommandSchedules(): void
+    {
+        // $this->app->booted(function () {
+        //     $schedule = $this->app->make(Schedule::class);
+        //     $schedule->command('inspire')->hourly();
+        // });
+    }
+
+    /**
+     * Register translations.
+     */
+    public function registerTranslations(): void
+    {
+        $langPath = resource_path('lang/modules/'.$this->moduleNameLower);
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath, $this->moduleNameLower);
+            $this->loadJsonTranslationsFrom($langPath);
+        } else {
+            $this->loadTranslationsFrom(module_path($this->moduleName, 'lang'), $this->moduleNameLower);
+            $this->loadJsonTranslationsFrom(module_path($this->moduleName, 'lang'));
+        }
+    }
+
+    /**
+     * Register config.
+     */
+    protected function registerConfig(): void
+    {
+        $this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower.'.php')], 'config');
+        $this->mergeConfigFrom(module_path($this->moduleName, 'config/config.php'), $this->moduleNameLower);
+    }
+
+    /**
+     * Register views.
+     */
+    public function registerViews(): void
+    {
+        $viewPath = resource_path('views/modules/'.$this->moduleNameLower);
+        $sourcePath = module_path($this->moduleName, 'resources/views');
+
+        $this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower.'-module-views']);
+
+        $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower);
+
+        $componentNamespace = str_replace('/', '\\', config('modules.namespace').'\\'.$this->moduleName.'\\'.ltrim(config('modules.paths.generator.component-class.path'), config('modules.paths.app_folder','')));
+        Blade::componentNamespace($componentNamespace, $this->moduleNameLower);
+    }
+
+    /**
+     * Get the services provided by the provider.
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+
+    private function getPublishableViewPaths(): array
+    {
+        $paths = [];
+        foreach (config('view.paths') as $path) {
+            if (is_dir($path.'/modules/'.$this->moduleNameLower)) {
+                $paths[] = $path.'/modules/'.$this->moduleNameLower;
+            }
+        }
+
+        return $paths;
+    }
+}

Modules/Employee/Providers/RouteServiceProvider.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Modules\Employee\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * Called before routes are registered.
+     *
+     * Register any model bindings or pattern based filters.
+     */
+    public function boot(): void
+    {
+        parent::boot();
+    }
+
+    /**
+     * Define the routes for the application.
+     */
+    public function map(): void
+    {
+        $this->mapApiRoutes();
+
+        $this->mapWebRoutes();
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     */
+    protected function mapWebRoutes(): void
+    {
+        Route::middleware('web')->group(module_path('Employee', '/routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     */
+    protected function mapApiRoutes(): void
+    {
+        Route::middleware('api')->prefix('api')->name('api.')->group(module_path('Employee', '/routes/api.php'));
+    }
+}

Modules/Employee/composer.json

@@ -0,0 +1,30 @@
+{
+    "name": "nwidart/employee",
+    "description": "",
+    "authors": [
+        {
+            "name": "Nicolas Widart",
+            "email": "n.widart@gmail.com"
+        }
+    ],
+    "extra": {
+        "laravel": {
+            "providers": [],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Modules\\Employee\\": "app/",
+            "Modules\\Employee\\Database\\Factories\\": "database/factories/",
+            "Modules\\Employee\\Database\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Modules\\Employee\\Tests\\": "tests/"
+        }
+    }
+}

Modules/Employee/config/config.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'name' => 'Employee',
+];

Modules/Employee/database/seeders/EmployeeDatabaseSeeder.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Employee\database\seeders;
+
+use Illuminate\Database\Seeder;
+
+class EmployeeDatabaseSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // $this->call([]);
+    }
+}

Modules/Employee/module.json

@@ -0,0 +1,11 @@
+{
+    "name": "Employee",
+    "alias": "employee",
+    "description": "",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+        "Modules\\Employee\\Providers\\EmployeeServiceProvider"
+    ],
+    "files": []
+}

Modules/Employee/package.json

@@ -0,0 +1,15 @@
+{
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "axios": "^1.1.2",
+    "laravel-vite-plugin": "^0.7.5",
+    "sass": "^1.69.5",
+    "postcss": "^8.3.7",
+    "vite": "^4.0.0"
+  }
+}

Modules/Employee/resources/views/layouts/master.blade.php

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+    <title>Employee Module - {{ config('app.name', 'Laravel') }}</title>
+
+    <meta name="description" content="{{ $description ?? '' }}">
+    <meta name="keywords" content="{{ $keywords ?? '' }}">
+    <meta name="author" content="{{ $author ?? '' }}">
+
+    <!-- Fonts -->
+    <link rel="preconnect" href="https://fonts.bunny.net">
+    <link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />
+
+    {{-- Vite CSS --}}
+    {{-- {{ module_vite('build-employee', 'resources/assets/sass/app.scss') }} --}}
+</head>
+
+<body>
+    @yield('content')
+
+    {{-- Vite JS --}}
+    {{-- {{ module_vite('build-employee', 'resources/assets/js/app.js') }} --}}
+</body>

Modules/Employee/routes/api.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Employee\Http\Controllers\EmployeeController;
+
+/*
+ *--------------------------------------------------------------------------
+ * API Routes
+ *--------------------------------------------------------------------------
+ *
+ * Here is where you can register API routes for your application. These
+ * routes are loaded by the RouteServiceProvider within a group which
+ * is assigned the "api" middleware group. Enjoy building your API!
+ *
+*/
+
+Route::middleware(['auth:sanctum'])->prefix('v1')->group(function () {
+    Route::apiResource('employee', EmployeeController::class)->names('employee');
+});

Modules/Employee/routes/web.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Employee\Http\Controllers\EmployeeController;
+
+/*
+|--------------------------------------------------------------------------
+| Web Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register web routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| contains the "web" middleware group. Now create something great!
+|
+*/
+
+Route::group([], function () {
+    Route::resource('employee', EmployeeController::class)->names('employee');
+});

Modules/Employee/vite.config.js

@@ -0,0 +1,26 @@
+import { defineConfig } from 'vite';
+import laravel from 'laravel-vite-plugin';
+
+export default defineConfig({
+    build: {
+        outDir: '../../public/build-employee',
+        emptyOutDir: true,
+        manifest: true,
+    },
+    plugins: [
+        laravel({
+            publicDirectory: '../../public',
+            buildDirectory: 'build-employee',
+            input: [
+                __dirname + '/resources/assets/sass/app.scss',
+                __dirname + '/resources/assets/js/app.js'
+            ],
+            refresh: true,
+        }),
+    ],
+});
+
+//export const paths = [
+//    'Modules/Employee/resources/assets/sass/app.scss',
+//    'Modules/Employee/resources/assets/js/app.js',
+//];

Modules/Leave/resources/views/create.blade.php

@@ -24,7 +24,7 @@
         <div class="col-lg-8">
           <div class="card">
             <div class="card-body">
-              <form action="{{ route('leave.store') }}" method="post" class="needs-validation" novalidate>
+              <form action="{{ route('leave.store') }}" class="needs-validation" novalidate method="post">
                 @csrf
                 @include('leave::partials.action')
               </form>

Modules/Leave/resources/views/partials/action.blade.php

@@ -1,9 +1,8 @@
 <div class="mb-3">
     <label for="employeeName" class="form-label">Employee Name</label>
-  <input type="text" class="form-control" id="employeeName" placeholder="Enter emploree name" name="employeeName"
-    required>
+    <input type="text" class="form-control" id="employeeName" placeholder="Enter employee name" name="employeeName" required>
     <div class="invalid-feedback">
-    Please enter Employee Name.
+      Please enter employee name.
   </div>
 </div>
 <div class="mb-3">
@@ -25,3 +24,7 @@
 <div class="text-end">
     <button type="submit" class="btn btn-primary">Add Leave</button>
 </div>
+
+@push('js')
+    <script src="{{ asset('assets/js/pages/form-validation.init.js') }}"></script>
+@endpush

modules_statuses.json

@@ -1,4 +1,5 @@
 {
     "Leave": true,
-    "Attendance": true
+    "Attendance": true,
+    "Employee": true
 }

public/assets/css/nepali.datepicker.v4.0.1.min.css

@@ -0,0 +1 @@
+.ndc-chevron::before{border-style:solid;border-width:.25em .25em 0 0;content:"";display:inline-block;height:.3em;left:.15em;position:relative;top:5px;transform:rotate(-45deg);vertical-align:top;width:.3em;border-color:#fff;box-sizing:initial}.ndc-chevron.ndc-right:before{left:-1px;transform:rotate(45deg)}.ndc-chevron.ndc-left:before{left:1px;transform:rotate(-135deg)}div#ndp-nepali-box{position:absolute;top:-999px;z-index:9999}div#ndp-nepali-box,div.ndp-nepali-box{width:202px;font-family:"Trebuchet MS",Tahoma,Verdana,Arial,sans-serif;border:1px solid #a6c9e2;background-color:#fdfefe;padding:1px;box-shadow:0 5px 5px -3px rgba(0,0,0,.2),0 8px 10px 1px rgba(0,0,0,.14),0 3px 14px 2px rgba(0,0,0,.12)}div.ndp-nepali-calendar-div div.ndp-nepali-box{top:unset!important}div#ndp-nepali-box .hidden,div.ndp-nepali-box .hidden{display:none}div#ndp-table-div{margin:0}div#ndp-table-div table{border-spacing:2px;border-collapse:separate}div.ndp-nepali-box td.ndp-link-disabled a{cursor:default!important}div#ndp-nepali-box td.ndp-date,div.ndp-nepali-box td.ndp-date{padding:2px;border:1px solid #c5dbec;background:#dfeffc;color:#2e6e9e}div#ndp-nepali-box td.ndp-selected,div.ndp-nepali-box td.ndp-selected{border:1px solid #fad42e;background:#fbec88;color:#363636;text-align:center}div#ndp-nepali-box td.ndp-current,div.ndp-nepali-box td.ndp-current{padding:2px;border:1px solid #fed22f;background:#f5f8f9;text-align:center;font-weight:700}div#ndp-nepali-box td.ndp-current a,div.ndp-nepali-box td.ndp-current a{color:#e17009;display:block}div#ndp-nepali-box td.ndp-date a,div#ndp-nepali-box td.ndp-selected a,div.ndp-nepali-box td.ndp-date a,div.ndp-nepali-box td.ndp-selected a{display:block;color:#1c94c4;text-decoration:none;width:20px;text-align:center;font-weight:700}a.ndp-disabled{color:#ccc!important}div#ndp-nepali-box td.ndp-current:hover,div#ndp-nepali-box td.ndp-date:hover,div.ndp-nepali-box td.ndp-current:hover,div.ndp-nepali-box td.ndp-date:hover{border:1px solid #fed22f;opacity:.8}div#ndp-nepali-box td.ndp-date a:hover,div.ndp-nepali-box td.ndp-date a:hover{color:#1c94c4}div#ndp-nepali-box table,div.ndp-nepali-box table{width:100%}div#ndp-nepali-box table,div#ndp-nepali-box td,div#ndp-nepali-box tr,div.ndp-nepali-box table,div.ndp-nepali-box td,div.ndp-nepali-box tr{font-size:12px;height:19px;line-height:19px;border-collapse:separate;border-spacing:2px}div#ndp-nepali-box a,div.ndp-nepali-box a{text-decoration:none}.ndp-days th,.ndp-header{text-align:center;font-weight:700}.ndp-header{border:1px solid #4297d7;background:#87b6d9;color:#fff;font-size:13px;padding:2px;line-height:20px;margin:2px;display:flex;justify-content:space-between;align-items:center}.ndp-next:hover,.ndp-prev:hover{background:#fed22f}.ndp-next,.ndp-prev{display:inline-block;width:1.3em;height:1.3em;background:#247ac4;border-radius:50%}.ndp-next.ndp-disabled,.ndp-prev.ndp-disabled{background:#ccc}.ndp-prev{left:7px}.ndp-next{right:7px}#currentMonth #ndp-month-select,#currentMonth #ndp-year-select{color:#000;font-size:12px;font-weight:400;padding:2px 1px 0;height:22px}.ndp-corner-all,.ndp-corner-left,.ndp-corner-tl,.ndp-corner-top{-moz-border-radius-topleft:5px;-webkit-border-top-left-radius:5px;-khtml-border-top-left-radius:5px;border-top-left-radius:5px}.ndp-corner-all,.ndp-corner-right,.ndp-corner-top,.ndp-corner-tr{-moz-border-radius-topright:5px;-webkit-border-top-right-radius:5px;-khtml-border-top-right-radius:5px;border-top-right-radius:5px}.ndp-corner-all,.ndp-corner-bl,.ndp-corner-bottom,.ndp-corner-left{-moz-border-radius-bottomleft:5px;-webkit-border-bottom-left-radius:5px;-khtml-border-bottom-left-radius:5px;border-bottom-left-radius:5px}.ndp-corner-all,.ndp-corner-bottom,.ndp-corner-br,.ndp-corner-right{-moz-border-radius-bottomright:5px;-webkit-border-bottom-right-radius:5px;-khtml-border-bottom-right-radius:5px;border-bottom-right-radius:5px}

resources/views/layouts/app.blade.php

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en" data-layout="vertical" data-topbar="light" data-sidebar="dark" data-sidebar-size="lg"
-  data-sidebar-image="none" data-preloader="disable">
+  data-sidebar-image="none" data-preloader="enable">
 
 <head>
 
@@ -28,7 +28,7 @@
   <link href="{{ asset('assets/css/toastr.css') }}" rel="stylesheet" type="text/css" />
 
   <!-- Nepali DatePicker Css -->
-  <link href="{{ asset('assets/css/nepaliDatePicker.min.css') }}" rel="stylesheet" type="text/css" />
+  <link href="{{ asset('assets/css/nepali.datepicker.v4.0.1.min.css') }}" rel="stylesheet" type="text/css" />
 
   <!-- Filepond css -->
   <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet" />
@@ -41,6 +41,9 @@
   <!-- Icons Css -->
   <link href="{{ asset('assets/css/icons.min.css') }}" rel="stylesheet" type="text/css" />
 
+  <!-- Sweetalert Css -->
+  <link href="{{ asset('assets/libs/sweetalert2/sweetalert2.min.css') }}" rel="stylesheet" type="text/css" />
+
   <!-- custom Css-->
   <link href="{{ asset('assets/css/custom.min.css') }}" rel="stylesheet" type="text/css" />
 
@@ -80,7 +83,6 @@
   <!-- END layout-wrapper -->
 
 
-
   <!--start back-to-top-->
   <button onclick="topFunction()" class="btn btn-danger btn-icon" id="back-to-top">
     <i class="ri-arrow-up-line"></i>
@@ -99,7 +101,7 @@
 
   <!-- Theme Settings -->
 
-  @include('layouts.partials.theme-setting')
+  {{-- @include('layouts.partials.theme-setting') --}}
 
   <!-- JAVASCRIPT -->
   <script src="{{ asset('assets/libs/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
@@ -111,7 +113,7 @@
   <script src="{{ asset('assets/js/plugins.js') }}"></script>
   <script src="{{ asset('assets/libs/@ckeditor/ckeditor5-build-classic/build/ckeditor.js') }}"></script>
   <script src="{{ asset('assets/libs/toastr/toastr.min.js') }}"></script>
-  <script src="{{ asset('assets/libs/nepalidatepicker/jquery.nepaliDatePicker.min.js') }}"></script>
+  <script src="{{ asset('assets/libs/nepalidatepicker/nepali.datepicker.v4.0.1.min.js') }}"></script>
   <script src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.min.js"></script>
   <script src="https://cdn.datatables.net/1.11.5/js/dataTables.bootstrap5.min.js"></script>
   <script src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
@@ -126,6 +128,11 @@
   <!--apexcharts-->
   <script src="{{ asset('assets/libs/apexcharts/apexcharts.min.js') }}"></script>
 
+  <!-- Sweet alert js -->
+  <script src="{{ asset('assets/libs/sweetalert2/sweetalert2.min.js') }}"></script>
+
+  <script src="{{ asset('assets/js/pages/sweetalerts.init.js') }}"></script>
+
   <!-- projects js -->
   <script src="{{ asset('assets/js/pages/dashboard-projects.init.js') }}"></script>
 
@@ -137,7 +144,7 @@
   <script src="{{ asset('assets/js/app.js') }}"></script>
 
   <!-- Custom js -->
-  <script type="module" src="{{ asset('assets/js/custom.js') }}"></script>
+  <script src="{{ asset('assets/js/custom.js') }}"></script>
   @stack('js')
 </body>
 

resources/views/layouts/partials/sidebar.blade.php

@@ -33,14 +33,14 @@
         <!-- start Dashboard Menu -->
         <li class="menu-title"><span data-key="t-menu">Menu</span></li>
         <li class="nav-item">
-          <a class="nav-link menu-link" href="#sidebarDashboards" data-bs-toggle="collapse" role="button"
-            aria-expanded="false" aria-controls="sidebarDashboards">
-            <i class="ri-dashboard-2-line"></i> <span data-key="t-dashboards">Dashboards</span>
+          <a class="nav-link menu-link active" href="#MenuOne" data-bs-toggle="collapse" role="button"
+            aria-expanded="true" aria-controls="MenuOne">
+            <i class="ri-dashboard-2-line"></i> <span data-key="t-dashboards">Dashboard</span>
           </a>
-          <div class="menu-dropdown collapse" id="sidebarDashboards">
+          <div class="menu-dropdown collapse" id="MenuOne">
             <ul class="nav nav-sm flex-column">
               <li class="nav-item">
-                <a href="#" class="nav-link" data-key="t-setting"> Website Setting </a>
+                <a href="#" class="nav-link" data-key="t-setting"> Setting </a>
               </li>
             </ul>
           </div>
@@ -48,11 +48,11 @@
         <!-- end Dashboard Menu -->
         <li class="menu-title"><i class="ri-more-fill"></i> <span data-key="t-pages">Pages</span></li>
         <li class="nav-item">
-          <a class="nav-link menu-link" href="#sidebarDashboards" data-bs-toggle="collapse" role="button"
-            aria-expanded="false" aria-controls="sidebarDashboards">
-            <i class="ri-dashboard-2-line"></i> <span data-key="t-dashboards">Website Resources</span>
+          <a class="nav-link menu-link" href="#MenuTwo" data-bs-toggle="collapse" role="button"
+            aria-expanded="false" aria-controls="MenuTwo">
+            <i class="ri-dashboard-2-line"></i> <span data-key="t-resources">Website Resources</span>
           </a>
-          <div class="menu-dropdown collapse" id="sidebarDashboards">
+          <div class="menu-dropdown collapse" id="MenuTwo">
             <ul class="nav nav-sm flex-column">
               <li class="nav-item">
                 <a href="#" class="nav-link" data-key="t-slider"> Slider </a>
@@ -70,6 +70,12 @@
           </a>
         </li>
 
+        <li class="nav-item">
+          <a class="nav-link menu-link" href="{{ route('employee.index') }}">
+            <i class="ri-honour-line"></i> <span data-key="t-widgets">Employee</span>
+          </a>
+        </li>
+
       </ul>
     </div>
     <!-- Sidebar -->