From d56226ccc5ecd6d922f660f07886d785fe6aef40 Mon Sep 17 00:00:00 2001
From: adam-skowronek <adasko8@st.amu.edu.pl>
Date: Thu, 23 Jun 2022 01:05:52 +0200
Subject: [PATCH] Add remove svg icon

---
 frontend/src/assets/svg/icon-remove.svg     |  2 +
 frontend/src/views/coordinator/Groups.tsx   | 71 +++++++++++----------
 frontend/src/views/coordinator/Leaders.tsx  |  5 +-
 frontend/src/views/coordinator/Students.tsx |  5 +-
 4 files changed, 47 insertions(+), 36 deletions(-)
 create mode 100644 frontend/src/assets/svg/icon-remove.svg

diff --git a/frontend/src/assets/svg/icon-remove.svg b/frontend/src/assets/svg/icon-remove.svg
new file mode 100644
index 0000000..1be75ca
--- /dev/null
+++ b/frontend/src/assets/svg/icon-remove.svg
@@ -0,0 +1,2 @@
+
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m12 2c5.5228475 0 10 4.4771525 10 10s-4.4771525 10-10 10-10-4.4771525-10-10 4.4771525-10 10-10zm0 2c-4.418278 0-8 3.581722-8 8s3.581722 8 8 8 8-3.581722 8-8-3.581722-8-8-8zm-4.70675 3.29325c.36092308-.36092308.92719527-.38868639 1.31971051-.08328994l.09428949.08328994 3.293 3.293 3.293-3.293c.391-.391 1.023-.391 1.414 0 .3609231.36092308.3886864.92719527.0832899 1.31971051l-.0832899.09428949-3.293 3.293 3.293 3.293c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293-.2133333 0-.4266667-.0680556-.6046991-.203588l-.1023009-.089412-3.293-3.293-3.293 3.293c-.195.195-.451.293-.707.293s-.512-.098-.707-.293c-.36092308-.3609231-.38868639-.9271953-.08328994-1.3197105l.08328994-.0942895 3.293-3.293-3.293-3.293c-.391-.391-.391-1.023 0-1.414z" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/frontend/src/views/coordinator/Groups.tsx b/frontend/src/views/coordinator/Groups.tsx
index 8894d15..5aa5373 100644
--- a/frontend/src/views/coordinator/Groups.tsx
+++ b/frontend/src/views/coordinator/Groups.tsx
@@ -3,6 +3,7 @@ import { useEffect, useState } from 'react'
 import { useMutation, useQuery } from 'react-query'
 import { useNavigate } from 'react-router-dom'
 import { deleteGroup, getGroups } from '../../api/groups'
+import { ReactComponent as IconRemove } from '../../assets/svg/icon-remove.svg'
 
 const Groups = () => {
   let navigate = useNavigate()
@@ -43,11 +44,11 @@ const Groups = () => {
       onSuccess: () => refetchGroups(),
     },
   )
-  
+
   useEffect(() => {
     setPage(1)
   }, [perPage])
-  
+
   if (areGroupsLoading) {
     return <div>Ładowanie</div>
   }
@@ -98,7 +99,9 @@ const Groups = () => {
                   <td>{points_for_first_term}</td>
                   <td>{points_for_second_term}</td>
                   <td>
-                    <button onClick={() => mutateDelete(id)}>X</button>
+                    <button onClick={() => mutateDelete(id)}>
+                      <IconRemove />
+                    </button>
                   </td>
                 </tr>
               ),
@@ -107,40 +110,40 @@ const Groups = () => {
         </table>
       </div>
       <div className="w-full flex items-center justify-center mt-2">
-            <div className="btn-group">
+        <div className="btn-group">
+          <button
+            className="btn btn-outline"
+            onClick={() => setPage(page - 1)}
+            disabled={page === 1}
+          >
+            «
+          </button>
+          {[
+            ...Array(
+              groups?.data?.max_pages && groups?.data?.max_pages + 1,
+            ).keys(),
+          ]
+            .slice(1)
+            .map((p) => (
               <button
-                className="btn btn-outline"
-                onClick={() => setPage(page - 1)}
-                disabled={page === 1}
+                key={p}
+                className={classNames('btn btn-outline', {
+                  'bg-success': p === page,
+                })}
+                onClick={() => setPage(p)}
               >
-                «
+                {p}
               </button>
-              {[
-                ...Array(
-                  groups?.data?.max_pages && groups?.data?.max_pages + 1,
-                ).keys(),
-              ]
-                .slice(1)
-                .map((p) => (
-                  <button
-                    key={p}
-                    className={classNames('btn btn-outline', {
-                      'bg-success': p === page,
-                    })}
-                    onClick={() => setPage(p)}
-                  >
-                    {p}
-                  </button>
-                ))}
-              <button
-                className="btn btn-outline"
-                onClick={() => setPage(page + 1)}
-                disabled={page === groups?.data?.max_pages}
-              >
-                »
-              </button>
-            </div>
-          </div>
+            ))}
+          <button
+            className="btn btn-outline"
+            onClick={() => setPage(page + 1)}
+            disabled={page === groups?.data?.max_pages}
+          >
+            »
+          </button>
+        </div>
+      </div>
     </div>
   )
 }
diff --git a/frontend/src/views/coordinator/Leaders.tsx b/frontend/src/views/coordinator/Leaders.tsx
index a9a8886..df7e80d 100644
--- a/frontend/src/views/coordinator/Leaders.tsx
+++ b/frontend/src/views/coordinator/Leaders.tsx
@@ -3,6 +3,7 @@ import { useMutation, useQuery } from 'react-query'
 import { useNavigate } from 'react-router-dom'
 import { getLeaders, deleteLeader } from '../../api/leaders'
 import classNames from 'classnames'
+import { ReactComponent as IconRemove } from '../../assets/svg/icon-remove.svg'
 
 const Leaders = () => {
   let navigate = useNavigate()
@@ -111,7 +112,9 @@ const Leaders = () => {
                           : 'Nie/stacjonarny'}
                       </td>
                       <td>
-                        <button onClick={() => mutateDelete(id)}>X</button>
+                        <button onClick={() => mutateDelete(id)}>
+                          <IconRemove />
+                        </button>
                       </td>
                     </tr>
                   ),
diff --git a/frontend/src/views/coordinator/Students.tsx b/frontend/src/views/coordinator/Students.tsx
index 91fcc65..c0ca585 100644
--- a/frontend/src/views/coordinator/Students.tsx
+++ b/frontend/src/views/coordinator/Students.tsx
@@ -8,6 +8,7 @@ import {
   downloadStudents,
 } from '../../api/students'
 import classNames from 'classnames'
+import { ReactComponent as IconRemove } from '../../assets/svg/icon-remove.svg'
 
 const Students = () => {
   let navigate = useNavigate()
@@ -179,7 +180,9 @@ const Students = () => {
                       <td>{group === null ? 'Nie' : 'Tak'}</td>
                       <td>{mode ? 'Stacjonarny' : 'Niestacjonarny'}</td>
                       <td>
-                        <button onClick={() => mutateDelete(index)}>X</button>
+                        <button onClick={() => mutateDelete(index)}>
+                          <IconRemove />
+                        </button>
                       </td>
                     </tr>
                   ))}