-
-
+ {Current}
+ {(activeTab === 0 || activeTab === 1) && (
+
+ {activeTab === 0 ? (
+ <>
+ Start Session
+ Decline Session
+
+ ) : (
+ <>
+ Confirm Session
+ Decline Session
+
+ )}
-
-
-
{`${current?.name} ${current?.surname || ''}`}
-
-
-
- {/* current?.coachLanguages?.map((lang) => (
-
{lang}
- )) */}
+ )}
+ {activeTab !== 1 && (
+ <>
+ {activeTab === 2 && (
+ <>
+
Course Info
+
+ {/*
+
{current?.specialityDesc}
+
+ {current?.coachLanguages?.map((lang) => (
+ {lang}
+ ))}
+
+
*/}
+
+ {getPrice(session?.cost)} / {getDuration(locale, session?.totalDuration)}
+
+
+
+ {session?.themesTags?.slice(0, 2).map((skill) => {skill?.name} )}
+ {session?.themesTags?.length > 2
+ ? (
+
+ {`+${session?.themesTags?.length - 2}`}
+
+ ) : null }
+
+
+ {/*
{current?.description}
*/}
+
+
+ )}
+
+
+
+ My Comments
+
+ {activeTab === 0 && (
+
}
+ >
+ Add new
+
+ )}
+
+
+ Sed tincidunt finibus eros nec feugiat. Nulla facilisi. Nunc maximus magna et egestas tincidunt. Integer lobortis laoreet neque at sodales. Aenean eget risus pharetra, efficitur dolor ut, commodo lacus. Sed vitae nunc odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis et velit et dolor rutrum euismod a pretium est.
+
+
+ Coach Comments
+
+
+ Sed tincidunt finibus eros nec feugiat. Nulla facilisi. Nunc maximus magna et egestas tincidunt. Integer lobortis laoreet neque at sodales. Aenean eget risus pharetra, efficitur dolor ut, commodo lacus. Sed vitae nunc odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis et velit et dolor rutrum euismod a pretium est.
- {/*
{current?.speciality}
*/}
-
- {getPrice(session?.cost)} / {getDuration(locale, session?.totalDuration)}
-
-
- {today
- ? `${i18nText('today', locale)} ${startDate.format('HH:mm')} - ${endDate.format('HH:mm')}`
- : `${startDate.format('D MMMM')} ${startDate.format('HH:mm')} - ${endDate.format('HH:mm')}`}
-
-
-
- {session?.themesTags?.slice(0, 2).map((skill) => {skill?.name} )}
- {session?.themesTags?.length > 2
- ? (
-
-
- ) : null }
-
-
- {/*
{current?.specialityDesc}
-
{current?.description}
*/}
-
- {i18nText('details', locale)}
-
-
-
-
-
- Start Session
- Decline Session
-
-
-
-
- My Comments
-
-
Add new
-
-
- Sed tincidunt finibus eros nec feugiat. Nulla facilisi. Nunc maximus magna et egestas tincidunt. Integer lobortis laoreet neque at sodales. Aenean eget risus pharetra, efficitur dolor ut, commodo lacus. Sed vitae nunc odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis et velit et dolor rutrum euismod a pretium est.
-
-
- Coach Comments
-
-
- Sed tincidunt finibus eros nec feugiat. Nulla facilisi. Nunc maximus magna et egestas tincidunt. Integer lobortis laoreet neque at sodales. Aenean eget risus pharetra, efficitur dolor ut, commodo lacus. Sed vitae nunc odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis et velit et dolor rutrum euismod a pretium est.
-
-
+
+ )}
);
diff --git a/src/components/Account/sessions/SessionsTabs.tsx b/src/components/Account/sessions/SessionsTabs.tsx
index 97f40ec..2a998a8 100644
--- a/src/components/Account/sessions/SessionsTabs.tsx
+++ b/src/components/Account/sessions/SessionsTabs.tsx
@@ -19,10 +19,11 @@ import { i18nText } from '../../../i18nKeys';
type SessionsTabsProps = {
locale: string;
updateSession: (val: number) => void;
+ activeTab: number;
+ updateTab: (tab: number) => void;
};
-export const SessionsTabs = ({ locale, updateSession }: SessionsTabsProps) => {
- const [activeTab, setActiveTab] = useState
(0);
+export const SessionsTabs = ({ locale, updateSession, activeTab, updateTab }: SessionsTabsProps) => {
const [sort, setSort] = useState();
const [sessions, setSessions] = useState();
const [loading, setLoading] = useState(true);
@@ -158,7 +159,7 @@ export const SessionsTabs = ({ locale, updateSession }: SessionsTabsProps) => {
setActiveTab(index)}
+ onClick={() => updateTab(index)}
>
{tab.label}
diff --git a/src/components/Account/sessions/index.tsx b/src/components/Account/sessions/index.tsx
index 264be30..478420a 100644
--- a/src/components/Account/sessions/index.tsx
+++ b/src/components/Account/sessions/index.tsx
@@ -6,17 +6,21 @@ import { SessionsTabs } from './SessionsTabs';
export const SessionsAll = ({ locale }: { locale: string }) => {
const [customSession, setCustomSession] = useState();
+ const [activeTab, setActiveTab] = useState(0);
return customSession ? (
setCustomSession(undefined)}
+ activeTab={activeTab}
/>
) : (
= ({ expert, locale }) =>
Sign Up Now
- {`${sessionCost}${isRus ? '₽' : '€'}`} / {`${sessionDuration}${isRus ? 'мин' : 'min'}`}
+ {`${sessionCost}€`} / {`${sessionDuration}${isRus ? 'мин' : 'min'}`}
diff --git a/src/components/Experts/Experts.tsx b/src/components/Experts/Experts.tsx
index 29df831..eb356a2 100644
--- a/src/components/Experts/Experts.tsx
+++ b/src/components/Experts/Experts.tsx
@@ -18,7 +18,7 @@ export const Experts = async ({ basePath = '/', locale, pageSize = DEFAULT_PAGE_
const searchData = await getTagList(locale);
const languages = await getLanguages(locale);
const filter = getFilter({ pageSize });
- const experts = await getExpertsList(filter, locale);
+ const experts = await getExpertsList(locale, filter);
const durFrom = `${searchData?.sessionCostMin || 0}${locale === 'ru' ? 'мин' : 'min'}`;
const durTo = `${searchData?.sessionDurationMax || 0}${locale === 'ru' ? 'мин' : 'min'}`;
const priceFrom = `${searchData?.sessionCostMin || 0}€`;
diff --git a/src/components/Experts/ExpertsList.tsx b/src/components/Experts/ExpertsList.tsx
index a1f6054..f84351a 100644
--- a/src/components/Experts/ExpertsList.tsx
+++ b/src/components/Experts/ExpertsList.tsx
@@ -8,7 +8,7 @@ import isEqual from 'lodash/isEqual';
import Image from 'next/image';
import { Link, useRouter } from '../../navigation';
import { ExpertsData, Filter, GeneralFilter } from '../../types/experts';
-import { getObjectByFilter, getObjectByAdditionalFilter } from '../../utils/filter';
+import { getObjectByFilter, getObjectByAdditionalFilter, getSearchParamsString } from '../../utils/filter';
import { getDuration, getPrice } from '../../utils/expert';
import { getExpertsList } from '../../actions/experts';
import { CustomPagination } from '../view/CustomPagination';
@@ -44,7 +44,7 @@ export const ExpertsList = ({
if (!isEqual(baseFilter, filter)) {
setLoading(true);
- getExpertsList(filter, locale)
+ getExpertsList(locale, filter)
.then((experts) => {
setExperts(experts);
})
@@ -70,10 +70,9 @@ export const ExpertsList = ({
delete newFilter.page;
}
- router.push({
- pathname: basePath as any,
- query: newFilter
- });
+ const search = getSearchParamsString(newFilter);
+
+ router.push(search ? `${basePath}?${search}#filter` : `${basePath}#filter`);
};
const currentPage = searchParams.has('page') ? Number(searchParams.get('page')) : baseFilter.page;
diff --git a/src/styles/_default.scss b/src/styles/_default.scss
index 96f03bd..1cde301 100644
--- a/src/styles/_default.scss
+++ b/src/styles/_default.scss
@@ -320,8 +320,8 @@ a {
margin-bottom: 16px;
}
- .ant-collapse-ghost >.ant-collapse-item, .ant-collapse-item {
- border-bottom: 1px solid #C4DFE6;
+ .ant-collapse-ghost >.ant-collapse-item, .ant-collapse-item, .ant-collapse-item:last-child {
+ border-bottom: 1px solid #C4DFE6 !important;
border-radius: 0 !important;
}
diff --git a/src/styles/sessions/_details.scss b/src/styles/sessions/_details.scss
index 39e043b..e8430da 100644
--- a/src/styles/sessions/_details.scss
+++ b/src/styles/sessions/_details.scss
@@ -33,6 +33,14 @@
justify-content: flex-start;
}
+ &__back {
+ color: #6FB98F !important;
+ padding: 0 !important;
+ @include rem(18);
+ font-weight: 600;
+ line-height: 120%;
+ }
+
&__comments {
display: flex;
flex-direction: column;
@@ -60,6 +68,136 @@
font-weight: 500;
line-height: 133.333%;
}
+
+ &_add {
+ color: #FF8A00 !important;
+ padding: 0 !important;
+ @include rem(15);
+ font-weight: 400;
+ line-height: 160%;
+ }
+ }
+
+ &__name {
+ color: #003B46;
+ @include rem(18);
+ font-weight: 600;
+ line-height: 150%;
+ }
+
+ &__info {
+ display: inline-flex;
+ gap: 8px;
+ align-items: center;
+ justify-content: flex-start;
+ }
+
+ &__subtitle {
+ color: #003B46;
+ @include rem(15);
+ font-weight: 600;
+ line-height: 133.333%;
+ }
+
+ &__cost {
+ color: #6FB98F;
+ @include rem(15);
+ font-style: normal;
+ font-weight: 600;
+ line-height: 120%;
+
+ span {
+ color: #B7B7B7;
+ }
+ }
+
+ &__date {
+ color: #66A5AD;
+ @include rem(12);
+ font-style: normal;
+ font-weight: 300;
+ line-height: 116.667%;
+
+ &.chosen {
+ color: #D93E5C;
+ }
+
+ &.history {
+ color: #C4C4C4 !important;
+ }
+ }
+
+ &__desc {
+ color: #66A5AD;
+ @include rem(13);
+ font-style: normal;
+ font-weight: 500;
+ line-height: 123.077%;
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ }
+
+ &__more {
+ text-decoration: none;
+ color: #FF8A00 !important;
+ @include rem(15);
+ font-style: normal;
+ font-weight: 400;
+ line-height: 160%;
+ display: inline-flex;
+ align-items: center;
+ }
+
+ &__apply {
+ user-select: none;
+ outline: none !important;
+ border: none !important;
+ text-decoration: none;
+ cursor: pointer;
+ border-radius: 8px !important;
+ background: #FFBD00 !important;
+ box-shadow: none !important;
+ display: flex;
+ height: 54px !important;
+ padding: 15px 24px;
+ justify-content: center;
+ align-items: center;
+ color: #003B46 !important;
+ @include rem(15);
+ font-style: normal;
+ font-weight: 400;
+ line-height: 160%;
+
+ &:hover, &:active {
+ color: #003B46 !important;
+ }
+ }
+
+ &__decline {
+ user-select: none;
+ outline: none !important;
+ border: none !important;
+ text-decoration: none;
+ cursor: pointer;
+ border-radius: 8px !important;
+ background: #D93E5C !important;
+ box-shadow: none !important;
+ display: flex;
+ height: 54px !important;
+ padding: 15px 24px;
+ justify-content: center;
+ align-items: center;
+ color: #fff !important;
+ @include rem(15);
+ font-style: normal;
+ font-weight: 400;
+ line-height: 160%;
+
+ &:hover, &:active {
+ color: #fff !important;
+ }
}
&__header {
diff --git a/src/types/sessions.ts b/src/types/sessions.ts
index f6c507e..12545b5 100644
--- a/src/types/sessions.ts
+++ b/src/types/sessions.ts
@@ -1,6 +1,6 @@
import { Language } from './tags';
-type PublicUser = {
+export type PublicUser = {
id: number;
login?: string;
name?: string;