diff --git a/composer.json b/composer.json index 5e02af0..44d38c5 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ ], "dev": [ "Composer\\Config::disableProcessTimeout", - "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve --host=localhost\" \"php artisan queue:listen --tries=1 --timeout=0\" \"php bin/dev-logs.php\" \"npm run dev\" --names=server,queue,logs,vite --kill-others" + "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve --host=localhost\" \"php artisan queue:listen --tries=1 --timeout=0\" \"php bin/dev-logs.php\" \"npm run dev:server\" --names=server,queue,logs,vite --kill-others" ], "lint": [ "pint --parallel" diff --git a/package-lock.json b/package-lock.json index 8d53271..3ab4d79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@vitejs/plugin-vue": "^6.0.0", "clsx": "^2.1.1", "concurrently": "^9.0.1", + "konsta": "^5.3.0", "laravel-vite-plugin": "^3.1", "lucide-vue-next": "^1.0.0", "tailwind-merge": "^3.2.0", @@ -6937,6 +6938,18 @@ "json-buffer": "3.0.1" } }, + "node_modules/konsta": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/konsta/-/konsta-5.3.0.tgz", + "integrity": "sha512-4KjAcQiczKSvbr/hgx9g0CLoJStqjE3DvAIhFJeN05WGi8lYu5b/6f2hdwnmtiq6K4QumY96usStEofH21pdbQ==", + "license": "MIT", + "dependencies": { + "tailwind-merge": "^3.3.1" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/laravel-precognition": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/laravel-precognition/-/laravel-precognition-2.0.0.tgz", diff --git a/package.json b/package.json index c14636a..46196e9 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "scripts": { "build": "vite build", "build:ssr": "vite build && vite build --ssr", - "dev": "vite", + "dev": "composer run dev", + "dev:server": "vite", "format": "prettier --write resources/", "format:check": "prettier --check resources/", "lint": "eslint . --fix", @@ -36,6 +37,7 @@ "@vitejs/plugin-vue": "^6.0.0", "clsx": "^2.1.1", "concurrently": "^9.0.1", + "konsta": "^5.3.0", "laravel-vite-plugin": "^3.1", "lucide-vue-next": "^1.0.0", "tailwind-merge": "^3.2.0", diff --git a/resources/css/app.css b/resources/css/app.css index f12718b..106c4f7 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,4 +1,6 @@ +@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap'); @import 'tailwindcss'; +@import 'konsta/vue/theme.css'; @source '../../vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php'; @source '../../storage/framework/views/*.php'; @@ -31,81 +33,3 @@ @apply transition-colors duration-300; } } - -.dark .bg-red-50 { - background-color: rgb(239 68 68 / 0.1); -} -.dark .bg-red-100 { - background-color: rgb(239 68 68 / 0.15); -} -.dark .text-red-600 { - color: rgb(248 113 113); -} -.dark .text-red-700 { - color: rgb(252 165 165); -} - -.dark .bg-blue-50 { - background-color: rgb(59 130 246 / 0.1); -} -.dark .bg-blue-100 { - background-color: rgb(59 130 246 / 0.15); -} -.dark .text-blue-600 { - color: rgb(96 165 250); -} -.dark .text-blue-700 { - color: rgb(147 197 253); -} - -.dark .bg-purple-50 { - background-color: rgb(168 85 247 / 0.1); -} -.dark .bg-purple-100 { - background-color: rgb(168 85 247 / 0.15); -} -.dark .text-purple-600 { - color: rgb(192 132 252); -} -.dark .text-purple-700 { - color: rgb(216 180 254); -} - -.dark .bg-emerald-50 { - background-color: rgb(16 185 129 / 0.1); -} -.dark .bg-emerald-100 { - background-color: rgb(16 185 129 / 0.15); -} -.dark .text-emerald-600 { - color: rgb(52 211 153); -} -.dark .text-emerald-700 { - color: rgb(110 231 183); -} - -.dark .bg-amber-50 { - background-color: rgb(245 158 11 / 0.1); -} -.dark .bg-amber-100 { - background-color: rgb(245 158 11 / 0.15); -} -.dark .text-amber-600 { - color: rgb(251 191 36); -} -.dark .text-amber-700 { - color: rgb(252 211 77); -} - -.dark .bg-green-50 { - background-color: rgb(34 197 94 / 0.1); -} -.dark .bg-green-100 { - background-color: rgb(34 197 94 / 0.15); -} -.dark .text-green-600 { - color: rgb(74 222 128); -} -.dark .text-green-700 { - color: rgb(134 239 172); -} diff --git a/resources/js/components/BlogCard.vue b/resources/js/components/BlogCard.vue index 086840a..5fde6ea 100644 --- a/resources/js/components/BlogCard.vue +++ b/resources/js/components/BlogCard.vue @@ -1,5 +1,6 @@ diff --git a/resources/js/components/BlogRow.vue b/resources/js/components/BlogRow.vue index 42b7826..8d2cd7a 100644 --- a/resources/js/components/BlogRow.vue +++ b/resources/js/components/BlogRow.vue @@ -1,5 +1,7 @@ diff --git a/resources/js/components/BreadcrumbNav.vue b/resources/js/components/BreadcrumbNav.vue index a373c91..b2bb07f 100644 --- a/resources/js/components/BreadcrumbNav.vue +++ b/resources/js/components/BreadcrumbNav.vue @@ -25,7 +25,7 @@ const breadcrumbs = computed(() => { \ No newline at end of file + + + diff --git a/resources/js/components/NodeRow.vue b/resources/js/components/NodeRow.vue index aff655b..689a81b 100644 --- a/resources/js/components/NodeRow.vue +++ b/resources/js/components/NodeRow.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/NoticeDialog.vue b/resources/js/components/NoticeDialog.vue index 6186fd4..a7d8fde 100644 --- a/resources/js/components/NoticeDialog.vue +++ b/resources/js/components/NoticeDialog.vue @@ -1,4 +1,5 @@ diff --git a/resources/js/components/ResourceRow.vue b/resources/js/components/ResourceRow.vue index 08cccf8..264f214 100644 --- a/resources/js/components/ResourceRow.vue +++ b/resources/js/components/ResourceRow.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/SubjectCard.vue b/resources/js/components/SubjectCard.vue index b862d10..f64e6ff 100644 --- a/resources/js/components/SubjectCard.vue +++ b/resources/js/components/SubjectCard.vue @@ -1,5 +1,6 @@ diff --git a/resources/js/components/ToastNotification.vue b/resources/js/components/ToastNotification.vue index e458e65..b6b8de9 100644 --- a/resources/js/components/ToastNotification.vue +++ b/resources/js/components/ToastNotification.vue @@ -1,40 +1,58 @@ - - diff --git a/resources/js/components/UserCard.vue b/resources/js/components/UserCard.vue index ec43154..c3e5cfe 100644 --- a/resources/js/components/UserCard.vue +++ b/resources/js/components/UserCard.vue @@ -1,4 +1,5 @@ diff --git a/resources/js/components/admin/DesktopSidebar.vue b/resources/js/components/admin/DesktopSidebar.vue index 32ea2d8..4aeb0c8 100644 --- a/resources/js/components/admin/DesktopSidebar.vue +++ b/resources/js/components/admin/DesktopSidebar.vue @@ -1,21 +1,24 @@ @@ -27,76 +30,80 @@ const handleClearCache = () => { Management

-
- - - - - {{ item.name }} - - -
-
+ +
+ + + + + + +
+
+
-
- - + + + -
+ + + + + + + + + +
Internal Dashboard
-
+
+ + +
+

+ Confirm Logout +

+

+ Are you sure you want to log out? +

+
+ Cancel + Confirm +
+
+
+ + +
+

+ Clear Cache +

+

+ Are you sure you want to clear all cache? +

+
+ Cancel + Confirm +
+
+
diff --git a/resources/js/components/admin/MobileSideBar.vue b/resources/js/components/admin/MobileSideBar.vue index aa81223..bf43b35 100644 --- a/resources/js/components/admin/MobileSideBar.vue +++ b/resources/js/components/admin/MobileSideBar.vue @@ -1,85 +1,132 @@ diff --git a/resources/js/components/admin/NodeRow.vue b/resources/js/components/admin/NodeRow.vue index 359fed7..a9eddfb 100644 --- a/resources/js/components/admin/NodeRow.vue +++ b/resources/js/components/admin/NodeRow.vue @@ -1,15 +1,24 @@ @@ -31,15 +40,10 @@ const handleDelete = () => { Edit - +
{
+ + +
+

+ Delete Folder +

+

+ Are you sure you want to delete this Folder? +

+
+ Cancel + Delete +
+
+
diff --git a/resources/js/components/admin/ResourceRow.vue b/resources/js/components/admin/ResourceRow.vue index 6e17042..2ee7a10 100644 --- a/resources/js/components/admin/ResourceRow.vue +++ b/resources/js/components/admin/ResourceRow.vue @@ -1,5 +1,6 @@ @@ -40,15 +50,15 @@ const handleDelete = () => { Edit - +
{
+ + +
+

+ Delete Resource +

+

+ Are you sure you want to delete this Resource? +

+
+ Cancel + Delete +
+
+
diff --git a/resources/js/components/admin/SubjectCard.vue b/resources/js/components/admin/SubjectCard.vue index 4f3f3c6..9032b7f 100644 --- a/resources/js/components/admin/SubjectCard.vue +++ b/resources/js/components/admin/SubjectCard.vue @@ -1,5 +1,6 @@ @@ -57,15 +66,15 @@ const handleDelete = () => { Edit - +
@@ -131,4 +140,22 @@ const handleDelete = () => { {{ subject.course }}
+ + +
+

+ Delete Subject +

+

+ Are you sure you want to delete this Subject? +

+
+ Cancel + Delete +
+
+
diff --git a/resources/js/components/admin/UserRow.vue b/resources/js/components/admin/UserRow.vue index 05de85d..7187069 100644 --- a/resources/js/components/admin/UserRow.vue +++ b/resources/js/components/admin/UserRow.vue @@ -1,6 +1,8 @@ diff --git a/resources/js/layouts/AdminLayout.vue b/resources/js/layouts/AdminLayout.vue index 99fbab9..c9b861b 100644 --- a/resources/js/layouts/AdminLayout.vue +++ b/resources/js/layouts/AdminLayout.vue @@ -1,5 +1,6 @@ diff --git a/resources/js/layouts/AppLayout.vue b/resources/js/layouts/AppLayout.vue index c0639ae..e57d7e6 100644 --- a/resources/js/layouts/AppLayout.vue +++ b/resources/js/layouts/AppLayout.vue @@ -1,36 +1,40 @@ diff --git a/resources/js/pages/Blog/Index.vue b/resources/js/pages/Blog/Index.vue index 06e955e..de7b3dc 100644 --- a/resources/js/pages/Blog/Index.vue +++ b/resources/js/pages/Blog/Index.vue @@ -1,6 +1,7 @@ @@ -40,42 +35,12 @@ const clearSearch = () => {
-
-
-
- -
- - - - -
- - -
+
@@ -99,15 +64,10 @@ const clearSearch = () => { আপনার অনুসন্ধানের সাথে মিল থাকা কোনো আর্টিকেল পাওয়া যায়নি।

- "{{ searchQuery }}"-এর সাথে মিল থাকা কোনো আর্টিকেল পাওয়া - যায়নি। বানান যাচাই করুন অথবা অনুসন্ধান মুছে আবার চেষ্টা করুন। + "{{ search }}"-এর সাথে মিল থাকা কোনো আর্টিকেল পাওয়া যায়নি। + বানান যাচাই করুন অথবা অনুসন্ধান মুছে আবার চেষ্টা করুন।

- + সব আর্টিকেল দেখুন
import { Link, Head } from '@inertiajs/vue3'; +import { kButton } from 'konsta/vue'; import { Calendar, User, Eye, ArrowLeft } from 'lucide-vue-next'; import { computed, ref } from 'vue'; @@ -56,13 +57,10 @@ const copyLink = async () => {
- + Back to journal +
@@ -138,12 +136,7 @@ const copyLink = async () => { community.

- - Join us - + Join us diff --git a/resources/js/pages/ContributorGuide.vue b/resources/js/pages/ContributorGuide.vue index 66316d4..8efa88f 100644 --- a/resources/js/pages/ContributorGuide.vue +++ b/resources/js/pages/ContributorGuide.vue @@ -1,5 +1,6 @@ diff --git a/resources/js/pages/admin/NodeCreateOrEdit.vue b/resources/js/pages/admin/NodeCreateOrEdit.vue index 454e2ee..2b3a8d3 100644 --- a/resources/js/pages/admin/NodeCreateOrEdit.vue +++ b/resources/js/pages/admin/NodeCreateOrEdit.vue @@ -1,5 +1,6 @@ diff --git a/resources/js/pages/ai/Index.vue b/resources/js/pages/ai/Index.vue index c4d1f0c..3318955 100644 --- a/resources/js/pages/ai/Index.vue +++ b/resources/js/pages/ai/Index.vue @@ -1,5 +1,6 @@