work site
This commit is contained in:
		
							
								
								
									
										3
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -16,11 +16,8 @@ | |||||||
|         "@mui/styled-engine-sc": "^6.0.0-alpha.9", |         "@mui/styled-engine-sc": "^6.0.0-alpha.9", | ||||||
|         "@mui/x-date-pickers": "^6.18.6", |         "@mui/x-date-pickers": "^6.18.6", | ||||||
|         "axios": "^1.6.2", |         "axios": "^1.6.2", | ||||||
| <<<<<<< Updated upstream |  | ||||||
|         "dayjs": "^1.11.10", |         "dayjs": "^1.11.10", | ||||||
| ======= |  | ||||||
|         "js-cookie": "^3.0.5", |         "js-cookie": "^3.0.5", | ||||||
| >>>>>>> Stashed changes |  | ||||||
|         "react": "^18.2.0", |         "react": "^18.2.0", | ||||||
|         "react-dom": "^18.2.0", |         "react-dom": "^18.2.0", | ||||||
|         "react-router-dom": "^6.21.1", |         "react-router-dom": "^6.21.1", | ||||||
|   | |||||||
| @@ -18,11 +18,9 @@ | |||||||
|     "@mui/styled-engine-sc": "^6.0.0-alpha.9", |     "@mui/styled-engine-sc": "^6.0.0-alpha.9", | ||||||
|     "@mui/x-date-pickers": "^6.18.6", |     "@mui/x-date-pickers": "^6.18.6", | ||||||
|     "axios": "^1.6.2", |     "axios": "^1.6.2", | ||||||
| <<<<<<< Updated upstream |  | ||||||
|     "dayjs": "^1.11.10", |     "dayjs": "^1.11.10", | ||||||
| ======= |  | ||||||
|     "js-cookie": "^3.0.5", |     "js-cookie": "^3.0.5", | ||||||
| >>>>>>> Stashed changes |  | ||||||
|     "react": "^18.2.0", |     "react": "^18.2.0", | ||||||
|     "react-dom": "^18.2.0", |     "react-dom": "^18.2.0", | ||||||
|     "react-router-dom": "^6.21.1", |     "react-router-dom": "^6.21.1", | ||||||
|   | |||||||
| @@ -1,10 +1,10 @@ | |||||||
| import Header from "../Header"; | import Header from "../Header"; | ||||||
| import styles from "./style.module.scss"; | import styles from "./style.module.scss"; | ||||||
| import TableMeets from '../TableMeets/TableMeets' | import TableMeets from '../TableMeets/TableMeets' | ||||||
| import Home from "../Home/Home"; | // import Home from "../Home/Home"; | ||||||
| // import FetchUtils from "../utils/FetchUtils"; | // import FetchUtils from "../utils/FetchUtils"; | ||||||
| import EditForm from "../edit/EditForm"; | // import EditForm from "../edit/EditForm"; | ||||||
| import PostForm from "../post/PostForm"; | // import PostForm from "../post/PostForm"; | ||||||
|  |  | ||||||
| const APIURL = '' | const APIURL = '' | ||||||
|  |  | ||||||
| @@ -63,7 +63,7 @@ const HomePage = () => { | |||||||
|             <div className={styles.cards__container}> |             <div className={styles.cards__container}> | ||||||
|                 <div className={styles.card}></div> |                 <div className={styles.card}></div> | ||||||
|             </div> |             </div> | ||||||
|             <Home></Home> |             {/* <Home></Home> */} | ||||||
|             {/* <FetchUtils></FetchUtils> */} |             {/* <FetchUtils></FetchUtils> */} | ||||||
|             {/* <PostForm /> */} |             {/* <PostForm /> */} | ||||||
|             {/* <EditForm /> */} |             {/* <EditForm /> */} | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ import styles from "./style.module.scss" | |||||||
| import Calendar from "../Calendar"; | import Calendar from "../Calendar"; | ||||||
| import avatar from '../../img/profilePage/avatar.png'; | import avatar from '../../img/profilePage/avatar.png'; | ||||||
| import gift from '../../img/profilePage/gift.png'; | import gift from '../../img/profilePage/gift.png'; | ||||||
| import Home from '../Home/Home'; | // import Home from '../Home/Home'; | ||||||
| const ProfilePage = () => { | const ProfilePage = () => { | ||||||
|  |  | ||||||
|     return ( |     return ( | ||||||
| @@ -57,7 +57,7 @@ const ProfilePage = () => { | |||||||
|                     <div className={styles.cards__container}> |                     <div className={styles.cards__container}> | ||||||
|                         <div className={styles.card}></div> |                         <div className={styles.card}></div> | ||||||
|                     </div> |                     </div> | ||||||
|                     <Home></Home> |                     {/* <Home></Home> */} | ||||||
|                     {/* <FetchUtils></FetchUtils> */} |                     {/* <FetchUtils></FetchUtils> */} | ||||||
|                     {/* <PostForm /> */} |                     {/* <PostForm /> */} | ||||||
|                     {/* <EditForm /> */} |                     {/* <EditForm /> */} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user