Skip to content

Commit

Permalink
Merge pull request #52 from suraj-webkul/issue#47
Browse files Browse the repository at this point in the history
Issue #47 fixed
  • Loading branch information
devansh-webkul authored Sep 25, 2024
2 parents 2bcb050 + 9739874 commit c39145b
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 17 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG for v1.x.x.md → CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
32 changes: 17 additions & 15 deletions src/Http/routes.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
<?php
Route::group([
'prefix' => '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');
});

});
Route::post('webhook', 'WebhookController')->name('admin.google.webhook');
});
});
2 changes: 1 addition & 1 deletion src/Resources/lang/en/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?'
];
];

0 comments on commit c39145b

Please sign in to comment.