From f4b8348e4301267be4932f64bef274e4a877cd6b Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Mon, 17 Oct 2016 10:37:44 -0400
Subject: [PATCH 1/3] Added extra gems required for ui and authentication

---
 Gemfile      |  7 +++++++
 Gemfile.lock | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/Gemfile b/Gemfile
index 00c79238..33f29772 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,5 +47,12 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
+gem 'devise', '4.2.0'
+gem 'omniauth', '1.3.1'
+gem 'omniauth-twitter', '1.2.1'
+gem 'omniauth-google-oauth2', '0.4.1'
+
 gem 'bigbluebutton-api-ruby'
 
+gem 'bootstrap-sass', '3.3.0.0'
+gem 'bootstrap-social-rails', '~> 4.12'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3aa0a317..32c8ad22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,8 +39,13 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
+    bcrypt (3.1.11)
     bigbluebutton-api-ruby (1.6.0)
       xml-simple (~> 1.1)
+    bootstrap-sass (3.3.0.0)
+      sass (~> 3.2)
+    bootstrap-social-rails (4.12.0)
+      railties (>= 3.1)
     builder (3.2.2)
     byebug (9.0.6)
     coffee-rails (4.2.1)
@@ -52,11 +57,20 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
     debug_inspector (0.0.2)
+    devise (4.2.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.1)
+      responders
+      warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.7.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
+    hashie (3.4.4)
     i18n (0.7.0)
     jbuilder (2.6.0)
       activesupport (>= 3.0.0, < 5.1)
@@ -65,6 +79,8 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json (1.8.3)
+    jwt (1.5.4)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -79,9 +95,36 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.9.1)
     multi_json (1.12.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
+    oauth (0.5.1)
+    oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.3.1)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
+    omniauth-google-oauth2 (0.4.1)
+      jwt (~> 1.5.2)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.3.1)
+    omniauth-oauth (1.1.0)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    omniauth-twitter (1.2.1)
+      json (~> 1.3)
+      omniauth-oauth (~> 1.1)
+    orm_adapter (0.5.0)
     puma (3.6.0)
     rack (2.0.1)
     rack-test (0.6.3)
@@ -113,6 +156,8 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
     sass (3.4.22)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
@@ -143,6 +188,8 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
+    warden (1.2.6)
+      rack (>= 1.0)
     web-console (3.3.1)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -158,11 +205,17 @@ PLATFORMS
 
 DEPENDENCIES
   bigbluebutton-api-ruby
+  bootstrap-sass (= 3.3.0.0)
+  bootstrap-social-rails (~> 4.12)
   byebug
   coffee-rails (~> 4.2)
+  devise (= 4.2.0)
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
+  omniauth (= 1.3.1)
+  omniauth-google-oauth2 (= 0.4.1)
+  omniauth-twitter (= 1.2.1)
   puma (~> 3.0)
   rails (~> 5.0.0, >= 5.0.0.1)
   sass-rails (~> 5.0)

From 682cbadbf0c27fb64b893b18da64f3848ccb0e5c Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Mon, 17 Oct 2016 13:45:24 -0400
Subject: [PATCH 2/3] Added some style to the landing page

---
 Gemfile                                     |   2 +
 Gemfile.lock                                |  11 ++-
 app/assets/images/bbb-logo.png              | Bin 0 -> 7318 bytes
 app/assets/javascripts/application.js       |   5 +-
 app/assets/stylesheets/application.css      |   2 +
 app/assets/stylesheets/landing.scss         |   4 +
 app/assets/stylesheets/narrow-jumbotron.css |  79 ++++++++++++++++++++
 app/controllers/landing_controller.rb       |  11 +--
 app/helpers/landing_helper.rb               |   7 ++
 app/views/landing/index.html.erb            |  67 ++++++++++-------
 app/views/layouts/application.html.erb      |  11 +++
 11 files changed, 159 insertions(+), 40 deletions(-)
 create mode 100644 app/assets/images/bbb-logo.png
 create mode 100644 app/assets/stylesheets/narrow-jumbotron.css

diff --git a/Gemfile b/Gemfile
index 33f29772..c1ee7d59 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,3 +56,5 @@ gem 'bigbluebutton-api-ruby'
 
 gem 'bootstrap-sass', '3.3.0.0'
 gem 'bootstrap-social-rails', '~> 4.12'
+gem 'jquery-ui-rails'
+gem 'jquery-datatables-rails', '~> 3.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 32c8ad22..6e41f344 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,10 +75,17 @@ GEM
     jbuilder (2.6.0)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
+    jquery-datatables-rails (3.4.0)
+      actionpack (>= 3.1)
+      jquery-rails
+      railties (>= 3.1)
+      sass-rails
     jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
     json (1.8.3)
     jwt (1.5.4)
     listen (3.0.8)
@@ -211,7 +218,9 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   devise (= 4.2.0)
   jbuilder (~> 2.5)
+  jquery-datatables-rails (~> 3.4.0)
   jquery-rails
+  jquery-ui-rails
   listen (~> 3.0.5)
   omniauth (= 1.3.1)
   omniauth-google-oauth2 (= 0.4.1)
@@ -228,4 +237,4 @@ DEPENDENCIES
   web-console
 
 BUNDLED WITH
-   1.13.2
+   1.13.5
diff --git a/app/assets/images/bbb-logo.png b/app/assets/images/bbb-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3737f7c5773ebbca34a14ccd00560893c3c3166a
GIT binary patch
literal 7318
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

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b12018d0..ce912696 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,7 +10,8 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
+//= require jquery2
+//= require jquery-ui
+//= require bootstrap-sprockets
 //= require turbolinks
 //= require_tree .
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 0ebd7fe8..a15c8c86 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -11,5 +11,7 @@
  * It is generally better to create a new file per style scope.
  *
  *= require_tree .
+ *= require jquery-ui
+ *= require dataTables/jquery.dataTables
  *= require_self
  */
diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss
index f33d6f8d..0dbe3ca0 100644
--- a/app/assets/stylesheets/landing.scss
+++ b/app/assets/stylesheets/landing.scss
@@ -1,3 +1,7 @@
 // Place all the styles related to the landing controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+// Bootstrap
+@import "bootstrap-sprockets";
+@import "bootstrap";
diff --git a/app/assets/stylesheets/narrow-jumbotron.css b/app/assets/stylesheets/narrow-jumbotron.css
new file mode 100644
index 00000000..a2dbf869
--- /dev/null
+++ b/app/assets/stylesheets/narrow-jumbotron.css
@@ -0,0 +1,79 @@
+/* Space out content a bit */
+body {
+  padding-top: 1.5rem;
+  padding-bottom: 1.5rem;
+}
+
+/* Everything but the jumbotron gets side spacing for mobile first views */
+.header,
+.marketing,
+.footer {
+  padding-right: 1rem;
+  padding-left: 1rem;
+}
+
+/* Custom page header */
+.header {
+  padding-bottom: 1rem;
+  border-bottom: .05rem solid #e5e5e5;
+}
+/* Make the masthead heading the same height as the navigation */
+.header h3 {
+  margin-top: 0;
+  margin-bottom: 0;
+  line-height: 3rem;
+}
+
+/* Custom page footer */
+.footer {
+  padding-top: 1.5rem;
+  color: #777;
+  border-top: .05rem solid #e5e5e5;
+}
+
+/* Customize container */
+@media (min-width: 48em) {
+  .container {
+    max-width: 72rem;
+  }
+}
+.container-narrow > hr {
+  margin: 2rem 0;
+}
+
+/* Main marketing message and sign up button */
+.jumbotron {
+  text-align: center;
+  border-bottom: .05rem solid #e5e5e5;
+}
+.jumbotron .btn {
+  padding: .75rem 1.5rem;
+  font-size: 1.5rem;
+}
+
+/* Supporting marketing content */
+.marketing {
+  margin: 3rem 0;
+}
+.marketing p + h4 {
+  margin-top: 1.5rem;
+}
+
+/* Responsive: Portrait tablets and up */
+@media screen and (min-width: 48em) {
+  /* Remove the padding we set earlier */
+  .header,
+  .marketing,
+  .footer {
+    padding-right: 0;
+    padding-left: 0;
+  }
+  /* Space out the masthead */
+  .header {
+    margin-bottom: 2rem;
+  }
+  /* Remove the bottom border on the jumbotron for visual effect */
+  .jumbotron {
+    border-bottom: 0;
+  }
+}
diff --git a/app/controllers/landing_controller.rb b/app/controllers/landing_controller.rb
index 135fd099..d33b4e2b 100644
--- a/app/controllers/landing_controller.rb
+++ b/app/controllers/landing_controller.rb
@@ -1,15 +1,6 @@
 class LandingController < ApplicationController
   def index
     @meeting_token = params[:id] || @meeting_token = rand.to_s[2..10]
-    @meeting_url = meeting_url(@meeting_token)
-  end
-  
-  private
-  def meeting_url(meeting_token)
-    _meeting_url = "#{request.original_url}"
-    _meeting_url += "meeting" if ( request.original_url == "#{request.base_url}/" )
-    _meeting_url += "/" unless _meeting_url.end_with?('/')
-    _meeting_url += "#{meeting_token}" if !params.has_key?(:id)
-    _meeting_url
+    @meeting_url = helpers.meeting_url(@meeting_token)
   end
 end
diff --git a/app/helpers/landing_helper.rb b/app/helpers/landing_helper.rb
index 6aa3ee92..3f9b3bc7 100644
--- a/app/helpers/landing_helper.rb
+++ b/app/helpers/landing_helper.rb
@@ -1,2 +1,9 @@
 module LandingHelper
+  def meeting_url(meeting_token)
+    _meeting_url = "#{request.original_url}"
+    _meeting_url += "meeting" if ( request.original_url == "#{request.base_url}/" )
+    _meeting_url += "/" unless _meeting_url.end_with?('/')
+    _meeting_url += "#{meeting_token}" if !params.has_key?(:id)
+    _meeting_url.gsub(/\/+$/, '')
+  end
 end
diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
index fed5c740..18eee059 100644
--- a/app/views/landing/index.html.erb
+++ b/app/views/landing/index.html.erb
@@ -1,35 +1,48 @@
-<h1>Landing#index</h1>
-<div id="landing_page_url">
-  <p><span id="meeting_url"><%= @meeting_url %></span></p>
-</div>
+<div class='container'>
 
-<div id="landing_page_join_form">
-  <form action="#">
-    <input type="text" name="name" value="" placement="Your name">
-    <input type="submit" value="Join">
-  </form>
-</div>
+  <!-- Body -->
+  <div class='body'>
 
-<div id="landing_page_invite_text">
-  <table border="1">
-    <tr>
-      <td>
+    <div class="container">
+      <div class="jumbotron">
+        <!-- Meeting URL -->
+        <h4 class="display-3">
+          <div id="landing_page_url" class="center-block">
+            <span id="meeting_url"><%= @meeting_url %></span>
+          </div>
+        </h4>
+
+        <!-- Join form -->
+        <div id="landing_page_join_form">
+          <form class="form-inline">
+            <div class="form-group">
+              <label for="name" class="sr-only">Name</label>
+              <input type="text" class="form-control input" id="name" placeholder="Your name">
+            </div>
+            <button type="submit" class="btn btn-success">Join</button>
+          </form>
+        </div>
+      </div>
+
+      <figure class=highlight><pre><figcaption class="text" data-lang="text">
         <p>Hi Everyone</p>
-        <br>
         <p>The meeting will be at this URL</p>
-        <br>
         <p><a href="<%= @meeting_url %>"><span id="meeting_url"><%= @meeting_url %></a></p>
-        <br>
         <p>Please join!</p>
-      </td>
-    </tr>
-  </table>
-</div>
+      </figcaption></pre></figure>
 
-<div id="landing_page_footer_message">
-  <p>Bookmark this page to reuse this meeting URL, or click refresh button to generate a new meeting URL</p>
-</div>
+      <div id="landing_page_footer_message">
+        <p>Bookmark this page to reuse this meeting URL, or click refresh button to generate a new meeting URL</p>
+      </div>
 
-<div id="landing_page_footer_oauth_append">
-  <p>You can have a personal URL (with recordings) by signing in below</p>
-</div>
+      <div id="landing_page_footer_oauth_append">
+        <p>You can have a personal URL (with recordings) by signing in below</p>
+      </div>
+
+        
+    </div>
+    
+    
+  </div>
+
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b8747eee..f240d1f4 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,6 +9,17 @@
   </head>
 
   <body>
+    <!-- Messages -->
+    <div id='messages' class='hidden'>
+    </div>
+
+    <!-- Header -->
+    <div class='navbar'>
+      <div class='container'>
+        <%= image_tag "bbb-logo.png", :alt => "BigBlueButton Demo", :class => "center-block" %>
+      </div>
+    </div>
+    
     <%= yield %>
   </body>
 </html>

From f725b7f1bc42bdf1beeba144062d2dca0c958c58 Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Mon, 17 Oct 2016 18:36:56 -0400
Subject: [PATCH 3/3] Implemented join to BBB first approach

---
 .gitignore                                |  1 +
 Gemfile                                   |  3 ++
 Gemfile.lock                              |  5 +++
 app/assets/javascripts/bbb.coffee         |  3 ++
 app/assets/stylesheets/bbb.scss           |  3 ++
 app/controllers/application_controller.rb |  4 +++
 app/controllers/bbb_controller.rb         | 38 +++++++++++++++++++++++
 app/controllers/landing_controller.rb     |  4 ++-
 app/helpers/application_helper.rb         | 22 +++++++++++++
 app/helpers/bbb_helper.rb                 | 36 +++++++++++++++++++++
 app/views/bbb/end.html.erb                |  2 ++
 app/views/bbb/join.html.erb               |  2 ++
 app/views/errors/error.html.erb           |  2 ++
 app/views/landing/index.html.erb          | 38 +++++++++++++++++------
 config/config.yml                         |  3 ++
 config/initializers/load_config.rb        |  1 +
 config/routes.rb                          |  3 ++
 sample.env                                |  8 +++++
 test/controllers/bbb_controller_test.rb   | 14 +++++++++
 19 files changed, 182 insertions(+), 10 deletions(-)
 create mode 100644 app/assets/javascripts/bbb.coffee
 create mode 100644 app/assets/stylesheets/bbb.scss
 create mode 100644 app/controllers/bbb_controller.rb
 create mode 100644 app/helpers/bbb_helper.rb
 create mode 100644 app/views/bbb/end.html.erb
 create mode 100644 app/views/bbb/join.html.erb
 create mode 100644 app/views/errors/error.html.erb
 create mode 100644 config/config.yml
 create mode 100644 config/initializers/load_config.rb
 create mode 100644 sample.env
 create mode 100644 test/controllers/bbb_controller_test.rb

diff --git a/.gitignore b/.gitignore
index bab620de..7559b50b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 
 # Ignore Byebug command history file.
 .byebug_history
+.env
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index c1ee7d59..2c1ef168 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,6 +31,9 @@ gem 'jbuilder', '~> 2.5'
 # gem 'capistrano-rails', group: :development
 
 group :development, :test do
+  # For environment configuration
+  gem 'dotenv-rails'
+
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e41f344..3a9be8f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,6 +63,10 @@ GEM
       railties (>= 4.1.0, < 5.1)
       responders
       warden (~> 1.2.3)
+    dotenv (2.1.1)
+    dotenv-rails (2.1.1)
+      dotenv (= 2.1.1)
+      railties (>= 4.0, < 5.1)
     erubis (2.7.0)
     execjs (2.7.0)
     faraday (0.9.2)
@@ -217,6 +221,7 @@ DEPENDENCIES
   byebug
   coffee-rails (~> 4.2)
   devise (= 4.2.0)
+  dotenv-rails
   jbuilder (~> 2.5)
   jquery-datatables-rails (~> 3.4.0)
   jquery-rails
diff --git a/app/assets/javascripts/bbb.coffee b/app/assets/javascripts/bbb.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/bbb.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/bbb.scss b/app/assets/stylesheets/bbb.scss
new file mode 100644
index 00000000..687fe4e6
--- /dev/null
+++ b/app/assets/stylesheets/bbb.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the bbb controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1c07694e..0a71c41d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,7 @@
+require 'bigbluebutton_api'
+require 'digest/sha1'
+
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
+  include ApplicationHelper
 end
diff --git a/app/controllers/bbb_controller.rb b/app/controllers/bbb_controller.rb
new file mode 100644
index 00000000..e51f7c36
--- /dev/null
+++ b/app/controllers/bbb_controller.rb
@@ -0,0 +1,38 @@
+class BbbController < ApplicationController
+  include BbbHelper
+
+  # GET /join
+  # GET /join.json
+  def join
+    logger.info params.to_json
+    if ( !params.has_key?(:id) )
+      render_response("missing_parameter", "meeting token was not included", :bad_request)
+    elsif ( !params.has_key?(:name) )
+      render_response("missing_parameter", "user name was not included", :bad_request)
+    else
+      bbb_join_url = bbb_join_url(params[:id], false, params[:name], false)
+      if bbb_join_url[:returncode]
+        logger.info "#Execute the redirect"
+        render_response("ok", "execute the redirect", :ok, {:join_url => bbb_join_url[:join_url]})
+      else
+        render_response("bigbluebutton_error", "join url could not be created", :internal_server_error)
+      end
+    end
+  end
+
+  def close
+  end
+  
+  private
+  def render_response(messageKey, message, status, response={})
+    respond_to do |format|
+      if (status == :ok)
+        format.html { render :template => "bbb/join" }
+        format.json { render :json => { :messageKey => messageKey, :message => message, :status => status, :response => response }, :status => status }
+      else
+        format.html { render :template => "errors/error" }
+        format.json { render :json => { :messageKey => messageKey, :message => message, :status => status, :response => response }, :status => status }
+      end
+    end
+  end
+end
diff --git a/app/controllers/landing_controller.rb b/app/controllers/landing_controller.rb
index d33b4e2b..b02805b7 100644
--- a/app/controllers/landing_controller.rb
+++ b/app/controllers/landing_controller.rb
@@ -1,6 +1,8 @@
 class LandingController < ApplicationController
+  include LandingHelper
+
   def index
     @meeting_token = params[:id] || @meeting_token = rand.to_s[2..10]
-    @meeting_url = helpers.meeting_url(@meeting_token)
+    @meeting_url = meeting_url(@meeting_token)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be794..3b958476 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,24 @@
 module ApplicationHelper
+  def bbb_endpoint
+    logger.info APP_CONFIG
+    #if ((defined? APP_CONFIG).to_s == 'constant') && (APP_CONFIG.has_key?('bbb_endpoint'))
+    #  APP_CONFIG['bbb_endpoint']
+    #else
+      'http://test-install.blindsidenetworks.com/bigbluebutton/'
+    #end
+  end
+
+  def bbb_secret
+    #if (defined? APP_CONFIG).to_s == 'constant' && (APP_CONFIG.has_key? 'bbb_secret')
+    #  APP_CONFIG['bbb_secret']
+    #else
+      '8cd8ef52e8e101574e400365b55e11a6'
+    #end
+  end
+
+  def random_password(length)
+    o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
+    password = (0...length).map { o[rand(o.length)] }.join
+    return password
+  end
 end
diff --git a/app/helpers/bbb_helper.rb b/app/helpers/bbb_helper.rb
new file mode 100644
index 00000000..d99712bf
--- /dev/null
+++ b/app/helpers/bbb_helper.rb
@@ -0,0 +1,36 @@
+module BbbHelper
+  def bbb_join_url(meeting_token, meeting_recorded=false, user_fullname='User', user_is_moderator=false)
+    bbb ||= BigBlueButton::BigBlueButtonApi.new(helpers.bbb_endpoint + "api", bbb_secret, "0.8", true)
+    if !bbb
+      return { :returncode => false, :messageKey => "BBBAPICallInvalid", :message => "BBB API call invalid." }
+    else
+      meeting_id = (Digest::SHA1.hexdigest("Rails.application.secrets.secret_key_base"+meeting_token)).to_s
+
+      #See if the meeting is running
+      begin
+        bbb_meeting_info = bbb.get_meeting_info( meeting_id, nil )
+      rescue BigBlueButton::BigBlueButtonException => exc
+        logger.info "Message for the log file #{exc.key}: #{exc.message}"
+        #This means that is not created, so create the meeting
+        logout_url = "#{request.base_url}/bbb/close"      #Closes the window after correct logout
+        moderator_password = random_password(12)
+        viewer_password = random_password(12)
+        meeting_options = {:record => meeting_recorded.to_s, :logoutURL => logout_url, :moderatorPW => moderator_password, :attendeePW => viewer_password }
+        bbb.create_meeting(meeting_token, meeting_id, meeting_options)
+
+        #And then get meeting info
+        bbb_meeting_info = bbb.get_meeting_info( meeting_id, nil )
+      end
+
+      #Get the join url
+      if (user_is_moderator)
+        password = bbb_meeting_info[:moderatorPW]
+      else
+        passord = bbb_meeting_info[:attendeePW]
+      end
+      join_url = bbb.join_meeting_url(meeting_id, user_fullname, password )
+      return { :returncode => true, :join_url => join_url, :messageKey => "", :message => "" }
+    end
+  end
+
+end
diff --git a/app/views/bbb/end.html.erb b/app/views/bbb/end.html.erb
new file mode 100644
index 00000000..ad2b2d3f
--- /dev/null
+++ b/app/views/bbb/end.html.erb
@@ -0,0 +1,2 @@
+<h1>Bbb#end</h1>
+<p>Find me in app/views/bbb/end.html.erb</p>
diff --git a/app/views/bbb/join.html.erb b/app/views/bbb/join.html.erb
new file mode 100644
index 00000000..55f29286
--- /dev/null
+++ b/app/views/bbb/join.html.erb
@@ -0,0 +1,2 @@
+<h1>Bbb#join</h1>
+<p>Find me in app/views/bbb/join.html.erb</p>
diff --git a/app/views/errors/error.html.erb b/app/views/errors/error.html.erb
new file mode 100644
index 00000000..f3066b91
--- /dev/null
+++ b/app/views/errors/error.html.erb
@@ -0,0 +1,2 @@
+<h1>Errors#error</h1>
+<p>Find me in app/views/errors/error.html.erb</p>
diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
index 18eee059..9334ddba 100644
--- a/app/views/landing/index.html.erb
+++ b/app/views/landing/index.html.erb
@@ -13,13 +13,13 @@
         </h4>
 
         <!-- Join form -->
-        <div id="landing_page_join_form">
-          <form class="form-inline">
+        <div id="landing_page_join">
+          <form id="join_form" class="form-inline">
             <div class="form-group">
-              <label for="name" class="sr-only">Name</label>
-              <input type="text" class="form-control input" id="name" placeholder="Your name">
+              <label for="join_form_name" class="sr-only">Name</label>
+              <input id="join_form_name" type="text" class="form-control input" id="name" placeholder="Your name" required>
             </div>
-            <button type="submit" class="btn btn-success">Join</button>
+            <button id="join_form_button" type="button" class="btn btn-success" data-url="<%= bbb_join_path(@meeting_token) %>">Join</button>
           </form>
         </div>
       </div>
@@ -38,11 +38,31 @@
       <div id="landing_page_footer_oauth_append">
         <p>You can have a personal URL (with recordings) by signing in below</p>
       </div>
-
         
     </div>
-    
-    
+  
   </div>
 
-</div>
\ No newline at end of file
+</div>
+
+<script>
+$(document).ready(function($) {
+  $('#join_form_button').click (function (event) {
+    $.ajax({
+      url : $(this).data ('url') + "?name=" + $('#join_form_name').val(),
+      dataType : "json",
+      async : true,
+      type : 'GET',
+      success : function(data) {
+        $(location).attr("href", data.response.join_url);
+      },
+      error : function(xhr, status, error) {
+        console.info(status);
+        console.info(error);
+      },
+      complete : function(xhr, status) {
+      }
+    });
+  });
+});
+</script>
diff --git a/config/config.yml b/config/config.yml
new file mode 100644
index 00000000..e72a9fec
--- /dev/null
+++ b/config/config.yml
@@ -0,0 +1,3 @@
+default:
+  bbb_endpoint: <%= ENV['BIGBLUEBUTTON_ENDPOINT'] %>
+  bbb_secret: <%= ENV['BIGBLUEBUTTON_SECRET'] %>
diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb
new file mode 100644
index 00000000..46b175b5
--- /dev/null
+++ b/config/initializers/load_config.rb
@@ -0,0 +1 @@
+APP_CONFIG = YAML.load_file("#{Rails.root}/config/config.yml")[Rails.env]
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 57c3044e..4da8b4c6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,7 @@
 Rails.application.routes.draw do
+  get 'bbb/join/:id', to: 'bbb#join', as: :bbb_join
+  get 'bbb/close'
+
   get 'meeting(/:id)', to: 'landing#index'
 
   root to: 'landing#index'
diff --git a/sample.env b/sample.env
new file mode 100644
index 00000000..132c23d3
--- /dev/null
+++ b/sample.env
@@ -0,0 +1,8 @@
+# This is a sample of the environment variables you will need for development
+# To use, copy this file to .env `cp sample.env .env`
+
+RAILS_ENV=development
+
+# BigBlueButton
+BIGBLUEBUTTON_ENDPOINT=http://test-install.blindsidenetworks.com/bigbluebutton/
+BIGBLUEBUTTON_SECRET=8cd8ef52e8e101574e400365b55e11a6
\ No newline at end of file
diff --git a/test/controllers/bbb_controller_test.rb b/test/controllers/bbb_controller_test.rb
new file mode 100644
index 00000000..4c017be1
--- /dev/null
+++ b/test/controllers/bbb_controller_test.rb
@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class BbbControllerTest < ActionDispatch::IntegrationTest
+  test "should get join" do
+    get bbb_join_url
+    assert_response :success
+  end
+
+  test "should get end" do
+    get bbb_end_url
+    assert_response :success
+  end
+
+end