From 5ab8aa99db3df3deb50b57a184d2e1aaea61bbeb Mon Sep 17 00:00:00 2001 From: Mini Robot Date: Fri, 19 Jan 2018 20:24:00 +0100 Subject: [PATCH] d --- config/application.rb | 2 +- .../20180119145343_devise_create_admins.rb | 8 +++---- db/schema.rb | 23 ++++++++++++++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/config/application.rb b/config/application.rb index a1f6136..7931d11 100644 --- a/config/application.rb +++ b/config/application.rb @@ -6,7 +6,7 @@ require 'rails/all' # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) -module SimpleCrm +module SimpleCms class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 5.1 diff --git a/db/migrate/20180119145343_devise_create_admins.rb b/db/migrate/20180119145343_devise_create_admins.rb index 92063de..254b261 100644 --- a/db/migrate/20180119145343_devise_create_admins.rb +++ b/db/migrate/20180119145343_devise_create_admins.rb @@ -26,9 +26,9 @@ class DeviseCreateAdmins < ActiveRecord::Migration[5.1] # t.string :unconfirmed_email # Only if using reconfirmable ## Lockable - # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts - # t.string :unlock_token # Only if unlock strategy is :email or :both - # t.datetime :locked_at + t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + t.string :unlock_token # Only if unlock strategy is :email or :both + t.datetime :locked_at t.timestamps null: false @@ -37,6 +37,6 @@ class DeviseCreateAdmins < ActiveRecord::Migration[5.1] add_index :admins, :email, unique: true add_index :admins, :reset_password_token, unique: true # add_index :admins, :confirmation_token, unique: true - # add_index :admins, :unlock_token, unique: true + add_index :admins, :unlock_token, unique: true end end diff --git a/db/schema.rb b/db/schema.rb index 7ac854c..32e4c73 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,28 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180119143920) do +ActiveRecord::Schema.define(version: 20180119145343) do + + create_table "admins", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_polish_ci" do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.integer "failed_attempts", default: 0, null: false + t.string "unlock_token" + t.datetime "locked_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["email"], name: "index_admins_on_email", unique: true + t.index ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true + t.index ["unlock_token"], name: "index_admins_on_unlock_token", unique: true + end create_table "friendly_id_slugs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_polish_ci" do |t| t.string "slug", null: false