From 19df96cb77fa80be7c2a5497d0dea8a8b3e2cc68 Mon Sep 17 00:00:00 2001
From: Connor Turland <connor@madhattertech.ca>
Date: Mon, 3 Mar 2014 00:25:47 -0800
Subject: [PATCH] reworked logged in homepage

---
 app/controllers/main_controller.rb | 12 +++++--
 app/views/main/home.html.erb       | 57 +++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
index 3ea6cb77..f7e9708a 100644
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -10,10 +10,16 @@ class MainController < ApplicationController
   
   # home page
   def home
-    @maps = Map.find_all_by_featured(true).shuffle!
-    @maps = @maps.slice(0,3)
+    @current = current_user
     
-    respond_with(@maps) 
+    if !authenticated?
+      @maps = Map.find_all_by_featured(true).shuffle!
+      @maps = @maps.slice(0,3)
+    elsif authenticated?
+      @maps = Map.order("updated_at DESC").limit(3)
+    end
+    
+    respond_with(@maps, @current) 
   end
   
   # /request
diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb
index ef664bb9..53f3e1da 100644
--- a/app/views/main/home.html.erb
+++ b/app/views/main/home.html.erb
@@ -15,31 +15,48 @@
 
 <div class="home_content">
 <div class="home_desc">
-  <div class="welcomeTo">Welcome to Metamaps</div>
-  <img id="homeMapImage" src="/assets/metamap128x128.png" width="128" height="128" />
-  <div class="metamapsIs">
-    a home on the web for <span class="swapWord">
-      <ul class="texts">
-      <li>building shared knowledge</li>
-      <li>learning</li>
-      <li>visioning</li>
-      <li>conversing</li>
-      <li>collaborating</li>
-      <li>sensemaking</li>
-      <li>innovating</li>
-      <li>designing</li>
-      <li>playing</li>
-      <li>exploring</li>
-      </ul>
-    </span>
+  <div class="welcomeTo">
+    <% if !authenticated? %>  
+      Welcome to Metamaps
+    <% elsif authenticated? %>
+      Welcome back, <%= @current.name.split[0...1][0] %>!
+    <% end %>
   </div>
+  <img id="homeMapImage" src="/assets/metamap128x128.png" width="128" height="128" />
+  
+  <% if !authenticated? %>
+    <div class="metamapsIs">
+      a home on the web for <span class="swapWord">
+        <ul class="texts">
+        <li>building shared knowledge</li>
+        <li>learning</li>
+        <li>visioning</li>
+        <li>conversing</li>
+        <li>collaborating</li>
+        <li>sensemaking</li>
+        <li>innovating</li>
+        <li>designing</li>
+        <li>playing</li>
+        <li>exploring</li>
+        </ul>
+      </span>
+    </div>
+  <% end %>
 </div>
 <div class="clearfloat"></div>
 
 <p class="contact">
-  <a href="/request" class="request button">Request Invite</a>
-  <a href="#" class="learnmore button openLightbox" data-open="about">Learn More</a>
-  <div class="featuredMaps">explore featured maps from our community</div>
+  <% if !authenticated? %>
+    <a href="/request" class="request button">Request Invite</a>
+    <a href="#" class="learnmore button openLightbox" data-open="about">Learn More</a>
+  <% end %>
+  <div class="featuredMaps">
+    <% if !authenticated? %>
+      explore featured maps from our community
+    <% elsif authenticated? %>
+      explore recently active maps
+    <% end %>
+  </div>
 </p>
 
 <div class="centeredProfile">