From 67071ff3f5d181d33d5b34f54d0a01d1e04aa19f Mon Sep 17 00:00:00 2001
From: Songyi Huang <songyih1996@gmail.com>
Date: Thu, 11 Jun 2020 23:52:13 -0700
Subject: [PATCH] adding global layout...

---
 leaderboard/db.sqlite3   | Bin 172032 -> 172032 bytes
 src/App.js               |  33 ++++++++++++++++++++++++++++++++-
 src/assets/gameview.scss |   4 ++--
 src/components/Navbar.js |   2 +-
 src/view/LeaderBoard.js  |   6 +-----
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/leaderboard/db.sqlite3 b/leaderboard/db.sqlite3
index ee8d71ae1b58b2ed58abba465a58f998e1a9e5ee..1a9fb87ef80396647aa808fd7e92362f75ad6f77 100644
GIT binary patch
delta 353
zcmZoTz}0YoYl5`kO$G)AEhuIN((5Pc7_;7F(6hg}F=YWivm8glWOe~-CXR%SjWQh0
zj&iIF%GQoKsfj76MM?RIMJWabhDPy;r6u|CMg~R(24+B>fvJ%Rh@)#@rfX=VU|?!x
zWMXA(qGw@bVrF5sd9g%1yUZ*GE`DJq{+Ij?{JZ(f_}B1v^M~<Y<JaUD=KHa+@d%$3
zKmRNSH=uh^0Z`CzqN6yIi1s9XQ87(seMTgw#3!bw=9REccF^C?DA#1L&4BT)5o7Ii
z`7}n|>D<YTB8)ZL6_Oc48CfgX#6$I`>trxWOt(&B<e5G%g;9b<y(zhT`mPj4Jx1l}
zzR8SI+nG}tr5PFPwgdG)+_}twNnn`)lfZUH1*ZS}+XWPuKJZVRAUNp*%XXFkra%1K
S3YfSRSk-{8RRt;ezz+bv09xz-

delta 295
zcmZoTz}0YoYl5`k4F(1VEhuIN(#t057_;7B(6j!qF=YWivn<Er$?O8w8ygcjHZPWl
zXP41t;Ntto#Q&1tfqyrD8UGsoZvHU-Yy2X7|M-4wY`n$i!9R;%n?XuMgISj`Cp9r8
zwJ0e+u_z@zJux?xO;n9pA4N1VJvFa{m46n4D9~zDFxf$WKcj4u!8QZNyGD$q)8*3`
zb*FPDGm0>lY*$ET3}s|3U=t73pRSX^C^6kSjge>iyc9+W7PY42{OP+=81)!cr~4)|
zN^NIOWt3)QEZYv$|8VDWCI=>gNe5WAvluY_;a{e}B(N-jNnkl6Nc00xw1A0SfmI#o
L5asPau@C$JEYVKS

diff --git a/src/App.js b/src/App.js
index 1edfdf6..4eb7236 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,13 +1,44 @@
 import React from 'react';
 import { BrowserRouter as Router, Route, Redirect } from "react-router-dom";
+import Drawer from '@material-ui/core/Drawer';
+import Toolbar from '@material-ui/core/Toolbar';
 import LeaderBoard from './view/LeaderBoard';
 import { DoudizhuGameView, LeducHoldemGameView } from './view/GameView';
+import Navbar from "./components/Navbar";
+import {makeStyles} from "@material-ui/core/styles";
+
+const drawerWidth = 250;
+
+const useStyles = makeStyles(() => ({
+    navBar: {
+      zIndex: 1002
+    },
+    drawer: {
+        zIndex: 1001,
+        width: drawerWidth,
+        flexShrink: 0
+    },
+    drawerPaper: {
+        width: drawerWidth
+    }
+}));
 
 function App() {
+    const classes = useStyles();
     return (
         <Router>
+            <Navbar className={classes.navBar} gameName={""}/>
+            <Drawer
+                className={classes.drawer}
+                variant="permanent"
+                classes={{
+                    paper: classes.drawerPaper
+                }}
+            >
+                <Toolbar />
+            </Drawer>
             <Route exact path="/">
-                <Redirect to="/replay/leduc-holdem" />
+                <Redirect to="/leaderboard" />
             </Route>
             <Route path="/leaderboard" component={LeaderBoard} />
             <Route path="/replay/doudizhu" component={DoudizhuGameView} />
diff --git a/src/assets/gameview.scss b/src/assets/gameview.scss
index eb5afa1..c62fef6 100644
--- a/src/assets/gameview.scss
+++ b/src/assets/gameview.scss
@@ -7,7 +7,7 @@
 }
 
 .header-bar {
-    width: 1000px;
+    width: calc(100% - 60px);
     margin-left: auto;
     margin-right: auto;
     height: 65px;
@@ -296,4 +296,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/Navbar.js b/src/components/Navbar.js
index d683e55..22f3e31 100644
--- a/src/components/Navbar.js
+++ b/src/components/Navbar.js
@@ -24,7 +24,7 @@ class Navbar extends React.Component {
             <AppBar position="static" className={"header-bar-wrapper"}>
                 <div className={"header-bar"}>
                     <Link to="/leaderboard"><img src={logo_white} alt={"Logo"} height="65px" /></Link>
-                    <div className={"title unselectable"}><div className={"title-text"}>Showdown<span className={"subtitle"}>/ {this.props.gameName}</span></div></div>
+                    <div className={"title unselectable"}><div className={"title-text"}>Showdown<span className={"subtitle"}>{this.props.gameName === '' ? '' : '/ ' + this.props.gameName}</span></div></div>
                     <div className={"stretch"} />
                     <div className={"github-info"} onClick={()=>{window.location.href = 'https://github.com/datamllab/rlcard'}}>
                         <div className={"github-icon"}><GitHubIcon /></div>
diff --git a/src/view/LeaderBoard.js b/src/view/LeaderBoard.js
index 1edf0ca..f7f8c72 100644
--- a/src/view/LeaderBoard.js
+++ b/src/view/LeaderBoard.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import {Link} from 'react-router-dom';
 // import axios from 'axios';
 
 class LeaderBoard extends React.Component {
@@ -9,10 +8,7 @@ class LeaderBoard extends React.Component {
 
     render() {
         return (
-            <ul>
-                <li><Link to="/replay/leduc-holdem">Leduc Holdem</Link></li>
-                <li><Link to="/replay/doudizhu">Dou Dizhu</Link></li>
-            </ul>
+            <div>wdnmd</div>
         )
     }
 }