diff --git a/.env.local b/.env.local index 91636404..5046a0a7 100644 --- a/.env.local +++ b/.env.local @@ -1,6 +1,6 @@ -NEXT_PUBLIC_API_HOST=https://pig.staging.vault48.org/ -NEXT_PUBLIC_REMOTE_CURRENT=https://pig.staging.vault48.org/static/ -#NEXT_PUBLIC_API_HOST=http://localhost:8888/ -#NEXT_PUBLIC_REMOTE_CURRENT=http://localhost:8888/static/ +#NEXT_PUBLIC_API_HOST=https://pig.staging.vault48.org/ +#NEXT_PUBLIC_REMOTE_CURRENT=https://pig.staging.vault48.org/static/ +NEXT_PUBLIC_API_HOST=http://localhost:8888/ +NEXT_PUBLIC_REMOTE_CURRENT=http://localhost:8888/static/ #NEXT_PUBLIC_API_HOST=https://pig.vault48.org/ #NEXT_PUBLIC_REMOTE_CURRENT=https://pig.vault48.org/static/ diff --git a/src/components/lab/LabHead/index.tsx b/src/components/lab/LabHead/index.tsx index d44a6b5d..4ebd08fa 100644 --- a/src/components/lab/LabHead/index.tsx +++ b/src/components/lab/LabHead/index.tsx @@ -18,6 +18,7 @@ const LabHead: FC = ({ isLoading }) => {
= ({ isLoading }) => { = ({ isLoading }) => { > Популярные + + setSort(LabNodesSort.Heroic)} + > + Важные +
); diff --git a/src/components/lab/LabHead/styles.module.scss b/src/components/lab/LabHead/styles.module.scss index 40cb3c08..75c249db 100644 --- a/src/components/lab/LabHead/styles.module.scss +++ b/src/components/lab/LabHead/styles.module.scss @@ -1,20 +1,20 @@ @import "src/styles/variables.scss"; .wrap { - @include inner_shadow; - border-radius: $radius; - background-color: $content_bg; - padding: 0 $gap * 0.5; } .group { + @include inner_shadow; display: flex; + background-color: $content_bg; + border-radius: $radius; @include tablet { flex-wrap: wrap; - align-items: center; + align-items: stretch; justify-content: center; + flex: 1; } & > * { diff --git a/src/components/lab/LabHeadItem/index.tsx b/src/components/lab/LabHeadItem/index.tsx index 0acf7a1f..07ede4dd 100644 --- a/src/components/lab/LabHeadItem/index.tsx +++ b/src/components/lab/LabHeadItem/index.tsx @@ -10,12 +10,13 @@ import styles from './styles.module.scss'; interface IProps { icon: string; + color: 'green' | 'orange' | 'yellow'; isLoading?: boolean; active?: boolean; onClick?: () => void; } -const LabHeadItem: FC = ({ icon, children, isLoading, active, onClick }) => { +const LabHeadItem: FC = ({ icon, color, children, isLoading, active, onClick }) => { if (isLoading) { return ( @@ -26,14 +27,13 @@ const LabHeadItem: FC = ({ icon, children, isLoading, active, onClick }) } return ( - {children} - + ); }; diff --git a/src/components/lab/LabHeadItem/styles.module.scss b/src/components/lab/LabHeadItem/styles.module.scss index ad3927b0..28b2e60f 100644 --- a/src/components/lab/LabHeadItem/styles.module.scss +++ b/src/components/lab/LabHeadItem/styles.module.scss @@ -2,21 +2,52 @@ .item { flex: 0 0 auto; - padding: $gap * 0.5; + padding: $gap * 0.5 $gap * 1.5 $gap * 0.5 $gap; fill: currentColor; color: darken(white, 50%); transition: color 0.25s; cursor: pointer; + border-radius: $radius; + min-height: 36px; + display: flex; + flex-direction: row; + align-items: center; &:hover { color: white; } + @include tablet { + flex-direction: column; + flex: 1; + } + &.active { - color: $wisegreen; + @include outer_shadow; + color: white; + + &.green { + background: $green_gradient; + } + + &.orange { + background: $red_gradient; + } + + &.yellow { + background: $yellow_gradient; + } } } .text { - font: $font_16_semibold; + font: $font_14_semibold; + text-transform: uppercase; + padding-bottom: 1px; + padding-left: $gap * 0.75; + + @include tablet { + padding-top: $gap * 0.5; + font: $font_12_semibold; + } } diff --git a/src/layouts/LabLayout/styles.module.scss b/src/layouts/LabLayout/styles.module.scss index 920278c8..3845e872 100644 --- a/src/layouts/LabLayout/styles.module.scss +++ b/src/layouts/LabLayout/styles.module.scss @@ -49,5 +49,5 @@ } .head { - padding: 0 $gap * 0.5 $gap * 0.5; + padding: 0 $gap * 0.5 $gap; } diff --git a/src/styles/_colors.scss b/src/styles/_colors.scss index a7c95109..c59291c2 100644 --- a/src/styles/_colors.scss +++ b/src/styles/_colors.scss @@ -15,6 +15,7 @@ $primary: $red; $secondary: $wisegreen; $red_gradient: linear-gradient(165deg, $orange -50%, $red 150%); +$yellow_gradient: linear-gradient(165deg, $yellow -50%, $red 150%); $blue_gradient: linear-gradient(170deg, $blue, $dark_blue); $green_gradient: linear-gradient( 170deg, diff --git a/src/types/lab/index.ts b/src/types/lab/index.ts index 8dd7127d..758d6f6b 100644 --- a/src/types/lab/index.ts +++ b/src/types/lab/index.ts @@ -22,6 +22,7 @@ export type ILabState = Readonly<{ export enum LabNodesSort { New = 'new', Hot = 'hot', + Heroic = 'heroic', } export type GetLabNodesRequest = {