diff --git a/src/app/[locale]/(main)/@experts/page.tsx b/src/app/[locale]/(main)/@experts/page.tsx
index b39c521..824f6f3 100644
--- a/src/app/[locale]/(main)/@experts/page.tsx
+++ b/src/app/[locale]/(main)/@experts/page.tsx
@@ -1,8 +1,10 @@
import React from 'react';
+import { unstable_setRequestLocale } from 'next-intl/server';
import { useTranslations } from 'next-intl';
import { Experts } from '../../../../components/Experts/Experts';
-export default function ExpertsPage({ params }: { params: { locale: string } }) {
+export default function ExpertsPage({ params: { locale } }: { params: { locale: string } }) {
+ unstable_setRequestLocale(locale);
const t = useTranslations('Experts');
return (
@@ -14,7 +16,7 @@ export default function ExpertsPage({ params }: { params: { locale: string } })
-
Professional Articles & Project News
+{t('news')}
-
-
diff --git a/src/app/[locale]/(main)/layout.tsx b/src/app/[locale]/(main)/layout.tsx
index daa1e7d..ed99329 100644
--- a/src/app/[locale]/(main)/layout.tsx
+++ b/src/app/[locale]/(main)/layout.tsx
@@ -12,18 +12,17 @@ import React, { ReactNode } from 'react';
// };
// }
-export default function MainLayout({ children, news, directions, experts }: {
+export default function MainLayout({ children, news, experts }: {
children: ReactNode,
news: ReactNode,
- directions: ReactNode,
- experts: ReactNode
+ experts: ReactNode,
+ payment: ReactNode
}) {
return (
<>
{children}
{news}
- {directions}
{experts}
);
-};
+}
diff --git a/src/app/[locale]/account/(account)/work-with-us/coaching/add-offer/page.tsx b/src/app/[locale]/account/(account)/expert-profile/add-offer/page.tsx
similarity index 94%
rename from src/app/[locale]/account/(account)/work-with-us/coaching/add-offer/page.tsx
rename to src/app/[locale]/account/(account)/expert-profile/add-offer/page.tsx
index 04ec673..7ed015c 100644
--- a/src/app/[locale]/account/(account)/work-with-us/coaching/add-offer/page.tsx
+++ b/src/app/[locale]/account/(account)/expert-profile/add-offer/page.tsx
@@ -1,18 +1,18 @@
import React from 'react';
-import { Link } from '../../../../../../../navigation';
-import { CustomSelect } from '../../../../../../../components/view/CustomSelect';
+import { Link } from '../../../../../../navigation';
+import { CustomSelect } from '../../../../../../components/view/CustomSelect';
export default function AddOffer() {
return (
<>
-
- 
-
-
-
-
News Headline
-
- The program not only focuses on a financial perspective, but allows you to study
- performance from many angles, such as human resources management, IT, operations
- management, risks etc.
+ {data.map((item, i) => (
+
-
+
-
-
-
-
-
-
-
-
-
- 
-
-
- News Headline
-
- The program not only focuses on a financial perspective, but allows you to study
- performance from many angles, such as human resources management, IT, operations
- management, risks etc.
-
- Read more
-
-
-
-
+ ))}
+
-
-
-
-
-
-
-
-
-
- News Headline
-
- The program not only focuses on a financial perspective, but allows you to study
- performance from many angles, such as human resources management, IT, operations
- management, risks etc.
-
- Read more
-
-
- - - + Work With Us
- - + Coaching diff --git a/src/app/[locale]/account/(account)/work-with-us/new-topic/page.tsx b/src/app/[locale]/account/(account)/expert-profile/new-topic/page.tsx similarity index 97% rename from src/app/[locale]/account/(account)/work-with-us/new-topic/page.tsx rename to src/app/[locale]/account/(account)/expert-profile/new-topic/page.tsx index a7b33ed..f8b6774 100644 --- a/src/app/[locale]/account/(account)/work-with-us/new-topic/page.tsx +++ b/src/app/[locale]/account/(account)/expert-profile/new-topic/page.tsx @@ -7,7 +7,7 @@ export default function NewTopic() { <>
- - + Work With Us diff --git a/src/app/[locale]/account/(account)/expert-profile/page.tsx b/src/app/[locale]/account/(account)/expert-profile/page.tsx new file mode 100644 index 0000000..1a46bcf --- /dev/null +++ b/src/app/[locale]/account/(account)/expert-profile/page.tsx @@ -0,0 +1,70 @@ +'use client' + +import { useEffect, useState } from 'react'; +import { message } from 'antd'; +// import { unstable_setRequestLocale } from 'next-intl/server'; +import { ExpertData } from '../../../../../types/profile'; +import { AUTH_TOKEN_KEY } from '../../../../../constants/common'; +import { useLocalStorage } from '../../../../../hooks/useLocalStorage'; +import { + getEducation, + getPersonalData, + getTags, + getPractice, + getSchedule, + getPayData, + getUserData +} from '../../../../../actions/profile'; +import { ExpertProfile } from '../../../../../components/ExpertProfile'; +import { Loader } from '../../../../../components/view/Loader'; + +export default function ExpertProfilePage({ params: { locale } }: { params: { locale: string } }) { + // unstable_setRequestLocale(locale); + const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, ''); + const [loading, setLoading] = useState
- - {i18nText('accountMenu.messages', params.locale)} + {i18nText('accountMenu.messages', locale)} -
- {`Person ${params.textId}`}
- - - Work With Us - - -
- Coaching -
- {i18nText('accountMenu.work-with-us', locale)} -
- {title} - {count ? ( - {count} + {getterCount(path, count) ? ( + {getterCount(path, count)} ) : null} ))}
-
-
{i18nText('logout', locale)} - -
- -
-
- {i18nText('deleteAcc', locale)} - + -
+
+ ++
+
++ ++++ {item.title} ++{item.category}++ {item.excerpt} +++ ++++ ++
++{item.author.name}+{item.createdAt}+++++
+ 165
+ ++
+ Share
+
+ ))}
+
-
diff --git a/src/app/[locale]/account/(account)/messages/[textId]/page.tsx b/src/app/[locale]/account/(account)/messages/[textId]/page.tsx
index 669063c..095e3b8 100644
--- a/src/app/[locale]/account/(account)/messages/[textId]/page.tsx
+++ b/src/app/[locale]/account/(account)/messages/[textId]/page.tsx
@@ -1,8 +1,9 @@
+'use client'
import React from 'react';
-import { useTranslations } from 'next-intl';
import { Link } from '../../../../../../navigation';
import { i18nText } from '../../../../../../i18nKeys';
-
+import {ChatMessages} from "../../../../../../components/Chat/ChatMessages";
+/*
export function generateStaticParams({
params: { locale },
}: { params: { locale: string } }) {
@@ -15,56 +16,22 @@ export function generateStaticParams({
return result;
}
+*
+ */
-export default function Message({ params }: { params: { locale: string, textId: string } }) {
- const t = useTranslations('Account.Messages');
+export default function Message({ params: { locale, textId } }: { params: { locale: string, textId: string } }) {
return (
<>
-
+
-
-
-
-
-
-
-
- 
-
-
-
- 🤩 It all for you!
-
- 07.09.2022
-
-
-
-
-
-
-
-
-
-
- 🤩 It all for you!
- 07.09.2022
-
- -
@@ -21,74 +13,7 @@ export default function Messages({ params: { locale } }: { params: { locale: str
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
- David
- 14
-
-
- Lorem ipsum dolor sit at, consecte...
-
-
- 25 may
-
-
-
-
-
-
-
-
-
-
-
-
-
- David
-
- Lorem ipsum dolor sit at, consecte...
-
-
- 25 may
-
-
-
-
-
-
-
-
-
-
-
-
- David
-
- Lorem ipsum dolor sit at, consecte...
-
-
- 25 may
-
- -
diff --git a/src/app/[locale]/account/(account)/settings/page.tsx b/src/app/[locale]/account/(account)/settings/page.tsx
index 691e68a..984d596 100644
--- a/src/app/[locale]/account/(account)/settings/page.tsx
+++ b/src/app/[locale]/account/(account)/settings/page.tsx
@@ -1,16 +1,10 @@
import React, { Suspense } from 'react';
-import type { Metadata } from 'next';
-import { useTranslations } from 'next-intl';
+import { unstable_setRequestLocale } from 'next-intl/server';
import { ProfileSettings } from '../../../../../components/Account';
import { i18nText } from '../../../../../i18nKeys';
-export const metadata: Metadata = {
- title: 'Bbuddy - Account - Profile Settings',
- description: 'Bbuddy desc Profile settings'
-};
-
export default function Settings({ params: { locale } }: { params: { locale: string } }) {
- const t = useTranslations('Account.Settings');
+ unstable_setRequestLocale(locale);
return (
<>
diff --git a/src/app/[locale]/account/(account)/support/page.tsx b/src/app/[locale]/account/(account)/support/page.tsx
index 2443916..30c71db 100644
--- a/src/app/[locale]/account/(account)/support/page.tsx
+++ b/src/app/[locale]/account/(account)/support/page.tsx
@@ -1,4 +1,5 @@
import React from 'react';
+import { unstable_setRequestLocale } from 'next-intl/server';
import type { Metadata } from 'next';
import { i18nText } from '../../../../../i18nKeys';
@@ -8,6 +9,8 @@ export const metadata: Metadata = {
};
export default function Support({ params: { locale } }: { params: { locale: string } }) {
+ unstable_setRequestLocale(locale);
+
return (
<>
-
diff --git a/src/app/[locale]/account/(account)/work-with-us/coaching/page.tsx b/src/app/[locale]/account/(account)/work-with-us/coaching/page.tsx
deleted file mode 100644
index 9b8fd55..0000000
--- a/src/app/[locale]/account/(account)/work-with-us/coaching/page.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import React from 'react';
-import { Link } from '../../../../../../navigation';
-
-export default function Coaching() {
- return (
- <>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- David
-
-
- 12 Practice hours
-
-
- 15 Supervision per year
-
-
-
- - My Offers -
-
-
-
-
-
-
- 45$ / 45min
-
-
-
- Engineering & Data
- Engineering & Data
- +6
-
- I have worked across a variety of organizations, lead teams, and delivered quality software
- for 8 years. In that time I've worked as an independent consultant, at agencies as a team
- lead, and as a senior engineer at Auth0. I also host a podcast
- https://anchor.fm/work-in-programming where I break down how …
-
-
-
-
- - About Coach -
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet, lectus nec viverra
- malesuada, ligula sem tempor risus, non posuere urna diam a libero.
-
-
-
- - Education -
-
-
- Psychologist
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet, lectus nec viverra
- malesuada, ligula sem tempor risus, non posuere urna diam a libero.
-
-
- 
-
-
-
-
- - Professional Certification -
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet, lectus nec viverra
- malesuada, ligula sem tempor risus, non posuere urna diam a libero.
-
-
-
- - Trainings | Seminars | Courses -
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet, lectus nec viverra
- malesuada, ligula sem tempor risus, non posuere urna diam a libero.
-
-
-
-
- );
-}
diff --git a/src/app/[locale]/account/(account)/work-with-us/page.tsx b/src/app/[locale]/account/(account)/work-with-us/page.tsx
deleted file mode 100644
index 08c2b83..0000000
--- a/src/app/[locale]/account/(account)/work-with-us/page.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import type { Metadata } from 'next';
-import { useTranslations } from 'next-intl';
-import { i18nText } from '../../../../../i18nKeys';
-
-export const metadata: Metadata = {
- title: 'Bbuddy - Account - Work with us',
- description: 'Bbuddy desc work with us'
-};
-
-export default function WorkWithUs({ params: { locale } }: { params: { locale: string } }) {
- const t = useTranslations('Account.WorkWithUs');
-
- return (
- <>
- - MBA Information -
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet, lectus nec viverra
- malesuada, ligula sem tempor risus, non posuere urna diam a libero.
-
- -
-
-
-
- );
-}
diff --git a/src/app/[locale]/account/(simple)/layout.tsx b/src/app/[locale]/account/(simple)/layout.tsx
new file mode 100644
index 0000000..72872cd
--- /dev/null
+++ b/src/app/[locale]/account/(simple)/layout.tsx
@@ -0,0 +1,17 @@
+import React, { ReactNode } from 'react';
+
+type AccountSimpleLayoutProps = {
+ children: ReactNode;
+};
+
+export default function AccountSimpleLayout({ children }: AccountSimpleLayoutProps) {
+ return (
+
- 
-
-
- {i18nText('insertInfo', locale)}
-
- {i18nText('changeUserData', locale)}
-
+
+ );
+};
diff --git a/src/app/[locale]/account/(simple)/rooms/[...slug]/page.tsx b/src/app/[locale]/account/(simple)/rooms/[...slug]/page.tsx
new file mode 100644
index 0000000..b6f024c
--- /dev/null
+++ b/src/app/[locale]/account/(simple)/rooms/[...slug]/page.tsx
@@ -0,0 +1,57 @@
+import React, { Suspense } from 'react';
+import { unstable_setRequestLocale } from 'next-intl/server';
+import { notFound } from 'next/navigation';
+import { AccountMenu, RoomDetails, RoomsTabs } from '../../../../../../components/Account';
+import { RoomsType } from '../../../../../../types/rooms';
+
+const ROOMS_ROUTES = [RoomsType.UPCOMING, RoomsType.RECENT, RoomsType.NEW];
+
+export async function generateStaticParams({
+ params: { locale },
+}: { params: { locale: string } }) {
+ return [{ locale, slug: [RoomsType.UPCOMING] }];
+}
+
+export default function RoomsDetailItem({ params: { locale, slug } }: { params: { locale: string, slug?: string[] } }) {
+ unstable_setRequestLocale(locale);
+ const roomType: string = slug?.length > 0 && slug[0] || '';
+ const roomId: number | null = slug?.length > 1 && Number(slug[1]) || null;
+
+ if (!slug?.length || slug?.length > 2) {
+ notFound();
+ }
+
+ if (ROOMS_ROUTES.includes(roomType as RoomsType) && Number.isInteger(roomId)) {
+ return (
+
+
+
+ {children}
+
+
+
+
+
+
+
+ );
+ }
+
+ return notFound();
+};
diff --git a/src/app/[locale]/account/(simple)/rooms/page.tsx b/src/app/[locale]/account/(simple)/rooms/page.tsx
new file mode 100644
index 0000000..b4ed706
--- /dev/null
+++ b/src/app/[locale]/account/(simple)/rooms/page.tsx
@@ -0,0 +1,12 @@
+'use client';
+
+import { redirect } from 'next/navigation';
+import { useLocalStorage } from '../../../../../hooks/useLocalStorage';
+import { AUTH_TOKEN_KEY } from '../../../../../constants/common';
+import { RoomsType } from '../../../../../types/rooms';
+
+export default function RoomsMainPage() {
+ const [token] = useLocalStorage(AUTH_TOKEN_KEY, '');
+
+ return token ? redirect(`rooms/${RoomsType.UPCOMING}`) : null;
+};
diff --git a/src/app/[locale]/account/(simple)/sessions/[...slug]/page.tsx b/src/app/[locale]/account/(simple)/sessions/[...slug]/page.tsx
new file mode 100644
index 0000000..59339bf
--- /dev/null
+++ b/src/app/[locale]/account/(simple)/sessions/[...slug]/page.tsx
@@ -0,0 +1,57 @@
+import React, { Suspense } from 'react';
+import { unstable_setRequestLocale } from 'next-intl/server';
+import { notFound } from 'next/navigation';
+import { AccountMenu, SessionDetails, SessionsTabs } from '../../../../../../components/Account';
+import { SessionType } from '../../../../../../types/sessions';
+
+const SESSION_ROUTES = [SessionType.UPCOMING, SessionType.REQUESTED, SessionType.RECENT];
+
+export async function generateStaticParams({
+ params: { locale },
+}: { params: { locale: string } }) {
+ return [{ locale, slug: [SessionType.UPCOMING] }];
+}
+
+export default function SessionDetailItem({ params: { locale, slug } }: { params: { locale: string, slug?: string[] } }) {
+ unstable_setRequestLocale(locale);
+ const sessionType: string = slug?.length > 0 && slug[0] || '';
+ const sessionId: number | null = slug?.length > 1 && Number(slug[1]) || null;
+
+ if (!slug?.length || slug?.length > 2) {
+ notFound();
+ }
+
+ if (SESSION_ROUTES.includes(sessionType as SessionType) && Number.isInteger(sessionId)) {
+ return (
+
+ Loading...}>
+
+
+
+
+
+
+
+
+ );
+ }
+
+ return notFound();
+};
diff --git a/src/app/[locale]/account/(simple)/sessions/page.ts b/src/app/[locale]/account/(simple)/sessions/page.ts
new file mode 100644
index 0000000..812e262
--- /dev/null
+++ b/src/app/[locale]/account/(simple)/sessions/page.ts
@@ -0,0 +1,12 @@
+'use client';
+
+import { redirect } from 'next/navigation';
+import { useLocalStorage } from '../../../../../hooks/useLocalStorage';
+import { AUTH_TOKEN_KEY } from '../../../../../constants/common';
+import { SessionType } from '../../../../../types/sessions';
+
+export default function SessionsMainPage() {
+ const [token] = useLocalStorage(AUTH_TOKEN_KEY, '');
+
+ return token ? redirect(`sessions/${SessionType.UPCOMING}`) : null;
+};
diff --git a/src/app/[locale]/account/layout.tsx b/src/app/[locale]/account/layout.tsx
index f9f0410..bb642a6 100644
--- a/src/app/[locale]/account/layout.tsx
+++ b/src/app/[locale]/account/layout.tsx
@@ -1,18 +1,14 @@
'use client';
-import { ReactNode, useEffect } from 'react';
-import { redirect, notFound } from 'next/navigation';
-import { useLocalStorage } from '../../../hooks/useLocalStorage';
-import { AUTH_TOKEN_KEY } from '../../../constants/common';
+import { ReactNode } from 'react';
+import dynamic from 'next/dynamic';
-export default function AccountLayout({ children }: { children: ReactNode }) {
- const [token] = useLocalStorage(AUTH_TOKEN_KEY, '');
+const Account = dynamic(() => import('../../../components/Account/AccountWrapper'), { ssr: false });
- useEffect(() => {
- if(!token){
- notFound();
- }
- }, []);
-
- return children;
+export default function AccountBaseLayout({ children }: { children: ReactNode }) {
+ return (
+
+ Loading...}>
+
+
+
-
- );
-};
diff --git a/src/app/[locale]/blog/[slug]/page.tsx b/src/app/[locale]/blog/[slug]/page.tsx
new file mode 100644
index 0000000..df0e865
--- /dev/null
+++ b/src/app/[locale]/blog/[slug]/page.tsx
@@ -0,0 +1,112 @@
+import React from 'react';
+import type {Metadata, ResolvingMetadata} from 'next';
+import { draftMode } from 'next/headers'
+import { notFound } from 'next/navigation';
+import {fetchBlogPost, fetchBlogPosts, Widget} from "../../../../lib/contentful/blogPosts";
+import Util from "node:util";
+import RichText from "../../../../lib/contentful/RichText";
+import Link from "next/link";
+
+interface BlogPostPageParams {
+ slug: string
+ locale: string
+}
+
+interface BlogPostPageProps {
+ params: BlogPostPageParams
+}
+
+export async function generateMetadata({ params }: BlogPostPageProps, parent: ResolvingMetadata): Promise
-
- 6 learnings from Shivpuri to Silicon Valley
-Leadership & Management
-
- {`news id ${params.blogId}`}
- I’m excited to kick off this series of newsletters where I’ll be sharing my experiences, learnings, - and best practices which helped me to grow both in my personal and professional life. My hope is to - give back to the community and help anyone connect directly with me who may have got impacted with - recent layoffs, dealing with immigration challenges. -
- - I’m excited to kick off this series of newsletters where I’ll be sharing my experiences, learnings, - and best practices which helped me to grow both in my personal and professional life. My hope is to - give back to the community and help anyone connect directly with me who may have got impacted with - recent layoffs, dealing with immigration challenges. -
- 
-
-
-
-
-
- 
-
-
-
-
- Sonali Garg
- February 6th, 2023
-
-
-
-
- 165
-
-
- 165
-
-
- Share
-
-
- Share
-
-
- - This is not about layoffs, it's about living with whatever life throws at you.. -
-- Over the past few months, as the macro-economic events have unfolded, I have heard voices filled - with anxiety, helplessness and general lack of confidence to deal with this ambiguity from my - mentees, colleagues, friends and family. I was laid off from Meta last November and I firmly - believe this is nothing but a bump in the road that might seem like a steep climb in the - short-term. I may not have all the answers but this has inspired me to share my story. If you - are looking for a sob story, you can stop reading now. Ever wondered what it takes for a girl - born into a conservative family in a small sleepy town in India, who lost one of her parents at - age 17, earned her living while pursuing engineering, moved to the UK by herself and ended up - working in big tech in Silicon valley? My goal with this series of posts is to inspire and share - my mental models that helped me throughout my professional and personal life. -
-- After completing my engineering, I started my career at a small software company in Bhopal and - then worked for TCS(Tata Consultancy Services), one of the largest IT-outsourcing companies in - the world for almost 5 years. Over the past 14 years, I have worked for big tech companies like - Meta (Facebook) and Google, wore multiple hats, led strategic programs, scaled multi - billion-dollar businesses, built teams and helped achieve business operational excellence. - Throughout my career, I’ve dealt with several challenges from execution to scale to building a - high performance team. A lot of my early struggles were about how to assimilate in a new - culture, create a network in a new environment, earn trust, create and nurture work - relationships into fruitful friendships and so on. -
-- I was born in a conservative family in a small town called ‘Shivpuri’, also known as ‘Mini - Kashmir’ because of its natural beauty. My father was a civil engineer working on Madikheda Dam - on Sindh river and was a strict disciplinarian. He was gone from dawn to dusk and was always - focused. My mother was a teacher in a school that was about 30 kms from our home. We (me and my - sister) would often be left with neighbors to be taken care of and this led us to become - independent at an early age. Our otherwise slow paced, simple life with only a few families - around in the government quarters that were set up to support construction of the dam was filled - with natural beauty, wildlife and a community of close friends. Our lives were balanced and - while my parents worked hard to provide basic needs, we were satisfied. There were only a few - schools with Hindi being the prevalent language as the medium of teaching. There were no - colleges for advanced studies and most girls did not go to college often married off by their - 18th birthday. Generally speaking, we had a joyous childhood with just the basics. While most - folks we interacted with were not highly educated nor ambitious, earned lower middle class - salaries and lacked exposure to the outside world but there was plenty to learn from them. - People had learnt to stick together in good and bad times. They embodied the old school - qualities of hard work, dedication and commitment. Be willing to give it all- hard work, - dedication and commitment. -
-- In 2003, my father passed away suddenly and we found ourselves in crisis. My mother was a - teacher and she did not have time to deal with her grief. Rather, she was struggling to garner - support to get transferred to a school in Bhopal, capital of Madhya Pradesh to be closer to our - maternal grandparents. As we uprooted ourselves from Shivpuri to Bhopal, one of my father’s - loyal friends came to help load the moving truck. While he had nothing to gain out of us, he - continued to serve us until the last day in Shivpuri. Remember, in crisis your team matters more - than any other time. Advocate for them ruthlessly in good and bad times, they will come through - in crisis. -
-- Eventually we found our footing, my mother’s job was transferred to a local school in Bhopal and - I got admission in a government engineering college. My sister was still attending high school - and both of us were teaching tuition classes to middle school students in the evenings to make - ends meet. I also started a tiffin service for a few out of town students while attending - college to pay for my transportation and cost of supplies. We refused to give up. Persevere when - all else fails. -
-- Our 5 years went by quickly in Bhopal as we worked towards improving our financial situation and - I completed my Bachelors in Computer Science. This was the time I first stepped out to live in a - metropolitan city, Mumbai for my job at TCS. This was a paradigm shift from Bhopal and I was - blown away to meet so many talented folks in Mumbai. In my head, I did not belong in this place. - I had imposter syndrome and felt like an outsider trying to make it in a new city. Most people I - met were fluent in more than 1 language, well-dressed, communicated openly and with confidence, - and presented themselves well. I was always in a dilemma when it came to adopting values. It - took me a while to adjust to it but I was still not confident about my work and communication - while my hard skills that I learnt in engineering were top notch. I kept questioning my - abilities but persisted. This was not the first time I was out of my comfort zone. Persist, when - in discomfort. -
-- I worked with multiple global companies who were clients of TCS and was presented an opportunity - to move to Scotland, UK for an year to work for GE, who was also a client. This was my first - opportunity to explore a different culture, food, music, languages etc. I remember working on my - english when in Mumbai, in preparation for my UK trip. It was really difficult to understand the - accent in the UK, even though language was not a barrier. I still remember certain words would - just not get across no matter how hard some of my colleagues tried and they would end up using - signs to convey. Be prepared, opportunities come to those who are prepared. -
-- In 2013, I came to the US on a dependent visa after marriage and quickly realized the curse of - H4 visa. I paved my path by going back to school at UC Berkeley and then jumped back into - building my career from scratch. While working in the US over the past years, I realized college - degrees with good grades and certifications definitely help you to get your foot in the door but - are not enough to be successful in your career. As I was again starting from scratch in a new - culture, determined to do whatever it takes, having done this a few times before, it doesn’t - scare me as much. Never be afraid to start from zero again! -
-
+
+ )
+ case 'widgetMedia':
+ return (
+ + {widget.widget.subTitle} +
+
+
+
+ );
+};
diff --git a/src/app/[locale]/blog/category/[slug]/page.tsx b/src/app/[locale]/blog/category/[slug]/page.tsx
new file mode 100644
index 0000000..2c897ed
--- /dev/null
+++ b/src/app/[locale]/blog/category/[slug]/page.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import type { Metadata } from 'next';
+import { draftMode } from 'next/headers'
+import {unstable_setRequestLocale} from "next-intl/server";
+import Link from "next/link";
+import {fetchBlogPosts} from "../../../../../lib/contentful/blogPosts";
+import {fetchBlogPostCategories} from "../../../../../lib/contentful/blogPostsCategories";
+import {BlogPosts} from "../../../../../components/BlogPosts/BlogPosts";
+
+export const metadata: Metadata = {
+ title: 'Bbuddy - Blog',
+ description: 'Bbuddy desc blog'
+};
+
+interface BlogPostPageParams {
+ slug: string
+ locale: string
+}
+interface BlogPostPageProps {
+ params: BlogPostPageParams
+}
+
+export default async function Blog({params, searchParams}: { params: BlogPostPageParams, searhParams?: {page: number} }) {
+ unstable_setRequestLocale(params.locale);
+ const page = searchParams.page || undefined
+ return (
+
+
+ {item.title}
+{item.category}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {item.author?.name}
+ {item.createdAt}
+
+
+
+
+ 165
+
+
+ 165
+
+
+ Share
+
+
+ Share
+
+ {item.body.map(renderWidget)}
+
+
+
+
+
+
-
+
+
-
-
-
- Mentorship, Career
-
-
- Mentorship, Career
- Development & Coaching.
-
-
-
- The ins-and-outs of building a career in tech, gaining
experience
from a mentor, and getting your feet wet with coaching.
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
- 6 learnings from Shivpuri to Silicon Valley
-
- Leadership & Management
-
- I’m excited to kick off this series of newsletters where I’ll be sharing my
- experiences,
- learnings, and best practices which helped me to grow both in my personal and
- professional life. My hope is to give back to the community and help anyone
- connect directly with me who may have got impacted with recent layoffs,
- dealing with immigration challenges.
-
-
-
-
-
-
-
-
-
- Sonali Garg
- February 6th, 2023
-
-
-
-
- 165
-
-
- 165
-
-
- Share
-
-
- Share
-
-
-
-
-
-
-
-
-
-
-
- 6 learnings from Shivpuri to Silicon Valley
-
- Leadership & Management
-
- I’m excited to kick off this series of newsletters where I’ll be sharing my
- experiences,
- learnings, and best practices which helped me to grow both in my personal and
- professional life. My hope is to give back to the community and help anyone
- connect directly with me who may have got impacted with recent layoffs,
- dealing with immigration challenges.
-
-
-
-
-
-
-
-
-
- Sonali Garg
- February 6th, 2023
-
-
-
-
- 165
-
-
- 165
-
-
- Share
-
-
- Share
-
-
-
-
-
-
-
-
-
-
-
- 6 learnings from Shivpuri to Silicon Valley
-
- Leadership & Management
-
- I’m excited to kick off this series of newsletters where I’ll be sharing my
- experiences,
- learnings, and best practices which helped me to grow both in my personal and
- professional life. My hope is to give back to the community and help anyone
- connect directly with me who may have got impacted with recent layoffs,
- dealing with immigration challenges.
-
-
-
-
-
-
-
-
-
- Sonali Garg
- February 6th, 2023
-
-
-
-
- 165
-
-
- 165
-
-
- Share
-
-
- Share
-
-
-
-
-
-
-
-
-
-
- 6 learnings from Shivpuri to Silicon Valley
-
- Leadership & Management
-
- I’m excited to kick off this series of newsletters where I’ll be sharing my
- experiences,
- learnings, and best practices which helped me to grow both in my personal and
- professional life. My hope is to give back to the community and help anyone
- connect directly with me who may have got impacted with recent layoffs,
- dealing with immigration challenges.
-
-
-
-
-
-
-
-
-
- Sonali Garg
- February 6th, 2023
-
-
-
-
- 165
-
-
- 165
-
-
- Share
-
-
- Share
- 
- Back to experts list
+ {i18nText('backToExperts', locale)}
Expert Background
+{i18nText('expertBackground', locale)}
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet, lectus nec viverra malesuada, ligula sem tempor risus, non posuere urna diam a libero. @@ -98,7 +91,7 @@ export default async function ExpertItem({ params: { expertId = '', locale} }: { {expert?.publicCoachDetails?.educations && expert.publicCoachDetails.educations?.map(generateDescription)} {expert?.publicCoachDetails?.certificates && expert.publicCoachDetails.certificates.length > 0 && (
-
-
+ */}
Professional Certification
+{i18nText('profCertification', locale)}
{expert.publicCoachDetails.certificates?.map((cert) => (
@@ -116,9 +109,13 @@ export default async function ExpertItem({ params: { expertId = '', locale} }: {
{expert?.publicCoachDetails?.trainings && expert.publicCoachDetails.trainings?.map(generateDescription)}
{expert?.publicCoachDetails?.mbas && expert.publicCoachDetails.mbas?.map(generateDescription)}
{expert?.publicCoachDetails?.experiences && expert.publicCoachDetails.experiences?.map(generateDescription)}
-
All Offers by this Expert
+ {/*All Offers by this Expert
@@ -164,7 +161,7 @@ export default async function ExpertItem({ params: { expertId = '', locale} }: {
+
+
({});
const onLogout = () => {
deleteStorageKey(AUTH_TOKEN_KEY);
deleteStorageKey(AUTH_USER);
window?.location?.replace(`/${paths.split('/')[1]}/`);
};
+ const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
+ let init = false
+ useEffect(() => {
+ if (jwt && locale && !init) {
+ init = true;
+ getChatList(locale, jwt).then((payload: any)=> {
+ if (payload?.directs) {
+ let summ = 0;
+ payload?.directs.forEach((el: any) => {
+ summ = summ + el.newMessagesCount
+ })
+ setCounts({'messages': summ})
+ }
+ })
+ }
+ }, [jwt, locale])
- const onDeleteAccount = () => {
- console.log('delete');
- };
+ const getterCount = (path: string, count: number)=> {
+ return counts[path]? counts[path] : count
+ }
return (
>[0];
-
export const ProfileSettings: FC = ({ locale }) => {
- const [form] = Form.useForm();
- const { profileSettings } = useProfileSettings(locale);
+ const [form] = Form.useForm();
+ const { profileSettings, fetchProfileSettings, save, fetchLoading } = useProfileSettings(locale);
+ const [showDeleteModal, setShowDeleteModal] = useState(false);
+ const [saveLoading, setSaveLoading] = useState(false);
+ const [photo, setPhoto] = useState();
+ const router = useRouter();
+
+ useEffect(() => {
+ fetchProfileSettings()
+ }, []);
useEffect(() => {
if (profileSettings) {
@@ -27,72 +38,162 @@ export const ProfileSettings: FC = ({ locale }) => {
}
}, [profileSettings]);
- const [fileList, setFileList] = useState();
+ const onSave = (newProfile: ProfileRequest) => {
+ setSaveLoading(true);
+ save(newProfile)
+ .then(() => {
+ fetchProfileSettings();
+ })
+ .catch(() => {
+ message.error('Не удалось сохранить изменения');
+ })
+ .finally(() => {
+ setSaveLoading(false);
+ })
+ }
- const onChange: UploadProps['onChange'] = ({ fileList: newFileList }) => {
- setFileList(newFileList);
- };
+ const onSaveProfile = () => {
+ form.validateFields()
+ .then(({ login, surname, username }) => {
+ const { phone, role, languagesLinks } = profileSettings || {};
+ const newProfile: ProfileRequest = {
+ phone,
+ role,
+ login,
+ surname,
+ username,
+ isPasswordKeepExisting: true,
+ isFaceImageKeepExisting: true,
+ languagesLinks: languagesLinks?.map(({ languageId }) => ({ languageId })) || []
+ };
- const onPreview = async (file: UploadFile) => {
- // let src = file.url as string;
- // if (!src) {
- // src = await new Promise((resolve) => {
- // const reader = new FileReader();
- // reader.readAsDataURL(file.originFileObj as FileType);
- // reader.onload = () => resolve(reader.result as string);
- // });
- // }
- // const image = new Image();
- // image.src = src;
- // const imgWindow = window.open(src);
- // imgWindow?.document.write(image.outerHTML);
- };
+ if (photo) {
+ const reader = new FileReader();
+ reader.readAsDataURL(photo as File);
+ reader.onloadend = () => {
+ const newReg = new RegExp('data:image/(png|jpg|jpeg);base64,')
+ newProfile.faceImage = reader?.result?.replace(newReg, '');
+ newProfile.isFaceImageKeepExisting = false;
+
+ onSave(newProfile);
+ }
+ } else {
+ onSave(newProfile);
+ }
+ })
+ }
+
+ const beforeCrop = (file: UploadFile) => {
+ return validateImage(file, true);
+ }
+
+ const beforeUpload = (file: UploadFile) => {
+ const isValid = validateImage(file);
+
+ if (isValid) {
+ setPhoto(file);
+ }
+
+ return false;
+ }
+
+ const onDeleteAccount = () => setShowDeleteModal(true);
return (
-
+
+
+
+ setShowDeleteModal(false)}
+ />
+
+
);
};
diff --git a/src/components/Account/agora/Agora.tsx b/src/components/Account/agora/Agora.tsx
new file mode 100644
index 0000000..79c5bbb
--- /dev/null
+++ b/src/components/Account/agora/Agora.tsx
@@ -0,0 +1,59 @@
+'use client'
+
+import { useJoin } from 'agora-rtc-react';
+import { useEffect, useState } from 'react';
+import { MediaControl } from './view';
+import { LocalUserPanel, RemoteUserPanel } from './components';
+import { PublicUser } from '../../../types/sessions';
+
+type AgoraProps = {
+ sessionId: number;
+ secret?: string;
+ stopCalling: () => void;
+ remoteUser?: PublicUser;
+};
+
+export const Agora = ({ sessionId, secret, stopCalling, remoteUser }: AgoraProps) => {
+ const [calling, setCalling] = useState(false);
+ const [micOn, setMic] = useState(false);
+ const [cameraOn, setCamera] = useState(false);
+
+ useEffect(() => {
+ setCalling(true);
+ }, []);
+
+ useJoin(
+ {
+ appid: process.env.NEXT_PUBLIC_AGORA_APPID,
+ channel: `${sessionId}-${secret}`,
+ token: null,
+ },
+ calling,
+ );
+
+ const stop = () => {
+ stopCalling();
+ setCalling(false);
+ };
+
+ return (
+ ;
+ /**
+ * Device ID, which can be retrieved by calling `getDevices()`.
+ */
+ readonly deviceId?: string;
+}
+
+export const CameraVideoTrack = ({
+ track: maybeTrack,
+ deviceId,
+ ...props
+}: CameraVideoTrackProps) => {
+ const track = useAwaited(maybeTrack);
+
+ useEffect(() => {
+ if (track && deviceId != null) {
+ track.setDevice(deviceId).catch(console.warn);
+ }
+ }, [deviceId, track]);
+
+ return {
+ /**
+ * Whether to turn on the local user's microphone. Default false.
+ */
+ readonly micOn?: boolean;
+ /**
+ * Whether to turn on the local user's camera. Default false.
+ */
+ readonly cameraOn?: boolean;
+ /**
+ * A microphone audio track which can be created by `createMicrophoneAudioTrack()`.
+ */
+ readonly audioTrack?: MaybePromiseOrNull;
+ /**
+ * A camera video track which can be created by `createCameraVideoTrack()`.
+ */
+ readonly videoTrack?: MaybePromiseOrNull;
+ /**
+ * Whether to play the local user's audio track. Default follows `micOn`.
+ */
+ readonly playAudio?: boolean;
+ /**
+ * Whether to play the local user's video track. Default follows `cameraOn`.
+ */
+ readonly playVideo?: boolean;
+ /**
+ * Device ID, which can be retrieved by calling `getDevices()`.
+ */
+ readonly micDeviceId?: string;
+ /**
+ * Device ID, which can be retrieved by calling `getDevices()`.
+ */
+ readonly cameraDeviceId?: string;
+ /**
+ * The volume. The value ranges from 0 (mute) to 1000 (maximum). A value of 100 is the current volume.
+ */
+ readonly volume?: number;
+ /**
+ * Render cover image if playVideo is off.
+ */
+ readonly cover?: string;
+ /**
+ * Children is rendered on top of the video canvas.
+ */
+ readonly children?: ReactNode;
+}
+
+/**
+ * Play/Stop local user camera and microphone track.
+ */
+export function LocalUser({
+ micOn,
+ cameraOn,
+ audioTrack,
+ videoTrack,
+ playAudio = false,
+ playVideo,
+ micDeviceId,
+ cameraDeviceId,
+ volume,
+ cover,
+ children,
+ style,
+ ...props
+}: LocalUserProps) {
+ playVideo = playVideo ?? !!cameraOn;
+ playAudio = playAudio ?? !!micOn;
+ return (
+ ;
+ /**
+ * Device ID, which can be retrieved by calling `getDevices()`.
+ */
+ readonly deviceId?: string;
+
+ readonly children?: ReactNode;
+}
+
+export const MicrophoneAudioTrack = ({
+ track: maybeTrack,
+ deviceId,
+ ...props
+}: MicrophoneAudioTrackProps) => {
+ const track = useAwaited(maybeTrack);
+
+ useEffect(() => {
+ if (track && deviceId != null) {
+ track.setDevice(deviceId).catch(console.warn);
+ }
+ }, [deviceId, track]);
+
+ return {
+ /**
+ * A remote track
+ */
+ readonly track?: IRemoteVideoTrack;
+ /**
+ * Whether to play the remote user's video track. Default follows `user.hasVideo`.
+ */
+ readonly playVideo?: boolean;
+ /**
+ * Render cover image if playVideo is off.
+ */
+ readonly cover?: string | (() => ReactNode);
+ /**
+ * Children is rendered on top of the video canvas.
+ */
+ readonly children?: ReactNode;
+ /**
+ * client instance
+ */
+ readonly client?: IAgoraRTCClient | null;
+}
+
+/**
+ * Subscribe and play remote user video track.
+ * An `IRemoteVideoTrack` can only be own by one `RemoteVideoPlayer`.
+ */
+export function RemoteVideoPlayer({
+ track,
+ playVideo,
+ cover,
+ client,
+ style,
+ children,
+ ...props
+}: RemoteVideoPlayerProps) {
+ const resolvedClient = useRTCClient(client);
+ const hasVideo = resolvedClient.remoteUsers?.find(user => user.uid === track?.getUserId())?.hasVideo;
+ playVideo = playVideo ?? hasVideo;
+
+ return (
+ ;
+
+const MicOnSvg = () => (
+
+);
+
+const MicOffSvg = () => (
+
+);
+
+const CameraOnSvg = () => (
+
+);
+
+const CameraOffSvg = () => (
+
+);
+
+const PhoneSvg = () => (
+
+);
+
+export const MicOnIcon = (props: Partial) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+
+ {session && (
+
+ ) : null;
+};
+
+export const AgoraClientGroup = ({ room, stopCalling }: { room?: Room, stopCalling: () => void }) => {
+ return room ? (
+
+ {room && (
+
+ ) : null;
+};
diff --git a/src/components/Account/agora/view/MediaControl.tsx b/src/components/Account/agora/view/MediaControl.tsx
new file mode 100644
index 0000000..334e6c8
--- /dev/null
+++ b/src/components/Account/agora/view/MediaControl.tsx
@@ -0,0 +1,49 @@
+import { Button } from 'antd';
+import { MicOffIcon, MicOnIcon, CameraOnIcon, CameraOffIcon, PhoneIcon } from '../icons';
+
+interface MediaControlProps {
+ calling: boolean;
+ micOn: boolean;
+ cameraOn: boolean;
+ setMic: () => void;
+ setCamera: () => void;
+ setCalling: () => void;
+}
+
+export const MediaControl = ({
+ calling,
+ micOn,
+ cameraOn,
+ setMic,
+ setCamera,
+ setCalling,
+}: MediaControlProps) => (
+ ();
+ const [loading, setLoading] = useState(false);
+ const router = useRouter();
+
+ const getRoom = debounce(() => {
+ createRoom(locale, jwt)
+ .then((data) => {
+ setRoomId(data);
+ })
+ .finally(() => {
+ setLoading(false);
+ })
+ }, 500);
+
+ useEffect(() => {
+ setLoading(true);
+ getRoom();
+ }, []);
+
+ return (
+
+ {roomId && (
+ router.push(`/account/rooms/${RoomsType.UPCOMING}`)}
+ />
+ )}
+
+ )
+};
diff --git a/src/components/Account/rooms/EditRoomForm.tsx b/src/components/Account/rooms/EditRoomForm.tsx
new file mode 100644
index 0000000..899f7d0
--- /dev/null
+++ b/src/components/Account/rooms/EditRoomForm.tsx
@@ -0,0 +1,220 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { Button, Form, Input, notification } from 'antd';
+import dayjs, { Dayjs } from 'dayjs';
+import { i18nText } from '../../../i18nKeys';
+import { Tag } from '../../../types/tags';
+import { Slot } from '../../../types/experts';
+import { RoomEdit, RoomEditDTO } from '../../../types/rooms';
+import { getRoomById, updateRoom } from '../../../actions/rooms';
+import { Loader } from '../../view/Loader';
+import { CustomInput } from '../../view/CustomInput';
+import { CustomSelect } from '../../view/CustomSelect';
+import { CustomSwitch } from '../../view/CustomSwitch';
+import { CustomMultiSelect } from '../../view/CustomMultiSelect';
+import { CustomDatePicker } from '../../view/CustomDatePicker';
+
+type EditRoomFormProps = {
+ roomId: number,
+ locale: string,
+ jwt: string,
+ mode: 'create' | 'edit';
+ afterSubmit?: () => void;
+}
+
+type RoomFormState = {
+ title?: string;
+ description?: string;
+ date?: Dayjs;
+ maxCount?: number;
+ startAt?: string;
+ supervisor?: boolean;
+ tags?: number[];
+};
+
+export const EditRoomForm = ({ roomId, locale, jwt, mode, afterSubmit }: EditRoomFormProps) => {
+ const [form] = Form.useForm();
+ const [editingRoom, setEditingRoom] = useState();
+ const dateValue = Form.useWatch('date', form);
+ const [loading, setLoading] = useState(false);
+ const [fetchLoading, setFetchLoading] = useState(false);
+
+ useEffect(() => {
+ setFetchLoading(true);
+ getRoomById(locale, jwt, roomId)
+ .then((data) => {
+ setEditingRoom(data);
+ const { item } = data || {};
+
+ if (mode === 'edit' && item) {
+ form.setFieldsValue({
+ title: item.title,
+ description: item.description,
+ date: item?.scheduledStartAtUtc ? dayjs(item.scheduledStartAtUtc) : undefined,
+ maxCount: item.maxClients,
+ startAt: item?.scheduledStartAtUtc,
+ supervisor: item.isNeedSupervisor,
+ tags: item.tagIds || undefined
+ })
+ }
+ })
+ .finally(() => {
+ setFetchLoading(false);
+ })
+ }, []);
+
+ const getAvailableSlots = useCallback((): string[] => {
+ const dateList = new Set();
+ if (editingRoom?.availableSlots) {
+ editingRoom.availableSlots.forEach(({ startTime }) => {
+ const [date] = startTime.split('T');
+ dateList.add(dayjs(date).format('YYYY-MM-DD'));
+ });
+
+ return Array.from(dateList);
+ }
+
+ return [];
+ }, [editingRoom?.availableSlots]);
+
+ const getTimeOptions = (slots?: Slot[], curDate?: Dayjs) => {
+ const date = curDate ? curDate.format('YYYY-MM-DD') : '';
+ if (slots && slots?.length && date) {
+ return slots.filter(({ startTime }) => dayjs(startTime).format('YYYY-MM-DD') === date)
+ .map(({ startTime, endTime }) => ({ value: startTime, label: `${dayjs(startTime).format('HH:mm')} - ${dayjs(endTime).format('HH:mm')}` }));
+ }
+
+ return [];
+ }
+
+ const getTagsOptions = (tags?: Tag[]) => {
+ if (tags) {
+ return tags.map(({ id, name }) => ({ value: id, label: {name} })) || [];
+ }
+
+ return [];
+ }
+
+ const onSubmit = () => {
+ setLoading(true);
+ const { title, description, startAt, maxCount, tags, supervisor } = form.getFieldsValue();
+ const result: RoomEdit = {
+ ...editingRoom,
+ id: roomId,
+ title,
+ scheduledStartAtUtc: startAt,
+ maxClients: maxCount,
+ isNeedSupervisor: supervisor,
+ tagIds: tags || []
+ };
+
+ if (description) {
+ result.description = description;
+ }
+
+ updateRoom(locale, jwt, result)
+ .then(() => {
+ afterSubmit && afterSubmit();
+ })
+ .catch((err) => {
+ notification.error({
+ message: 'Error',
+ description: err?.response?.data?.errMessage
+ });
+ })
+ .finally(() => {
+ setLoading(false)
+ });
+ }
+
+ const disabledDate = (current: Dayjs) => current && !getAvailableSlots().includes(current.format('YYYY-MM-DD'));
+
+ return (
+
+
+
+ );
+};
diff --git a/src/components/Account/rooms/RoomDetails.tsx b/src/components/Account/rooms/RoomDetails.tsx
new file mode 100644
index 0000000..cf3c0d2
--- /dev/null
+++ b/src/components/Account/rooms/RoomDetails.tsx
@@ -0,0 +1,88 @@
+'use client'
+
+import React, { useEffect, useState } from 'react';
+import { RoomsType } from '../../../types/rooms';
+import { useSessionTracking } from '../../../actions/hooks/useSessionTracking';
+import { AccountMenu } from '../AccountMenu';
+import { Loader } from '../../view/Loader';
+import { RoomDetailsContent } from './RoomDetailsContent';
+import { useRoomDetails } from '../../../actions/hooks/useRoomDetails';
+import { AgoraClientGroup } from '../agora';
+import { SupervisorReportModal } from '../../Modals/SupervisorReportModal';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { AUTH_USER } from '../../../constants/common';
+
+type RoomDetailsProps = {
+ locale: string;
+ roomId: number;
+ activeType: RoomsType;
+};
+
+export const RoomDetails = ({ roomId, locale, activeType }: RoomDetailsProps) => {
+ const { room, errorData, loading, fetchData, isStarted } = useRoomDetails(locale, roomId);
+ const tracking = useSessionTracking(locale, roomId);
+ const [isCalling, setIsCalling] = useState(false);
+ const [isOpenReport, setIsOpenReport] = useState(false);
+ const [userData] = useLocalStorage(AUTH_USER, '');
+ const { id: userId = 0 } = userData ? JSON.parse(userData) : {};
+ const isSupervisor = room?.supervisor && room.supervisor.id === +userId || false;
+
+ useEffect(() => {
+ if (isCalling) {
+ tracking.start();
+ } else {
+ tracking.stop();
+ }
+ }, [isCalling]);
+
+ useEffect(() => {
+ if (isSupervisor && isStarted) {
+ setIsOpenReport(true);
+ }
+ }, [isStarted]);
+
+ const stopCalling = () => {
+ setIsCalling(false);
+ fetchData();
+ }
+
+ return isCalling
+ ? (
+ (false);
+ const [forSupervisor, setForSupervisor] = useState(false);
+ const startDate = room?.scheduledStartAtUtc ? dayjs(room?.scheduledStartAtUtc).locale(locale) : null;
+ const endDate = room?.scheduledEndAtUtc ? dayjs(room?.scheduledEndAtUtc).locale(locale) : null;
+ const today = startDate ? dayjs().format('YYYY-MM-DD') === startDate.format('YYYY-MM-DD') : false;
+ const isCreator = room?.coach && room.coach.id === +userId || false;
+ const isSupervisor = room?.supervisor && room.supervisor.id === +userId || false;
+ const isClient = room?.clients && room.clients.length > 0 && room.clients.map(({ id }) => id).includes(+userId) || false;
+ const isTimeBeforeStart = room?.scheduledStartAtUtc ? dayjs() < dayjs(room.scheduledStartAtUtc) : false;
+ const [isEdit, setIsEdit] = useState(false);
+ const [report, setReport] = useState();
+
+ useEffect(() => {
+ if (room?.id && room?.supervisor && activeType === RoomsType.RECENT) {
+ getReport(locale, jwt, room.id)
+ .then((data) => {
+ setReport(data);
+ })
+ }
+ }, [room])
+
+ const goBack = () => router.push(`/account/rooms/${activeType}`);
+
+ const checkUserApply = (): boolean => (!room?.supervisor || !isSupervisor) && (!room?.clients || room?.clients && room?.clients.length === 0 || !isClient);
+
+ const deleteClient = (clientUserId: number) => {
+ if (room?.id) {
+ deleteRoomClient(locale, jwt, { sessionId: room.id, clientUserId })
+ .then(() => {
+ refresh();
+ })
+ .catch((err) => {
+ notification.error({
+ message: 'Error',
+ description: err?.response?.data?.errMessage
+ });
+ });
+ }
+ };
+
+ const deleteSupervisor = (supervisorUserId?: number) => {
+ if (room?.id && supervisorUserId) {
+ deleteRoomSupervisor(locale, jwt, { sessionId: room.id, supervisorUserId })
+ .then(() => {
+ refresh();
+ })
+ .catch((err) => {
+ notification.error({
+ message: 'Error',
+ description: err?.response?.data?.errMessage
+ });
+ })
+ }
+ };
+
+ const becomeClient = () => {
+ if (room?.id && userId) {
+ becomeRoomClient(locale, jwt, { sessionId: room.id, clientUserId: +userId })
+ .then(() => {
+ refresh();
+ })
+ .catch((err) => {
+ notification.error({
+ message: 'Error',
+ description: err?.response?.data?.errMessage
+ });
+ });
+ }
+ };
+
+ const becomeSupervisor = () => {
+ if (room?.id && userId) {
+ becomeRoomSupervisor(locale, jwt, { sessionId: room.id, supervisorUserId: +userId })
+ .then(() => {
+ refresh();
+ })
+ .catch((err) => {
+ notification.error({
+ message: 'Error',
+ description: err?.response?.data?.errMessage
+ });
+ });
+ }
+ };
+
+ const onInviteSupervisor = () => {
+ setForSupervisor(true)
+ setShowModal(true);
+ };
+
+ const onAddUser = (id: number) => {
+ if (room?.id) {
+ setShowModal(false);
+
+ if (forSupervisor) {
+ addSupervisor(locale, jwt, { sessionId: room.id, supervisorUserId: id })
+ .then(() => {
+ refresh();
+ })
+ .catch((err) => {
+ notification.error({
+ message: 'Error',
+ description: err?.response?.data?.errMessage
+ });
+ });
+ } else {
+ addClient(locale, jwt, { sessionId: room.id, clientUserId: id })
+ .then(() => {
+ refresh();
+ })
+ .catch((err) => {
+ notification.error({
+ message: 'Error',
+ description: err?.response?.data?.errMessage
+ });
+ });
+ }
+ }
+ };
+
+ const afterEditing = () => {
+ setIsEdit(false);
+ refresh();
+ }
+
+ return !isEdit ? (
+ ();
+ const [rooms, setRooms] = useState();
+ const [loading, setLoading] = useState(true);
+ const [errorData, setErrorData] = useState();
+ const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
+ const router = useRouter();
+ const pathname = usePathname();
+
+ const fetchData = () => {
+ setErrorData(undefined);
+ setLoading(true);
+ Promise.all([
+ getUpcomingRooms(locale, jwt),
+ getRecentRooms(locale, jwt)
+ ])
+ .then(([upcoming, recent]) => {
+ setRooms({
+ [RoomsType.UPCOMING]: upcoming || [],
+ [RoomsType.RECENT]: recent || []
+ });
+ })
+ .catch((err) => {
+ setErrorData(err);
+ })
+ .finally(() => {
+ setLoading(false);
+ });
+ };
+
+ useEffect(() => {
+ fetchData();
+ }, []);
+
+ const onChangeSort = useCallback((value: string) => {
+ setSort(value);
+ }, [sort]);
+
+ const onClickSession = (event: MouseEvent, id: number) => {
+ event.stopPropagation();
+ event.preventDefault();
+ router.push(`${pathname}/${id}`);
+ };
+
+ const getChildren = (list?: any[]) => (
+ <>
+ {/*
+
+ );
+};
diff --git a/src/components/Account/rooms/index.tsx b/src/components/Account/rooms/index.tsx
new file mode 100644
index 0000000..4441047
--- /dev/null
+++ b/src/components/Account/rooms/index.tsx
@@ -0,0 +1,6 @@
+'use client'
+
+export * from './RoomDetails';
+export * from './RoomsTabs';
+export * from './RoomDetailsContent';
+export * from './CreateRoom';
diff --git a/src/components/Account/sessions/SessionDetails.tsx b/src/components/Account/sessions/SessionDetails.tsx
new file mode 100644
index 0000000..b0f1c43
--- /dev/null
+++ b/src/components/Account/sessions/SessionDetails.tsx
@@ -0,0 +1,77 @@
+'use client'
+
+import React, { useState, useEffect } from 'react';
+import { SessionType } from '../../../types/sessions';
+import { AUTH_USER } from '../../../constants/common';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { Loader } from '../../view/Loader';
+import { useSessionDetails } from "../../../actions/hooks/useSessionDetails";
+import { AgoraClient } from '../agora';
+import { AccountMenu } from '../AccountMenu';
+import { SessionDetailsContent } from './SessionDetailsContent';
+import { useSessionTracking } from '../../../actions/hooks/useSessionTracking';
+
+type SessionDetailsProps = {
+ locale: string;
+ sessionId: number;
+ activeType: SessionType;
+};
+
+export const SessionDetails = ({ sessionId, locale, activeType }: SessionDetailsProps) => {
+ const { session, errorData, loading, fetchData } = useSessionDetails(locale, sessionId);
+ const tracking = useSessionTracking(locale, sessionId);
+ const [isCalling, setIsCalling] = useState(false);
+ const [userData] = useLocalStorage(AUTH_USER, '');
+ const { id: userId = 0 } = userData ? JSON.parse(userData) : {};
+
+ const client = session?.clients?.length ? session?.clients[0] : null;
+ const isCoach = +userId !== client?.id;
+
+ useEffect(() => {
+ if (isCalling) {
+ tracking.start();
+ } else {
+ tracking.stop();
+ }
+ }, [isCalling]);
+
+ const stopCalling = () => {
+ setIsCalling(false);
+ fetchData()
+ }
+
+ return isCalling
+ ? (
+ (false);
+ const [finishLoading, setFinishLoading] = useState(false);
+ const [openDeclineModal, setOpenDeclineModal] = useState(false);
+ const [openAddCommentModal, setOpenAddCommentModal] = useState(false);
+ const router = useRouter();
+
+ const goBack = () => router.push(`/account/sessions/${activeType}`);
+
+ const onApproveSession = () => {
+ if (activeType === SessionType.REQUESTED) {
+ setApproveLoading(true);
+ approveRequestedSession(locale, jwt, session.id)
+ .then(() => {
+ goBack();
+ })
+ .catch((err) => {
+ notification.error({
+ message: i18nText('errors.approvingSession', locale),
+ description: err?.response?.data?.errMessage
+ });
+ })
+ .finally(() => {
+ setApproveLoading(false);
+ });
+ } else {
+ startSession();
+ }
+ };
+
+ const onFinishSession = () => {
+ if (isCoach) {
+ setFinishLoading(true);
+ finishSession(locale, jwt, session.id)
+ .then(() => {
+ goBack();
+ })
+ .catch((err) => {
+ notification.error({
+ message: i18nText('errors.finishingSession', locale),
+ description: err?.response?.data?.errMessage
+ });
+ })
+ .finally(() => {
+ setFinishLoading(false);
+ })
+ }
+ };
+
+ const startDate = session?.scheduledStartAtUtc ? dayjs(session?.scheduledStartAtUtc).locale(locale) : null;
+ const endDate = session?.scheduledEndAtUtc ? dayjs(session?.scheduledEndAtUtc).locale(locale) : null;
+ const today = startDate ? dayjs().format('YYYY-MM-DD') === startDate.format('YYYY-MM-DD') : false;
+
+ const CoachCard = (coach?: PublicUser) => coach ? (
+ (0);
+type SessionsTabsProps = {
+ locale: string;
+ activeTab: SessionType;
+};
+
+export const SessionsTabs = ({ locale, activeTab }: SessionsTabsProps) => {
const [sort, setSort] = useState();
const [sessions, setSessions] = useState();
const [loading, setLoading] = useState(true);
const [errorData, setErrorData] = useState();
const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
- const [userId] = useLocalStorage(AUTH_USER, '');
+ const [userData] = useLocalStorage(AUTH_USER, '');
+ const { id: userId = 0 } = userData ? JSON.parse(userData) : {};
+ const router = useRouter();
+ const pathname = usePathname();
const fetchData = () => {
setErrorData(undefined);
@@ -35,9 +43,9 @@ export const SessionsTabs = ({ locale }: { locale: string }) => {
])
.then(([upcoming, requested, recent]) => {
setSessions({
- [SessionType.UPCOMING]: upcoming.data || [],
- [SessionType.REQUESTED]: requested.data?.requestedSessions || [],
- [SessionType.RECENT]: recent.data || []
+ [SessionType.UPCOMING]: upcoming || [],
+ [SessionType.REQUESTED]: requested?.requestedSessions || [],
+ [SessionType.RECENT]: recent || []
});
})
.catch((err) => {
@@ -56,6 +64,12 @@ export const SessionsTabs = ({ locale }: { locale: string }) => {
setSort(value);
}, [sort]);
+ const onClickSession = (event: MouseEvent, id: number) => {
+ event.stopPropagation();
+ event.preventDefault();
+ router.push(`${pathname}/${id}`);
+ };
+
const getChildren = (list?: Session[]) => (
<>
{/*
-
@@ -41,27 +49,20 @@ export const AccountMenu = ({ menu, locale }: { menu: { path: string, title: str
+
+
+
+ {i18nText('photoDesc', locale)}
+
+
+
+
+
+
+
+
+
+
+ {/*
+
+
+
*/}
+
+
+
+
+
+
+ {i18nText('save', locale)}
+
+ router.push('settings/change-password')}>
+ {i18nText('changePass', locale)}
+
+
+
+
+ );
+};
diff --git a/src/components/Account/agora/AgoraGroup.tsx b/src/components/Account/agora/AgoraGroup.tsx
new file mode 100644
index 0000000..51a8fef
--- /dev/null
+++ b/src/components/Account/agora/AgoraGroup.tsx
@@ -0,0 +1,54 @@
+'use client'
+
+import { useJoin } from 'agora-rtc-react';
+import { useEffect, useState } from 'react';
+import { MediaControl } from './view';
+import { UsersGroupPanel } from './components';
+
+type AgoraProps = {
+ roomId: number;
+ secret?: string;
+ stopCalling: () => void;
+};
+
+export const AgoraGroup = ({ roomId, secret, stopCalling }: AgoraProps) => {
+ const [calling, setCalling] = useState(false);
+ const [micOn, setMic] = useState(false);
+ const [cameraOn, setCamera] = useState(false);
+
+ useEffect(() => {
+ setCalling(true);
+ }, []);
+
+ useJoin(
+ {
+ appid: process.env.NEXT_PUBLIC_AGORA_APPID,
+ channel: `${roomId}-${secret}`,
+ token: null,
+ },
+ calling,
+ );
+
+ const stop = () => {
+ stopCalling();
+ setCalling(false);
+ };
+
+ return (
+ <>
+
+ setCamera(a => !a)}
+ setMic={() => setMic(a => !a)}
+ />
+
+
+
+
+
+ setCamera(a => !a)}
+ setMic={() => setMic(a => !a)}
+ />
+
+
+ );
+};
diff --git a/src/components/Account/agora/components/CameraVideoTrack.tsx b/src/components/Account/agora/components/CameraVideoTrack.tsx
new file mode 100644
index 0000000..668f51b
--- /dev/null
+++ b/src/components/Account/agora/components/CameraVideoTrack.tsx
@@ -0,0 +1,30 @@
+import { useEffect } from 'react';
+import { ICameraVideoTrack, LocalVideoTrack, LocalVideoTrackProps, MaybePromiseOrNull } from 'agora-rtc-react';
+import { useAwaited } from '../../../../utils/agora/tools';
+
+interface CameraVideoTrackProps extends LocalVideoTrackProps {
+ /**
+ * A camera video track which can be created by `createCameraVideoTrack()`.
+ */
+ readonly track?: MaybePromiseOrNull
+
+ );
+};
diff --git a/src/components/Account/agora/components/LocalUserPanel.tsx b/src/components/Account/agora/components/LocalUserPanel.tsx
new file mode 100644
index 0000000..87587bd
--- /dev/null
+++ b/src/components/Account/agora/components/LocalUserPanel.tsx
@@ -0,0 +1,43 @@
+import { useLocalMicrophoneTrack, useLocalCameraTrack, usePublish, useIsConnected } from 'agora-rtc-react';
+import { UserOutlined } from '@ant-design/icons';
+import { useLocalStorage } from '../../../../hooks/useLocalStorage';
+import { AUTH_USER } from '../../../../constants/common';
+import { LocalUser } from './LocalUser';
+
+type LocalUserPanelProps = {
+ calling: boolean;
+ micOn: boolean;
+ cameraOn: boolean;
+};
+
+export const LocalUserPanel = ({
+ calling,
+ micOn,
+ cameraOn
+}: LocalUserPanelProps) => {
+ const isConnected = useIsConnected();
+ const [userData] = useLocalStorage(AUTH_USER, '');
+ const { faceImageUrl: userImage = '' } = userData ? JSON.parse(userData) : {};
+ const { localMicrophoneTrack } = useLocalMicrophoneTrack(micOn);
+ const { localCameraTrack } = useLocalCameraTrack(cameraOn);
+
+ usePublish([localMicrophoneTrack, localCameraTrack]);
+
+ return calling && isConnected ? (
+ {children}
+
+ {!cameraOn && (
+
+ ) : null;
+};
diff --git a/src/components/Account/agora/components/MicrophoneAudioTrack.tsx b/src/components/Account/agora/components/MicrophoneAudioTrack.tsx
new file mode 100644
index 0000000..3876449
--- /dev/null
+++ b/src/components/Account/agora/components/MicrophoneAudioTrack.tsx
@@ -0,0 +1,32 @@
+import { ReactNode, useEffect } from 'react';
+import { IMicrophoneAudioTrack, LocalAudioTrack, LocalAudioTrackProps, MaybePromiseOrNull } from 'agora-rtc-react';
+import { useAwaited } from '../../../../utils/agora/tools';
+
+interface MicrophoneAudioTrackProps extends LocalAudioTrackProps {
+ /**
+ * A microphone audio track which can be created by `createMicrophoneAudioTrack()`.
+ */
+ readonly track?: MaybePromiseOrNull
+
+ )}
+
+ {!userImage && (
+
+ {videoTracks?.length > 0 ? (
+
+ ) : null;
+}
diff --git a/src/components/Account/agora/components/RemoteUsers.tsx b/src/components/Account/agora/components/RemoteUsers.tsx
new file mode 100644
index 0000000..1829995
--- /dev/null
+++ b/src/components/Account/agora/components/RemoteUsers.tsx
@@ -0,0 +1,12 @@
+import type { IRemoteVideoTrack } from 'agora-rtc-react';
+import { RemoteVideoPlayer } from './RemoteVideoPlayer';
+
+export function RenderRemoteUsers({ videoTracks }: { videoTracks: IRemoteVideoTrack[] }) {
+ return (
+ <>
+ {videoTracks.map((track: IRemoteVideoTrack) => (
+
+ {remoteUsers?.length === 0 && (
+
+ )}
+
+ Ожидайте подключения собеседника
+
+ )}
+
+ {!user?.faceImageUrl && (
+
+
+ );
+};
diff --git a/src/components/Account/agora/components/UserCover.tsx b/src/components/Account/agora/components/UserCover.tsx
new file mode 100644
index 0000000..2cfde3f
--- /dev/null
+++ b/src/components/Account/agora/components/UserCover.tsx
@@ -0,0 +1,56 @@
+import type { CSSProperties, ReactNode } from 'react';
+
+export const FloatBoxStyle: CSSProperties = {
+ position: "absolute",
+ top: 0,
+ left: 0,
+ width: "100%",
+ height: "100%",
+ overflow: "hidden",
+ zIndex: 2,
+};
+
+const CoverBlurStyle: CSSProperties = {
+ width: "100%",
+ height: "100%",
+ background: "#1a1e21 center/cover no-repeat",
+ filter: "blur(16px) brightness(0.4)",
+};
+
+const CoverImgStyle: CSSProperties = {
+ position: "absolute",
+ top: "50%",
+ left: "50%",
+ maxWidth: "50%",
+ maxHeight: "50%",
+ aspectRatio: "1",
+ transform: "translate(-50%, -50%)",
+ borderRadius: "50%",
+ overflow: "hidden",
+ objectFit: "cover",
+};
+
+export interface UserCoverProps {
+ /**
+ * Cover image url or a custom render function.
+ */
+ cover: string | (() => ReactNode);
+}
+
+/**
+ * User Cover image with blur background
+ */
+export function UserCover({ cover }: UserCoverProps) {
+ return (
+ {children}
+
+ {typeof cover === "string" ? (
+ <>
+
+ 
+
+ ) : (
+ cover()
+ )}
+
+ );
+}
diff --git a/src/components/Account/agora/components/UsersGroupPanel.tsx b/src/components/Account/agora/components/UsersGroupPanel.tsx
new file mode 100644
index 0000000..be7f901
--- /dev/null
+++ b/src/components/Account/agora/components/UsersGroupPanel.tsx
@@ -0,0 +1,44 @@
+import {
+ useIsConnected, useLocalCameraTrack, useLocalMicrophoneTrack, usePublish,
+ useRemoteAudioTracks,
+ useRemoteUsers,
+ useRemoteVideoTracks
+} from 'agora-rtc-react';
+import { LocalUser } from './LocalUser';
+import { RemoteVideoPlayer } from './RemoteVideoPlayer';
+
+type UsersGroupPanelProps = {
+ calling: boolean;
+ micOn: boolean;
+ cameraOn: boolean;
+};
+
+export const UsersGroupPanel = ({ calling, micOn, cameraOn }: UsersGroupPanelProps) => {
+ const isConnected = useIsConnected();
+ const remoteUsers = useRemoteUsers();
+ const { localMicrophoneTrack } = useLocalMicrophoneTrack(micOn);
+ const { localCameraTrack } = useLocalCameraTrack(cameraOn);
+ const { videoTracks } = useRemoteVideoTracks(remoteUsers);
+ const { audioTracks } = useRemoteAudioTracks(remoteUsers);
+
+ usePublish([localMicrophoneTrack, localCameraTrack]);
+ audioTracks.map(track => track.play());
+
+ return calling && isConnected && remoteUsers ? (
+
+
+ ) : null;
+}
diff --git a/src/components/Account/agora/components/index.ts b/src/components/Account/agora/components/index.ts
new file mode 100644
index 0000000..5e48733
--- /dev/null
+++ b/src/components/Account/agora/components/index.ts
@@ -0,0 +1,6 @@
+export * from './RemoteVideoPlayer';
+export * from './UserCover';
+export * from './RemoteUsers';
+export * from './LocalUserPanel';
+export * from './RemoteUserPanel';
+export * from './UsersGroupPanel';
diff --git a/src/components/Account/agora/icons/index.tsx b/src/components/Account/agora/icons/index.tsx
new file mode 100644
index 0000000..76c609e
--- /dev/null
+++ b/src/components/Account/agora/icons/index.tsx
@@ -0,0 +1,61 @@
+'use client'
+
+import React from 'react';
+import Icon from '@ant-design/icons';
+import type { GetProps } from 'antd';
+
+type CustomIconComponentProps = GetProps
+
+ {remoteUsers.length > 0 && remoteUsers.map((user) => (
+
+
+ ))}
+
+ :
+);
diff --git a/src/components/Account/agora/view/index.ts b/src/components/Account/agora/view/index.ts
new file mode 100644
index 0000000..dc4fa80
--- /dev/null
+++ b/src/components/Account/agora/view/index.ts
@@ -0,0 +1 @@
+export * from "./MediaControl";
diff --git a/src/components/Account/index.ts b/src/components/Account/index.ts
index 435b58a..9ade85d 100644
--- a/src/components/Account/index.ts
+++ b/src/components/Account/index.ts
@@ -1,5 +1,6 @@
'use client'
export { AccountMenu } from './AccountMenu';
-export { SessionsTabs } from './SessionsTabs';
export { ProfileSettings } from './ProfileSettings';
+export * from './sessions';
+export * from './rooms';
diff --git a/src/components/Account/rooms/CreateRoom.tsx b/src/components/Account/rooms/CreateRoom.tsx
new file mode 100644
index 0000000..971305e
--- /dev/null
+++ b/src/components/Account/rooms/CreateRoom.tsx
@@ -0,0 +1,45 @@
+'use client'
+
+import React, { useEffect, useState } from 'react';
+import { EditRoomForm } from './EditRoomForm';
+import debounce from 'lodash/debounce';
+import { createRoom } from '../../../actions/rooms';
+import { Loader } from '../../view/Loader';
+import { useRouter } from '../../../navigation';
+import { RoomsType } from '../../../types/rooms';
+
+
+export const CreateRoom = ({ locale, jwt }: { locale: string, jwt: string }) => {
+ const [roomId, setRoomId] = useState
+
+
+ setIsOpenReport(false)}
+ locale={locale}
+ refresh={fetchData}
+ roomId={room.id}
+ />
+ )}
+
+
+ );
+};
diff --git a/src/components/Account/rooms/RoomDetailsContent.tsx b/src/components/Account/rooms/RoomDetailsContent.tsx
new file mode 100644
index 0000000..ade0e89
--- /dev/null
+++ b/src/components/Account/rooms/RoomDetailsContent.tsx
@@ -0,0 +1,377 @@
+'use client'
+
+import React, { useState, useEffect } from 'react';
+import { Button, notification, Tag } from 'antd';
+import { DeleteOutlined, LeftOutlined } from '@ant-design/icons';
+import dayjs from 'dayjs';
+import Image from 'next/image';
+import { useRouter } from '../../../navigation';
+import { Report, Room, RoomsType } from '../../../types/rooms';
+import { i18nText } from '../../../i18nKeys';
+import { LinkButton } from '../../view/LinkButton';
+import {
+ addClient,
+ addSupervisor,
+ becomeRoomClient,
+ becomeRoomSupervisor,
+ deleteRoomClient,
+ deleteRoomSupervisor,
+ getReport
+} from '../../../actions/rooms';
+import { AUTH_TOKEN_KEY, AUTH_USER } from '../../../constants/common';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { UserListModal } from '../../Modals/UsersListModal';
+import { SessionState } from '../../../types/sessions';
+import { EditRoomForm } from './EditRoomForm';
+
+type RoomDetailsContentProps = {
+ locale: string;
+ activeType: RoomsType;
+ room?: Room;
+ startRoom: () => void;
+ refresh: () => void;
+};
+
+export const RoomDetailsContent = ({ room, startRoom, locale, activeType, refresh }: RoomDetailsContentProps) => {
+ const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
+ const [userData] = useLocalStorage(AUTH_USER, '');
+ const { id: userId = 0 } = userData ? JSON.parse(userData) : {};
+ const router = useRouter();
+ const [showModal, setShowModal] = useState
+
+ setIsCalling(true)}
+ refresh={fetchData}
+ />
+
+
+ {isSupervisor && room?.id && (
+
+ setShowModal(false)}
+ submit={onAddUser}
+ afterCloseModal={() => setForSupervisor(false)}
+ room={room}
+ />
+ )}
+
+ ) : (
+
+
+
+ {room?.title || ''}
+
+ {today
+ ? `${i18nText('today', locale)} ${startDate?.format('HH:mm')} - ${endDate?.format('HH:mm')}`
+ : `${startDate?.format('D MMMM')} ${startDate?.format('HH:mm')} - ${endDate?.format('HH:mm')}`}
+
+ {room?.themesTags && room.themesTags.length > 0 && (
+
+
+ )}
+ {room?.description &&
+ {room.themesTags.map((skill) => {skill?.name} )}
+
+ {room.description}
}
+ {activeType === RoomsType.UPCOMING && (isCreator || isSupervisor || isClient) && (
+
+ {(isCreator || isClient || isSupervisor) && (
+
+ )}
+ {isCreator && isTimeBeforeStart && room?.state === SessionState.COACH_APPROVED && (
+
+ )}
+
+ )}
+
+
+ {room?.isNeedSupervisor && (
+
+
+ {i18nText('room.roomCreator', locale)}
+
+
+
+
+
+
+
+
+ {`${room?.coach?.name} ${room?.coach?.surname || ''}`}
+
+
+ )}
+
+
+ {room?.supervisor && (
+ {i18nText('room.supervisor', locale)}
+
+
+ )}
+ {room?.supervisor && activeType === RoomsType.RECENT && (
+ <>
+ {room?.supervisorComment && (
+
+ }
+ onClick={() => deleteSupervisor(room?.supervisor?.id)}
+ />
+ )}
+
+
+
+
+
+ {isCreator && activeType === RoomsType.UPCOMING && isTimeBeforeStart && room?.state === SessionState.COACH_APPROVED && (
+ {`${room?.supervisor?.name} ${room?.supervisor?.surname || ''}`}
+ {room.supervisorComment}
+ )}
+ {report && report.length > 0 && (
+
+ {report.map(({ key, score }) => (
+
+ )}
+
+ )}
+ {isTimeBeforeStart && room?.state === SessionState.COACH_APPROVED && !room?.supervisor && isCreator && activeType === RoomsType.UPCOMING && (
+
+ )}
+ {isTimeBeforeStart && room?.state === SessionState.COACH_APPROVED && !room?.supervisor && !isCreator && activeType === RoomsType.UPCOMING && checkUserApply() && (
+
+ )}
+ {!room?.supervisor && !isCreator && !checkUserApply() && (
+
+
+ ))}
+ {i18nText(`room.rating_${key?.toLowerCase()}`, locale)}
+
+ {score || 0}
+ {i18nText('noData', locale)}
+ )}
+
+
+ {room && (
+
+
+ {room?.clients && room?.clients?.length > 0 && (
+ {i18nText('room.participants', locale)}
+ {`${room?.clients?.length || 0}/${room?.maxClients}`}
+
+ {room.clients.map(({id, faceImageUrl, name, surname}) => (
+
+ )}
+ {isTimeBeforeStart && room?.state === SessionState.COACH_APPROVED && isCreator && activeType === RoomsType.UPCOMING && (!room?.clients || (room?.clients && room?.clients?.length < room.maxClients)) && (
+
+ )}
+ {isTimeBeforeStart && room?.state === SessionState.COACH_APPROVED && !isCreator && activeType === RoomsType.UPCOMING && (!room?.clients || (room?.clients && room?.clients?.length < room.maxClients)) && checkUserApply() && (
+
+ )}
+
+ }
+ onClick={() => deleteClient(id)}
+ />
+ )}
+
+ ))}
+
+
+
+
+ {isCreator && room?.state === SessionState.COACH_APPROVED && activeType === RoomsType.UPCOMING && isTimeBeforeStart && (
+ {`${name} ${surname || ''}`}
+
+
+ );
+};
diff --git a/src/components/Account/rooms/RoomsTabs.tsx b/src/components/Account/rooms/RoomsTabs.tsx
new file mode 100644
index 0000000..8f4dd7d
--- /dev/null
+++ b/src/components/Account/rooms/RoomsTabs.tsx
@@ -0,0 +1,173 @@
+'use client';
+
+import React, { MouseEvent, useCallback, useEffect, useState } from 'react';
+import { Empty, Space } from 'antd';
+import dayjs from 'dayjs';
+import 'dayjs/locale/ru';
+import 'dayjs/locale/en';
+import 'dayjs/locale/de';
+import 'dayjs/locale/it';
+import 'dayjs/locale/fr';
+import 'dayjs/locale/es';
+import { RoomsType } from '../../../types/rooms';
+import { getRecentRooms, getUpcomingRooms } from '../../../actions/rooms';
+import { Loader } from '../../view/Loader';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { AUTH_TOKEN_KEY } from '../../../constants/common';
+import { usePathname, useRouter } from '../../../navigation';
+import { i18nText } from '../../../i18nKeys';
+import { CreateRoom } from './CreateRoom';
+
+type RoomsTabsProps = {
+ locale: string;
+ activeTab: RoomsType;
+};
+
+export const RoomsTabs = ({ locale, activeTab }: RoomsTabsProps) => {
+ const [sort, setSort] = useState
+
+
+
+
*/}
+
+
+
+ {list && list?.length > 0 ? list?.map(({ id, scheduledStartAtUtc, scheduledEndAtUtc, title, coach, clients, supervisor, maxClients }) => {
+ const startDate = dayjs(scheduledStartAtUtc).locale(locale);
+ const endDate = dayjs(scheduledEndAtUtc).locale(locale);
+ const today = dayjs().format('YYYY-MM-DD') === startDate.format('YYYY-MM-DD');
+
+ return (
+
+
+ );
+
+ const tabs = [
+ {
+ key: RoomsType.UPCOMING,
+ label: (
+ <>
+ {i18nText('room.upcoming', locale)}
+ {rooms?.upcoming && rooms?.upcoming?.length > 0 ? ({rooms?.upcoming.length}) : null}
+
+ ),
+ children: getChildren(rooms?.upcoming)
+ },
+ {
+ key: RoomsType.RECENT,
+ label: i18nText('room.recent', locale),
+ children: getChildren(rooms?.recent)
+ },
+ {
+ key: RoomsType.NEW,
+ label: i18nText('room.newRoom', locale),
+ children: ) => onClickSession(e, id)}>
+
+ )
+ }) : (
+
+
+
+ 
+
+
+
+
+
+ {`${coach?.name} ${coach?.surname || ''}`}
+ {title}
+
+ {today
+ ? `${i18nText('today', locale)} ${startDate.format('HH:mm')} - ${endDate.format('HH:mm')}`
+ : `${startDate.format('D MMMM')} ${startDate.format('HH:mm')} - ${endDate.format('HH:mm')}`}
+
+
+ {supervisor && (
+ <>
+
+ {i18nText('room.supervisor', locale)}
+ {`${supervisor?.name} ${supervisor?.surname || ''}`}
+
+ )}
+ {i18nText('room.members', locale)}
+ {`${clients.length}/${maxClients}`}
+
+ {tabs.map(({ key, label }) => (
+ router.push(`/account/rooms/${key}`)}
+ >
+ {label}
+
+ ))}
+
+ {tabs.filter(({ key }) => key === activeTab)[0].children}
+
+
+
+
+
+ );
+};
diff --git a/src/components/Account/sessions/SessionDetailsContent.tsx b/src/components/Account/sessions/SessionDetailsContent.tsx
new file mode 100644
index 0000000..212b15c
--- /dev/null
+++ b/src/components/Account/sessions/SessionDetailsContent.tsx
@@ -0,0 +1,301 @@
+'use client'
+
+import React, { useState } from 'react';
+import { Button, Empty, notification, Tag } from 'antd';
+import { LeftOutlined, PlusOutlined, RightOutlined } from '@ant-design/icons';
+import Image from 'next/image';
+import dayjs from 'dayjs';
+import { Link, useRouter } from '../../../navigation';
+import { i18nText } from '../../../i18nKeys';
+import { getDuration, getPrice } from '../../../utils/expert';
+import { PublicUser, Session, SessionState, SessionType } from '../../../types/sessions';
+import { AUTH_TOKEN_KEY } from '../../../constants/common';
+import { approveRequestedSession, finishSession } from '../../../actions/sessions';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { DeclineSessionModal } from '../../Modals/DeclineSessionModal';
+import { AddCommentModal } from '../../Modals/AddCommentModal';
+
+type SessionDetailsContentProps = {
+ locale: string;
+ session: Session;
+ activeType: SessionType;
+ startSession: () => void;
+ refresh: () => void;
+ isCoach: boolean;
+};
+
+export const SessionDetailsContent = ({ session, locale, activeType, startSession, refresh, isCoach }: SessionDetailsContentProps) => {
+ const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
+ const [approveLoading, setApproveLoading] = useState
+
+ {session && (
+ setIsCalling(true)}
+ refresh={fetchData}
+ isCoach={isCoach}
+ />
+ )}
+
+
+
+
+ ) : null;
+
+ const StudentCard = (student?: PublicUser | null) => student ? (
+
+
+
+
+
+ {`${coach?.name} ${coach?.surname || ''}`}
+
+ {/*
+
*/}
+ {coach?.specialityDesc}
+
+ {coach?.coachLanguages?.map((lang) => (
+ {lang}
+ ))}
+
+
+ {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 && session?.themesTags?.length > 2
+ ? (
+
+
+ {`+${session?.themesTags?.length - 2}`}
+
+
+ ) : null }
+
+ {coach?.description}
*/}
+
+ {i18nText('details', locale)}
+
+
+ ) : null;
+
+ const client = session?.clients?.length ? session?.clients[0] : null;
+ const Current = isCoach ? StudentCard(client) : CoachCard(session?.coach);
+
+ return (
+
+
+
+
+ {`${student?.name} ${student?.surname || ''}`}
+
+ {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?.themesTagName}
+
+ {student?.description}
*/}
+ {activeType === SessionType.REQUESTED && session?.clientComment && (
+
+
+ )}
+
+ {session.clientComment}
+
+
+
+ );
+};
diff --git a/src/components/Account/SessionsTabs.tsx b/src/components/Account/sessions/SessionsTabs.tsx
similarity index 76%
rename from src/components/Account/SessionsTabs.tsx
rename to src/components/Account/sessions/SessionsTabs.tsx
index 2132d27..73fbd84 100644
--- a/src/components/Account/SessionsTabs.tsx
+++ b/src/components/Account/sessions/SessionsTabs.tsx
@@ -1,6 +1,6 @@
'use client';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState, MouseEvent } from 'react';
import { Empty, Space } from 'antd';
import dayjs from 'dayjs';
import 'dayjs/locale/ru';
@@ -9,21 +9,29 @@ import 'dayjs/locale/de';
import 'dayjs/locale/it';
import 'dayjs/locale/fr';
import 'dayjs/locale/es';
-import { Loader } from '../view/Loader';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
-import { AUTH_TOKEN_KEY, AUTH_USER } from '../../constants/common';
-import { getRecentSessions, getRequestedSessions, getUpcomingSessions } from '../../actions/profile';
-import { Session, Sessions, SessionType } from '../../types/sessions';
-import { i18nText } from '../../i18nKeys';
+import { Loader } from '../../view/Loader';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { AUTH_TOKEN_KEY, AUTH_USER } from '../../../constants/common';
+import { getRecentSessions, getRequestedSessions, getUpcomingSessions } from '../../../actions/sessions';
+import { Session, Sessions, SessionType } from '../../../types/sessions';
+import { useRouter, usePathname } from '../../../navigation';
+import { i18nText } from '../../../i18nKeys';
-export const SessionsTabs = ({ locale }: { locale: string }) => {
- const [activeTab, setActiveTab] = useState
+ }
+ onClick={goBack}
+ >
+ {i18nText('back', locale)}
+
+
+ {Current}
+ {(activeType === SessionType.UPCOMING || activeType === SessionType.REQUESTED) &&
+ (session?.state === SessionState.CREATED || session?.state === SessionState.PAID
+ || session?.state === SessionState.COACH_APPROVED || session?.state === SessionState.STARTED) && (
+
+
+ {session?.state === SessionState.STARTED && isCoach && (
+
+ )}
+ {session?.id && session?.state !== SessionState.STARTED && (
+ <>
+
+ setOpenDeclineModal(false)}
+ activeType={activeType}
+ locale={locale}
+ sessionId={session.id}
+ success={goBack}
+ />
+
+ )}
+
+ )}
+ {activeType !== SessionType.REQUESTED && (
+ <>
+ {activeType === SessionType.RECENT && (
+ <>
+ {i18nText('courseInfo', locale)}
+
+ {/*
+
+ )}
+
+
*/}
+ {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}
*/}
+
+
+
+ )}
+
+ setOpenAddCommentModal(false)}
+ locale={locale}
+ sessionId={session.id}
+ refresh={refresh}
+ />
+
+ )}
+
+ {(session?.clientComments?.length > 0 || session?.coachComments?.length > 0) ? (
+ <>
+ {(isCoach ? session?.coachComments : session?.clientComments)?.map(({ id, comment }) => (
+
+ {session?.clientComments?.length === 0 && session?.coachComments?.length === 0
+ ? i18nText('session.comments', locale)
+ : i18nText('session.myComments', locale)}
+
+ {activeType === SessionType.UPCOMING && (
+ <>
+ }
+ onClick={() => setOpenAddCommentModal(true)}
+ >
+ {i18nText('session.addComment', locale)}
+
+
+ {comment}
+
+ ))}
+ {(isCoach ? session?.clientComments : session?.coachComments)?.length > 0 && (
+
+ {isCoach ? i18nText('session.clientComments', locale) : i18nText('session.coachComments', locale)}
+
+ )}
+ {(isCoach ? session?.clientComments : session?.coachComments)?.map(({ id , comment }) => (
+
+ {comment}
+
+ ))}
+
+ ) :
@@ -82,7 +96,7 @@ export const SessionsTabs = ({ locale }: { locale: string }) => {
const today = dayjs().format('YYYY-MM-DD') === startDate.format('YYYY-MM-DD');
return (
-
+
) => onClickSession(e, id)}>
@@ -102,7 +116,7 @@ export const SessionsTabs = ({ locale }: { locale: string }) => {
)
}) : (
- (slug);
+ return (
+ ();
+ const [loading, setLoading] = useState(false);
+ useEffect(() => {
+ if (jwt) {
+ setLoading(true);
+ Promise.all([
+ getChatList(locale, jwt),
+ ])
+ .then(([_groups]) => {
+ setСhats(_groups)
+ })
+ .catch((e) => {
+ console.log(e)
+ message.error('Не удалось загрузить данные');
+ })
+ .finally(() => {
+ setLoading(false);
+ })
+ }
+ },[jwt])
+
+ return (
+ (false);
+ const [text, setText] = useState('');
+ const [me, setMe] = useState();
+ const [notMe, setNotMe] = useState();
+ const [messages, setMessages] = useState([]);
+
+ useEffect(() => {
+ if (jwt) {
+ setLoading(true);
+ Promise.all([
+ getChatList(locale, jwt),
+ getChatMessages(locale, jwt, groupId),
+ ])
+ .then(([_groups, _messages]) => {
+ //
+ const _group = _groups.directs.find( (el: any) => el.group.id === groupId)
+ if (_group.group.members[0].userId === parseInt(_group.userId)){
+ setMe(_group.group.members[0].user)
+ setNotMe(_group.group.members[1].user)
+ } else {
+ setMe(_group.group.members[1].user)
+ setNotMe(_group.group.members[0].user)
+ }
+ setMessages(_messages.messages);
+
+ })
+ .catch((e) => {
+ console.log(e)
+ message.error('Не удалось загрузить данные');
+ })
+ .finally(() => {
+ setLoading(false);
+ })
+ }
+ },[jwt])
+
+
+ const onConnected = (flag: boolean) =>{
+ if (flag) {
+ joinChat(groupId)
+ readUreaded()
+ }
+ }
+
+ const readUreaded = () => {
+ const msgs = [] as number[];
+ messages.forEach((message: any) => {
+ if (!message.seen && message.sentByMe === false){
+ msgs.push(message.id)
+ }
+ })
+ readMessages(msgs)
+ }
+
+ const onReceiveMessage = (payload: any) => {
+ const _messages = [... messages];
+ let flag = false;
+ const msg = {
+ data : payload.data,
+ dataType: null,
+ id: payload.id,
+ receiverId:null,
+ seen: false,
+ senderId: payload.creatorId,
+ sentAt: payload.createdUtc+'.000Z',
+ sentByMe: payload.creatorId === me.id,
+ text: payload.content,
+ type:"text"
+ }
+ _messages.forEach((item: any, i) => {
+ if (item.id === msg.id){
+ _messages[i] = msg
+ flag = true
+ }
+ })
+ //console.log(payload, flag)
+ if (flag){
+ setMessages([..._messages]);
+ } else {
+ setMessages([msg, ..._messages]);
+ }
+ readMessages([msg.id])
+
+ }
+
+ const onOpponentRead = (payload: any) => {
+ console.log('onOpponentRead', payload)
+ const _messages = [... messages] as any[];
+ _messages.forEach((item: any, i) => {
+ if (item.id === payload.messageId){
+ _messages[i].seen = true
+
+ }
+ })
+ setMessages([..._messages])
+ }
+
+ useEffect(() => {
+ addListener('onConnected', onConnected)
+ addListener('ReceiveMessage', onReceiveMessage)
+ addListener('MessageWasRead', onOpponentRead)
+ }, [messages, me, setMessages]);
+
+
+
+
+ const handleSendMessages = () => {
+ newMessage({
+ GroupId: groupId.toString(),
+ CreatorId: me.id,
+ Content: text
+ })
+ setText('')
+ }
+
+ const onEnterPress = (e: any) => {
+ if(e.keyCode == 13 && e.shiftKey == false) {
+ e.preventDefault();
+ handleSendMessages();
+ }
+ }
+
+ const handleChangeMessage = (e: any) =>{
+ const { value } = e.target;
+ e.preventDefault();
+ setText(value);
+ return true
+ }
+
+
+ const messageRender = (message: any, i:number) => {
+ const item = message.sentByMe ? me : notMe
+ const date = dayjs(message.sentAt).fromNow()
+ const imgSrc = item?.faceImage?.descriptor ? 'http://static.bbuddy.expert/' + item.faceImage.descriptor.split(':')[1] : ''
+ return (
+
- {tabs.map((tab, index) => (
+ {tabs.map(({ key, label }) => (
setActiveTab(index)}
+ key={key}
+ className={`tabs-session__item ${key === activeTab ? 'active' : ''}`}
+ onClick={() => router.push(`/account/sessions/${key}`)}
>
- {tab.label}
+ {label}
))}
- {tabs[activeTab].children}
+ {tabs.filter(({ key }) => key === activeTab)[0].children}
);
};
diff --git a/src/components/Account/sessions/index.tsx b/src/components/Account/sessions/index.tsx
new file mode 100644
index 0000000..e173564
--- /dev/null
+++ b/src/components/Account/sessions/index.tsx
@@ -0,0 +1,5 @@
+'use client'
+
+export * from './SessionDetails';
+export * from './SessionsTabs';
+export * from './SessionDetailsContent';
diff --git a/src/components/BlogPosts/BlogPostCategories.tsx b/src/components/BlogPosts/BlogPostCategories.tsx
new file mode 100644
index 0000000..3f31eb3
--- /dev/null
+++ b/src/components/BlogPosts/BlogPostCategories.tsx
@@ -0,0 +1,35 @@
+'use client';
+import React, {useState} from "react";
+import {Languages} from "../../types/tags";
+import {BlogPostCategory} from "../../types/blogPostCategory";
+import Link from "next/link";
+
+type Props = {
+ languages?: Languages;
+ basePath: string;
+ locale: string;
+ cats: BlogPostCategory[],
+ slug: string
+};
+
+export const BlogPostCategories = ({ basePath = '/', cats = [], slug = '' }: Props) => {
+ const [currentCat, setCurrentCat] = useState
+
+ )
+}
diff --git a/src/components/BlogPosts/BlogPosts.tsx b/src/components/BlogPosts/BlogPosts.tsx
new file mode 100644
index 0000000..0ec761c
--- /dev/null
+++ b/src/components/BlogPosts/BlogPosts.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { DEFAULT_PAGE_SIZE } from '../../constants/common';
+import {getLanguages} from "../../actions/tags";
+import {fetchBlogPosts} from "../../lib/contentful/blogPosts";
+import {fetchBlogPostCategories} from "../../lib/contentful/blogPostsCategories";
+import {BlogPostsList} from "./BlogPostsList";
+import {BlogPostCategories} from "./BlogPostCategories";
+
+type PostsProps = {
+ basePath: string;
+ locale: string;
+ pageSize?: number;
+ currentCat: string;
+ page?: number
+};
+
+export const BlogPosts = async ({ basePath = '/', locale, pageSize = DEFAULT_PAGE_SIZE, currentCat = '', page = 1 }: PostsProps) => {
+ const languages = await getLanguages(locale);
+ const {data, total} = await fetchBlogPosts({preview: false, category: currentCat, page: page})
+ const cats = await fetchBlogPostCategories(false)
+
+ return (
+
+
+
+ {
+ cats.map((cat, i)=>(
+
+ {cat.title}
+
+ ))
+ }
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/components/BlogPosts/BlogPostsList.tsx b/src/components/BlogPosts/BlogPostsList.tsx
new file mode 100644
index 0000000..7a26f94
--- /dev/null
+++ b/src/components/BlogPosts/BlogPostsList.tsx
@@ -0,0 +1,82 @@
+'use client';
+
+import React from 'react';
+import { DEFAULT_PAGE_SIZE } from '../../constants/common';
+import {Languages, SearchData} from "../../types/tags";
+import {BlogPost} from "../../types/blogPost";
+import Link from "next/link";
+import {CustomPagination} from "../view/CustomPagination";
+
+type Props = {
+ searchData?: SearchData;
+ languages?: Languages;
+ basePath: string;
+ locale: string;
+ data: BlogPost[],
+ total: number,
+ pageSize: number
+};
+
+export const BlogPostsList = ({ basePath = '/', locale, pageSize = DEFAULT_PAGE_SIZE, data = [], total= 0 }: Props) => {
+ const currentPage = 1
+ const onChangePage = (page: number) => {
+ router.push(page === 1 ? basePath : basePath+'?page='+page);
+ };
+
+ return (
+
+
+
+
+ Mentorship, Career
+
+
+ Mentorship, Career
+ Development & Coaching
+
+
+
+ The ins-and-outs of building a career in tech, gaining
experience
from a mentor, and getting your feet wet with coaching.
+
+
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/components/Chat/ChatList.tsx b/src/components/Chat/ChatList.tsx
new file mode 100644
index 0000000..782edb5
--- /dev/null
+++ b/src/components/Chat/ChatList.tsx
@@ -0,0 +1,76 @@
+'use client'
+import React, {useEffect, useState} from 'react';
+import {AUTH_TOKEN_KEY} from '../../constants/common';
+import {getChatList, getChatMessages} from "../../actions/chat/groups";
+import {useLocalStorage} from "../../hooks/useLocalStorage";
+import {Link} from "../../navigation";
+import dayjs from "dayjs";
+import relativeTime from "dayjs/plugin/relativeTime";
+import {message} from "antd";
+import {Loader} from "../view/Loader";
+
+dayjs.extend(relativeTime);
+
+type CompProps = {
+ locale: string;
+};
+
+export const ChatList = ({ locale }: CompProps) => {
+ const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
+ const [chats, setСhats] = useState
+
+
+ {data.map((item, i) => (
+
+ {total > pageSize && (
+
+
+ {chats?.directs.map((item: any, i: number) => (
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/components/Chat/ChatMessages.tsx b/src/components/Chat/ChatMessages.tsx
new file mode 100644
index 0000000..f0bed45
--- /dev/null
+++ b/src/components/Chat/ChatMessages.tsx
@@ -0,0 +1,200 @@
+'use client'
+import React, {useEffect, useState} from 'react';
+import {AUTH_TOKEN_KEY} from '../../constants/common';
+import {getChatList, getChatMessages} from "../../actions/chat/groups";
+import {useLocalStorage} from "../../hooks/useLocalStorage";
+import dayjs from "dayjs";
+import relativeTime from "dayjs/plugin/relativeTime";
+
+import {message} from "antd";
+import {Loader} from "../view/Loader";
+import SignalrConnection from "../../lib/signalr-connection";
+import {CheckOutlined} from "@ant-design/icons";
+
+dayjs.extend(relativeTime);
+
+type CompProps = {
+ locale: string;
+ groupId: number
+};
+
+export const ChatMessages = ({ locale, groupId }: CompProps) => {
+ const { newMessage, joinChat, readMessages, addListener } = SignalrConnection();
+ const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
+ //const messages = await getChatMessages(locale, jwt, groupId)
+ const [loading, setLoading] = useState
+
+
+ ))}
+
+ 
+
+
+
+
+
+
+ {item.firstName}
+ {item.newMessagesCount && (
+ {item.newMessagesCount}
+ )}
+
+
+ {item?.lastMessage?.text}
+
+
+ {dayjs(item?.lastMessage?.sentAt).fromNow()}
+
+
+
+ )
+ }
+
+
+ return (
+
+
+
+
+ {imgSrc && (
)}
+
+
+ {message.text}
+
+
+
+
+
+
+
+ {messages.map((el, i)=> (messageRender(el, i)))}
+
+
+