finishing up events

Author: sweir27

Gemfile

@@ -11,7 +11,6 @@ gem 'will_paginate', '3.0.4'
 gem 'bootstrap-will_paginate', '0.0.9'
 gem "paperclip", "~> 4.2"
 gem "cancan"
-gem "validates_url_format_of"
 
 group :development, :test do
   gem 'sqlite3', '1.3.8'

Gemfile.lock

@@ -164,8 +164,6 @@ GEM
     uglifier (2.1.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    validates_url_format_of (0.4.1)
-      activerecord (>= 3.1, < 5)
     websocket (1.0.7)
     will_paginate (3.0.4)
     xpath (2.0.0)
@@ -198,5 +196,4 @@ DEPENDENCIES
   sqlite3 (= 1.3.8)
   turbolinks (= 1.1.1)
   uglifier (= 2.1.1)
-  validates_url_format_of
   will_paginate (= 3.0.4)

app/assets/stylesheets/custom.css.scss

@@ -101,6 +101,9 @@ img {
 .text-inset-bold {
   font-weight: bold;
 }
+.text-inset-title {
+  font-size: 14pt;
+}
 
 .current-show-tag {
   color: $maroon;
@@ -148,12 +151,24 @@ img {
   margin-bottom: 50px;
 }
 
+.left-mid {
+  float: left;
+  width: 60%;
+  margin-bottom: 50px;
+}
+
 .right {
   float: right;
   width: 50%;
   margin-bottom: 50px;
 }
 
+.right-event {
+  float: right;
+  // margin-bottom: 20px;
+  width:40%;
+}
+
 .right-float {
   float: right;
   margin-bottom: 50px;
@@ -182,6 +197,11 @@ h3 {
   padding-top: 50px;
 }
 
+.event-info {
+  clear: both;
+  padding-top: 20px;
+}
+
 .info-text {
   padding: 30px;
 }
@@ -438,12 +458,16 @@ aside {
   // text-align: center;
 }
 
-.read-more-link, .read-less-link {
-  cursor: pointer;
+.ind-show-paragraph, .ind-event-paragraph {
+  margin-top: 10px;
 }
 
-.ind-show-paragraph {
+.ind-show-paragraph-truncated {
+  margin-top: 10px;
+}
 
+.read-more-link, .read-less-link {
+  cursor: pointer;
 }
 
 .ind-show-text {
@@ -479,6 +503,12 @@ aside {
   padding-right: 30px;
 }
 
+.event-picture {
+  padding: 20px;
+  padding-top: 0px;
+  padding-right: 30px;
+}
+
 /* links */
 
 .links {

app/controllers/events_controller.rb

@@ -51,6 +51,6 @@ def admin_user
     end
 
     def event_params
-      params.require(:event).permit(:title, :description, :event_date, :start_time, :end_time, :event_image, :on_homepage)
+      params.require(:event).permit(:title, :description, :event_date, :start_time, :end_time, :event_image, :on_homepage, :url)
     end
 end

app/controllers/shows_controller.rb

@@ -45,13 +45,13 @@ def ind_current
 
   def current
     @current_show = Show.where(:current => true).first
-    # @events = Event.where(:on_homepage => true).sort_by(&:event_date)
+    @events = Event.where(:on_homepage => true).sort_by(&:event_date)
   end
 
   def past
     current_show = Show.where(:current => true).first
     start_date = Show.arel_table[:start_date]
-    @past_shows = Show.where(start_date.lt(current_show.start_date))
+    @past_shows = Show.where(start_date.lt(current_show.start_date)).limit(10)
     @is_current_page = false
     render 'past'
   end

app/models/link.rb

@@ -3,6 +3,4 @@ class Link < ActiveRecord::Base
   validates :title, presence: true, length: { maximum: 50 }
   validates :description, presence: true
   validates :url, presence: true
-  validates_url_format_of :url,
-                          :allow_nil => true
 end

app/models/user.rb

@@ -10,8 +10,6 @@ class User < ActiveRecord::Base
                     uniqueness: { case_sensitive: false }
   has_secure_password
   validates :password, length: { minimum: 6 }
-  validates_url_format_of :website,
-                          :allow_nil => true
 
   Paperclip.interpolates :slug do |attachment, style|
     attachment.instance.slug

app/views/events/_ind_event_admin.html.erb

@@ -4,10 +4,9 @@
   </div>
   <div class='left-larger no-margin'>
     <div class='inner-content-shows small-padding'>
-      <div class='ind-event-text'><%= "#{event.event_date.strftime('%m/%d/%Y')}" %></div>
-      <div class='ind-event-text'><%= "Start: #{event.start_time}" %></div>
-      <div class='ind-event-text'><%= "End: #{event.end_time}" %></div>
-      <div class='ind-event-paragraph-truncated'>
+      <div class='ind-event-text'><%= "#{event.event_date.strftime('%m/%d/%Y')}, #{event.start_time.strftime('%I:%M %p')} - #{event.end_time.strftime('%I:%M %p')}" %></div>
+      <div class='ind-event-text'><%= link_to event.url, event.url if event.url %></div>
+      <div class='ind-event-paragraph'>
         <%= event.description %>
       </div>
     </div>

app/views/events/edit.html.erb

@@ -12,6 +12,9 @@
       <%= f.label :description %>
       <%= f.text_area :description %>
 
+      <%= f.label :url %>
+      <%= f.text_field :url %>
+
       <%= f.label :event_date %>
       <%= f.date_select :event_date %>
 

app/views/events/index.html.erb

@@ -4,7 +4,7 @@
   <ul class="events">
     <% @events.each do |date_group| %>
       <h2 class='center'><%= "#{Date::MONTHNAMES[date_group[0].month]} #{date_group[0].year}" %></h2>
-      <% date_group[1].each do |event| %>
+      <% date_group[1].sort_by(&:event_date).each do |event| %>
         <%= render :partial => 'ind_event_admin', :locals => { event: event } %>
       <% end %>
     <% end %>