Add more info to the landing page

app/assets/javascripts/application.js

@@ -12,6 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require bootstrap-sprockets
 //= require dataTables/jquery.dataTables
 //= require dataTables/extras/dataTables.responsive
 //= require dataTables/jquery.dataTables

app/assets/stylesheets/card.scss

@@ -6,8 +6,12 @@
     box-shadow: 0 1px 3px rgba(0,0,0, 0.12), 0 1px 2px rgba(0,0,0, 0.24);
     border-radius: 2px;
 
-    &.padded {
+    h1, .h1, h2, .h2, h3, .h3 {
-      padding: 10px;
+      margin-top: 0;
     }
   }
 }
+
+.padded {
+  padding: 10px;
+}

app/assets/stylesheets/landing.css.scss

@@ -90,3 +90,22 @@ a.login-button {
     }
   }
 }
+
+.request {
+  h4 {
+    margin: 0;
+    color: #0072ae;
+    font-size: 1em;
+    text-transform: uppercase;
+  }
+
+}
+
+.notification ,.request {
+  border-top: 1px solid #c7d0d5;
+  padding: 15px 10px;
+
+  .actions {
+    text-align: right;
+  }
+}

app/assets/stylesheets/layout.scss

@@ -1,3 +1,7 @@
 #content {
   padding: 30px;
 }
+
+.info-message {
+  color: rgb(144, 148, 156);
+}

app/controllers/notifications_controller.rb

@@ -10,7 +10,7 @@ class NotificationsController < ApplicationController
 
   def read
     @notification.read!
-    redirect_to user_notifications_path(@notification.user)
+    redirect_to root_path
   end
 
   private

app/controllers/pages_controller.rb

@@ -3,10 +3,12 @@ class PagesController < ApplicationController
 
   def landing
     query = TransactionsQuery.new(current_user)
-    @transactions = ActiveRecord::Base.connection.exec_query(query.query.order(query.arel_table[:time].desc).take(10).project(Arel.star).to_sql)
+    @transactions  = ActiveRecord::Base.connection.exec_query(query.query.order(query.arel_table[:time].desc).take(10).project(Arel.star).to_sql)
+    @requests      = current_user.incoming_requests.open.includes(:creditor).take(10)
+    @notifications = current_user.notifications.unread
   end
 
-  def sign_in
+  def sign_in_page
     @statistics = Statistics.new
   end
 end

app/controllers/requests_controller.rb

@@ -10,12 +10,12 @@ class RequestsController < ApplicationController
 
   def confirm
     @request.confirm!
-    redirect_to user_requests_path(@request.debtor)
+    redirect_to root_path
   end
 
   def decline
     @request.decline!
-    redirect_to user_requests_path(@request.debtor)
+    redirect_to root_path
   end
 
   private

app/models/concerns/base_transaction.rb

@@ -1,6 +1,7 @@
 module BaseTransaction
   extend ActiveSupport::Concern
   include ActionView::Helpers::NumberHelper
+  include ApplicationHelper
 
   included do
     belongs_to :debtor,   class_name: 'User'

app/models/notification.rb

@@ -13,6 +13,8 @@
 class Notification < ActiveRecord::Base
   belongs_to :user
 
+  scope :unread, -> { where read: false }
+
   def read!
     update_attributes read: true
   end

app/views/application/_menu.html.haml

@@ -5,10 +5,10 @@
       = link_to 'Transactions', current_user, class: 'menu-item'
       = link_to user_requests_path(current_user), class: 'menu-item' do
         Requests
-        %span.badge= current_user.incoming_requests.size
+        %span.badge= current_user.incoming_requests.open.size
       = link_to user_notifications_path(current_user), class: 'menu-item' do
         Notifications
-        %span.badge= current_user.notifications.size
+        %span.badge= current_user.notifications.unread.size
       - if current_user.penning
         = link_to 'Zeus', User.zeus, class: 'menu-item'
         = link_to user_requests_path(User.zeus), class: 'menu-item' do

app/views/application/_menu_requests.html.haml

@@ -0,0 +1,3 @@
+= link_to user_requests_path(user), class: 'menu-item' do
+  Requests
+  %span.badge= user.incoming_requests.open.size

app/views/pages/_notifications.html.haml

@@ -0,0 +1,16 @@
+.card-wrapper
+  - if @notifications.any?
+    .card
+      .padded
+        %h3 Notifications
+      - @notifications.each do |n|
+        .notification.pure-g
+          .pure-u-11-12
+            = n.message
+          .pure-u-1-12.actions
+            = link_to notification_read_path(n), method: :post do
+              %span.glyphicon.glyphicon-eye-open
+  - else
+    .card.padded
+      %span.info-message
+        You have no unread notifications.

app/views/pages/_requests.html.haml

@@ -0,0 +1,23 @@
+.card-wrapper
+  - if @requests.any?
+    .card
+      .padded
+        %h3 Requests
+      - @requests.each do |r|
+        .request.pure-g
+          .pure-u-1-3
+            %h4= r.message
+            = r.creditor.name
+          .pure-u-1-3
+            = euro_from_cents r.amount
+          .pure-u-1-3.actions
+            .btn-group
+              = link_to request_confirm_path(r), method: :post, class: 'btn btn-default btn-success' do
+                %span.glyphicon.glyphicon-ok
+              = link_to request_decline_path(r), method: :post, class: 'btn btn-default btn-danger' do
+                %span.glyphicon.glyphicon-remove
+          .clear-both
+  - else
+    .card.padded
+      %span.info-message
+        You have no open requests at the moment.

app/views/pages/_transaction_form.html.haml

@@ -0,0 +1,3 @@
+.card-wrapper
+  .card.padded
+    = react_component 'TransactionForm', user: current_user, peers: User.all.order(:name).pluck(:name)

app/views/pages/landing.html.haml

@@ -2,13 +2,6 @@
   .pure-u-7-12
     = render 'transactions'
   .pure-u-5-12
-    .card-wrapper
+    = render 'transaction_form'
-      .card.padded
+    = render 'requests'
-        = react_component 'TransactionForm', user: current_user, peers: User.all.order(:name).pluck(:name)
+    = render 'notifications'
-    .card-wrapper
-      .card
-        requests
-    .card-wrapper
-      .card
-        notifications
-

config/routes.rb

@@ -7,7 +7,7 @@ Rails.application.routes.draw do
     root 'pages#landing', as: :authenticated_root
   end
 
-  root to: 'pages#sign_in'
+  root to: 'pages#sign_in_page'
 
   resources :transactions, only: [:index, :create]
   resources :users,        only: [:index, :show] do