<% if @report.dismissed %>
@@ -19,7 +32,7 @@
<% elsif @report.warned %>
Warned
<% elsif @report.revoked %>
-
Revoked
+
Revoked
<% else %>
<% if @pledge %>
<%= link_to("Revoke", new_report_revocation_path(@report, back: request.fullpath), class: 'revoke-button button') %>
diff --git a/config/routes.rb b/config/routes.rb
index 92887d6b..58a0af85 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,18 +1,18 @@
Rails.application.routes.draw do
-
+
devise_for :users, controllers: { invitations: "users/invitations" },
path_names: { sign_in: "login", sign_out: "logout" }
-
+
scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-
+
authenticated :user do
root to: "home#index", as: :authenticated_user_root
end
-
+
unauthenticated do
root to: "home#index"
end
-
+
resources :pledges, only: [ :index, :create, :show ]
get '/pledge', to: 'pledges#new', as: :new_pledge
get '/take-the-pledge', to: 'pledges#new'
@@ -22,8 +22,8 @@
resources :affiliates, only: [ :index, :new, :create, :edit, :update ]
resources :resources, only: [ :index ]
get '/research', to: 'resources#index', as: :research
- get '/keystone-code', to: 'resources#keystone_code', as: :keystone_code
- get '/inclusion-101', to: 'resources#inclusion_101', as: :inclusion_101
+ get '/keystone-code', to: 'resources#keystone_code', as: :keystone_code
+ get '/inclusion-101', to: 'resources#inclusion_101', as: :inclusion_101
resources :stories, only: [ :index, :new, :create, :edit, :update ]
get '/changemakers', to: 'stories#changemakers', as: :changemakers
resources :reports, only: [ :index, :show, :new, :create ] do
@@ -39,7 +39,7 @@
resources :staff, only: [ :index ]
resources :users, only: [ :index, :show, :edit, :update ]
post '/users/:id/remove_avatar', to: 'users#remove_avatar', as: :remove_avatar
-
+
get '/about', to: 'about#index', as: :about
get '/contact', to: 'about#contact', as: :contact
get '/data-policy', to: 'about#data_policy', as: :data_policy
@@ -48,6 +48,8 @@
get '/donate', to: 'donate#index', as: :donate
get '/donate/success', to: 'donate#success', as: :donate_success
+ resources :comments, only: [ :new, :create]
+
end
-
+
end
diff --git a/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb b/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb
deleted file mode 100644
index 7715639f..00000000
--- a/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeDesiredOutcomeToRecommendedResponse < ActiveRecord::Migration[6.0]
- def change
- rename_column :reports, :desired_outcome, :recommended_response
- end
-end
diff --git a/db/migrate/20220630164320_create_comments.rb b/db/migrate/20220630164320_create_comments.rb
new file mode 100644
index 00000000..043ce701
--- /dev/null
+++ b/db/migrate/20220630164320_create_comments.rb
@@ -0,0 +1,12 @@
+class CreateComments < ActiveRecord::Migration[6.0]
+ def change
+ create_table :comments do |t|
+ t.integer :report_id
+ t.integer :commenter_id
+ t.text :body
+ t.integer :parent_comment_id
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index baa309b8..04c5b34b 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_02_23_190839) do
+ActiveRecord::Schema.define(version: 2022_06_30_164320) do
create_table "affiliates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "name"
@@ -29,6 +29,15 @@
t.string "mixer"
end
+ create_table "comments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
+ t.integer "report_id"
+ t.integer "commenter_id"
+ t.text "body"
+ t.integer "parent_comment_id"
+ t.datetime "created_at", precision: 6, null: false
+ t.datetime "updated_at", precision: 6, null: false
+ end
+
create_table "conduct_warnings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
t.integer "pledge_id"
t.integer "report_id"
@@ -55,6 +64,7 @@
t.datetime "twitch_authed_on"
t.integer "referrer_id"
t.integer "referrals_count", default: 0
+ t.integer "reports_count"
end
create_table "reports", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
@@ -72,6 +82,7 @@
t.boolean "dismissed", default: false
t.boolean "warned", default: false
t.boolean "revoked", default: false
+ t.integer "twitch_id"
t.index ["reviewer_id"], name: "index_reports_on_reviewer_id"
end
@@ -96,7 +107,7 @@
t.datetime "published_on"
end
- create_table "twitch_tokens", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "twitch_tokens", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "access_token"
t.integer "expires_in"
t.datetime "created_at", precision: 6, null: false
diff --git a/test/controllers/comments_controller_test.rb b/test/controllers/comments_controller_test.rb
new file mode 100644
index 00000000..a812ddae
--- /dev/null
+++ b/test/controllers/comments_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CommentsControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
new file mode 100644
index 00000000..39882706
--- /dev/null
+++ b/test/fixtures/comments.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ report_id: 1
+
+two:
+ report_id: 1
diff --git a/test/models/comment_test.rb b/test/models/comment_test.rb
new file mode 100644
index 00000000..b6d6131a
--- /dev/null
+++ b/test/models/comment_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CommentTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end