From f832313552e2553b720c0f8f420e524b2b886d04 Mon Sep 17 00:00:00 2001
From: Aaron Parecki <aaron@parecki.com>
Date: Sun, 10 Jan 2016 09:34:04 -0800
Subject: [PATCH] add header menu and more semantic-ui updates

---
 compass/app/Http/Controllers/Controller.php   |  8 ++++++-
 compass/public/assets/map.css                 |  4 ++--
 compass/public/assets/styles.css              | 18 ---------------
 compass/resources/views/index.blade.php       | 10 ++++----
 compass/resources/views/map.blade.php         |  2 +-
 .../views/partials/logged-in.blade.php        | 23 +++++++++++++++----
 compass/resources/views/settings.blade.php    |  2 +-
 7 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/compass/app/Http/Controllers/Controller.php b/compass/app/Http/Controllers/Controller.php
index dff6b3a..14f9612 100644
--- a/compass/app/Http/Controllers/Controller.php
+++ b/compass/app/Http/Controllers/Controller.php
@@ -91,6 +91,9 @@ class Controller extends BaseController
     return view('map', [
       'displayURL' => self::displayURL(),
       'database' => $db,
+      'menu' => [
+        '/settings/'.$name => 'Settings'
+      ]
     ]);
   }
 
@@ -115,7 +118,10 @@ class Controller extends BaseController
     return view('settings', [
       'displayURL' => self::displayURL(),
       'database' => $db,
-      'users' => $users
+      'users' => $users,
+      'menu' => [
+        '/map/'.$name => 'Map'
+      ]
     ]);
   }
 
diff --git a/compass/public/assets/map.css b/compass/public/assets/map.css
index 5b08fbe..0a8da41 100644
--- a/compass/public/assets/map.css
+++ b/compass/public/assets/map.css
@@ -9,9 +9,9 @@ html, body {
 #calendar {
   z-index: 100;
   width: 200px;
-  height: calc(100% - 180px);
+  height: calc(100% - 240px);
   position: absolute;
-  top: 10px;
+  top: 60px;
   right: 10px;
   border: 3px #888 solid;
   background: white;
diff --git a/compass/public/assets/styles.css b/compass/public/assets/styles.css
index c010fb6..2912b7a 100644
--- a/compass/public/assets/styles.css
+++ b/compass/public/assets/styles.css
@@ -19,24 +19,6 @@
 }
 
 
-.corner-logo {
-  position: absolute;
-  z-index: 2000;
-  top: 6px;
-  left: 20px;
-}
-.logged-in {
-  position: absolute;
-  z-index: 2000;
-  top: 6px;
-  right: 20px;
-  font-size: 80%;
-  padding: 4px 16px;
-}
-.logged-in .logout {
-  margin-left: 16px;
-}
-
 
 .dashboard {
   max-width: 500px;
diff --git a/compass/resources/views/index.blade.php b/compass/resources/views/index.blade.php
index 0454628..96b3afa 100644
--- a/compass/resources/views/index.blade.php
+++ b/compass/resources/views/index.blade.php
@@ -6,13 +6,13 @@
 
   <div class="logo"><img src="/assets/compass.svg" width="200"></div>
 
-  <form action="/auth/start" method="post" class="pure-form login">
-    <fieldset>
+  <form action="/auth/start" method="post" class="ui form login" style="margin-top: 40px;">
+    <div class="ui action input">
       <input type="url" name="me">
-      <button type="submit" class="pure-button pure-button-primary">Sign in</button>
-    </fieldset>
+      <button type="submit" class="ui button primary">Sign in</button>
+    </div>
   </form>
 
 </div>
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/compass/resources/views/map.blade.php b/compass/resources/views/map.blade.php
index 49b1c1d..cc66af4 100644
--- a/compass/resources/views/map.blade.php
+++ b/compass/resources/views/map.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-<div class="corner-logo"><a href="/"><img src="/assets/compass.svg" height="40"/></a></div>
+@include('partials/logged-in')
 
 <div id="calendar">
   <div class="scroll">
diff --git a/compass/resources/views/partials/logged-in.blade.php b/compass/resources/views/partials/logged-in.blade.php
index 77ab63b..48fda45 100644
--- a/compass/resources/views/partials/logged-in.blade.php
+++ b/compass/resources/views/partials/logged-in.blade.php
@@ -1,6 +1,19 @@
-<div class="corner-logo"><a href="/"><img src="/assets/compass.svg" height="40"/></a></div>
-
-<div class="logged-in">
-  <span>{{ $displayURL }}</span>
-  <span class="logout"><a href="/auth/logout">sign out</a></span>
+<div class="ui fixed menu">
+  <div class="ui container">
+    <a href="/" class="header item">
+      <img class="logo" src="/assets/compass.svg">
+      <span style="padding-left: 0.7em;">Compass</span>
+    </a>
+    @if(isset($menu))
+      @foreach($menu as $u=>$n)
+        <a href="{{ $u }}" class="item">{{ $n }}</a>
+      @endforeach
+    @endif
+    <div class="ui simple dropdown item right">
+      {{ $displayURL }} <i class="dropdown icon"></i>
+      <div class="menu">
+        <a class="item" href="/auth/logout">Sign Out</a>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/compass/resources/views/settings.blade.php b/compass/resources/views/settings.blade.php
index 665c299..652cc7e 100644
--- a/compass/resources/views/settings.blade.php
+++ b/compass/resources/views/settings.blade.php
@@ -45,7 +45,7 @@
           <div class="error">{{ session('create-error') }}</div>
         @endif
         <span class="create {{ session('create-error') ? '' : 'hidden' }}">
-          <form action="/settings/{{ $database->name }}" method="post">
+          <form action="/settings/{{ $database->name }}" method="post" class="ui form">
             <div class="ui action input">
               <input type="url" name="add_user" value="{{ session('add-user-url') }}" placeholder="github or indieauth url">
               <button type="submit" class="ui button primary">Add User</button>