Merge pull request #33 from Sharifur/dev

Vcalendar issue solved

.gitignore

@@ -17,3 +17,4 @@ yarn-error.log
 /cgi-bin
 /.well-known
 /public/attendance-file/*
+.vendor.zip

package.json

@@ -36,12 +36,13 @@
         "vue-loader": "^16.1.2"
     },
     "dependencies": {
+        "@popperjs/core": "^2.11.8",
         "bootstrap": "^5.1.3",
         "dropzone": "^6.0.0-beta.2",
         "html2pdf.js": "^0.10.1",
         "moment-timezone": "^0.5.34",
         "path": "^0.12.7",
-        "v-calendar": "^3.0.0-alpha.9",
+        "v-calendar": "^3.1.2",
         "vue-sweetalert2": "^5.0.2",
         "vue3-datepicker": "^0.2.5"
     }

public/build/assets/app-HzQhOQzM.css

@@ -0,0 +1 @@
+@tailwind base;@tailwind components;@tailwind utilities;

public/build/manifest.json

@@ -70,9 +70,9 @@
       "resources/js/app.js"
     ]
   },
-  "_MediaUploader-!~{010}~.js": {
+  "_MediaUploader-!~{011}~.js": {
     "file": "assets/MediaUploader-JdgemgHW.css",
-    "src": "_MediaUploader-!~{010}~.js"
+    "src": "_MediaUploader-!~{011}~.js"
   },
   "_MediaUploader-XLJWAQfV.js": {
     "css": [
@@ -176,6 +176,11 @@
     "isDynamicEntry": true,
     "src": "node_modules/dompurify/dist/purify.es.js"
   },
+  "resources/css/app.css": {
+    "file": "assets/app-HzQhOQzM.css",
+    "isEntry": true,
+    "src": "resources/css/app.css"
+  },
   "resources/js/Pages/Admin/Login.vue": {
     "file": "assets/Login-GedlPRKO.js",
     "imports": [

resources/js/app.js

@@ -1,9 +1,12 @@
-import * as bootstrap from 'bootstrap'
+
 import { createApp, h } from 'vue';
 import { createInertiaApp } from '@inertiajs/inertia-vue3';
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
-
-
+import VCalendar from 'v-calendar';
+import 'v-calendar/style.css';
+import { setupCalendar, Calendar, DatePicker } from 'v-calendar';
+import "../scss/main-style.scss"
+;
 import { InertiaProgress } from '@inertiajs/progress';
 import VueSweetalert2 from 'vue-sweetalert2';
 import 'sweetalert2/dist/sweetalert2.min.css';
@@ -90,10 +93,11 @@ createInertiaApp({
          return createApp({ render: () => h(app, props) })
             .use(plugin)
             .use(VueSweetalert2)
-            // .use(SetupCalendar, {})
+            .use(VCalendar, {})
+            .use(setupCalendar, {})
             // Use the components
-            // .component('Calendar', Calendar)
-            // .component('DatePicker', DatePicker)
+            .component('Calendar', Calendar)
+            .component('DatePicker', DatePicker)
             .mixin({ methods: {
                 route,
                 countryNameBySlug(slug){

resources/scss/components/_calendar.scss

@@ -8,6 +8,13 @@
     border-radius: 0;
     width: 100%;
 }
+.vc-bordered{
+     width: 100% !important;
+ }
+.vc-header .vc-title {
+    opacity: 0.9 !important;
+}
+
 .cleardar-wrapper{
     .head-rapw {
         text-align: center;

resources/scss/main-style.scss

@@ -1,31 +1,31 @@
 //bootstrap
-@import "~bootstrap/scss/bootstrap";
-//fontawesome 5 free
-@import '~@fortawesome/fontawesome-free/scss/fontawesome';
-@import '~@fortawesome/fontawesome-free/scss/regular';
-@import '~@fortawesome/fontawesome-free/scss/solid';
-@import '~@fortawesome/fontawesome-free/scss/brands';
+@import "bootstrap/scss/bootstrap";
+////fontawesome 5 free
+@import '@fortawesome/fontawesome-free/scss/fontawesome';
+@import '@fortawesome/fontawesome-free/scss/regular';
+@import '@fortawesome/fontawesome-free/scss/solid';
+@import '@fortawesome/fontawesome-free/scss/brands';
 
 //global
-@import "resources/scss/global/_mixins";
-@import "resources/scss/global/_variables";
-@import "resources/scss/global/_global";
+@import "global/_mixins";
+@import "global/_variables";
+@import "global/_global";
 
 //sections
-@import "resources/scss/sections/_dashboard";
-@import "resources/scss/sections/_bootstrap-override";
-@import "resources/scss/sections/_pagination";
-@import "resources/scss/sections/thirdparty_plugin_css_override";
-@import "resources/scss/sections/invoice";
+@import "sections/_dashboard";
+@import "sections/_bootstrap-override";
+@import "sections/_pagination";
+@import "sections/thirdparty_plugin_css_override";
+@import "sections/invoice";
 @import "sections/salarySlip";
 @import "sections/user-dashboard";
 
 //components
-@import "resources/scss/components/iconpicker";
-@import "resources/scss/components/_button";
-@import "resources/scss/components/_datepicker";
-@import "resources/scss/components/media_uploader";
-@import "resources/scss/components/transition";
-@import "resources/scss/components/sweetalert";
-@import "resources/scss/components/calendar";
+@import "components/iconpicker";
+@import "components/_button";
+@import "components/_datepicker";
+@import "components/media_uploader";
+@import "components/transition";
+@import "components/sweetalert";
+@import "components/calendar";
 

resources/views/app.blade.php

@@ -16,7 +16,7 @@
             <link rel="stylesheet" href="{{asset('css/loginscreen.css')}}">
         @endif
         @routes
-        @vite(['resources/css/app.css', 'resources/js/app.js'])
+        @vite([ 'resources/js/app.js'])
         @inertiaHead
 {{--        <script src="{{ mix('js/app.js') }}" defer></script>--}}
         <script>window.Laravel = {csrfToken: '{{ csrf_token() }}'}</script>

vite.config.js

@@ -7,7 +7,9 @@ import path from 'path'; // Import the path module
 export default defineConfig({
     plugins: [
         laravel({
-            input: 'resources/js/app.js',
+            input:  [
+                'resources/js/app.js',
+            ],
             refresh: true,
         }),
         vue(