diff --git a/src/components/main/Header/index.tsx b/src/components/main/Header/index.tsx index 6007e165..22acda4f 100644 --- a/src/components/main/Header/index.tsx +++ b/src/components/main/Header/index.tsx @@ -11,9 +11,13 @@ import { Group } from '~/components/containers/Group'; import * as MODAL_ACTIONS from '~/redux/modal/actions'; import { DIALOGS } from '~/redux/modal/constants'; import { pick } from 'ramda'; +import { Icon } from '~/components/input/Icon'; +import { url } from 'inspector'; +import { getURL } from '~/utils/dom'; +import path from 'ramda/es/path'; const mapStateToProps = state => ({ - user: pick(['username', 'is_user'])(selectUser(state)), + user: pick(['username', 'is_user', 'photo'])(selectUser(state)), }); const mapDispatchToProps = { @@ -23,7 +27,7 @@ const mapDispatchToProps = { type IProps = ReturnType & typeof mapDispatchToProps & {}; -const HeaderUnconnected: FC = ({ user: { username, is_user }, showDialog }) => { +const HeaderUnconnected: FC = ({ user: { username, is_user, photo }, showDialog }) => { const onLogin = useCallback(() => showDialog(DIALOGS.LOGIN), [showDialog]); const onOpenEditor = useCallback(() => showDialog(DIALOGS.EDITOR), [showDialog]); @@ -41,7 +45,9 @@ const HeaderUnconnected: FC = ({ user: { username, is_user }, showDialog {is_user && (
{username}
-
+
+ {(!photo || !photo.id) && } +
)} diff --git a/src/components/main/Header/style.scss b/src/components/main/Header/style.scss index 21eb4783..c7d96aca 100644 --- a/src/components/main/Header/style.scss +++ b/src/components/main/Header/style.scss @@ -3,7 +3,7 @@ align-items: center; justify-content: flex-end; font-weight: 500; - height: 80px; + height: 120px; } .spacer { @@ -65,17 +65,31 @@ .user_button { align-items: center; border-radius: $input_radius; - font: $font_16_medium; + font: $font_16_semibold; text-transform: uppercase; flex: 0 !important; - opacity: 0.3; cursor: pointer; margin-left: $gap; } .user_avatar { + @include outer_shadow(); + width: 32px; height: 32px; background: white; border-radius: $radius; + margin-left: ($gap + 2px) !important; + background: 50% 50% no-repeat $wisegreen; + display: flex; + align-items: center; + justify-content: center; + background-size: cover; + + svg { + fill: #222222; + stroke: #222222; + width: 24px; + height: 24px; + } } diff --git a/src/sprites/Sprites.tsx b/src/sprites/Sprites.tsx index 3ae8944d..bba02120 100644 --- a/src/sprites/Sprites.tsx +++ b/src/sprites/Sprites.tsx @@ -93,6 +93,11 @@ const Sprites: FC<{}> = () => ( + + + + + );