Merge remote-tracking branch 'origin/develop' into feature/create-sid…

…ebar

client/src/app/layout.tsx

@@ -21,7 +21,12 @@ export default function RootLayout({ children }: { children: ReactNode }) {
           <Toaster
             theme='dark'
             toastOptions={{
-              style: { ...inter.style, background: '#2F3239', color: '#fff', border: 'none' },
+              style: {
+                ...inter.style,
+                background: 'var(--grey-dark-color)',
+                color: 'var(--white-color)',
+                border: 'none',
+              },
             }}
           />
           {children}

client/src/entities/session/api/index.ts

@@ -9,3 +9,4 @@ export { useLogout } from './useLogout';
 export { useRegister } from './useRegister';
 export { useResetPassword } from './useResetPassword';
 export { useUpdateMe } from './useUpdateMe';
+export { useGetUsers } from './useGetUsers';

client/src/entities/session/api/useGetUsers.tsx

@@ -0,0 +1,31 @@
+'use client';
+import { useQuery } from '@tanstack/react-query';
+import { IUserProtectedResponse } from '@teameights/types';
+import { API } from '@/shared/api';
+import { API_USERS } from '@/shared/constant';
+
+interface IQueryParams {
+  page?: number;
+  limit?: number;
+  filters?: string | null;
+  sort?: string;
+}
+
+export const useGetUsers = ({ page, limit, filters, sort }: IQueryParams) => {
+  const queryString = [
+    page && `page=${page}`,
+    limit && `limit=${limit}`,
+    filters && `filters=${filters}`,
+    sort && `sort=${sort}`,
+  ].join('');
+
+  return useQuery({
+    queryKey: ['useGetUsers', queryString],
+    queryFn: async () => {
+      const { data } = await API.get<IUserProtectedResponse>(`${API_USERS}?${queryString}`);
+      return data;
+    },
+    refetchOnMount: false,
+    refetchOnWindowFocus: false,
+  });
+};

client/src/shared/constant/server-routes.ts

@@ -9,3 +9,4 @@ export const API_REFRESH = '/auth/refresh';
 export const API_LOGOUT = '/auth/logout';
 export const API_GOOGLE_LOGIN = '/auth/google/login';
 export const API_GITHUB_LOGIN = '/auth/github/login';
+export const API_USERS = '/users';

client/src/shared/ui/badge/badge-text/badge-text.tsx

@@ -41,7 +41,7 @@ export const BadgeText: FC<BadgeFrameworkProps> = props => {
     <div
       className={clsx([className], styles.badge_text)}
       style={{
-        backgroundColor: `${badgeColors[data] ? badgeColors[data] : '#2F3239'}`,
+        backgroundColor: `${badgeColors[data] ? badgeColors[data] : 'var(--grey-dark-color)'}`,
         color: badgeTextColors[data],
         maxWidth: `${maxWidth ? maxWidth : '100%'}`,
       }}

client/src/shared/ui/drawer/drawer.tsx

@@ -10,6 +10,8 @@
  * @prop {boolean} open - Determines whether the drawer is visible (open) or not.
  * @prop {function} onClose - Callback function that gets triggered when the drawer is requested to be closed.
  * @prop {boolean} [isFullHeight=false] - Specifies whether the drawer should cover full height of the viewport. Default is `false`.
+ * @prop {string} [className] - Class for drawer content
+ * @prop {string} [overlayClassName] - Class for drawer overlay
  * @prop {ReactNode} [children] - Content to be displayed inside the drawer.
  *
  * Usage:
@@ -41,9 +43,19 @@ interface DrawerProps {
   onClose: () => void;
   isFullHeight?: boolean;
   direction?: 'left' | 'right' | 'top' | 'bottom';
+  className?: string;
+  overlayClassName?: string;
 }
 export const Drawer: FC<PropsWithChildren<DrawerProps>> = props => {
-  const { open, onClose, isFullHeight, direction = 'bottom', children } = props;
+  const {
+    open,
+    onClose,
+    isFullHeight,
+    direction = 'bottom',
+    className,
+    overlayClassName,
+    children,
+  } = props;
 
   const style = {
     borderRadius: isFullHeight ? '0' : '15px 15px 0 0',
@@ -54,10 +66,13 @@ export const Drawer: FC<PropsWithChildren<DrawerProps>> = props => {
 
   return (
     <DrawerComponent
+      zIndex={99}
       open={open}
       onClose={onClose}
       direction={direction}
       style={style}
+      className={className}
+      overlayClassName={overlayClassName}
       customIdSuffix='t8s-drawer'
       lockBackgroundScroll
     >

client/src/shared/ui/index.ts

@@ -12,6 +12,7 @@ export * from './flex';
 export * from './icon-wrapper';
 export * from './drawer';
 export * from './image-loader';
+export * from './search-bar';
 export * from './progress-bar';
 export * from './logo';
 export * from './need-help';

client/src/shared/ui/search-bar/contexts/index.ts

@@ -0,0 +1 @@
+export { SearchContext } from './search-context';

client/src/shared/ui/search-bar/contexts/search-context.ts

@@ -0,0 +1,4 @@
+import { createContext } from 'react';
+import { SearchContextType } from '../types';
+
+export const SearchContext = createContext<SearchContextType | null>(null);

client/src/shared/ui/search-bar/hooks/index.ts

@@ -0,0 +1,2 @@
+export { useTrackFilterArr } from './useTrackFiltersArr';
+export { useFilters } from './useFilters';

client/src/shared/ui/search-bar/hooks/useFilters.ts

@@ -0,0 +1,12 @@
+import { useContext } from 'react';
+import { SearchContext } from '../contexts';
+
+export const useFilters = () => {
+  const context = useContext(SearchContext);
+
+  if (!context) {
+    throw new Error();
+  }
+
+  return context;
+};

client/src/shared/ui/search-bar/hooks/useTrackFiltersArr.ts

@@ -0,0 +1,46 @@
+import { useEffect, useRef } from 'react';
+import { Filter, IFilterParams } from '../types';
+
+export const useTrackFilterArr = (
+  filterArr: Filter[],
+  onChange: (filterValues: string | null) => void
+) => {
+  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  useEffect(() => {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+    }
+
+    timerRef.current = setTimeout(() => {
+      const filterValues: IFilterParams = filterArr.reduce<{
+        [key: string]: string | string[] | [number, number];
+      }>((acc, curr) => {
+        switch (curr.type) {
+          case 'text':
+            if (curr.filterValue.length) {
+              acc[curr.value] = curr.filterValue;
+            }
+
+            return acc;
+
+          case 'multiple':
+          case 'checkbox':
+            if (curr.filterValue.length) {
+              acc[curr.value] = curr.filterValue.map<string>(item => item.value);
+            }
+
+            return acc;
+
+          case 'range':
+            if (curr.filterValue?.length) {
+              acc[curr.value] = curr.filterValue;
+            }
+
+            return acc;
+        }
+      }, {});
+
+      onChange(Object.keys(filterValues).length ? JSON.stringify(filterValues) : null);
+    }, 1300);
+  }, [filterArr, onChange]);
+};

client/src/widgets/search/ui/search-bar/search-bar.module.scss → client/src/shared/ui/search-bar/search-bar.module.scss

@@ -1,11 +1,11 @@
 .searchbar {
   width: 100%;
   max-width: 1176px;
-  min-height: 40px;
   padding-left: 24px;
   padding-right: 24px;
 
   &_content {
+    min-height: 40px;
     border: 1px solid var(--green-normal-color);
     border-radius: 10px;
     overflow: hidden;

client/src/widgets/search/ui/search-bar/search-bar.stories.tsx → client/src/shared/ui/search-bar/search-bar.stories.tsx

@@ -60,7 +60,7 @@ export const SearchBar_default = () => {
           filterValue: [],
         },
       ]}
-      callback={queryString => console.log(queryString)}
+      onChange={filterValues => console.log(filterValues)}
     />
   );
 };

client/src/shared/ui/search-bar/search-bar.tsx

@@ -0,0 +1,83 @@
+'use client';
+
+import { FC, useState } from 'react';
+import styles from './search-bar.module.scss';
+import { Filter } from './types';
+import { FilterSelect } from './ui/filter-select';
+import { SearchInput } from './ui/search-input';
+import { TagList } from './ui/tag-list';
+import { Flex } from '@/shared/ui';
+import { useTrackFilterArr } from './hooks';
+import { SearchContext } from './contexts';
+import { ModalButton } from './ui/modal-button';
+import { Modal } from './ui/modal';
+
+/**
+ * Search-bar Component
+ *
+ * Used to search by query parameters.
+ *
+ * Props:
+ *
+ * @prop {Filter[]} [initialFiltersState] - Initial state as an array with filters.
+ * @prop {(filterValues: string | null) => void} [onChange] - A callback that takes a string of query parameters as an argument. Must be used for requests to the server.
+ *
+ * Usage:
+ *
+ * ```tsx
+ * import { SearchBar } from '@/widgets/search';
+ *
+ * <SearchBar initialFiltersState={[{
+ *  type: 'text',
+ *  label: 'Name',
+ *  value: 'name',
+ *  placeholder: 'Search by name',
+ *  filterValue: '',
+ *  }]}
+ *  onChange={string => console.log(string)}
+ * />
+ * ```
+ */
+
+interface SearchBarProps {
+  initialFiltersState: Filter[];
+  onChange: (filterValues: string | null) => void;
+}
+
+export const SearchBar: FC<SearchBarProps> = ({ initialFiltersState, onChange }) => {
+  const [filterArr, setFilterArr] = useState(initialFiltersState);
+  const [filterIndex, setFilterIndex] = useState(0);
+  const [isModalOpened, setIsModalOpened] = useState(false);
+  useTrackFilterArr(filterArr, onChange);
+
+  const onOpen = () => {
+    setIsModalOpened(true);
+  };
+
+  const onClose = () => {
+    setIsModalOpened(false);
+  };
+
+  return (
+    <SearchContext.Provider
+      value={{
+        filterArr,
+        setFilterArr,
+        filterIndex,
+        setFilterIndex,
+      }}
+    >
+      <ModalButton onOpen={onOpen} onClose={onClose} />
+
+      <Flex direction='column' gap='24px' className={styles.searchbar}>
+        <Flex className={styles.searchbar_content}>
+          <FilterSelect />
+          <SearchInput />
+        </Flex>
+        <TagList />
+      </Flex>
+
+      <Modal isOpened={isModalOpened} onClose={onClose} />
+    </SearchContext.Provider>
+  );
+};

client/src/widgets/search/types/types.ts → client/src/shared/ui/search-bar/types/types.ts

@@ -1,3 +1,4 @@
+import { Dispatch, SetStateAction } from 'react';
 import { MultiValue } from 'react-select';
 
 interface IFilter {
@@ -36,3 +37,14 @@ export interface IRangeFilter extends IFilter {
 }
 
 export type Filter = ITextFilter | ICheckboxFilter | IMultipleFilter | IRangeFilter;
+
+export interface IFilterParams {
+  [key: string]: string | [number, number] | string[];
+}
+
+export interface SearchContextType {
+  filterArr: Filter[];
+  setFilterArr: Dispatch<SetStateAction<Filter[]>>;
+  filterIndex: number;
+  setFilterIndex: Dispatch<SetStateAction<number>>;
+}

client/src/shared/ui/search-bar/ui/filter-menu/filter-menu.module.scss

@@ -0,0 +1,13 @@
+.searchinput_wrapper {
+  width: 100%;
+  min-height: 40px;
+  border: 1px solid var(--green-normal-color);
+  border-radius: 10px;
+  overflow: hidden;
+}
+
+.menu_wrapper {
+  height: 100%;
+  margin-bottom: 10px;
+  overflow: hidden;
+}

client/src/shared/ui/search-bar/ui/filter-menu/filter-menu.tsx

@@ -0,0 +1,19 @@
+import { Flex } from '@/shared/ui';
+import { SearchInput } from '../search-input';
+import { TagList } from '../tag-list';
+import styles from './filter-menu.module.scss';
+import { useState } from 'react';
+
+export const FilterMenu = () => {
+  const [menuWrapper, setMenuWrapper] = useState<HTMLDivElement | null>(null);
+
+  return (
+    <Flex direction='column' gap='16px' height='100%'>
+      <Flex className={styles.searchinput_wrapper}>
+        <SearchInput menuWrapper={menuWrapper} />
+      </Flex>
+      <TagList isOnlyCurrentFilterTags />
+      <div className={styles.menu_wrapper} ref={setMenuWrapper}></div>
+    </Flex>
+  );
+};

client/src/shared/ui/search-bar/ui/filter-menu/index.ts

@@ -0,0 +1 @@
+export { FilterMenu } from './filter-menu';