Skip to content

Commit

Permalink
update:軽微な修正
Browse files Browse the repository at this point in the history
  • Loading branch information
kaoru-528 committed Oct 26, 2024
1 parent 68d1ce1 commit f205c16
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 69 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,6 @@ span.image {
}

.book{
width: 20%;
width: 30%;
height: auto;
}
2 changes: 1 addition & 1 deletion app/controllers/password_resets_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def get_user
end

def valid_user
return if @user&.activated? && @user&.authenticated?(:reset, params[:id])
return if @user&.activated? && @user.authenticated?(:reset, params[:id])

redirect_to root_url
end
Expand Down
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# Suppress logger output for asset requests.
config.assets.quiet = true

config.hosts << "taruha.site"
config.hosts << 'taruha.site'
# Raises error for missing translations.
# config.i18n.raise_on_missing_translations = true

Expand Down
2 changes: 1 addition & 1 deletion config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
plugin :tmp_restart

# 本番環境の場合、socketを使う
bind "unix:///home/ubuntu/www/book_log_list/shared/tmp/sockets/puma.sock" if ENV.fetch("RAILS_ENV") == "production"
bind 'unix:///home/ubuntu/www/book_log_list/shared/tmp/sockets/puma.sock' if ENV.fetch('RAILS_ENV') == 'production'
131 changes: 66 additions & 65 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,85 +10,86 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.0].define(version: 2024_10_15_025040) do
ActiveRecord::Schema[7.0].define(version: 20_241_015_025_040) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
enable_extension 'plpgsql'

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.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
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.datetime 'created_at', null: false
t.index ['blob_id'], name: 'index_active_storage_attachments_on_blob_id'
t.index %w[record_type record_id name blob_id], name: 'index_active_storage_attachments_uniqueness',
unique: true
end

create_table "active_storage_blobs", force: :cascade do |t|
t.string "key", null: false
t.string "filename", null: false
t.string "content_type"
t.text "metadata"
t.string "service_name", null: false
t.bigint "byte_size", null: false
t.string "checksum"
t.datetime "created_at", null: false
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
create_table 'active_storage_blobs', force: :cascade do |t|
t.string 'key', null: false
t.string 'filename', null: false
t.string 'content_type'
t.text 'metadata'
t.string 'service_name', null: false
t.bigint 'byte_size', null: false
t.string 'checksum'
t.datetime 'created_at', null: false
t.index ['key'], name: 'index_active_storage_blobs_on_key', unique: true
end

create_table "active_storage_variant_records", force: :cascade do |t|
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
create_table 'active_storage_variant_records', force: :cascade do |t|
t.bigint 'blob_id', null: false
t.string 'variation_digest', null: false
t.index %w[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true
end

create_table "books", force: :cascade do |t|
t.string "title"
t.string "author"
t.integer "image"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
create_table 'books', force: :cascade do |t|
t.string 'title'
t.string 'author'
t.integer 'image'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
end

create_table "microposts", force: :cascade do |t|
t.text "content"
t.bigint "user_id", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "title"
t.string "image_url"
t.text "comment"
t.index ["user_id", "created_at"], name: "index_microposts_on_user_id_and_created_at"
t.index ["user_id"], name: "index_microposts_on_user_id"
create_table 'microposts', force: :cascade do |t|
t.text 'content'
t.bigint 'user_id', null: false
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.string 'title'
t.string 'image_url'
t.text 'comment'
t.index %w[user_id created_at], name: 'index_microposts_on_user_id_and_created_at'
t.index ['user_id'], name: 'index_microposts_on_user_id'
end

create_table "relationships", force: :cascade do |t|
t.integer "follower_id"
t.integer "followed_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["followed_id"], name: "index_relationships_on_followed_id"
t.index ["follower_id", "followed_id"], name: "index_relationships_on_follower_id_and_followed_id", unique: true
t.index ["follower_id"], name: "index_relationships_on_follower_id"
create_table 'relationships', force: :cascade do |t|
t.integer 'follower_id'
t.integer 'followed_id'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.index ['followed_id'], name: 'index_relationships_on_followed_id'
t.index %w[follower_id followed_id], name: 'index_relationships_on_follower_id_and_followed_id', unique: true
t.index ['follower_id'], name: 'index_relationships_on_follower_id'
end

create_table "users", force: :cascade do |t|
t.string "name"
t.string "email"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "password_digest"
t.string "remember_digest"
t.boolean "admin", default: false
t.string "activation_digest"
t.boolean "activated", default: false
t.datetime "activated_at"
t.string "reset_digest"
t.datetime "reset_sent_at"
t.index ["email"], name: "index_users_on_email", unique: true
create_table 'users', force: :cascade do |t|
t.string 'name'
t.string 'email'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.string 'password_digest'
t.string 'remember_digest'
t.boolean 'admin', default: false
t.string 'activation_digest'
t.boolean 'activated', default: false
t.datetime 'activated_at'
t.string 'reset_digest'
t.datetime 'reset_sent_at'
t.index ['email'], name: 'index_users_on_email', unique: true
end

add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "microposts", "users"
add_foreign_key 'active_storage_attachments', 'active_storage_blobs', column: 'blob_id'
add_foreign_key 'active_storage_variant_records', 'active_storage_blobs', column: 'blob_id'
add_foreign_key 'microposts', 'users'
end

0 comments on commit f205c16

Please sign in to comment.