Add username and links

curio-team · Nov 15, 2017 · a5e40b2 · a5e40b2
1 parent ca14f6b
commit a5e40b2
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 8 deletions.
diff --git a/public/css/app.css b/public/css/app.css
@@ -8355,15 +8355,40 @@ body {
   background: linear-gradient(to right, #71B280, #134E5E);
 }
 
-h1 {
-  margin: 15px;
+header {
+  margin: 0 15px;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  font-size: 16px;
+}
+
+header > * {
+  margin: 15px 0;
+}
+
+.user {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+}
+
+.user,
+.user a {
+  color: white;
 }
 
 .board {
   display: grid;
   grid-gap: 15px;
   grid-template-columns: 1fr 1fr;
-  margin: 0 15px 0 15px;
+  margin: 0 15px;
 }
 
 .category {

diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
@@ -12,16 +12,31 @@ body{
   background: linear-gradient(to right, #71B280, #134E5E);
 }
 
-h1{
-  margin: 15px;
+header{
+  margin: 0 15px;
+  display: flex;
+  justify-content: space-between;
+  font-size: 16px;
+}
+
+header > *{
+  margin: 15px 0;
+}
+
+.user{
+  display: flex;
+  align-items: center;
+}
+
+.user, .user a{
+  color: white;
 }
 
 .board{
   display: grid;
   grid-gap: 15px;
   grid-template-columns: 1fr 1fr;
-
-  margin: 0 15px 0 15px;
+  margin: 0 15px;
 }
 
 .category{

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -11,7 +11,17 @@
     <title>Whiteboard</title>
 </head>
 <body>
-    <h1>Whiteboard</h1>
+	<header>
+	    <h1>Whiteboard</h1>
+	    <div class="user">
+	    	{{ Auth::user()->name }} (
+	    		@if(Auth::user()->type == 'teacher')
+	    			<a href="/admin">admin</a>&nbsp;|&nbsp;
+	    		@endif
+	    		<a href="https://login.amo.rocks/logout">uitloggen</a>
+	    	)
+	    </div>
+	</header>
     @yield('content')
     @stack('scripts')
 </body>