Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
kus-admin
Project
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Кубота
kus-admin
Commits
ffaba6a9
Commit
ffaba6a9
authored
Jan 30, 2020
by
Иван Кубота
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
isMobile store property.
If we resize Profile page up - it switches to Main Account view. Change Name\Surname to real ones. Made header items work
parent
6d8f8a73
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
63 additions
and
12 deletions
+63
-12
main.jsx
src/main.jsx
+6
-0
Store.js
src/model/Store.js
+1
-0
Account.jsx
src/view/block/account/Account.jsx
+16
-4
Header.jsx
src/view/block/header/Header.jsx
+32
-7
Button.jsx
src/view/cmp/button/Button.jsx
+1
-1
Account.jsx
src/view/page/account/Account.jsx
+7
-0
No files found.
src/main.jsx
View file @
ffaba6a9
...
@@ -22,6 +22,12 @@ export default function() {
...
@@ -22,6 +22,12 @@ export default function() {
},
{})
},
{})
)
}
)
}
</
div
>;
</
div
>;
const
w
=
window
;
w
.
addEventListener
(
'resize'
,
function
()
{
store
.
set
({
isMobile
:
w
.
innerWidth
<
1025
});
});
};
};
src/model/Store.js
View file @
ffaba6a9
let
latest
;
let
latest
;
const
store
=
new
Store
(
latest
=
{
const
store
=
new
Store
(
latest
=
{
commit
:
window
.
CommitID
,
commit
:
window
.
CommitID
,
isMobile
:
false
,
'navigation'
:
{
'navigation'
:
{
current
:
'Login'
current
:
'Login'
},
},
...
...
src/view/block/account/Account.jsx
View file @
ffaba6a9
...
@@ -8,11 +8,23 @@ const AccountBlock = D.declare('view.block.AccountBlock', () => {
...
@@ -8,11 +8,23 @@ const AccountBlock = D.declare('view.block.AccountBlock', () => {
<
div
class=
"account__info"
>
<
div
class=
"account__info"
>
<
h3
class=
"account__name"
>
<
h3
class=
"account__name"
>
<
User
width=
"32"
height=
"32"
/>
<
User
width=
"32"
height=
"32"
/>
<
span
>
{
'Ким Ир Сен Константин Му Константинович Константинопольский'
.
split
(
/
\s
/
).
map
(
word
=>
<
div
<
span
>
cls=
"title-name-word"
>
{
word
}
</
div
>)
}
</
span
>
{
(
update
)
=>
store
.
sub
([
'account.data.firstname'
,
'account.data.middlename'
,
'account.data.lastname'
],
(
f
,
m
,
l
)
=>
update
(
[
l
,
f
,
m
]
.
join
(
' '
)
.
split
(
/
\s
+/
)
.
map
(
word
=>
<
div
class=
"title-name-word"
>
{
word
}
</
div
>)
)
)
}
</
span
>
</
h3
>
</
h3
>
<
p
>
Химки-2
</
p
>
<
p
>
{
store
.
val
(
'account.data.location'
)
}
</
p
>
<
p
>
Кассир
</
p
>
<
p
>
{
store
.
val
(
'account.data.position.title'
)
}
</
p
>
</
div
>
</
div
>
<
div
class=
"account__rating"
>
<
div
class=
"account__rating"
>
<
Rating
/>
<
Rating
/>
...
...
src/view/block/header/Header.jsx
View file @
ffaba6a9
...
@@ -8,6 +8,26 @@ import { Page } from "../../page/Page";
...
@@ -8,6 +8,26 @@ import { Page } from "../../page/Page";
const
{
IF
,
NOT
}
=
Store
;
const
{
IF
,
NOT
}
=
Store
;
const
Header
=
D
.
declare
(
'view.block.Header'
,
()
=>
{
const
Header
=
D
.
declare
(
'view.block.Header'
,
()
=>
{
const
tempPageMenuHidden
=
new
Store
.
Value
.
Boolean
(
true
);
const
tempPageMenuHidden
=
new
Store
.
Value
.
Boolean
(
true
);
const
actions
=
{
logo
:
'Account'
,
logout
:
function
()
{
store
.
set
(
'account.token'
,
false
);
},
profile
:
'Profile'
};
store
.
sub
(
'isMobile'
,
(
is
)
=>
actions
.
profile
=
is
?
'Profile'
:
'Account'
);
const
action
=
function
(
name
)
{
if
(
store
.
get
(
'isTesting'
)){
// TODO SHOW MODAL
}
else
{
if
(
typeof
actions
[
name
]
===
'function'
){
actions
[
name
]();
}
else
{
store
.
set
(
'navigation.current'
,
actions
[
name
]);
}
}
};
return
<
header
class=
{
D
.
cls
(
return
<
header
class=
{
D
.
cls
(
"page-header"
,
{
"page-header"
,
{
"page-header--inner"
:
(
NOT
(
store
.
valEqual
(
'navigation.current'
,
'Login'
)))
"page-header--inner"
:
(
NOT
(
store
.
valEqual
(
'navigation.current'
,
'Login'
)))
...
@@ -32,20 +52,25 @@ const Header = D.declare('view.block.Header', () => {
...
@@ -32,20 +52,25 @@ const Header = D.declare('view.block.Header', () => {
</
div
>
</
div
>
<
IF
condition=
{
NOT
(
store
.
valEqual
(
'navigation.current'
,
'Login'
))
}
>
<
IF
condition=
{
NOT
(
store
.
valEqual
(
'navigation.current'
,
'Login'
))
}
>
<
div
className=
"page-header__wrapper"
>
<
div
className=
"page-header__wrapper"
>
<
a
href=
"#"
class=
"page-header__logo"
aria
-
label=
{
"Логотип ВкусВилл"
}
>
<
Button
class=
{
"button page-header__logo-link page-header__logo"
}
aria
-
label=
{
"Перейти на главную страницу"
}
onClick=
{
()
=>
action
(
'logo'
)
}
>
<
Logo
width=
"116"
height=
"41"
/>
<
Logo
width=
"116"
height=
"41"
/>
</
a
>
</
Button
>
<
div
class=
"page-header__user-block"
>
<
div
class=
"page-header__user-block"
>
<
Button
class=
{
"button page-header__profile-link"
}
<
Button
class=
{
"button page-header__profile-link"
}
type=
{
"button"
}
aria
-
label=
{
"Перейти на страницу профиля"
}
aria
-
label=
{
"Перейти на страницу профиля"
}
>
onClick=
{
()
=>
action
(
'profile'
)
}
>
<
User
width=
"32"
height=
"32"
/><
span
>
Иванов Иван
</
span
>
<
User
width=
"32"
height=
"32"
/>
<
span
>
{
store
.
val
(
'account.data.lastname'
)
}{
' '
}
{
store
.
val
(
'account.data.firstname'
)
}
</
span
>
</
Button
>
</
Button
>
<
Button
class=
{
"button page-header__logout-link"
}
<
Button
class=
{
"button page-header__logout-link"
}
type=
{
"button"
}
aria
-
label=
{
"Выйти из аккаунта"
}
aria
-
label=
{
"Выйти из аккаунта"
}
>
onClick=
{
()
=>
action
(
'logout'
)
}
>
<
Logout
width=
"18"
height=
"18"
/><
span
>
Выйти
</
span
>
<
Logout
width=
"18"
height=
"18"
/><
span
>
Выйти
</
span
>
</
Button
>
</
Button
>
</
div
>
</
div
>
...
...
src/view/cmp/button/Button.jsx
View file @
ffaba6a9
import
'./button.scss'
;
import
'./button.scss'
;
export
default
D
.
declare
(
'view.cmp.Button'
,
function
(
cfg
,
children
)
{
export
default
D
.
declare
(
'view.cmp.Button'
,
function
(
cfg
,
children
)
{
return
<
button
type=
{
'button'
||
cfg
.
type
}
class=
{
'button'
}
{
...
cfg
}
>
{
children
}
</
button
>
return
<
button
type=
{
cfg
.
type
||
'button'
}
class=
{
'button'
}
{
...
cfg
}
>
{
children
}
</
button
>
});
});
src/view/page/account/Account.jsx
View file @
ffaba6a9
...
@@ -3,6 +3,13 @@ import Format from "../../cmp/format/Format";
...
@@ -3,6 +3,13 @@ import Format from "../../cmp/format/Format";
import
AccountBlock
from
'../../block/account/Account.jsx'
;
import
AccountBlock
from
'../../block/account/Account.jsx'
;
const
Account
=
D
.
declare
(
'view.page.Account'
,
()
=>
{
const
Account
=
D
.
declare
(
'view.page.Account'
,
()
=>
{
store
.
sub
([
'isMobile'
,
'navigation.current'
],
(
is
,
page
)
=>
{
if
(
!
is
&&
page
===
'Profile'
)
store
.
set
(
'navigation.current'
,
'Account'
);
});
return
<
div
class=
"account-page"
>
return
<
div
class=
"account-page"
>
<
h1
class=
"readers-only"
>
Страница личного кабинета сотрудника
</
h1
>
<
h1
class=
"readers-only"
>
Страница личного кабинета сотрудника
</
h1
>
<
div
class=
"account-page__wrapper"
>
<
div
class=
"account-page__wrapper"
>
...
...
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