From c9fbba6ee9220b8e94bb7cdcab8a39fc62b1fe7c Mon Sep 17 00:00:00 2001 From: TheNeedful-DO Date: Sun, 26 Nov 2023 10:09:55 +0000 Subject: [PATCH] Add micropost form to project show view --- app/assets/stylesheets/microposts.sass | 2 ++ app/controllers/projects_controller.rb | 3 +++ app/views/projects/show.html.haml | 12 ++++++++---- app/views/shared/_stats.html.haml | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/microposts.sass b/app/assets/stylesheets/microposts.sass index 22789c56..feec0190 100644 --- a/app/assets/stylesheets/microposts.sass +++ b/app/assets/stylesheets/microposts.sass @@ -5,6 +5,8 @@ color: #ddd box-shadow: 0px 0px 0px 10px black inset, 0px 0px 0px 43px white inset, 0px 0px 116px 62px black inset rotate: -36deg +ol.microposts + padding: 0 .micropost .display-name, .timestamp font-family: "Press Start 2P", "Anton", Impact, fantasy, sans-serif diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c410d575..cd9630b4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -10,6 +10,9 @@ class ProjectsController < ApplicationController def show authorize @project @followable = @project + if @project.user == current_user + @micropost = @project.microposts.build + end end # GET /projects/new diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 94f388b9..5016fed9 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -11,9 +11,13 @@ .stats %p #{@project.followers.count} Followers -- if @project.microposts.any? +- if @project.user == current_user + %section.micropost_form + = render 'shared/micropost_form' + +- if @project.microposts.where.not(id: nil).any? %section.microposts - %h3 Posts #{@project.microposts.count} + %h3 Posts #{@project.microposts.where.not(id: nil).count} %ol.microposts - = render @project.microposts - = will_paginate @project.microposts.paginate(page: params[:page]) + = render @project.microposts.where.not(id: nil) + = will_paginate @project.microposts.where.not(id: nil).paginate(page: params[:page]) diff --git a/app/views/shared/_stats.html.haml b/app/views/shared/_stats.html.haml index 7f73a4dc..26aef7d3 100644 --- a/app/views/shared/_stats.html.haml +++ b/app/views/shared/_stats.html.haml @@ -1,6 +1,6 @@ - @user ||= current_user .stats - %a{:href => "#{following_user_path(@user)}"} + %span{:href => "#{following_user_path(@user)}"} %strong#following.stat = @user.following.count following