diff --git a/package.json b/package.json index 0fe42007..a198a4e0 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "axios": "^0.21.1", "body-scroll-lock": "^2.6.4", "classnames": "^2.2.6", + "color2k": "^1.2.4", "connected-react-router": "^6.5.2", "date-fns": "^2.4.1", "flexbin": "^0.2.0", @@ -70,13 +71,13 @@ ] }, "devDependencies": { - "@types/throttle-debounce": "^2.1.0", "@craco/craco": "5.8.0", "@types/classnames": "^2.2.7", "@types/marked": "^1.2.2", "@types/node": "^11.13.22", "@types/ramda": "^0.26.33", "@types/react-redux": "^7.1.11", + "@types/throttle-debounce": "^2.1.0", "@types/yup": "^0.29.11", "craco-alias": "^2.1.1", "craco-fast-refresh": "^1.0.2", diff --git a/src/components/input/Button/styles.module.scss b/src/components/input/Button/styles.module.scss index 0489151c..6c54ab0d 100644 --- a/src/components/input/Button/styles.module.scss +++ b/src/components/input/Button/styles.module.scss @@ -219,11 +219,13 @@ } .primary { - background: $red; + @include outer_shadow; + background: $red_gradient_alt; } .secondary { - background: $wisegreen; + @include outer_shadow; + background: $green_gradient; } .lab { diff --git a/src/components/main/Header/index.tsx b/src/components/main/Header/index.tsx index 83f37062..39ab0aee 100644 --- a/src/components/main/Header/index.tsx +++ b/src/components/main/Header/index.tsx @@ -24,6 +24,7 @@ import { Authorized } from '~/components/containers/Authorized'; import { useShallowSelect } from '~/utils/hooks/useShallowSelect'; import { selectLabUpdates, selectLabUpdatesNodes } from '~/redux/lab/selectors'; import { selectFlow, selectFlowUpdated } from '~/redux/flow/selectors'; +import { Button } from '~/components/input/Button'; const mapStateToProps = (state: IState) => ({ user: pick(['username', 'is_user', 'photo', 'last_seen_boris'])(selectUser(state)), @@ -84,22 +85,24 @@ const HeaderUnconnected: FC = memo( return createPortal(
- +
+ +
- - ФЛОУ - - + + ФЛОУ + + = memo( > ЛАБ + + + БОРИС + - - БОРИС - - {is_user && ( -
+
)} @@ -133,9 +136,9 @@ const HeaderUnconnected: FC = memo( )} {!is_user && ( - -
ВДОХ
-
+ )}
, diff --git a/src/components/main/Header/styles.module.scss b/src/components/main/Header/styles.module.scss index ec3dd377..46a2a3fe 100644 --- a/src/components/main/Header/styles.module.scss +++ b/src/components/main/Header/styles.module.scss @@ -44,7 +44,7 @@ @include tablet { flex: 1; - justify-content: space-around; + justify-content: flex-start; } } @@ -56,7 +56,6 @@ .user_button { flex: 0; - padding-left: $gap / 2; cursor: pointer; } @@ -121,6 +120,13 @@ @include tablet { padding: $gap; + &.notifications { + flex: 1; + justify-content: flex-end; + align-items: center; + margin-right: $gap; + } + &::after { right: 0; } @@ -132,3 +138,12 @@ display: none; } } + +.logo_wrapper { + + @include tablet { + &.logged_in { + display: none; + } + } +} diff --git a/src/components/main/Logo/styles.module.scss b/src/components/main/Logo/styles.module.scss index 71450ebd..7f0f28fa 100644 --- a/src/components/main/Logo/styles.module.scss +++ b/src/components/main/Logo/styles.module.scss @@ -6,8 +6,4 @@ user-select: none; color: white; text-decoration: none; - - @include tablet { - display: none; - } } diff --git a/src/constants/api.ts b/src/constants/api.ts index 7b61e9b7..490a76bb 100644 --- a/src/constants/api.ts +++ b/src/constants/api.ts @@ -1,6 +1,8 @@ import { IComment, INode, ITag } from '~/redux/types'; import { ISocialProvider } from '~/redux/auth/types'; +console.log('base at ', process.env.REACT_APP_API_HOST); + export const API = { BASE: process.env.REACT_APP_API_HOST, USER: { diff --git a/src/containers/dialogs/LoginDialogButtons/index.tsx b/src/containers/dialogs/LoginDialogButtons/index.tsx index 45d55f50..2c85f9cb 100644 --- a/src/containers/dialogs/LoginDialogButtons/index.tsx +++ b/src/containers/dialogs/LoginDialogButtons/index.tsx @@ -11,9 +11,7 @@ interface IProps { const LoginDialogButtons: FC = ({ openOauthWindow }) => ( - +