From 8d81c3bca3ae6add4ddb69cd16f51ffe2432a753 Mon Sep 17 00:00:00 2001
From: sarah <sarahkharraz@gmail.com>
Date: Fri, 27 Sep 2019 14:42:48 +0100
Subject: [PATCH 1/3] Pb with self hosting font

---
 public/index.html            | 2 +-
 public/style.css             | 8 ++++++++
 src/components/nameInput.js  | 2 +-
 src/components/nameOutput.js | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/public/index.html b/public/index.html
index 6b28ad5..6db5085 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,7 @@
       content="Web site created using create-react-app"
     />
     <link
-    href="https://fonts.googleapis.com/css?family=Lovelo|Plexifont|+BV=swap"
+    href="https://fonts.googleapis.com/css?family=Lovelo|Plexifont+BV=swap"
     rel="stylesheet"
   />
     <link rel="stylesheet" href="./style.css" />
diff --git a/public/style.css b/public/style.css
index 7a6358b..b747028 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1,3 +1,11 @@
 html{
   background-color: black;
 }
+
+@font-face {
+font-family: 'Lovelo', monospace;
+src: url('lovelo-black.eot') format('embedded-opentype'),
+     url('lovelo-black.woff') format('woff'),
+     url('lovelo-black.ttf')  format('truetype'),
+     url('lovelo-black.svg') format('svg');
+}
diff --git a/src/components/nameInput.js b/src/components/nameInput.js
index 11cda31..16a8887 100644
--- a/src/components/nameInput.js
+++ b/src/components/nameInput.js
@@ -22,7 +22,7 @@ const NameInput = ({ name, setName }) => {
         }}
       >
         <input
-          class="enterName"
+          className="enterName"
           type="text"
           required
           value={tempName}
diff --git a/src/components/nameOutput.js b/src/components/nameOutput.js
index 46c313e..14be187 100644
--- a/src/components/nameOutput.js
+++ b/src/components/nameOutput.js
@@ -18,11 +18,11 @@ const NameOutput = ({ name }) => {
   };
 
   return (
-    <section className="nameOutput">
+    <div className="nameOutput">
       <h1 className="nameOutputh1">{randomElement}</h1>
       <h3 className="nameOutputh3">It's your turn to play!</h3>
       <button className="outputButton">Next Player</button>
-      </section>
+    </div>
 
   );
 };

From 415e168cacfb82964a67cd089d4f64c3a8e361ef Mon Sep 17 00:00:00 2001
From: sarah <sarahkharraz@gmail.com>
Date: Fri, 27 Sep 2019 14:44:47 +0100
Subject: [PATCH 2/3] merge conflicts

---
 src/components/nameOutput.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/nameOutput.js b/src/components/nameOutput.js
index 14be187..1abb5ef 100644
--- a/src/components/nameOutput.js
+++ b/src/components/nameOutput.js
@@ -21,9 +21,10 @@ const NameOutput = ({ name }) => {
     <div className="nameOutput">
       <h1 className="nameOutputh1">{randomElement}</h1>
       <h3 className="nameOutputh3">It's your turn to play!</h3>
-      <button className="outputButton">Next Player</button>
+      <button className="outputButton" onClick={handleClick}>
+        Next Player
+      </button>
     </div>
-
   );
 };
 

From e0c2818c4d07e0ea700e9337f10546a26675b995 Mon Sep 17 00:00:00 2001
From: sarah <sarahkharraz@gmail.com>
Date: Fri, 27 Sep 2019 15:13:11 +0100
Subject: [PATCH 3/3] Fixed font?

---
 public/style.css | 12 +++++++-----
 src/App.css      | 10 ++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/public/style.css b/public/style.css
index b747028..f933e4d 100644
--- a/public/style.css
+++ b/public/style.css
@@ -3,9 +3,11 @@ html{
 }
 
 @font-face {
-font-family: 'Lovelo', monospace;
-src: url('lovelo-black.eot') format('embedded-opentype'),
-     url('lovelo-black.woff') format('woff'),
-     url('lovelo-black.ttf')  format('truetype'),
-     url('lovelo-black.svg') format('svg');
+  font-family: 'Lovelo Black', monospace;
+  src: url('Lovelo Black.otf');
+}
+
+@font-face {
+  font-family: 'plexifont', monospace;
+  src: url('plexifont.ttf');
 }
diff --git a/src/App.css b/src/App.css
index 95bd8fa..2f14d34 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,3 +1,13 @@
+@font-face {
+  font-family: 'Lovelo Black', monospace;
+  src: url('Lovelo Black.otf');
+}
+
+@font-face {
+  font-family: 'plexifont', monospace;
+  src: url('plexifont.ttf');
+}
+
 .App {
 }