Skip to content

Commit

Permalink
Revert "set up environment"
Browse files Browse the repository at this point in the history
This reverts commit 3702c47.
  • Loading branch information
Lucian Kahn committed May 29, 2015
1 parent e880041 commit 720fd91
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 27 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -12,7 +12,6 @@
# database
config/database.yml
latest.dump
dump.rdb

# compilation
public/assets
Expand Down
4 changes: 4 additions & 0 deletions bin/rails
@@ -1,4 +1,8 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require 'rails/commands'
4 changes: 4 additions & 0 deletions bin/rake
@@ -1,4 +1,8 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
require_relative '../config/boot'
require 'rake'
Rake.application.run
80 changes: 54 additions & 26 deletions db/schema.rb
Expand Up @@ -16,6 +16,7 @@
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
enable_extension "hstore"
enable_extension "pg_stat_statements"

create_table "activities", force: true do |t|
t.string "name"
Expand Down Expand Up @@ -88,15 +89,15 @@
create_table "assessments", force: true do |t|
t.text "body"
t.integer "chapter_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.text "instructions"
end

create_table "categories", force: true do |t|
t.text "title"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "chapter_levels", force: true do |t|
Expand All @@ -109,8 +110,8 @@

create_table "chapters", force: true do |t|
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "workbook_id"
t.text "article_header"
t.text "rule_position"
Expand Down Expand Up @@ -139,8 +140,8 @@
t.string "classcode"
t.integer "chapter_id"
t.datetime "due_date"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.boolean "temporary", default: false, null: false
t.integer "classroom_id"
end
Expand All @@ -158,6 +159,19 @@
add_index "classrooms", ["code"], name: "index_classrooms_on_code", using: :btree
add_index "classrooms", ["grade"], name: "index_classrooms_on_grade", using: :btree

create_table "comments", force: true do |t|
t.string "title"
t.text "body"
t.integer "user_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "ancestry"
t.string "reply_type"
t.integer "lecture_chapter_id"
end

add_index "comments", ["ancestry"], name: "index_comments_on_ancestry", using: :btree

create_table "concept_categories", force: true do |t|
t.string "name"
t.integer "concept_class_id"
Expand Down Expand Up @@ -215,23 +229,23 @@
t.string "name"
t.string "file"
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "grammar_rules", force: true do |t|
t.string "identifier"
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.text "practice_lesson"
t.integer "author_id"
end

create_table "grammar_tests", force: true do |t|
t.text "text"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "homepage_news_slides", force: true do |t|
Expand Down Expand Up @@ -287,8 +301,8 @@
t.string "name"
t.string "description"
t.text "content"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "rule_examples", force: true do |t|
Expand Down Expand Up @@ -317,8 +331,8 @@

create_table "rule_questions", force: true do |t|
t.text "body"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "rule_id"
t.text "prompt"
t.text "instructions"
Expand All @@ -327,8 +341,8 @@

create_table "rules", force: true do |t|
t.text "name"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "category_id"
t.integer "workbook_id", default: 1
t.text "description"
Expand All @@ -339,6 +353,16 @@

add_index "rules", ["uid"], name: "index_rules_on_uid", unique: true, using: :btree

create_table "rules_misseds", force: true do |t|
t.integer "rule_id"
t.integer "user_id"
t.integer "assessment_id"
t.datetime "time_take"
t.boolean "missed"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

create_table "schools", force: true do |t|
t.string "nces_id"
t.string "lea_id"
Expand Down Expand Up @@ -390,8 +414,8 @@
t.integer "user_id"
t.integer "classroom_chapter_id"
t.datetime "completion_date"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.text "missed_rules"
t.string "state", default: "unstarted", null: false
t.text "story_step_input"
Expand All @@ -406,6 +430,10 @@
t.integer "workbook_id"
end

create_table "t1", id: false, force: true do |t|
t.integer "id"
end

create_table "topic_categories", force: true do |t|
t.string "name"
t.datetime "created_at"
Expand Down Expand Up @@ -436,8 +464,8 @@
t.string "email"
t.string "password_digest"
t.string "role", default: "user"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "classcode"
t.boolean "active", default: false
t.string "username"
Expand All @@ -455,8 +483,8 @@

create_table "workbooks", force: true do |t|
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end

end

0 comments on commit 720fd91

Please sign in to comment.