#10. Добавление localStorage сервиса, добавлены верхнее и нижнее меню приложения (#11)

src/core/hooks/useParams.ts

@@ -0,0 +1,25 @@
+import {useMemo} from 'react';
+import {useLocation, useParams as useReactParams} from 'react-router-dom';
+import {PageType} from '../enums/common';
+import {getPageType} from '../utils/common';
+
+type ParamsParser<T> = (value?: string) => T;
+export type ParamsParsers<T> = Partial<{[K in keyof T]: ParamsParser<T[K]>}>;
+
+export function useParams<T extends {[name: string]: unknown}>(paramParsers: ParamsParsers<T> = {}) {
+    const params = useReactParams<Record<keyof T, string>>();
+    const {pathname} = useLocation();
+
+    return useMemo(() => {
+        return Object.keys(paramParsers).reduce<T & {pageType: PageType}>((memo, key) => {
+            const parser = paramParsers[key];
+
+            return {
+                ...memo,
+                [key]: parser?.(params[key]),
+            };
+        }, {
+            pageType: getPageType(pathname),
+        } as T & {pageType: PageType});
+    }, [params, paramParsers, pathname]);
+}

src/core/hooks/useQuery.ts

@@ -49,16 +49,14 @@ export function booleanParser(defaultValue?: boolean) {
 
 // Array parser (должен уметь с enum)
 
-export function useQuery(): ParsedUrlQuery;
-export function useQuery<T extends {[name: string]: unknown}>(queryParsers: QueryParsers<T>): Partial<T>;
 export function useQuery<T extends {[name: string]: unknown}>(
-    queryParsers?: QueryParsers<T>
+    queryParsers: QueryParsers<T>
 ): ParsedUrlQuery | Partial<T> {
     const {search} = useLocation();
 
     return useMemo(() => {
         const query = parse(search.slice(1));
-        return queryParsers ? Object.keys(query).reduce<Partial<T>>((memo, key) => {
+        return queryParsers ? Object.keys(queryParsers).reduce<T>((memo, key) => {
             if (key in queryParsers) {
                 const parser = queryParsers[key];
                 return {
@@ -67,6 +65,6 @@ export function useQuery<T extends {[name: string]: unknown}>(
                 };
             }
             return memo;
-        }, {}) : query;
+        }, {} as T) : query;
     }, [search, queryParsers]);
 }