Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #47 fixed #52

Merged
merged 5 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 ?'
];
];