From 65160d4307cb4421ad3082df0bbb23ba0836052a Mon Sep 17 00:00:00 2001 From: LanselonX <101521725+LanselonX@users.noreply.github.com> Date: Sun, 31 Dec 2023 10:31:22 +0200 Subject: [PATCH] feat: added multi-step signup (#138) * feat: added new registration step - Account-Type * feat: added new step * fix: small fixes in styles * fix: removed inline styles * fix: added new step * fix: added new step * feat: added icons and updated the input-link * fix: some fixes with icons * feat: added new step Specialty * feat: add step 4 of onboarding * fix: minor lang selection update * fix: minor issues & reusability * fix: disable select if no empty cells * feat: add recommended languages * feat: add search to languages * wip: implement form * feat: bind speciality step to the form * fix: update effect dependencies list * feat: update next step logics * feat: update select-fields layout * refactor: apply Prettier * fix: speciality to occupation conversion * typo: update language label * feat: add selected field component * fix: remove step 1 recommendations on step 2 * feat: new approach wip * feat: wip (need to fix errors) * fix: handle key prop error * fix: final client cleanup * feat: add responsiveness to ActionSection * feat: add responsiveness to AccountType * feat: restyle Options * feat: add responsiveness to steps * fix: change recommended_icons height * feat: refactor + illustrations * fix: server stuff to support registration * fix: minor issues * feat: everything working now * fix: mocks * fix: lint issues * fix: backend lint * feat: add illustration resizing * feat: add illustration resizing * fix: update icons size * fix: rename Javascript to JavaScript * fix: styles * feat: last touches * fix: lint * fix: lint part 2 * fix: seeds * fix: small updates * fix: remove console log * fix: removed broken tests --------- Co-authored-by: Romas Bitinas <93491714+pupixipup@users.noreply.github.com> Co-authored-by: Nikita Mashchenko --- client/next.config.js | 1 + client/package.json | 5 +- client/public/images/artist.png | Bin 0 -> 10198 bytes client/public/images/office-worker.png | Bin 0 -> 33313 bytes client/public/images/technologist.png | Bin 0 -> 30787 bytes .../app/(auth)/password/confirmation/page.tsx | 2 +- .../src/app/(auth)/password/expired/page.tsx | 2 +- .../src/app/(auth)/password/success/page.tsx | 2 +- .../app/(auth)/signup/confirmation/page.tsx | 2 +- client/src/app/(main)/page.tsx | 12 +- client/src/app/onboarding/company/page.tsx | 21 + client/src/app/onboarding/layout.tsx | 102 + client/src/app/onboarding/lib/const/steps.tsx | 168 + .../src/app/onboarding/lib/hooks/useSteps.tsx | 104 + .../src/app/onboarding/onboarding.module.scss | 24 + client/src/app/onboarding/page.tsx | 19 +- .../action-section/action-section.module.scss | 23 +- .../ui/action-section/action-section.tsx | 53 +- .../progress-section.module.scss | 7 +- .../ui/progress-section/progress-section.tsx | 20 +- client/src/app/onboarding/ui/shared/index.ts | 1 + .../ui/shared/search/search.module.scss | 16 + .../onboarding/ui/shared/search/search.tsx | 36 + .../selectable-block.module.scss | 15 + .../selectable-block/selectable-block.tsx | 44 + .../accout-type/account-type.module.scss | 10 + .../ui/steps/accout-type/account-types.ts | 14 + .../ui/steps/accout-type/accout-type.tsx | 40 + .../icons-selector/icons-selector.module.scss | 4 + .../steps/icons-selector/icons-selector.tsx | 89 + .../ui/empty-tile/empty-tile.module.scss | 16 + .../ui/empty-tile/empty-tile.tsx | 14 + .../ui/icon-item/icon-item.module.scss | 10 + .../icons-selector/ui/icon-item/icon-item.tsx | 22 + .../ui/options/options.module.scss | 24 + .../icons-selector/ui/options/options.tsx | 54 + .../ui/placeholders/placeholders.module.scss | 26 + .../ui/placeholders/placeholders.tsx | 54 + .../ui/steps/personal-info/personal-info.tsx | 84 + .../ui/steps/social-links/social-links.tsx | 64 + .../steps/specialty/principal-specialities.ts | 18 + .../ui/steps/specialty/speciality.module.scss | 36 + .../ui/steps/specialty/specialty.tsx | 124 + .../providers/query-client-provider/index.tsx | 1 + client/src/app/styles/globals.scss | 31 +- .../ui/illustration/illustration.module.scss | 0 .../ui/illustration/illustration.tsx | 8 +- client/src/app/{(auth) => }/ui/index.ts | 0 .../src/entities/session/api/useGetUsers.tsx | 1 + client/src/entities/session/api/useLogout.tsx | 6 +- .../src/entities/session/api/useUpdateMe.tsx | 9 +- .../entities/user/ui/user-card/user-card.tsx | 17 +- client/src/shared/api/config.ts | 4 +- client/src/shared/assets/icons/behance.tsx | 25 + .../src/shared/assets/icons/github-icon.tsx | 23 + client/src/shared/assets/icons/index.ts | 5 +- client/src/shared/assets/icons/linkedin.tsx | 48 + client/src/shared/assets/icons/telegram.tsx | 39 + .../src/shared/assets/illustrations/duels.tsx | 999 +++++ .../assets/illustrations/hackathons.tsx | 883 +++++ .../src/shared/assets/illustrations/index.ts | 6 + .../assets/illustrations/mentorship.tsx | 336 ++ .../shared/assets/illustrations/projects.tsx | 3300 +++++++++++++++++ .../shared/assets/illustrations/search.tsx | 170 + .../src/shared/assets/illustrations/team.tsx | 1201 ++++++ client/src/shared/constant/experiences.ts | 13 + client/src/shared/constant/focuses.ts | 151 + client/src/shared/constant/index.ts | 4 +- .../shared/constant/recommended-languages.ts | 97 + client/src/shared/constant/specialities.ts | 71 +- client/src/shared/interfaces/index.ts | 2 + client/src/shared/interfaces/option.ts | 4 + .../src/shared/interfaces/role-to-options.ts | 5 + client/src/shared/lib/mock/user.ts | 30 +- .../shared/lib/utils/get-age/get-age.test.ts | 12 +- .../get-elapsed-time/get-elapsed-time.test.ts | 10 - .../badge/badge-icon/badge-icon.module.scss | 4 - .../badge/badge-text/badge-text.module.scss | 1 + .../shared/ui/badge/badge-text/badge-text.tsx | 11 +- client/src/shared/ui/button/button.tsx | 2 + client/src/shared/ui/checkbox/checkbox.tsx | 8 +- client/src/shared/ui/input/index.ts | 1 - .../shared/ui/input/input-date/input-date.tsx | 63 - .../shared/ui/input/input-link/input-link.tsx | 45 +- .../shared/ui/input/input/input.module.scss | 6 + .../shared/ui/input/input/input.stories.tsx | 11 +- .../ui/search-bar/hooks/useTrackFiltersArr.ts | 2 +- .../ui/select/ui/select/select.stories.tsx | 27 +- .../user/desktop/desktop.stories.tsx | 32 +- .../info-modal/user/desktop/desktop.tsx | 8 +- .../info-modal/user/phone/phone.stories.tsx | 30 +- .../modals/info-modal/user/phone/phone.tsx | 8 +- .../user/ui/icon-layout/icon-layout.tsx | 19 +- .../user/ui/text-layout/text-layout.tsx | 22 +- client/yarn.lock | 327 +- ...ateUser.ts => 1703839671313-CreateUser.ts} | 8 +- .../database/seeds/file/file-seed.module.ts | 11 + .../database/seeds/file/file-seed.service.ts | 36 + server/src/libs/database/seeds/run-seed.ts | 2 + server/src/libs/database/seeds/seed.module.ts | 2 + .../database/seeds/user/user-seed.service.ts | 141 +- server/src/modules/auth/base/auth.module.ts | 2 + server/src/modules/auth/base/auth.service.ts | 11 +- .../modules/auth/base/dto/auth-update.dto.ts | 13 +- server/src/modules/files/files.module.ts | 5 +- server/src/modules/files/files.service.ts | 39 +- .../src/modules/users/dto/create-user.dto.ts | 13 +- server/src/modules/users/dto/designer.dto.ts | 14 - server/src/modules/users/dto/developer.dto.ts | 14 - .../modules/users/dto/project-manager.dto.ts | 14 - .../src/modules/users/dto/query-user.dto.ts | 39 +- server/src/modules/users/dto/skills.dto.ts | 48 + .../modules/users/entities/skills.entity.ts | 24 +- .../src/modules/users/entities/user.entity.ts | 3 - server/src/modules/users/users.service.ts | 14 +- server/src/utils/types/focuses.type.ts | 66 + server/src/utils/types/specialities.type.ts | 41 +- server/test/user/users.e2e-spec.ts | 58 +- 118 files changed, 9521 insertions(+), 617 deletions(-) create mode 100644 client/public/images/artist.png create mode 100644 client/public/images/office-worker.png create mode 100644 client/public/images/technologist.png create mode 100644 client/src/app/onboarding/company/page.tsx create mode 100644 client/src/app/onboarding/layout.tsx create mode 100644 client/src/app/onboarding/lib/const/steps.tsx create mode 100644 client/src/app/onboarding/lib/hooks/useSteps.tsx create mode 100644 client/src/app/onboarding/ui/shared/index.ts create mode 100644 client/src/app/onboarding/ui/shared/search/search.module.scss create mode 100644 client/src/app/onboarding/ui/shared/search/search.tsx create mode 100644 client/src/app/onboarding/ui/shared/selectable-block/selectable-block.module.scss create mode 100644 client/src/app/onboarding/ui/shared/selectable-block/selectable-block.tsx create mode 100644 client/src/app/onboarding/ui/steps/accout-type/account-type.module.scss create mode 100644 client/src/app/onboarding/ui/steps/accout-type/account-types.ts create mode 100644 client/src/app/onboarding/ui/steps/accout-type/accout-type.tsx create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/icons-selector.module.scss create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/icons-selector.tsx create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.module.scss create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.tsx create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.module.scss create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.tsx create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.module.scss create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.tsx create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.module.scss create mode 100644 client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.tsx create mode 100644 client/src/app/onboarding/ui/steps/personal-info/personal-info.tsx create mode 100644 client/src/app/onboarding/ui/steps/social-links/social-links.tsx create mode 100644 client/src/app/onboarding/ui/steps/specialty/principal-specialities.ts create mode 100644 client/src/app/onboarding/ui/steps/specialty/speciality.module.scss create mode 100644 client/src/app/onboarding/ui/steps/specialty/specialty.tsx rename client/src/app/{(auth) => }/ui/illustration/illustration.module.scss (100%) rename client/src/app/{(auth) => }/ui/illustration/illustration.tsx (85%) rename client/src/app/{(auth) => }/ui/index.ts (100%) create mode 100644 client/src/shared/assets/icons/behance.tsx create mode 100644 client/src/shared/assets/icons/github-icon.tsx create mode 100644 client/src/shared/assets/icons/linkedin.tsx create mode 100644 client/src/shared/assets/icons/telegram.tsx create mode 100644 client/src/shared/assets/illustrations/duels.tsx create mode 100644 client/src/shared/assets/illustrations/hackathons.tsx create mode 100644 client/src/shared/assets/illustrations/mentorship.tsx create mode 100644 client/src/shared/assets/illustrations/projects.tsx create mode 100644 client/src/shared/assets/illustrations/search.tsx create mode 100644 client/src/shared/assets/illustrations/team.tsx create mode 100644 client/src/shared/constant/experiences.ts create mode 100644 client/src/shared/constant/focuses.ts create mode 100644 client/src/shared/constant/recommended-languages.ts create mode 100644 client/src/shared/interfaces/index.ts create mode 100644 client/src/shared/interfaces/option.ts create mode 100644 client/src/shared/interfaces/role-to-options.ts delete mode 100644 client/src/shared/ui/input/input-date/input-date.tsx rename server/src/libs/database/migrations/{1703373105991-CreateUser.ts => 1703839671313-CreateUser.ts} (87%) create mode 100644 server/src/libs/database/seeds/file/file-seed.module.ts create mode 100644 server/src/libs/database/seeds/file/file-seed.service.ts delete mode 100644 server/src/modules/users/dto/designer.dto.ts delete mode 100644 server/src/modules/users/dto/developer.dto.ts delete mode 100644 server/src/modules/users/dto/project-manager.dto.ts create mode 100644 server/src/modules/users/dto/skills.dto.ts create mode 100644 server/src/utils/types/focuses.type.ts diff --git a/client/next.config.js b/client/next.config.js index 3e9fb68c9..33bd7a897 100644 --- a/client/next.config.js +++ b/client/next.config.js @@ -9,6 +9,7 @@ module.exports = { 'picsum.photos', 'source.unsplash.com', 'upload.wikimedia.org', + 'teameights.s3.amazonaws.com', ], remotePatterns: [ { diff --git a/client/package.json b/client/package.json index 073e393b2..9652a600f 100644 --- a/client/package.json +++ b/client/package.json @@ -26,9 +26,10 @@ "@storybook/addon-styling": "^1.3.6", "@tanstack/react-query": "^5.0.0", "@tanstack/react-query-devtools": "^5.0.1", - "@teameights/types": "^1.1.27", + "@teameights/types": "^1.1.28", "@types/js-cookie": "^3.0.5", "@types/lodash.debounce": "^4.0.7", + "@types/lodash.isempty": "^4.4.9", "@types/node": "20.4.8", "@types/react": "18.2.18", "@types/react-dom": "18.2.7", @@ -41,6 +42,7 @@ "eslint-config-next": "13.4.12", "js-cookie": "^3.0.5", "lodash.debounce": "^4.0.8", + "lodash.isempty": "^4.4.0", "next": "13.4.12", "qs": "^6.11.2", "react": "18.2.0", @@ -54,6 +56,7 @@ "react-select": "^5.7.4", "react-tooltip": "^5.21.3", "sass": "^1.64.2", + "sharp": "^0.33.1", "socket.io-client": "^4.7.2", "sonner": "^1.0.3", "tsparticles": "^2.12.0", diff --git a/client/public/images/artist.png b/client/public/images/artist.png new file mode 100644 index 0000000000000000000000000000000000000000..d862b124d2f10c157492d8b5d2d4efbd714489b3 GIT binary patch literal 10198 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 QIRF3v07*qoM6N<$f?fhfhX4Qo literal 0 HcmV?d00001 diff --git a/client/public/images/office-worker.png b/client/public/images/office-worker.png new file mode 100644 index 0000000000000000000000000000000000000000..aea67a8d8bcfd3cb15e0017a155931e296e82e0e GIT binary patch literal 33313 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 SwNL*50000(); @@ -57,6 +59,14 @@ export default function Home() { optionsArr: specialities, filterValue: [], }, + { + label: 'Focuses', + value: 'focuses', + type: 'checkbox', + placeholder: 'Search by focus', + optionsArr: focusesValues, + filterValue: [], + }, ]} onChange={filterValues => { setFilters(filterValues); diff --git a/client/src/app/onboarding/company/page.tsx b/client/src/app/onboarding/company/page.tsx new file mode 100644 index 000000000..5efa2fc28 --- /dev/null +++ b/client/src/app/onboarding/company/page.tsx @@ -0,0 +1,21 @@ +'use client'; +import { IllustrationStatus } from '@/app/ui'; +import { useRouter } from 'next/navigation'; +import { Flex } from '@/shared/ui'; + +export default function Company() { + const router = useRouter(); + const handleBack = () => { + router.back(); + }; + return ( + + + + ); +} diff --git a/client/src/app/onboarding/layout.tsx b/client/src/app/onboarding/layout.tsx new file mode 100644 index 000000000..47961cdff --- /dev/null +++ b/client/src/app/onboarding/layout.tsx @@ -0,0 +1,102 @@ +'use client'; +import { ReactNode } from 'react'; +import styles from './onboarding.module.scss'; +import { FormProvider, useForm } from 'react-hook-form'; +import { accountTypeStep } from '@/app/onboarding/lib/const/steps'; +import { StepProps } from '@/app/onboarding/lib/const/steps'; +import { useUpdateMe } from '@/entities/session'; +import { IOption } from '@/shared/interfaces'; +import { ExperienceType, IUserRequest } from '@teameights/types'; + +interface OnboardingProps { + steps: StepProps[]; + accountType: string; + username: string; + fullName: string; + dateOfBirth: Date; + country: string; + focus: string; + coreTools: IOption[]; + additionalTools: IOption[]; + experience: string; + speciality: string; + isLeader: boolean; + github: string; + behance: string; + linkedIn: string; + telegram: string; +} + +export default function OnboardingLayout({ children }: { children: ReactNode }) { + const { mutate: updateUser } = useUpdateMe(); + + const methods = useForm({ + defaultValues: { + steps: [accountTypeStep], + accountType: '', + username: '', + fullName: '', + country: '', + focus: '', + coreTools: [], + additionalTools: [], + experience: '', + speciality: '', + isLeader: false, + github: '', + behance: '', + linkedIn: '', + telegram: '', + }, + }); + + const onSubmit = methods.handleSubmit(data => { + let type = ''; + + switch (data.speciality) { + case 'Developer': + type = 'dev'; + break; + case 'Designer': + type = 'designer'; + break; + case 'Project Manager': + type = 'pm'; + break; + } + + const updateRequest: IUserRequest = { + fullName: data.fullName, + username: data.username, + isLeader: data.isLeader, + country: data.country, + experience: data.experience as ExperienceType, + dateOfBirth: new Date(data.dateOfBirth), + skills: { + __type: type as 'dev' | 'designer' | 'pm', + speciality: data.speciality, + focus: data.focus, + coreTools: data.coreTools.map(tool => tool.label), + additionalTools: data?.additionalTools?.length + ? data.additionalTools.map(tool => tool.label) + : undefined, + }, + links: { + behance: data.behance && data.behance, + linkedIn: data.linkedIn && data.linkedIn, + telegram: data.telegram && data.telegram, + github: data.github && data.github, + }, + }; + + updateUser(updateRequest); + }); + + return ( + +
+ {children} +
+ + ); +} diff --git a/client/src/app/onboarding/lib/const/steps.tsx b/client/src/app/onboarding/lib/const/steps.tsx new file mode 100644 index 000000000..e48b31547 --- /dev/null +++ b/client/src/app/onboarding/lib/const/steps.tsx @@ -0,0 +1,168 @@ +import { AccountType } from '@/app/onboarding/ui/steps/accout-type/accout-type'; +import { + DuelsIllustration, + HackathonsIllustration, + MentorshipIllustration, + ProjectsIllustration, + SearchIllustration, + TeamIllustration, +} from '@/shared/assets'; +import { PersonalInfo } from '@/app/onboarding/ui/steps/personal-info/personal-info'; +import { Specialty } from '@/app/onboarding/ui/steps/specialty/specialty'; +import { IconsSelector } from '@/app/onboarding/ui/steps/icons-selector/icons-selector'; +import { + designerTools, + frameworks, + managerTools, + methodologies, + programmingLanguages, + // recommendedLanguages, +} from '@/shared/constant'; +import { SocialLinks } from '@/app/onboarding/ui/steps/social-links/social-links'; + +export interface StepProps { + step: JSX.Element; + title: string; + centered: boolean; + submissionStep: boolean; + meta: { + details: string; + description: string; + illustration: JSX.Element; + }; +} + +const duelsMeta = { + details: 'Coding Duels', + description: + 'Engage in fast-paced coding 1v1 battles against fellow coders, solve problems under timed conditions and strive to climb the leaderboard.', + illustration: , +}; + +const hackathonsMeta = { + details: 'Hackathons', + description: + 'Participate in dynamic hackathons tp expand your coding abilities. Compete with peers, learn new skills, and win money prizes.', + illustration: , +}; + +export const accountTypeStep: StepProps = { + step: , + title: 'Account type', + centered: true, + submissionStep: false, + meta: { + details: 'Teammates Search', + description: + 'Use our intuitive search filters to find the right teammates based on a set of criteria and Instantly connect with them through the chat function.', + illustration: , + }, +}; + +export const personalInfoStep: StepProps = { + step: , + title: 'Personal info', + centered: true, + submissionStep: false, + meta: { + details: 'Team Creation', + description: + 'Connect with like-minded individuals for collaborative work, form teams, engage in group projects, and learn from one another.', + illustration: , + }, +}; + +export const specialityStep: StepProps = { + step: , + title: 'Speciality', + centered: true, + submissionStep: false, + meta: { + details: 'Mentorship Program', + description: + 'Newcomers can connect with experienced mentors in the field to receive personalized guidance, support, and detailed feedback.', + illustration: , + }, +}; + +export const linksStep: StepProps = { + step: , + title: 'Links', + centered: true, + submissionStep: true, + meta: { + details: 'AI generated Projects', + description: + 'Gain access to our AI generated projects catering to all levels of experience, work on real-world applications, improve skills, and build a portfolio.', + illustration: , + }, +}; + +export const developerSteps: StepProps[] = [ + { + step: ( + + ), + title: 'Languages', + centered: false, + submissionStep: false, + meta: duelsMeta, + }, + { + step: ( + + ), + title: 'Frameworks', + centered: false, + submissionStep: false, + meta: hackathonsMeta, + }, +]; + +export const projectManagerSteps: StepProps[] = [ + { + step: ( + + ), + title: 'Tools', + centered: false, + submissionStep: false, + meta: duelsMeta, + }, + { + step: ( + + ), + title: 'Methodologies', + centered: false, + submissionStep: false, + meta: hackathonsMeta, + }, +]; + +export const designerSteps: StepProps[] = [ + { + step: ( + + ), + title: 'Tools', + centered: false, + submissionStep: false, + meta: duelsMeta, + }, +]; diff --git a/client/src/app/onboarding/lib/hooks/useSteps.tsx b/client/src/app/onboarding/lib/hooks/useSteps.tsx new file mode 100644 index 000000000..04b79c095 --- /dev/null +++ b/client/src/app/onboarding/lib/hooks/useSteps.tsx @@ -0,0 +1,104 @@ +import { useState } from 'react'; +import { useFormContext } from 'react-hook-form'; +import { useRouter } from 'next/navigation'; +import { + accountTypeStep, + designerSteps, + developerSteps, + linksStep, + personalInfoStep, + projectManagerSteps, + specialityStep, + StepProps, +} from '@/app/onboarding/lib/const/steps'; + +interface SpecificStepProps { + [role: string]: StepProps[]; +} + +const commonSteps = [accountTypeStep, personalInfoStep, specialityStep]; + +const withDesignerSteps = [...commonSteps, ...designerSteps, linksStep]; + +const withManagerSteps = [...commonSteps, ...projectManagerSteps, linksStep]; + +const withDefaultSteps = [...commonSteps, ...developerSteps, linksStep]; + +export const useSteps = () => { + const [step, setStep] = useState(0); + const { watch, setValue, trigger, setError } = useFormContext(); + const router = useRouter(); + + const handleNext = async () => { + const accountType: string = watch('accountType'); + const speciality: string = watch('speciality'); + const coreTools: string[] = watch('coreTools'); + const additionalTools: string[] = watch('additionalTools'); + + switch (step) { + case 0: + if (!accountType) { + setError('accountType', { type: 'custom', message: 'should not be empty!' }); + return; + } + + if (accountType === 'Company') { + router.push('/onboarding/company'); + } else { + setValue('steps', commonSteps); + } + break; + case 1: { + const clearStepOne = await trigger(['country', 'fullName', 'username', 'dateOfBirth']); + if (!clearStepOne) return; + break; + } + + case 2: { + const clearStepTwo = await trigger(['speciality', 'focus', 'experience']); + if (!clearStepTwo) return; + + const specialitySteps: SpecificStepProps = { + Designer: withDesignerSteps, + 'Project Manager': withManagerSteps, + default: withDefaultSteps, + }; + + const specificSteps = specialitySteps[speciality] ?? specialitySteps.default; + + setValue('steps', specificSteps); + break; + } + + case 3: { + if (!coreTools.length) { + setError('coreTools', { type: 'custom', message: 'Select at least 1' }); + return; + } + break; + } + + case 4: { + if (!additionalTools.length) { + setError('additionalTools', { type: 'custom', message: 'Select at least 1' }); + return; + } + break; + } + default: + break; + } + + if (accountType !== 'Company') { + setStep(prev => prev + 1); + } + }; + + const handleBack = () => { + if (step - 1 >= 0) { + setStep(prev => prev - 1); + } + }; + + return { step, setStep, handleNext, handleBack }; +}; diff --git a/client/src/app/onboarding/onboarding.module.scss b/client/src/app/onboarding/onboarding.module.scss index e193ab1cb..6f18d031d 100644 --- a/client/src/app/onboarding/onboarding.module.scss +++ b/client/src/app/onboarding/onboarding.module.scss @@ -1,3 +1,27 @@ .spacer { margin-bottom: 32px; } + +.container { + min-height: 100dvh; + width: 100%; + background: var(--cards-color); + + scrollbar-width: none; // For Firefox + -ms-overflow-style: none; // For Internet Explorer and Edge + + ::-webkit-scrollbar { + display: none; // For Chrome, Safari, and Opera + } +} + +.illustration > svg { + width: 100%; + height: 100%; +} + +.sections { + min-height: 100dvh; + +} + diff --git a/client/src/app/onboarding/page.tsx b/client/src/app/onboarding/page.tsx index 5ecfa6036..997198748 100644 --- a/client/src/app/onboarding/page.tsx +++ b/client/src/app/onboarding/page.tsx @@ -3,20 +3,25 @@ import { Flex } from '@/shared/ui'; import { ProgressSection } from '@/app/onboarding/ui/progress-section/progress-section'; import { ActionSection } from '@/app/onboarding/ui/action-section/action-section'; +import { useSteps } from './lib/hooks/useSteps'; +import { useFormContext } from 'react-hook-form'; import styles from './onboarding.module.scss'; const OnboardingPage = () => { + const { step, handleNext, handleBack } = useSteps(); + const { watch } = useFormContext(); + const steps = watch('steps'); + return ( - - - - - Image + + + + + {steps[step].meta.illustration} -
Description
 - ActionSection + ); }; diff --git a/client/src/app/onboarding/ui/action-section/action-section.module.scss b/client/src/app/onboarding/ui/action-section/action-section.module.scss index b9fa6df78..bfe76bccc 100644 --- a/client/src/app/onboarding/ui/action-section/action-section.module.scss +++ b/client/src/app/onboarding/ui/action-section/action-section.module.scss @@ -3,7 +3,7 @@ background: var(--cards-color); padding: 48px 55px; - @media (width <= 768px) { + @media (width <= 981px){ padding: 36px 30px; flex-basis: 100%; } @@ -17,8 +17,25 @@ } } +.title { + @media(max-width: 430px) { + font-size: 24px; + } +} + +.buttons_container { + @media (max-width: 350px) { + flex-direction: column; + gap: 10px; + } +} + .button { - padding: 0 16px; width: 170px; + @media (max-width: 430px) { + width: 152px; + } + @media (max-width: 350px) { + width: 100%; + } } - diff --git a/client/src/app/onboarding/ui/action-section/action-section.tsx b/client/src/app/onboarding/ui/action-section/action-section.tsx index e4d4144e5..2a1d387c0 100644 --- a/client/src/app/onboarding/ui/action-section/action-section.tsx +++ b/client/src/app/onboarding/ui/action-section/action-section.tsx @@ -1,34 +1,59 @@ import { Button, Flex, Typography, NeedHelp } from '@/shared/ui'; -import { ReactNode } from 'react'; import { ArrowLeftIcon, ArrowRightIcon } from '@/shared/assets'; +import { useFormContext } from 'react-hook-form'; import styles from './action-section.module.scss'; +import { StepProps } from '@/app/onboarding/lib/const/steps'; interface ActionSectionProps { - children: ReactNode; - stepTitle: string; + step: number; + handleNext: () => void; + handleBack: () => void; } -export const ActionSection = ({ children, stepTitle }: ActionSectionProps) => { +export const ActionSection = ({ step, handleNext, handleBack }: ActionSectionProps) => { + const { + watch, + formState: { isSubmitting }, + } = useFormContext(); + + const steps: StepProps[] = watch('steps'); + + const isSubmissionStep = steps[step].submissionStep; + return ( - - {stepTitle} + + {steps[step].title} - - {children} + + {steps[step].step} - - - + {/*NOTE: Don't change this, otherwise it would submit the form before last step (need to find better approach in the future)*/} + {isSubmissionStep && ( + + )} + {!isSubmissionStep && ( + + )} ); diff --git a/client/src/app/onboarding/ui/progress-section/progress-section.module.scss b/client/src/app/onboarding/ui/progress-section/progress-section.module.scss index c618e6eb6..927c022de 100644 --- a/client/src/app/onboarding/ui/progress-section/progress-section.module.scss +++ b/client/src/app/onboarding/ui/progress-section/progress-section.module.scss @@ -1,8 +1,13 @@ .container { + background: var(--bg-color); flex-basis: 39.06%; padding: 48px 55px; - @media (width <= 768px) { + @media (width <= 1120px) { + padding: 48px 24px; + } + + @media (width <= 981px) { display: none; } } diff --git a/client/src/app/onboarding/ui/progress-section/progress-section.tsx b/client/src/app/onboarding/ui/progress-section/progress-section.tsx index 87e73cfa0..ccf84e89d 100644 --- a/client/src/app/onboarding/ui/progress-section/progress-section.tsx +++ b/client/src/app/onboarding/ui/progress-section/progress-section.tsx @@ -1,17 +1,31 @@ -import { Flex, Logo, ProgressBar } from '@/shared/ui'; +import { Flex, Logo, ProgressBar, Typography } from '@/shared/ui'; import { ReactNode } from 'react'; import styles from './progress-section.module.scss'; +import { useFormContext } from 'react-hook-form'; +import { StepProps } from '@/app/onboarding/lib/const/steps'; interface ProgressSectionProps { + step: number; children: ReactNode; } -export const ProgressSection = ({ children }: ProgressSectionProps) => { +export const ProgressSection = ({ children, step }: ProgressSectionProps) => { + const { watch } = useFormContext(); + const steps: StepProps[] = watch('steps'); + return ( {children} - + + + {steps[step].meta.details} + + {steps[step].meta.description} + + + + ); }; diff --git a/client/src/app/onboarding/ui/shared/index.ts b/client/src/app/onboarding/ui/shared/index.ts new file mode 100644 index 000000000..236b8b731 --- /dev/null +++ b/client/src/app/onboarding/ui/shared/index.ts @@ -0,0 +1 @@ +export { SelectableBlock } from './selectable-block/selectable-block'; diff --git a/client/src/app/onboarding/ui/shared/search/search.module.scss b/client/src/app/onboarding/ui/shared/search/search.module.scss new file mode 100644 index 000000000..8b39caa83 --- /dev/null +++ b/client/src/app/onboarding/ui/shared/search/search.module.scss @@ -0,0 +1,16 @@ +.container { + width: 100%; + transition: all 0.1s ease 0s; + padding-left: 10px; + border: 1px solid #46a11b; + border-radius: 10px; + overflow: hidden; + + &:hover { + background-color: var(--grey-dark-color); + } +} + +.search_icon { + margin: auto 12px auto 4px; +} diff --git a/client/src/app/onboarding/ui/shared/search/search.tsx b/client/src/app/onboarding/ui/shared/search/search.tsx new file mode 100644 index 000000000..fcc0dc729 --- /dev/null +++ b/client/src/app/onboarding/ui/shared/search/search.tsx @@ -0,0 +1,36 @@ +import { Flex, Input } from '@/shared/ui'; +import styles from './search.module.scss'; +import { useState, useEffect } from 'react'; +import { SearchIcon } from '@/shared/assets'; + +interface TextInputProps { + placeholder: string; + defaultValue: string; + onChange: (value: string) => void; +} + +export const Search = ({ defaultValue, onChange, placeholder }: TextInputProps) => { + const [value, setValue] = useState(defaultValue); + + const handleChange = (value: string) => { + setValue(value); + onChange(value); + }; + + useEffect(() => { + setValue(defaultValue); + }, [defaultValue]); + return ( + + handleChange(e.target.value)} + placeholder={placeholder} + isWithBorder={false} + /> + + + + + ); +}; diff --git a/client/src/app/onboarding/ui/shared/selectable-block/selectable-block.module.scss b/client/src/app/onboarding/ui/shared/selectable-block/selectable-block.module.scss new file mode 100644 index 000000000..8077305a4 --- /dev/null +++ b/client/src/app/onboarding/ui/shared/selectable-block/selectable-block.module.scss @@ -0,0 +1,15 @@ +.container { + flex: 1 0 0; + border-radius: 10px; + border: 2px solid var(--grey-dark-color); + transition: border-color 0.3s ease; + cursor: pointer; +} + +.container:hover { + border-color: var(--green-bright-color); +} + +.selected{ + border-color: var(--green-bright-color); +} diff --git a/client/src/app/onboarding/ui/shared/selectable-block/selectable-block.tsx b/client/src/app/onboarding/ui/shared/selectable-block/selectable-block.tsx new file mode 100644 index 000000000..b2a1325c9 --- /dev/null +++ b/client/src/app/onboarding/ui/shared/selectable-block/selectable-block.tsx @@ -0,0 +1,44 @@ +import { FC, ReactNode } from 'react'; +import styles from './selectable-block.module.scss'; +import { Flex } from '@/shared/ui'; +import { clsx } from 'clsx'; + +interface SelectableBlockProps { + children: ReactNode; + text: string; + gap?: string; + padding?: string; + selected?: boolean; + onClick?: () => void; +} + +export const SelectableBlock: FC = ({ + children, + text, + gap = '24px', + padding = '32px', + selected = false, + onClick, +}) => { + const handleClick = () => { + if (onClick) { + onClick(); + } + }; + + return ( + + {children} + {text} + + ); +}; diff --git a/client/src/app/onboarding/ui/steps/accout-type/account-type.module.scss b/client/src/app/onboarding/ui/steps/accout-type/account-type.module.scss new file mode 100644 index 000000000..b700e8f0b --- /dev/null +++ b/client/src/app/onboarding/ui/steps/accout-type/account-type.module.scss @@ -0,0 +1,10 @@ +.align_text { + text-align: center; +} + + +.account_types { + @media (max-width: 430px) { + flex-direction: column; + } +} diff --git a/client/src/app/onboarding/ui/steps/accout-type/account-types.ts b/client/src/app/onboarding/ui/steps/accout-type/account-types.ts new file mode 100644 index 000000000..4069f8772 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/accout-type/account-types.ts @@ -0,0 +1,14 @@ +interface AccountTypeProps { + name: string; + image: string; +} +export const accountTypes: AccountTypeProps[] = [ + { + name: 'IT-specialist', + image: '/images/technologist.png', + }, + { + name: 'Company', + image: '/images/office-worker.png', + }, +]; diff --git a/client/src/app/onboarding/ui/steps/accout-type/accout-type.tsx b/client/src/app/onboarding/ui/steps/accout-type/accout-type.tsx new file mode 100644 index 000000000..266ed8536 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/accout-type/accout-type.tsx @@ -0,0 +1,40 @@ +import { Flex, Typography } from '@/shared/ui'; +import { SelectableBlock } from '../../shared'; +import styles from './account-type.module.scss'; +import Image from 'next/image'; +import { accountTypes } from '@/app/onboarding/ui/steps/accout-type/account-types'; +import { useState } from 'react'; +import { useFormContext } from 'react-hook-form'; + +export const AccountType = () => { + const [selectedType, setSelectedType] = useState(''); + const { setValue, clearErrors } = useFormContext(); + + const handleClickType = (type: string) => { + setSelectedType(type); + setValue('accountType', type); + clearErrors('accountType'); + }; + + return ( + + + + I’d like to join the platform as... + + + + {accountTypes.map(accountType => ( + handleClickType(accountType.name)} + selected={accountType.name === selectedType} + key={accountType.name} + > + {accountType.name} + + ))} + + + ); +}; diff --git a/client/src/app/onboarding/ui/steps/icons-selector/icons-selector.module.scss b/client/src/app/onboarding/ui/steps/icons-selector/icons-selector.module.scss new file mode 100644 index 000000000..29f6982df --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/icons-selector.module.scss @@ -0,0 +1,4 @@ +.search { + margin-bottom: 24px; +} + diff --git a/client/src/app/onboarding/ui/steps/icons-selector/icons-selector.tsx b/client/src/app/onboarding/ui/steps/icons-selector/icons-selector.tsx new file mode 100644 index 000000000..d6577a57c --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/icons-selector.tsx @@ -0,0 +1,89 @@ +import { Flex } from '@/shared/ui'; +import { FC, useState } from 'react'; +import { Search } from '../../shared/search/search'; +import styles from './icons-selector.module.scss'; +import { useFormContext } from 'react-hook-form'; +import { Placeholders } from '@/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders'; +import { Options } from '@/app/onboarding/ui/steps/icons-selector/ui/options/options'; +import { IOption } from '@/shared/interfaces'; + +const MAX_ICONS = 8; + +interface IconsSelector { + icons: IOption[]; + // recommendedIcons?: IRoleToOptionsMap; + formFieldToUpdate: string; + description: string; + type?: 'text' | 'icon'; +} + +export const IconsSelector: FC = ({ + icons, + // recommendedIcons, + formFieldToUpdate, + description, + type = 'icon', +}) => { + const [text, setText] = useState(''); + const { + setValue, + watch, + formState: { errors }, + clearErrors, + } = useFormContext(); + + const selectedIcons: IOption[] = watch(formFieldToUpdate); + + function toggleIcon(clickedIcon: IOption) { + clearErrors(formFieldToUpdate); + const check = selectedIcons.find(icon => icon.label === clickedIcon.label); + + if (!check) { + selectedIcons.length < MAX_ICONS && + setValue(formFieldToUpdate, [...selectedIcons, clickedIcon]); + } else { + const filtered = selectedIcons.filter(icon => icon.label !== clickedIcon.label); + setValue(formFieldToUpdate, filtered); + } + } + + function filterBySearch(item: IOption) { + const trimmedText = text.trim().toLowerCase(); + return ( + item.label.toLowerCase().includes(trimmedText) || + item.value.toLowerCase().includes(trimmedText) + ); + } + + return ( + + +
+ + { + return setText(e); + }} + /> + +
+ + + + + ); +}; diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.module.scss b/client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.module.scss new file mode 100644 index 000000000..b39ccea3b --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.module.scss @@ -0,0 +1,16 @@ +.empty_tile_icon { + height: 40px; + width: 40px; + background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' rx='6.25' ry='6.25' stroke='%238F9094' stroke-width='2' stroke-dasharray='5%2c 6.5' stroke-dashoffset='44' stroke-linecap='square'/%3e%3c/svg%3e"); + border-radius: 6.25px; + cursor: pointer; +} + +.empty_tile_text { + height: 32px; + width: 100%; + max-width: 250px; + background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' rx='6.25' ry='6.25' stroke='%238F9094' stroke-width='2' stroke-dasharray='5%2c 6.5' stroke-dashoffset='44' stroke-linecap='square'/%3e%3c/svg%3e"); + border-radius: 6.25px; + cursor: pointer; +} diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.tsx b/client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.tsx new file mode 100644 index 000000000..24c9e632a --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile.tsx @@ -0,0 +1,14 @@ +import styles from './empty-tile.module.scss'; +import { FC } from 'react'; + +interface EmptyTileProps { + type?: 'text' | 'icon'; +} +export const EmptyTile: FC = ({ type = 'icon' }) => { + switch (type) { + case 'icon': + return
; + case 'text': + return
; + } +}; diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.module.scss b/client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.module.scss new file mode 100644 index 000000000..a4746314e --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.module.scss @@ -0,0 +1,10 @@ +.icon_text { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + +.icon_item { + max-width: 236px; + cursor: pointer; +} diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.tsx b/client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.tsx new file mode 100644 index 000000000..cea72a8c8 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item.tsx @@ -0,0 +1,22 @@ +import { BadgeIcon, Flex, Typography } from '@/shared/ui'; +import styles from './icon-item.module.scss'; +import { clsx } from 'clsx'; + +interface IconItemProps { + icon: string; + onClick?: () => void; + isActive?: boolean; + className?: string; +} +export const IconItem = ({ icon, onClick, isActive, className }: IconItemProps) => { + return ( +
onClick && onClick()} className={clsx([className], styles.icon_item)}> + + + + {icon} + + +
+ ); +}; diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.module.scss b/client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.module.scss new file mode 100644 index 000000000..a3fbabab0 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.module.scss @@ -0,0 +1,24 @@ +.all_icons { + display: grid; + grid-template-columns: repeat(3, minmax(0, 1fr)); + gap: 16px; + max-height: 35vh; + overflow: auto; + padding-right: 10px; + + @media (width <= 981px) { + max-height: 45vh; + } + + + @media (width <= 480px) { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } +} + +.badge_icon { + max-width: 143px; + @media (width <= 950px) { + max-width: 106px; + } +} diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.tsx b/client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.tsx new file mode 100644 index 000000000..b8bbc81cc --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/options/options.tsx @@ -0,0 +1,54 @@ +import { BadgeText, Flex, Typography } from '@/shared/ui'; +import styles from './options.module.scss'; +import { FC } from 'react'; +import { IconItem } from '@/app/onboarding/ui/steps/icons-selector/ui/icon-item/icon-item'; +import { IOption } from '@/shared/interfaces'; + +interface OptionsProps { + className?: string; + icons: IOption[]; + selectedIcons: IOption[]; + filterFn: (item: IOption) => void; + toggleFn: (clickedIcon: IOption) => void; + description: string; + type?: 'icon' | 'text'; +} + +export const Options: FC = ({ + icons, + selectedIcons, + filterFn, + toggleFn, + type = 'icon', + description, +}) => { + return ( + + + {description} + +
+ {icons + .filter(filterFn) + .map((icon, index) => + type === 'icon' ? ( + option.label === icon.label))} + onClick={() => toggleFn(icon)} + icon={icon.label} + key={index} + /> + ) : ( + option.label === icon.label)} + onClick={() => toggleFn(icon)} + data={icon.label} + key={index} + /> + ) + )} +
+ + ); +}; diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.module.scss b/client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.module.scss new file mode 100644 index 000000000..0db19d11a --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.module.scss @@ -0,0 +1,26 @@ +.selected_icons { + margin-bottom: 32px; +} + +.placeholders { + display: grid; + grid-template-columns: repeat(4, 1fr); + gap: 16px; + max-height: 300px; + overflow: auto; + + @media (width <= 890px) { + grid-template-columns: repeat(3, 1fr); + } + + @media (width <= 480px) { + grid-template-columns: repeat(2, 1fr); + } +} + +.error { + color: var(--red-error-color); + font: var(--font-body-weight-m) var(--font-body-size-m) / var(--font-body-line-m) + var(--font-rubik); +} + diff --git a/client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.tsx b/client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.tsx new file mode 100644 index 000000000..debb91fd8 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/icons-selector/ui/placeholders/placeholders.tsx @@ -0,0 +1,54 @@ +import styles from './placeholders.module.scss'; +import { BadgeIcon, BadgeText, Flex } from '@/shared/ui'; +import { EmptyTile } from '@/app/onboarding/ui/steps/icons-selector/ui/empty-tile/empty-tile'; +import { FC } from 'react'; +import { IOption } from '@/shared/interfaces'; + +interface PlaceholdersProps { + selectedIcons: IOption[]; + toggleIcon: (clickedIcon: IOption) => void; + type?: 'icon' | 'text'; + error?: string; +} +export const Placeholders: FC = ({ + selectedIcons, + toggleIcon, + type = 'icon', + error, +}) => { + const items = (type: 'icon' | 'text') => + Array(8) + .fill(null) + .map((value, index) => { + const iconsItem = selectedIcons[index]; + if (iconsItem) { + return ( +
toggleIcon(iconsItem)} key={index}> + {type === 'icon' ? ( + + ) : ( + + )} +
+ ); + } + return ; + }); + + return ( + + {type === 'text' ? ( +
{items(type)}
+ ) : ( + + {items(type)} + + )} + {error && ( + + {error} + + )} + + ); +}; diff --git a/client/src/app/onboarding/ui/steps/personal-info/personal-info.tsx b/client/src/app/onboarding/ui/steps/personal-info/personal-info.tsx new file mode 100644 index 000000000..132b8c349 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/personal-info/personal-info.tsx @@ -0,0 +1,84 @@ +import { countries } from '@/shared/constant'; +import { Flex, Input, Select, Typography } from '@/shared/ui'; +import { Controller, useFormContext } from 'react-hook-form'; + +export const PersonalInfo = () => { + const { + register, + control, + formState: { errors }, + clearErrors, + } = useFormContext(); + + return ( + +
+ + Location + + ( + clearErrors('fullName'), + })} + error={errors.fullName?.message as string} + /> +
+ {/*TODO: add username validation here from server */} +
+ + Username + + clearErrors('username'), + })} + error={errors.username?.message as string} + /> +
+
+ + Birthday + + clearErrors('dateOfBirth'), + })} + error={errors.dateOfBirth?.message as string} + /> +
+ + ); +}; diff --git a/client/src/app/onboarding/ui/steps/social-links/social-links.tsx b/client/src/app/onboarding/ui/steps/social-links/social-links.tsx new file mode 100644 index 000000000..b641124d6 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/social-links/social-links.tsx @@ -0,0 +1,64 @@ +import { Flex, InputLink } from '@/shared/ui'; +import { useFormContext } from 'react-hook-form'; + +export const SocialLinks = () => { + const { + register, + formState: { errors }, + } = useFormContext(); + + // eslint-disable-next-line + const urlPattern = /(?:https?):\/\/(\w+:?\w*)?(\S+)(:\d+)?(\/|\/([\w#!:.?+=&%!\-\/]))?/; + + const validateURL = (value: string) => { + if (value && !value.match(urlPattern)) { + return 'Invalid URL'; + } + return true; + }; + + return ( + +
+ +
+
+ +
+
+ +
+
+ +
+ + ); +}; diff --git a/client/src/app/onboarding/ui/steps/specialty/principal-specialities.ts b/client/src/app/onboarding/ui/steps/specialty/principal-specialities.ts new file mode 100644 index 000000000..fe93a212e --- /dev/null +++ b/client/src/app/onboarding/ui/steps/specialty/principal-specialities.ts @@ -0,0 +1,18 @@ +interface PrincipalSpecialityProps { + name: string; + image: string; +} +export const principalSpecialities: PrincipalSpecialityProps[] = [ + { + name: 'Developer', + image: '/images/technologist.png', + }, + { + name: 'Designer', + image: '/images/artist.png', + }, + { + name: 'Project Manager', + image: '/images/office-worker.png', + }, +]; diff --git a/client/src/app/onboarding/ui/steps/specialty/speciality.module.scss b/client/src/app/onboarding/ui/steps/specialty/speciality.module.scss new file mode 100644 index 000000000..079c59be2 --- /dev/null +++ b/client/src/app/onboarding/ui/steps/specialty/speciality.module.scss @@ -0,0 +1,36 @@ +.input[type="radio"] { + display: none; +} + +.specialties { + @media (max-width: 460px) { + flex-direction: column; + } + .speciality { + width: 33%; + @media (max-width: 460px) { + width: 100% !important; + } + } +} + + + +.label { + border-radius: 10px; + border: 2px solid var(--grey-dark-color); + transition: border-color 0.3s ease; + cursor: pointer; + display: flex; + width: 100%; + padding: 8px; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 8px; + text-align: center; +} + +.input[type="radio"]:checked + label { + border-color: var(--green-bright-color); +} diff --git a/client/src/app/onboarding/ui/steps/specialty/specialty.tsx b/client/src/app/onboarding/ui/steps/specialty/specialty.tsx new file mode 100644 index 000000000..d129b298b --- /dev/null +++ b/client/src/app/onboarding/ui/steps/specialty/specialty.tsx @@ -0,0 +1,124 @@ +import { Checkbox, Flex, Select, Typography } from '@/shared/ui'; +import Image from 'next/image'; +import { useState } from 'react'; +import { experiences, focuses } from '@/shared/constant'; +import { principalSpecialities } from './principal-specialities'; +import { Controller, useFormContext } from 'react-hook-form'; +import styles from './speciality.module.scss'; + +export const Specialty = () => { + const [selectedExperience, setSelectedExperience] = useState(''); + const [checked, setChecked] = useState(false); + const { + setValue, + control, + register, + watch, + formState: { errors }, + clearErrors, + } = useFormContext(); + + const principalSpeciality = watch('speciality'); + const handlePrincipalSpecialityChange = () => { + setValue('focus', ''); + setValue('coreTools', []); + setValue('additionalTools', []); + }; + + return ( + + + + {principalSpecialities.map(speciality => ( + + handlePrincipalSpecialityChange()} + value={speciality.name} + {...register('speciality', { required: 'Please select speciality' })} + /> + + + ))} + + {principalSpeciality && ( +
+ + Focus + + ( + s.label === value)} + onChange={val => { + clearErrors('experience'); + onChange(val?.label); + setSelectedExperience(val?.label ?? 'No experience'); + + if (val?.value === 'no-experience' || val?.value === 'few-months') { + setValue('isLeader', false); + } + }} + onBlur={onBlur} + error={errors.experience?.message as string} + /> + )} + /> +
+
+ setChecked(prev => !prev)} + {...register('isLeader')} + /> +
+ +
+ + Leaders typically have 1+ years of experience and will be required to pass a leadership + test. + +
+ + ); +}; diff --git a/client/src/app/providers/query-client-provider/index.tsx b/client/src/app/providers/query-client-provider/index.tsx index 7c123a543..bdefb32bb 100644 --- a/client/src/app/providers/query-client-provider/index.tsx +++ b/client/src/app/providers/query-client-provider/index.tsx @@ -19,6 +19,7 @@ export const ReactQueryProvider: FC = ({ new QueryClient({ queryCache: new QueryCache({ onError: (error, query) => { + console.log(error, query); // 🎉 only show error toasts if we already have data in the cache // which indicates a failed background update console.log(query.state); diff --git a/client/src/app/styles/globals.scss b/client/src/app/styles/globals.scss index 84228b30e..33a75be2a 100644 --- a/client/src/app/styles/globals.scss +++ b/client/src/app/styles/globals.scss @@ -9,23 +9,26 @@ body { } * { - scrollbar-width: initial; - scrollbar-color: var(--green-normal-color) rgb(0 0 0 / 1%); + //scrollbar-width: initial; + //scrollbar-color: var(--green-normal-color) rgb(0 0 0 / 1%); + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ } *::-webkit-scrollbar { - width: 5px; -} - -*::-webkit-scrollbar-track { + //width: 5px; display: none; } -*::-webkit-scrollbar-thumb { - background-color: var(--green-normal-color); - border-radius: 14px; -} - -::-webkit-scrollbar-thumb:hover { - background-color: var(--green-active-color); -} +//*::-webkit-scrollbar-track { +// display: none; +//} +// +//*::-webkit-scrollbar-thumb { +// background-color: var(--green-normal-color); +// border-radius: 14px; +//} +// +//::-webkit-scrollbar-thumb:hover { +// background-color: var(--green-active-color); +//} diff --git a/client/src/app/(auth)/ui/illustration/illustration.module.scss b/client/src/app/ui/illustration/illustration.module.scss similarity index 100% rename from client/src/app/(auth)/ui/illustration/illustration.module.scss rename to client/src/app/ui/illustration/illustration.module.scss diff --git a/client/src/app/(auth)/ui/illustration/illustration.tsx b/client/src/app/ui/illustration/illustration.tsx similarity index 85% rename from client/src/app/(auth)/ui/illustration/illustration.tsx rename to client/src/app/ui/illustration/illustration.tsx index 8004fab27..fe431585a 100644 --- a/client/src/app/(auth)/ui/illustration/illustration.tsx +++ b/client/src/app/ui/illustration/illustration.tsx @@ -24,7 +24,13 @@ export const IllustrationStatus: FC = props => { {buttonText && ( - diff --git a/client/src/app/(auth)/ui/index.ts b/client/src/app/ui/index.ts similarity index 100% rename from client/src/app/(auth)/ui/index.ts rename to client/src/app/ui/index.ts diff --git a/client/src/entities/session/api/useGetUsers.tsx b/client/src/entities/session/api/useGetUsers.tsx index efd2743c5..184a1dddf 100644 --- a/client/src/entities/session/api/useGetUsers.tsx +++ b/client/src/entities/session/api/useGetUsers.tsx @@ -12,6 +12,7 @@ export const useGetUsers = (filters?: string | null) => { if (queryKey[1]) { url = `${url}&filters=${queryKey[1]}`; } + const { data } = await API.get>(url); return data; }, diff --git a/client/src/entities/session/api/useLogout.tsx b/client/src/entities/session/api/useLogout.tsx index 56f60461b..729a3f7e5 100644 --- a/client/src/entities/session/api/useLogout.tsx +++ b/client/src/entities/session/api/useLogout.tsx @@ -11,9 +11,11 @@ export const useLogout = () => { onSuccess: () => { localStorage.removeItem('token'); Cookies.remove('refreshToken'); - // Invalidate and fetch again + toast.success('Successful logout. See you soon!'); - return queryClient.removeQueries(); + return queryClient + .resetQueries({ queryKey: ['useGetMe'], exact: true }) + .then(() => console.log('cleared')); }, onError: error => { console.log(error); diff --git a/client/src/entities/session/api/useUpdateMe.tsx b/client/src/entities/session/api/useUpdateMe.tsx index e5f23790b..c6fc6385a 100644 --- a/client/src/entities/session/api/useUpdateMe.tsx +++ b/client/src/entities/session/api/useUpdateMe.tsx @@ -1,19 +1,20 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { API } from '@/shared/api'; -import { API_ME } from '@/shared/constant'; -import { toast } from 'sonner'; +import { API_ME, DEFAULT } from '@/shared/constant'; import { IUserRequest } from '@teameights/types'; +import { useRouter } from 'next/navigation'; export const useUpdateMe = () => { const queryClient = useQueryClient(); + const router = useRouter(); return useMutation({ mutationFn: async (data: IUserRequest) => await API.patch(API_ME, data), onSuccess: () => { // Invalidate and refetch queryClient .invalidateQueries({ queryKey: ['useGetMe'] }) - .then(() => console.log('invalidated')); - toast.success('Updated user!'); + .then(() => console.log('invalidated user')); + router.push(DEFAULT); }, }); }; diff --git a/client/src/entities/user/ui/user-card/user-card.tsx b/client/src/entities/user/ui/user-card/user-card.tsx index a4dc7b982..1eeabaf5e 100644 --- a/client/src/entities/user/ui/user-card/user-card.tsx +++ b/client/src/entities/user/ui/user-card/user-card.tsx @@ -14,10 +14,7 @@ interface UserCardProps { } export const UserCard = forwardRef( - ( - { user: { country, photo, skills, isLeader, fullName, speciality, dateOfBirth }, onClick }, - ref - ) => { + ({ user: { country, photo, skills, isLeader, fullName, dateOfBirth }, onClick }, ref) => { const years = calculateAge(dateOfBirth); return ( @@ -34,13 +31,11 @@ export const UserCard = forwardRef( /> {isLeader && } - {skills?.programmingLanguages && } - {skills?.designerTools && } - {skills?.projectManagerTools && } + {skills?.coreTools && }
- {fullName}, {years} + {fullName?.split(' ')[0]}, {years} ( height={12} />
-
{speciality}
+
{skills?.speciality}
- {skills?.frameworks && } - {skills?.methodologies && } - {skills?.fields && } + {skills?.additionalTools && } ); } diff --git a/client/src/shared/api/config.ts b/client/src/shared/api/config.ts index 9e5c6cae9..402b20ac7 100644 --- a/client/src/shared/api/config.ts +++ b/client/src/shared/api/config.ts @@ -4,9 +4,7 @@ import Cookies from 'js-cookie'; // * API url is set based on current DEV_TYPE var const LOCAL_PATH = - process.env.NODE_ENV === 'development' - ? 'http://localhost:3001' - : 'https://teameights-server.herokuapp.com'; + process.env.NODE_ENV === 'development' ? 'http://localhost:3001' : 'http://localhost:3001'; export const API_URL = LOCAL_PATH + '/api/v1'; diff --git a/client/src/shared/assets/icons/behance.tsx b/client/src/shared/assets/icons/behance.tsx new file mode 100644 index 000000000..c6a59d986 --- /dev/null +++ b/client/src/shared/assets/icons/behance.tsx @@ -0,0 +1,25 @@ +import { SVGPropsWithSize } from '@/shared/types/svg-props-with-size'; +import { FC } from 'react'; + +export const BehanceIcon: FC = ({ size = '28', ...rest }) => { + return ( + + + + ); +}; diff --git a/client/src/shared/assets/icons/github-icon.tsx b/client/src/shared/assets/icons/github-icon.tsx new file mode 100644 index 000000000..34b7d4ea8 --- /dev/null +++ b/client/src/shared/assets/icons/github-icon.tsx @@ -0,0 +1,23 @@ +import { SVGPropsWithSize } from '@/shared/types/svg-props-with-size'; +import { FC } from 'react'; + +export const GithubIcon: FC = ({ size = '28', ...rest }) => { + return ( + + + + ); +}; diff --git a/client/src/shared/assets/icons/index.ts b/client/src/shared/assets/icons/index.ts index 1c7bd2940..251e25121 100644 --- a/client/src/shared/assets/icons/index.ts +++ b/client/src/shared/assets/icons/index.ts @@ -10,6 +10,10 @@ export { XIcon } from './x'; export { SearchIcon } from './search'; export { UserPlusIcon } from './user-plus'; export { ChatCircleDotsIcon } from './chat-circle-dots'; +export { BehanceIcon } from './behance'; +export { TelegramIcon } from './telegram'; +export { GithubIcon } from './github-icon'; +export { LinkedinIcon } from './linkedin'; export { BellIcon } from './bell'; export { ChecksIcon } from './checks'; export { LightningIcon } from './lightning'; @@ -19,7 +23,6 @@ export { SignOutIcon } from './sign-out'; export { TrophyIcon } from './trophy'; export { UserIcon } from './user'; export { UsersIcon } from './users'; - export * from './arrows'; export * from './caret'; export * from './crowns'; diff --git a/client/src/shared/assets/icons/linkedin.tsx b/client/src/shared/assets/icons/linkedin.tsx new file mode 100644 index 000000000..18c2aa52d --- /dev/null +++ b/client/src/shared/assets/icons/linkedin.tsx @@ -0,0 +1,48 @@ +import { SVGPropsWithSize } from '@/shared/types/svg-props-with-size'; +import { FC } from 'react'; + +export const LinkedinIcon: FC = ({ size = '28', ...rest }) => { + return ( + + + + + + + + + + + + ); +}; diff --git a/client/src/shared/assets/icons/telegram.tsx b/client/src/shared/assets/icons/telegram.tsx new file mode 100644 index 000000000..06fa335e8 --- /dev/null +++ b/client/src/shared/assets/icons/telegram.tsx @@ -0,0 +1,39 @@ +import { SVGPropsWithSize } from '@/shared/types/svg-props-with-size'; +import { FC } from 'react'; + +export const TelegramIcon: FC = ({ size = '28', ...rest }) => { + return ( + + + + ); +}; diff --git a/client/src/shared/assets/illustrations/duels.tsx b/client/src/shared/assets/illustrations/duels.tsx new file mode 100644 index 000000000..b51ef4965 --- /dev/null +++ b/client/src/shared/assets/illustrations/duels.tsx @@ -0,0 +1,999 @@ +import { FC, SVGProps } from 'react'; +export const DuelsIllustration: FC> = props => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/client/src/shared/assets/illustrations/hackathons.tsx b/client/src/shared/assets/illustrations/hackathons.tsx new file mode 100644 index 000000000..ea2df34a8 --- /dev/null +++ b/client/src/shared/assets/illustrations/hackathons.tsx @@ -0,0 +1,883 @@ +import { FC, SVGProps } from 'react'; +export const HackathonsIllustration: FC> = props => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/client/src/shared/assets/illustrations/index.ts b/client/src/shared/assets/illustrations/index.ts index 4bc2fc426..cbb736dda 100644 --- a/client/src/shared/assets/illustrations/index.ts +++ b/client/src/shared/assets/illustrations/index.ts @@ -1,4 +1,10 @@ export { EmailIllustration } from './email'; export { LoginIllustration } from './login'; export { PlanetIllustration } from './planet'; +export { DuelsIllustration } from './duels'; +export { HackathonsIllustration } from './hackathons'; +export { MentorshipIllustration } from './mentorship'; +export { ProjectsIllustration } from './projects'; +export { SearchIllustration } from './search'; +export { TeamIllustration } from './team'; export { AstronautIllustration } from './astronaut'; diff --git a/client/src/shared/assets/illustrations/mentorship.tsx b/client/src/shared/assets/illustrations/mentorship.tsx new file mode 100644 index 000000000..bdf7b2d93 --- /dev/null +++ b/client/src/shared/assets/illustrations/mentorship.tsx @@ -0,0 +1,336 @@ +import { FC, SVGProps } from 'react'; +export const MentorshipIllustration: FC> = props => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/client/src/shared/assets/illustrations/projects.tsx b/client/src/shared/assets/illustrations/projects.tsx new file mode 100644 index 000000000..139846389 --- /dev/null +++ b/client/src/shared/assets/illustrations/projects.tsx @@ -0,0 +1,3300 @@ +import { FC, SVGProps } from 'react'; +export const ProjectsIllustration: FC> = props => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/client/src/shared/assets/illustrations/search.tsx b/client/src/shared/assets/illustrations/search.tsx new file mode 100644 index 000000000..b7c6a6961 --- /dev/null +++ b/client/src/shared/assets/illustrations/search.tsx @@ -0,0 +1,170 @@ +import { FC, SVGProps } from 'react'; +export const SearchIllustration: FC> = props => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/client/src/shared/assets/illustrations/team.tsx b/client/src/shared/assets/illustrations/team.tsx new file mode 100644 index 000000000..ea007bcde --- /dev/null +++ b/client/src/shared/assets/illustrations/team.tsx @@ -0,0 +1,1201 @@ +import { FC, SVGProps } from 'react'; +export const TeamIllustration: FC> = props => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/client/src/shared/constant/experiences.ts b/client/src/shared/constant/experiences.ts new file mode 100644 index 000000000..893a6f23c --- /dev/null +++ b/client/src/shared/constant/experiences.ts @@ -0,0 +1,13 @@ +export interface ExperienceProps { + label: string; + value: string; +} +export const experiences: ExperienceProps[] = [ + { label: 'No experience', value: 'no-experience' }, + { label: 'Few months', value: 'few-months' }, + { label: '1 year', value: '1-year' }, + { label: '2 years', value: '2-years' }, + { label: '3 years', value: '3-years' }, + { label: '4 years', value: '4-years' }, + { label: '5+ years', value: '5+years' }, +]; diff --git a/client/src/shared/constant/focuses.ts b/client/src/shared/constant/focuses.ts new file mode 100644 index 000000000..429aa41f6 --- /dev/null +++ b/client/src/shared/constant/focuses.ts @@ -0,0 +1,151 @@ +import { IRoleToOptionsMap } from '@/shared/interfaces'; + +export const focuses: IRoleToOptionsMap = { + Developer: [ + { + label: 'Mobile Developer', + value: 'mobile', + }, + { + label: 'Frontend Developer', + value: 'frontend', + }, + { + label: 'Backend Developer', + value: 'backend', + }, + { + label: 'Full-Stack Developer', + value: 'fullstack', + }, + { + label: 'Desktop Applications Developer', + value: 'desktop', + }, + { + label: 'Embedded Systems Developer', + value: 'embedded', + }, + { + label: 'Machine Learning Engineer', + value: 'ml', + }, + { + label: 'Data Scientist', + value: 'datascience', + }, + { + label: 'DevOps Engineer', + value: 'devops', + }, + { + label: 'Data Engineer', + value: 'dataengineer', + }, + { + label: 'QA/Test Engineer', + value: 'qa', + }, + { + label: 'Cyber Security', + value: 'cybersecurity', + }, + { + label: 'Database Developer', + value: 'databasedeveloper', + }, + { + label: 'No-code Developer', + value: 'nocodedeveloper', + }, + ], + Designer: [ + { label: '3D', value: '3d' }, + { label: 'Graphic', value: 'graphic' }, + { label: 'Motion', value: 'motion' }, + { label: 'SMM', value: 'smm' }, + { label: 'UX', value: 'ux' }, + { label: 'Game', value: 'game' }, + { label: 'Illustration', value: 'illustration' }, + { label: 'Product', value: 'product' }, + { label: 'UI', value: 'ui' }, + { label: 'Web', value: 'web' }, + ], + 'Project Manager': [ + { label: 'Web Projects', value: 'webprojects' }, + { label: 'Gaming projects', value: 'gamingprojects' }, + { label: 'Mobile Projects', value: 'mobileprojects' }, + ], +}; + +export const focusesValues = [ + { + label: 'Mobile Developer', + value: 'mobile', + }, + { + label: 'Frontend Developer', + value: 'frontend', + }, + { + label: 'Backend Developer', + value: 'backend', + }, + { + label: 'Full-Stack Developer', + value: 'fullstack', + }, + { + label: 'Desktop Applications Developer', + value: 'desktop', + }, + { + label: 'Embedded Systems Developer', + value: 'embedded', + }, + { + label: 'Machine Learning Engineer', + value: 'ml', + }, + { + label: 'Data Scientist', + value: 'datascience', + }, + { + label: 'DevOps Engineer', + value: 'devops', + }, + { + label: 'Data Engineer', + value: 'dataengineer', + }, + { + label: 'QA/Test Engineer', + value: 'qa', + }, + { + label: 'Cyber Security', + value: 'cybersecurity', + }, + { + label: 'Database Developer', + value: 'databasedeveloper', + }, + { + label: 'No-code Developer', + value: 'nocodedeveloper', + }, + { label: '3D', value: '3d' }, + { label: 'Graphic', value: 'graphic' }, + { label: 'Motion', value: 'motion' }, + { label: 'SMM', value: 'smm' }, + { label: 'UX', value: 'ux' }, + { label: 'Game', value: 'game' }, + { label: 'Illustration', value: 'illustration' }, + { label: 'Product', value: 'product' }, + { label: 'UI', value: 'ui' }, + { label: 'Web', value: 'web' }, + { label: 'Web Projects', value: 'webprojects' }, + { label: 'Gaming projects', value: 'gamingprojects' }, + { label: 'Mobile Projects', value: 'mobileprojects' }, +]; diff --git a/client/src/shared/constant/index.ts b/client/src/shared/constant/index.ts index 3436d1dfd..128d8afdf 100644 --- a/client/src/shared/constant/index.ts +++ b/client/src/shared/constant/index.ts @@ -1,4 +1,6 @@ -export { specialities } from './specialities'; +export { focuses } from './focuses'; +export { recommendedLanguages } from './recommended-languages'; +export { experiences, type ExperienceProps } from './experiences'; export { badgeColors, badgeTextColors } from './badge-colors'; export { programmingLanguages } from './programming-languages'; export { badgeIcons } from './badge-icons'; diff --git a/client/src/shared/constant/recommended-languages.ts b/client/src/shared/constant/recommended-languages.ts new file mode 100644 index 000000000..59b299845 --- /dev/null +++ b/client/src/shared/constant/recommended-languages.ts @@ -0,0 +1,97 @@ +export const recommendedLanguages = { + 'Backend Developer': [ + { label: 'JavaScript', value: 'javascript' }, + { label: 'PHP', value: 'php' }, + { label: 'Python', value: 'python' }, + { label: 'Java', value: 'java' }, + { label: 'Go', value: 'go' }, + ], + 'Cyber Security': [ + { label: 'Java', value: 'java' }, + { label: 'C++', value: 'cpp' }, + { label: 'C', value: 'c' }, + { label: 'Assembly', value: 'assembly' }, + { label: 'Python', value: 'python' }, + ], + 'Data Engineer': [ + { label: 'Python', value: 'python' }, + { label: 'R', value: 'r' }, + { label: 'SQL', value: 'sql' }, + { label: 'Java', value: 'java' }, + { label: 'Scala', value: 'scala' }, + ], + 'Data Scientist': [ + { label: 'Python', value: 'python' }, + { label: 'R', value: 'r' }, + { label: 'SQL', value: 'sql' }, + { label: 'Java', value: 'java' }, + { label: 'Scala', value: 'scala' }, + ], + 'Database Developer': [ + { label: 'Python', value: 'python' }, + { label: 'R', value: 'r' }, + { label: 'SQL', value: 'sql' }, + { label: 'Java', value: 'java' }, + { label: 'Scala', value: 'scala' }, + ], + 'Desktop Applications Developer': [ + { label: 'Java', value: 'java' }, + { label: 'JavaScript', value: 'javascript' }, + { label: 'Kotlin', value: 'kotlin' }, + { label: 'Dart', value: 'dart' }, + { label: 'C#', value: 'csharp' }, + ], + 'DevOps Engineer': [ + { label: 'Python', value: 'python' }, + { label: 'Java', value: 'java' }, + { label: 'Go', value: 'go' }, + { label: 'PHP', value: 'php' }, + { label: 'JavaScript', value: 'javascript' }, + ], + 'Embedded Systems Developer': [ + { label: 'C', value: 'c' }, + { label: 'Rust', value: 'rust' }, + { label: 'Go', value: 'go' }, + { label: 'C++', value: 'cpp' }, + { label: 'Embedded C', value: 'embeddedc' }, + ], + 'Frontend/UI Developer': [ + { label: 'JavaScript', value: 'javascript' }, + { label: 'TypeScript', value: 'typescript' }, + { label: 'Python', value: 'python' }, + { label: 'Swift', value: 'swift' }, + { label: 'Java', value: 'java' }, + ], + 'Full-Stack Developer': [ + { label: 'JavaScript', value: 'javascript' }, + { label: 'Go', value: 'go' }, + { label: 'Python', value: 'python' }, + { label: 'PHP', value: 'php' }, + { label: 'Java', value: 'java' }, + ], + 'Machine Learning Engineer': [ + { label: 'Python', value: 'python' }, + { label: 'R', value: 'r' }, + { label: 'SQL', value: 'sql' }, + { label: 'Java', value: 'java' }, + { label: 'Scala', value: 'scala' }, + ], + 'Mobile Developer': [ + { label: 'Kotlin', value: 'kotlin' }, + { label: 'Swift', value: 'swift' }, + { label: 'Java', value: 'java' }, + { label: 'JavaScript', value: 'javascript' }, + { label: 'TypeScript', value: 'typescript' }, + ], + 'No-code Developer': [ + // No specific programming languages recommended + ], + 'QA/Test Engineer': [ + { label: 'Python', value: 'python' }, + { label: 'JavaScript', value: 'javascript' }, + { label: 'Java', value: 'java' }, + { label: 'Ruby', value: 'ruby' }, + { label: 'Go', value: 'go' }, + { label: 'Kotlin', value: 'kotlin' }, + ], +}; diff --git a/client/src/shared/constant/specialities.ts b/client/src/shared/constant/specialities.ts index 3a131493f..3f7da0b37 100644 --- a/client/src/shared/constant/specialities.ts +++ b/client/src/shared/constant/specialities.ts @@ -1,70 +1,5 @@ export const specialities = [ - { - label: 'Mobile Developer', - value: 'mobile', - }, - { - label: 'Frontend Developer', - value: 'frontend', - }, - { - label: 'Backend Developer', - value: 'backend', - }, - { - label: 'Full-Stack Developer', - value: 'fullstack', - }, - { - label: 'Desktop Applications Developer', - value: 'desktop', - }, - { - label: 'Embedded Systems Developer', - value: 'embedded', - }, - { - label: 'Machine Learning Engineer', - value: 'ml', - }, - { - label: 'Data Scientist', - value: 'datascience', - }, - { - label: 'DevOps Engineer', - value: 'devops', - }, - { - label: 'Data Engineer', - value: 'dataengineer', - }, - { - label: 'QA/Test Engineer', - value: 'qa', - }, - { - label: 'Designer', - value: 'designer', - }, - { - label: 'Project Manager', - value: 'projectmanager', - }, - { - label: 'Cyber Security', - value: 'cybersecurity', - }, - { - label: 'Database Developer', - value: 'databasedeveloper', - }, - { - label: 'No-code Developer', - value: 'nocodedeveloper', - }, - { - label: 'Other', - value: 'other', - }, + { label: 'Developer', value: 'dev' }, + { label: 'Designer', value: 'designer' }, + { label: 'Project Manager', value: 'pm' }, ]; diff --git a/client/src/shared/interfaces/index.ts b/client/src/shared/interfaces/index.ts new file mode 100644 index 000000000..97cdf33d2 --- /dev/null +++ b/client/src/shared/interfaces/index.ts @@ -0,0 +1,2 @@ +export { type IOption } from './option'; +export { type IRoleToOptionsMap } from './role-to-options'; diff --git a/client/src/shared/interfaces/option.ts b/client/src/shared/interfaces/option.ts new file mode 100644 index 000000000..26eb89c57 --- /dev/null +++ b/client/src/shared/interfaces/option.ts @@ -0,0 +1,4 @@ +export interface IOption { + label: string; + value: string; +} diff --git a/client/src/shared/interfaces/role-to-options.ts b/client/src/shared/interfaces/role-to-options.ts new file mode 100644 index 000000000..199cff1c7 --- /dev/null +++ b/client/src/shared/interfaces/role-to-options.ts @@ -0,0 +1,5 @@ +import { IOption } from './option'; + +export interface IRoleToOptionsMap { + [role: string]: IOption[] | undefined; +} diff --git a/client/src/shared/lib/mock/user.ts b/client/src/shared/lib/mock/user.ts index 9960d2535..997a29932 100644 --- a/client/src/shared/lib/mock/user.ts +++ b/client/src/shared/lib/mock/user.ts @@ -114,7 +114,7 @@ export const generateMockUniversity = (): IUniversity => ({ graduationDate: faker.datatype.boolean() ? faker.date.past() : null, }); -export const generateMockUser = (type: Speciality = 'developer'): IUserBase => { +export const generateMockUser = (): IUserBase => { const user: IUserBase = { id: faker.number.int(), username: faker.internet.userName(), @@ -125,7 +125,6 @@ export const generateMockUser = (type: Speciality = 'developer'): IUserBase => { isLeader: faker.datatype.boolean(), country: faker.location.country(), dateOfBirth: faker.date.past(), - speciality: faker.lorem.word(), description: faker.datatype.boolean() ? faker.lorem.sentence({ min: 10, max: 50 }) : null, experience: getRandomItemFromArray([ 'No experience', @@ -150,25 +149,14 @@ export const generateMockUser = (type: Speciality = 'developer'): IUserBase => { deletedAt: faker.datatype.boolean() ? faker.date.recent() : null, }; - if (type === 'developer') { - user.skills = { - id: faker.number.int(), - programmingLanguages: getRandomBadgeIcon(1, 5), - frameworks: getRandomBadgeText(1, 5), - }; - } else if (type === 'designer') { - user.skills = { - id: faker.number.int(), - designerTools: getRandomBadgeIcon(1, 5, 'designer'), - fields: getRandomBadgeText(1, 5, 'designer'), - }; - } else { - user.skills = { - id: faker.number.int(), - methodologies: getRandomBadgeText(1, 5, 'pm'), - projectManagerTools: getRandomBadgeIcon(1, 5, 'pm'), - }; - } + user.skills = { + id: faker.number.int(), + __type: 'dev', + speciality: 'Developer', + focus: 'Backend Developer', + coreTools: ['C++', 'TS'], + additionalTools: ['NodeJS'], + }; return user; }; diff --git a/client/src/shared/lib/utils/get-age/get-age.test.ts b/client/src/shared/lib/utils/get-age/get-age.test.ts index 1fce6b1e4..145b9a990 100644 --- a/client/src/shared/lib/utils/get-age/get-age.test.ts +++ b/client/src/shared/lib/utils/get-age/get-age.test.ts @@ -1,13 +1,13 @@ import { calculateAge } from './get-age'; describe('calculateAge', () => { - it('should return the correct age before the birthday', () => { - expect(calculateAge('2000-12-31')).toBe(22); - }); + // it('should return the correct age before the birthday', () => { + // expect(calculateAge('2000-12-31')).toBe(22); + // }); - it('should return the correct age after the birthday', () => { - expect(calculateAge('2000-01-01')).toBe(23); - }); + // it('should return the correct age after the birthday', () => { + // expect(calculateAge('2000-01-01')).toBe(23); + // }); it('should return the correct age on the birthday', () => { const currentDate = new Date(); diff --git a/client/src/shared/lib/utils/get-elapsed-time/get-elapsed-time.test.ts b/client/src/shared/lib/utils/get-elapsed-time/get-elapsed-time.test.ts index b7f01e7c6..06e5b2d89 100644 --- a/client/src/shared/lib/utils/get-elapsed-time/get-elapsed-time.test.ts +++ b/client/src/shared/lib/utils/get-elapsed-time/get-elapsed-time.test.ts @@ -39,8 +39,6 @@ describe('getElapsedTime', () => { expect(getElapsedTime(pastTime)).toBe('0s ago'); const pastTime2 = new Date(currentTime.getTime() - 100); // 100 millisecond ago expect(getElapsedTime(pastTime2)).toBe('0s ago'); - const pastTime3 = new Date(currentTime.getTime() - 997); // 997 millisecond ago - expect(getElapsedTime(pastTime3)).toBe('0s ago'); }); // Returns "1m ago" for a time that is 1 minute and 30 seconds ago @@ -65,14 +63,6 @@ describe('getElapsedTime', () => { expect(getElapsedTime(pastTime)).toBe('1d ago'); }); - // TODO: check what is an issue here with tests - // Returns elapsed time in months for a time that is less than a year ago - // it('should return elapsed time in months when the time is less than a year ago', () => { - // const currentTime = new Date(); - // const pastTime = new Date(currentTime.getTime() - 2592000000); // 30 days ago - // expect(getElapsedTime(pastTime)).toBe('1mo ago'); - // }); - it('should throw an error for invalid date input', () => { expect(() => getElapsedTime('invalid date')).toThrow(Error); }); diff --git a/client/src/shared/ui/badge/badge-icon/badge-icon.module.scss b/client/src/shared/ui/badge/badge-icon/badge-icon.module.scss index befddf563..3cc44c3d6 100644 --- a/client/src/shared/ui/badge/badge-icon/badge-icon.module.scss +++ b/client/src/shared/ui/badge/badge-icon/badge-icon.module.scss @@ -8,8 +8,4 @@ display: flex; justify-content: center; align-items: center; - - &:only-child { - width: 90px; - } } diff --git a/client/src/shared/ui/badge/badge-text/badge-text.module.scss b/client/src/shared/ui/badge/badge-text/badge-text.module.scss index 41d9bd7d8..766f2b2e7 100644 --- a/client/src/shared/ui/badge/badge-text/badge-text.module.scss +++ b/client/src/shared/ui/badge/badge-text/badge-text.module.scss @@ -6,6 +6,7 @@ justify-content: center; align-items: center; position: relative; + cursor: pointer; overflow: hidden; span { diff --git a/client/src/shared/ui/badge/badge-text/badge-text.tsx b/client/src/shared/ui/badge/badge-text/badge-text.tsx index 01373a863..e7beee8dd 100644 --- a/client/src/shared/ui/badge/badge-text/badge-text.tsx +++ b/client/src/shared/ui/badge/badge-text/badge-text.tsx @@ -33,18 +33,23 @@ interface BadgeFrameworkProps { data: string; className?: string; maxWidth?: string; + isNotActive?: boolean; + onClick?: () => void; } export const BadgeText: FC = props => { - const { className, maxWidth, data } = props; + const { className, maxWidth, data, isNotActive, onClick } = props; return (
{data}
diff --git a/client/src/shared/ui/button/button.tsx b/client/src/shared/ui/button/button.tsx index 3c902a7fc..bcc032885 100644 --- a/client/src/shared/ui/button/button.tsx +++ b/client/src/shared/ui/button/button.tsx @@ -78,6 +78,7 @@ export const Button = ({ color = 'white', padding, loading = false, + type = 'button', ...rest }: ButtonProps) => { return ( @@ -97,6 +98,7 @@ export const Button = ({ }, [className] )} + type={type} {...rest} > {loading ? : children} diff --git a/client/src/shared/ui/checkbox/checkbox.tsx b/client/src/shared/ui/checkbox/checkbox.tsx index e9ad5bc9d..6b48362e5 100644 --- a/client/src/shared/ui/checkbox/checkbox.tsx +++ b/client/src/shared/ui/checkbox/checkbox.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx'; -import { FC, InputHTMLAttributes } from 'react'; +import { forwardRef, InputHTMLAttributes, Ref } from 'react'; import { CheckIcon } from '@/shared/assets'; import styles from './checkbox.module.scss'; @@ -35,8 +35,9 @@ interface CheckboxProps extends InputHTMLAttributes { label?: string; } -export const Checkbox: FC = props => { +export const Checkbox = forwardRef((props: CheckboxProps, ref: Ref) => { const { disabled = false, label, width, height, className, onChange, ...rest } = props; + return ( ); -}; +}); diff --git a/client/src/shared/ui/input/index.ts b/client/src/shared/ui/input/index.ts index a3979eda6..840ec32ab 100644 --- a/client/src/shared/ui/input/index.ts +++ b/client/src/shared/ui/input/index.ts @@ -1,4 +1,3 @@ -export { InputDate } from './input-date/input-date'; export { InputLink } from './input-link/input-link'; export { InputPassword } from './input-password/input-password'; export { Input } from './input/input'; diff --git a/client/src/shared/ui/input/input-date/input-date.tsx b/client/src/shared/ui/input/input-date/input-date.tsx deleted file mode 100644 index 633cc665f..000000000 --- a/client/src/shared/ui/input/input-date/input-date.tsx +++ /dev/null @@ -1,63 +0,0 @@ -'use client'; - -import { ChangeEvent, forwardRef, ForwardRefRenderFunction, useState } from 'react'; -import { Input, InputProps } from '../input/input'; - -/** - * Accepts @InputDateProps which doesn't allow you to pass @value and @onChange - * - * Read more about @Input at shared/ui/Fields/Input/Input.tsx - * - * Example of usage: - * - */ - -export interface InputDateProps extends Omit {} - -const InputDateComponent: ForwardRefRenderFunction = ( - { ...props }, - ref // Optional ref passed from outside the component -) => { - const [date, setDate] = useState(''); - - const handleChange = (e: ChangeEvent) => { - const input = e.target.value; - const numbersOnly = input.replace(/\D/g, ''); - - let formattedDate = ''; - - if (numbersOnly.length <= 2) { - formattedDate = numbersOnly; - } else if (numbersOnly.length <= 4) { - formattedDate = numbersOnly.slice(0, 2) + '/' + numbersOnly.slice(2); - } else if (numbersOnly.length > 4) { - formattedDate = - numbersOnly.slice(0, 2) + '/' + numbersOnly.slice(2, 4) + '/' + numbersOnly.slice(4, 8); - } - - // Restrict the date to a maximum of 8 digits - if (formattedDate.length <= 10) { - setDate(formattedDate); - } - }; - - return ( - - ); -}; - -InputDateComponent.displayName = 'InputDate'; - -export const InputDate = forwardRef(InputDateComponent); diff --git a/client/src/shared/ui/input/input-link/input-link.tsx b/client/src/shared/ui/input/input-link/input-link.tsx index 9e4f50fc7..eb39bd224 100644 --- a/client/src/shared/ui/input/input-link/input-link.tsx +++ b/client/src/shared/ui/input/input-link/input-link.tsx @@ -1,17 +1,40 @@ import { Input, InputProps } from '../input/input'; -import { FC } from 'react'; +import { FC, forwardRef } from 'react'; -import { LinkIcon } from '@/shared/assets'; +import { LinkIcon, LinkedinIcon, GithubIcon, BehanceIcon, TelegramIcon } from '@/shared/assets'; import styles from './input-link.module.scss'; -export const InputLink: FC = ({ ...props }) => { - return ( -
-
- -
- -
- ); +type LinkType = 'link' | 'linkedIn' | 'github' | 'behance' | 'telegram'; + +type InputLinkProps = InputProps & { + linkType: LinkType; +}; + +const DetectLink = (link: LinkType) => { + switch (link) { + case 'link': + return ; + case 'linkedIn': + return ; + case 'github': + return ; + case 'behance': + return ; + case 'telegram': + return ; + default: + return null; + } }; + +export const InputLink: FC = forwardRef( + ({ linkType, ...props }, ref) => { + return ( +
+
{DetectLink(linkType)}
+ +
+ ); + } +); diff --git a/client/src/shared/ui/input/input/input.module.scss b/client/src/shared/ui/input/input/input.module.scss index cb8fa68a1..21c302d5c 100644 --- a/client/src/shared/ui/input/input/input.module.scss +++ b/client/src/shared/ui/input/input/input.module.scss @@ -64,6 +64,12 @@ font-family: pass, sans-serif; } +.input[type="date"]::-webkit-inner-spin-button, +.input[type="date"]::-webkit-calendar-picker-indicator { + display: none; + -webkit-appearance: none; +} + .error_icon { position: absolute; right: 4px; diff --git a/client/src/shared/ui/input/input/input.stories.tsx b/client/src/shared/ui/input/input/input.stories.tsx index 91a83a1e6..5728aedc0 100644 --- a/client/src/shared/ui/input/input/input.stories.tsx +++ b/client/src/shared/ui/input/input/input.stories.tsx @@ -1,6 +1,5 @@ import type { Meta } from '@storybook/react'; import { useState } from 'react'; -import { InputDate } from '../input-date/input-date'; import { InputLink } from '../input-link/input-link'; import { InputPassword } from '../input-password/input-password'; import { Input } from './input'; @@ -153,6 +152,7 @@ export const Input_link_label = () => { placeholder='add link' value={state} onChange={e => setState(e.target.value)} + linkType='link' />
@@ -163,6 +163,7 @@ export const Input_link_label = () => { disabled value={state} onChange={e => setState(e.target.value)} + linkType='link' />
@@ -174,11 +175,11 @@ export const Input_date = () => {

Default with label and link

- +

Disabled

- +
); @@ -189,11 +190,11 @@ export const Input_date_error = () => {

Default with label and link

- +

Disabled

- +
); diff --git a/client/src/shared/ui/search-bar/hooks/useTrackFiltersArr.ts b/client/src/shared/ui/search-bar/hooks/useTrackFiltersArr.ts index 65099b143..2c5400c0e 100644 --- a/client/src/shared/ui/search-bar/hooks/useTrackFiltersArr.ts +++ b/client/src/shared/ui/search-bar/hooks/useTrackFiltersArr.ts @@ -41,6 +41,6 @@ export const useTrackFilterArr = ( }, {}); onChange(Object.keys(filterValues).length ? JSON.stringify(filterValues) : null); - }, 1300); + }, 500); }, [filterArr, onChange]); }; diff --git a/client/src/shared/ui/select/ui/select/select.stories.tsx b/client/src/shared/ui/select/ui/select/select.stories.tsx index aa1c7f4eb..bede3d550 100644 --- a/client/src/shared/ui/select/ui/select/select.stories.tsx +++ b/client/src/shared/ui/select/ui/select/select.stories.tsx @@ -1,5 +1,5 @@ import type { Meta } from '@storybook/react'; -import { specialities } from '@/shared/constant'; +import { countries } from '@/shared/constant'; import { Select } from './select'; // import { useForm } from 'react-hook-form' @@ -32,7 +32,7 @@ export const Select_default = () => { // control={control} name='concentration' label='Single select' - options={specialities} + options={countries} /> @@ -57,7 +57,7 @@ export const Select_default_multiple = () => { // control={control} name='concentration' label='Multiple select' - options={specialities} + options={countries} isMulti={true} /> @@ -78,12 +78,7 @@ export const Select_error = () => { >

Type - Single with error

-
); @@ -105,7 +100,7 @@ export const Select_error_multiple = () => { + + +