From 640893d4d99a55906bb4a45aad574e8a16eb558e Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Sat, 24 Feb 2024 12:49:29 -0500 Subject: [PATCH 01/14] add visual cue to course index page --- app/assets/stylesheets/courses.scss | 14 ++++++++++++++ app/views/courses/index.html.erb | 12 ++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/courses.scss diff --git a/app/assets/stylesheets/courses.scss b/app/assets/stylesheets/courses.scss new file mode 100644 index 000000000..628c4f4ec --- /dev/null +++ b/app/assets/stylesheets/courses.scss @@ -0,0 +1,14 @@ +.date .collection-item { + padding-left: 24px !important; + padding-right: 24px !important; +} + +.date .collection-item p { + line-height: 1rem; +} + +.date p { + margin: 0; + font-size: 0.85rem; + color: #676464; +} diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 5256f8430..b51ecf397 100755 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -1,3 +1,7 @@ +<% content_for :stylesheets do %> + <%= stylesheet_link_tag "courses" %> +<% end %> +

Courses

<% @listing.each do |category, list| %> @@ -26,9 +30,13 @@ <% end %> <% if category != :completed %> -
+
<% course.current_assessments.ordered.each do |asmt| %> - <%= link_to asmt.display_name, course_assessment_path(course, asmt), class: "collection-item grey-text text-darken-4" %> + <%= link_to course_assessment_path(course, asmt), class: "collection-item grey-text text-darken-4 date" do%> + <%= asmt.display_name %> +

Start: <%= asmt.date_to_s(asmt.start_at) %> | +  Due: <%= asmt.date_to_s(asmt.due_at) %>

+ <% end %> <% end %>
<% end %> From 8a6bf779bd5d85cb9fa9eb55cd4ebc44dba1e6b1 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 26 Feb 2024 04:55:50 -0500 Subject: [PATCH 02/14] Implement toggle for hover --- app/assets/stylesheets/assessments.scss | 10 +++++++ app/controllers/users_controller.rb | 15 +++++++++++ app/views/assessments/index.html.erb | 9 ++++--- app/views/users/show.html.erb | 19 +++++++++++++ config/routes.rb | 1 + ...3719_add_hover_assessment_date_to_users.rb | 5 ++++ db/schema.rb | 27 ++++++++++--------- 7 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 db/migrate/20240226083719_add_hover_assessment_date_to_users.rb diff --git a/app/assets/stylesheets/assessments.scss b/app/assets/stylesheets/assessments.scss index 3fa89c6c7..6c22290b8 100644 --- a/app/assets/stylesheets/assessments.scss +++ b/app/assets/stylesheets/assessments.scss @@ -24,3 +24,13 @@ font-size: 0.85rem; color: #676464; } + +.hover p { + display: none; +} + +.collection-item:hover { + .hover { + display: block; + } +} diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3ad1e15f2..8dca34b5e 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -37,6 +37,8 @@ def show redirect_to(users_path) && return end + @hover_assessment_date = user.hover_assessment_date + if current_user.administrator? # if current user is admin, show whatever he requests @user = user @@ -372,6 +374,19 @@ def update_password_for_user end end + action_auth_level :update_display_settings, :student + def update_display_settings + @user = User.find(params[:id]) + return if params[:user].nil? || params[:user].is_a?(String) || @user.nil? + + if @user.update(hover_assessment_date: params[:user][:hover_assessment_date]) + flash[:success] = "Successfully updated display settings" + (redirect_to user_path(id: @user.id)) && return + else + flash[:error] = "#{@user.errors[:hover_assessment_date][0]}" + end + end + private def new_user_params diff --git a/app/views/assessments/index.html.erb b/app/views/assessments/index.html.erb index 3803f4dc7..87321c70c 100644 --- a/app/views/assessments/index.html.erb +++ b/app/views/assessments/index.html.erb @@ -130,9 +130,11 @@
<% asmts.each do |asmt| %> + <% hoverable = @cud.user.hover_assessment_date ? 'hover' : '' %> + <% asmt_class = "collection-item grey-text text-darken-4 date " + hoverable %> <%= link_to course_assessment_path(@course, asmt), - class: "collection-item grey-text text-darken-4 date" do %> - <%= asmt.display_name %> + class: asmt_class do %> + <%= asmt.display_name %> <% if !asmt.released? %> <% if @cud.instructor? %> @@ -141,7 +143,8 @@ <% end %> <% end %> -

Start: <%= asmt.date_to_s(asmt.start_at) %> | +

+ Start: <%= asmt.date_to_s(asmt.start_at) %> |  Due: <%= asmt.date_to_s(asmt.due_at) %>

<% end %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 99a2f508c..075c08082 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,3 +1,7 @@ + + <% @title = @user.display_name %>

<%= @user.display_name %>

@@ -89,4 +93,19 @@ Managed Authorized Clients <% end %> +

Display Settings

+ <%= form_for @user, url: update_display_settings_user_path(@user) do |f|%> +
    +
  • + Hover to show assessment dates on course page +
    + +

    +
  • +
+ <%= f.submit 'Save', { class: "btn primary" } %> + <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 2da1250c5..0d4cfb71d 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -82,6 +82,7 @@ get "github_oauth_callback", on: :collection match "update_password_for_user", on: :member, via: [:get, :put] post "change_password_for_user", on: :member + patch "update_display_settings", on: :member end resources :courses, param: :name do diff --git a/db/migrate/20240226083719_add_hover_assessment_date_to_users.rb b/db/migrate/20240226083719_add_hover_assessment_date_to_users.rb new file mode 100644 index 000000000..e39c2a072 --- /dev/null +++ b/db/migrate/20240226083719_add_hover_assessment_date_to_users.rb @@ -0,0 +1,5 @@ +class AddHoverAssessmentDateToUsers < ActiveRecord::Migration[6.1] + def change + add_column :users, :hover_assessment_date, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index e2b39aa25..6d46f1f28 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,13 +10,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2024_02_19_175942) do +ActiveRecord::Schema.define(version: 2024_02_26_083719) do create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false - t.bigint "record_id", null: false - t.bigint "blob_id", null: false + t.integer "record_id", null: false + t.integer "blob_id", null: false t.datetime "created_at", null: false t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true @@ -27,7 +27,7 @@ t.string "filename", null: false t.string "content_type" t.text "metadata" - t.bigint "byte_size", null: false + t.integer "byte_size", null: false t.string "checksum", null: false t.datetime "created_at", null: false t.string "service_name", null: false @@ -35,7 +35,7 @@ end create_table "active_storage_variant_records", force: :cascade do |t| - t.bigint "blob_id", null: false + t.integer "blob_id", null: false t.string "variation_digest", null: false t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true end @@ -130,7 +130,7 @@ t.integer "course_id" t.integer "assessment_id" t.string "category_name", default: "General" - t.datetime "release_at", default: -> { "CURRENT_TIMESTAMP" } + t.datetime "release_at" t.index ["assessment_id"], name: "index_attachments_on_assessment_id" end @@ -215,8 +215,8 @@ t.datetime "updated_at", null: false t.string "membership_url" t.string "platform" - t.boolean "auto_sync", default: false - t.boolean "drop_missing_students", default: false + t.boolean "auto_sync" + t.boolean "drop_missing_students" end create_table "module_data", force: :cascade do |t| @@ -311,7 +311,7 @@ t.integer "course_id" t.datetime "created_at" t.datetime "updated_at" - t.datetime "until", default: -> { "CURRENT_TIMESTAMP" } + t.datetime "until" t.boolean "disabled", default: false end @@ -323,14 +323,14 @@ create_table "scoreboards", force: :cascade do |t| t.integer "assessment_id" - t.text "banner" - t.text "colspec" + t.text "banner", limit: 65535 + t.text "colspec", limit: 65535 end create_table "scores", force: :cascade do |t| t.integer "submission_id" t.float "score" - t.text "feedback", size: :medium + t.text "feedback", limit: 16777215 t.integer "problem_id" t.datetime "created_at" t.datetime "updated_at" @@ -356,7 +356,7 @@ t.string "submitter_ip", limit: 40 t.integer "tweak_id" t.boolean "ignored", default: false, null: false - t.string "dave" + t.string "dave", limit: 255 t.text "embedded_quiz_form_answer" t.integer "submitted_by_app_id" t.string "group_key", default: "" @@ -388,6 +388,7 @@ t.string "school" t.string "major" t.string "year" + t.boolean "hover_assessment_date" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true From 38a865f6f619da960c20c038c0f74d03dff24a5a Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 26 Feb 2024 05:00:19 -0500 Subject: [PATCH 03/14] remove bold from course index --- app/views/courses/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index b51ecf397..4e0caeeb3 100755 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -33,7 +33,7 @@
<% course.current_assessments.ordered.each do |asmt| %> <%= link_to course_assessment_path(course, asmt), class: "collection-item grey-text text-darken-4 date" do%> - <%= asmt.display_name %> + <%= asmt.display_name %>

Start: <%= asmt.date_to_s(asmt.start_at) %> |  Due: <%= asmt.date_to_s(asmt.due_at) %>

<% end %> From 38fd11b122fb9a34af95af029c08d05697f7b7d4 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 26 Feb 2024 12:47:27 -0500 Subject: [PATCH 04/14] fix clearfix --- app/controllers/users_controller.rb | 2 +- app/views/assessments/index.html.erb | 42 ++++++++++++++++++++-------- app/views/courses/index.html.erb | 2 +- app/views/users/show.html.erb | 2 +- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8dca34b5e..78b323e0b 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -383,7 +383,7 @@ def update_display_settings flash[:success] = "Successfully updated display settings" (redirect_to user_path(id: @user.id)) && return else - flash[:error] = "#{@user.errors[:hover_assessment_date][0]}" + flash[:error] = @user.errors[:hover_assessment_date][0].to_s end end diff --git a/app/views/assessments/index.html.erb b/app/views/assessments/index.html.erb index 87321c70c..21fced9b2 100644 --- a/app/views/assessments/index.html.erb +++ b/app/views/assessments/index.html.erb @@ -7,6 +7,32 @@ <% content_for :javascripts do %> <%= external_javascript_include_tag "clipboardjs" %> <% @title = @user.display_name %> diff --git a/db/migrate/20240226083719_add_hover_assessment_date_to_users.rb b/db/migrate/20240226083719_add_hover_assessment_date_to_users.rb index e39c2a072..1b93cfe86 100644 --- a/db/migrate/20240226083719_add_hover_assessment_date_to_users.rb +++ b/db/migrate/20240226083719_add_hover_assessment_date_to_users.rb @@ -1,5 +1,5 @@ class AddHoverAssessmentDateToUsers < ActiveRecord::Migration[6.1] def change - add_column :users, :hover_assessment_date, :boolean + add_column :users, :hover_assessment_date, :boolean, default: false, null: false end end diff --git a/db/schema.rb b/db/schema.rb index 6d46f1f28..e4c13fa77 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,8 +15,8 @@ create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false - t.integer "record_id", null: false - t.integer "blob_id", null: false + t.bigint "record_id", null: false + t.bigint "blob_id", null: false t.datetime "created_at", null: false t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true @@ -27,7 +27,7 @@ t.string "filename", null: false t.string "content_type" t.text "metadata" - t.integer "byte_size", null: false + t.bigint "byte_size", null: false t.string "checksum", null: false t.datetime "created_at", null: false t.string "service_name", null: false @@ -35,7 +35,7 @@ end create_table "active_storage_variant_records", force: :cascade do |t| - t.integer "blob_id", null: false + t.bigint "blob_id", null: false t.string "variation_digest", null: false t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true end @@ -130,7 +130,7 @@ t.integer "course_id" t.integer "assessment_id" t.string "category_name", default: "General" - t.datetime "release_at" + t.datetime "release_at", default: -> { "CURRENT_TIMESTAMP" } t.index ["assessment_id"], name: "index_attachments_on_assessment_id" end @@ -215,8 +215,8 @@ t.datetime "updated_at", null: false t.string "membership_url" t.string "platform" - t.boolean "auto_sync" - t.boolean "drop_missing_students" + t.boolean "auto_sync", default: false + t.boolean "drop_missing_students", default: false end create_table "module_data", force: :cascade do |t| @@ -311,7 +311,7 @@ t.integer "course_id" t.datetime "created_at" t.datetime "updated_at" - t.datetime "until" + t.datetime "until", default: -> { "CURRENT_TIMESTAMP" } t.boolean "disabled", default: false end @@ -323,8 +323,8 @@ create_table "scoreboards", force: :cascade do |t| t.integer "assessment_id" - t.text "banner", limit: 65535 - t.text "colspec", limit: 65535 + t.text "banner" + t.text "colspec" end create_table "scores", force: :cascade do |t| @@ -356,7 +356,7 @@ t.string "submitter_ip", limit: 40 t.integer "tweak_id" t.boolean "ignored", default: false, null: false - t.string "dave", limit: 255 + t.string "dave" t.text "embedded_quiz_form_answer" t.integer "submitted_by_app_id" t.string "group_key", default: "" @@ -388,7 +388,7 @@ t.string "school" t.string "major" t.string "year" - t.boolean "hover_assessment_date" + t.boolean "hover_assessment_date", default: false, null: false t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true From b53fc63e5fbf53d77638998679b5c1d577dbe2a3 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 26 Feb 2024 13:31:00 -0500 Subject: [PATCH 07/14] fix schema --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index e4c13fa77..c5baab40a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -330,7 +330,7 @@ create_table "scores", force: :cascade do |t| t.integer "submission_id" t.float "score" - t.text "feedback", limit: 16777215 + t.text "feedback", size: medium t.integer "problem_id" t.datetime "created_at" t.datetime "updated_at" From d265f9c0f8674a21d639068db32d6e281b0e22c8 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 26 Feb 2024 13:31:29 -0500 Subject: [PATCH 08/14] fix schema --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index c5baab40a..e4e27a00d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -330,7 +330,7 @@ create_table "scores", force: :cascade do |t| t.integer "submission_id" t.float "score" - t.text "feedback", size: medium + t.text "feedback", size: :medium t.integer "problem_id" t.datetime "created_at" t.datetime "updated_at" From c3fcdcf62ce45a9d3dd92a95eca7a6e1d54a0677 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 26 Feb 2024 17:34:46 -0500 Subject: [PATCH 09/14] add content for tag --- app/views/users/show.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 8f24bd73f..53670bcd4 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,6 +1,8 @@ +<% content_for :javascripts do %> +<% end %> <% @title = @user.display_name %> From 9bc4424a181046a660f71a6cd9518ff9b594fa21 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 11 Mar 2024 15:03:32 -0400 Subject: [PATCH 10/14] Address comments and fix clearfix --- app/assets/stylesheets/_variables.scss | 1 + .../{courses.scss => assessment_date.scss} | 4 +- app/assets/stylesheets/assessments.scss | 15 -------- app/views/assessments/index.html.erb | 38 ++++++++++--------- app/views/courses/index.html.erb | 5 ++- app/views/users/show.html.erb | 6 +-- 6 files changed, 30 insertions(+), 39 deletions(-) rename app/assets/stylesheets/{courses.scss => assessment_date.scss} (74%) diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss index bacd94b70..a71183d7f 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/assets/stylesheets/_variables.scss @@ -11,3 +11,4 @@ $autolab-green: #3a862d; $autolab-white: #fff; $autolab-selected-gray: #f5f5f5; $autolab-border-gray: #f4f1f1; +$autolab-gray-text: #676464; diff --git a/app/assets/stylesheets/courses.scss b/app/assets/stylesheets/assessment_date.scss similarity index 74% rename from app/assets/stylesheets/courses.scss rename to app/assets/stylesheets/assessment_date.scss index 628c4f4ec..2e7805b94 100644 --- a/app/assets/stylesheets/courses.scss +++ b/app/assets/stylesheets/assessment_date.scss @@ -1,3 +1,5 @@ +@import 'variables'; + .date .collection-item { padding-left: 24px !important; padding-right: 24px !important; @@ -10,5 +12,5 @@ .date p { margin: 0; font-size: 0.85rem; - color: #676464; + color: $autolab-gray-text; } diff --git a/app/assets/stylesheets/assessments.scss b/app/assets/stylesheets/assessments.scss index 6c22290b8..f56a0be06 100644 --- a/app/assets/stylesheets/assessments.scss +++ b/app/assets/stylesheets/assessments.scss @@ -10,21 +10,6 @@ margin-bottom: 0 !important; } -.date .collection-item { - padding-left: 24px !important; - padding-right: 24px !important; -} - -.date .collection-item p { - line-height: 1rem; -} - -.date p { - margin: 0; - font-size: 0.85rem; - color: #676464; -} - .hover p { display: none; } diff --git a/app/views/assessments/index.html.erb b/app/views/assessments/index.html.erb index d65ec6b0c..80123803e 100644 --- a/app/views/assessments/index.html.erb +++ b/app/views/assessments/index.html.erb @@ -7,24 +7,25 @@ <% content_for :javascripts do %> <%= external_javascript_include_tag "clipboardjs" %> + <% end %> <% @title = @user.display_name %> From a6256c27addc7a2cd0bab9be599f82384cf018d4 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 11 Mar 2024 15:43:02 -0400 Subject: [PATCH 11/14] Move date to partial --- app/views/assessments/_assessment_date.html.erb | 5 +++++ app/views/assessments/index.html.erb | 5 ++--- app/views/courses/index.html.erb | 4 +--- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 app/views/assessments/_assessment_date.html.erb diff --git a/app/views/assessments/_assessment_date.html.erb b/app/views/assessments/_assessment_date.html.erb new file mode 100644 index 000000000..564a65ed2 --- /dev/null +++ b/app/views/assessments/_assessment_date.html.erb @@ -0,0 +1,5 @@ +<% hoverable = hover %> +

+ Start: <%= assessment.date_to_s(assessment.start_at) %> | +  Due: <%= assessment.date_to_s(assessment.due_at) %> +

\ No newline at end of file diff --git a/app/views/assessments/index.html.erb b/app/views/assessments/index.html.erb index 80123803e..0eb9380bc 100644 --- a/app/views/assessments/index.html.erb +++ b/app/views/assessments/index.html.erb @@ -164,9 +164,8 @@ <% end %> <% end %> -

- Start: <%= asmt.date_to_s(asmt.start_at) %> | -  Due: <%= asmt.date_to_s(asmt.due_at) %>

+ <% hoverable = @cud.user.hover_assessment_date ? 'hover' : '' %> + <%= render partial: 'assessment_date', locals: { assessment: asmt, hover: hoverable } %> <% end %> <% end %>
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 1576a13cf..ac603ff69 100755 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -34,9 +34,7 @@ <% course.current_assessments.ordered.each do |asmt| %> <%= link_to course_assessment_path(course, asmt), class: "collection-item grey-text text-darken-4 date" do %> <%= asmt.display_name %> -

Start: <%= asmt.date_to_s(asmt.start_at) %> | -  Due: <%= asmt.date_to_s(asmt.due_at) %> -

+ <%= render partial: 'assessments/assessment_date', locals: { assessment: asmt, hover: '' } %> <% end %> <% end %>
From 2103a2dbe2f34db1d22ebcda77797bebc2de06d1 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 11 Mar 2024 17:47:10 -0400 Subject: [PATCH 12/14] Change line endings --- app/views/assessments/_assessment_date.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/assessments/_assessment_date.html.erb b/app/views/assessments/_assessment_date.html.erb index 564a65ed2..040d5e240 100644 --- a/app/views/assessments/_assessment_date.html.erb +++ b/app/views/assessments/_assessment_date.html.erb @@ -1,5 +1,5 @@ -<% hoverable = hover %> -

- Start: <%= assessment.date_to_s(assessment.start_at) %> | -  Due: <%= assessment.date_to_s(assessment.due_at) %> -

\ No newline at end of file +<% hoverable = hover %> +

+ Start: <%= assessment.date_to_s(assessment.start_at) %> | +  Due: <%= assessment.date_to_s(assessment.due_at) %> +

From 409e80cd22e0cfe943f37a0997a9afde8acf9bb0 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Mon, 11 Mar 2024 17:52:24 -0400 Subject: [PATCH 13/14] fix schema --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 2be289cf5..9f776836b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2024_02_26_083719) do +ActiveRecord::Schema.define(version: 2024_02_26_194217) do create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false From 1fe1a6fec1e9f00c89a46c828264d889544f8b79 Mon Sep 17 00:00:00 2001 From: Joanna Ge Date: Sat, 16 Mar 2024 12:40:03 -0400 Subject: [PATCH 14/14] Remove dead code --- app/views/users/show.html.erb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index cfda40ad1..ebaa86282 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,9 +1,3 @@ -<% content_for :javascripts do %> - -<% end %> - <% @title = @user.display_name %>

<%= @user.display_name %>