autopublish on the hourly basis and ui cleanup

Author: azeemh

README.md

@@ -56,7 +56,7 @@ or
 
 ### ~~Stories have WYSIWYG editing with full html capability~~
 
-### Stories can be set to be auto or prepublished (variables set, validations in progress)
+### ~~Stories can be set to be auto or prepublished (variables set, validations in progress)~~
 
 ### ~~Require user to make journalist account in order to create or edit a story and require user to have journalist account with editor status to manage themes, newspaper settings, admin, etc~~
 

app/assets/stylesheets/app.scss

@@ -8,7 +8,6 @@ $maxwidth: 1920px;
 // mnml defaults //
 
 *, html {
-	font-family: sans-serif;
 	text-decoration: none;
 }
 
@@ -167,6 +166,7 @@ nav a {
 	margin: 1rem;
 	text-align: center;
 	flex-grow: 2;
+	font-size: 2rem;
 }
 
 // Headlines //
@@ -178,16 +178,16 @@ h1 {
 }
 
 h2 {
-	font-size: 3rem;
+	font-size: 4rem;
 	@media only screen and (max-width: $maxwidth) {
 		font-size: 3vw;
 	}
 }
 
 h3 {
-	font-size: 1.5rem;
+	font-size: 3rem;
 	@media only screen and (max-width: $maxwidth) {
-		font-size: 1.5vw;
+		font-size: 1.75vw;
 	}
 }
 
@@ -213,23 +213,15 @@ h3 {
 	width: 100%;
 }
 
-.covertext {
-	font-size: 2rem;
-}
-
 .videocard {
 	display: inline-flex;
-	.videowrapper {
-		width: 73%;
-		padding: 1%;
-	}
 	.videopane {
-		width: 33%;
+		width: 98%;
 		padding: 1%;
 	}
 	@media only screen and (max-width: $maxwidth) {
 		.covertext {
-			font-size: 1.5vw;
+			font-size: 2vw;
 		}
 	}
 }
@@ -242,6 +234,21 @@ h3 {
 	}
 }
 
+.audiocard {
+	@media only screen and (max-width: $maxwidth) {
+		.covertext {
+			font-size: 2vw;
+		}
+	}
+}
+.textcard {
+	@media only screen and (max-width: $maxwidth) {
+		.covertext {
+			font-size: 2vw;
+		}
+	}
+}
+
 
 #toolbar {
 	display: inline-block;

app/controllers/home_controller.rb

@@ -1,3 +1,4 @@
+require 'date'
 class HomeController < ApplicationController
   before_action :authenticate_user!, only: [:dashboard]
   def index

app/controllers/stories_controller.rb

@@ -13,7 +13,15 @@ def only_journalists
 
   # GET /stories or /stories.json
   def index
-    @stories = Story.all.published
+    Story.to_be_published.each do |s|
+      puts s.title + " | " + s.autopublishdate.to_s
+      s.autopublish if DateTime.now > s.autopublishdate
+    end
+    @stories = Story.published
+  end
+
+  def drafts
+    @stories = Story.drafts
   end
 
   # GET /stories/1 or /stories/1.json
@@ -54,8 +62,11 @@ def update
     respond_to do |format|
       if @story.update(story_params)
 
+        if @story.publish == false 
+          @story.publishdate = nil
+          @story.save! 
         #sets the publish date of a news story to day it was first published. (saved with publish = true)
-        if @story.publish? && @story.publishdate.nil?
+        elsif @story.publish && @story.publishdate.nil?
           @story.publishdate = DateTime.now
           @story.save
         end

app/models/story.rb

@@ -12,11 +12,13 @@ class Story < ApplicationRecord
 
   scope :published, -> {where(publish: true)}
   scope :to_be_published, -> {where(enableautopublish: true)}
+  scope :drafts, -> {where(publish: false)}
 
   def autopublish
     if DateTime.now >= self.autopublishdate
       self.publish = true
       self.publishdate = self.autopublishdate
+      self.enableautopublish = false #disable after successful run
       self.save!
     end
   end

app/views/categories/_category.html.erb

@@ -1,4 +1,5 @@
 <div id="<%= dom_id category %>">
+  <!-- OLD 
   <p>
     <strong>Name:</strong>
     <%= category.name %>
@@ -8,5 +9,7 @@
     <strong>Color:</strong>
     <%= category.color %>
   </p>
+-->
+<a href="categories/<%= category.id %>/edit" style="text-decoration: none; border: none; border-bottom: 2px solid; border-color: <%= category.color %>; order: <%= category.order %>; padding: 2em;"><%= category.name.upcase + " & order: " + category.order.to_s %></a>
 
 </div>

app/views/categories/_form.html.erb

@@ -23,7 +23,7 @@
 
   <div class="field">
     <%= form.label :order, style: "display: block" %>
-    <%= form.number_field :order %>
+    <%= form.number_field :order, min: "0" %>
   </div>
 
   <div>

app/views/categories/index.html.erb

@@ -1,14 +1,9 @@
 <p style="color: green"><%= notice %></p>
 
-<h1>Categories</h1>
+<h1>Categories | <%= link_to "New", new_category_path %></h1>
 
-<div id="categories">
+<div style="display: inline;" id="categories">
   <% @categories.each do |category| %>
-    <%= render category %>
-    <p>
-      <%= link_to "Show this category", category %>
-    </p>
+    <div style="padding: 2rem;"><%= render category %></div>
   <% end %>
-</div>
-
-<%= link_to "New category", new_category_path %>
+</div>

app/views/home/dashboard.html.erb

@@ -2,32 +2,40 @@
 <p style="padding: 3rem;">“The basis of our governments being the opinion of the people, the very first object should be to keep that right; and were it left to me to decide whether we should have a government without newspapers, or newspapers without a government, I should not hesitate a moment to prefer the latter.” – Thomas Jefferson</p>
 
 <!-- IF USER IS EDITOR? -->
-<h2>Settings</h2>
+<h2>Settings | <%= link_to "Edit", edit_setting_path(@setting) %></h2>
 <% if @setting.nil? %>
 <%= link_to "New Settings", new_setting_path %>
 <% else %>
-<label>Name & Tagline:</label>
-<h3><%= @setting.newspapername %></h3>
-<em><%= @setting.tagline %></em>
+<label>Name</label>
+<blockquote><h1><%= @setting.newspapername %></h1></blockquote>
+<label>Tagline</label>
+<blockquote><h2><%= @setting.tagline %></h2></blockquote>
 <br/>
 <br/>
-<label>Current Theme: <%= @setting.theme.name %></label>
+<label>Current Theme:</label>
+<blockquote><h3><%= @setting.theme.name %></h3></blockquote>
 <br/>
 <br/>
-<%= link_to "Edit Settings", edit_setting_path(@setting) %>
 <% end %>
 
-<h2>Themes</h2>
+<h2>Themes | <%= link_to "New", new_theme_path %></h2>
 <% unless @themes.nil? %>
 	<% @themes.each do |theme| %>
+	<div style="padding: 2em;">
 		<%= link_to theme.name, edit_theme_path(theme) %>
+		<br/>
+		<div style="font-size: 4rem;">
+			<span style="color: <%= theme.backgroundcolor %>">■</span><span style="color: <%= theme.headingcolor %>">■</span><span style="color: <%= theme.textcolor %>">■</span><span style="color: <%= theme.primarycolor %>">■</span><span style="color: <%= theme.secondarycolor %>">■</span><span style="color: <%= theme.tertiarycolor %>">■</span><span style="color: <%= theme.quaternarycolor %>">■</span> 
+		</div>
+		<% if theme.logo.attached? %>
+		<img style="max-height: 200px; width: auto;" src="<%= url_for(theme.logo) %>"> 
+		<% end %>	
+	</div>
 	<% end %>
 <% end %>
-<br/><br/>
-<%= link_to "New Theme", new_theme_path %>
 <br/>
 <br/>
-<h2>Categories</h2>
+<h2>Categories | <%= link_to "New", new_category_path %></h2>
 <div style="display: inline-flex;">
 <% unless Category.nil? %>
   <% Category.all.each do |category| %>
@@ -36,13 +44,11 @@
 <% end %>
 </div>
 <br/><br/>
-<%= link_to "New Category", new_category_path %>
 <!-- END IF USER IS EDITOR? -->
 
-<h2>Stories</h2>
+<h2>Stories | <%= link_to "New", new_story_path %></h2>
 <% unless Story.nil? %>
   <% Story.all.each do |story| %>
 	<h5><%= unless story.publish? then "Draft: " end %><a href="stories/<%= story.slug %>"><%= story.title %></a> | <a href="stories/<%= story.slug %>/edit">EDIT</a></h5>
   <% end %>
 <% end %>
-<%= link_to "New Story", new_story_path %>

app/views/home/index.html.erb

@@ -1,4 +1,4 @@
-<h1 style="text-align: right;"><%= Date.today.strftime("%A, %B %e %Y") %></h1>
+<h1 style="text-align: right;"><%= DateTime.now.strftime("%A, %B, %d, %Y %l:%M %P") %></h1>
 <h2>
 <% if Setting.last.nil? %>
 All The News. All The Time.