From 0dce8d2bf57e3450c9090404727d0cb8eaefee62 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 25 May 2018 11:55:48 -0400 Subject: [PATCH] continue front-end work --- app/assets/images/placeholder-user.jpg | Bin 0 -> 10796 bytes app/assets/stylesheets/application.scss | 13 +++ app/controllers/users_controller.rb | 7 +- app/models/user.rb | 19 +++- app/views/main/index.html.erb | 2 +- app/views/rooms/sessions.html.erb | 40 ++++++++ app/views/shared/_footer.html.erb | 2 +- app/views/shared/_header.html.erb | 13 ++- app/views/shared/_start_meeting.html.erb | 14 +-- .../shared/{ => modals}/_login_modal.html.erb | 14 ++- .../modals/_select_client_modal.html.erb | 32 ++++++ .../shared/{ => modals}/_video_modal.html.erb | 2 +- app/views/users/settings.html.erb | 93 ++++++++++++++++++ config/routes.rb | 3 + db/migrate/20180504131648_create_users.rb | 1 + db/schema.rb | 1 + 16 files changed, 238 insertions(+), 18 deletions(-) create mode 100644 app/assets/images/placeholder-user.jpg rename app/views/shared/{ => modals}/_login_modal.html.erb (69%) create mode 100644 app/views/shared/modals/_select_client_modal.html.erb rename app/views/shared/{ => modals}/_video_modal.html.erb (94%) create mode 100644 app/views/users/settings.html.erb diff --git a/app/assets/images/placeholder-user.jpg b/app/assets/images/placeholder-user.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a1ec342436454258820455483ea79b53dd06bf98 GIT binary patch literal 10796 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 0ba8de4b..a212757b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -68,6 +68,19 @@ html, body { background-color: $rule-color; } +.thumbnail { + height: 60%; + width: auto; +} + +.client-icon { + height: 100px; + width: 100px; + display: flex; + align-items: center; + justify-content: center; +} + .container-fluid { height: 100%; } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c33a1c9a..46e3b05b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,9 +17,14 @@ class UsersController < ApplicationController end end + # GET /settings + def settings + redirect_to root_path unless current_user + end + private def user_params params.require(:user).permit(:name, :email, :username, :password, :password_confirmation) end -end \ No newline at end of file +end diff --git a/app/models/user.rb b/app/models/user.rb index 585e8a15..520c43be 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -26,7 +26,7 @@ class User < ApplicationRecord user.name = send("#{auth['provider']}_name", auth) user.username = send("#{auth['provider']}_username", auth) user.email = send("#{auth['provider']}_email", auth) - + user.image = send("#{auth['provider']}_image", auth) user.save! user end @@ -51,6 +51,10 @@ class User < ApplicationRecord auth['info']['email'] end + def twitter_image(auth) + auth['info']['image'] + end + def google_name(auth) auth['info']['name'] end @@ -62,6 +66,19 @@ class User < ApplicationRecord def google_email(auth) auth['info']['email'] end + + def google_image(auth) + auth['info']['picture'] + end + end + + def subtitle + case provider + when "greenlight", "google", "twitter" + "User" + else + "Unknown" + end end private diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index a4644d5f..7ed62eb0 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -9,7 +9,7 @@ <%= render "shared/features" %> -<%= render "shared/video_modal" %> +<%= render "shared/modals/video_modal" %>