Commit 9add1e0f authored by Zac Wood's avatar Zac Wood

ready for merge

parent 1b69b590
<h1>Home#index</h1> <h1>Welcome to Schedules!</h1>
<p>Find me in app/views/home/index.html.erb</p> <p>Schedules is a website designed by Mason SRCT designed to help students explore the GMU Catalog.</p>
Search for either professors or courses using the search bar above.
<div class="row"> <div class="row">
<div class="col-4"> <div class="col-md-4 col-sm-12">
<h1><%= @instructor.name %></h1> <h1><%= @instructor.name %></h1>
<% prev = @instructor.course_sections.reject { |s| s.course.semester == @semester }.map { |s| s.name.split[0..1].join(' ') }.uniq %> <% prev = @instructor.course_sections.reject { |s| s.course.semester == @semester }.map { |s| s.name.split[0..1].join(' ') }.uniq %>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<% end %> <% end %>
</div> </div>
<div class ="col-8"> <div class ="col-md-8 col-sm-12">
<h3><%= @semester.to_s %></h3> <h3><%= @semester.to_s %></h3>
<% if @courses.any? %> <% if @courses.any? %>
<%= render partial: 'shared/course', collection: @courses, locals: { expanded: true } %> <%= render partial: 'shared/course', collection: @courses, locals: { expanded: true } %>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="icon"> <div class="icon">
<i class="fa fa-book"></i> <i class="fa fa-book"></i>
</div> </div>
3 credits <%= course.credits %> credits
</div> </div>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<div class="attr"> <div class="attr">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<i class="fa fa-bars"></i> <i class="fa fa-bars"></i>
</div> </div>
<!-- TODO: FIX THIS --> <!-- TODO: FIX THIS -->
<%#= "#{course.section_count}" %> 3 sections <%#= "#{course.section_count}" %> <%= course.course_sections.count %> sections
</div> </div>
</div> </div>
<p class="description"><%= course.description %></p> <p class="description"><%= course.description %></p>
......
...@@ -53,4 +53,4 @@ ...@@ -53,4 +53,4 @@
<div class="row"> <div class="row">
<!-- Search result, List of Courses --> <!-- Search result, List of Courses -->
<div class="col-lg-7 col-md-10 mx-auto order-2 order-lg-0" id="search-list"> <div class="col-lg-8 col-md-10 mx-auto order-2 order-lg-0" id="search-list">
require 'test_helper'
class ApplicationControllerTest < ActionDispatch::IntegrationTest
test "redirects without semester id" do
get "/"
assert_response :redirect
assert_match /\?semester_id=#{semesters(:fall2018).id}/, @response.redirect_url
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment