Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
addcpm-json
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
addcpm-json
Commits
933792fe
Commit
933792fe
authored
Jan 18, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Редирект на стр. кабинета с главной для авторизированного юзера
parent
d9ae0377
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
feeds.global.php
src/config/autoload/feeds.global.php
+2
-0
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+0
-1
Index.php
src/src/App/Action/Index.php
+9
-1
No files found.
src/config/autoload/feeds.global.php
View file @
933792fe
...
...
@@ -13,11 +13,13 @@ return [
'year'
=>
'год'
,
],
'colors_active_lines'
=>
[
/*
'shows' => '#2CA02C',
'clicks' => '#D62728',
'transactions' => '#1F77B4',
'salemoney' => '#FF7F0E',
'admoney' => '#9467BD',
*/
'Views'
=>
'#2CA02C'
,
'Clicks'
=>
'#D62728'
,
'Orders'
=>
'#1F77B4'
,
...
...
src/public/js/script-feeds-stat-table.js
View file @
933792fe
...
...
@@ -89,7 +89,6 @@ $(document).ready(function(){
}
else
{
for
(
var
i
=
dataPeriod
.
length
-
1
;
i
>=
0
;
i
--
)
{
//for(var i = 0; i < dataPeriod.length; i++) {
...
...
src/src/App/Action/Index.php
View file @
933792fe
...
...
@@ -25,10 +25,11 @@
namespace
App\Action
;
use
App\Authentication\UserService
;
use
Psr\Http\Message\ResponseInterface
;
use
Psr\Http\Message\ServerRequestInterface
;
use
Zend\Diactoros\Response\HtmlResponse
;
use
Zend\Diactoros\Response\RedirectResponse
;
/**
* Class Index
...
...
@@ -46,6 +47,13 @@ class Index extends Common
{
$this
->
initInfo
(
$request
);
/** @var UserService $auth */
$auth
=
$this
->
container
->
get
(
UserService
::
class
);
if
(
$auth
->
getIdentity
())
{
return
new
RedirectResponse
(
$this
->
router
->
generateUri
(
'user.cabinet'
));
}
$data
=
[
'lang'
=>
$request
->
getAttribute
(
'layoutInfo'
)
->
getLang
(),
];
...
...
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