fixed merge conflict

Author: favour-chibueze

src/components/Disclaimer/Disclaimer.js

@@ -5,11 +5,11 @@ import './Disclaimer.css';
 export default function Disclaimer(props) {
 
   return (
-    <>
+    <div>
       <div className="disclaimerContainer">
-         <p>The source for the data used in this project is <a className="disclaimerLink" target="_blank" href="https://itsfoss.com/best-open-source-internships/" rel="noreferrer">"It's Foss"</a>, an award-winning web-portal that focuses on Open Source.</p>
+         <p>The source for the data used in this project is <a className="disclaimerLink" target="_blank" href="https://itsfoss.com/best-open-source-internships/" rel="noreferrer">"It's Foss"</a>, an award-winning web-portal that focuses on Open Source and <a className="disclaimerLink" target="_blank" href="https://www.geeksforgeeks.org/" rel="noreferrer">"GeeksforGeeks"</a>.</p>
       </div>     
 
-    </>
+    </div>
   );
 }

src/components/Resources/Resources.js

@@ -23,10 +23,6 @@ return (
               </article>)}
       </div> 
       <Disclaimer />
-    </>   </article>)
-          }
-      </div>     
-
-    </div>
+   </div> 
   );
 }

src/components/Resources/TableView.js

@@ -5,7 +5,6 @@ import './TableView.css';
 import Toggle from "../Toggle";
 
 export default function TableView() {
-    
 return (
   <div className="container">
   <Toggle />

src/components/SingleResource/SingleResource.css

@@ -50,6 +50,22 @@
   color: rgba(0, 122, 124, 0.5);
 }
 
+.singleResourceBtn {
+  padding: 8px;
+  margin: 14px 40px;
+  width: 13%;
+  border: 1px solid rgb(0, 122, 124);
+  cursor: pointer;
+  transition: all 0.3s;
+  background-color: transparent;
+  text-align: center;
+}
+
+.singleResourceBtn:hover {
+  background: rgb(0, 122, 124);
+  color: #fff;
+}
+
 @media (max-width: 875px) {
   .fullCard {
     width: auto;

src/components/SingleResource/SingleResource.js

@@ -1,15 +1,18 @@
 import React from 'react';
 import '../../assets/css/App.css';
 import './SingleResource.css';
-import { useParams } from "react-router-dom";
+import { useParams, useHistory } from "react-router-dom";
 import data from '../data/data.json';
 import Disclaimer from '../Disclaimer/Disclaimer';
 
 export default function SingleResource() {
   const { id } = useParams();
-
+  const history = useHistory();
+  
   return (
-    <>
+    <div>
+      <button className="singleResourceBtn" onClick={() => history.goBack()}>Go Back</button>
+      
       <div className="fullCardContainer">
           { data
               .filter((resource) => resource.id === Number(id))
@@ -30,6 +33,6 @@ export default function SingleResource() {
               ))}
       </div>     
       <Disclaimer />
-    </>
+    </div>
   );
 }

src/components/data/data.json

@@ -102,7 +102,7 @@
       "September"
     ],
     "stipend": false,
-    "description": "Deeproot started in 2000. Their main product is deepOfix Mail Server and is based on Debian."
+    "description": "Open Mainframe Project also has its own open-source program and the mentees will be able to expand their knowledge on the mainframe technology. You’ll also help in contributing to open source projects which will make it easier for infrastructure applications to run on the mainframe.",
     "location": ["Remote"]
   },
   {
@@ -118,7 +118,7 @@
     ],
     "stipend": true,
     "location": ["Remote"],
-    "description": "An organisation dedicated to network functions virtualisation"
+    "description": "Their mission is to impinge on every individual who has the zeal to learn more. Around the year we conduct several educational programs and offer internship opportunities to the youngsters so that they become industry-ready."
   },
   {
     "id": 9,
@@ -153,7 +153,7 @@
     "internship_period": null,
     "application_period": [],
     "stipend": true,
-    "description": "Khan Academy is looking for talented software developers to create a free virtual classroom for the world. You can work on developing web solutions, data analysis developing classroom content, etc."
+    "description": "Khan Academy is looking for talented software developers to create a free virtual classroom for the world. You can work on developing web solutions, data analysis developing classroom content, etc.",
     "location": ["Remote"]
   },
   {
@@ -167,6 +167,7 @@
       "October"
     ],
     "stipend": true,
-    "location": ["Remote"]
+    "location": ["Remote"],
+    "description": "You can contribute to participating projects on GitHub and even if you’re not able to make a large major contribution what you can get out of it is how to use Git and Github."
   }
 ]