Merge pull request #289 from /issues/288-macos2

Issues/288 macos2
MayGo · Nov 13, 2024 · 1658f62 · 1658f62
2 parents 599cd9e + 24a0530
commit 1658f62
Show file tree

Hide file tree

Showing 85 changed files with 8,551 additions and 9,293 deletions.
diff --git a/client/package.json b/client/package.json
@@ -3,7 +3,7 @@
     "version": "3.19.22",
     "private": true,
     "dependencies": {
-        "@chakra-ui/icons": "^2.0.11",
+        "@chakra-ui/icons": "^2.2.4",
         "@chakra-ui/react": "^2.3.7",
         "@datepicker-react/hooks": "^2.8.4",
         "@emotion/react": "^11.10.5",

diff --git a/client/src/components/AuthButton.tsx b/client/src/components/AuthButton.tsx
diff --git a/client/src/components/AuthCheck.tsx b/client/src/components/AuthCheck.tsx
diff --git a/client/src/components/Datepicker/MonthSelect.tsx b/client/src/components/Datepicker/MonthSelect.tsx
@@ -1,4 +1,4 @@
-import { Select } from '@chakra-ui/select';
+import { Select } from '@chakra-ui/react';
 
 import React from 'react';
 

diff --git a/client/src/components/Datepicker/YearSelect.tsx b/client/src/components/Datepicker/YearSelect.tsx
@@ -1,4 +1,4 @@
-import { Select } from '@chakra-ui/select';
+import { Select } from '@chakra-ui/react';
 import { range } from 'lodash';
 import React from 'react';
 
@@ -8,7 +8,7 @@ export const YearSelect = ({ value, onChange }) => {
 
     return (
         <Select placeholder="Select year" value={value} onChange={onChange}>
-            {years.map(year => (
+            {years.map((year) => (
                 <option key={year} value={year}>
                     {year}
                 </option>

diff --git a/client/src/components/Header/Header.tsx b/client/src/components/Header/Header.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { Flex, Box, Center, Link } from '@chakra-ui/layout';
-import { useColorModeValue } from '@chakra-ui/color-mode';
+import { Flex, Box, Center, Link } from '@chakra-ui/react';
+import { useColorModeValue } from '@chakra-ui/react';
 import { TocklerLogo } from './TocklerLogo';
 import { TocklerLogoText } from './TocklerLogoText';
 

diff --git a/client/src/components/Header/MenuItem.tsx b/client/src/components/Header/MenuItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
-import { Box, Center } from '@chakra-ui/layout';
-import { Button } from '@chakra-ui/button';
+import { Box, Center } from '@chakra-ui/react';
+import { Button } from '@chakra-ui/react';
 
 export const MenuItem = ({ to, icon, title }) => (
     <Box>

diff --git a/client/src/components/MainLayout/HeaderMenu.tsx b/client/src/components/MainLayout/HeaderMenu.tsx
@@ -6,7 +6,7 @@ import {
     AiOutlineQuestionCircle,
 } from 'react-icons/ai';
 import React from 'react';
-import { Box } from '@chakra-ui/layout';
+import { Box } from '@chakra-ui/react';
 import { ColorModeSwitcher } from '../ColorModeSwitcher';
 import { Header } from '../Header/Header';
 import { MenuItem } from '../Header/MenuItem';

diff --git a/client/src/components/MainLayout/MainLayout.tsx b/client/src/components/MainLayout/MainLayout.tsx
@@ -1,4 +1,4 @@
-import { Box } from '@chakra-ui/layout';
+import { Box } from '@chakra-ui/react';
 
 import React from 'react';
 import { Outlet } from 'react-router-dom';