From 1f750b3ef0e4e3c0153006551c4449eabb10d1e5 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Mon, 11 May 2020 20:47:11 -0700
Subject: add basic link + route

---
 frontend/src/components/App.js | 45 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

(limited to 'frontend/src/components/App.js')

diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js
index 17240f5..2f438e9 100644
--- a/frontend/src/components/App.js
+++ b/frontend/src/components/App.js
@@ -1,15 +1,48 @@
 import React from 'react';
-import Header from './Header'
 import PasteArea from './PasteArea'
 import Footer from './Footer'
+import styled from 'styled-components'
+import {
+  BrowserRouter as Router,
+  Switch,
+  Route,
+  Link
+} from "react-router-dom";
+
+const SpacedTitle = styled.div`
+    margin-top: 10vh
+`
+
+const Inline = styled.div`
+    display: inline-block
+`
+
+const Desc = () => {
+  return (
+    <h3>a modern, <a href="https://github.com/jackyzha0/ctrl-v" target="_blank" rel="noopener noreferrer">open-source</a> pastebin with latex and markdown rendering support</h3>
+  );
+}
 
 function App() {
   return (
-    <div className="lt-content-column">
-      <Header />
-      <PasteArea />
-      <Footer />
-    </div>
+    <Router>
+      <div className="lt-content-column">
+        <SpacedTitle>
+          <nav>
+            <h1 className="mainLogo">
+              <span role="img" aria-label="clipboard">📋&nbsp;</span>
+              <Link to="/">ctrl-v</Link>
+            </h1>
+
+            <Desc />
+          </nav>
+        </SpacedTitle>
+
+        <PasteArea/>
+
+        <Footer />
+      </div>
+    </Router>
   );
 }
 
-- 
cgit v1.2.3


From 433466a3947e75a36b811795bc21be1fff10b5e8 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Mon, 11 May 2020 21:11:16 -0700
Subject: backend redir

---
 frontend/src/components/App.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'frontend/src/components/App.js')

diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js
index 2f438e9..605903e 100644
--- a/frontend/src/components/App.js
+++ b/frontend/src/components/App.js
@@ -1,28 +1,34 @@
 import React from 'react';
-import PasteArea from './PasteArea'
+import NewPaste from './NewPaste'
+import ViewPaste from './ViewPaste'
 import Footer from './Footer'
 import styled from 'styled-components'
 import {
   BrowserRouter as Router,
   Switch,
   Route,
-  Link
+  Link,
+  useParams
 } from "react-router-dom";
 
 const SpacedTitle = styled.div`
     margin-top: 10vh
 `
 
-const Inline = styled.div`
-    display: inline-block
-`
-
 const Desc = () => {
   return (
     <h3>a modern, <a href="https://github.com/jackyzha0/ctrl-v" target="_blank" rel="noopener noreferrer">open-source</a> pastebin with latex and markdown rendering support</h3>
   );
 }
 
+const GetPasteWithParam = () => {
+  let { hash } = useParams();
+
+  return (
+    <ViewPaste hash = {hash} />
+  );
+}
+
 function App() {
   return (
     <Router>
@@ -38,7 +44,14 @@ function App() {
           </nav>
         </SpacedTitle>
 
-        <PasteArea/>
+        <Switch>
+          <Route path="/:hash" 
+            children={<GetPasteWithParam />} 
+          />
+          <Route path="/">
+            <NewPaste />
+          </Route>
+        </Switch>
 
         <Footer />
       </div>
-- 
cgit v1.2.3