From fb4da722abe97fc0e99d4b4c03c6f6f7f17784c3 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 9 Feb 2014 23:48:05 -0500 Subject: [PATCH] removed extra migrate files --- app/assets/stylesheets/base.css | 2 +- db/migrate/20120920013446_create_users.rb | 17 ------ db/migrate/20121005160234_create_synapses.rb | 15 ----- db/migrate/20121023231434_create_maps.rb | 12 ---- db/migrate/20121026000731_create_mappings.rb | 14 ----- db/migrate/20130101193917_create_topics.rb | 13 ----- db/migrate/20130101194424_create_metacodes.rb | 10 ---- db/migrate/20130709192842_add_devise.rb | 55 ------------------- ...0709212556_add_password_reset_to_devise.rb | 5 -- 9 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 db/migrate/20120920013446_create_users.rb delete mode 100644 db/migrate/20121005160234_create_synapses.rb delete mode 100644 db/migrate/20121023231434_create_maps.rb delete mode 100644 db/migrate/20121026000731_create_mappings.rb delete mode 100644 db/migrate/20130101193917_create_topics.rb delete mode 100644 db/migrate/20130101194424_create_metacodes.rb delete mode 100644 db/migrate/20130709192842_add_devise.rb delete mode 100644 db/migrate/20130709212556_add_password_reset_to_devise.rb diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index cc69049e..4a174b66 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -399,7 +399,7 @@ font-family: 'LatoLight'; background: #FFF; border-radius:5px; box-shadow: 6px 6px 8px rgba(0,0,0,0.4); - margin:16px; + margin:16px 16px 16px 19px; } .mapCard { diff --git a/db/migrate/20120920013446_create_users.rb b/db/migrate/20120920013446_create_users.rb deleted file mode 100644 index b120c2ff..00000000 --- a/db/migrate/20120920013446_create_users.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.text :settings - t.string :code, :limit => 8 - t.string :joinedwithcode, :limit => 8 - t.string :crypted_password - t.string :password_salt - t.string :persistence_token - t.string :perishable_token - - t.timestamps - end - end -end diff --git a/db/migrate/20121005160234_create_synapses.rb b/db/migrate/20121005160234_create_synapses.rb deleted file mode 100644 index 4ff17811..00000000 --- a/db/migrate/20121005160234_create_synapses.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateSynapses < ActiveRecord::Migration - def change - create_table :synapses do |t| - t.text :desc - t.text :category - t.text :weight - t.text :permission - t.integer :node1_id - t.integer :node2_id - t.integer :user_id - - t.timestamps - end - end -end diff --git a/db/migrate/20121023231434_create_maps.rb b/db/migrate/20121023231434_create_maps.rb deleted file mode 100644 index f28c31e4..00000000 --- a/db/migrate/20121023231434_create_maps.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateMaps < ActiveRecord::Migration - def change - create_table :maps do |t| - t.text :name - t.boolean :arranged - t.text :desc - t.text :permission - t.integer :user_id - t.timestamps - end - end -end diff --git a/db/migrate/20121026000731_create_mappings.rb b/db/migrate/20121026000731_create_mappings.rb deleted file mode 100644 index 01598d5c..00000000 --- a/db/migrate/20121026000731_create_mappings.rb +++ /dev/null @@ -1,14 +0,0 @@ -class CreateMappings < ActiveRecord::Migration - def change - create_table :mappings do |t| - t.text :category - t.integer :xloc - t.integer :yloc - t.integer :topic_id - t.integer :synapse_id - t.integer :map_id - t.integer :user_id - t.timestamps - end - end -end diff --git a/db/migrate/20130101193917_create_topics.rb b/db/migrate/20130101193917_create_topics.rb deleted file mode 100644 index 34f9a538..00000000 --- a/db/migrate/20130101193917_create_topics.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateTopics < ActiveRecord::Migration - def change - create_table :topics do |t| - t.text :name - t.text :desc - t.text :link - t.text :permission - t.integer :user_id - t.integer :metacode_id - t.timestamps - end - end -end diff --git a/db/migrate/20130101194424_create_metacodes.rb b/db/migrate/20130101194424_create_metacodes.rb deleted file mode 100644 index 154c8afe..00000000 --- a/db/migrate/20130101194424_create_metacodes.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateMetacodes < ActiveRecord::Migration - def change - create_table :metacodes do |t| - t.text :name - t.string :icon - - t.timestamps - end - end -end diff --git a/db/migrate/20130709192842_add_devise.rb b/db/migrate/20130709192842_add_devise.rb deleted file mode 100644 index 52f0ae97..00000000 --- a/db/migrate/20130709192842_add_devise.rb +++ /dev/null @@ -1,55 +0,0 @@ -class AddDevise < ActiveRecord::Migration - def up - ### handcode devise columns - - # database authenticatable - add_column :users, :encrypted_password, :string, :null => nil, :limit => 128, :default => "" - - # encryptable - #add_column :users, :password_salt, :string, :null => nil - - # rememberable - add_column :users, :remember_token, :string - add_column :users, :remember_created_at, :datetime - - # confirmable - #add_column :users, :confirmation_token, :string - #add_column :users, :confirmed_at, :datetime - #add_column :users, :confirmation_sent_at, :datetime - - # recoverable - add_column :users, :reset_password_token, :string - - # trackable - add_column :users, :last_sign_in_at, :datetime - add_column :users, :last_sign_in_ip, :string - add_column :users,:sign_in_count, :integer, :default => 0 - add_column :users,:current_sign_in_at, :datetime - add_column :users,:current_sign_in_ip, :string - - #add_index :users, :confirmation_token, :unique => true for confirmable - add_index :users, :reset_password_token, :unique => true - - end - - def down - #remove_index :users, :confirmation_token - remove_index :users, :reset_password_token - - remove_column :users,"password_salt" - #remove_column :users,"confirmation_token" - #remove_column :users,"confirmed_at" - #remove_column :users,"confirmation_sent_at" - remove_column :users,"reset_password_token" - remove_column :users,"remember_token" - remove_column :users,"remember_created_at" - remove_column :users,"sign_in_count" - remove_column :users,"current_sign_in_at" - remove_column :users,"current_sign_in_ip" - remove_column :users,"last_sign_in_at" - remove_column :users,"last_sign_in_ip" - remove_column :users,"encrypted_password" - - end - -end diff --git a/db/migrate/20130709212556_add_password_reset_to_devise.rb b/db/migrate/20130709212556_add_password_reset_to_devise.rb deleted file mode 100644 index dbf44512..00000000 --- a/db/migrate/20130709212556_add_password_reset_to_devise.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddPasswordResetToDevise < ActiveRecord::Migration - def change - add_column :users, :reset_password_sent_at, :datetime - end -end