From 89692b203e26c4d334db67a41170aa85039dbbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ganesh=20Kandu=20=28=20=E0=A4=97=E0=A4=A3=E0=A5=87?= =?UTF-8?q?=E0=A4=B6=20=E0=A4=95=E0=A4=BE=E0=A4=82=E0=A4=A6=E0=A5=81=20=29?= Date: Tue, 9 May 2023 22:32:38 +0530 Subject: [PATCH 1/3] debugger added permission issue in file upload fixed --- app/Http/Controllers/UserController.php | 3 +++ composer.json | 1 + storage/debugbar/.gitignore | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 storage/debugbar/.gitignore diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index d59fbf4..786a3a4 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -318,6 +318,9 @@ function SaveProfile(Request $request){ $file = $request->file('photo'); if(!empty($file)){ + if(!is_writable(public_path('/images'))){ + return json_encode(["error" => public_path('/images')." don't exist or don't have permission."]); + } $image_path = $file->getClientOriginalName(); $path = '/images/' . $image_path; $file->move(public_path('/images'), $image_path); diff --git a/composer.json b/composer.json index 67670ff..b1eda46 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ "laravel/tinker": "^2.7" }, "require-dev": { + "barryvdh/laravel-debugbar": "^3.8", "fakerphp/faker": "^1.9.1", "laravel/pint": "^1.0", "laravel/sail": "^1.0.1", diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/storage/debugbar/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From 0296b33083d9338c72507a4399503e0690316e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ganesh=20Kandu=20=28=20=E0=A4=97=E0=A4=A3=E0=A5=87?= =?UTF-8?q?=E0=A4=B6=20=E0=A4=95=E0=A4=BE=E0=A4=82=E0=A4=A6=E0=A5=81=20=29?= Date: Thu, 11 May 2023 22:44:12 +0530 Subject: [PATCH 2/3] adding languages --- lang/en/lang.php | 74 +++++++++++++++++++ lang/en/login.php | 40 ++++++++++ lang/hi/lang.php | 74 +++++++++++++++++++ lang/hi/login.php | 40 ++++++++++ resources/views/admin/activities.blade.php | 8 +- resources/views/admin/conversations.blade.php | 14 ++-- resources/views/admin/dashboard.blade.php | 24 +++--- resources/views/admin/master.blade.php | 22 +++--- resources/views/admin/members.blade.php | 60 +++++++-------- resources/views/admin/notifications.blade.php | 12 +-- resources/views/admin/profile.blade.php | 20 ++--- resources/views/admin/settings.blade.php | 28 +++---- resources/views/common/msg.blade.php | 30 ++++---- resources/views/login.blade.php | 21 +++--- resources/views/signon.blade.php | 34 ++++----- resources/views/user/activities.blade.php | 8 +- resources/views/user/conversations.blade.php | 14 ++-- resources/views/user/dashboard.blade.php | 10 +-- resources/views/user/master.blade.php | 20 ++--- resources/views/user/members.blade.php | 44 +++++------ resources/views/user/notifications.blade.php | 12 +-- resources/views/user/profile.blade.php | 21 +++--- 22 files changed, 429 insertions(+), 201 deletions(-) create mode 100644 lang/en/lang.php create mode 100644 lang/en/login.php create mode 100644 lang/hi/lang.php create mode 100644 lang/hi/login.php diff --git a/lang/en/lang.php b/lang/en/lang.php new file mode 100644 index 0000000..148f826 --- /dev/null +++ b/lang/en/lang.php @@ -0,0 +1,74 @@ + 'All your total Message', + 'all-your-total-conversations' => 'All your total Conversations', + 'this-month' => 'This Month', + 'total-users' => 'Total User\'s', + 'total-messages' => 'Total Message\'s', + 'total-conversations' => 'Total conversation\'s', + 'average-messages-per-user' => 'Average message\'s per user', + 'all-messages-per-day' => 'All message\'s per day', + 'all-users-per-day' => 'All user\'s per day', + 'all-conversations-per-day' => 'All conversation\'s per day', + 'all-your-messages-per-day' => 'All your message\'s per day', + 'all-your-conversations-per-day' => 'All your conversation\'s per day', + 'dashboard' => 'Dashboard', + 'messages' => 'Messages', + 'members' => 'Member\'s', + 'conversations' => 'Conversations', + 'settings' => 'Settings', + 'notification' => 'Notification', + 'activity' => 'Activity', + 'profile' => 'Profile', + 'logout' => 'Logout', + 'close' => 'Close', + 'last-created' => 'Last Created', + 'update-group' => 'Update Group', + 'whiteboard' => 'WhiteBoard', + 'send' => 'Send', + 'search-conversation' => 'Search Conversation', + 'name' => 'Name', + 'departement' => 'Departement', + 'email' => 'Email', + 'status' => 'Status', + 'search-using-mail' => 'Search using mail', + 'about-me' => 'About me', + 'created-at' => 'Created At', + 'updated-at' => 'Updated At', + 'select-all' => 'Select All', + 'delete' => 'Delete', + 'set-inactive' => 'Set Inactive', + 'set-active' => 'Set active', + 'block' => 'Block', + 'unblock' => 'UnBlock', + 'make-admin' => 'Make Admin', + 'revoke-admin-power' => 'Revoke Admin Power', + 'create-new-conversation' => 'Create New Conversation', + 'action' => 'Action', + 'departments' => 'Department\'s', + 'add-and-delete-department' => 'Add and Delete Department', + 'add-department' => 'Add Department', + 'department' => 'Department', + 'delete-department' => 'Delete Department', + 'timezone' => 'Timezone', + 'update-timezone' => 'Update Timezone', + 'file-upload-path' => 'File Upload Path', + 'place-it-outside-the-webroot-means-that-the-files-will-not-be-publicly-exposed' => 'Place it outside the webroot means that the files will not be publicly exposed.', + 'notifications' => 'Notification\'s', + 'activities' => 'Activitie\'s', + 'superadmin' => 'SuperAdmin', + 'change-password' => 'Change Password', +]; diff --git a/lang/en/login.php b/lang/en/login.php new file mode 100644 index 0000000..811ab6b --- /dev/null +++ b/lang/en/login.php @@ -0,0 +1,40 @@ + 'Sign in', + 'lang00001' => 'Sign in using form below', + 'lang00002' => 'Email', + 'lang00003' => 'Password', + 'lang00004' => 'Remember me', + 'lang00005' => 'Sign On', + 'lang00006' => 'Login', + 'lang00007' => 'No account', + 'lang00008' => 'Registration takes less than a minute but gives you full control over your orders.', + 'lang00009' => 'First Name', + 'lang00010' => 'Please enter first name', + 'lang00011' => 'E-mail Address', + 'lang00012' => 'Phone Number', + 'lang00013' => 'Password', + 'lang00014' => 'Confirm Password', + 'lang00015' => 'Already have account', + 'lang00016' => 'Last Name', + 'lang00017' => 'Please enter last Name', + 'lang00018' => 'Please enter valid email address!', + 'lang00019' => 'Please enter your phone number!', + 'lang00020' => 'Please enter password!', + 'lang00021' => 'Passwords do not match!', + 'lang00022' => 'Already have account', + +]; diff --git a/lang/hi/lang.php b/lang/hi/lang.php new file mode 100644 index 0000000..d609c64 --- /dev/null +++ b/lang/hi/lang.php @@ -0,0 +1,74 @@ + 'आपके सभी संदेश', + 'all-your-total-conversations' => 'आपके सभी वार्तालाप', + 'this-month' => 'इस महीने', + 'total-users' => 'कुल उपयोगकर्ता', + 'total-messages' => 'कुल संदेश', + 'total-conversations' => 'कुल वार्तालाप', + 'average-messages-per-user' => 'प्रति उपयोगकर्ता औसत संदेश', + 'all-messages-per-day' => 'प्रतिदिन कुल संदेश', + 'all-users-per-day' => 'प्रतिदिन सभी उपयोगकर्ता', + 'all-conversations-per-day' => 'प्रतिदिन सभी वार्तालाप', + 'all-your-messages-per-day' => 'प्रतिदिन आपके सभी संदेश', + 'all-your-conversations-per-day' => 'प्रतिदिन आपके सभी वार्तालाप', + 'dashboard' => 'डैशबोर्ड', + 'messages' => 'संदेश', + 'members' => 'सदस्यों', + 'conversations' => 'वार्तालाप', + 'settings' => 'सेटिंग्स', + 'notification' => 'अधिसूचना', + 'activity' => 'गतिविधि', + 'profile' => 'प्रोफ़ाइल', + 'logout' => 'लॉगआउट', + 'close' => 'बंद करे', + 'last-created' => 'अंतिम बनाया गया', + 'update-group' => 'ग्रुप अपडेट करें', + 'whiteboard' => 'सफेद बोर्ड', + 'send' => 'भेजें', + 'search-conversation' => 'वार्तालाप खोजें', + 'name' => 'नाम', + 'departement' => 'विभाग', + 'email' => 'ईमेल', + 'status' => 'स्थिति', + 'search-using-mail' => 'मेल का उपयोग करके खोजें', + 'about-me' => 'मेरे बारे में', + 'created-at' => 'बनाया गया', + 'updated-at' => 'अपडेट किया गया', + 'select-all' => 'सभी का चयन करें', + 'delete' => 'हटाएँ', + 'set-inactive' => 'निष्क्रिय करें', + 'set-active' => 'सक्रिय करें', + 'block' => 'अवरोधित करें', + 'unblock' => 'अवरोध हटाएँ', + 'make-admin' => 'व्यवस्थापक बनाएँ', + 'revoke-admin-power' => 'व्यवस्थापक अधिकार रद्द करें', + 'create-new-conversation' => 'नई बातचीत बनाएँ', + 'action' => 'कार्यवाही', + 'departments' => 'विभागों', + 'add-and-delete-department' => 'विभाग जोड़ें और हटाएँ', + 'add-department' => 'विभाग जोड़ें', + 'department' => 'विभाग', + 'delete-department' => 'विभाग हटाएँ', + 'timezone' => 'समय क्षेत्र', + 'update-timezone' => 'समय क्षेत्र अपडेट करें', + 'file-upload-path' => 'फ़ाइल अपलोड पथ', + 'place-it-outside-the-webroot-means-that-the-files-will-not-be-publicly-exposed' => 'इसे वेबरूट के बाहर रखना यह मान लें कि फ़ाइलें सार्वजनिक रूप से प्रकट नहीं होंगी।', + 'notifications' => 'सूचनाएं', + 'activities' => 'गतिविधियां', + 'superadmin' => 'सुपर व्यवस्थापक', + 'change-password' => 'पासवर्ड बदलें' +]; diff --git a/lang/hi/login.php b/lang/hi/login.php new file mode 100644 index 0000000..c79ed5b --- /dev/null +++ b/lang/hi/login.php @@ -0,0 +1,40 @@ + 'साइन इन करें', + 'lang00001' => 'नीचे दिए गए फ़ॉर्म का उपयोग करके साइन इन करें', + 'lang00002' => 'ईमेल', + 'lang00003' => 'पासवर्ड', + 'lang00004' => 'मुझे याद रखें', + 'lang00005' => 'साइन ऑन करें', + 'lang00006' => 'लॉग इन करें', + 'lang00007' => 'कोई अकाउंट नहीं है', + 'lang00008' => 'रजिस्ट्रेशन करने में एक मिनट से भी कम समय लगता है लेकिन इससे आपको अपने ऑर्डरों पर पूर्ण नियंत्रण मिलता है।', + 'lang00009' => 'पहला नाम', + 'lang00010' => 'कृपया पहला नाम दर्ज करें', + 'lang00011' => 'ईमेल पता', + 'lang00012' => 'फ़ोन नंबर', + 'lang00013' => 'पासवर्ड', + 'lang00014' => 'पासवर्ड की पुष्टि कीजिए', + 'lang00015' => 'पहले से ही अकाउंट है', + 'lang00016' => 'अंतिम नाम', + 'lang00017' => 'कृपया अंतिम नाम दर्ज करें', + 'lang00018' => 'कृपया वैध ईमेल पता दर्ज करें!', + 'lang00019' => 'कृपया अपना फ़ोन नंबर दर्ज करें!', + 'lang00020' => 'कृपया पासवर्ड दर्ज करें!', + 'lang00021' => 'पासवर्ड मेल नहीं खाते!', + 'lang00022' => 'पहले से ही अकाउंट है', + +]; diff --git a/resources/views/admin/activities.blade.php b/resources/views/admin/activities.blade.php index 32e6ea2..cabc54a 100644 --- a/resources/views/admin/activities.blade.php +++ b/resources/views/admin/activities.blade.php @@ -16,14 +16,14 @@
-
Activitie's
+
{{ __("lang.activities") }}
- - + +
- +

diff --git a/resources/views/admin/conversations.blade.php b/resources/views/admin/conversations.blade.php index 22f23c4..7d76c75 100644 --- a/resources/views/admin/conversations.blade.php +++ b/resources/views/admin/conversations.blade.php @@ -1,6 +1,6 @@ @extends('admin.master') -@section('title', 'Conversations\'s') +@section('title', __("lang.conversations")) @section('header') @@ -38,8 +38,8 @@
- Select All - Delete + {{ __("lang.select-all") }} + {{ __("lang.delete") }}
@@ -48,10 +48,10 @@ # - Name - Members + {{ __("lang.name") }} + {{ __("lang.members") }} Created at - Action + {{ __("lang.action") }} @@ -71,7 +71,7 @@
- Delete + {{ __("lang.delete") }}
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index d4a37a0..235b3e5 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -1,6 +1,6 @@ @extends('admin.master') -@section('title', 'Dashboard') +@section('title', __("lang.dashboard")) @section('header') @@ -21,52 +21,52 @@
-
All your total Message
+
{{ __("lang.all-your-total-message") }}

{{ $current_user_messages_count }}

-

This Month{{ $current_user_messages_count_this_month }}

+

{{ __("lang.this-month") }}{{ $current_user_messages_count_this_month }}

-
All your total Conversations
+
{{ __("lang.all-your-total-conversations") }}

{{ $current_user_conversations_count }}

-

This Month{{ $current_user_new_conversations_this_month }}

+

{{ __("lang.this-month") }}{{ $current_user_new_conversations_this_month }}

-
Total User's
+
{{ __("lang.total-users") }}

{{ $users_count }}

-

This Month{{ $new_users_this_month }}

+

{{ __("lang.this-month") }}{{ $new_users_this_month }}

-
Total Message's
+
{{ __("lang.total-messages") }}

{{ $messages_count }}

-

This Month{{ $new_messages_this_month }}

+

{{ __("lang.this-month") }}{{ $new_messages_this_month }}

-
Total conversation's
+
{{ __("lang.total-conversations") }}

{{ $conversations_count }}

-

This Month{{ $new_conversations_this_month }}

+

{{ __("lang.this-month") }}{{ $new_conversations_this_month }}

-
Average message's per user
+
{{ __("lang.average-messages-per-user") }}

{{ $average_messages_peruser }}

diff --git a/resources/views/admin/master.blade.php b/resources/views/admin/master.blade.php index 61de420..4543a5e 100644 --- a/resources/views/admin/master.blade.php +++ b/resources/views/admin/master.blade.php @@ -22,41 +22,41 @@
  • - Dashboard + {{ __("lang.dashboard") }}
  • - Messages + {{ __("lang.messages") }}
  • - Members + {{ __("lang.members") }}
  • - Conversations + {{ __("lang.conversations") }}
  • - Settings + {{ __("lang.settings") }}
  • - Notification + {{ __("lang.notification") }} {{ $status['notification'] }}
  • - Activity + {{ __("lang.activity") }}
  • - Profile + {{ __("lang.profile") }}
  • - Logout + {{ __("lang.logout") }}
    • @@ -73,14 +73,14 @@
    Alert
    -

    - +
    diff --git a/resources/views/admin/members.blade.php b/resources/views/admin/members.blade.php index 448ca45..cab17e3 100644 --- a/resources/views/admin/members.blade.php +++ b/resources/views/admin/members.blade.php @@ -30,19 +30,19 @@
    - Select All - Delete - Set Inactive + {{ __("lang.select-all") }} + {{ __("lang.delete") }} + {{ __("lang.set-inactive") }} Set Active - Block - UnBlock - Make Admin - Revoke Admin Power - Create New Conversation + {{ __("lang.block") }} + {{ __("lang.unblock") }} + {{ __("lang.make-admin") }} + {{ __("lang.revoke-admin-power") }} + {{ __("lang.create-new-conversation") }}
    -
    Member's
    +
    {{ __("lang.members") }}