Bootstrap

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-
+gem 'orderly'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.0'
 # Use postgresql as the database for Active Record
@@ -24,7 +24,8 @@ gem 'jbuilder', '~> 2.5'
 # Use Redis adapter to run Action Cable in production
 # gem 'redis', '~> 3.0'
 # Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
+gem 'devise'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
@@ -46,3 +47,5 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f'

Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/mimemagicrb/mimemagic.git
+  revision: 01f92d86d15d85cfd0f20dabd025dcbd36a8a60f
+  ref: 01f92d86d15d85cfd0f20dabd025dcbd36a8a60f
+  specs:
+    mimemagic (0.3.5)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -58,6 +65,7 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    bcrypt (3.1.16)
     bindex (0.8.1)
     builder (3.2.4)
     byebug (11.1.3)
@@ -71,6 +79,12 @@ GEM
     childprocess (3.0.0)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
+    devise (4.8.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
     diff-lcs (1.4.4)
     erubi (1.10.0)
     execjs (2.7.0)
@@ -93,14 +107,17 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.5.3)
     minitest (5.14.4)
     nio4r (2.5.5)
     nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
+    orderly (0.1.1)
+      capybara (>= 1.1)
+      rspec (>= 2.14)
+    orm_adapter (0.5.0)
     pg (1.2.3)
     public_suffix (4.0.6)
     puma (3.12.6)
@@ -138,6 +155,13 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    responders (3.0.1)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.1)
@@ -184,6 +208,8 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     web-console (4.1.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -200,10 +226,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
   byebug
   capybara (~> 2.13)
+  devise
   jbuilder (~> 2.5)
   listen (>= 3.0.5, < 3.2)
+  mimemagic!
+  orderly
   pg
   puma (~> 3.12.6)
   rails (~> 6.0.0)

app/assets/stylesheets/application.css

@@ -13,3 +13,4 @@
  *= require_tree .
  *= require_self
  */
+

app/assets/stylesheets/comments.scss

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

app/assets/stylesheets/sessions.scss

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

app/assets/stylesheets/user_sign_in.scss

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

app/assets/stylesheets/users.scss

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

app/controllers/application_controller.rb

@@ -1,3 +1,14 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
+
+  private
+  def current_user
+    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+  end
+  helper_method :current_user
+
+  def authorize
+    redirect_to login_url, alert: "Not authorized" if current_user.nil?
+  end
+
 end

app/controllers/articles_controller.rb

@@ -0,0 +1,3 @@
+class articleController < ApplicationController
+  before_filter :authorize, only: [:edit, :update]
+end 

app/controllers/comments_controller.rb

@@ -0,0 +1,31 @@
+class CommentsController < ApplicationController
+
+  def new 
+    @comment = Comment.new
+  end
+
+  def create
+    @comment = Comment.create(comment: comments_params["comment"], post_id: id_params, user_id: user_params)
+    redirect_to posts_url
+  end
+
+  def index
+    @comment = Comment.new
+  end
+
+  private
+
+  def comments_params
+    params.require(:comment).permit(:comment)
+  end
+
+  def id_params
+    params.require(:post_id)
+  end
+
+  def user_params
+    params.require(:current_user_id)
+  end
+
+
+end

app/controllers/posts_controller.rb

@@ -1,4 +1,6 @@
 class PostsController < ApplicationController
+
+
   def new
     @post = Post.new
   end
@@ -9,12 +11,29 @@ def create
   end
 
   def index
-    @posts = Post.all
+    @post = Post.new
+    @comment = Comment.new
+    @posts = Post.all.order(created_at: :desc)
+    @posts_comments = Comment.all.order(created_at: :desc)
+    @users = User.all
+  end
+
+  def update
+    post = Post.find_by(id: id_params)
+    post.increment(:likes)
+    post.save
+    redirect_to posts_url
   end
 
+
   private
 
   def post_params
     params.require(:post).permit(:message)
   end
+
+  def id_params
+    params.require(:id)
+  end
 end
+

app/controllers/sessions_controller.rb

@@ -0,0 +1,26 @@
+class SessionsController < ApplicationController
+  def new
+  end
+
+  def create
+    @user = User.find_by(email: params[:email])
+    if @user && @user.authenticate(params[:password])
+      session[:user_id] = @user.id
+      redirect_to '/posts#index', notice: "Logged in!"
+    else
+      flash.now.alert = "Email or password is invalid"
+      render "new"
+    end
+  end
+
+  # def index
+  # p '+++++'
+  # @user = User.find_by(first_name: params[:first_name])
+  # p '+++++'
+  # end 
+  def destroy
+    session[:user_id] = nil
+    redirect_to root_url, notice: "Logged out!"
+  end
+
+end

app/controllers/users_controller.rb

@@ -0,0 +1,29 @@
+class UsersController < ApplicationController
+
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user = User.new(user_params)
+    if @user.save
+      session[:user_id] = @user.id
+      redirect_to '/posts#index', notice: "Thank you for signing up!"
+    else
+      render "new"
+    end
+  end
+
+  def index 
+    if params[:search_by_user] != ""
+      @user_searched = User.where("lower(first_name) = ?", params[:search_by_user].downcase)
+    end 
+  end 
+
+  private
+
+  def user_params
+   params.require(:user).permit(:first_name, :surname, :email, :password, :password_confirmation, :gender, :dob)
+  end
+
+end

app/helpers/comments_helper.rb

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

app/helpers/sessions_helper.rb

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

app/helpers/user_sign_in_helper.rb

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

app/helpers/users_helper.rb

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

app/models/comment.rb

@@ -0,0 +1,2 @@
+class Comment < ApplicationRecord
+end 

app/models/post.rb

@@ -1,2 +1,3 @@
 class Post < ApplicationRecord
 end
+

app/models/user.rb

@@ -0,0 +1,6 @@
+class User < ApplicationRecord
+
+  has_secure_password
+
+  validates_uniqueness_of :email  
+end

app/models/user_sign_in.rb

@@ -0,0 +1,8 @@
+# class UserSignIn < ApplicationRecord
+#   # Include default devise modules. Others available are:
+#   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+#   devise :database_authenticatable, :registerable,
+#          :recoverable, :rememberable, :validatable
+# end
+
+#file not in use

app/views/comments/index.html.erb

@@ -0,0 +1 @@
+

app/views/layouts/application.html.erb

@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
+
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> 
+  <%= favicon_link_tag asset_path('favicon.ico') %>
+
     <title>Acebook</title>
     <%= csrf_meta_tags %>
 
@@ -9,6 +16,26 @@
   </head>
 
   <body>
+
+  <% if notice %>
+  <p class="alert alert-success"><%= notice %></p>
+<% end %>
+<% if alert %>
+  <p class="alert alert-danger"><%= alert %></p>
+<% end %>
+
+<% if current_user %>
+<h3>
+  Logged in as <%= current_user.first_name %>.
+  <%= link_to "Log Out", logout_path %>
+  </h3>
+<% else %>
+  <%= link_to "Log In", login_path %>
+<% end %>
+
+
     <%= yield %>
+
+
   </body>
 </html>