diff --git a/Gemfile b/Gemfile index 53a46175..464451b6 100644 --- a/Gemfile +++ b/Gemfile @@ -41,9 +41,11 @@ gem 'omniauth-google-oauth2' gem 'bigbluebutton-api-ruby' # Front-end. -gem 'bootstrap-sass', '3.3.0.0' -gem 'bootstrap-social-rails', '~> 4.12' -gem 'font-awesome-sass', '4.7.0' +gem 'bootstrap', '~> 4.1.1' +gem 'tabler-rubygem' + +# Fontawesome icons. +gem "font-awesome-sass", '~> 5.0.13' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/Gemfile.lock b/Gemfile.lock index 0af93c99..b3cb64d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,14 +39,16 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (7.1.4) + autoprefixer-rails (8.5.0) + execjs bcrypt (3.1.11) bigbluebutton-api-ruby (1.6.0) xml-simple (~> 1.1) bindex (0.5.0) - bootstrap-sass (3.3.0.0) - sass (~> 3.2) - bootstrap-social-rails (4.12.0) - railties (>= 3.1) + bootstrap (4.1.1) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) builder (3.2.3) byebug (10.0.2) coffee-rails (4.2.2) @@ -75,8 +77,8 @@ GEM faraday (0.12.2) multipart-post (>= 1.2, < 3) ffi (1.9.23) - font-awesome-sass (4.7.0) - sass (>= 3.2) + font-awesome-sass (5.0.13) + sassc (>= 1.11) globalid (0.4.1) activesupport (>= 4.2.0) hashie (3.5.7) @@ -131,6 +133,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack + popper_js (1.12.9) puma (3.11.4) rack (2.0.5) rack-test (0.6.3) @@ -194,6 +197,10 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (1.11.4) + bundler + ffi (~> 1.9.6) + sass (>= 3.3.0) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -207,6 +214,8 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) + tabler-rubygem (0.1.2) + autoprefixer-rails (>= 6.0.3) thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) @@ -233,14 +242,13 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) bigbluebutton-api-ruby - bootstrap-sass (= 3.3.0.0) - bootstrap-social-rails (~> 4.12) + bootstrap (~> 4.1.1) byebug coffee-rails (~> 4.2) dotenv-rails factory_bot_rails faker - font-awesome-sass (= 4.7.0) + font-awesome-sass (~> 5.0.13) jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) @@ -255,6 +263,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) sqlite3 + tabler-rubygem turbolinks (~> 5) tzinfo-data uglifier (>= 1.3.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b12018d0..5ecdd253 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -10,7 +10,7 @@ // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. // -//= require jquery -//= require jquery_ujs +//= require tabler +//= require tabler.plugins //= require turbolinks //= require_tree . diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5bb4b9f4..0ba8de4b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -30,12 +30,42 @@ // You should have received a copy of the GNU Lesser General Public License along // with BigBlueButton; if not, see . +@import "font-awesome-sprockets"; +@import "font-awesome"; + +@import "tabler/variables"; @import "bootstrap"; +@import "tabler"; +@import "tabler.plugins"; + +$background-color: #d1e2ff; +$rule-color: lightblue; + +.video-container { + position: relative; + width: 100%; + height: 0; + padding-bottom: 56.25%; +} + +iframe{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } html, body { width: 100%; height: 100%; - background: #ffffff; + background: linear-gradient(180deg, $background-color 50%, white 50%); +} + +.small-rule { + width: 25%; + border-width: 3px; + background-color: $rule-color; } .container-fluid { @@ -158,4 +188,4 @@ body[data-controller=landing].app-background { top: 0; right: 0; padding-right: 3px; -} \ No newline at end of file +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6cc921c1..a0bd83ef 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,8 +10,7 @@ + data-current-user="<%= current_user.try(:encrypted_id) %>">
@@ -27,17 +26,10 @@
- -
- - <% if current_user %> - <%= link_to image_tag("bbb_logo.png", :alt => "BigBlueButton", :class => "logo"), room_path(current_user) %> - <% else %> - <%= link_to image_tag("bbb_logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %> - <% end %> - -
+ <%= render "shared/header" %> <%= yield %> + + <%= render "shared/footer" %> diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index df729989..a4644d5f 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -1,36 +1,18 @@ -<% content_for :title do %> -
-

Landing Title

-
-<% end %> +
+

Teach Students Online

+
-
-
+ <%= render "shared/start_meeting" %> -
- <%= render layout: 'shared/center_panel' do %> -
- <%= form_for(:meeting, url: create_meeting_path) do |f| %> -
- <%= f.label :name, "Name" %> - <%= f.text_field :name %> -
-
- <%= f.submit "Start Meeting", class: "btn white-text light-green" %> - <% end %> -
- <% end %> -
+
- <% unless configured_providers.empty? %> - - <% end %> - -
- -
- -
+ <%= render "shared/features" %>
+ +<%= render "shared/video_modal" %> + + diff --git a/app/views/shared/_features.html.erb b/app/views/shared/_features.html.erb new file mode 100644 index 00000000..a0586ce2 --- /dev/null +++ b/app/views/shared/_features.html.erb @@ -0,0 +1,11 @@ +

Features

+
+ +
+
+

Feature One

+
+
+

Feature Two

+
+
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb new file mode 100644 index 00000000..7ca0198d --- /dev/null +++ b/app/views/shared/_footer.html.erb @@ -0,0 +1,3 @@ + diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb new file mode 100644 index 00000000..faa8b949 --- /dev/null +++ b/app/views/shared/_header.html.erb @@ -0,0 +1,27 @@ +
+
+
+ + <%= image_tag("bbb_logo.png", class: "header-brand-img") %> + + +
+ <% if current_user %> + + <% else %> + + + <%= render "shared/login_modal" %> + <% end %> +
+
+
+
diff --git a/app/views/shared/_login_modal.html.erb b/app/views/shared/_login_modal.html.erb new file mode 100644 index 00000000..a14c9a82 --- /dev/null +++ b/app/views/shared/_login_modal.html.erb @@ -0,0 +1,35 @@ + diff --git a/app/views/shared/_start_meeting.html.erb b/app/views/shared/_start_meeting.html.erb new file mode 100644 index 00000000..21d583e3 --- /dev/null +++ b/app/views/shared/_start_meeting.html.erb @@ -0,0 +1,15 @@ +
+
+
+
+ + + + +
+
+
+ +
diff --git a/app/views/shared/_video_modal.html.erb b/app/views/shared/_video_modal.html.erb new file mode 100644 index 00000000..c16c8054 --- /dev/null +++ b/app/views/shared/_video_modal.html.erb @@ -0,0 +1,23 @@ +