Skip to content

Commit

Permalink
Merge pull request #22 from php-kchat/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
GaneshKandu authored May 13, 2023
2 parents d6ee83a + b2696df commit db282ec
Show file tree
Hide file tree
Showing 25 changed files with 448 additions and 213 deletions.
3 changes: 3 additions & 0 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
74 changes: 74 additions & 0 deletions lang/en/lang.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/

'all-your-total-message' => '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',
];
40 changes: 40 additions & 0 deletions lang/en/login.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/

'lang00000' => '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',

];
75 changes: 75 additions & 0 deletions lang/hi/lang.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/

'all-your-total-message' => 'आपके सभी संदेश',
'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' => 'पासवर्ड बदलें',
'are-you-sure-you-want-to-delete-activities' => 'Are you sure you want to delete <strong>Activities</strong>',
];
40 changes: 40 additions & 0 deletions lang/hi/login.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/

'lang00000' => 'साइन इन करें',
'lang00001' => 'नीचे दिए गए फ़ॉर्म का उपयोग करके साइन इन करें',
'lang00002' => 'ईमेल',
'lang00003' => 'पासवर्ड',
'lang00004' => 'मुझे याद रखें',
'lang00005' => 'साइन ऑन करें',
'lang00006' => 'लॉग इन करें',
'lang00007' => 'कोई अकाउंट नहीं है',
'lang00008' => 'रजिस्ट्रेशन करने में एक मिनट से भी कम समय लगता है लेकिन इससे आपको अपने ऑर्डरों पर पूर्ण नियंत्रण मिलता है।',
'lang00009' => 'पहला नाम',
'lang00010' => 'कृपया पहला नाम दर्ज करें',
'lang00011' => 'ईमेल पता',
'lang00012' => 'फ़ोन नंबर',
'lang00013' => 'पासवर्ड',
'lang00014' => 'पासवर्ड की पुष्टि कीजिए',
'lang00015' => 'पहले से ही अकाउंट है',
'lang00016' => 'अंतिम नाम',
'lang00017' => 'कृपया अंतिम नाम दर्ज करें',
'lang00018' => 'कृपया वैध ईमेल पता दर्ज करें!',
'lang00019' => 'कृपया अपना फ़ोन नंबर दर्ज करें!',
'lang00020' => 'कृपया पासवर्ड दर्ज करें!',
'lang00021' => 'पासवर्ड मेल नहीं खाते!',
'lang00022' => 'पहले से ही अकाउंट है',

];
10 changes: 5 additions & 5 deletions resources/views/admin/activities.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
<div class="col-md-10 pt-3">
<div class="card shadow-sm rounded bg-white mb-3">
<div class="card-header border-bottom p-3">
<h6 class="m-0 float-left">Activitie's</h6>
<h6 class="m-0 float-left">{{ __("lang.activities") }}</h6>
<div class="btn-group float-right">
<button type="button" class="btn btn-sm rounded" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="mdi mdi-dots-vertical"></i>
</button>
<div class="dropdown-menu dropdown-menu-right">
<button class="dropdown-item" type="button" onclick="delete_activity()"></i> Delete</button>
<button class="dropdown-item" type="button" onclick="SelectAll()"></i> Select All</button>
<button class="dropdown-item" type="button" onclick="delete_activity()"></i> {{ __("lang.delete") }}</button>
<button class="dropdown-item" type="button" onclick="SelectAll()"></i> {{ __("lang.select-all") }}</button>
</div>
</div>
<select class="pages float-right mr-3">
Expand Down Expand Up @@ -51,7 +51,7 @@
</button>
<div class="dropdown-menu dropdown-menu-right">
<input type="hidden" class="act{{ $info->id }}" id="id" value="{{ $info->id }}" />
<button class="dropdown-item" type="button" ajax_post data-msg="Are you sure you want to delete activities?" action="/activity/delete" form="act{{ $info->id }}" ><i class="mdi mdi-delete"></i> Delete</button>
<button class="dropdown-item" type="button" ajax_post data-msg="Are you sure you want to delete activities?" action="/activity/delete" form="act{{ $info->id }}" ><i class="mdi mdi-delete"></i> {{ __("lang.delete") }}</button>
</div>
</div>
<br />
Expand All @@ -67,7 +67,7 @@
@section('script')
<script>
function delete_activity(){
kchat_alert("Are you sure you want to delete <strong>Activities</strong>?",(function(){__post('/activity/delete',{'ids':getSelectedID()});}));
kchat_alert("{{ __("lang.are-you-sure-you-want-to-delete-activities") }}",(function(){__post('/activity/delete',{'ids':getSelectedID()});}));
}
</script>
@endsection
14 changes: 7 additions & 7 deletions resources/views/admin/conversations.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@extends('admin.master')

@section('title', 'Conversations\'s')
@section('title', __("lang.conversations"))

@section('header')
<link href="css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -38,8 +38,8 @@
</svg>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" onclick="SelectAll()" >Select All</a>
<a class="dropdown-item" onclick="delete_convos()" >Delete</a>
<a class="dropdown-item" onclick="SelectAll()" >{{ __("lang.select-all") }}</a>
<a class="dropdown-item" onclick="delete_convos()" >{{ __("lang.delete") }}</a>
</div>
</div>
</th>
Expand All @@ -48,10 +48,10 @@
<thead>
<tr>
<th>#</th>
<th>Name</th>
<th>Members</th>
<th>{{ __("lang.name") }}</th>
<th>{{ __("lang.members") }}</th>
<th>Created at</th>
<th>Action</th>
<th>{{ __("lang.action") }}</th>
</tr>
</thead>
<tbody id="member_table" >
Expand All @@ -71,7 +71,7 @@
</svg>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-convoid="{{ $conversation->id }}" onclick="delete_convo({{ $conversation->id }});" >Delete</a>
<a class="dropdown-item" data-convoid="{{ $conversation->id }}" onclick="delete_convo({{ $conversation->id }});" >{{ __("lang.delete") }}</a>
</div>
</div>
</td>
Expand Down
Loading

0 comments on commit db282ec

Please sign in to comment.