Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
497ab143
Commit
497ab143
authored
May 27, 2018
by
huy.dang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix route:cache issue
parent
6a34661b
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
57 additions
and
52 deletions
+57
-52
RoutingServiceProvider.php
Modules/Core/Providers/RoutingServiceProvider.php
+11
-9
backendRoutes.php
Modules/Media/Http/backendRoutes.php
+0
-4
MediaServiceProvider.php
Modules/Media/Providers/MediaServiceProvider.php
+4
-0
backendRoutes.php
Modules/Menu/Http/backendRoutes.php
+0
-7
MenuServiceProvider.php
Modules/Menu/Providers/MenuServiceProvider.php
+7
-0
backendRoutes.php
Modules/Page/Http/backendRoutes.php
+0
-4
frontendRoutes.php
Modules/Page/Http/frontendRoutes.php
+10
-12
PageServiceProvider.php
Modules/Page/Providers/PageServiceProvider.php
+4
-0
backendRoutes.php
Modules/Tag/Http/backendRoutes.php
+0
-3
TagServiceProvider.php
Modules/Tag/Providers/TagServiceProvider.php
+4
-0
backendRoutes.php
Modules/Translation/Http/backendRoutes.php
+0
-3
TranslationServiceProvider.php
Modules/Translation/Providers/TranslationServiceProvider.php
+5
-0
backendRoutes.php
Modules/User/Http/backendRoutes.php
+0
-3
UserServiceProvider.php
Modules/User/Providers/UserServiceProvider.php
+4
-0
backendRoutes.php
Modules/Workshop/Http/backendRoutes.php
+0
-7
WorkshopServiceProvider.php
Modules/Workshop/Providers/WorkshopServiceProvider.php
+8
-0
No files found.
Modules/Core/Providers/RoutingServiceProvider.php
View file @
497ab143
...
@@ -4,7 +4,6 @@ namespace Modules\Core\Providers;
...
@@ -4,7 +4,6 @@ namespace Modules\Core\Providers;
use
Illuminate\Foundation\Support\Providers\RouteServiceProvider
as
ServiceProvider
;
use
Illuminate\Foundation\Support\Providers\RouteServiceProvider
as
ServiceProvider
;
use
Illuminate\Routing\Router
;
use
Illuminate\Routing\Router
;
use
Mcamara\LaravelLocalization\Facades\LaravelLocalization
;
abstract
class
RoutingServiceProvider
extends
ServiceProvider
abstract
class
RoutingServiceProvider
extends
ServiceProvider
{
{
...
@@ -52,14 +51,17 @@ abstract class RoutingServiceProvider extends ServiceProvider
...
@@ -52,14 +51,17 @@ abstract class RoutingServiceProvider extends ServiceProvider
$this
->
loadApiRoutes
(
$router
);
$this
->
loadApiRoutes
(
$router
);
});
});
$router
->
group
([
$prefixes
=
array_merge
(
json_decode
(
setting
(
'core::locales'
)),
[
''
]);
'namespace'
=>
$this
->
namespace
,
foreach
(
$prefixes
as
$prefix
)
{
'prefix'
=>
LaravelLocalization
::
setLocale
(),
$router
->
group
([
'middleware'
=>
[
'localizationRedirect'
,
'web'
],
'namespace'
=>
$this
->
namespace
,
],
function
(
Router
$router
)
{
'prefix'
=>
$prefix
,
$this
->
loadBackendRoutes
(
$router
);
'middleware'
=>
[
'localizationRedirect'
,
'web'
],
$this
->
loadFrontendRoutes
(
$router
);
],
function
(
Router
$router
)
{
});
$this
->
loadBackendRoutes
(
$router
);
$this
->
loadFrontendRoutes
(
$router
);
});
}
}
}
/**
/**
...
...
Modules/Media/Http/backendRoutes.php
View file @
497ab143
...
@@ -3,10 +3,6 @@
...
@@ -3,10 +3,6 @@
use
Illuminate\Routing\Router
;
use
Illuminate\Routing\Router
;
/** @var Router $router */
/** @var Router $router */
$router
->
bind
(
'media'
,
function
(
$id
)
{
return
app
(
\Modules\Media\Repositories\FileRepository
::
class
)
->
find
(
$id
);
});
$router
->
group
([
'prefix'
=>
'/media'
],
function
(
Router
$router
)
{
$router
->
group
([
'prefix'
=>
'/media'
],
function
(
Router
$router
)
{
$router
->
get
(
'media'
,
[
$router
->
get
(
'media'
,
[
'as'
=>
'admin.media.media.index'
,
'as'
=>
'admin.media.media.index'
,
...
...
Modules/Media/Providers/MediaServiceProvider.php
View file @
497ab143
...
@@ -58,6 +58,10 @@ class MediaServiceProvider extends ServiceProvider
...
@@ -58,6 +58,10 @@ class MediaServiceProvider extends ServiceProvider
BuildingSidebar
::
class
,
BuildingSidebar
::
class
,
$this
->
getSidebarClassForModule
(
'media'
,
RegisterMediaSidebar
::
class
)
$this
->
getSidebarClassForModule
(
'media'
,
RegisterMediaSidebar
::
class
)
);
);
app
(
'router'
)
->
bind
(
'media'
,
function
(
$id
)
{
return
app
(
FileRepository
::
class
)
->
find
(
$id
);
});
}
}
public
function
boot
(
DispatcherContract
$events
)
public
function
boot
(
DispatcherContract
$events
)
...
...
Modules/Menu/Http/backendRoutes.php
View file @
497ab143
...
@@ -3,13 +3,6 @@
...
@@ -3,13 +3,6 @@
use
Illuminate\Routing\Router
;
use
Illuminate\Routing\Router
;
/** @var Router $router */
/** @var Router $router */
$router
->
bind
(
'menu'
,
function
(
$id
)
{
return
app
(
\Modules\Menu\Repositories\MenuRepository
::
class
)
->
find
(
$id
);
});
$router
->
bind
(
'menuitem'
,
function
(
$id
)
{
return
app
(
\Modules\Menu\Repositories\MenuItemRepository
::
class
)
->
find
(
$id
);
});
$router
->
group
([
'prefix'
=>
'/menu'
],
function
(
Router
$router
)
{
$router
->
group
([
'prefix'
=>
'/menu'
],
function
(
Router
$router
)
{
$router
->
get
(
'menus'
,
[
$router
->
get
(
'menus'
,
[
'as'
=>
'admin.menu.menu.index'
,
'as'
=>
'admin.menu.menu.index'
,
...
...
Modules/Menu/Providers/MenuServiceProvider.php
View file @
497ab143
...
@@ -47,6 +47,13 @@ class MenuServiceProvider extends ServiceProvider
...
@@ -47,6 +47,13 @@ class MenuServiceProvider extends ServiceProvider
BuildingSidebar
::
class
,
BuildingSidebar
::
class
,
$this
->
getSidebarClassForModule
(
'menu'
,
RegisterMenuSidebar
::
class
)
$this
->
getSidebarClassForModule
(
'menu'
,
RegisterMenuSidebar
::
class
)
);
);
app
(
'router'
)
->
bind
(
'menu'
,
function
(
$id
)
{
return
app
(
MenuRepository
::
class
)
->
find
(
$id
);
});
app
(
'router'
)
->
bind
(
'menuitem'
,
function
(
$id
)
{
return
app
(
MenuItemRepository
::
class
)
->
find
(
$id
);
});
}
}
/**
/**
...
...
Modules/Page/Http/backendRoutes.php
View file @
497ab143
...
@@ -3,10 +3,6 @@
...
@@ -3,10 +3,6 @@
use
Illuminate\Routing\Router
;
use
Illuminate\Routing\Router
;
/** @var Router $router */
/** @var Router $router */
$router
->
bind
(
'page'
,
function
(
$id
)
{
return
app
(
\Modules\Page\Repositories\PageRepository
::
class
)
->
find
(
$id
);
});
$router
->
group
([
'prefix'
=>
'/page'
],
function
(
Router
$router
)
{
$router
->
group
([
'prefix'
=>
'/page'
],
function
(
Router
$router
)
{
$router
->
get
(
'pages'
,
[
$router
->
get
(
'pages'
,
[
'as'
=>
'admin.page.page.index'
,
'as'
=>
'admin.page.page.index'
,
...
...
Modules/Page/Http/frontendRoutes.php
View file @
497ab143
...
@@ -3,15 +3,13 @@
...
@@ -3,15 +3,13 @@
use
Illuminate\Routing\Router
;
use
Illuminate\Routing\Router
;
/** @var Router $router */
/** @var Router $router */
if
(
!
App
::
runningInConsole
())
{
$router
->
get
(
'/'
,
[
$router
->
get
(
'/'
,
[
'uses'
=>
'PublicController@homepage'
,
'uses'
=>
'PublicController@homepage'
,
'as'
=>
'homepage'
,
'as'
=>
'homepage'
,
'middleware'
=>
config
(
'asgard.page.config.middleware'
),
'middleware'
=>
config
(
'asgard.page.config.middleware'
),
]);
]);
$router
->
any
(
'{uri}'
,
[
$router
->
any
(
'{uri}'
,
[
'uses'
=>
'PublicController@uri'
,
'uses'
=>
'PublicController@uri'
,
'as'
=>
'page'
,
'as'
=>
'page'
,
'middleware'
=>
config
(
'asgard.page.config.middleware'
),
'middleware'
=>
config
(
'asgard.page.config.middleware'
),
])
->
where
(
'uri'
,
'.*'
);
])
->
where
(
'uri'
,
'.*'
);
}
Modules/Page/Providers/PageServiceProvider.php
View file @
497ab143
...
@@ -39,6 +39,10 @@ class PageServiceProvider extends ServiceProvider
...
@@ -39,6 +39,10 @@ class PageServiceProvider extends ServiceProvider
BuildingSidebar
::
class
,
BuildingSidebar
::
class
,
$this
->
getSidebarClassForModule
(
'page'
,
RegisterPageSidebar
::
class
)
$this
->
getSidebarClassForModule
(
'page'
,
RegisterPageSidebar
::
class
)
);
);
app
(
'router'
)
->
bind
(
'page'
,
function
(
$id
)
{
return
app
(
PageRepository
::
class
)
->
find
(
$id
);
});
}
}
public
function
boot
()
public
function
boot
()
...
...
Modules/Tag/Http/backendRoutes.php
View file @
497ab143
...
@@ -4,9 +4,6 @@ use Illuminate\Routing\Router;
...
@@ -4,9 +4,6 @@ use Illuminate\Routing\Router;
/** @var Router $router */
/** @var Router $router */
$router
->
group
([
'prefix'
=>
'tag'
],
function
(
Router
$router
)
{
$router
->
group
([
'prefix'
=>
'tag'
],
function
(
Router
$router
)
{
$router
->
bind
(
'tag__tag'
,
function
(
$id
)
{
return
app
(
\Modules\Tag\Repositories\TagRepository
::
class
)
->
find
(
$id
);
});
$router
->
get
(
'tags'
,
[
$router
->
get
(
'tags'
,
[
'as'
=>
'admin.tag.tag.index'
,
'as'
=>
'admin.tag.tag.index'
,
'uses'
=>
'TagController@index'
,
'uses'
=>
'TagController@index'
,
...
...
Modules/Tag/Providers/TagServiceProvider.php
View file @
497ab143
...
@@ -41,6 +41,10 @@ class TagServiceProvider extends ServiceProvider
...
@@ -41,6 +41,10 @@ class TagServiceProvider extends ServiceProvider
BuildingSidebar
::
class
,
BuildingSidebar
::
class
,
$this
->
getSidebarClassForModule
(
'tag'
,
RegisterTagSidebar
::
class
)
$this
->
getSidebarClassForModule
(
'tag'
,
RegisterTagSidebar
::
class
)
);
);
app
(
'router'
)
->
bind
(
'tag__tag'
,
function
(
$id
)
{
return
app
(
TagRepository
::
class
)
->
find
(
$id
);
});
}
}
public
function
boot
()
public
function
boot
()
...
...
Modules/Translation/Http/backendRoutes.php
View file @
497ab143
...
@@ -4,9 +4,6 @@ use Illuminate\Routing\Router;
...
@@ -4,9 +4,6 @@ use Illuminate\Routing\Router;
/** @var Router $router */
/** @var Router $router */
$router
->
group
([
'prefix'
=>
'/translation'
],
function
(
Router
$router
)
{
$router
->
group
([
'prefix'
=>
'/translation'
],
function
(
Router
$router
)
{
$router
->
bind
(
'translations'
,
function
(
$id
)
{
return
\Modules\Translation\Entities\TranslationTranslation
::
find
(
$id
);
});
$router
->
get
(
'translations'
,
[
$router
->
get
(
'translations'
,
[
'uses'
=>
'TranslationController@index'
,
'uses'
=>
'TranslationController@index'
,
'as'
=>
'admin.translation.translation.index'
,
'as'
=>
'admin.translation.translation.index'
,
...
...
Modules/Translation/Providers/TranslationServiceProvider.php
View file @
497ab143
...
@@ -11,6 +11,7 @@ use Modules\Core\Traits\CanGetSidebarClassForModule;
...
@@ -11,6 +11,7 @@ use Modules\Core\Traits\CanGetSidebarClassForModule;
use
Modules\Core\Traits\CanPublishConfiguration
;
use
Modules\Core\Traits\CanPublishConfiguration
;
use
Modules\Translation\Console\BuildTranslationsCacheCommand
;
use
Modules\Translation\Console\BuildTranslationsCacheCommand
;
use
Modules\Translation\Entities\Translation
;
use
Modules\Translation\Entities\Translation
;
use
Modules\Translation\Entities\TranslationTranslation
;
use
Modules\Translation\Events\Handlers\RegisterTranslationSidebar
;
use
Modules\Translation\Events\Handlers\RegisterTranslationSidebar
;
use
Modules\Translation\Repositories\Cache\CacheTranslationDecorator
;
use
Modules\Translation\Repositories\Cache\CacheTranslationDecorator
;
use
Modules\Translation\Repositories\Eloquent\EloquentTranslationRepository
;
use
Modules\Translation\Repositories\Eloquent\EloquentTranslationRepository
;
...
@@ -45,6 +46,10 @@ class TranslationServiceProvider extends ServiceProvider
...
@@ -45,6 +46,10 @@ class TranslationServiceProvider extends ServiceProvider
BuildingSidebar
::
class
,
BuildingSidebar
::
class
,
$this
->
getSidebarClassForModule
(
'translation'
,
RegisterTranslationSidebar
::
class
)
$this
->
getSidebarClassForModule
(
'translation'
,
RegisterTranslationSidebar
::
class
)
);
);
app
(
'router'
)
->
bind
(
'translations'
,
function
(
$id
)
{
return
TranslationTranslation
::
find
(
$id
);
});
}
}
public
function
boot
()
public
function
boot
()
...
...
Modules/User/Http/backendRoutes.php
View file @
497ab143
...
@@ -81,9 +81,6 @@ $router->group(['prefix' => '/account'], function (Router $router) {
...
@@ -81,9 +81,6 @@ $router->group(['prefix' => '/account'], function (Router $router) {
'as'
=>
'admin.account.profile.update'
,
'as'
=>
'admin.account.profile.update'
,
'uses'
=>
'Account\ProfileController@update'
,
'uses'
=>
'Account\ProfileController@update'
,
]);
]);
$router
->
bind
(
'userTokenId'
,
function
(
$id
)
{
return
app
(
\Modules\User\Repositories\UserTokenRepository
::
class
)
->
find
(
$id
);
});
$router
->
get
(
'api-keys'
,
[
$router
->
get
(
'api-keys'
,
[
'as'
=>
'admin.account.api.index'
,
'as'
=>
'admin.account.api.index'
,
'uses'
=>
'Account\ApiKeysController@index'
,
'uses'
=>
'Account\ApiKeysController@index'
,
...
...
Modules/User/Providers/UserServiceProvider.php
View file @
497ab143
...
@@ -66,6 +66,10 @@ class UserServiceProvider extends ServiceProvider
...
@@ -66,6 +66,10 @@ class UserServiceProvider extends ServiceProvider
BuildingSidebar
::
class
,
BuildingSidebar
::
class
,
$this
->
getSidebarClassForModule
(
'user'
,
RegisterUserSidebar
::
class
)
$this
->
getSidebarClassForModule
(
'user'
,
RegisterUserSidebar
::
class
)
);
);
app
(
'router'
)
->
bind
(
'userTokenId'
,
function
(
$id
)
{
return
app
(
UserTokenRepository
::
class
)
->
find
(
$id
);
});
}
}
/**
/**
...
...
Modules/Workshop/Http/backendRoutes.php
View file @
497ab143
...
@@ -3,13 +3,6 @@
...
@@ -3,13 +3,6 @@
use
Illuminate\Routing\Router
;
use
Illuminate\Routing\Router
;
/** @var Router $router */
/** @var Router $router */
$router
->
bind
(
'module'
,
function
(
$module
)
{
return
app
(
\Nwidart\Modules\Repository
::
class
)
->
find
(
$module
);
});
$router
->
bind
(
'theme'
,
function
(
$theme
)
{
return
app
(
\Modules\Workshop\Manager\ThemeManager
::
class
)
->
find
(
$theme
);
});
$router
->
group
([
'prefix'
=>
'/workshop'
],
$router
->
group
([
'prefix'
=>
'/workshop'
],
function
(
Router
$router
)
{
function
(
Router
$router
)
{
$router
->
get
(
'modules'
,
[
$router
->
get
(
'modules'
,
[
...
...
Modules/Workshop/Providers/WorkshopServiceProvider.php
View file @
497ab143
...
@@ -20,6 +20,7 @@ use Modules\Workshop\Scaffold\Module\Generators\ValueObjectGenerator;
...
@@ -20,6 +20,7 @@ use Modules\Workshop\Scaffold\Module\Generators\ValueObjectGenerator;
use
Modules\Workshop\Scaffold\Module\ModuleScaffold
;
use
Modules\Workshop\Scaffold\Module\ModuleScaffold
;
use
Modules\Workshop\Scaffold\Theme\ThemeGeneratorFactory
;
use
Modules\Workshop\Scaffold\Theme\ThemeGeneratorFactory
;
use
Modules\Workshop\Scaffold\Theme\ThemeScaffold
;
use
Modules\Workshop\Scaffold\Theme\ThemeScaffold
;
use
Nwidart\Modules\Repository
;
class
WorkshopServiceProvider
extends
ServiceProvider
class
WorkshopServiceProvider
extends
ServiceProvider
{
{
...
@@ -45,6 +46,13 @@ class WorkshopServiceProvider extends ServiceProvider
...
@@ -45,6 +46,13 @@ class WorkshopServiceProvider extends ServiceProvider
BuildingSidebar
::
class
,
BuildingSidebar
::
class
,
$this
->
getSidebarClassForModule
(
'workshop'
,
RegisterWorkshopSidebar
::
class
)
$this
->
getSidebarClassForModule
(
'workshop'
,
RegisterWorkshopSidebar
::
class
)
);
);
app
(
'router'
)
->
bind
(
'module'
,
function
(
$module
)
{
return
app
(
Repository
::
class
)
->
find
(
$module
);
});
app
(
'router'
)
->
bind
(
'theme'
,
function
(
$theme
)
{
return
app
(
ThemeManager
::
class
)
->
find
(
$theme
);
});
}
}
public
function
boot
()
public
function
boot
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment