From 939820bffbfccf62947c56a8b15d71d35c97eb38 Mon Sep 17 00:00:00 2001
From: Josh <josha5@outlook.com>
Date: Fri, 22 Jun 2018 15:58:25 -0400
Subject: [PATCH] minor styling and fixes

---
 .dockerignore                         | 2 --
 app/models/room.rb                    | 4 ----
 app/views/main/index.html.erb         | 2 +-
 app/views/shared/_room_event.html.erb | 2 +-
 docker-compose.yml                    | 2 +-
 sample.env                            | 7 ++-----
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 82b4ef4d..328b891a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,7 +5,6 @@ README.md
 
 # Rails
 .env
-sample.env
 *.rbc
 capybara-*.html
 .rspec
@@ -14,7 +13,6 @@ tmp
 /db/**/*.sqlite3
 /db/**/*.sqlite3-journal
 /db/production
-public/system
 public/assets
 public/gl
 coverage/
diff --git a/app/models/room.rb b/app/models/room.rb
index 92130dac..65d5bb5d 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -64,10 +64,6 @@ class Room < ApplicationRecord
     options[:user_is_moderator] ||= false
     options[:meeting_recorded] ||= false
 
-    #options[:wait_for_moderator] ||= false
-    #options[:meeting_name] ||= name
-    #options[:room_owner] ||= nil
-
     return call_invalid_res if !bbb
 
     # Get the meeting info.
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
index 06323800..07e7646a 100644
--- a/app/views/main/index.html.erb
+++ b/app/views/main/index.html.erb
@@ -1,7 +1,7 @@
 <div class="background landing-section">
   <div class="d-flex align-items-center" style="height: 100%;">
     <div class="container text-center">
-      <h1 id="main-text" class="font-weight-400 responsive-header">Welcome to BigBlueButton.</h1>
+      <h1 id="main-text" class="font-weight-400 responsive-header">Welcome to Greenlight.</h1>
       <h4 class="text-muted">A simple front end for your BigBlueButton Open Source Web Conferencing Server.</h4>
 
       <%= link_to "https://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %>
diff --git a/app/views/shared/_room_event.html.erb b/app/views/shared/_room_event.html.erb
index e88df47c..5236bc43 100644
--- a/app/views/shared/_room_event.html.erb
+++ b/app/views/shared/_room_event.html.erb
@@ -10,7 +10,7 @@
 
     <div class="row">
       <div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5 align-top">
-        <% if @room.owner.image.nil? %>
+        <% if @room.owner.image.blank? %>
           <span class="avatar"><%= @room.owner.name.first %></span>
         <% else %>
           <span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
diff --git a/docker-compose.yml b/docker-compose.yml
index 8d5d9e05..ef11cc2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     entrypoint: [bin/start]
     image: joshblind/greenlight:latest
     container_name: greenlight-web
-    env_file: .env
+    env_file: env
     restart: unless-stopped
     ports:
       - 6000:3000
diff --git a/sample.env b/sample.env
index 4b0fae9c..d60f565f 100644
--- a/sample.env
+++ b/sample.env
@@ -1,12 +1,9 @@
-# This is a sample of the environment variables you will need
-# To use, copy this file to .env `cp sample.env .env`
-
 # Create a Secret Key for Rails
 #
 # You can generate a secure one through the Greenlight docker image
 # with with the command.
 #
-#   docker run --rm bigbluebutton/greenlight rake secret
+#   docker run --rm bigbluebutton/greenlight bundle exec rake secret
 #
 SECRET_KEY_BASE=
 
@@ -44,7 +41,7 @@ TWITTER_SECRET=
 # Set this to true if you want GreenLight to support user signup and login without
 # Omniauth. This will allow users to create an account at www.hostname.com/signup
 # and use that account to fully interact with GreenLight.
-ALLOW_GREENLIGHT_ACCOUNTS=false
+ALLOW_GREENLIGHT_ACCOUNTS=true
 
 # Prefix for the applications root URL.
 # Useful for deploying the application to a subdirectory, which is highly recommended