Feature/fifth assignment

.gitignore

@@ -32,3 +32,22 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+
+# ---Vim stuff---
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~

Gemfile

@@ -63,3 +63,5 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem 'annotate'

Gemfile.lock

@@ -44,6 +44,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    annotate (2.7.4)
+      activerecord (>= 3.2, < 6.0)
+      rake (>= 10.4, < 13.0)
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
@@ -209,6 +212,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  annotate
   bootstrap
   byebug
   capybara (>= 2.15)
@@ -236,4 +240,4 @@ RUBY VERSION
    ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

app/assets/stylesheets/authors.scss → app/assets/stylesheets/users.scss

@@ -1,3 +1,3 @@
-// Place all the styles related to the Authors controller here.
+// Place all the styles related to the users controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/posts_controller.rb

@@ -69,6 +69,6 @@ def set_post
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def post_params
-      params.require(:post).permit(:author_id, :content, :published)
+      params.require(:post).permit(:author_id, :title, :sub_reddit_id, :content, :published)
     end
 end

app/controllers/users_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+  end
+
+  def show
+    @user = User.find_by( id: params[:id] )
+  end
+
+  def new
+    @user = User.new
+  end
+end

app/helpers/users_helper.rb

@@ -0,0 +1,2 @@
+module UsersHelper
+end

app/models/comment.rb

@@ -1,2 +1,18 @@
+# == Schema Information
+#
+# Table name: comments
+#
+#  id         :integer          not null, primary key
+#  post_id    :integer
+#  author_id  :integer
+#  content    :text
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
 class Comment < ApplicationRecord
+  belongs_to :post
+  belongs_to :author, class_name: 'User'
+
+  validates :content, presence: true, length: { minimum: 2 }
 end

app/models/post.rb

@@ -1,2 +1,24 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: posts
+#
+#  id            :integer          not null, primary key
+#  author_id     :integer          not null
+#  content       :text
+#  published     :boolean
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  title         :string           default(""), not null
+#  sub_reddit_id :integer
+#
+
 class Post < ApplicationRecord
+  has_many :comments
+  has_many :upvotes
+  belongs_to :user
+  belongs_to :sub_reddits
+
+  validates :title, presence: true, uniqueness: true
+  validates :sub_reddit_id, presence: true
 end

app/models/sub_reddit.rb

@@ -0,0 +1,21 @@
+# == Schema Information
+#
+# Table name: sub_reddits
+#
+#  id          :integer          not null, primary key
+#  title       :string           not null
+#  description :text             not null
+#  private     :boolean          default(FALSE), not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  owner_id    :integer
+#
+
+class SubReddit < ApplicationRecord
+  belongs_to :user
+  has_many :posts
+
+  validates :title, presence: true, uniqueness: true
+  validates :owner, presence: true
+  validates :description, presence: true
+end

app/models/upvote.rb

@@ -0,0 +1,20 @@
+# == Schema Information
+#
+# Table name: upvotes
+#
+#  id         :integer          not null, primary key
+#  creator    :string           not null
+#  post       :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  creator_id :integer
+#  post_id    :integer
+#
+
+class Upvote < ApplicationRecord
+  belongs_to :user
+  belongs_to :post
+
+  validates :post, presence: true
+  validates :creator, uniqueness: true, presence: true
+end

app/models/user.rb

@@ -0,0 +1,19 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id         :integer          not null, primary key
+#  email      :string           not null
+#  username   :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class User < ApplicationRecord
+  has_many :comments, foreign_key: 'author_id'
+  has_many :sub_reddits
+  has_many :posts
+  has_many :upvotes
+
+  validates :email, uniqueness: { scope: :username } , presence: true
+end

app/views/comments/index.html.erb

@@ -1,13 +1,17 @@
 <p id="notice"><%= notice %></p>
 
 <h1>Comments</h1>
-
+<% @comments.each do |comment| %>
+  <t%= comment.post_id %>
+<% end %>
 <table>
   <thead>
     <tr>
       <th>Post</th>
       <th>Author</th>
       <th>Content</th>
+      <th>Created at:</th>
+      <th>Updated at:</th>
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -18,6 +22,8 @@
         <td><%= comment.post_id %></td>
         <td><%= comment.author_id %></td>
         <td><%= comment.content %></td>
+        <td><%= comment.created_at %></td>
+        <td><%= comment.updated_at %></td>
         <td><%= link_to 'Show', comment %></td>
         <td><%= link_to 'Edit', edit_comment_path(comment) %></td>
         <td><%= link_to 'Destroy', comment, method: :delete, data: { confirm: 'Are you sure?' } %></td>

app/views/comments/new.html.erb

@@ -3,5 +3,3 @@
 <%= render 'form', comment: @comment %>
 
 <%= link_to 'Back', comments_path %>
-
-<h2>Solve captcha!</h2>