Commit 2211913

@@ -1,5 +0,0 @@
-class WorkoutsController < ApplicationController
-  def show
-    @workout = Workout.find_by(name: params[:id].upcase)
-  end
-end

@@ -0,0 +1,6 @@
+<div class="small-12 columns">
+  <div class="row">
+    <h1><%= link_to @program.name, program_path(@program) %></h1>
+    <%= render @program.workouts %>
+  </div>
+</div>

@@ -1,9 +1,13 @@
 <div class="large-4 small-6 columns">
   <div class="panel">
-    <h5><%= link_to training_session.workout.name, workout_path(training_session.workout.slug) %></h5>
-    <h6 class="subheader"><%= distance_of_time_in_words_to_now training_session.occurred_at %> ago</h6>
+    <h5>
+      <%= training_session.occurred_at.strftime("%a, %d %b") %>
+      (<%= link_to training_session.workout.name, program_path(training_session.workout.program.slug, anchor: training_session.workout.slug) %>)
+    </h5>
     <% training_session.exercise_sessions.each do |exercise_session| %>
-      <p><%= exercise_session.exercise.name %> @ <%= exercise_session.target_weight %> <%= exercise_session.sets.join(',') %> </p>
+      <p><strong><%= exercise_session.exercise.name %></strong></p>
+      <p><%= exercise_session.sets.join('/') %></p>
+      <p><%= exercise_session.target_weight %> lbs </p>
     <% end %>
   </div>
 </div>

@@ -1,6 +1,5 @@
 <div class="row">
-  <!-- Side Bar -->
-  <div class="large-4 small-12 columns">
+  <div class="large-3 small-12 columns">
     <div class="hide-for-small panel">
       <div class="row">
         <%= form_tag(upload_training_sessions_path, method: :post, multipart: true) do %>
@@ -15,20 +14,14 @@
         <% end %>
       </div>
     </div>
-    <a href="#">
-      <div class="panel callout radius">
-        <h6><%= @training_sessions.count %>  training sessions completed</h6>
-      </div>
-    </a>
+    <div class="panel callout radius">
+      <h6><%= @training_sessions.count %> training sessions completed</h6>
+    </div>
   </div>
-  <!-- End Side Bar -->
 
-  <!-- Thumbnails -->
-  <div class="large-8 columns">
+  <div class="large-9 columns">
     <div class="row">
       <%= render @training_sessions %>
     </div>
-    <!-- End Thumbnails -->
-    </div>
   </div>
 </div>

@@ -0,0 +1,7 @@
+<div class="small-6 columns">
+  <div class="panel">
+    <%= link_to '', {}, name: workout.slug %>
+    <h1>Workout <%= workout.name %>
+    <%= render workout.exercise_workouts %>
+  </div>
+</div>

@@ -1,9 +0,0 @@
-<div class="row">
-  <div class="small-12 columns">
-    <div class="row">
-      <h1>Workout <%= link_to @workout.name, workout_path(@workout) %> of <%= link_to @workout.program.name, program_path(@workout.program) %></h1>
-      <%= render @workout.exercise_workouts %>
-    </div>
-    </div>
-  </div>
-</div>

@@ -8,7 +8,6 @@ Rails.application.routes.draw do
     end
   end
   resources :programs, only: [:show]
-  resources :workouts, only: [:show]
   get "/dashboard" => "training_sessions#index", as: :dashboard
   get "/terms" => "static_pages#terms"
 end

@@ -1,18 +0,0 @@
-require "rails_helper"
-
-describe WorkoutsController do
-  let(:user) { create(:user) }
-
-  before :each do
-    http_login(user)
-  end
-
-  describe "#show" do
-    let(:workout) { create(:workout) }
-
-    it "loads the workout" do
-      get :show, id: workout.slug
-      expect(assigns(:workout)).to eql(workout)
-    end
-  end
-end

@@ -1,11 +0,0 @@
-require 'rails_helper'
-
-describe '/workouts' do
-  it 'routes to the workouts/:id' do
-    expect(get: '/workouts/A').to route_to(
-      controller: 'workouts',
-      action: 'show',
-      id: 'A'
-    )
-  end
-end