Skip to content

Commit 4eccccc

Browse files
committed
Merge branch 'deploy'
2 parents dcc5321 + 3c97e7d commit 4eccccc

File tree

8 files changed

+50
-6875
lines changed

8 files changed

+50
-6875
lines changed

package-lock.json

-6,829
This file was deleted.

package.json

+42-40
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
1-
{
2-
"name": "vite-react-template",
3-
"private": true,
4-
"version": "0.0.0",
5-
"type": "module",
6-
"scripts": {
7-
"dev": "vite",
8-
"build": "vite build --base=/project-6_Front_End",
9-
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
10-
"preview": "vite preview"
11-
},
12-
"dependencies": {
13-
"@reduxjs/toolkit": "^2.2.5",
14-
"axios": "^1.7.2",
15-
"clsx": "^2.1.1",
16-
"formik": "^2.4.6",
17-
"modern-normalize": "^2.0.0",
18-
"react": "^18.2.0",
19-
"react-dom": "^18.2.0",
20-
"react-hot-toast": "^2.4.1",
21-
"react-icons": "^5.0.1",
22-
"react-modal": "^3.16.1",
23-
"react-redux": "^9.1.2",
24-
"react-router-dom": "^6.23.1",
25-
"redux-persist": "^6.0.0",
26-
"toast": "^0.5.4",
27-
"uuid": "^9.0.1",
28-
"yup": "^1.4.0"
29-
},
30-
"devDependencies": {
31-
"@types/react": "^18.2.55",
32-
"@types/react-dom": "^18.2.19",
33-
"@vitejs/plugin-react": "^4.2.1",
34-
"eslint": "^8.56.0",
35-
"eslint-plugin-react": "^7.33.2",
36-
"eslint-plugin-react-hooks": "^4.6.0",
37-
"eslint-plugin-react-refresh": "^0.4.5",
38-
"vite": "^5.1.0"
39-
}
40-
}
1+
2+
{
3+
"name": "vite-react-template",
4+
"private": true,
5+
"version": "0.0.0",
6+
"type": "module",
7+
"scripts": {
8+
"dev": "vite",
9+
"build": "vite build --base=/",
10+
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
11+
"preview": "vite preview"
12+
},
13+
"dependencies": {
14+
"@reduxjs/toolkit": "^2.2.5",
15+
"axios": "^1.7.2",
16+
"clsx": "^2.1.1",
17+
"formik": "^2.4.6",
18+
"modern-normalize": "^2.0.0",
19+
"react": "^18.2.0",
20+
"react-dom": "^18.2.0",
21+
"react-hot-toast": "^2.4.1",
22+
"react-icons": "^5.0.1",
23+
"react-modal": "^3.16.1",
24+
"react-redux": "^9.1.2",
25+
"react-router-dom": "^6.23.1",
26+
"redux-persist": "^6.0.0",
27+
"toast": "^0.5.4",
28+
"uuid": "^9.0.1",
29+
"yup": "^1.4.0"
30+
},
31+
"devDependencies": {
32+
"@types/react": "^18.2.55",
33+
"@types/react-dom": "^18.2.19",
34+
"@vitejs/plugin-react": "^4.2.1",
35+
"eslint": "^8.56.0",
36+
"eslint-plugin-react": "^7.33.2",
37+
"eslint-plugin-react-hooks": "^4.6.0",
38+
"eslint-plugin-react-refresh": "^0.4.5",
39+
"vite": "^5.1.0"
40+
}
41+
}
42+

src/components/App/App.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,5 @@ export const App = () => {
6868
)}
6969
</>
7070
);
71+
7172
};

src/components/CreateCardModal/CreateCardModal.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Modal from "react-modal";
2-
import css from "./CreateCard.module.css";
2+
import css from "./CreateCardModal.module.css";
33
import * as Yup from 'yup';
44
import { Form, Formik, Field } from "formik";
55
import svg from "../../img/icons.svg";

src/components/EditColumnModal/EditColumnModal.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Modal from "react-modal";
2-
import css from "EditColumn.module.css";
2+
import css from "./EditColumnModal.module.css";
33
import * as Yup from 'yup';
44
import { Form, Formik, Field } from "formik";
55
import svg from "../../img/icons.svg";

src/components/TaskCard/TaskCard.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import css from "./TaskCard.module.css"
22
import svg from "../../img/icons.svg";
3-
import { useSelector } from "react-redux";
43
import { EditCard } from "../EditCardModal/EditCardModal";
4+
import { useState } from "react";
55

66
export const Card = () => {
7-
const [isOpen, setIsOpen] = useSelector(false);
7+
const [isOpen, setIsOpen] = useState(false);
88

99
const openModal = () => {
1010
setIsOpen(true)

src/components/TaskColumnName/TaskColumnName.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import css from "./TaskColumnName.module.css";
22
import svg from "../../img/icons.svg";
3-
import { useSelector} from "react"
3+
import { useState} from "react"
44
import { EditColumn } from "../EditColumnModal/EditColumnModal";
55

66
export const TaskColumnName = () => {
7-
const [isOpen, setIsOpen] = useSelector(false);
7+
const [isOpen, setIsOpen] = useState(false);
88

99
const openModal = () => {
1010
setIsOpen(true)

src/index.css

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
--blue: #8fa1d0;
1212
--red: #e09cb5;
1313
--violet: #5255bc;
14+
--color: #121212;
1415

1516
/* others */
1617
--indent: 20px;

0 commit comments

Comments
 (0)