From 9b51ca5021e7b99e7cd8d4e2749ddf6f164d8850 Mon Sep 17 00:00:00 2001
From: KwonYeKyeong <kwonliz6.6@gmail.com>
Date: Tue, 28 Jul 2020 09:56:45 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=82=A0=EC=A7=9C=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                          |  5 +++++
 .idea/misc.xml                            |  6 ++++++
 .idea/modules.xml                         |  8 ++++++++
 .idea/todo-frontend.iml                   | 12 ++++++++++++
 .idea/vcs.xml                             |  6 ++++++
 package-lock.json                         |  3 +++
 static/src/component/board/card/index.jsx |  2 +-
 static/src/component/board/task/index.jsx |  5 +++--
 8 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/todo-frontend.iml
 create mode 100644 .idea/vcs.xml
 create mode 100644 package-lock.json

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..b58b603
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..7f9b010
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/todo-frontend.iml" filepath="$PROJECT_DIR$/.idea/todo-frontend.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/todo-frontend.iml b/.idea/todo-frontend.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/todo-frontend.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..48e341a
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}
diff --git a/static/src/component/board/card/index.jsx b/static/src/component/board/card/index.jsx
index 17931f6..f532dbf 100644
--- a/static/src/component/board/card/index.jsx
+++ b/static/src/component/board/card/index.jsx
@@ -9,7 +9,7 @@ function Card(props) {
             <div className='title'>{subject}</div>
             {
                 tasks.map(task => {
-                    return <Task key={task.id} title={task.title} subject={subject} id={task.id} move={move}/>
+                    return <Task key={task.id} title={task.title} subject={subject} id={task.id} created={task.created} move={move}/>
                 })
             }
 
diff --git a/static/src/component/board/task/index.jsx b/static/src/component/board/task/index.jsx
index bc3abbf..135f7c5 100644
--- a/static/src/component/board/task/index.jsx
+++ b/static/src/component/board/task/index.jsx
@@ -5,7 +5,7 @@ import {isDone, isTodo, toToggledValue} from "../../../utility/status";
 import Button from "../../atom/Button";
 
 function Task(props) {
-    const {title, subject, id, move} = props;
+    const {title, subject, id, created, move} = props;
     const onClick = (event) => {
         event.stopPropagation();
         const toggledValue = toToggledValue(subject);
@@ -17,7 +17,8 @@ function Task(props) {
             {
                 isTodo(subject) && <Button className='task-left-btn' onClick={onClick} value='>'/>
             }
-            {title}
+            {title} <br/>
+            {created}
             {
                 isDone(subject) && <Button className='task-right-btn' onClick={onClick} value='<'/>
             }

From a8e3386e24957885d4c33a4edf823627a2b2b773 Mon Sep 17 00:00:00 2001
From: KwonYeKyeong <kwonliz6.6@gmail.com>
Date: Tue, 28 Jul 2020 16:11:42 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=EC=B9=B4=EB=93=9C=20=EC=82=AD=EC=A0=9C=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/component/board/card/index.jsx |  4 ++--
 static/src/component/board/task/index.jsx |  6 +++++-
 static/src/page/Board.jsx                 | 25 ++++++++++++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/static/src/component/board/card/index.jsx b/static/src/component/board/card/index.jsx
index f532dbf..820b265 100644
--- a/static/src/component/board/card/index.jsx
+++ b/static/src/component/board/card/index.jsx
@@ -3,13 +3,13 @@ import Task from "../task";
 import '../../../css/Card.css';
 
 function Card(props) {
-    const {subject, tasks, move} = props;
+    const {subject, tasks, move, remove} = props;
     return (
         <div className='card'>
             <div className='title'>{subject}</div>
             {
                 tasks.map(task => {
-                    return <Task key={task.id} title={task.title} subject={subject} id={task.id} created={task.created} move={move}/>
+                    return <Task key={task.id} title={task.title} subject={subject} id={task.id} created={task.created} move={move} remove={remove}/>
                 })
             }
 
diff --git a/static/src/component/board/task/index.jsx b/static/src/component/board/task/index.jsx
index 135f7c5..3a85287 100644
--- a/static/src/component/board/task/index.jsx
+++ b/static/src/component/board/task/index.jsx
@@ -5,12 +5,15 @@ import {isDone, isTodo, toToggledValue} from "../../../utility/status";
 import Button from "../../atom/Button";
 
 function Task(props) {
-    const {title, subject, id, created, move} = props;
+    const {title, subject, id, created, move, remove} = props;
     const onClick = (event) => {
         event.stopPropagation();
         const toggledValue = toToggledValue(subject);
         move(id, toggledValue);
     };
+    function handle(event) {
+        remove(id);
+    }
 
     return (
         <div className='task'>
@@ -22,6 +25,7 @@ function Task(props) {
             {
                 isDone(subject) && <Button className='task-right-btn' onClick={onClick} value='<'/>
             }
+            <Button className='task-remove-btn' onClick={handle} value='X'/>
         </div>
     );
 }
diff --git a/static/src/page/Board.jsx b/static/src/page/Board.jsx
index d6967d3..ed2b80d 100644
--- a/static/src/page/Board.jsx
+++ b/static/src/page/Board.jsx
@@ -31,13 +31,36 @@ function Board() {
             });
         }
     };
+    function remove(id) {
+        const todo = cards.todo;
+        const done = cards.done;
+
+        let index = todo.findIndex((value) => {
+            return value.id === id;
+        });
+
+        if(index!==-1){
+            todo.splice(index, 1);
+        }
+        else{
+            index = done.findIndex((value) => {
+                return value.id === id;
+            });
+            done.splice(index, 1);
+        }
+
+        updateCards({
+            "todo": cards.todo,
+            "done": cards.done
+        });
+    }
 
     return (
         <div className='board'>
             <div className='board-list'>
                 {
                     Object.entries(cards).map(([subject, tasks]) => {
-                        return <Card key={subject} subject={subject} tasks={tasks} move={move}/>;
+                        return <Card key={subject} subject={subject} tasks={tasks} move={move} remove={remove}/>;
                     })
                 }
             </div>

From c9fa10b41334cd586c44c3390cd325d96701e05a Mon Sep 17 00:00:00 2001
From: KwonYeKyeong <kwonliz6.6@gmail.com>
Date: Sat, 1 Aug 2020 18:17:29 +0900
Subject: [PATCH 3/6] =?UTF-8?q?BE=20=EC=84=9C=EB=B2=84=EC=97=90=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=9A=94=EC=B2=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/page/Board.jsx        | 12 ++++++++++--
 static/src/service/deleteCard.js | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 static/src/service/deleteCard.js

diff --git a/static/src/page/Board.jsx b/static/src/page/Board.jsx
index ed2b80d..aff0a35 100644
--- a/static/src/page/Board.jsx
+++ b/static/src/page/Board.jsx
@@ -5,6 +5,7 @@ import '../css/Board.css';
 import moveTo from "../service/moveTo";
 import {Link} from "react-router-dom";
 import {toName, toToggleName} from '../utility/status';
+import deleteCard from "../service/deleteCard";
 
 function Board() {
     const [cards, updateCards] = useState({});
@@ -38,15 +39,22 @@ function Board() {
         let index = todo.findIndex((value) => {
             return value.id === id;
         });
-
-        if(index!==-1){
+        if(index!==-1) {
             todo.splice(index, 1);
+            const isSuccesses = deleteCard(id);
+            if (!isSuccesses) {
+                alert('NotFound(todo)');
+            }
         }
         else{
             index = done.findIndex((value) => {
                 return value.id === id;
             });
             done.splice(index, 1);
+            const isSuccesses = deleteCard(id);
+            if (!isSuccesses) {
+                alert('NotFound(done)');
+            }
         }
 
         updateCards({
diff --git a/static/src/service/deleteCard.js b/static/src/service/deleteCard.js
new file mode 100644
index 0000000..7b66864
--- /dev/null
+++ b/static/src/service/deleteCard.js
@@ -0,0 +1,17 @@
+async function deleteCard(id) {
+    try {
+        const response = await fetch(`/todo/cards/${id}`, {
+            method: 'DELETE',
+            credentials: 'include',
+            mode: 'cors',
+            headers: {
+                'Content-Type': 'application/json; utf-8',
+            },
+        });
+        return response.status === 201;
+    } catch (e) {
+        return false;
+    }
+}
+
+export default deleteCard;

From 4668511192f98ccdbcf0a17386537acc7d5f0681 Mon Sep 17 00:00:00 2001
From: KwonYeKyeong <kwonliz6.6@gmail.com>
Date: Sun, 2 Aug 2020 16:36:52 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=EB=8B=B4=EB=8B=B9=EC=9E=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/component/board/card/index.jsx |  2 +-
 static/src/component/board/task/index.jsx |  4 ++--
 static/src/page/Enrollment.jsx            | 13 +++++++++++--
 static/src/service/createCard.js          |  4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/static/src/component/board/card/index.jsx b/static/src/component/board/card/index.jsx
index 820b265..e949a67 100644
--- a/static/src/component/board/card/index.jsx
+++ b/static/src/component/board/card/index.jsx
@@ -9,7 +9,7 @@ function Card(props) {
             <div className='title'>{subject}</div>
             {
                 tasks.map(task => {
-                    return <Task key={task.id} title={task.title} subject={subject} id={task.id} created={task.created} move={move} remove={remove}/>
+                    return <Task key={task.id} title={task.title} assignee={task.assignee} subject={subject} id={task.id} created={task.created} move={move} remove={remove}/>
                 })
             }
 
diff --git a/static/src/component/board/task/index.jsx b/static/src/component/board/task/index.jsx
index 3a85287..6978c1d 100644
--- a/static/src/component/board/task/index.jsx
+++ b/static/src/component/board/task/index.jsx
@@ -5,7 +5,7 @@ import {isDone, isTodo, toToggledValue} from "../../../utility/status";
 import Button from "../../atom/Button";
 
 function Task(props) {
-    const {title, subject, id, created, move, remove} = props;
+    const {title, subject, id, assignee, created, move, remove} = props;
     const onClick = (event) => {
         event.stopPropagation();
         const toggledValue = toToggledValue(subject);
@@ -21,7 +21,7 @@ function Task(props) {
                 isTodo(subject) && <Button className='task-left-btn' onClick={onClick} value='>'/>
             }
             {title} <br/>
-            {created}
+            {assignee} {created}
             {
                 isDone(subject) && <Button className='task-right-btn' onClick={onClick} value='<'/>
             }
diff --git a/static/src/page/Enrollment.jsx b/static/src/page/Enrollment.jsx
index e30a456..c29c2e5 100644
--- a/static/src/page/Enrollment.jsx
+++ b/static/src/page/Enrollment.jsx
@@ -6,19 +6,25 @@ import Input from "../component/atom/Input";
 
 function Enrollment({history}) {
     const [title, setTitle] = useState('');
+    const [assignee, setAssignee] = useState('');
 
     const onChange = (event) => {
         event.stopPropagation();
         setTitle(event.target.value);
     };
 
+    const handleAssigneeInput=(event)=>{
+        event.stopPropagation();
+        setAssignee(event.target.value);
+    }
+
     const onPreviousClick = (event) => {
         event.stopPropagation();
         history.goBack();
     };
 
     const add = async () => {
-        const isSuccesses = await createCard(title);
+        const isSuccesses = await createCard(title, assignee);
         if (isSuccesses) {
             history.goBack();
         } else {
@@ -41,13 +47,16 @@ function Enrollment({history}) {
     const onClearClick = (event) => {
         event.stopPropagation();
         setTitle('');
+        setAssignee('');
     };
 
     return (
         <div className='enrollment'>
             <div className='enrollment-title'>
                 <label htmlFor="title">Title</label>
-                <Input id='title' onChange={onChange} onKeyPress={onEnterPress} value={title}/>
+                <Input id='title' onChange={onChange} onKeyPress={onEnterPress} value={title}/> <br/>
+                <label htmlFor="assignee">담당자</label>
+                <Input id='assignee' onChange={handleAssigneeInput} onKeyPress={onEnterPress} value={assignee}/>
             </div>
             <div className='enrollment-btn-grp'>
                 <Button className='enrollment-btn' onClick={onPreviousClick} value='이전'/>
diff --git a/static/src/service/createCard.js b/static/src/service/createCard.js
index 0cef56a..ccf1b8e 100644
--- a/static/src/service/createCard.js
+++ b/static/src/service/createCard.js
@@ -1,4 +1,4 @@
-async function createCard(title) {
+async function createCard(title, assignee) {
   try {
     const response = await fetch('/todo/cards', {
       method: 'POST',
@@ -7,7 +7,7 @@ async function createCard(title) {
       headers: {
         'Content-Type': 'application/json; charset=utf-8',
       },
-      body: JSON.stringify({ title }),
+      body: JSON.stringify({ title, assignee }),
     });
 
     return response.status === 201;

From 3c9bb13d7be017e092f7e0e970daf701f36197b6 Mon Sep 17 00:00:00 2001
From: KwonYeKyeong <kwonliz6.6@gmail.com>
Date: Mon, 3 Aug 2020 15:40:57 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EC=9A=B0=EC=84=A0=EC=88=9C=EC=9C=84=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/component/board/card/index.jsx |  3 ++-
 static/src/component/board/task/index.jsx |  4 ++--
 static/src/page/Board.jsx                 | 15 +++++++++++++
 static/src/page/Enrollment.jsx            | 26 ++++++++++++++++++-----
 static/src/service/createCard.js          |  4 ++--
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/static/src/component/board/card/index.jsx b/static/src/component/board/card/index.jsx
index e949a67..308edaa 100644
--- a/static/src/component/board/card/index.jsx
+++ b/static/src/component/board/card/index.jsx
@@ -9,7 +9,8 @@ function Card(props) {
             <div className='title'>{subject}</div>
             {
                 tasks.map(task => {
-                    return <Task key={task.id} title={task.title} assignee={task.assignee} subject={subject} id={task.id} created={task.created} move={move} remove={remove}/>
+                    return <Task key={task.id} title={task.title} priority={task.priority} assignee={task.assignee}
+                                 subject={subject} id={task.id} created={task.created} move={move} remove={remove}/>
                 })
             }
 
diff --git a/static/src/component/board/task/index.jsx b/static/src/component/board/task/index.jsx
index 6978c1d..cf8a136 100644
--- a/static/src/component/board/task/index.jsx
+++ b/static/src/component/board/task/index.jsx
@@ -5,7 +5,7 @@ import {isDone, isTodo, toToggledValue} from "../../../utility/status";
 import Button from "../../atom/Button";
 
 function Task(props) {
-    const {title, subject, id, assignee, created, move, remove} = props;
+    const {title, subject, id, priority, assignee, created, move, remove} = props;
     const onClick = (event) => {
         event.stopPropagation();
         const toggledValue = toToggledValue(subject);
@@ -20,7 +20,7 @@ function Task(props) {
             {
                 isTodo(subject) && <Button className='task-left-btn' onClick={onClick} value='>'/>
             }
-            {title} <br/>
+            {title} {String(priority)+'순위'} <br/>
             {assignee} {created}
             {
                 isDone(subject) && <Button className='task-right-btn' onClick={onClick} value='<'/>
diff --git a/static/src/page/Board.jsx b/static/src/page/Board.jsx
index aff0a35..c490e3e 100644
--- a/static/src/page/Board.jsx
+++ b/static/src/page/Board.jsx
@@ -26,6 +26,21 @@ function Board() {
             const changedStatus = toName(result.status);
             cards[changedStatus].push(result);
 
+            // case 1:
+            // const changedCards = await getCards();
+            // updateCards({
+            //     todo: changedCards.todo,
+            //     done: changedCards.done
+            // });
+
+            // case 2:
+            cards.todo.sort(function (a, b) {
+                return a.priority-b.priority;
+            });
+            cards.done.sort(function (a, b) {
+                return a.priority-b.priority;
+            });
+
             updateCards({
                 todo: cards.todo,
                 done: cards.done
diff --git a/static/src/page/Enrollment.jsx b/static/src/page/Enrollment.jsx
index c29c2e5..45cfdbc 100644
--- a/static/src/page/Enrollment.jsx
+++ b/static/src/page/Enrollment.jsx
@@ -7,24 +7,30 @@ import Input from "../component/atom/Input";
 function Enrollment({history}) {
     const [title, setTitle] = useState('');
     const [assignee, setAssignee] = useState('');
+    const [priority, setPriority] = useState('2');
 
-    const onChange = (event) => {
+    const onChangeTitle = (event) => {
         event.stopPropagation();
         setTitle(event.target.value);
     };
 
-    const handleAssigneeInput=(event)=>{
+    const onChangeAssignee = (event) => {
         event.stopPropagation();
         setAssignee(event.target.value);
     }
 
+    const onChangePriority = (event) => {
+        event.stopPropagation();
+        setPriority(event.target.value);
+    }
+
     const onPreviousClick = (event) => {
         event.stopPropagation();
         history.goBack();
     };
 
     const add = async () => {
-        const isSuccesses = await createCard(title, assignee);
+        const isSuccesses = await createCard(title, assignee, priority);
         if (isSuccesses) {
             history.goBack();
         } else {
@@ -48,15 +54,25 @@ function Enrollment({history}) {
         event.stopPropagation();
         setTitle('');
         setAssignee('');
+        document.getElementById("priority").value = 2;
+        setPriority('2');
     };
 
     return (
         <div className='enrollment'>
             <div className='enrollment-title'>
                 <label htmlFor="title">Title</label>
-                <Input id='title' onChange={onChange} onKeyPress={onEnterPress} value={title}/> <br/>
+                <Input id='title' onChange={onChangeTitle} onKeyPress={onEnterPress} value={title}/> <br/>
                 <label htmlFor="assignee">담당자</label>
-                <Input id='assignee' onChange={handleAssigneeInput} onKeyPress={onEnterPress} value={assignee}/>
+                <Input id='assignee' onChange={onChangeAssignee} onKeyPress={onEnterPress} value={assignee}/> <br/>
+                <label>
+                    우선순위
+                    <select id='priority' onChange={onChangePriority}>
+                        <option value="1">1순위</option>
+                        <option selected value="2">2순위</option>
+                        <option value="3">3순위</option>
+                    </select>
+                </label>
             </div>
             <div className='enrollment-btn-grp'>
                 <Button className='enrollment-btn' onClick={onPreviousClick} value='이전'/>
diff --git a/static/src/service/createCard.js b/static/src/service/createCard.js
index ccf1b8e..dfa327f 100644
--- a/static/src/service/createCard.js
+++ b/static/src/service/createCard.js
@@ -1,4 +1,4 @@
-async function createCard(title, assignee) {
+async function createCard(title, assignee, priority) {
   try {
     const response = await fetch('/todo/cards', {
       method: 'POST',
@@ -7,7 +7,7 @@ async function createCard(title, assignee) {
       headers: {
         'Content-Type': 'application/json; charset=utf-8',
       },
-      body: JSON.stringify({ title, assignee }),
+      body: JSON.stringify({ title, assignee, priority }),
     });
 
     return response.status === 201;

From 4e58a771b0dec5cc2ad71733073fe6d7984c2974 Mon Sep 17 00:00:00 2001
From: "Seung Bin . Ko" <kosb15@naver.com>
Date: Sat, 8 Aug 2020 12:18:43 +0900
Subject: [PATCH 6/6] =?UTF-8?q?gitigore=20=EB=A3=A8=ED=8A=B8=20=EB=94=94?=
 =?UTF-8?q?=EB=A0=88=ED=86=A0=EB=A6=AC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 5bd973872171d7e98a97fa7e4137c5a35541a3a0)
---
 .gitignore        |  46 +++++++++++++++++
 static/.gitignore | 126 ----------------------------------------------
 2 files changed, 46 insertions(+), 126 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 static/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3171cc0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,46 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+# dependencies
+**/node_modules
+# testing
+**/coverage
+# production
+**/build
+# misc
+**/.DS_Store
+npm-debug.log*
+**/yarn-debug.log*
+**/yarn-error.log*
+# Created by https://www.toptal.com/developers/gitignore/api/webstorm
+# Edit at https://www.toptal.com/developers/gitignore?templates=webstorm
+### WebStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+.idea/**/*.xml
+.idea/**/*.iml
+# Generated files
+.idea/**/contentModel.xml
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+# Sonarlint plugin
+.idea/**/sonarlint/
+# SonarQube Plugin
+.idea/**/sonarIssues.xml
+# Markdown Navigator plugin
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator-enh.xml
+.idea/**/markdown-navigator/
+# Cache file creation bug
+# See https://youtrack.jetbrains.com/issue/JBR-2257
+.idea/$CACHE_FILE$
diff --git a/static/.gitignore b/static/.gitignore
deleted file mode 100644
index e4231c8..0000000
--- a/static/.gitignore
+++ /dev/null
@@ -1,126 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-
-# Created by https://www.toptal.com/developers/gitignore/api/webstorm
-# Edit at https://www.toptal.com/developers/gitignore?templates=webstorm
-
-### WebStorm ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-.idea/*.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### WebStorm Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-.idea/**/sonarlint/
-
-# SonarQube Plugin
-.idea/**/sonarIssues.xml
-
-# Markdown Navigator plugin
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
-.idea/**/markdown-navigator/
-
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-.idea/$CACHE_FILE$
-
-# End of https://www.toptal.com/developers/gitignore/api/webstorm