From 3e8500d466b641ef34c24f8b0de8163a44ba7a9e Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Fri, 5 Mar 2021 22:17:18 -0800
Subject: refactoring css

---
 frontend/src/App.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 frontend/src/App.js

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

diff --git a/frontend/src/App.js b/frontend/src/App.js
new file mode 100644
index 0000000..99e71ae
--- /dev/null
+++ b/frontend/src/App.js
@@ -0,0 +1,60 @@
+import React from 'react';
+import NewPaste from './components/NewPaste'
+import ViewPaste from './components/ViewPaste'
+import Footer from './components/Footer'
+import styled from 'styled-components'
+import {
+  BrowserRouter as Router,
+  Switch,
+  Route,
+  useParams
+} from "react-router-dom";
+import Raw from './components/renderers/Raw'
+import ThemeProvider from './theme/ThemeProvider'
+import GlobalStyle from './theme/GlobalStyle'
+import {Watermark} from "./components/Watermark";
+
+const Main = styled.div`
+  margin-top: 10vh;
+  padding: 0 20vw 30px 20vw;
+`
+
+const GetPasteWithParam = () => {
+  let { hash } = useParams();
+  return <ViewPaste hash = {hash} />;
+}
+
+const GetRawWithParam = () => {
+  let { hash } = useParams();
+  return <Raw hash={hash} />;
+}
+
+const App = () => {
+  return (
+    <ThemeProvider>
+      <GlobalStyle />
+      <Router>
+        <Switch>
+          <Route path="/raw/:hash"><GetRawWithParam /></Route>
+          <Route>
+            <Watermark/>
+            <Main id="appElement">
+              <Switch>
+                <Route path="/:hash">
+                  <GetPasteWithParam />
+                </Route>
+                <Route path="/">
+                  <NewPaste />
+                </Route>
+              </Switch>
+              <Footer />
+            </Main>
+          </Route>
+        </Switch>
+      </Router>
+    </ThemeProvider>
+  );
+}
+
+
+export default App;
-- 
cgit v1.2.3


From dbf726d9e021a692254defdab8b993063b15354f Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 16:09:51 -0800
Subject: update watermark styling

---
 frontend/src/App.js | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 99e71ae..a8da469 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import NewPaste from './components/NewPaste'
 import ViewPaste from './components/ViewPaste'
-import Footer from './components/Footer'
 import styled from 'styled-components'
 import {
   BrowserRouter as Router,
@@ -47,7 +46,6 @@ const App = () => {
                   <NewPaste />
                 </Route>
               </Switch>
-              <Footer />
             </Main>
           </Route>
         </Switch>
-- 
cgit v1.2.3