From ede80075c1a8b96bbc482a73d406d1a9857b201b Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 31 May 2018 15:04:18 -0400 Subject: [PATCH] redo rooms page --- app/assets/images/logo_with_text.png | Bin 0 -> 6755 bytes app/assets/stylesheets/application.scss | 18 +++-- app/controllers/main_controller.rb | 1 + app/controllers/rooms_controller.rb | 12 ++- app/controllers/users_controller.rb | 10 +-- app/helpers/sessions_helper.rb | 4 +- app/models/room.rb | 11 ++- app/models/user.rb | 10 ++- app/views/layouts/application.html.erb | 4 +- app/views/main/index.html.erb | 25 +----- app/views/rooms/sessions.html.erb | 6 +- app/views/rooms/show.html.erb | 63 ++++++++++++--- app/views/shared/_header.html.erb | 11 +-- app/views/shared/_meeting_url.html.erb | 42 ---------- app/views/shared/_sessions.html.erb | 76 ++++++++++++++++++ app/views/shared/_start_meeting.html.erb | 31 ------- .../shared/components/_room_block.html.erb | 10 ++- .../shared/components/_subtitle.html.erb | 2 +- .../shared/modals/_create_room_modal.html.erb | 19 ++++- app/views/shared/modals/_login_modal.html.erb | 4 - .../shared/modals/_signup_modal.html.erb | 38 +++++++++ app/views/users/new.html.erb | 0 app/views/users/settings.html.erb | 6 +- config/routes.rb | 3 +- db/migrate/20180504131648_create_users.rb | 1 + db/migrate/20180504131705_create_rooms.rb | 1 + db/schema.rb | 4 + 27 files changed, 258 insertions(+), 154 deletions(-) create mode 100644 app/assets/images/logo_with_text.png delete mode 100644 app/views/shared/_meeting_url.html.erb create mode 100644 app/views/shared/_sessions.html.erb create mode 100644 app/views/shared/modals/_signup_modal.html.erb delete mode 100644 app/views/users/new.html.erb diff --git a/app/assets/images/logo_with_text.png b/app/assets/images/logo_with_text.png new file mode 100644 index 0000000000000000000000000000000000000000..6fa57f4f336567665c050afdf11c6ea085bd9e8b GIT binary patch literal 6755 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 - <%= render "shared/footer" %> - <% if current_user %> <%= render "shared/modals/create_room_modal" %> <% end %> + + <%= render "shared/footer" %> diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 8eab997f..9d8a8f60 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -1,28 +1,11 @@
- <% if current_user %> -

<%= "Welcome, #{current_user.firstname}." %>

- <% else %> -

Teach Students Online.

- <%= render "shared/modals/video_modal" %> - <% end %> +

Teach Students Online.

+ <%= render "shared/modals/video_modal" %> +
- <% if current_user %> -
- <% current_user.rooms.each do |room| %> -
- <%= link_to room do %> - <%= render "shared/components/room_block", room: room %> - <% end %> -
- <% end %> -
- -
- <% else %> - <%= render "shared/features" %> - <% end %> + <%= render "shared/features" %>
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index a8d2bff0..54e2843e 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -2,16 +2,14 @@
<%= link_to root_path, class: "header-brand" do %> - <%= image_tag("bbb_logo.png", class: "header-brand-img") %> + <%= image_tag("logo_with_text.png", class: "header-brand-img") %> <% end %>
<% if current_user %> - + Create Room - <%= render "shared/modals/login_modal" %> - Sessions
<% if current_user.image.nil? %> @@ -41,8 +39,11 @@
<% else %> - + + + <%= render "shared/modals/login_modal" %> + <%= render "shared/modals/signup_modal" %> <% end %>
diff --git a/app/views/shared/_meeting_url.html.erb b/app/views/shared/_meeting_url.html.erb deleted file mode 100644 index 051604a4..00000000 --- a/app/views/shared/_meeting_url.html.erb +++ /dev/null @@ -1,42 +0,0 @@ - \ No newline at end of file diff --git a/app/views/shared/_sessions.html.erb b/app/views/shared/_sessions.html.erb new file mode 100644 index 00000000..be4cde5c --- /dev/null +++ b/app/views/shared/_sessions.html.erb @@ -0,0 +1,76 @@ +
+
+ + <%= render "shared/components/subtitle", subtitle: "Sessions" %> + +
+
+
+ + + + + + + + + + + + + <% 3.times do %> + + + + + + + + + + <% end %> + +
NameThumbnailsLengthUsersVisibility
+
Example Meeting
+
+ June 21, 2017 (about 3 hours ago) +
+ 		+ + + + +
+ Length +
+ 1 hr + 		+
+ Users +
+ 4 + 		+
+ Visibility +
+ Unlisted + 		+ Presentation + Podcast + +
+ +
+ Action + Another action + Something else here +
+ Separated link +
+
+
+
+
+
+
+
diff --git a/app/views/shared/_start_meeting.html.erb b/app/views/shared/_start_meeting.html.erb index 3b05d2f9..be62209c 100644 --- a/app/views/shared/_start_meeting.html.erb +++ b/app/views/shared/_start_meeting.html.erb @@ -26,34 +26,3 @@ - - diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb index c233df59..33f8922d 100644 --- a/app/views/shared/components/_room_block.html.erb +++ b/app/views/shared/components/_room_block.html.erb @@ -3,7 +3,9 @@
- + + +
<%= room.name %>
@@ -17,8 +19,10 @@
Action Another action - <%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %> - Delete + <% if room != current_user.main_room %> + <%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %> + Delete + <% end %> <% end %>
diff --git a/app/views/shared/components/_subtitle.html.erb b/app/views/shared/components/_subtitle.html.erb index 8b9a16d0..3025ac0a 100644 --- a/app/views/shared/components/_subtitle.html.erb +++ b/app/views/shared/components/_subtitle.html.erb @@ -1,5 +1,5 @@
-
+

<%= subtitle %>

diff --git a/app/views/shared/modals/_create_room_modal.html.erb b/app/views/shared/modals/_create_room_modal.html.erb index b0bb0987..94aa40e2 100644 --- a/app/views/shared/modals/_create_room_modal.html.erb +++ b/app/views/shared/modals/_create_room_modal.html.erb @@ -13,15 +13,14 @@ - <%= f.text_field :name, class: "form-control", placeholder: "Enter a room name...", autocomplete: :off %> -
+ <%= f.text_field :name, id: "room-name", class: "form-control", placeholder: "Enter a room name...", autocomplete: :off %>
- <%= f.submit "Create Room", class: "btn btn-outline-primary btn-block btn-pill" %> + <%= f.submit "Create Room", id: "create-room-submit", class: "btn btn-outline-primary btn-block btn-pill" %>
<% end %> @@ -32,3 +31,15 @@ + + diff --git a/app/views/shared/modals/_login_modal.html.erb b/app/views/shared/modals/_login_modal.html.erb index 2d417612..cd9ae0f8 100644 --- a/app/views/shared/modals/_login_modal.html.erb +++ b/app/views/shared/modals/_login_modal.html.erb @@ -35,11 +35,7 @@ -
- <%= link_to "Don't have an account, sign up!", "google.com" %> -
- diff --git a/app/views/shared/modals/_signup_modal.html.erb b/app/views/shared/modals/_signup_modal.html.erb new file mode 100644 index 00000000..84f80241 --- /dev/null +++ b/app/views/shared/modals/_signup_modal.html.erb @@ -0,0 +1,38 @@ + diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb deleted file mode 100644 index e69de29b..00000000 diff --git a/app/views/users/settings.html.erb b/app/views/users/settings.html.erb index af1add04..4bd51ae3 100644 --- a/app/views/users/settings.html.erb +++ b/app/views/users/settings.html.erb @@ -3,13 +3,13 @@ <%= render "shared/components/subtitle", subtitle: "Settings" %>
-
+
-
+
@@ -58,7 +58,7 @@
-
+

diff --git a/config/routes.rb b/config/routes.rb index dbbb0349..4be78eea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,8 +12,7 @@ Rails.application.routes.draw do get '/sessions', to: 'rooms#sessions', as: :sessions end - # Signup routes. - get '/signup', to: 'users#new' + # Signup route. post '/signup', to: 'users#create' # User settings. diff --git a/db/migrate/20180504131648_create_users.rb b/db/migrate/20180504131648_create_users.rb index 5bcb6b34..e7d4da27 100644 --- a/db/migrate/20180504131648_create_users.rb +++ b/db/migrate/20180504131648_create_users.rb @@ -1,6 +1,7 @@ class CreateUsers < ActiveRecord::Migration[5.0] def change create_table :users do |t| + t.belongs_to :room, index: true t.string :provider t.string :uid t.string :name diff --git a/db/migrate/20180504131705_create_rooms.rb b/db/migrate/20180504131705_create_rooms.rb index 2ba7ba75..e07d068d 100644 --- a/db/migrate/20180504131705_create_rooms.rb +++ b/db/migrate/20180504131705_create_rooms.rb @@ -5,6 +5,7 @@ class CreateRooms < ActiveRecord::Migration[5.0] t.string :name, index: true t.string :uid, index: true t.string :bbb_id, index: true + t.string :icon, index: true t.timestamps end diff --git a/db/schema.rb b/db/schema.rb index 47860038..238d641e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -17,15 +17,18 @@ ActiveRecord::Schema.define(version: 20180504131705) do t.string "name" t.string "uid" t.string "bbb_id" + t.string "icon" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["bbb_id"], name: "index_rooms_on_bbb_id" + t.index ["icon"], name: "index_rooms_on_icon" t.index ["name"], name: "index_rooms_on_name" t.index ["uid"], name: "index_rooms_on_uid" t.index ["user_id"], name: "index_rooms_on_user_id" end create_table "users", force: :cascade do |t| + t.integer "room_id" t.string "provider" t.string "uid" t.string "name" @@ -36,6 +39,7 @@ ActiveRecord::Schema.define(version: 20180504131705) do t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["password_digest"], name: "index_users_on_password_digest", unique: true + t.index ["room_id"], name: "index_users_on_room_id" end end