From 383d59703f1f0e066c115e0ab469c3f28d44af77 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sun, 25 Dec 2022 16:01:40 -0800 Subject: [PATCH 1/3] Add theme to user table and blueprint --- app/blueprints/api/v1/user_blueprint.rb | 2 +- db/migrate/20221225235726_add_theme_to_user.rb | 5 +++++ db/schema.rb | 7 ++----- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20221225235726_add_theme_to_user.rb diff --git a/app/blueprints/api/v1/user_blueprint.rb b/app/blueprints/api/v1/user_blueprint.rb index dace3a7..6762f0a 100644 --- a/app/blueprints/api/v1/user_blueprint.rb +++ b/app/blueprints/api/v1/user_blueprint.rb @@ -4,7 +4,7 @@ module Api module V1 class UserBlueprint < ApiBlueprint view :minimal do - fields :username, :language, :private, :gender + fields :username, :language, :private, :gender, :theme field :avatar do |user| { picture: user.picture, diff --git a/db/migrate/20221225235726_add_theme_to_user.rb b/db/migrate/20221225235726_add_theme_to_user.rb new file mode 100644 index 0000000..a4c41d5 --- /dev/null +++ b/db/migrate/20221225235726_add_theme_to_user.rb @@ -0,0 +1,5 @@ +class AddThemeToUser < ActiveRecord::Migration[6.1] + def change + add_column :users, :theme, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 6f0ca67..457ebf0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_12_24_065845) do +ActiveRecord::Schema.define(version: 2022_12_25_235726) do # These are extensions that must be enabled in order to support this database enable_extension "btree_gin" enable_extension "pg_trgm" enable_extension "pgcrypto" enable_extension "plpgsql" - enable_extension "timescaledb" create_table "characters", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.string "name_en" @@ -105,9 +104,6 @@ ActiveRecord::Schema.define(version: 2022_12_24_065845) do t.integer "awakening_level", default: 1, null: false t.index ["party_id"], name: "index_grid_weapons_on_party_id" t.index ["weapon_id"], name: "index_grid_weapons_on_weapon_id" - t.index ["weapon_key1_id"], name: "index_grid_weapons_on_weapon_key1_id" - t.index ["weapon_key2_id"], name: "index_grid_weapons_on_weapon_key2_id" - t.index ["weapon_key3_id"], name: "index_grid_weapons_on_weapon_key3_id" end create_table "job_skills", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| @@ -243,6 +239,7 @@ ActiveRecord::Schema.define(version: 2022_12_24_065845) do t.boolean "private", default: false, null: false t.string "element", default: "water", null: false t.integer "gender", default: 0, null: false + t.string "theme" end create_table "weapon_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| From e9dbc36f2aed75d23c2946d110d9a28aa3d523b6 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sun, 25 Dec 2022 16:11:51 -0800 Subject: [PATCH 2/3] Add default value to theme in user table --- db/migrate/20221226000952_set_default_value_to_theme.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20221226000952_set_default_value_to_theme.rb diff --git a/db/migrate/20221226000952_set_default_value_to_theme.rb b/db/migrate/20221226000952_set_default_value_to_theme.rb new file mode 100644 index 0000000..4bff6fb --- /dev/null +++ b/db/migrate/20221226000952_set_default_value_to_theme.rb @@ -0,0 +1,5 @@ +class SetDefaultValueToTheme < ActiveRecord::Migration[6.1] + def change + change_column :users, :theme, :string, null: false, default: 'system' + end +end diff --git a/db/schema.rb b/db/schema.rb index 457ebf0..77c0032 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: 2022_12_25_235726) do +ActiveRecord::Schema.define(version: 2022_12_26_000952) do # These are extensions that must be enabled in order to support this database enable_extension "btree_gin" @@ -239,7 +239,7 @@ ActiveRecord::Schema.define(version: 2022_12_25_235726) do t.boolean "private", default: false, null: false t.string "element", default: "water", null: false t.integer "gender", default: 0, null: false - t.string "theme" + t.string "theme", default: "system", null: false end create_table "weapon_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| From 1752081f3fcef8b67d286b185a20050b2a59a364 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sun, 25 Dec 2022 20:17:20 -0800 Subject: [PATCH 3/3] Output theme --- app/controllers/api/v1/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index cdd9d4e..f259737 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -103,7 +103,7 @@ module Api def user_params params.require(:user).permit( :username, :email, :password, :password_confirmation, - :granblue_id, :picture, :element, :language, :gender, :private + :granblue_id, :picture, :element, :language, :gender, :private, :theme ) end end