kevinhughes27 · kevinhughes27 · Jun 26, 2018 · Jun 26, 2018 · Jun 26, 2018 · Jun 26, 2018
diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
@@ -4,6 +4,7 @@ class LoginController < Devise::SessionsController
 
   skip_before_action :require_no_authentication
   skip_before_action :verify_signed_out_user
+  skip_before_action :verify_authenticity_token, only: [:destroy]
 
   def self.controller_path
     'login'

diff --git a/app/graphql/types/query.rb b/app/graphql/types/query.rb
@@ -28,15 +28,15 @@ def field(id:)
   field :teams, [Types::Team], null: true
 
   def teams
-    context[:tournament].teams.all
+    context[:tournament].teams.includes(:division).all
   end
 
   field :team, Types::Team, null: true do
     argument :id, ID, required: true
   end
 
   def team(id:)
-    context[:tournament].teams.find(i)
+    context[:tournament].teams.find(id)
   end
 
   field :divisions, [Types::Division], null: true
@@ -59,7 +59,7 @@ def division(id:)
   end
 
   def games(scheduled: false, has_team: false)
-    scope = context[:tournament].games
+    scope = context[:tournament].games.includes(:division)
 
     scope = scope.scheduled if scheduled
     scope = scope.has_team if has_team
@@ -73,7 +73,7 @@ def games(scheduled: false, has_team: false)
   end
 
   def game(id:)
-    context[:tournament].game.find(:id)
+    context[:tournament].game.find(id)
   end
 
   field :score_reports, [Types::ScoreReport], auth: :required, null: true

diff --git a/clients/admin_next/public/index.html b/clients/admin_next/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" style="height: 100%;">
+<html lang="en">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -22,11 +22,11 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" />
     <title>Ultimate Tournament Admin</title>
   </head>
-  <body style="height: 100%;">
+  <body>
     <noscript>
       You need to enable JavaScript to run this app.
     </noscript>
-    <div id="root" style="height: 100%;"></div>
+    <div id="root"></div>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.

diff --git a/clients/admin_next/src/assets/jss/styles.tsx b/clients/admin_next/src/assets/jss/styles.tsx
@@ -1,7 +1,6 @@
 const App = {
   root: {
-    flexGrow: 1,
-    height: "100%",
+    flexGrow: 1
   }
 };
 
@@ -30,7 +29,7 @@ const NavItems = {
 const Loader = {
   container: {
     display: "flex",
-    height: "100%",
+    height: "92vh",
     justifyContent: "center",
     alignItems: "center"
   },
@@ -42,12 +41,9 @@ const Loader = {
 const BlankSlate = {
   container: {
     display: "flex",
-    height: "100%",
+    height: "92vh",
     justifyContent: "center",
     alignItems: "center"
-  },
-  content: {
-    height: 100
   }
 };
 

diff --git a/clients/admin_next/src/components/App.tsx b/clients/admin_next/src/components/App.tsx
@@ -32,7 +32,7 @@ class App extends React.Component<Props, State> {
     const { classes } = this.props;
 
     return (
-      <Router>
+      <Router basename={process.env.PUBLIC_URL}>
         <div className={classes.root}>
           <TopBar openNav={this.openNav} />
           <SideBar

diff --git a/clients/admin_next/src/components/Routes.tsx b/clients/admin_next/src/components/Routes.tsx
@@ -9,7 +9,7 @@ import Schedule from "./pages/Schedule";
 import Games from "./pages/Games";
 
 const Routes = () => (
-  <div style={{height: "100%"}}>
+  <div>
     <Route exact path="/" component={Home} />
     <Route path="/teams" component={Teams} />
     <Route path="/divisions" component={Divisions} />

diff --git a/clients/admin_next/src/components/layout/UserMenu.tsx b/clients/admin_next/src/components/layout/UserMenu.tsx
@@ -11,42 +11,46 @@ interface Props extends WithStyles<typeof styles> {}
 
 interface State {
   open: boolean;
+  anchorEl: any;
 }
 
 class UserMenu extends React.Component<Props, State> {
   state = {
     open: false,
+    anchorEl: undefined
   };
 
-  handleOpen = () => {
-    this.setState({ open: true });
+  handleOpen = (event: any) => {
+    this.setState({ open: true, anchorEl: event.currentTarget });
   }
 
   handleClose = () => {
-    this.setState({ open: false });
+    this.setState({ open: false, anchorEl: undefined });
+  }
+
+  handleLogout = () => {
+    fetch("/sign_out", {method: "DELETE", credentials: "include"});
   }
 
   render() {
-    const { open } = this.state;
+    const { open, anchorEl } = this.state;
 
     return (
       <div>
-        <IconButton
-          onClick={this.handleOpen}
-          color="inherit"
-        >
+        <IconButton onClick={this.handleOpen}>
           <Avatar alt="Kevin Hughes" src="https://www.gravatar.com/avatar/a14e0880b9ef8720734a7db6b6c4ade0" />
         </IconButton>
         <Menu
-          id="menu-appbar"
+          id="user-menu"
+          anchorEl={anchorEl}
           anchorOrigin={{vertical: "top", horizontal: "right"}}
           transformOrigin={{vertical: "top", horizontal: "right"}}
           open={open}
           onClose={this.handleClose}
         >
           <MenuItem onClick={this.handleClose}>Profile</MenuItem>
           <MenuItem onClick={this.handleClose}>Settings</MenuItem>
-          <MenuItem onClick={this.handleClose}>Logout</MenuItem>
+          <MenuItem onClick={this.handleLogout}>Logout</MenuItem>
         </Menu>
       </div>
     );

diff --git a/clients/admin_next/src/components/pages/Home.tsx b/clients/admin_next/src/components/pages/Home.tsx
@@ -10,7 +10,7 @@ class Home extends React.Component<Props> {
 
     return (
       <div className={classes.container}>
-        <span className={classes.content}>Home</span>
+        <span>Home</span>
       </div>
     );
   }

diff --git a/clients/admin_next/src/components/pages/Schedule.tsx b/clients/admin_next/src/components/pages/Schedule.tsx
@@ -10,7 +10,7 @@ class Schedule extends React.Component<Props> {
 
     return (
       <div className={classes.container}>
-        <span className={classes.content}>Schedule</span>
+        <span>Schedule</span>
       </div>
     );
   }