diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG.md similarity index 86% rename from CHANGELOG for v1.x.x.md rename to CHANGELOG.md index 88bfbd2..c1e8184 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ +## **v1.0.1 (25th of September 2024)** + +* #47 [fixed] If the admin is clicking on the google icon then the app locale is getting changes automatically. + +* #26 [fixed] There is no option to give permission for google calendar. + ## **v1.0.0 (19th of November 2021)** - *First Release* -* [feature] Admin user can connect to their google account. +* [feature] Admin user can connect to their google account. * [feature] User can fetch all events from selected calendars diff --git a/src/Http/routes.php b/src/Http/routes.php index 89161f3..26c302c 100644 --- a/src/Http/routes.php +++ b/src/Http/routes.php @@ -1,22 +1,24 @@ 'admin/google', - 'namespace' => 'Webkul\Google\Http\Controllers', - 'middleware' => ['web'] -], function () { - - Route::group(['middleware' => ['user']], function () { - Route::get('', 'AccountController@index')->name('admin.google.index'); - Route::get('oauth', 'AccountController@store')->name('admin.google.store'); +use Illuminate\Support\Facades\Route; - Route::delete('{id}', 'AccountController@destroy')->name('admin.google.destroy'); +Route::group(['middleware' => ['web', 'admin_locale']], function () { + Route::group([ + 'prefix' => 'admin/google', + 'namespace' => 'Webkul\Google\Http\Controllers', + ], function () { + Route::group(['middleware' => ['user']], function () { + Route::get('', 'AccountController@index')->name('admin.google.index'); - Route::post('sync/{id}', 'CalendarController@sync')->name('admin.google.calendar.sync'); + Route::get('oauth', 'AccountController@store')->name('admin.google.store'); - Route::post('create-link', 'MeetController@createLink')->name('admin.google.meet.create_link'); - }); + Route::delete('{id}', 'AccountController@destroy')->name('admin.google.destroy'); + + Route::post('sync/{id}', 'CalendarController@sync')->name('admin.google.calendar.sync'); - Route::post('webhook', 'WebhookController')->name('admin.google.webhook'); + Route::post('create-link', 'MeetController@createLink')->name('admin.google.meet.create_link'); + }); -}); \ No newline at end of file + Route::post('webhook', 'WebhookController')->name('admin.google.webhook'); + }); +}); diff --git a/src/Resources/lang/en/app.php b/src/Resources/lang/en/app.php index ceb2cda..6d1c07f 100644 --- a/src/Resources/lang/en/app.php +++ b/src/Resources/lang/en/app.php @@ -22,4 +22,4 @@ 'destroy-success' => 'Google account removed successfully.', 'save-sync' => 'Save and Sync', 'confirm-remove' => 'Are you sure you want to remove google account ?' -]; \ No newline at end of file +];