removed namey, problem fixed in home, secret for staging

Author: pbmolini

.gitignore

@@ -18,8 +18,9 @@
 
 .byebug_history
 
-/db-data/*
+/db-data*/*
 /public/uploads
+/public/assets
 
-docker-compose.production.yml
-docker-compose.staging.yml
+Dockerfile.*
+docker-compose.*.yml

Gemfile

@@ -56,7 +56,7 @@ gem 'geocoder'
 
 # Localization
 gem 'gettext_i18n_rails'
-gem 'gettext_i18n_rails_js', '~> 1.0.0'
+gem 'gettext_i18n_rails_js', '~> 1.2.0'
 gem 'i18n_data'
 # From branch master to work with Rails 5
 gem 'globalize', git: 'https://github.com/globalize/globalize'
@@ -77,7 +77,7 @@ gem 'mini_magick'
 gem 'simple_form_fancy_uploads'
 
 # random names
-gem 'namey'
+# gem 'namey'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

Gemfile.lock

@@ -113,7 +113,7 @@ GEM
       text (>= 1.3.0)
     gettext_i18n_rails (1.8.0)
       fast_gettext (>= 0.9.0)
-    gettext_i18n_rails_js (1.0.4)
+    gettext_i18n_rails_js (1.2.0)
       gettext (>= 3.0.2)
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
@@ -157,9 +157,6 @@ GEM
     mini_portile2 (2.2.0)
     minitest (5.10.3)
     multi_json (1.12.1)
-    namey (0.0.12)
-      sequel (~> 4.48)
-      sqlite3
     nio4r (2.1.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
@@ -236,7 +233,6 @@ GEM
     selenium-webdriver (3.5.1)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-    sequel (4.49.0)
     simple_form (3.5.0)
       actionpack (> 4, < 5.2)
       activemodel (> 4, < 5.2)
@@ -257,7 +253,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
     text (1.3.1)
     thor (0.20.0)
     thread_safe (0.3.6)
@@ -302,7 +297,7 @@ DEPENDENCIES
   font-awesome-rails
   geocoder
   gettext_i18n_rails
-  gettext_i18n_rails_js (~> 1.0.0)
+  gettext_i18n_rails_js (~> 1.2.0)
   globalize!
   high_voltage (~> 3.0.0)
   i18n_data
@@ -312,7 +307,6 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.2)
   lograge
   mini_magick
-  namey
   pg (~> 0.18)
   pry-rails
   puma (~> 3.7)

app/controllers/pages_controller.rb

@@ -1,6 +1,7 @@
 class PagesController < ApplicationController
   include HighVoltage::StaticPage
 
+  before_action :home
   # before_filter :authenticate
   # layout :layout_for_page
 
@@ -14,4 +15,10 @@ def layout_for_page
       'application'
     end
   end
+
+  def home
+    if params[:id] == 'home'
+      @featured_stories = Story.last(10)
+    end
+  end
 end

app/controllers/users/registrations_controller.rb

@@ -63,7 +63,7 @@ def after_sign_up_path_for(resource)
   private
 
   def generate_name
-    name = [Namey::Generator.new.name(:common, false), rand(100..999)].join
+    name = [('a'..'z').to_a.shuffle[0,8].join, rand(100..999)].join
     if Commoner.exists?(["lower(name) = ?", name.downcase])
       generate_name
     else

app/views/pages/home.html.erb

@@ -2,7 +2,7 @@
   <div class="row justify-content-center">
     <div class="col">
       <div class="logo-container">
-        <%= inline_svg 'logo', id: 'logo-svg' %>
+        <%= inline_svg 'logo.svg', id: 'logo-svg' %>
       </div>
     </div>
   </div>
@@ -18,11 +18,13 @@
     <% end %>
   </p>
 </div>
-<h2 class="text-center">Latest Stories</h2>
-<div class="row">
-<% Story.last(10).each do |story| %>
-  <div class="col-lg-4 col-md-6">
-    <%= render 'stories/card', story: story %>
+<% if @featured_stories.any? %>
+  <h2 class="text-center">Latest Stories</h2>
+  <div class="row">
+  <% @featured_stories.each do |story| %>
+    <div class="col-lg-4 col-md-6">
+      <%= render 'stories/card', story: story %>
+    </div>
+  <% end %>
   </div>
 <% end %>
-</div>

config/secrets.yml

@@ -28,5 +28,8 @@ test:
 # Or, use `bin/rails secrets:setup` to configure encrypted secrets
 # and move the `production:` environment over there.
 
+staging:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+
 production:
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>