From 115338e0c3a369972588cddf1e2665a45dae89d7 Mon Sep 17 00:00:00 2001
From: jimmys-box <89916651+jimmys-box@users.noreply.github.com>
Date: Tue, 15 Mar 2022 11:12:45 +0100
Subject: [PATCH] style: error page
---
components/CopyField.jsx | 1 +
components/Error.jsx | 12 ++++-----
components/form/CandidateField.jsx | 40 ++++--------------------------
package-lock.json | 30 ----------------------
pages/index.jsx | 17 +++----------
styles/scss/_homePage.scss | 4 +--
6 files changed, 16 insertions(+), 88 deletions(-)
diff --git a/components/CopyField.jsx b/components/CopyField.jsx
index ebb1e02..b4b29e1 100644
--- a/components/CopyField.jsx
+++ b/components/CopyField.jsx
@@ -21,6 +21,7 @@ const CopyField = (props) => {
new ClipboardJS('.btn');
}
+
return (
diff --git a/components/Error.jsx b/components/Error.jsx
index dc855db..9f30dfd 100644
--- a/components/Error.jsx
+++ b/components/Error.jsx
@@ -5,11 +5,11 @@ import { useTranslation } from "next-i18next";
const Error = (props) => {
const { t } = useTranslation();
return (
-
+
-
+
@@ -19,15 +19,15 @@ const Error = (props) => {
-
+
- {t("common.backHomepage")}
+ {t("common.backHomepage")}
-
+
{t("resource.help")}
diff --git a/components/form/CandidateField.jsx b/components/form/CandidateField.jsx
index a642b52..91a3832 100644
--- a/components/form/CandidateField.jsx
+++ b/components/form/CandidateField.jsx
@@ -42,34 +42,6 @@ const CandidateField = ({avatar, label, description, candIndex, onDelete, onAdd,
}
useEffect(() => {
setClassName("candidateButton " + (selected ? "candidateAdded" : ""))
-<<<<<<< HEAD
-}, [selected] );
-useEffect(() => {
- setPlusIcon("mr-2 cursorPointer " + (selected ? "trashIcon" : ""))
-}, [selected] );
-useEffect(() => {
- setTrashIcon("trashIcon " + (selected ? "displayTrash" : ""))
-}, [selected] );
-
-const addFunction = () => {
- addCandidate();
- setSelectedState(!selected);
-};
-const deleteFunction = () => {
- onDelete();
- toggle();
-}
-
- const [image, setImage] = useState(null);
- const [createObjectURL, setCreateObjectURL] = useState(null);
- const uploadToClient = (event) => {
- if (event.target.files && event.target.files[0]) {
- const i = event.target.files[0];
- setImage(i);
- setCreateObjectURL(URL.createObjectURL(i));
- }
- };
-=======
}, [selected]);
useEffect(() => {
setPlusIcon("mr-2 cursorPointer " + (selected ? "trashIcon" : ""))
@@ -82,6 +54,10 @@ const deleteFunction = () => {
addCandidate();
setSelectedState(!selected);
}
+ const removeCandidate = () => {
+ onDelete();
+ toggle();
+ }
@@ -98,7 +74,6 @@ const deleteFunction = () => {
->>>>>>> 102b62636454308245aa839e42a8387359101d1d
}
};
@@ -182,13 +157,8 @@ const deleteFunction = () => {
autoFocus
/>
-<<<<<<< HEAD
-
-
-=======
-
->>>>>>> 102b62636454308245aa839e42a8387359101d1d
+