Merge branch 'main' into refactor/melhora-layout-do-perfil

Author: caiquedv

api_doc.md

@@ -9,6 +9,8 @@ $theme-colors: (
   "dark":       #1b1b1b
 );
 
+$primary: #a130fd;
+
 @import 'bootstrap/scss/bootstrap';
 @import 'bootstrap-icons/font/bootstrap-icons';
 @import 'actiontext.css';

app/assets/images/avatars/avatar1.png

@@ -9,7 +9,10 @@ def create
 
       def update
         status = params.permit(:status)[:status]
-        return render status: :bad_request, json: { error: 'Status inválido' } unless Invitation.statuses.key? status
+        unless Invitation.statuses.key? status
+          return render status: :bad_request,
+                        json: { error: I18n.t('invalid_status') }
+        end
 
         invitation = Invitation.find(params[:id])
         invitation.update!(status:)

app/assets/images/avatars/avatar10.png

@@ -15,7 +15,7 @@ def show
         profile = Profile.active.find(params[:id])
         render status: :ok, json: json_output(profile)
       rescue ActiveRecord::RecordNotFound
-        render status: :not_found, json: { error: 'Perfil não existe.' }
+        render status: :not_found, json: { error: I18n.t('profile_not_found') }
       end
 
       private

app/assets/images/avatars/avatar11.png

@@ -3,5 +3,44 @@ class NotificationsController < ApplicationController
 
   def index
     @notifications = current_user.profile.notifications.order(created_at: :desc)
+    @notifications.map { |n| n.seen! if n.unseen? }
+  end
+
+  def update
+    @notification = Notification.find(params[:id])
+    @notification.clicked!
+    redirect_to_notification
+  end
+
+  private
+
+  def redirect_to_notification
+    return redirect_to_invitation if @notification.notifiable.is_a? Invitation
+    return redirect_to_comment if @notification.notifiable.is_a? Comment
+    return redirect_to_connection if @notification.notifiable.is_a? Connection
+    return redirect_to_post if @notification.notifiable.is_a? Post
+
+    redirect_to_like if @notification.notifiable.is_a? Like
+  end
+
+  def redirect_to_invitation
+    redirect_to invitation_path(@notification.notifiable)
+  end
+
+  def redirect_to_comment
+    redirect_to post_path(@notification.notifiable.post)
+  end
+
+  def redirect_to_connection
+    redirect_to profile_path(@notification.notifiable.follower)
+  end
+
+  def redirect_to_post
+    redirect_to post_path(@notification.notifiable)
+  end
+
+  def redirect_to_like
+    likeable = @notification.notifiable.likeable
+    redirect_to post_path(likeable.is_a?(Comment) ? likeable.post : likeable)
   end
 end

app/assets/images/avatars/avatar12.png

@@ -3,6 +3,7 @@ class PostsController < ApplicationController
   before_action :set_post, only: %w[show edit update pin]
   before_action :authorize!, only: %w[edit update pin]
   before_action :blocks_update, only: %w[update]
+  before_action :redirect_if_removed_content, only: %w[show edit update pin]
 
   require 'image_processing/mini_magick'
 
@@ -71,4 +72,10 @@ def authorize!
   def blocks_update
     redirect_to root_path, alert: t('.error') if @post.published? && @post.published_at && post_params['published_at']
   end
+
+  def redirect_if_removed_content
+    return if current_user&.admin?
+
+    redirect_to root_path, alert: t('.redirect_alert.invalid_user') if @post.removed?
+  end
 end

app/assets/images/avatars/avatar13.png

@@ -5,6 +5,7 @@ class ReportsController < ApplicationController
   before_action :redirect_unless_published_post
   before_action :authorize!, only: %i[index show]
   before_action :redirect_if_self_report, only: :create
+  before_action :set_report, only: %i[reject show remove_content]
 
   def new
     set_offences
@@ -18,13 +19,22 @@ def create
 
   def index
     return @reports = Report.granted.all if params[:filter] == 'granted'
-    return @reports = Report.not_granted.all if params[:filter] == 'not_granted'
+    return @reports = Report.rejected.all if params[:filter] == 'rejected'
 
     @reports = Report.pending.all
   end
 
-  def show
-    @report = Report.find(params[:id])
+  def show; end
+
+  def reject
+    @report.rejected!
+    redirect_to @report, notice: t('.success')
+  end
+
+  def remove_content
+    @report.reportable.removed!
+    @report.granted!
+    redirect_to @report, notice: t('.success')
   end
 
   private
@@ -48,15 +58,19 @@ def redirect_unless_published_post
 
   def set_offences
     @offences = [
-      'Discurso de ódio',
-      'Pornografia',
-      'Racismo',
-      'Spam',
-      'Conteúdo pertubador',
-      'Abuso/Perseguição'
+      t('reports.hate_speech'),
+      t('reports.pornography'),
+      t('reports.racism'),
+      t('reports.spam'),
+      t('reports.disturbin_content'),
+      t('reports.harassment')
     ]
   end
 
+  def set_report
+    @report = Report.find(params[:id])
+  end
+
   def post_and_published?
     return true unless @reportable.is_a? Post
 

app/assets/images/avatars/avatar14.png

@@ -7,12 +7,12 @@ def index; end
   def deactivate_profile
     current_user.profile.inactive!
     sign_out current_user
-    redirect_to root_path, alert: t('deactivate_profile')
+    redirect_to root_path, alert: t('.success')
   end
 
   def delete_account
     current_user.delete_user_data
-    redirect_to root_path, notice: t('delete_account')
+    redirect_to root_path, notice: t('.success')
   end
 
   def change_privacy

app/assets/images/avatars/avatar15.png

@@ -1,11 +1,11 @@
 module PostsHelper
   def date_fixer(post)
     if post.draft?
-      'Criado em: '
+      t('posts.helpers.created_at')
     elsif post.scheduled?
-      'Agendado para: '
+      t('posts.helpers.scheduled_for')
     else
-      'Publicado em: '
+      t('posts.helpers.published_at')
     end
   end
 

app/assets/images/avatars/avatar16.png

@@ -3,6 +3,6 @@ def received_invitation
     profile = Profile.find(params[:profile_id])
     project_title = params[:project_title]
     mail(subject: t('.subject'), to: profile.user.email,
-         body: "Você recebeu um convite para participar do projeto #{project_title}.")
+         body: t('.body', title: project_title))
   end
 end

app/assets/images/avatars/avatar17.png

@@ -8,7 +8,7 @@ def notify_like
     @most_liked_post = @user.most_liked_post_since(1)
     @most_liked_comment = @user.most_liked_comment_since(1)
 
-    mail(subject: "Você recebeu #{@post_likes.count + @comment_likes.count} curtidas nas últimas 24 horas!",
+    mail(subject: t('.subject', likes: @post_likes.count + @comment_likes.count),
          to: @user.email)
   end
 end

app/assets/images/avatars/avatar18.png

@@ -6,6 +6,8 @@ class Comment < ApplicationRecord
   has_many :reports, as: :reportable, dependent: :destroy
   has_many :notifications, as: :notifiable, dependent: :destroy
 
+  enum status: { published: 0, removed: 20 }
+
   after_create :notify_interested_users
   after_create :create_notification
 

app/assets/images/avatars/avatar19.png

@@ -15,7 +15,7 @@ class Connection < ApplicationRecord
   def cant_follow_yourself
     return unless followed_profile == follower
 
-    errors.add(:followed_profile, 'não pode ser o mesmo do usuário')
+    errors.add(:followed_profile, I18n.t('connections.same_user'))
   end
 
   def create_notification

app/assets/images/avatars/avatar2.png

@@ -19,7 +19,7 @@ def set_status
   def expiration_date_cannot_be_in_the_past
     return unless expiration_date.present? && expiration_date < Time.zone.today
 
-    errors.add(:expiration_date, 'deve ser maior que a data atual')
+    errors.add(:expiration_date, I18n.t('invitations.date_error'))
   end
 
   def truncate_description

app/assets/images/avatars/avatar20.png

@@ -1,4 +1,6 @@
 class Notification < ApplicationRecord
   belongs_to :profile
   belongs_to :notifiable, polymorphic: true
+
+  enum status: { unseen: 0, seen: 5, clicked: 10 }
 end

app/assets/images/avatars/avatar21.png

@@ -10,7 +10,7 @@ class Post < ApplicationRecord
   validate :file_size
   validate :validate_published_at
 
-  enum status: { published: 0, archived: 5, draft: 10, scheduled: 15 }
+  enum status: { published: 0, archived: 5, draft: 10, scheduled: 15, removed: 20 }
   acts_as_ordered_taggable_on :tags
 
   enum pin: { unpinned: 0, pinned: 10 }
@@ -61,7 +61,7 @@ def correct_file_type
     content_types = content.body.to_s.scan(/content-type="(.*?)"/)
 
     content_types.each do |type|
-      errors.add(:content, 'Tipo de arquivo inválido.') unless options.include? type[0]
+      errors.add(:content, I18n.t('posts.model.invalid_file')) unless options.include? type[0]
     end
   end
 
@@ -73,11 +73,11 @@ def file_size
 
   def test_file_size(attachments)
     attachments.each do |attachment|
-      validate_attachment_size(attachment, 'image/png', 2_000_000, 'Tamanho de imagem permitido é 2mb')
-      validate_attachment_size(attachment, 'image/jpeg', 2_000_000, 'Tamanho de imagem permitido é 2mb')
-      validate_attachment_size(attachment, 'video/mp4', 15_000_000, 'Tamanho do vídeo permitido é 15mb')
-      validate_attachment_size(attachment, 'audio/mpeg', 3_000_000, 'Tamanho do áudio permitido é 3mb')
-      validate_attachment_size(attachment, 'application/pdf', 900_000, 'Tamanho do PDF permitido é 900kb')
+      validate_attachment_size(attachment, 'image/png', 2_000_000, I18n.t('posts.model.max_image_size'))
+      validate_attachment_size(attachment, 'image/jpeg', 2_000_000, I18n.t('posts.model.max_image_size'))
+      validate_attachment_size(attachment, 'video/mp4', 15_000_000, I18n.t('posts.model.max_video_size'))
+      validate_attachment_size(attachment, 'audio/mpeg', 3_000_000, I18n.t('posts.model.max_audio_size'))
+      validate_attachment_size(attachment, 'application/pdf', 900_000, I18n.t('posts.model.max_pdf_size'))
     end
   end
 
@@ -89,7 +89,8 @@ def validate_attachment_size(attachment, content_type, size_limit, error_message
 
   def validate_published_at
     return if published_at.nil?
+    return unless scheduled?
 
-    errors.add(:published_at, 'não pode estar no passado') if published_at < (Time.zone.now - 1.second)
+    errors.add(:published_at, I18n.t('posts.model.invalid_date')) if published_at < Time.zone.now
   end
 end

app/assets/images/avatars/avatar22.png

@@ -38,8 +38,7 @@ class Profile < ApplicationRecord
   enum privacy: { private_profile: 0, public_profile: 10 }
   enum status: { inactive: 0, active: 5 }
 
-  delegate :full_name, to: :user
-  delegate :email, to: :user
+  delegate :full_name, :email, to: :user
 
   def self.advanced_search(search_query)
     left_outer_joins(:job_categories, :personal_info, :user).where(
@@ -115,13 +114,13 @@ def active!
   def valid_photo_content_type
     return if photo.present? && photo.content_type.in?(%w[image/jpg image/jpeg image/png])
 
-    errors.add(:photo, message: 'deve ser do formato .jpg, .jpeg ou .png') if photo.present?
+    errors.add(:photo, message: I18n.t('profiles.model.photo_extention')) if photo.present?
   end
 
   def photo_size_lower_than_3mb
     return if photo.present? && photo.byte_size <= 3.megabytes
 
-    errors.add(:photo, message: 'deve ter no máximo 3MB') if photo.present?
+    errors.add(:photo, message: I18n.t('profiles.model.photo_size')) if photo.present?
   end
 end
 

app/assets/images/avatars/avatar23.png

@@ -2,7 +2,7 @@ class Report < ApplicationRecord
   belongs_to :profile
   belongs_to :reportable, polymorphic: true
 
-  enum status: { pending: 0, granted: 5, not_granted: 9 }
+  enum status: { pending: 0, granted: 5, rejected: 9 }
 
   def truncated_message
     message.truncate(50)

app/assets/images/avatars/avatar24.png

@@ -83,7 +83,7 @@ def subscribe_likes_mailer_job
   end
 
   def validate_citizen_id_number
-    errors.add(:citizen_id_number, 'inválido') unless CPF.valid?(citizen_id_number)
+    errors.add(:citizen_id_number, I18n.t('users.model.invalid_cpf')) unless CPF.valid?(citizen_id_number)
   end
 
   def transfer_posts_and_comments_to(clone)

app/assets/images/avatars/avatar25.png

@@ -1,7 +1,7 @@
 <div class="container text-center">
   <div class="d-flex flex-column">
     <h1 class="text-primary"><%= @profile.full_name %></span></h1>
-    <h3>Seguindo <%= @followed_profiles.count %> <%= User.model_name.human(count: @followed_profiles.count).downcase %></h3>
+    <h3><%= t('.following') %> <%= @followed_profiles.count %> <%= User.model_name.human(count: @followed_profiles.count).downcase %></h3>
   </div>
   <div class="row row-cols-1 row-cols-md-3 g-4 justify-content-center gap-3 mt-4">
     <% @followed_profiles.each do |followed| %>

app/assets/images/avatars/avatar26.png

@@ -1,7 +1,7 @@
 <div class="container text-center">
   <div class="d-flex flex-column">
     <h1 class="text-primary"><%= @profile.full_name %></span></h1>
-    <h2>Seguido por <%= @follower_profiles.count %> <%= User.model_name.human(count: @follower_profiles.count).downcase %></h2>
+    <h2><%= t('.followed_by') %> <%= @follower_profiles.count %> <%= User.model_name.human(count: @follower_profiles.count).downcase %></h2>
   </div>
   <div class="row row-cols-1 row-cols-md-3 g-4 justify-content-center gap-3 mt-4">
     <% @follower_profiles.each do |connection| %>

app/assets/images/avatars/avatar27.png

@@ -1 +1 @@
-<p><%= I18n.t('notifications.new_follower_mail', follower_name: @notification.notifiable.follower.full_name) %></p>
+<p><%= @notification.notifiable.follower.full_name %> <%= t('notifications.started_following_you') %></p>

app/assets/images/avatars/avatar28.png

@@ -1,5 +1,5 @@
 <% if @education_info.errors.any? %>
-  <p>Verifique o(s) erro(s) abaixo:</p>
+  <p><%= t('check_errors')%></p>
     <ul class="alert alert-warning" role="alert"> 
       <% @education_info.errors.full_messages.each do |msg| %>
         <li><%= msg %> </li>

app/assets/images/avatars/avatar29.png

@@ -19,6 +19,6 @@
   <%= education_info.label :visibility, class:"form-check-label" %>
 </p>
 <p class='mt-3'>
-  <%= education_info.submit 'Salvar', class:'btn btn-primary' %>
-  <%= link_to 'Voltar', profile_path(current_user.profile), class: 'btn btn-secondary' %>
+  <%= education_info.submit t('save_btn'), class:'btn btn-primary' %>
+  <%= link_to t('return_btn'), profile_path(current_user.profile), class: 'btn btn-secondary' %>
 </p>