diff --git a/client/src/components/Forms/RegistrationPipeline/components/InitialPart/InitialPart.styles.js b/client/src/components/RegistrationPipeline/components/InitialPart/InitialPart.styles.js
similarity index 92%
rename from client/src/components/Forms/RegistrationPipeline/components/InitialPart/InitialPart.styles.js
rename to client/src/components/RegistrationPipeline/components/InitialPart/InitialPart.styles.js
index fc429d38a..794628451 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/InitialPart/InitialPart.styles.js
+++ b/client/src/components/RegistrationPipeline/components/InitialPart/InitialPart.styles.js
@@ -1,6 +1,6 @@
import styled from 'styled-components'
-import { BLACK, GREEN, WHITE } from '../../../../../constants/colors'
+import { BLACK, GREEN, WHITE } from '../../../../constants/colors'
export const CardContainer = styled.div`
display: flex;
@@ -21,7 +21,7 @@ export const Container = styled.div`
gap: 50px;
justify-content: center;
align-items: center;
- min-height: calc(100vh - 2.375rem);
+ min-height: 100vh;
width: 100%;
background: ${BLACK.background};
`
diff --git a/client/src/components/Forms/RegistrationPipeline/components/MultiStepRegistration/MultiStepRegistration.jsx b/client/src/components/RegistrationPipeline/components/MultiStepRegistration/MultiStepRegistration.jsx
similarity index 88%
rename from client/src/components/Forms/RegistrationPipeline/components/MultiStepRegistration/MultiStepRegistration.jsx
rename to client/src/components/RegistrationPipeline/components/MultiStepRegistration/MultiStepRegistration.jsx
index b05886239..ef3e12a12 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/MultiStepRegistration/MultiStepRegistration.jsx
+++ b/client/src/components/RegistrationPipeline/components/MultiStepRegistration/MultiStepRegistration.jsx
@@ -2,8 +2,8 @@ import React, { useState } from 'react'
import { useSelector } from 'react-redux'
import { Form, Formik } from 'formik'
-import { useCheckAuth } from '../../../../../api/hooks/auth/useCheckAuth'
-import Loader from '../../../../../shared/components/Loader/Loader'
+import { useCheckAuth } from '../../../../api/hooks/auth/useCheckAuth'
+import Loader from '../../../../shared/components/Loader/Loader'
import CurrentStep from '../CurrentStep/CurrentStep'
import NavigationButtons from '../NavigationButtons/NavigationButtons'
import NavLogo from '../NavLogo/NavLogo'
@@ -21,14 +21,15 @@ const MultiStepRegistration = ({
const [oneOfOptionalFieldsHasValue, setOneOfOptionalFieldsHasValue] = useState(false)
const { step, isOptionalStep } = useSelector((state) => state.registrationReducer)
- const { data: userData } = useCheckAuth()
+ const { data: userData, isFetching } = useCheckAuth()
const currentStepData = steps[step - 1]
const isLastStep = step === steps.length
const handleSubmit = (values) => {
submitForm(values, userData)
}
- if (isFinishingRegistration) {
+ console.log(step)
+ if (isFetching) {
return
}
@@ -41,6 +42,7 @@ const MultiStepRegistration = ({
{() => {
return (
diff --git a/client/src/components/Forms/RegistrationPipeline/components/NavLogo/NavLogo.js b/client/src/components/RegistrationPipeline/components/NavLogo/NavLogo.js
similarity index 91%
rename from client/src/components/Forms/RegistrationPipeline/components/NavLogo/NavLogo.js
rename to client/src/components/RegistrationPipeline/components/NavLogo/NavLogo.js
index 0602bcfaa..269f277db 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/NavLogo/NavLogo.js
+++ b/client/src/components/RegistrationPipeline/components/NavLogo/NavLogo.js
@@ -3,8 +3,8 @@ import { useState } from 'react'
import AppBar from '@mui/material/AppBar'
import Box from '@mui/material/Box'
-import InfoIcon from '../../../../../assets/InfoIcon'
-import { Text } from '../../../../../shared/styles/Tpography.styles'
+import InfoIcon from '../../../../assets/Shared/InfoIcon'
+import { Text } from '../../../../shared/styles/Tpography.styles'
// * Assets
import Hover from './Hover'
diff --git a/client/src/components/Forms/RegistrationPipeline/components/NavLogo/NavLogo.styles.js b/client/src/components/RegistrationPipeline/components/NavLogo/NavLogo.styles.js
similarity index 77%
rename from client/src/components/Forms/RegistrationPipeline/components/NavLogo/NavLogo.styles.js
rename to client/src/components/RegistrationPipeline/components/NavLogo/NavLogo.styles.js
index 5eaf6a6d1..e4d6425ef 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/NavLogo/NavLogo.styles.js
+++ b/client/src/components/RegistrationPipeline/components/NavLogo/NavLogo.styles.js
@@ -3,8 +3,8 @@ import Toolbar from '@mui/material/Toolbar'
import styled from 'styled-components'
// * Constants
-import { GREEN } from '../../../../../constants/colors'
-import { Text } from '../../../../../shared/styles/Tpography.styles'
+import { GREEN } from '../../../../constants/colors'
+import { Text } from '../../../../shared/styles/Tpography.styles'
export const NavBar = styled(Toolbar)`
background: #26292b;
@@ -24,9 +24,12 @@ export const SectionName = styled(Text)`
font-size: 2rem;
color: ${GREEN.text};
line-height: 120%;
+ display: flex;
+ gap: 5px;
`
export const SectionNameOptionalText = styled.span`
color: #86878b;
font-size: 16px;
+ font-weight: 400;
`
diff --git a/client/src/components/Forms/RegistrationPipeline/components/NavigationButtons/NavigationButtons.jsx b/client/src/components/RegistrationPipeline/components/NavigationButtons/NavigationButtons.jsx
similarity index 84%
rename from client/src/components/Forms/RegistrationPipeline/components/NavigationButtons/NavigationButtons.jsx
rename to client/src/components/RegistrationPipeline/components/NavigationButtons/NavigationButtons.jsx
index 9c1823e67..051e78310 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/NavigationButtons/NavigationButtons.jsx
+++ b/client/src/components/RegistrationPipeline/components/NavigationButtons/NavigationButtons.jsx
@@ -3,11 +3,11 @@ import { useDispatch } from 'react-redux'
import { useNavigate } from 'react-router-dom'
import { useFormikContext } from 'formik'
-import ArrowNavigateBack from '../../../../../assets/Arrows/ArrowNavigateBack'
-import ArrowNavigateFurther from '../../../../../assets/Arrows/ArrowNavigateFurther'
-import { GREEN } from '../../../../../constants/colors'
-import CustomButton from '../../../../../shared/components/CustomButton/CustomButton'
-import { setStep } from '../../../../../store/reducers/RegistrationAuth'
+import ArrowNavigateBack from '../../../../assets/Arrows/ArrowNavigateBack'
+import ArrowNavigateFurther from '../../../../assets/Arrows/ArrowNavigateFurther'
+import { GREEN } from '../../../../constants/colors'
+import CustomButton from '../../../../shared/components/CustomButton/CustomButton'
+import { setStep } from '../../../../store/reducers/RegistrationAuth'
import { ButtonsContainer } from './NavigationButtons.styles'
diff --git a/client/src/components/Forms/RegistrationPipeline/components/NavigationButtons/NavigationButtons.styles.js b/client/src/components/RegistrationPipeline/components/NavigationButtons/NavigationButtons.styles.js
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/NavigationButtons/NavigationButtons.styles.js
rename to client/src/components/RegistrationPipeline/components/NavigationButtons/NavigationButtons.styles.js
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.jsx
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.jsx
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.jsx
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.styles.js
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.styles.js
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/AvatarForm.styles.js
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.jsx
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.jsx
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.jsx
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.styles.js
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.styles.js
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/AvatarSelection/AvatarSelection.styles.js
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.jsx
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.jsx
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.jsx
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.styles.js
similarity index 88%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.styles.js
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.styles.js
index 79d6ab899..af1199911 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.styles.js
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/ChooseAvatar.styles.js
@@ -1,6 +1,6 @@
import styled, { css } from 'styled-components'
-import selectedIcon from '../../../../../../../../assets/defaultAvatarSelectedIcon.svg'
+import selectedIcon from '../../../../../../../assets/Avatars/defaultAvatarSelectedIcon.svg'
export const ChooseAvatarContainer = styled.div`
flex: 1;
@@ -17,11 +17,11 @@ export const DefaultAvatarContainer = styled.li`
margin-bottom: 2rem;
&:hover {
- img{
+ img {
mix-blend-mode: overlay;
}
}
-
+
${({ selected }) =>
selected &&
css`
@@ -39,8 +39,7 @@ export const DefaultAvatarContainer = styled.li`
img {
mix-blend-mode: overlay;
}
- `}}
-
+ `}
`
export const DefaultAvatar = styled.img`
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.jsx
similarity index 94%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.jsx
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.jsx
index c3ba72a68..a5e586b72 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.jsx
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.jsx
@@ -1,7 +1,7 @@
import React, { useState } from 'react'
import Dropzone from 'react-dropzone'
-import { ReactComponent as UploadAvatarIcon } from '../../../../../../../../../../assets/uploadAvatarIcon.svg'
+import { ReactComponent as UploadAvatarIcon } from '../../../../../../../../../assets/Avatars/uploadAvatarIcon.svg'
import { DropzoneContent, DropzoneText } from './CustomDropZone.styles'
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.styles.js
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.styles.js
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/AvatarForm/components/ChooseAvatar/components/CustomDropZone/CustomDropZone.styles.js
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/InfoForm/InfoForm.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/InfoForm.styles.js
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/InfoForm/InfoForm.styles.js
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/InfoForm.styles.js
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/TeamInfoForm/TeamInfoForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/TeamInfoForm/TeamInfoForm.jsx
new file mode 100644
index 000000000..1aaf7eda5
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/TeamInfoForm/TeamInfoForm.jsx
@@ -0,0 +1,100 @@
+import React, { useEffect, useState } from 'react'
+import countryList from 'react-select-country-list'
+
+import { useGetByTag } from '../../../../../../api/hooks/team/useGetByTag'
+import { useDebounce } from '../../../../../../api/hooks/temeights/useDebounce'
+import { teamTypes } from '../../../../../../constants/teamFormData'
+import CustomInput from '../../../../../../shared/components/CustomInput/CustomInput'
+import {
+ GroupContainer,
+ SectionContainer,
+} from '../../../../../../shared/components/CustomInput/CustomInput.styles'
+import CustomSelect from '../../../../../../shared/components/CustomSelect/CustomSelect'
+import CustomTextArea from '../../../../../../shared/components/CustomTextArea/CustomTextArea'
+import { InputsContainer } from '../InfoForm.styles'
+
+const TeamInfoForm = () => {
+ const countriesOptions = React.useMemo(() => countryList().getData(), [])
+ let { mutate: getTeamByTag, data: errorStatus } = useGetByTag()
+
+ // State and setters for ...
+ // Search term
+ const [searchTerm, setSearchTerm] = useState('')
+
+ // Searching status (whether there is pending API request)
+ const [isSearching, setIsSearching] = useState(false)
+ // Debounce search term so that it only gives us latest value ...
+ // ... if searchTerm has not been updated within last 500ms.
+ // The goal is to only have the API call fire when user stops typing ...
+ // ... so that we aren't hitting our API rapidly.
+ const debouncedSearchTerm = useDebounce(searchTerm, 500)
+
+ // Effect for API call
+ useEffect(
+ () => {
+ if (debouncedSearchTerm) {
+ setIsSearching(true)
+ getTeamByTag(debouncedSearchTerm)
+ } else {
+ // setResults([])
+ setIsSearching(false)
+ }
+ },
+ [debouncedSearchTerm], // Only call effect if debounced search term changes
+ )
+
+ const handleSearchInputChange = (value) => {
+ setSearchTerm(value) // Update the search term state with the input value
+ }
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default TeamInfoForm
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/UserInfoForm/UserInfoForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/UserInfoForm/UserInfoForm.jsx
new file mode 100644
index 000000000..f43e4216f
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/UserInfoForm/UserInfoForm.jsx
@@ -0,0 +1,101 @@
+import React, { useEffect, useState } from 'react'
+import countryList from 'react-select-country-list'
+
+import { useValidateUsername } from '../../../../../../api/hooks/auth/useValidateUsername'
+import { useDebounce } from '../../../../../../api/hooks/temeights/useDebounce'
+import CustomInput from '../../../../../../shared/components/CustomInput/CustomInput'
+import {
+ GroupContainer,
+ SectionContainer,
+} from '../../../../../../shared/components/CustomInput/CustomInput.styles'
+import CustomSelect from '../../../../../../shared/components/CustomSelect/CustomSelect'
+import CustomTextArea from '../../../../../../shared/components/CustomTextArea/CustomTextArea'
+import { InputsContainer } from '../InfoForm.styles'
+
+const UserInfoForm = () => {
+ const countriesOptions = React.useMemo(() => countryList().getData(), [])
+
+ let { mutate: validateUsername, data: errorStatus } = useValidateUsername()
+
+ // State and setters for ...
+ // Search term
+ const [searchTerm, setSearchTerm] = useState('')
+
+ // Searching status (whether there is pending API request)
+ const [isSearching, setIsSearching] = useState(false)
+ // Debounce search term so that it only gives us latest value ...
+ // ... if searchTerm has not been updated within last 500ms.
+ // The goal is to only have the API call fire when user stops typing ...
+ // ... so that we aren't hitting our API rapidly.
+ const debouncedSearchTerm = useDebounce(searchTerm, 500)
+
+ // Effect for API call
+ useEffect(
+ () => {
+ if (debouncedSearchTerm) {
+ setIsSearching(true)
+ validateUsername(debouncedSearchTerm)
+ } else {
+ // setResults([])
+ setIsSearching(false)
+ }
+ },
+ [debouncedSearchTerm], // Only call effect if debounced search term changes
+ )
+
+ const handleSearchInputChange = (value) => {
+ setSearchTerm(value) // Update the search term state with the input value
+ }
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default UserInfoForm
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/index.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/index.jsx
new file mode 100644
index 000000000..c8af93211
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/InfoForm/index.jsx
@@ -0,0 +1,23 @@
+import React from 'react'
+
+import { useCheckAuth } from '../../../../../api/hooks/auth/useCheckAuth'
+import Loader from '../../../../../shared/components/Loader/Loader'
+import { ContentContainer } from '../../MultiStepRegistration/MultiStepRegistration.styles'
+
+import TeamInfoForm from './TeamInfoForm/TeamInfoForm'
+import UserInfoForm from './UserInfoForm/UserInfoForm'
+
+const InfoForm = () => {
+ const { data: user, isLoading: isUserLoading } = useCheckAuth()
+
+ return (
+ <>
+ {isUserLoading && }
+
+ {user?.isRegistered ? : }
+
+
+ )
+}
+
+export default InfoForm
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/InviteMembersForm/InviteMembersForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/InviteMembersForm/InviteMembersForm.jsx
new file mode 100644
index 000000000..1a27758f1
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/InviteMembersForm/InviteMembersForm.jsx
@@ -0,0 +1,97 @@
+import { useState } from 'react'
+import { useFormikContext } from 'formik'
+
+import AddUserIcon from '../../../../../assets/Shared/AddUserIcon'
+import DeleteIcon from '../../../../../assets/Shared/DeleteIcon'
+import { LOCAL_PATH } from '../../../../../http'
+import AutocompleteInput from '../../../../../shared/components/AutocompleteInput/AutocompleteInput'
+import { errorToaster } from '../../../../../shared/components/Toasters/Error.toaster'
+import { ContentContainer } from '../../MultiStepRegistration/MultiStepRegistration.styles'
+
+import {
+ CustomButton,
+ InviteArea,
+ InvitedUser,
+ InvitedUsersContainer,
+ InviteFormText,
+ UserAvatar,
+ UsernameAvatarContainer,
+ UserText,
+} from './InviteMembersForm.styles'
+
+const InviteMembersForm = () => {
+ const [value, setValue] = useState(null)
+
+ const { setFieldValue, setTouched, values } = useFormikContext()
+
+ const addUsersToInviteQueue = () => {
+ let members = values.members
+
+ const exists = members.some((item) => item.id === value.id)
+
+ if (!exists && members.length < 8) {
+ members.push(value)
+
+ setFieldValue('members', members)
+
+ setTouched({ members: true })
+ }
+
+ if (members.length === 8) {
+ errorToaster('Only 8 members per team!')
+ }
+ }
+
+ const removeUserFromInviteQueue = (member) => {
+ let members = values.members
+
+ const filteredArray = members.filter((obj) => {
+ return obj.id !== member.id
+ })
+
+ setFieldValue('members', filteredArray)
+ }
+
+ return (
+
+
+ You can invite up to 7 members to join your team. Send invites now or later.
+ Team members can be removed as needed.
+
+
+
+
+
+ Send invite
+
+
+
+ {values.members.map((member, index) => {
+ return (
+
+
+
+ {member?.username}
+
+ {index === 0 ? (
+ // Render without delete icon for the first user
+
+
+ this is you.
+
+
+ ) : (
+ // Render with delete icon for other users
+ removeUserFromInviteQueue(member)}>
+
+
+ )}
+
+ )
+ })}
+
+
+ )
+}
+
+export default InviteMembersForm
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/InviteMembersForm/InviteMembersForm.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/InviteMembersForm/InviteMembersForm.styles.js
new file mode 100644
index 000000000..6e6391774
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/InviteMembersForm/InviteMembersForm.styles.js
@@ -0,0 +1,89 @@
+import styled from 'styled-components'
+
+export const InviteFormText = styled.p`
+ color: #fff;
+ font-weight: 400;
+`
+
+export const InviteArea = styled.div`
+ display: flex;
+ gap: 16px;
+`
+
+export const CustomButton = styled.button`
+ width: 142px;
+ height: 48px;
+
+ background: #46a11b;
+ border-radius: 10px;
+ font-size: 16px;
+ font-weight: 400;
+ color: white;
+ border: none;
+ cursor: pointer;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ gap: 6px;
+
+ &:hover {
+ -webkit-transform: scale(1.01);
+ -ms-transform: scale(1.01);
+ transform: scale(1.01);
+ }
+`
+
+export const InvitedUsersContainer = styled.div`
+ display: grid;
+ grid-template-columns: repeat(2, 270px);
+ grid-template-rows: repeat(4, 58px);
+ grid-gap: 16px 30px; /* Adjust the gap between grid items as desired */
+ grid-auto-flow: dense; /* Fills in empty spaces */
+`
+
+export const InvitedUser = styled.div`
+ width: 270px;
+ height: 58px;
+ background-color: inherit;
+ flex-wrap: wrap;
+
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 5px;
+
+ &:hover {
+ cursor: pointer;
+ background: #2f3239;
+ }
+`
+
+export const UserAvatar = styled.img`
+ width: 50px;
+ height: 50px;
+ border-radius: 50%;
+`
+
+export const UserText = styled.h1`
+ font-size: ${(props) => props.fontSize || '18px'};
+ font-weight: 400;
+ color: ${(props) => props.color || 'white'};
+`
+
+export const UsernameAvatarContainer = styled.div`
+ display: flex;
+ align-items: center;
+ gap: 12px;
+`
+
+// export const DeleteContainer = styled.div`
+// cursor: pointer;
+
+// &:hover {
+// -webkit-transform: scale(1.01);
+// -ms-transform: scale(1.01);
+// transform: scale(1.01);
+// }
+// `
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserConcentrationForm/UserConcentrationForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserConcentrationForm/UserConcentrationForm.jsx
similarity index 70%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserConcentrationForm/UserConcentrationForm.jsx
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/UserConcentrationForm/UserConcentrationForm.jsx
index b135fe474..24c67e450 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserConcentrationForm/UserConcentrationForm.jsx
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserConcentrationForm/UserConcentrationForm.jsx
@@ -1,8 +1,8 @@
import React from 'react'
-import { userConcentrations } from '../../../../../../constants/finishRegistrationData'
-import SelectValue from '../../../../../../shared/components/CustomSelect/components/SelectValue'
-import CustomSelect from '../../../../../../shared/components/CustomSelect/CustomSelect'
+import { userConcentrations } from '../../../../../constants/finishRegistrationData'
+import SelectValue from '../../../../../shared/components/CustomSelect/components/SelectValue'
+import CustomSelect from '../../../../../shared/components/CustomSelect/CustomSelect'
import { ContentContainer } from '../../MultiStepRegistration/MultiStepRegistration.styles'
const UserConcentrationForm = () => {
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/UserEducationForm/UserEducationForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserEducationForm/UserEducationForm.jsx
new file mode 100644
index 000000000..7910e368f
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserEducationForm/UserEducationForm.jsx
@@ -0,0 +1,77 @@
+import React, { useState } from 'react'
+import { useFormikContext } from 'formik'
+
+import CustomInput from '../../../../../shared/components/CustomInput/CustomInput'
+import CheckboxWithLabel from '../../CheckboxWithLabel/CheckboxWithLabel'
+import { ContentContainer } from '../../MultiStepRegistration/MultiStepRegistration.styles'
+
+import { GroupItems, InputWrapper } from './UserEducationForm.styles'
+
+const UserEducationForm = () => {
+ const [checkbox, setCheckbox] = useState(false)
+ const { setFieldValue } = useFormikContext()
+
+ const handleClick = () => {
+ if (checkbox) {
+ setCheckbox(false)
+ setFieldValue('graduationDate', '')
+ } else {
+ setCheckbox(true)
+ setFieldValue('graduationDate', '0')
+ }
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default UserEducationForm
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/UserEducationForm/UserEducationForm.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserEducationForm/UserEducationForm.styles.js
new file mode 100644
index 000000000..ab8c55a1b
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserEducationForm/UserEducationForm.styles.js
@@ -0,0 +1,12 @@
+import styled from 'styled-components'
+
+export const GroupItems = styled.div`
+ display: flex;
+ justify-content: space-around;
+ gap: 130px;
+`
+
+export const InputWrapper = styled.div`
+ flex-grow: ${(props) => props.grow || '1'};
+ width: ${(props) => props.width || '100%'};
+`
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.jsx
similarity index 82%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.jsx
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.jsx
index ff2da14dd..1816c04ed 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.jsx
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.jsx
@@ -3,15 +3,15 @@ import React from 'react'
import {
userExperienceOptions,
userLeaderOptions,
-} from '../../../../../../constants/finishRegistrationData'
-import CustomRadioButtonsGroup from '../../../../../../shared/components/CustomRadioButtonsGroup/CustomRadioButtonsGroup'
+} from '../../../../../constants/finishRegistrationData'
+import CustomRadioButtonsGroup from '../../../../../shared/components/CustomRadioButtonsGroup/CustomRadioButtonsGroup'
import { ContentContainer } from '../../MultiStepRegistration/MultiStepRegistration.styles'
import { NoteContainer, NoteText, QuestionSection, QuestionText } from './UserExperienceForm.styles'
const UserExperienceForm = () => {
return (
-
+
How many years of experience you have?
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.styles.js b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.styles.js
similarity index 76%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.styles.js
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.styles.js
index cc2c212d8..479212560 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.styles.js
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserExperienceForm/UserExperienceForm.styles.js
@@ -1,6 +1,6 @@
import styled from 'styled-components'
-import { Text } from '../../../../../../shared/styles/Tpography.styles'
+import { Text } from '../../../../../shared/styles/Tpography.styles'
export const QuestionSection = styled.div`
display: flex;
@@ -9,7 +9,8 @@ export const QuestionSection = styled.div`
export const QuestionText = styled(Text)`
margin-bottom: 1.5rem;
- font-size: 24px;
+ font-size: 22px;
+ font-weight: 400;
`
export const NoteContainer = styled.div`
diff --git a/client/src/components/RegistrationPipeline/components/RegistrationForms/UserJobForm/UserJobForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserJobForm/UserJobForm.jsx
new file mode 100644
index 000000000..0c94f0082
--- /dev/null
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserJobForm/UserJobForm.jsx
@@ -0,0 +1,70 @@
+import React, { useState } from 'react'
+import { useFormikContext } from 'formik'
+
+import CustomInput from '../../../../../shared/components/CustomInput/CustomInput'
+import CheckboxWithLabel from '../../CheckboxWithLabel/CheckboxWithLabel'
+import { ContentContainer } from '../../MultiStepRegistration/MultiStepRegistration.styles'
+import { GroupItems, InputWrapper } from '../UserEducationForm/UserEducationForm.styles'
+
+const UserJobForm = () => {
+ const [checkbox, setCheckbox] = useState(false)
+ const { setFieldValue } = useFormikContext()
+
+ const handleClick = () => {
+ if (checkbox) {
+ setCheckbox(false)
+ setFieldValue('endDate', '')
+ } else {
+ setCheckbox(true)
+ setFieldValue('endDate', '0')
+ }
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default UserJobForm
diff --git a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserLinksForm/UserLinksForm.jsx b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserLinksForm/UserLinksForm.jsx
similarity index 62%
rename from client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserLinksForm/UserLinksForm.jsx
rename to client/src/components/RegistrationPipeline/components/RegistrationForms/UserLinksForm/UserLinksForm.jsx
index c52c092c0..676200a60 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/RegistrationForms/UserLinksForm/UserLinksForm.jsx
+++ b/client/src/components/RegistrationPipeline/components/RegistrationForms/UserLinksForm/UserLinksForm.jsx
@@ -1,8 +1,8 @@
import React from 'react'
-import { userLinks } from '../../../../../../constants/finishRegistrationData'
-import CustomInput from '../../../../../../shared/components/CustomInput/CustomInput'
-import { InputWithIConWrapper } from '../../../../../../shared/components/CustomInput/CustomInput.styles'
+import { userLinks } from '../../../../../constants/finishRegistrationData'
+import CustomInput from '../../../../../shared/components/CustomInput/CustomInput'
+import { InputWithIConWrapper } from '../../../../../shared/components/CustomInput/CustomInput.styles'
import { ContentContainer } from '../../MultiStepRegistration/MultiStepRegistration.styles'
const UserLinksForm = () => {
@@ -16,8 +16,7 @@ const UserLinksForm = () => {
name={link.name}
type="text"
containerWidth="100%"
- inputWidth="70%"
- placeholder="add link (optional)"
+ placeholder="add link"
/>
))}
diff --git a/client/src/components/Forms/RegistrationPipeline/components/Stepper/Stepper.js b/client/src/components/RegistrationPipeline/components/Stepper/Stepper.js
similarity index 97%
rename from client/src/components/Forms/RegistrationPipeline/components/Stepper/Stepper.js
rename to client/src/components/RegistrationPipeline/components/Stepper/Stepper.js
index 3563a2e96..faa76750d 100644
--- a/client/src/components/Forms/RegistrationPipeline/components/Stepper/Stepper.js
+++ b/client/src/components/RegistrationPipeline/components/Stepper/Stepper.js
@@ -8,7 +8,7 @@ import { styled } from '@mui/material/styles'
import PropTypes from 'prop-types'
// * Constants
-import { GREEN } from '../../../../../constants/colors'
+import { GREEN } from '../../../../constants/colors'
// * Components
import { CustomStepper, StepperContainer } from './Stepper.styles'
diff --git a/client/src/components/Forms/RegistrationPipeline/components/Stepper/Stepper.styles.js b/client/src/components/RegistrationPipeline/components/Stepper/Stepper.styles.js
similarity index 100%
rename from client/src/components/Forms/RegistrationPipeline/components/Stepper/Stepper.styles.js
rename to client/src/components/RegistrationPipeline/components/Stepper/Stepper.styles.js
diff --git a/client/src/components/Forms/RegistrationPipeline/index.js b/client/src/components/RegistrationPipeline/index.js
similarity index 68%
rename from client/src/components/Forms/RegistrationPipeline/index.js
rename to client/src/components/RegistrationPipeline/index.js
index bf48ffb5d..f11d29a86 100644
--- a/client/src/components/Forms/RegistrationPipeline/index.js
+++ b/client/src/components/RegistrationPipeline/index.js
@@ -3,11 +3,14 @@ import React from 'react'
import { useDispatch, useSelector } from 'react-redux'
import { useNavigate } from 'react-router-dom'
-import { useEditUserDetails } from '../../../api/hooks/auth/useEditUserDetails'
-import { useUpdateAvatar } from '../../../api/hooks/auth/useUpdateAvatar'
-import { defaultUserAvatars } from '../../../constants/finishRegistrationData'
-import { finishRegistrationValidation } from '../../../schemas'
-import { setIsFinishRegistrationStarted } from '../../../store/reducers/RegistrationAuth'
+import { useEditUserDetails } from '../../api/hooks/auth/useEditUserDetails'
+import { useUpdateAvatar } from '../../api/hooks/auth/useUpdateAvatar'
+import { defaultUserAvatars } from '../../constants/finishRegistrationData'
+import { finishRegistrationValidation } from '../../schemas'
+import { setIsFinishRegistrationStarted, setStep } from '../../store/reducers/RegistrationAuth'
+import { formatDateString } from '../../utils/convertStringToDate'
+import { convertYearToDate } from '../../utils/convertYearToDate'
+import { removeEmptyFields } from '../../utils/removeEmptyFields'
import InitialPart from './components/InitialPart/InitialPart'
import MultiStepRegistration from './components/MultiStepRegistration/MultiStepRegistration'
@@ -16,6 +19,7 @@ import InfoForm from './components/RegistrationForms/InfoForm'
import UserConcentrationForm from './components/RegistrationForms/UserConcentrationForm/UserConcentrationForm'
import UserEducationForm from './components/RegistrationForms/UserEducationForm/UserEducationForm'
import UserExperienceForm from './components/RegistrationForms/UserExperienceForm/UserExperienceForm'
+import UserJobForm from './components/RegistrationForms/UserJobForm/UserJobForm'
import UserLinksForm from './components/RegistrationForms/UserLinksForm/UserLinksForm'
function FinishRegistration() {
@@ -31,6 +35,7 @@ function FinishRegistration() {
{ component: , name: 'Concentration', isOptional: false },
{ component: , name: 'Experience', isOptional: false },
{ component: , name: 'Education', isOptional: true },
+ { component: , name: 'Work Experience', isOptional: true },
{ component: , name: 'Links', isOptional: true },
{
component: (
@@ -48,7 +53,7 @@ function FinishRegistration() {
fullName: '',
country: '',
username: '',
- age: '',
+ dateOfBirth: '',
description: '',
programmingLanguages: [],
frameworks: [],
@@ -56,8 +61,14 @@ function FinishRegistration() {
experience: '',
leader: '',
university: '',
+ degree: ``,
major: '',
+ addmissionDate: '',
graduationDate: '',
+ title: '',
+ company: '',
+ startDate: '',
+ endDate: '',
github: '',
linkedIn: '',
telegram: '',
@@ -66,15 +77,39 @@ function FinishRegistration() {
function onSuccess() {
dispatch(setIsFinishRegistrationStarted(false))
+ dispatch(setStep(1))
navigate('/', { replace: true })
}
const submitForm = (formData, userCurrentData) => {
+ let universityDates = convertYearToDate(formData.addmissionDate, formData.graduationDate)
+
+ let jobDates = convertYearToDate(formData.startDate, formData.endDate)
+
+ let universityData = {
+ university: formData.university,
+ degree: formData.degree,
+ major: formData.major,
+ addmissionDate: universityDates.dateOne,
+ graduationDate: universityDates.dateTwo,
+ }
+
+ let universityValidated = removeEmptyFields(universityData)
+
+ let jobData = {
+ title: formData.title,
+ company: formData.company,
+ startDate: jobDates.dateOne,
+ endDate: jobDates.dateTwo,
+ }
+
+ let jobValidated = removeEmptyFields(jobData)
+
const registrationData = {
email: userCurrentData.email,
username: formData.username,
fullName: formData.fullName,
- age: formData.age,
+ dateOfBirth: formatDateString(formData.dateOfBirth),
description: formData.description,
concentration: formData.concentration,
country: formData.country,
@@ -87,9 +122,8 @@ function FinishRegistration() {
},
programmingLanguages: formData.programmingLanguages,
frameworks: formData.frameworks,
- university: formData.university,
- major: formData.major,
- graduationDate: formData.graduationDate.toString(),
+ jobData: jobValidated !== null ? jobValidated : undefined,
+ universityData: universityValidated !== null ? universityValidated : undefined,
isRegistered: false,
}
diff --git a/client/src/components/SnackBar/SnackBar.js b/client/src/components/SnackBar/SnackBar.js
deleted file mode 100644
index ed928b48c..000000000
--- a/client/src/components/SnackBar/SnackBar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react'
-import Snackbar from '@mui/material/Snackbar'
-import { isEqual } from 'lodash'
-
-import { AlertBox } from './SnackBar.styles'
-
-const SnackBar = ({ open, handleClose, error, vertical = 'top' }) => {
- const Alert = React.forwardRef(function Alert(props, ref) {
- return
- })
-
- return (
-
-
- {error}
-
-
- )
-}
-
-export default SnackBar
diff --git a/client/src/components/SnackBar/SnackBar.styles.js b/client/src/components/SnackBar/SnackBar.styles.js
deleted file mode 100644
index 6d4c9c682..000000000
--- a/client/src/components/SnackBar/SnackBar.styles.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import MuiAlert from '@mui/material/Alert'
-import styled from 'styled-components'
-
-import { device } from '../../constants/breakpoints'
-import { RED } from '../../constants/colors'
-
-export const AlertBox = styled(MuiAlert)`
- && {
- /* margin-top: 100px; */
- background: ${RED.alert};
- }
-
- @media ${device.tablet} {
- max-width: 250px;
- }
-`
diff --git a/client/src/screens/UsersList/UsersList.js b/client/src/components/Teammates/Teammates.js
similarity index 50%
rename from client/src/screens/UsersList/UsersList.js
rename to client/src/components/Teammates/Teammates.js
index 13457e9b0..f17521373 100644
--- a/client/src/screens/UsersList/UsersList.js
+++ b/client/src/components/Teammates/Teammates.js
@@ -1,32 +1,31 @@
// * Modules
import React, { useState } from 'react'
-import CssBaseline from '@mui/material/CssBaseline'
+import { ThemeProvider } from 'styled-components'
// * API
import { useCheckAuth } from '../../api/hooks/auth/useCheckAuth'
+import { GlobalStyle } from '../../shared/styles/Global.styles'
import Cards from './components/Cards/Cards'
+// * Components
+import Filters from './components/FiltersArea/Filters'
import NotFound from './components/NotFound/NotFound'
import SliderToTop from './components/SliderToTop/SliderToTop'
-// * Components
-import TopBar from './components/TopBar/TopBar'
import UserProfile from './components/UserProfile/UserProfile'
import UserProfilePhone from './components/UserProfilePhone/UserProfilePhone'
// * Styles
import {
CardsContainer,
CardsZone,
- GlobalStyle,
GridContainer,
InfoContainer,
UserCardModal,
-} from './UsersList.styles'
+} from './Teammates.styles'
-function UsersList() {
+function Teammates() {
/**
* Set of states that are used by this component
*/
-
const [open, setOpen] = useState(false)
const [showUser, setShowUser] = useState({})
const [isNotFound, setIsNotFound] = useState(false)
@@ -67,42 +66,43 @@ function UsersList() {
return (
<>
-
-
-
- {/* ! USED ONLY FOR 730px or more */}
-
-
-
- {/* ! USED ONLY FOR 730px or less */}
-
- {/* If nothing was found, show user a NotFound container */}
- {isNotFound ? (
-
-
-
- ) : (
-
-
-
-
-
-
-
-
- )}
+
+
+
+ {/* ! USED ONLY FOR 730px or more */}
+
+
+
+ {/* ! USED ONLY FOR 730px or less */}
+
+ {/* If nothing was found, show user a NotFound container */}
+ {isNotFound ? (
+
+
+
+ ) : (
+
+
+
+
+
+
+
+
+ )}
+
)
}
-export default UsersList
+export default Teammates
diff --git a/client/src/screens/UsersList/UsersList.styles.js b/client/src/components/Teammates/Teammates.styles.js
similarity index 64%
rename from client/src/screens/UsersList/UsersList.styles.js
rename to client/src/components/Teammates/Teammates.styles.js
index e211f5f24..8b7a790a6 100644
--- a/client/src/screens/UsersList/UsersList.styles.js
+++ b/client/src/components/Teammates/Teammates.styles.js
@@ -57,31 +57,3 @@ export const UserCardModal = styled(Modal)`
display: none;
}
`
-/**
- * Global style applied for this component.
- * TODO: Move this global style to the root component after refactoring
- */
-export const GlobalStyle = createGlobalStyle`
- body {
- background: #26292B !important;
- overflow-y: scroll;
- scrollbar-width: none; /* Firefox */
- -ms-overflow-style: none; /* Internet Explorer 10+ */
- ::-webkit-scrollbar { /* WebKit */
- transition: all 0.2s;
- width: ${(props) => (props.scrollbar ? `10px` : '0')};
- height: ${(props) => (props.scrollbar ? `auto` : '0')};
- }
- ::-webkit-scrollbar-track {
- background: transparent;
- }
-
- ::-webkit-scrollbar-thumb {
- background-color:
- ${(props) => (props.scrollbar ? `#5D9D0B;` : '#000000')};
- border-radius: 10px;
- }
-
-
- }
-`
diff --git a/client/src/screens/UsersList/components/CardSkeleton/CardSkeleton.js b/client/src/components/Teammates/components/CardSkeleton/CardSkeleton.js
similarity index 100%
rename from client/src/screens/UsersList/components/CardSkeleton/CardSkeleton.js
rename to client/src/components/Teammates/components/CardSkeleton/CardSkeleton.js
diff --git a/client/src/screens/UsersList/components/CardSkeleton/CardSkeleton.styles.js b/client/src/components/Teammates/components/CardSkeleton/CardSkeleton.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/CardSkeleton/CardSkeleton.styles.js
rename to client/src/components/Teammates/components/CardSkeleton/CardSkeleton.styles.js
diff --git a/client/src/screens/UsersList/components/Cards/Cards.js b/client/src/components/Teammates/components/Cards/Cards.js
similarity index 100%
rename from client/src/screens/UsersList/components/Cards/Cards.js
rename to client/src/components/Teammates/components/Cards/Cards.js
diff --git a/client/src/screens/UsersList/components/Cards/Cards.styles.js b/client/src/components/Teammates/components/Cards/Cards.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/Cards/Cards.styles.js
rename to client/src/components/Teammates/components/Cards/Cards.styles.js
diff --git a/client/src/screens/UsersList/components/TopBar/Contentration.options.js b/client/src/components/Teammates/components/FiltersArea/Contentration.options.js
similarity index 100%
rename from client/src/screens/UsersList/components/TopBar/Contentration.options.js
rename to client/src/components/Teammates/components/FiltersArea/Contentration.options.js
diff --git a/client/src/screens/UsersList/components/TopBar/TopBar.js b/client/src/components/Teammates/components/FiltersArea/Filters.js
similarity index 95%
rename from client/src/screens/UsersList/components/TopBar/TopBar.js
rename to client/src/components/Teammates/components/FiltersArea/Filters.js
index 9fb91e48f..66731503f 100644
--- a/client/src/screens/UsersList/components/TopBar/TopBar.js
+++ b/client/src/components/Teammates/components/FiltersArea/Filters.js
@@ -5,12 +5,10 @@ import countryList from 'react-select-country-list'
import AppBar from '@mui/material/AppBar'
import { Form, Formik } from 'formik'
-import Filters from '../../../../assets/Filters'
+import Filters from '../../../../assets/Filters/Filters'
// * Assets
-import PlatformLogo from '../../../../assets/PlatformLogo'
-import Search from '../../../../assets/SearchIcon'
+import Search from '../../../../assets/Filters/SearchIcon'
// * Components
-import NavBarContainer from '../../../../components/NavBar/NavBar'
import frameworkOptions from '../../../../constants/frameworks'
import CustomSelect from '../../../../shared/components/CustomSelect/CustomSelect'
import { setFilters } from '../../../../store/reducers/Shared'
@@ -19,17 +17,15 @@ import { PlaceholderText } from '../SelectField/SelectField.styles'
// * Options
import { concentrationOptions } from './Contentration.options'
-import { programmingLanguageOptions } from './ProgrammingLanguages.options'
import {
- AlternativeLogoContainer,
BoxContainer,
Button,
FilterContainer,
FilterText,
- LogoContainer,
NavBar,
SelectContainer,
-} from './TopBar.styles'
+} from './Filters.styles'
+import { programmingLanguageOptions } from './ProgrammingLanguages.options'
const TopBar = ({ setDisplayFiltered, displayFiltered }) => {
const [filterBar, setFilterBar] = useState(false)
diff --git a/client/src/screens/UsersList/components/TopBar/TopBar.styles.js b/client/src/components/Teammates/components/FiltersArea/Filters.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/TopBar/TopBar.styles.js
rename to client/src/components/Teammates/components/FiltersArea/Filters.styles.js
diff --git a/client/src/screens/UsersList/components/TopBar/ProgrammingLanguages.options.js b/client/src/components/Teammates/components/FiltersArea/ProgrammingLanguages.options.js
similarity index 100%
rename from client/src/screens/UsersList/components/TopBar/ProgrammingLanguages.options.js
rename to client/src/components/Teammates/components/FiltersArea/ProgrammingLanguages.options.js
diff --git a/client/src/screens/UsersList/components/TopBar/Filters/Countries.js b/client/src/components/Teammates/components/FiltersArea/SpecificFilters/Countries.js
similarity index 100%
rename from client/src/screens/UsersList/components/TopBar/Filters/Countries.js
rename to client/src/components/Teammates/components/FiltersArea/SpecificFilters/Countries.js
diff --git a/client/src/screens/UsersList/components/TopBar/Filters/ProgrammingLanguages.js b/client/src/components/Teammates/components/FiltersArea/SpecificFilters/ProgrammingLanguages.js
similarity index 100%
rename from client/src/screens/UsersList/components/TopBar/Filters/ProgrammingLanguages.js
rename to client/src/components/Teammates/components/FiltersArea/SpecificFilters/ProgrammingLanguages.js
diff --git a/client/src/screens/UsersList/components/TopBar/Filters/Roles.js b/client/src/components/Teammates/components/FiltersArea/SpecificFilters/Roles.js
similarity index 100%
rename from client/src/screens/UsersList/components/TopBar/Filters/Roles.js
rename to client/src/components/Teammates/components/FiltersArea/SpecificFilters/Roles.js
diff --git a/client/src/screens/UsersList/components/FiltersMenu/FiltersMenu.js b/client/src/components/Teammates/components/FiltersMenu/FiltersMenu.js
similarity index 90%
rename from client/src/screens/UsersList/components/FiltersMenu/FiltersMenu.js
rename to client/src/components/Teammates/components/FiltersMenu/FiltersMenu.js
index 4640a5da0..3fe68c171 100644
--- a/client/src/screens/UsersList/components/FiltersMenu/FiltersMenu.js
+++ b/client/src/components/Teammates/components/FiltersMenu/FiltersMenu.js
@@ -2,15 +2,12 @@
import React from 'react'
import { useFormikContext } from 'formik'
-import Close from '../../../../assets/Close'
// * Assets
-import Filters from '../../../../assets/Filters'
+import Filters from '../../../../assets/Filters/Filters'
+import Close from '../../../../assets/Shared/Close'
import frameworkOptions from '../../../../constants/frameworks'
import SelectValue from '../../../../shared/components/CustomSelect/components/SelectValue'
import CustomSelect from '../../../../shared/components/CustomSelect/CustomSelect'
-import { PlaceholderText } from '../SelectField/SelectField.styles'
-import { concentrationOptions } from '../TopBar/Contentration.options'
-import { programmingLanguageOptions } from '../TopBar/ProgrammingLanguages.options'
// * Styles
import {
diff --git a/client/src/screens/UsersList/components/FiltersMenu/FiltersMenu.styles.js b/client/src/components/Teammates/components/FiltersMenu/FiltersMenu.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/FiltersMenu/FiltersMenu.styles.js
rename to client/src/components/Teammates/components/FiltersMenu/FiltersMenu.styles.js
diff --git a/client/src/screens/UsersList/components/NotFound/NotFound.js b/client/src/components/Teammates/components/NotFound/NotFound.js
similarity index 91%
rename from client/src/screens/UsersList/components/NotFound/NotFound.js
rename to client/src/components/Teammates/components/NotFound/NotFound.js
index 052fb6d6d..3824c97f8 100644
--- a/client/src/screens/UsersList/components/NotFound/NotFound.js
+++ b/client/src/components/Teammates/components/NotFound/NotFound.js
@@ -1,5 +1,5 @@
// * Assets
-import NonFound from '../../../../assets/NonFound'
+import NonFound from '../../../../assets/Shared/SearchingPeople'
// * Styles
import {
diff --git a/client/src/screens/UsersList/components/NotFound/NotFound.styles.js b/client/src/components/Teammates/components/NotFound/NotFound.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/NotFound/NotFound.styles.js
rename to client/src/components/Teammates/components/NotFound/NotFound.styles.js
diff --git a/client/src/screens/UsersList/components/SelectField/MenuProps.js b/client/src/components/Teammates/components/SelectField/MenuProps.js
similarity index 100%
rename from client/src/screens/UsersList/components/SelectField/MenuProps.js
rename to client/src/components/Teammates/components/SelectField/MenuProps.js
diff --git a/client/src/screens/UsersList/components/SelectField/SelectField.css b/client/src/components/Teammates/components/SelectField/SelectField.css
similarity index 55%
rename from client/src/screens/UsersList/components/SelectField/SelectField.css
rename to client/src/components/Teammates/components/SelectField/SelectField.css
index 77849d7b2..14de5c797 100644
--- a/client/src/screens/UsersList/components/SelectField/SelectField.css
+++ b/client/src/components/Teammates/components/SelectField/SelectField.css
@@ -4,18 +4,6 @@ fieldset{
outline: none !important;
}
-/* remove background */
-/* .css-vrp7az-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input.css-vrp7az-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input.css-vrp7az-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input{
- background: none;
-} */
-
-/* customize input */
-/* .css-vrp7az-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input {
- color: white !important;
- font-size: 0.875rem !important;
- font-weight: 600 !important;
-} */
-
/* scrollbar customization */
.css-1poimk-MuiPaper-root-MuiMenu-paper-MuiPaper-root-MuiPopover-paper::-webkit-scrollbar {
width: 9px;
diff --git a/client/src/screens/UsersList/components/SelectField/SelectField.js b/client/src/components/Teammates/components/SelectField/SelectField.js
similarity index 100%
rename from client/src/screens/UsersList/components/SelectField/SelectField.js
rename to client/src/components/Teammates/components/SelectField/SelectField.js
diff --git a/client/src/screens/UsersList/components/SelectField/SelectField.styles.js b/client/src/components/Teammates/components/SelectField/SelectField.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/SelectField/SelectField.styles.js
rename to client/src/components/Teammates/components/SelectField/SelectField.styles.js
diff --git a/client/src/screens/UsersList/components/SliderToTop/SliderToTop.jsx b/client/src/components/Teammates/components/SliderToTop/SliderToTop.jsx
similarity index 97%
rename from client/src/screens/UsersList/components/SliderToTop/SliderToTop.jsx
rename to client/src/components/Teammates/components/SliderToTop/SliderToTop.jsx
index 26310c566..393a58f05 100644
--- a/client/src/screens/UsersList/components/SliderToTop/SliderToTop.jsx
+++ b/client/src/components/Teammates/components/SliderToTop/SliderToTop.jsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react'
import { animateScroll as scroll } from 'react-scroll'
// * Assets
-import Slider from '../../../../assets/Slider'
+import Slider from '../../../../assets/Shared/Slider'
// * Styles
import {
diff --git a/client/src/screens/UsersList/components/SliderToTop/SliderToTop.styles.js b/client/src/components/Teammates/components/SliderToTop/SliderToTop.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/SliderToTop/SliderToTop.styles.js
rename to client/src/components/Teammates/components/SliderToTop/SliderToTop.styles.js
diff --git a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthFourCase.js b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthFourCase.js
similarity index 88%
rename from client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthFourCase.js
rename to client/src/components/Teammates/components/UserCard/FrameworksCases/LengthFourCase.js
index 5486b397d..d4e0bc0a1 100644
--- a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthFourCase.js
+++ b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthFourCase.js
@@ -1,6 +1,6 @@
// * Styles
// * Colors
-import { frameworkColors, frameworkTextColors } from '../FrameworkColors'
+import { frameworkColors, frameworkTextColors } from '../../../../../constants/frameworkColors'
import { Framework } from '../UserCard.styles'
const LengthFourCase = ({ userFrameworks }) => {
diff --git a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthFourSlicedCase.js b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthFourSlicedCase.js
similarity index 90%
rename from client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthFourSlicedCase.js
rename to client/src/components/Teammates/components/UserCard/FrameworksCases/LengthFourSlicedCase.js
index 889c0b327..a7b696dbb 100644
--- a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthFourSlicedCase.js
+++ b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthFourSlicedCase.js
@@ -1,6 +1,6 @@
// * Styles
// * Colors
-import { frameworkColors, frameworkTextColors } from '../FrameworkColors'
+import { frameworkColors, frameworkTextColors } from '../../../../../constants/frameworkColors'
import { AndMore, Framework } from '../UserCard.styles'
const LengthFourSlicedCase = ({ userFrameworks }) => {
diff --git a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthOneCase.js b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthOneCase.js
similarity index 83%
rename from client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthOneCase.js
rename to client/src/components/Teammates/components/UserCard/FrameworksCases/LengthOneCase.js
index 8f61211a5..f856664d3 100644
--- a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthOneCase.js
+++ b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthOneCase.js
@@ -1,6 +1,6 @@
// * Styles
// * Colors
-import { frameworkColors, frameworkTextColors } from '../FrameworkColors'
+import { frameworkColors, frameworkTextColors } from '../../../../../constants/frameworkColors'
import { Framework } from '../UserCard.styles'
const LengthOneCase = ({ userFrameworks }) => {
diff --git a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthThreeCase.js b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthThreeCase.js
similarity index 88%
rename from client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthThreeCase.js
rename to client/src/components/Teammates/components/UserCard/FrameworksCases/LengthThreeCase.js
index e8edb81fc..67a712414 100644
--- a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthThreeCase.js
+++ b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthThreeCase.js
@@ -1,6 +1,6 @@
// * Styles
// * Colors
-import { frameworkColors, frameworkTextColors } from '../FrameworkColors'
+import { frameworkColors, frameworkTextColors } from '../../../../../constants/frameworkColors'
import { Framework } from '../UserCard.styles'
const LengthThreeCase = ({ userFrameworks }) => {
diff --git a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthTwoCase.js b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthTwoCase.js
similarity index 82%
rename from client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthTwoCase.js
rename to client/src/components/Teammates/components/UserCard/FrameworksCases/LengthTwoCase.js
index dc86f3b23..b0b2e2632 100644
--- a/client/src/screens/UsersList/components/UserCard/FrameworksCases/LengthTwoCase.js
+++ b/client/src/components/Teammates/components/UserCard/FrameworksCases/LengthTwoCase.js
@@ -1,6 +1,6 @@
// * Styles
// * Colors
-import { frameworkColors, frameworkTextColors } from '../FrameworkColors'
+import { frameworkColors, frameworkTextColors } from '../../../../../constants/frameworkColors'
import { Framework } from '../UserCard.styles'
const LengthTwoCase = ({ userFrameworks }) => {
diff --git a/client/src/screens/UsersList/components/UserCard/UserCard.js b/client/src/components/Teammates/components/UserCard/UserCard.js
similarity index 87%
rename from client/src/screens/UsersList/components/UserCard/UserCard.js
rename to client/src/components/Teammates/components/UserCard/UserCard.js
index 7a4a7097e..f327d31b9 100644
--- a/client/src/screens/UsersList/components/UserCard/UserCard.js
+++ b/client/src/components/Teammates/components/UserCard/UserCard.js
@@ -1,10 +1,11 @@
import React from 'react'
-import Photo from '../../../../components/Profile/Photo.jpg'
-import { LOCAL_PATH } from '../../../../http'
// * Images
-import CrownImg from '../../img/CrownTest.png'
-import userImg from '../../img/tempImg.jpg'
+import CrownImg from '../../../../assets/UserProfile/LeaderCrown.png'
+// * Colors
+import { languageOptions } from '../../../../constants/programmingLanguages'
+import { LOCAL_PATH } from '../../../../http'
+import { calculateAge } from '../../../../utils/calculateAge'
import LengthFourCase from './FrameworksCases/LengthFourCase'
import LengthFourSlicedCase from './FrameworksCases/LengthFourSlicedCase'
@@ -12,8 +13,6 @@ import LengthFourSlicedCase from './FrameworksCases/LengthFourSlicedCase'
import LengthOneCase from './FrameworksCases/LengthOneCase'
import LengthThreeCase from './FrameworksCases/LengthThreeCase'
import LengthTwoCase from './FrameworksCases/LengthTwoCase'
-// * Colors
-import languageOptions from './ProgrammingLanguages'
// * Styles
import {
AndMore,
@@ -31,10 +30,6 @@ import {
Wrapper,
} from './UserCard.styles'
-//programminglanguages when hovering, change last SVG to +4
-
-// frameworks
-
// PASS IN PROPS TO RESPECTIVE COMPONENT TO RENDER
const UserCard = React.forwardRef((props, ref) => {
const person = props.person
@@ -87,10 +82,7 @@ const UserCard = React.forwardRef((props, ref) => {
{/* TODO: Change for real image! */}
-
+
{programmingLanguages}
@@ -98,7 +90,7 @@ const UserCard = React.forwardRef((props, ref) => {
- {person.fullName}, {person.age}
+ {person.fullName}, {calculateAge(person.dateOfBirth)}
diff --git a/client/src/screens/UsersList/components/UserCard/UserCard.styles.js b/client/src/components/Teammates/components/UserCard/UserCard.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/UserCard/UserCard.styles.js
rename to client/src/components/Teammates/components/UserCard/UserCard.styles.js
diff --git a/client/src/screens/UsersList/components/UserProfile/UserProfile.js b/client/src/components/Teammates/components/UserProfile/UserProfile.js
similarity index 86%
rename from client/src/screens/UsersList/components/UserProfile/UserProfile.js
rename to client/src/components/Teammates/components/UserProfile/UserProfile.js
index 06e6b5ae5..0b9d704cb 100644
--- a/client/src/screens/UsersList/components/UserProfile/UserProfile.js
+++ b/client/src/components/Teammates/components/UserProfile/UserProfile.js
@@ -2,17 +2,15 @@
import React from 'react'
import CloseIcon from '@mui/icons-material/Close'
import GitHubIcon from '@mui/icons-material/GitHub'
-import InstagramIcon from '@mui/icons-material/Instagram'
import LinkedInIcon from '@mui/icons-material/LinkedIn'
import TelegramIcon from '@mui/icons-material/Telegram'
-import AddIcon from '../../../../assets/AddIcon'
// * Assets
-import LinkIcon from '../../../../assets/LinkIcon'
-import MessageIcon from '../../../../assets/MessageIcon'
+import LinkIcon from '../../../../assets/Shared/LinkIcon'
+import AddIcon from '../../../../assets/UserProfile/AddIcon'
+import MessageIcon from '../../../../assets/UserProfile/MessageIcon'
import { LOCAL_PATH } from '../../../../http'
-// * Temporary image
-import AvatarImage from '../../img/tempImg.jpg'
+import { calculateAge } from '../../../../utils/calculateAge'
import {
Button,
@@ -36,12 +34,8 @@ const UserProfile = ({ user, handleClose }) => {
- {/* TODO: Change for the REAL photo! */}
-
+
{/* TODO: Change for real links! & rewrite for the .map() */}
@@ -57,7 +51,7 @@ const UserProfile = ({ user, handleClose }) => {
- {user.fullName}, {user.age}
+ {user.fullName}, {calculateAge(user.dateOfBirth)}
diff --git a/client/src/screens/UsersList/components/UserProfile/UserProfile.styles.js b/client/src/components/Teammates/components/UserProfile/UserProfile.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/UserProfile/UserProfile.styles.js
rename to client/src/components/Teammates/components/UserProfile/UserProfile.styles.js
diff --git a/client/src/screens/UsersList/components/UserProfilePhone/UserProfilePhone.js b/client/src/components/Teammates/components/UserProfilePhone/UserProfilePhone.js
similarity index 86%
rename from client/src/screens/UsersList/components/UserProfilePhone/UserProfilePhone.js
rename to client/src/components/Teammates/components/UserProfilePhone/UserProfilePhone.js
index c88620c5b..04713544f 100644
--- a/client/src/screens/UsersList/components/UserProfilePhone/UserProfilePhone.js
+++ b/client/src/components/Teammates/components/UserProfilePhone/UserProfilePhone.js
@@ -4,13 +4,13 @@ import InstagramIcon from '@mui/icons-material/Instagram'
import LinkedInIcon from '@mui/icons-material/LinkedIn'
import TelegramIcon from '@mui/icons-material/Telegram'
-import AddIcon from '../../../../assets/AddIcon'
// * Assets
-import ComebackArrow from '../../../../assets/ComebackArrow'
-import LinkIcon from '../../../../assets/LinkIcon'
-import MessageIcon from '../../../../assets/MessageIcon'
+import ComebackArrow from '../../../../assets/Arrows/ComebackArrow'
+import LinkIcon from '../../../../assets/Shared/LinkIcon'
+import AddIcon from '../../../../assets/UserProfile/AddIcon'
+import MessageIcon from '../../../../assets/UserProfile/MessageIcon'
import { LOCAL_PATH } from '../../../../http'
-import TempImg from '../../img/tempImg.jpg'
+import { calculateAge } from '../../../../utils/calculateAge'
// * Styles
import {
@@ -38,16 +38,12 @@ const UserProfilePhone = ({ user, mobileProfile, handleClose }) => {
- {/* TODO: Change for the REAL photo! */}
-
+
- {user.fullName}, {user.age}
+ {user.fullName}, {calculateAge(user.dateOfBirth)}
{user.concentration}
diff --git a/client/src/screens/UsersList/components/UserProfilePhone/UserProfilePhone.styles.js b/client/src/components/Teammates/components/UserProfilePhone/UserProfilePhone.styles.js
similarity index 100%
rename from client/src/screens/UsersList/components/UserProfilePhone/UserProfilePhone.styles.js
rename to client/src/components/Teammates/components/UserProfilePhone/UserProfilePhone.styles.js
diff --git a/client/src/components/TopTemplate/TopTemplate.js b/client/src/components/TopTemplate/TopTemplate.js
deleted file mode 100644
index 8bb72a8e3..000000000
--- a/client/src/components/TopTemplate/TopTemplate.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import TeameightsLogo from '../../assets/Team/TeameightsLogo.js'
-import NavBar from '../NavBar/NavBar'
-
-import { NavContainer } from './TopTemplate.styles'
-
-const TopTemplate = () => {
- return (
-
-
-
-
-
- )
-}
-
-export default TopTemplate
diff --git a/client/src/components/TopTemplate/TopTemplate.styles.js b/client/src/components/TopTemplate/TopTemplate.styles.js
deleted file mode 100644
index 296feb184..000000000
--- a/client/src/components/TopTemplate/TopTemplate.styles.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import styled from 'styled-components'
-
-import { BLACK } from '../../constants/colors'
-
-// export const ToolbarContainer = styled.div`
-// width: 100%;
-// background: ${BLACK.background};
-// display: grid;
-// grid-template-columns: repeat(3, 1fr);
-// justify-items: center;
-// align-items: center;
-// height: 78px;
-// grid-auto-flow: column;
-// `
-
-export const NavContainer = styled.div`
- justify-self: center;
-`
diff --git a/client/src/constants/finishRegistrationData.js b/client/src/constants/finishRegistrationData.js
index c789a9db4..db81cf27e 100644
--- a/client/src/constants/finishRegistrationData.js
+++ b/client/src/constants/finishRegistrationData.js
@@ -1,16 +1,22 @@
-import blueAvatar from '../assets/defaultAvatars/user/default-blue.png'
-import greenAvatar from '../assets/defaultAvatars/user/default-green.png'
-import orangeAvatar from '../assets/defaultAvatars/user/default-orange.png'
-import pinkAvatar from '../assets/defaultAvatars/user/default-pink.png'
-import purpleAvatar from '../assets/defaultAvatars/user/default-purple.png'
-import yellowAvatar from '../assets/defaultAvatars/user/default-yellow.png'
+import BehanceIcon from '../assets/Links/BehanceIcon'
import GitHubIcon from '../assets/Links/GitHubIcon'
import LinkedInIcon from '../assets/Links/LinkedInIcon'
import TelegramIcon from '../assets/Links/TelegramIcon'
import concentrationOptions from './concentrations'
import frameworkOptions from './frameworks'
-import programmingLanguageOptions from './programmingLanguages'
+import { programmingLanguageOptions } from './programmingLanguages'
+
+const avatarFilenames = [
+ 'default-blue.png',
+ 'default-green.png',
+ 'default-orange.png',
+ 'default-pink.png',
+ 'default-purple.png',
+ 'default-yellow.png',
+]
+
+const avatars = avatarFilenames.map((filename) => require(`../assets/Images/user/${filename}`))
export const userConcentrations = [
{
@@ -46,38 +52,47 @@ export const userLinks = [
name: 'telegram',
icon: ,
},
+ {
+ name: 'behance',
+ icon: ,
+ },
]
export const defaultUserAvatars = [
- { name: 'green', path: greenAvatar },
- { name: 'pink', path: pinkAvatar },
- { name: 'blue', path: blueAvatar },
- { name: 'orange', path: orangeAvatar },
- { name: 'purple', path: purpleAvatar },
- { name: 'yellow', path: yellowAvatar },
+ { name: 'green', path: avatars[0] },
+ { name: 'pink', path: avatars[1] },
+ { name: 'blue', path: avatars[2] },
+ { name: 'orange', path: avatars[3] },
+ { name: 'purple', path: avatars[4] },
+ { name: 'yellow', path: avatars[5] },
]
+
export const userExperienceOptions = [
{
- label: '0-1 years',
- value: '0-1',
+ label: 'No experience',
+ value: '0',
},
{
label: '1-3 years',
value: '1-3',
},
{
- label: '3+ years',
- value: '3+',
+ label: '3-5 years',
+ value: '3-5',
+ },
+ {
+ label: '5+ years',
+ value: '5+',
},
]
export const userLeaderOptions = [
{
- label: 'YES',
- value: 'true',
+ label: 'No',
+ value: 'false',
},
{
- label: 'NO',
- value: 'false',
+ label: 'Yes',
+ value: 'true',
},
]
diff --git a/client/src/screens/UsersList/components/UserCard/FrameworkColors.js b/client/src/constants/frameworkColors.js
similarity index 100%
rename from client/src/screens/UsersList/components/UserCard/FrameworkColors.js
rename to client/src/constants/frameworkColors.js
diff --git a/client/src/constants/images.js b/client/src/constants/images.js
new file mode 100644
index 000000000..c44c19ab1
--- /dev/null
+++ b/client/src/constants/images.js
@@ -0,0 +1 @@
+// export const unregisteredImg =
diff --git a/client/src/constants/programmingLanguages.js b/client/src/constants/programmingLanguages.js
index 93f8d5578..8a65abc09 100644
--- a/client/src/constants/programmingLanguages.js
+++ b/client/src/constants/programmingLanguages.js
@@ -1,3 +1,20 @@
+// * Logos
+import C from '../assets/LanguageLogo/C'
+import Cplusplus from '../assets/LanguageLogo/Cplusplus'
+import Csharp from '../assets/LanguageLogo/Csharp'
+import Dart from '../assets/LanguageLogo/Dart'
+import GO from '../assets/LanguageLogo/GO'
+import Html from '../assets/LanguageLogo/Html'
+import Java from '../assets/LanguageLogo/Java'
+import JS from '../assets/LanguageLogo/JS'
+import Perl from '../assets/LanguageLogo/Perl'
+import Php from '../assets/LanguageLogo/Php'
+import Python from '../assets/LanguageLogo/Python'
+import Ruby from '../assets/LanguageLogo/Ruby'
+import Scala from '../assets/LanguageLogo/Scala'
+import SQL from '../assets/LanguageLogo/SQL'
+import Swift from '../assets/LanguageLogo/Swift'
+
const programmingLanguageOptions = [
{
label: 'JS',
@@ -46,4 +63,22 @@ const programmingLanguageOptions = [
},
]
-export default programmingLanguageOptions
+const languageOptions = Object.freeze({
+ JS: ,
+ 'C++': ,
+ C: ,
+ Python: ,
+ Swift: ,
+ Ruby: ,
+ Scala: ,
+ PHP: ,
+ Go: ,
+ 'C#': ,
+ Java: ,
+ 'HTML/CSS': ,
+ Dart: ,
+ Perl: ,
+ SQL: ,
+})
+
+export { languageOptions, programmingLanguageOptions }
diff --git a/client/src/constants/routes.js b/client/src/constants/routes.js
index 628c8685e..4e7408c06 100644
--- a/client/src/constants/routes.js
+++ b/client/src/constants/routes.js
@@ -1,13 +1,20 @@
const ROUTES = Object.freeze({
+ default: '/',
login: '/auth/login',
registration: '/auth/registration',
confirmEmail: '/auth/confirm-email',
+ authVerification: '/auth/verification',
finishRegistration: '/auth/finish-registration',
passwordRecover: '/auth/password-recover',
passwordRecoverConfirm: '/auth/password-recover-confirm',
passwordRecoverSuccess: '/auth/password-recover/:id/:token',
- temporary: '/platform',
- Profile: '/profile',
+ profile: '/profile',
+ profileEdit: '/profile-edit',
+ tournaments: '/tournaments',
+ specificTeam: '/team/:id',
+ noTeam: '/team',
+ allTeams: '/teams',
+ createTeam: '/teams/create',
})
export default ROUTES
diff --git a/client/src/constants/teamFormData.js b/client/src/constants/teamFormData.js
index 375bbcf8b..d883fc30e 100644
--- a/client/src/constants/teamFormData.js
+++ b/client/src/constants/teamFormData.js
@@ -1,9 +1,13 @@
-import blueAvatar from '../assets/defaultAvatars/team/default-blue.png'
-import greenAvatar from '../assets/defaultAvatars/team/default-green.png'
-import orangeAvatar from '../assets/defaultAvatars/team/default-orange.png'
-import pinkAvatar from '../assets/defaultAvatars/team/default-pink.png'
-import purpleAvatar from '../assets/defaultAvatars/team/default-purple.png'
-import yellowAvatar from '../assets/defaultAvatars/team/default-yellow.png'
+const avatarFilenames = [
+ 'default-blue.png',
+ 'default-green.png',
+ 'default-orange.png',
+ 'default-pink.png',
+ 'default-purple.png',
+ 'default-yellow.png',
+]
+
+const avatars = avatarFilenames.map((filename) => require(`../assets/Images/team/${filename}`))
export const teamTypes = [
{
@@ -21,10 +25,10 @@ export const teamTypes = [
]
export const defaultTeamAvatars = [
- { name: 'green', path: greenAvatar },
- { name: 'pink', path: pinkAvatar },
- { name: 'blue', path: blueAvatar },
- { name: 'orange', path: orangeAvatar },
- { name: 'purple', path: purpleAvatar },
- { name: 'yellow', path: yellowAvatar },
+ { name: 'green', path: avatars[0] },
+ { name: 'pink', path: avatars[1] },
+ { name: 'blue', path: avatars[2] },
+ { name: 'orange', path: avatars[3] },
+ { name: 'purple', path: avatars[4] },
+ { name: 'yellow', path: avatars[5] },
]
diff --git a/client/src/fonts/FontsFree-Net-Noir_regular.woff b/client/src/fonts/FontsFree-Net-Noir_regular.woff
deleted file mode 100644
index 2d1117843..000000000
Binary files a/client/src/fonts/FontsFree-Net-Noir_regular.woff and /dev/null differ
diff --git a/client/src/index.js b/client/src/index.js
index 15f641239..a702b570d 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -4,44 +4,25 @@ import ReactDOM from 'react-dom/client'
import { QueryClient, QueryClientProvider } from 'react-query'
// * Redux
import { Provider } from 'react-redux'
-import { createGlobalStyle } from 'styled-components'
+import { ThemeProvider } from 'styled-components'
+import { GlobalStyle } from './shared/styles/Global.styles'
import { setupStore } from './store/store'
// * Components
import App from './App'
-const GlobalStyle = createGlobalStyle`
-
- @font-face {
- font-family: NoirPro-Regular;
- src: local('NoirPro-Regular'), url(./fonts/FontsFree-Net-Noir_regular.woff) format('woff');
- font-display: swap;
- }
-
- *,
- *::before,
- *::after {
- margin: 0;
- padding: 0;
- box-sizing: border-box;
- font-family: "Montserrat" !important;
-
- }
-
- ul{
- list-style-type: none;
- }
-`
const store = setupStore()
const queryClient = new QueryClient()
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(
-
-
-
-
-
- ,
+
+
+
+
+
+
+
+ ,
)
diff --git a/client/src/layouts/AuthLayout/AuthLayout.jsx b/client/src/layouts/AuthLayout/AuthLayout.jsx
index 7b8c6fdae..e7002d733 100644
--- a/client/src/layouts/AuthLayout/AuthLayout.jsx
+++ b/client/src/layouts/AuthLayout/AuthLayout.jsx
@@ -1,11 +1,8 @@
-import React, { useEffect, useState } from 'react'
-import { useSelector } from 'react-redux'
import { Outlet, useLocation, useNavigate } from 'react-router-dom'
import { Button } from '@mui/material'
import CssBaseline from '@mui/material/CssBaseline'
-import CodingImage from '../../assets/CodingImage'
-import SnackBar from '../../components/SnackBar/SnackBar'
+import CodingImage from '../../assets/Login/CodingImage'
import {
AuthContainer,
@@ -20,25 +17,10 @@ import {
const AuthLayout = () => {
const navigate = useNavigate()
const location = useLocation()
- const { error } = useSelector((state) => state.userReducer)
- const [open, setOpen] = useState(false)
- const handleClose = (event, reason) => {
- if (reason === 'clickaway') {
- return
- }
- setOpen(false)
- }
-
- useEffect(() => {
- if (error) {
- setOpen(true)
- }
- }, [error])
return (
<>
- {error && }
,
- Dart: ,
- Perl: ,
- SQL: ,
-})
-
-export default languageOptions
diff --git a/client/src/screens/UsersList/img/Country.svg b/client/src/screens/UsersList/img/Country.svg
deleted file mode 100644
index dd7412147..000000000
--- a/client/src/screens/UsersList/img/Country.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/client/src/screens/UsersList/img/Crown.svg b/client/src/screens/UsersList/img/Crown.svg
deleted file mode 100644
index 35d493d91..000000000
--- a/client/src/screens/UsersList/img/Crown.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/client/src/screens/UsersList/img/tempImg.jpg b/client/src/screens/UsersList/img/tempImg.jpg
deleted file mode 100644
index 852d17b52..000000000
Binary files a/client/src/screens/UsersList/img/tempImg.jpg and /dev/null differ
diff --git a/client/src/shared/components/AutocompleteInput/AutocompleteInput.jsx b/client/src/shared/components/AutocompleteInput/AutocompleteInput.jsx
new file mode 100644
index 000000000..a33c149fe
--- /dev/null
+++ b/client/src/shared/components/AutocompleteInput/AutocompleteInput.jsx
@@ -0,0 +1,79 @@
+import { useEffect, useMemo, useState } from 'react'
+import { ThemeProvider } from '@mui/material'
+import Autocomplete from '@mui/material/Autocomplete'
+import { debounce } from '@mui/material/utils'
+import { useField } from 'formik'
+
+import { useGetUserByUsername } from '../../../api/hooks/temeights/useGetUserByUsername'
+
+import { theme } from './AutocompleteInput.theme'
+import { List } from './List'
+import { InputLoader } from './Loader'
+import { InputTextField } from './TextField'
+
+export default function UserSearch({ value, setValue, width = 412, ...props }) {
+ const [inputValue, setInputValue] = useState('')
+ const [user, setUser] = useState([])
+
+ let { mutate: getUsers, isLoading: areUsersLoading } = useGetUserByUsername()
+
+ const fetchUsers = useMemo(
+ () =>
+ debounce((username, callback) => {
+ getUsers(username, {
+ onSuccess: (data) => {
+ if (data) {
+ setUser(data)
+ }
+ },
+ }) // Fetch user data from the React Query hook
+
+ callback() // Call the callback immediately as the fetch is handled by React Query
+ }, 400),
+ [getUsers],
+ )
+
+ useEffect(() => {
+ setUser([])
+ if (inputValue) {
+ fetchUsers(inputValue, () => {}) // Call the debounced fetch functio
+ }
+ }, [inputValue, fetchUsers])
+
+ return (
+
+ (typeof option === 'string' ? option : option.username)}
+ options={user}
+ autoComplete
+ includeInputInList
+ filterSelectedOptions
+ filterOptions={(x) => x}
+ value={value}
+ isOptionEqualToValue={(option, value) => option.username === value.username}
+ forcePopupIcon={false}
+ noOptionsText={}
+ onChange={(event, newValue, reason) => {
+ if (setValue && reason === 'selectOption') {
+ setValue(newValue)
+ } else if (setValue && reason === 'clear') {
+ setValue(null)
+ }
+ }}
+ onInputChange={(event, newInputValue) => {
+ setInputValue(newInputValue)
+ }}
+ renderInput={(params) => }
+ renderOption={(props, option) => {
+ return
+ }}
+ {...props}
+ />
+
+ )
+}
diff --git a/client/src/shared/components/AutocompleteInput/AutocompleteInput.styles.js b/client/src/shared/components/AutocompleteInput/AutocompleteInput.styles.js
new file mode 100644
index 000000000..9ccc5721f
--- /dev/null
+++ b/client/src/shared/components/AutocompleteInput/AutocompleteInput.styles.js
@@ -0,0 +1,12 @@
+import styled from 'styled-components'
+
+export const LoaderContainer = styled.div`
+ display: flex;
+ gap: 10px;
+`
+
+export const LoaderText = styled.h1`
+ font-size: 16px;
+ font-weight: 400;
+ color: white;
+`
diff --git a/client/src/shared/components/AutocompleteInput/AutocompleteInput.theme.js b/client/src/shared/components/AutocompleteInput/AutocompleteInput.theme.js
new file mode 100644
index 000000000..a32370de2
--- /dev/null
+++ b/client/src/shared/components/AutocompleteInput/AutocompleteInput.theme.js
@@ -0,0 +1,23 @@
+import { createTheme } from '@mui/material'
+
+export const theme = createTheme({
+ components: {
+ // Name of the component
+ MuiAutocomplete: {
+ styleOverrides: {
+ // Name of the slot
+ noOptions: {
+ color: 'white',
+ fontSize: 16,
+ },
+ paper: {
+ background: '#2F3239',
+ marginTop: '10px',
+ },
+ clearIndicator: {
+ color: 'white',
+ },
+ },
+ },
+ },
+})
diff --git a/client/src/shared/components/AutocompleteInput/List.js b/client/src/shared/components/AutocompleteInput/List.js
new file mode 100644
index 000000000..507a9f815
--- /dev/null
+++ b/client/src/shared/components/AutocompleteInput/List.js
@@ -0,0 +1,21 @@
+import { Grid } from '@mui/material'
+
+import { LOCAL_PATH } from '../../../http'
+
+export const List = ({ props, option }) => {
+ return (
+
+
+
+ 
+
+
+ {option.username}
+
+
+
+ )
+}
diff --git a/client/src/shared/components/AutocompleteInput/Loader.js b/client/src/shared/components/AutocompleteInput/Loader.js
new file mode 100644
index 000000000..9b6bf50d5
--- /dev/null
+++ b/client/src/shared/components/AutocompleteInput/Loader.js
@@ -0,0 +1,16 @@
+import { CircularProgress } from '@mui/material'
+
+import { LoaderContainer, LoaderText } from './AutocompleteInput.styles'
+
+export const InputLoader = ({ areUsersLoading }) => {
+ if (areUsersLoading) {
+ return (
+
+
+ Getting users...
+
+ )
+ } else {
+ return 'No users found'
+ }
+}
diff --git a/client/src/shared/components/AutocompleteInput/TextField.js b/client/src/shared/components/AutocompleteInput/TextField.js
new file mode 100644
index 000000000..adce07a29
--- /dev/null
+++ b/client/src/shared/components/AutocompleteInput/TextField.js
@@ -0,0 +1,29 @@
+import React from 'react'
+import { TextField } from '@mui/material'
+
+import SearchIcon from '../../../assets/Shared/SearchIcon'
+
+export const InputTextField = ({ params }) => {
+ return (
+
+
+
+ ),
+ sx: { color: 'white' },
+ }}
+ />
+ )
+}
diff --git a/client/src/shared/components/CustomInput/CustomInput.jsx b/client/src/shared/components/CustomInput/CustomInput.jsx
index f9bd7b6a8..6cbd1cd42 100644
--- a/client/src/shared/components/CustomInput/CustomInput.jsx
+++ b/client/src/shared/components/CustomInput/CustomInput.jsx
@@ -2,26 +2,65 @@ import React from 'react'
import Box from '@mui/material/Box'
import { useField } from 'formik'
+import AlertIcon from '../../../assets/Inputs/AlertIcon'
+import { formatDateInput } from '../../../utils/formatDateString'
import { ErrorMessage, Label } from '../../styles/Tpography.styles'
-import { Input } from './CustomInput.styles'
+import { IconSpan, Input, InputWrapper } from './CustomInput.styles'
-const CustomInput = ({ label, containerWidth = 'auto', inputWidth = '100%', ...props }) => {
- const [field, meta] = useField(props)
+const CustomInput = ({
+ label,
+ containerWidth = 'auto',
+ inputWidth = '100%',
+ onInputChange,
+ uniqueError,
+ uniqueErrorMessage,
+ shouldFormatDate = false,
+ shouldFormatYear = false,
+ isOptional = false,
+ ...props
+}) => {
+ const [field, meta, helpers] = useField(props)
const isError = meta.touched && meta.error
+ const handleChange = (event) => {
+ const { value } = event.target
+ let formattedValue = value
+
+ if (shouldFormatDate) {
+ formattedValue = formatDateInput(value) // Format the value if shouldFormatDate is true
+ } else if (shouldFormatYear) {
+ formattedValue = value.slice(0, 4) // Format the value if shouldFormatNumber is true
+ }
+
+ helpers.setValue(formattedValue) // Manually set the value of the field
+
+ if (onInputChange) {
+ onInputChange(formattedValue) // Pass the input value to the callback
+ }
+ }
+
return (
-
+
{label && }
-
+
+
+ {(isError || uniqueError) && (
+
+
+
+ )}
+
{isError && {meta.error}}
+ {uniqueError && {uniqueErrorMessage}}
)
}
diff --git a/client/src/shared/components/CustomInput/CustomInput.styles.js b/client/src/shared/components/CustomInput/CustomInput.styles.js
index 28ae65b46..f0d466ea1 100644
--- a/client/src/shared/components/CustomInput/CustomInput.styles.js
+++ b/client/src/shared/components/CustomInput/CustomInput.styles.js
@@ -3,6 +3,17 @@ import styled from 'styled-components'
import { WHITE } from '../../../constants/colors'
import { shake } from '../../styles/KeyFrames.styles'
+export const InputWrapper = styled.div`
+ position: relative;
+`
+
+export const IconSpan = styled.span`
+ position: absolute;
+ top: 50%;
+ right: 10px;
+ transform: translateY(-50%);
+`
+
export const Input = styled.input`
outline: 0;
border-width: 0 0 1.5px;
@@ -14,10 +25,30 @@ export const Input = styled.input`
color: ${WHITE.main};
animation-name: ${(props) => props.animation || shake};
animation-duration: 0.3s;
+ display: ${(props) => (props.isOptional ? 'none' : 'block')};
&:focus {
border-color: ${WHITE.main};
}
+
+ ::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+ }
+ ::-webkit-outer-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+ }
+
+ ::placeholder {
+ font-size: 15px;
+ font-weight: 400;
+ }
+
+ &:hover {
+ background: #2f3239;
+ cursor: pointer;
+ }
`
export const GroupContainer = styled.div`
@@ -25,6 +56,7 @@ export const GroupContainer = styled.div`
flex-basis: 33.3%;
flex-direction: column;
`
+
export const SectionContainer = styled.div`
display: flex;
width: 100%;
@@ -36,7 +68,7 @@ export const SectionContainer = styled.div`
export const InputWithIConWrapper = styled.div`
display: flex;
- gap: 20px;
+ gap: 15px;
align-items: center;
align-self: flex-start;
`
diff --git a/client/src/shared/components/CustomRadioButtonsGroup/CustomRadioButtonsGroup.jsx b/client/src/shared/components/CustomRadioButtonsGroup/CustomRadioButtonsGroup.jsx
index 25da16b47..ddf0762d9 100644
--- a/client/src/shared/components/CustomRadioButtonsGroup/CustomRadioButtonsGroup.jsx
+++ b/client/src/shared/components/CustomRadioButtonsGroup/CustomRadioButtonsGroup.jsx
@@ -1,9 +1,9 @@
-import React from 'react'
+import React, { useState } from 'react'
import Radio from '@mui/joy/Radio'
import RadioGroup from '@mui/joy/RadioGroup'
import Sheet from '@mui/joy/Sheet'
import Stack from '@mui/material/Stack'
-import { useField } from 'formik'
+import { useField, useFormikContext } from 'formik'
import { GREEN, WHITE } from '../../../constants/colors'
import { ErrorMessage } from '../../styles/Tpography.styles'
@@ -11,14 +11,71 @@ import { ErrorMessage } from '../../styles/Tpography.styles'
const CustomRadioButtonsGroup = ({ options, ...props }) => {
const [field, meta] = useField(props)
+ // Grab values and submitForm from context
+ const { values, setFieldValue } = useFormikContext()
+
const isError = meta.touched && meta.error
+ /**
+ * The function returns true if the name is 'leader', the value is 'true', and the experience is '0'.
+ * @returns The function `disableCondition` is returning a boolean value. It returns `true` if the
+ * `name` parameter is equal to `'leader'`, the `values.experience` is equal to `'0'`, and the `value`
+ * parameter is equal to `'true'`. Otherwise, it returns `false`.
+ *
+ * ! Can be extended to different types if needed
+ */
+ const disableCondition = (name, value) => {
+ switch (name) {
+ case 'leader':
+ return values?.experience === '0' && value === 'true'
+ // Add additional cases for different types if needed
+ default:
+ return false
+ }
+ }
+
+ /**
+ * The function checks if a button with a value of '0' was clicked and sets a form field value to an
+ * empty string if true.
+ *
+ * ! Can be extended to different types if needed
+ */
+ const checkClicked = (e) => {
+ switch (e.target.value) {
+ case '0':
+ setFieldValue('leader', '')
+ break
+ // Add additional cases for different types if needed
+ default:
+ break
+ }
+ }
+
+ /**
+ * The function checks the label color based on the checked status and value of a checkbox input.
+ * @returns The function `checkLabelColor` returns a string representing a color code. The color code
+ * returned depends on the values of the `checked` and `value` parameters, as well as the value of
+ * `values.experience`. If `checked` is true and `values.experience` is not equal to '0' or if `value`
+ * is not equal to 'true', the color code `
+ * ! Can be extended to different types if needed
+ */
+ const checkLabelColor = (checked, value) => {
+ switch (true) {
+ case checked && !(values?.experience === '0' && value === 'true'):
+ return '#5BD424'
+ case values?.experience === '0' && value === 'true':
+ return '#86878b68'
+ default:
+ return WHITE.main
+ }
+ }
+
return (
@@ -26,11 +83,9 @@ const CustomRadioButtonsGroup = ({ options, ...props }) => {
{
overlay
disableIcon
value={value}
+ sx={{
+ minWidth: '100px',
+ }}
+ id={value}
+ disabled={disableCondition(props.name, value)}
+ onChange={(e) => checkClicked(e)}
slotProps={{
label: ({ checked }) => ({
sx: {
- fontWeight: 'lg',
- fontSize: 'md',
- color: checked ? 'text.primary' : 'text.secondary',
+ fontWeight: '400px',
+ fontSize: '16px',
+ // text inside the buttons
+ color: checkLabelColor(checked, value),
+ justifyContent: 'center',
+ alignItems: 'center',
+ display: 'flex',
},
}),
action: ({ checked }) => ({
sx: {
- borderColor: isError ? '#cf625e' : WHITE.main,
+ border: '2px solid #86878B',
'&:hover': {
- backgroundColor: checked ? GREEN.alternativeBorder : 'inherit',
- transform: 'scale(1.02)',
+ backgroundColor: '#2F3239',
+ border: checked ? '2px solid #5BD424' : '2px solid #86878B',
+ transform: 'scale(1.04)',
},
...(checked && {
- border: 'none',
- backgroundColor: GREEN.alternativeBorder,
+ borderColor: '#5BD424',
}),
},
}),
diff --git a/client/src/shared/components/CustomSelect/CustomSelect.jsx b/client/src/shared/components/CustomSelect/CustomSelect.jsx
index 3962b0a79..53b89127a 100644
--- a/client/src/shared/components/CustomSelect/CustomSelect.jsx
+++ b/client/src/shared/components/CustomSelect/CustomSelect.jsx
@@ -2,10 +2,7 @@ import React from 'react'
import FormControl from '@mui/material/FormControl'
import { useField } from 'formik'
-import {
- Item,
- PlaceholderText,
-} from '../../../screens/UsersList/components/SelectField/SelectField.styles'
+import { Item } from '../../../components/Teammates/components/SelectField/SelectField.styles'
import { ErrorMessage, Label, Text } from '../../styles/Tpography.styles'
import { Line, MenuProps, SelectCustom } from './CustomSelect.styles'
diff --git a/client/src/shared/components/Forms/UserAvatar/AvatarEditButton/AvatarEditButton.jsx b/client/src/shared/components/Forms/UserAvatar/AvatarEditButton/AvatarEditButton.jsx
index 1eb3364a0..70092ca8d 100644
--- a/client/src/shared/components/Forms/UserAvatar/AvatarEditButton/AvatarEditButton.jsx
+++ b/client/src/shared/components/Forms/UserAvatar/AvatarEditButton/AvatarEditButton.jsx
@@ -1,4 +1,4 @@
-import AvatarEditIcon from '../../../../../assets/AvatarEditIcon'
+import AvatarEditIcon from '../../../../../assets/Avatars/AvatarEditIcon'
import { AvatarEditContainer } from './AvatarEditButton.styles'
diff --git a/client/src/shared/components/Toasters/Error.toaster.js b/client/src/shared/components/Toasters/Error.toaster.js
new file mode 100644
index 000000000..e9253354f
--- /dev/null
+++ b/client/src/shared/components/Toasters/Error.toaster.js
@@ -0,0 +1,31 @@
+import { toast } from 'react-hot-toast'
+
+export const errorToaster = (error) => {
+ console.log(error)
+ if (typeof error === 'string') {
+ toast.error(error, {
+ id: error,
+ style: { background: '#2F3239', color: 'white' },
+ })
+ }
+ // Display the toast with the error message
+ else if (error?.response?.data?.message) {
+ toast.error(error?.response?.data?.message, {
+ id: error?.response?.data?.message,
+ style: { background: '#2F3239', color: 'white' },
+ })
+ } else {
+ let errors = error?.response?.data
+
+ for (let i = 0; i < errors.length; i++) {
+ const word = errors[i].split('-')[1]
+
+ setTimeout(() => {
+ toast.error(word, {
+ id: word,
+ style: { background: '#2F3239', color: 'white' },
+ })
+ }, i * 300) // Delay each notification by i * 100 milliseconds
+ }
+ }
+}
diff --git a/client/src/shared/components/Toasters/Success.toaster.js b/client/src/shared/components/Toasters/Success.toaster.js
new file mode 100644
index 000000000..9992b1e46
--- /dev/null
+++ b/client/src/shared/components/Toasters/Success.toaster.js
@@ -0,0 +1,10 @@
+import { toast } from 'react-hot-toast'
+
+export const successToaster = (message) => {
+ if (typeof message === 'string') {
+ toast.success(message, {
+ id: message,
+ style: { background: '#2F3239', color: 'white' },
+ })
+ }
+}
diff --git a/client/src/shared/styles/Global.styles.js b/client/src/shared/styles/Global.styles.js
new file mode 100644
index 000000000..39aa00b41
--- /dev/null
+++ b/client/src/shared/styles/Global.styles.js
@@ -0,0 +1,37 @@
+import { createGlobalStyle } from 'styled-components'
+
+export const GlobalStyle = createGlobalStyle`
+ *,
+ *::before,
+ *::after {
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ font-family: 'Rubik', sans-serif !important;
+ }
+
+ body {
+ background: #26292B !important;
+ overflow-y: scroll;
+ scrollbar-width: none; /* Firefox */
+ -ms-overflow-style: none; /* Internet Explorer 10+ */
+ ::-webkit-scrollbar { /* WebKit */
+ transition: all 0.2s;
+ width: ${(props) => (props.theme.scrollbar ? `5px` : '0')};
+ height: ${(props) => (props.theme.scrollbar ? `auto` : '0')};
+ }
+ ::-webkit-scrollbar-track {
+ background: transparent;
+ }
+
+ ::-webkit-scrollbar-thumb {
+ background-color:
+ ${(props) => (props.theme.scrollbar ? `#5D9D0B;` : '#000000')};
+ border-radius: 10px;
+ }
+ }
+
+ ul{
+ list-style-type: none;
+ }
+`
diff --git a/client/src/shared/styles/Tpography.styles.js b/client/src/shared/styles/Tpography.styles.js
index 99995a0d6..d69000ca9 100644
--- a/client/src/shared/styles/Tpography.styles.js
+++ b/client/src/shared/styles/Tpography.styles.js
@@ -18,8 +18,8 @@ export const Label = styled.label`
`
export const ErrorMessage = styled.p`
- font-size: 15px;
- font-weight: 900;
+ font-size: 14px;
+ font-weight: 400;
margin: 0.5rem 0 0 0;
- color: #cf625e;
+ color: #d42422;
`
diff --git a/client/src/utils/calculateAge.js b/client/src/utils/calculateAge.js
new file mode 100644
index 000000000..55daef542
--- /dev/null
+++ b/client/src/utils/calculateAge.js
@@ -0,0 +1,25 @@
+export const calculateAge = (birthDate) => {
+ // Parse the birth date string
+ const birthYear = new Date(birthDate).getFullYear()
+
+ // Get the current year
+ const currentYear = new Date().getFullYear()
+
+ // Calculate the age
+ let age = currentYear - birthYear
+
+ // Check if the birth date has passed in the current year
+ const currentDate = new Date()
+ const birthDateObj = new Date(birthDate)
+
+ if (
+ currentDate.getMonth() < birthDateObj.getMonth() ||
+ (currentDate.getMonth() === birthDateObj.getMonth() &&
+ currentDate.getDate() < birthDateObj.getDate())
+ ) {
+ // Subtract 1 from the age if the birth date has not yet occurred in the current year
+ age--
+ }
+
+ return age
+}
diff --git a/client/src/utils/convertStringToDate.js b/client/src/utils/convertStringToDate.js
new file mode 100644
index 000000000..96e655965
--- /dev/null
+++ b/client/src/utils/convertStringToDate.js
@@ -0,0 +1,8 @@
+export const formatDateString = (inputValue) => {
+ const [day, month, year] = inputValue.split('/')
+
+ // Create a new Date object in JavaScript (months start from 0)
+ const birthday = new Date(year, month - 1, day, 0, 0, 0).toISOString()
+
+ return birthday
+}
diff --git a/client/src/utils/convertYearToDate.js b/client/src/utils/convertYearToDate.js
new file mode 100644
index 000000000..8c586d3e3
--- /dev/null
+++ b/client/src/utils/convertYearToDate.js
@@ -0,0 +1,17 @@
+export const convertYearToDate = (dateOne, dateTwo) => {
+ let dateOneISODate = null
+ let dateTwoISODate = null
+
+ if (dateOne && dateOne != 0) {
+ dateOneISODate = new Date(dateOne, 0).toISOString()
+ }
+
+ if (dateTwo && dateTwo != 0) {
+ dateTwoISODate = new Date(dateTwo, 0).toISOString()
+ }
+
+ return {
+ dateOne: dateOneISODate,
+ dateTwo: dateTwoISODate,
+ }
+}
diff --git a/client/src/utils/formatDateString.js b/client/src/utils/formatDateString.js
new file mode 100644
index 000000000..bf4ff1b04
--- /dev/null
+++ b/client/src/utils/formatDateString.js
@@ -0,0 +1,19 @@
+export const formatDateInput = (inputValue) => {
+ // Remove any non-digit characters
+ const digitsOnly = inputValue.replace(/\D/g, '') // Remove non-digit characters
+ let formattedValue = ''
+
+ if (digitsOnly.length > 0) {
+ formattedValue = digitsOnly.slice(0, 2) // Extract the first two digits for day
+
+ if (digitsOnly.length > 2) {
+ formattedValue += '/' + digitsOnly.slice(2, 4) // Add a slash and extract the next two digits for month
+
+ if (digitsOnly.length > 4) {
+ formattedValue += '/' + digitsOnly.slice(4, 8) // Add a slash and extract the next four digits for year
+ }
+ }
+ }
+
+ return formattedValue
+}
diff --git a/client/src/utils/removeEmptyFields.js b/client/src/utils/removeEmptyFields.js
new file mode 100644
index 000000000..c105d8660
--- /dev/null
+++ b/client/src/utils/removeEmptyFields.js
@@ -0,0 +1,18 @@
+export const removeEmptyFields = (obj) => {
+ for (let key in obj) {
+ // eslint-disable-next-line no-prototype-builtins
+ if (obj.hasOwnProperty(key)) {
+ let value = obj[key]
+
+ if (value === null || value === '') {
+ delete obj[key]
+ }
+ }
+ }
+
+ if (Object.keys(obj).length === 0) {
+ return null
+ }
+
+ return obj
+}
diff --git a/client/src/utils/transformToCreateTeamDto.js b/client/src/utils/transformToCreateTeamDto.js
new file mode 100644
index 000000000..1209954a6
--- /dev/null
+++ b/client/src/utils/transformToCreateTeamDto.js
@@ -0,0 +1,15 @@
+export const transformToCreateTeamDto = (arr) => {
+ const members = {
+ emails: [],
+ ids: [],
+ }
+
+ for (let i = 0; i < arr.length; i++) {
+ const entry = arr[i]
+
+ members.emails.push(entry.email)
+ members.ids.push(entry.id)
+ }
+
+ return { members }
+}
diff --git a/server/.eslintrc.js b/server/.eslintrc.js
index bc97872aa..9a17bc4a3 100644
--- a/server/.eslintrc.js
+++ b/server/.eslintrc.js
@@ -36,13 +36,15 @@ module.exports = {
'prettier/prettier': [
'error',
{
- parser: 'typescript',
singleQuote: true,
- tabWidth: 2,
- tabs: false,
- semicolons: true,
- arrowParens: 'avoid',
trailingComma: 'all',
+ semi: true,
+ bracketSpacing: true,
+ arrowParens: 'avoid',
+ endOfLine: 'auto',
+ tabWidth: 4,
+ useTabs: true,
+ parser: 'typescript',
},
],
'@typescript-eslint/ban-ts-comment': 'off',
diff --git a/server/.prettierrc b/server/.prettierrc
index 67dee496b..0a5076e00 100644
--- a/server/.prettierrc
+++ b/server/.prettierrc
@@ -4,7 +4,7 @@
"semi": true,
"bracketSpacing": true,
"arrowParens": "avoid",
- "endOfLine": "lf",
+ "endOfLine": "auto",
"tabWidth": 4,
"useTabs": true,
"parser": "typescript"
diff --git a/server/src/auth/auth.service.ts b/server/src/auth/auth.service.ts
index 160967a0d..8bf98718a 100644
--- a/server/src/auth/auth.service.ts
+++ b/server/src/auth/auth.service.ts
@@ -235,7 +235,9 @@ export class AuthService {
* @param {string} activationLink - string - The activation link that was sent to the user's email.
*/
async activate(activationLink: string): Promise {
- const user = await this.userService.verifyActivationLink(activationLink);
+ const user = await this.userService.verifyActivationLink(
+ activationLink,
+ );
/* It's checking if the user exists. */
if (!user) {
diff --git a/server/src/auth/guards/roles.guard.ts b/server/src/auth/guards/roles.guard.ts
index f7a2b011f..0e9bc9d5c 100644
--- a/server/src/auth/guards/roles.guard.ts
+++ b/server/src/auth/guards/roles.guard.ts
@@ -55,7 +55,9 @@ export class RolesGuard implements CanActivate {
}
req.user = user;
- const check = user.roles.some(role => requiredRoles.includes(role.value));
+ const check = user.roles.some(role =>
+ requiredRoles.includes(role.value),
+ );
if (!check) {
throw new HttpException(
diff --git a/server/src/files/file.service.ts b/server/src/files/file.service.ts
index b5b12b5e9..94d364d62 100644
--- a/server/src/files/file.service.ts
+++ b/server/src/files/file.service.ts
@@ -36,7 +36,10 @@ export class FileService {
fs.writeFileSync(path.resolve(filePath, fileName), buffer);
return type + '/' + fileName;
} catch (err) {
- throw new HttpException(err.message, HttpStatus.INTERNAL_SERVER_ERROR);
+ throw new HttpException(
+ err.message,
+ HttpStatus.INTERNAL_SERVER_ERROR,
+ );
}
}
@@ -49,7 +52,10 @@ export class FileService {
const filePath = path.resolve(__dirname, '..', 'static', fileName);
await fs.promises.unlink(filePath);
} catch (err) {
- throw new HttpException(err.message, HttpStatus.INTERNAL_SERVER_ERROR);
+ throw new HttpException(
+ err.message,
+ HttpStatus.INTERNAL_SERVER_ERROR,
+ );
}
}
}
diff --git a/server/src/leaderboard/leaderboard.service.ts b/server/src/leaderboard/leaderboard.service.ts
index b7933ea0f..463d4cf93 100644
--- a/server/src/leaderboard/leaderboard.service.ts
+++ b/server/src/leaderboard/leaderboard.service.ts
@@ -70,7 +70,8 @@ export class LeaderboardService {
const teamIndex = leaderboardCandidate.tournament_teams.findIndex(
team =>
- team.team_id.toString() === dto.tournament_team.team_id.toString(),
+ team.team_id.toString() ===
+ dto.tournament_team.team_id.toString(),
);
if (teamIndex === -1) {
diff --git a/server/src/mails/templates/reset.ts b/server/src/mails/templates/reset.ts
index 7498834df..100e4675a 100644
--- a/server/src/mails/templates/reset.ts
+++ b/server/src/mails/templates/reset.ts
@@ -26,8 +26,8 @@ export const resetEmail = (
Reset password on Teameights 🔧
Hello ${
- user.username
- },
+ user.username
+ },
We recieved a request at ${new Date().toISOString()} (UTC) to reset your password on Teameights. If you made this request, please confirm it by clicking button below.
@@ -39,8 +39,8 @@ export const resetEmail = (
or copy and paste this URL into your browser: ${link}
This request was made by ${
- user.username
- } from ${ip}. If you were not expecting this reset, you can ignore this email. If you are concerned about your account's safety, please reply to this email to get in touch with us.
+ user.username
+ } from ${ip}. If you were not expecting this reset, you can ignore this email. If you are concerned about your account's safety, please reply to this email to get in touch with us.
Teameights Support Team 🎉
diff --git a/server/src/mails/templates/team-invite.ts b/server/src/mails/templates/team-invite.ts
index 289754436..3b533f16f 100644
--- a/server/src/mails/templates/team-invite.ts
+++ b/server/src/mails/templates/team-invite.ts
@@ -28,14 +28,14 @@ export const teamInviteEmail = (
Join ${
- team.name
- } on Teameights 🎉
+ team.name
+ } on Teameights 🎉
Hello ${
- receiver.username
- },
+ receiver.username
+ },
${
- inviter.username
- } (${
+ inviter.username
+ } (${
inviter.email
}) has invited you to the ${
team.name
@@ -48,18 +48,18 @@ export const teamInviteEmail = (
 |
+ inviter.image
+ ? process.env.API_URL + '/' + inviter.image
+ : 'https://i.ibb.co/Htx1WFL/ava-10.png'
+ }" width="64" height="64" style="display:block;outline:none;border:none;text-decoration:none;border-radius:9999px" />
 |
 |
+ receiver.image
+ ? process.env.API_URL +
+ '/' +
+ receiver.image
+ : 'https://i.ibb.co/6BDySfL/ava-05.png'
+ } width="64" height="64" style="display:block;outline:none;border:none;text-decoration:none;border-radius:9999px" />
@@ -77,8 +77,8 @@ export const teamInviteEmail = (
or copy and paste this URL into your browser: ${link}
This invitation was intended for ${
- receiver.email
- }. If you were not expecting this invitation, you can ignore this email. If you are concerned about your account's safety, please reply to this email to get in touch with us.
+ receiver.email
+ }. If you were not expecting this invitation, you can ignore this email. If you are concerned about your account's safety, please reply to this email to get in touch with us.
Teameights Support Team 🎉
diff --git a/server/src/maintenance/maintenance.module.ts b/server/src/maintenance/maintenance.module.ts
index c26bbcb24..b770ecc37 100644
--- a/server/src/maintenance/maintenance.module.ts
+++ b/server/src/maintenance/maintenance.module.ts
@@ -1,13 +1,13 @@
import { Module } from '@nestjs/common';
import { MongooseModule } from '@nestjs/mongoose';
+import { NotificationsModule } from '@/notifications/notifications.module';
import { RolesModule } from '@/roles/roles.module';
import { TeamsModule } from '@/teams/teams.module';
import { UsersModule } from '@/users/users.module';
import { MaintenanceController } from './maintenance.controller';
import { MaintenanceService } from './maintenance.service';
-import { NotificationsModule } from '@/notifications/notifications.module';
@Module({
controllers: [MaintenanceController],
diff --git a/server/src/maintenance/maintenance.service.ts b/server/src/maintenance/maintenance.service.ts
index a4f09716b..4b436f7be 100644
--- a/server/src/maintenance/maintenance.service.ts
+++ b/server/src/maintenance/maintenance.service.ts
@@ -5,6 +5,7 @@ import mongoose, { Connection } from 'mongoose';
import { performance } from 'perf_hooks';
import { uuid } from 'uuidv4';
+import { NotificationsService } from '@/notifications/notifications.service';
import { RolesService } from '@/roles/roles.service';
import { CreateTeamDto } from '@/teams/dto/create-team.dto';
import { TeamsService } from '@/teams/teams.service';
@@ -21,7 +22,6 @@ import {
avatar_purple,
avatar_yellow,
} from './maintenance.data';
-import { NotificationsService } from '@/notifications/notifications.service';
@Injectable()
export class MaintenanceService {
@@ -128,9 +128,12 @@ export class MaintenanceService {
initialUser.email = email;
initialUser.username = faker.internet.userName();
initialUser.fullName = faker.name.fullName();
- initialUser.birthDate = faker.date.birthdate();
- initialUser.age = String(faker.datatype.number({ min: 18, max: 65 }));
- initialUser.description = faker.lorem.sentence();
+ (initialUser.dateOfBirth = faker.date.birthdate({
+ min: 18,
+ max: 65,
+ mode: 'age',
+ })),
+ (initialUser.description = faker.lorem.sentence());
initialUser.concentration = faker.name.jobTitle();
initialUser.country = faker.address.country();
initialUser.experience = `${faker.datatype.number({
diff --git a/server/src/notifications/notifications.service.ts b/server/src/notifications/notifications.service.ts
index c21aac500..11a587f57 100644
--- a/server/src/notifications/notifications.service.ts
+++ b/server/src/notifications/notifications.service.ts
@@ -46,12 +46,17 @@ export class NotificationsService {
};
if (typeof session !== 'undefined') {
- const data = await this.systemNotificationModel.create([notification], {
- session,
- });
+ const data = await this.systemNotificationModel.create(
+ [notification],
+ {
+ session,
+ },
+ );
return data[0]._id;
} else {
- const data = await this.systemNotificationModel.create(notification);
+ const data = await this.systemNotificationModel.create(
+ notification,
+ );
return data._id;
}
}
@@ -80,9 +85,12 @@ export class NotificationsService {
};
if (typeof session !== 'undefined') {
- const data = await this.teamNotificationModel.create([notification], {
- session,
- });
+ const data = await this.teamNotificationModel.create(
+ [notification],
+ {
+ session,
+ },
+ );
return data[0]._id;
} else {
const data = await this.teamNotificationModel.create(notification);
diff --git a/server/src/notifications/tests/notifications.gateway.spec.ts b/server/src/notifications/tests/notifications.gateway.spec.ts
index 46ac799c4..25b8f0d60 100644
--- a/server/src/notifications/tests/notifications.gateway.spec.ts
+++ b/server/src/notifications/tests/notifications.gateway.spec.ts
@@ -93,7 +93,10 @@ describe('Notifications Gateway Test', () => {
await new Promise(resolve => {
ws.on('connect', async () => {
- ws.emit('subscribeToNotifications', JSON.stringify({ id: user._id }));
+ ws.emit(
+ 'subscribeToNotifications',
+ JSON.stringify({ id: user._id }),
+ );
});
/*
@@ -128,7 +131,9 @@ describe('Notifications Gateway Test', () => {
displayed.
*/
// TODO: Handle resolve on error here
- expect(newNotification.system_message).toBe('New notification!');
+ expect(newNotification.system_message).toBe(
+ 'New notification!',
+ );
/*
`ws.disconnect();` is a method call that disconnects the client from the WebSocket server. In this
@@ -147,7 +152,9 @@ describe('Notifications Gateway Test', () => {
if (!ws.active) {
console.log('disconnected from web socket');
setTimeout(() => {
- console.log('changeStream should be closed now -- stop timer!');
+ console.log(
+ 'changeStream should be closed now -- stop timer!',
+ );
resolve();
}, 3000);
}
@@ -167,7 +174,9 @@ describe('Notifications Gateway Test', () => {
if (!ws.active) {
console.log('disconnected from web socket');
setTimeout(() => {
- console.log('changeStream should be closed now -- stop timer!');
+ console.log(
+ 'changeStream should be closed now -- stop timer!',
+ );
resolve();
/*
diff --git a/server/src/pipes/validation.pipe.ts b/server/src/pipes/validation.pipe.ts
index fa571ccab..88b33089c 100644
--- a/server/src/pipes/validation.pipe.ts
+++ b/server/src/pipes/validation.pipe.ts
@@ -15,12 +15,14 @@ export class ValidationPipe implements PipeTransform {
/* Checking if there are any errors in the children of the error object. If there are, it will return
the error message. Used for nested objects validation inside the orginial object*/
return err.children.length === 0
- ? `${err.property} - ${Object.values(err.constraints).join(', ')}`
+ ? `${err.property} - ${Object.values(err.constraints).join(
+ ', ',
+ )}`
: err.children.map(
err =>
- `${err.property} - ${Object.values(err.constraints).join(
- ', ',
- )}`,
+ `${err.property} - ${Object.values(
+ err.constraints,
+ ).join(', ')}`,
);
});
throw new ValidationException(messages);
diff --git a/server/src/roles/roles.controller.ts b/server/src/roles/roles.controller.ts
index 1de3688fe..d78bdd7c4 100644
--- a/server/src/roles/roles.controller.ts
+++ b/server/src/roles/roles.controller.ts
@@ -2,11 +2,12 @@ import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common';
import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
import mongoose, { ObjectId } from 'mongoose';
+import { RolesGuard } from '@/auth/guards/roles.guard';
+import { Roles } from '@/auth/guards/roles-auth.decorator';
+
import { CreateRoleDto } from './dto/create-role.dto';
import { Role } from './roles.schema';
import { RolesService } from './roles.service';
-import { RolesGuard } from '@/auth/guards/roles.guard';
-import { Roles } from '@/auth/guards/roles-auth.decorator';
@ApiTags('Roles')
@Controller('roles')
diff --git a/server/src/roles/roles.module.ts b/server/src/roles/roles.module.ts
index 30d37289d..e4ed2e2ab 100644
--- a/server/src/roles/roles.module.ts
+++ b/server/src/roles/roles.module.ts
@@ -1,14 +1,13 @@
import { Module } from '@nestjs/common';
import { MongooseModule } from '@nestjs/mongoose';
+import { TokensModule } from '@/tokens/tokens.module';
import { User, UserSchema } from '@/users/users.schema';
import { RolesController } from './roles.controller';
import { Role, RoleSchema } from './roles.schema';
import { RolesService } from './roles.service';
-import { TokensModule } from '@/tokens/tokens.module';
-
@Module({
controllers: [RolesController],
providers: [RolesService],
diff --git a/server/src/teams/dto/update-team.dto.ts b/server/src/teams/dto/update-team.dto.ts
index 6150447e0..ad20f36d7 100644
--- a/server/src/teams/dto/update-team.dto.ts
+++ b/server/src/teams/dto/update-team.dto.ts
@@ -62,7 +62,8 @@ export class UpdateTeamDto {
@ApiProperty({
example: 10,
- description: 'Number of points that the team has earned in the tournaments',
+ description:
+ 'Number of points that the team has earned in the tournaments',
})
@IsOptional()
@IsNumber()
diff --git a/server/src/teams/teams.controller.ts b/server/src/teams/teams.controller.ts
index ed1b6174e..070a46034 100644
--- a/server/src/teams/teams.controller.ts
+++ b/server/src/teams/teams.controller.ts
@@ -86,7 +86,11 @@ export class TeamsController {
/* Parsing the query string into an object. */
const parsedQuery = qs.parse(filtersQuery);
- return this.teamsService.getFilteredTeamsByPage(page, limit, parsedQuery);
+ return this.teamsService.getFilteredTeamsByPage(
+ page,
+ limit,
+ parsedQuery,
+ );
}
@ApiOperation({
@@ -127,7 +131,7 @@ export class TeamsController {
})
@ApiResponse({ status: 200, type: Team })
@Put('/remove-member')
- removeMember(@Body() dto: TeamMembershipDTO): Promise {
+ removeMember(@Body() dto: TeamMembershipDTO): Promise {
return this.teamsService.removeMember(dto);
}
@@ -138,7 +142,9 @@ export class TeamsController {
})
@ApiResponse({ status: 200, type: InviteToTeamResponseDto })
@Post('/invite')
- inviteToTeam(@Body() dto: InviteToTeamDto): Promise {
+ inviteToTeam(
+ @Body() dto: InviteToTeamDto,
+ ): Promise {
return this.teamsService.inviteToTeam(dto);
}
@@ -184,7 +190,7 @@ export class TeamsController {
})
@ApiResponse({ status: 200, type: Team })
@Put('/leave')
- leaveTeam(@Body() dto: TeamMembershipDTO): Promise {
+ leaveTeam(@Body() dto: TeamMembershipDTO): Promise {
return this.teamsService.leaveTeam(dto);
}
@@ -210,4 +216,13 @@ export class TeamsController {
transferLeader(@Body() dto: TransferLeaderDto): Promise {
return this.teamsService.transferLeader(dto);
}
+
+ @ApiOperation({
+ summary: 'Get team by tag',
+ })
+ @ApiResponse({ status: 200, type: Team })
+ @Get('/tag/:tag')
+ getByTag(@Param('tag') tag: string): Promise {
+ return this.teamsService.getByTag(tag);
+ }
}
diff --git a/server/src/teams/teams.schema.ts b/server/src/teams/teams.schema.ts
index f74f87f56..eddcff14a 100644
--- a/server/src/teams/teams.schema.ts
+++ b/server/src/teams/teams.schema.ts
@@ -75,7 +75,8 @@ export class Team {
@ApiProperty({
example: 10,
- description: 'Number of points that the team has earned in the tournaments',
+ description:
+ 'Number of points that the team has earned in the tournaments',
})
@Prop({ required: false })
points: number;
diff --git a/server/src/teams/teams.service.ts b/server/src/teams/teams.service.ts
index 11582f97b..08205b7cb 100644
--- a/server/src/teams/teams.service.ts
+++ b/server/src/teams/teams.service.ts
@@ -109,9 +109,9 @@ export class TeamsService {
await this.userService.addTeam(candidate._id, team._id);
/* Check if there are any members to invite. */
- if (dto?.members?.emails.length > 0) {
+ if (dto?.members?.emails.length > 1) {
/* Inviting all the members of the team to the team. */
- for (let i = 0; i < dto.members.emails.length; i++) {
+ for (let i = 1; i < dto.members.emails.length; i++) {
const candidate = {
email: dto.members.emails[i],
from_user_id: dto.leader,
@@ -260,10 +260,16 @@ export class TeamsService {
parsedQuery.$expr = {
$and: [
{
- $gte: [{ $size: '$members' }, Number(parsedQuery.members[0])],
+ $gte: [
+ { $size: '$members' },
+ Number(parsedQuery.members[0]),
+ ],
},
{
- $lte: [{ $size: '$members' }, Number(parsedQuery.members[1])],
+ $lte: [
+ { $size: '$members' },
+ Number(parsedQuery.members[1]),
+ ],
},
],
};
@@ -408,7 +414,9 @@ export class TeamsService {
userId: mongoose.Types.ObjectId,
notificationid: mongoose.Types.ObjectId,
): Promise {
- console.log(`Removing notification ${notificationid} from user ${userId}`);
+ console.log(
+ `Removing notification ${notificationid} from user ${userId}`,
+ );
/* Removing the notification from the database. */
await this.notificationsService.removeNotification(notificationid);
@@ -427,7 +435,9 @@ export class TeamsService {
notificationid: mongoose.Types.ObjectId,
): Promise {
const notification =
- await this.notificationsService.getTeamNotificationById(notificationid);
+ await this.notificationsService.getTeamNotificationById(
+ notificationid,
+ );
if (!notification) {
/* Checking if the user has the notification. If it does, it is removing it. */
@@ -512,7 +522,9 @@ export class TeamsService {
notificationid: mongoose.Types.ObjectId,
): Promise {
const notification =
- await this.notificationsService.getTeamNotificationById(notificationid);
+ await this.notificationsService.getTeamNotificationById(
+ notificationid,
+ );
if (!notification) {
/* Checking if the user has the notification. If it does, it is removing it. */
@@ -549,7 +561,10 @@ export class TeamsService {
/* Checking if the user exists. If it doesn't, it is throwing an error. */
if (!candidate) {
- throw new HttpException(`User was not found`, HttpStatus.BAD_REQUEST);
+ throw new HttpException(
+ `User was not found`,
+ HttpStatus.BAD_REQUEST,
+ );
}
/* Checking if the user already has a team. If it does, it is throwing an error. */
@@ -605,12 +620,15 @@ export class TeamsService {
* @param {TeamMembershipDTO} dto - TeamMembershipDTO
* @returns The updated team.
*/
- async leaveTeam(dto: TeamMembershipDTO): Promise {
+ async leaveTeam(dto: TeamMembershipDTO): Promise {
const candidate = await this.userService.getUserById(dto.user_id);
/* Checking if the user exists. If it doesn't, it is throwing an error. */
if (!candidate) {
- throw new HttpException(`User was not found`, HttpStatus.BAD_REQUEST);
+ throw new HttpException(
+ `User was not found`,
+ HttpStatus.BAD_REQUEST,
+ );
}
/* Checking if the user already has a team. If it does, it is throwing an error. */
@@ -642,6 +660,28 @@ export class TeamsService {
// TODO: in the future, check if user is signed up for the tournament before allowing to leave the team
+ /* The above code is checking if a team leader is trying to leave a team that has other members in it.
+ If so, it throws an HTTP exception with a message indicating that the leader cannot leave the team
+ before removing all players. */
+ if (team.leader._id.equals(candidate._id) && team.members.length > 1) {
+ throw new HttpException(
+ `${candidate.username} can't leave the team before removing all players`,
+ HttpStatus.BAD_REQUEST,
+ );
+ }
+
+ /* The above code is checking if a candidate is the only member of a team and also the leader of that
+ team. If both conditions are true, it deletes the team from the database using the team's ID and
+ removes the team from the candidate's list of teams using the candidate's ID. */
+ if (
+ team.leader._id.equals(candidate._id) &&
+ team.members.length === 1
+ ) {
+ await this.teamModel.findOneAndDelete({ _id: team._id });
+
+ return this.userService.removeTeam(candidate._id);
+ }
+
/* Removing the user to the team. */
const updated = await this.teamModel.findOneAndUpdate(
{ _id: team._id },
@@ -690,7 +730,7 @@ export class TeamsService {
* @param {TeamMembershipDTO} dto - TeamMembershipDTO
* @returns Team
*/
- async removeMember(dto: TeamMembershipDTO): Promise {
+ async removeMember(dto: TeamMembershipDTO): Promise {
return await this.leaveTeam(dto);
}
@@ -741,13 +781,21 @@ export class TeamsService {
// check if leader is valid user
const leader = await this.userService.getUserById(dto.leader_id);
if (!leader) {
- throw new HttpException(`User was not found`, HttpStatus.BAD_REQUEST);
+ throw new HttpException(
+ `User was not found`,
+ HttpStatus.BAD_REQUEST,
+ );
}
// check if new_leader is valid user
- const new_leader = await this.userService.getUserById(dto.new_leader_id);
+ const new_leader = await this.userService.getUserById(
+ dto.new_leader_id,
+ );
if (!new_leader) {
- throw new HttpException(`User was not found`, HttpStatus.BAD_REQUEST);
+ throw new HttpException(
+ `User was not found`,
+ HttpStatus.BAD_REQUEST,
+ );
}
// check if both leader and new_leader belogn to the same team
@@ -782,4 +830,8 @@ export class TeamsService {
return newTeam;
}
+
+ async getByTag(tag: string): Promise {
+ return await this.teamModel.findOne({ tag: tag });
+ }
}
diff --git a/server/src/teams/tests/stubs/update-team-avatar.dto.stub.ts b/server/src/teams/tests/stubs/update-team-avatar.dto.stub.ts
index d19ee6fa4..479a14d34 100644
--- a/server/src/teams/tests/stubs/update-team-avatar.dto.stub.ts
+++ b/server/src/teams/tests/stubs/update-team-avatar.dto.stub.ts
@@ -7,7 +7,6 @@ export const UpdateTeamAvatarDtoStub = (
): UpdateTeamAvatarDto => {
return {
teamID: teamid,
- image:
- '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',
+ image: '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',
};
};
diff --git a/server/src/teams/tests/teams.service.spec.ts b/server/src/teams/tests/teams.service.spec.ts
index 1f69cc63f..22c59c593 100644
--- a/server/src/teams/tests/teams.service.spec.ts
+++ b/server/src/teams/tests/teams.service.spec.ts
@@ -51,7 +51,9 @@ describe('TeamService', () => {
envFilePath: `.dev.env`,
}),
rootMongooseTestModule(),
- MongooseModule.forFeature([{ name: Team.name, schema: TeamsSchema }]),
+ MongooseModule.forFeature([
+ { name: Team.name, schema: TeamsSchema },
+ ]),
/* Serving the static files. */
ServeStaticModule.forRoot({
rootPath: path.resolve(__dirname, 'static'),
@@ -194,7 +196,9 @@ describe('TeamService', () => {
it('should create user, give him role, create team, then create another user invite him to team and double check everything was updated', async () => {
const user1 = await createUser();
- const team = await teamsService.createTeam(CreateTeamDtoStub(user1._id));
+ const team = await teamsService.createTeam(
+ CreateTeamDtoStub(user1._id),
+ );
await userService.updateAvatar(UpdateUserAvatarDtoStub(user1.email, 1));
@@ -220,7 +224,9 @@ describe('TeamService', () => {
it('should create user, give him role, create team, then create another user invite him to team and double check invite has image field', async () => {
const user1 = await createUser();
- const team = await teamsService.createTeam(CreateTeamDtoStub(user1._id));
+ const team = await teamsService.createTeam(
+ CreateTeamDtoStub(user1._id),
+ );
const user2 = await userService.createUser(
RegisterUserDtoStub('mmashc2@uic.edu'),
@@ -262,7 +268,7 @@ describe('TeamService', () => {
it('should create 5 users, give them role, one user should create team and then invite other users into it', async () => {
const users = await createMultipleUsers(5);
- const leader = users.shift();
+ // const leader = users.shift();
const members = {
emails: [],
@@ -275,21 +281,23 @@ describe('TeamService', () => {
}
const team = await teamsService.createTeam(
- CreateTeamDtoStub(leader._id, null, members.emails, members.ids),
+ CreateTeamDtoStub(users[0]._id, null, members.emails, members.ids),
);
/* Checking if the team is defined. */
expect(team).toBeDefined();
- for (let i = 0; i < users.length; i++) {
+ for (let i = 1; i < users.length; i++) {
const notification =
- await notificationService.getTeamNotificationsForUser(users[i]._id);
+ await notificationService.getTeamNotificationsForUser(
+ users[i]._id,
+ );
/* Checking if the notification is defined. */
expect(notification[0]).toBeDefined();
/* Checking if the notification is defined. */
- expect(notification[0].from_user_id).toStrictEqual(leader._id);
+ expect(notification[0].from_user_id).toStrictEqual(users[0]._id);
}
});
@@ -342,7 +350,9 @@ describe('TeamService', () => {
const updatedTeam = await teamsService.updateTeam(incoming_update_data);
expect(updatedTeam.name).toEqual(incoming_update_data.name);
- expect(updatedTeam.description).toEqual(incoming_update_data.description);
+ expect(updatedTeam.description).toEqual(
+ incoming_update_data.description,
+ );
expect(updatedTeam.country).toEqual(incoming_update_data.country);
expect(updatedTeam.tag).toEqual(incoming_update_data.tag);
expect(updatedTeam.type).toEqual(incoming_update_data.type);
@@ -372,7 +382,9 @@ describe('TeamService', () => {
await teamsService.createTeam(CreateTeamDtoStub(user._id));
// @ts-ignore
- await expect(teamsService.updateTeam({})).rejects.toThrow(HttpException);
+ await expect(teamsService.updateTeam({})).rejects.toThrow(
+ HttpException,
+ );
});
it('should create user, then create team and then call updateTeam with only required teamid', async () => {
@@ -420,7 +432,9 @@ describe('TeamService', () => {
let team: Team;
for (let i = 0; i < 7; i++) {
- team = await teamsService.createTeam(CreateTeamDtoStub(users[i]._id));
+ team = await teamsService.createTeam(
+ CreateTeamDtoStub(users[i]._id),
+ );
}
await teamsService.joinTeam({
@@ -434,7 +448,8 @@ describe('TeamService', () => {
});
expect(
- (await teamsService.getFilteredTeamsByPage(1, 9, { members: [3] })).total,
+ (await teamsService.getFilteredTeamsByPage(1, 9, { members: [3] }))
+ .total,
).toBe(1);
});
diff --git a/server/src/tokens/tokens.service.ts b/server/src/tokens/tokens.service.ts
index a556aab51..378ef43d5 100644
--- a/server/src/tokens/tokens.service.ts
+++ b/server/src/tokens/tokens.service.ts
@@ -85,7 +85,9 @@ export class TokensService {
// * his Ipad, he will be automatically logged out on PC
const tokenData =
typeof session !== 'undefined'
- ? await this.tokenModel.findOne({ user: userId }).session(session)
+ ? await this.tokenModel
+ .findOne({ user: userId })
+ .session(session)
: await this.tokenModel.findOne({ user: userId });
if (tokenData) {
tokenData.refreshToken = refreshToken;
diff --git a/server/src/tournaments/tournaments.controller.ts b/server/src/tournaments/tournaments.controller.ts
index 3c881e271..36e3c8316 100644
--- a/server/src/tournaments/tournaments.controller.ts
+++ b/server/src/tournaments/tournaments.controller.ts
@@ -49,7 +49,8 @@ export class TournamentsController {
}
@ApiOperation({
- summary: 'Get all tournaments in the form /check-existance/:tournament/:id',
+ summary:
+ 'Get all tournaments in the form /check-existance/:tournament/:id',
})
@ApiResponse({ status: 200, type: Object })
@Get('/check-existance/:tournament_id/:user_id')
diff --git a/server/src/tournaments/tournaments.service.ts b/server/src/tournaments/tournaments.service.ts
index f6d961b93..d8a61f6c9 100644
--- a/server/src/tournaments/tournaments.service.ts
+++ b/server/src/tournaments/tournaments.service.ts
@@ -41,7 +41,10 @@ export class TournamentsService {
}
/* It checks if the tournament end time is later than the start time. */
- if (new Date(dto.tournament_endTime) < new Date(dto.tournament_startTime)) {
+ if (
+ new Date(dto.tournament_endTime) <
+ new Date(dto.tournament_startTime)
+ ) {
throw new HttpException(
`Start time can't be later than end time`,
HttpStatus.BAD_REQUEST,
@@ -81,7 +84,9 @@ export class TournamentsService {
* @param t_id - mongoose.Types.ObjectId
* @returns A tournament object
*/
- async getTournamentById(t_id: mongoose.Types.ObjectId): Promise {
+ async getTournamentById(
+ t_id: mongoose.Types.ObjectId,
+ ): Promise {
return await this.tournamentModel.findById(t_id);
}
@@ -135,7 +140,10 @@ export class TournamentsService {
/* It checks if the team exists. */
if (!candidateTeam) {
- throw new HttpException(`Team was not found`, HttpStatus.BAD_REQUEST);
+ throw new HttpException(
+ `Team was not found`,
+ HttpStatus.BAD_REQUEST,
+ );
}
const candidateTournament = await this.getTournamentById(dto.t_id);
@@ -187,9 +195,10 @@ export class TournamentsService {
);
} else {
/* It's filtering the participants array and pushing the new participant to the array. */
- const filtered = checkTeamInTournament.tournament_participants.filter(
- participant => participant.team_id !== dto.team_id,
- );
+ const filtered =
+ checkTeamInTournament.tournament_participants.filter(
+ participant => participant.team_id !== dto.team_id,
+ );
const newParticipants = {
team_id: dto.team_id,
frontend_id: dto.frontend_id,
diff --git a/server/src/users/dto/job-data.dto.ts b/server/src/users/dto/job-data.dto.ts
index bc2ed2082..48ae35638 100644
--- a/server/src/users/dto/job-data.dto.ts
+++ b/server/src/users/dto/job-data.dto.ts
@@ -1,5 +1,12 @@
import { ApiProperty } from '@nestjs/swagger';
-import { IsDate, IsDefined, IsNotEmpty, IsString } from 'class-validator';
+import {
+ IsDate,
+ IsDateString,
+ IsDefined,
+ IsNotEmpty,
+ IsOptional,
+ IsString,
+} from 'class-validator';
export class JobDataDto {
@ApiProperty({ example: 'SWE', description: 'Job title' })
@@ -21,7 +28,7 @@ export class JobDataDto {
example: `2016-05-18T14:10:30Z`,
description: 'startDate in UTC',
})
- @IsDate()
+ @IsDateString()
@IsNotEmpty({ message: 'Should not be empty' })
@IsDefined()
readonly startDate: Date;
@@ -32,7 +39,8 @@ export class JobDataDto {
})
@IsString({ message: 'Should be string' })
@IsNotEmpty({ message: 'Should not be empty' })
- @IsDate()
+ @IsDateString()
@IsDefined()
+ @IsOptional()
readonly endDate: Date;
}
diff --git a/server/src/users/dto/university-data.dto.ts b/server/src/users/dto/university-data.dto.ts
index 9a2e8ba62..d0a7f14cb 100644
--- a/server/src/users/dto/university-data.dto.ts
+++ b/server/src/users/dto/university-data.dto.ts
@@ -1,5 +1,12 @@
import { ApiProperty } from '@nestjs/swagger';
-import { IsDate, IsDefined, IsNotEmpty, IsString } from 'class-validator';
+import {
+ IsDate,
+ IsDateString,
+ IsDefined,
+ IsNotEmpty,
+ IsOptional,
+ IsString,
+} from 'class-validator';
export class UniversityDataDto {
@ApiProperty({ example: 'UIC', description: 'User university name' })
@@ -27,7 +34,7 @@ export class UniversityDataDto {
example: `2016-05-18T14:10:30Z`,
description: 'Addmission in UTC',
})
- @IsDate()
+ @IsDateString()
@IsNotEmpty({ message: 'Should not be empty' })
@IsDefined()
readonly addmissionDate: Date;
@@ -38,7 +45,8 @@ export class UniversityDataDto {
})
@IsString({ message: 'Should be string' })
@IsNotEmpty({ message: 'Should not be empty' })
- @IsDate()
+ @IsDateString()
@IsDefined()
+ @IsOptional()
readonly graduationDate: Date;
}
diff --git a/server/src/users/dto/update-user.dto.ts b/server/src/users/dto/update-user.dto.ts
index 58502e022..13ee21931 100644
--- a/server/src/users/dto/update-user.dto.ts
+++ b/server/src/users/dto/update-user.dto.ts
@@ -4,6 +4,7 @@ import {
IsArray,
IsBoolean,
IsDate,
+ IsDateString,
IsEmail,
IsNotEmpty,
IsObject,
@@ -39,11 +40,11 @@ export class UpdateUserDto {
@IsOptional()
readonly fullName: string;
- @ApiProperty({ example: '17', description: 'Age of user' })
- @IsString({ message: 'Should be string' })
+ @ApiProperty({ example: new Date(), description: 'Date of birth' })
+ @IsDateString()
@IsNotEmpty({ message: 'Should not be empty' })
@IsOptional()
- readonly age: string;
+ readonly dateOfBirth: Date;
@ApiProperty({
example: '20 y.o. developer from Ukraine',
@@ -62,14 +63,6 @@ export class UpdateUserDto {
@IsOptional()
readonly concentration: string;
- @ApiProperty({
- example: '2016-05-18T14:10:30Z',
- description: 'Birthday of user',
- })
- @IsDate()
- @IsOptional()
- readonly birthDate: Date;
-
@ApiProperty({ example: 'Ukraine', description: 'Country of user' })
@IsString({ message: 'Should be string' })
@IsNotEmpty({ message: 'Should not be empty' })
diff --git a/server/src/users/tests/users.service.spec.ts b/server/src/users/tests/users.service.spec.ts
index 20318e8ec..d2ac8e53d 100644
--- a/server/src/users/tests/users.service.spec.ts
+++ b/server/src/users/tests/users.service.spec.ts
@@ -45,8 +45,12 @@ describe('UserService', () => {
envFilePath: `.dev.env`,
}),
rootMongooseTestModule(),
- MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
- MongooseModule.forFeature([{ name: Role.name, schema: RoleSchema }]),
+ MongooseModule.forFeature([
+ { name: User.name, schema: UserSchema },
+ ]),
+ MongooseModule.forFeature([
+ { name: Role.name, schema: RoleSchema },
+ ]),
/* Serving the static files. */
ServeStaticModule.forRoot({
rootPath: path.resolve(__dirname, 'static'),
@@ -112,16 +116,19 @@ describe('UserService', () => {
});
it('should create user and update birthday date', async () => {
+ const users = await userService.getAllUsers();
+
+ console.log(users);
const user = await createUser();
expect(user.email).toBe('test@example.com');
const updateBirthdayData = {
email: 'test@example.com',
- birthDate: new Date(2002, 0),
+ dateOfBirth: new Date(2002, 0),
};
// @ts-ignore
const updateUser = await userService.updateUser(updateBirthdayData);
- expect(updateUser.birthDate).toEqual(updateBirthdayData.birthDate);
+ expect(updateUser.dateOfBirth).toEqual(updateBirthdayData.dateOfBirth);
});
it('should create user and then update university fields', async () => {
@@ -180,7 +187,9 @@ describe('UserService', () => {
// compare all fields
expect(updateUser.jobData[0].title).toBe(updateJobData.jobData.title);
- expect(updateUser.jobData[0].company).toBe(updateJobData.jobData.company);
+ expect(updateUser.jobData[0].company).toBe(
+ updateJobData.jobData.company,
+ );
expect(updateUser.jobData[0].startDate).toEqual(
updateJobData.jobData.startDate,
diff --git a/server/src/users/users.controller.ts b/server/src/users/users.controller.ts
index 07388b329..01121615a 100644
--- a/server/src/users/users.controller.ts
+++ b/server/src/users/users.controller.ts
@@ -29,7 +29,8 @@ export class UsersController {
constructor(private userService: UsersService) {}
@ApiOperation({
- summary: 'Get specific user by email, returns null in case nothing found',
+ summary:
+ 'Get specific user by email, returns null in case nothing found',
})
@ApiResponse({ status: 200, type: User })
@Get('/get-by-email/:email')
@@ -47,6 +48,15 @@ export class UsersController {
return this.userService.getUserByUsername(username);
}
+ @ApiOperation({
+ summary: 'Get partial best match usernames',
+ })
+ @ApiResponse({ status: 200, type: [User] })
+ @Get('/partial/:username')
+ getPartialUsernames(@Param('username') username: string): Promise {
+ return this.userService.getPartialUsernames(username);
+ }
+
@ApiOperation({
summary: 'Get specific user by id, returns null in case nothing found',
})
@@ -115,7 +125,11 @@ export class UsersController {
/* Parsing the query string into an object. */
const parsedQuery = qs.parse(filtersQuery);
- return this.userService.getFilteredUsersByPage(page, limit, parsedQuery);
+ return this.userService.getFilteredUsersByPage(
+ page,
+ limit,
+ parsedQuery,
+ );
}
@UsePipes(ValidationPipe)
diff --git a/server/src/users/users.schema.ts b/server/src/users/users.schema.ts
index 0e3ab897c..e6e373717 100644
--- a/server/src/users/users.schema.ts
+++ b/server/src/users/users.schema.ts
@@ -29,13 +29,6 @@ export class User {
@Prop()
fullName: string;
- @ApiProperty({
- example: '2016-05-18T14:10:30Z',
- description: 'Date of Birth',
- })
- @Prop()
- birthDate: Date;
-
@ApiProperty({
example: 'true',
description: 'Did user click on confirmation email?',
@@ -68,9 +61,9 @@ export class User {
@Prop()
country: string;
- @ApiProperty({ example: '17', description: 'Age of user' })
+ @ApiProperty({ example: new Date(), description: 'Date of birth' })
@Prop()
- age: string;
+ dateOfBirth: Date;
/* UNIVERSITY DATA */
@ApiProperty({
diff --git a/server/src/users/users.service.ts b/server/src/users/users.service.ts
index 10e128cb9..d78b33d5e 100644
--- a/server/src/users/users.service.ts
+++ b/server/src/users/users.service.ts
@@ -94,7 +94,10 @@ export class UsersService {
* @param {ClientSession} [session] - This is the session that will be used to run the query.
* @returns A user object
*/
- async getUserByEmail(email: string, session?: ClientSession): Promise {
+ async getUserByEmail(
+ email: string,
+ session?: ClientSession,
+ ): Promise {
/* Checking if the session is undefined. If it is, it is returning the user. If it is not, it is
returning the user with the session. */
const user =
@@ -138,6 +141,14 @@ export class UsersService {
return user;
}
+ async getPartialUsernames(username: string): Promise {
+ const regex = new RegExp(username, 'i');
+
+ return await this.userModel
+ .find({ username: regex, team: null })
+ .limit(5);
+ }
+
async getUserById(
id: mongoose.Types.ObjectId,
session?: ClientSession,
@@ -180,7 +191,10 @@ export class UsersService {
* @param {string} email - The email of the user whose password we want to update.
* @returns The updated user.
*/
- async updateUserPassword(hashPassword: string, email: string): Promise {
+ async updateUserPassword(
+ hashPassword: string,
+ email: string,
+ ): Promise {
return await this.userModel.findOneAndUpdate(
{ email },
{ password: hashPassword },
@@ -276,7 +290,8 @@ export class UsersService {
async updateUser(dto: UpdateUserDto): Promise {
/* Validating the DTO to prevent additional fields */
const filtered = await userUpdateValidate(dto);
- const candidate = await this.getUserByEmail(dto.email);
+
+ let candidate = await this.getUserByEmail(dto.email);
if (!candidate) {
throw new HttpException(
@@ -285,6 +300,17 @@ export class UsersService {
);
}
+ if (dto?.username) {
+ candidate = await this.getUserByUsername(dto.username);
+
+ if (candidate) {
+ throw new HttpException(
+ `Username ${dto.username} is already taken`,
+ HttpStatus.BAD_REQUEST,
+ );
+ }
+ }
+
/* Updating the user with the given email with the new data and returning the updated user. */
const user = await this.userModel.findOneAndUpdate(
{ email: dto.email },
@@ -407,6 +433,9 @@ export class UsersService {
* @param userID - The ID of the user you want to add to a team.
*/
async removeTeam(userID: mongoose.Types.ObjectId): Promise {
- await this.userModel.updateOne({ _id: userID }, { $unset: { team: null } });
+ await this.userModel.updateOne(
+ { _id: userID },
+ { $unset: { team: null } },
+ );
}
}
diff --git a/server/src/validation/constants/allowed-update-user-fields.ts b/server/src/validation/constants/allowed-update-user-fields.ts
index 4c192bfa1..68a2716c0 100644
--- a/server/src/validation/constants/allowed-update-user-fields.ts
+++ b/server/src/validation/constants/allowed-update-user-fields.ts
@@ -2,7 +2,7 @@ export const allowedUpdateUserFields: string[] = [
'email',
'username',
'fullName',
- 'age',
+ 'dateOfBirth',
'description',
'concentration',
'country',
@@ -13,5 +13,4 @@ export const allowedUpdateUserFields: string[] = [
'frameworks',
'universityData',
'jobData',
- 'birthDate',
];
diff --git a/server/src/validation/validation.ts b/server/src/validation/validation.ts
index 4b7f626ff..d139012b4 100644
--- a/server/src/validation/validation.ts
+++ b/server/src/validation/validation.ts
@@ -10,12 +10,14 @@ export class ManualValidatorHook {
/* Checking if there are any errors in the children of the error object. If there are, it will return
the error message. Used for nested objects validation inside the orginial object*/
return err.children.length === 0
- ? `${err.property} - ${Object.values(err.constraints).join(', ')}`
+ ? `${err.property} - ${Object.values(
+ err.constraints,
+ ).join(', ')}`
: err.children.map(
err =>
- `${err.property} - ${Object.values(err.constraints).join(
- ', ',
- )}`,
+ `${err.property} - ${Object.values(
+ err.constraints,
+ ).join(', ')}`,
);
});
return messages;