fix: Tweaks nos conflitos

backend/app/controllers/acaos_controller.rb

@@ -1,31 +1,30 @@
 class AcaosController < ApplicationController
-  before_action :set_acao, only: %i[ show edit update destroy ]
+  before_action :set_acao, only: %i[show edit update destroy]
 
   # GET /acaos or /acaos.json
   def index
     @acaos = Acao.all
+    render json: @acaos
   end
 
   # GET /acaos/1 or /acaos/1.json
-  def show
-  end
+  def show; end
 
   # GET /acaos/new
   def new
     @acao = Acao.new
   end
 
   # GET /acaos/1/edit
-  def edit
-  end
+  def edit; end
 
   # POST /acaos or /acaos.json
   def create
     @acao = Acao.new(acao_params)
 
     respond_to do |format|
       if @acao.save
-        format.html { redirect_to acao_url(@acao), notice: "Acao was successfully created." }
+        format.html { redirect_to acao_url(@acao), notice: 'Acao was successfully created.' }
         format.json { render :show, status: :created, location: @acao }
       else
         format.html { render :new, status: :unprocessable_entity }
@@ -38,7 +37,7 @@ def create
   def update
     respond_to do |format|
       if @acao.update(acao_params)
-        format.html { redirect_to acao_url(@acao), notice: "Acao was successfully updated." }
+        format.html { redirect_to acao_url(@acao), notice: 'Acao was successfully updated.' }
         format.json { render :show, status: :ok, location: @acao }
       else
         format.html { render :edit, status: :unprocessable_entity }
@@ -52,19 +51,20 @@ def destroy
     @acao.destroy!
 
     respond_to do |format|
-      format.html { redirect_to acaos_url, notice: "Acao was successfully destroyed." }
+      format.html { redirect_to acaos_url, notice: 'Acao was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_acao
-      @acao = Acao.find(params[:id])
-    end
 
-    # Only allow a list of trusted parameters through.
-    def acao_params
-      params.fetch(:acao, {})
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_acao
+    @acao = Acao.find(params[:id])
+  end
+
+  # Only allow a list of trusted parameters through.
+  def acao_params
+    params.require(:acao).permit(:titulo, :valor, :tipo, :mes, :ano)
+  end
 end

backend/app/models/acao.rb

@@ -1,3 +1,2 @@
 class Acao < ApplicationRecord
-  belongs_to :user
 end

backend/app/views/acaos/_acao.html.erb

@@ -0,0 +1,27 @@
+<div id="<%= dom_id acao %>">
+  <p>
+    <strong>Titulo:</strong>
+    <%= acao.titulo %>
+  </p>
+
+  <p>
+    <strong>Valor:</strong>
+    <%= acao.valor %>
+  </p>
+
+  <p>
+    <strong>Tipo:</strong>
+    <%= acao.tipo %>
+  </p>
+
+  <p>
+    <strong>Mes:</strong>
+    <%= acao.mes %>
+  </p>
+
+  <p>
+    <strong>Ano:</strong>
+    <%= acao.ano %>
+  </p>
+
+</div>

backend/app/views/acaos/_acao.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! acao, :id, :titulo, :valor, :tipo, :mes, :ano, :created_at, :updated_at
+json.url acao_url(acao, format: :json)

backend/app/views/acaos/_form.html.erb

@@ -0,0 +1,42 @@
+<%= form_with(model: acao) do |form| %>
+  <% if acao.errors.any? %>
+    <div style="color: red">
+      <h2><%= pluralize(acao.errors.count, "error") %> prohibited this acao from being saved:</h2>
+
+      <ul>
+        <% acao.errors.each do |error| %>
+          <li><%= error.full_message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div>
+    <%= form.label :titulo, style: "display: block" %>
+    <%= form.text_field :titulo %>
+  </div>
+
+  <div>
+    <%= form.label :valor, style: "display: block" %>
+    <%= form.text_field :valor %>
+  </div>
+
+  <div>
+    <%= form.label :tipo, style: "display: block" %>
+    <%= form.check_box :tipo %>
+  </div>
+
+  <div>
+    <%= form.label :mes, style: "display: block" %>
+    <%= form.text_field :mes %>
+  </div>
+
+  <div>
+    <%= form.label :ano, style: "display: block" %>
+    <%= form.text_field :ano %>
+  </div>
+
+  <div>
+    <%= form.submit %>
+  </div>
+<% end %>

backend/app/views/acaos/edit.html.erb

@@ -0,0 +1,10 @@
+<h1>Editing acao</h1>
+
+<%= render "form", acao: @acao %>
+
+<br>
+
+<div>
+  <%= link_to "Show this acao", @acao %> |
+  <%= link_to "Back to acaos", acaos_path %>
+</div>

backend/app/views/acaos/index.html.erb

@@ -0,0 +1,14 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Acaos</h1>
+
+<div id="acaos">
+  <% @acaos.each do |acao| %>
+    <%= render acao %>
+    <p>
+      <%= link_to "Show this acao", acao %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New acao", new_acao_path %>

backend/app/views/acaos/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @acaos, partial: "acaos/acao", as: :acao

backend/app/views/acaos/new.html.erb

@@ -0,0 +1,9 @@
+<h1>New acao</h1>
+
+<%= render "form", acao: @acao %>
+
+<br>
+
+<div>
+  <%= link_to "Back to acaos", acaos_path %>
+</div>

backend/app/views/acaos/show.html.erb

@@ -0,0 +1,10 @@
+<p style="color: green"><%= notice %></p>
+
+<%= render @acao %>
+
+<div>
+  <%= link_to "Edit this acao", edit_acao_path(@acao) %> |
+  <%= link_to "Back to acaos", acaos_path %>
+
+  <%= button_to "Destroy this acao", @acao, method: :delete %>
+</div>

backend/app/views/acaos/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "acaos/acao", acao: @acao

backend/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   resources :acessos
+  resources :acaos
   resources :storages
   resources :eventos
   resources :reuniaos
@@ -12,6 +13,7 @@
   post '/documentos/delete', to: 'documentos#destroy'
   post '/storages/delete', to: 'storages#destroy'
   post '/storages/edit', to: 'storages#update'
+  post '/acaos/delete', to: 'acaos#destroy'
 
   resources :tarefas
   resources :acaos

backend/db/migrate/20240524205418_create_acaos.rb → backend/db/migrate/20240615164148_create_acaos.rb

@@ -3,9 +3,9 @@ def change
     create_table :acaos do |t|
       t.string :titulo
       t.float :valor
-      t.boolean :type
-      t.string :data
-      t.references :user, null: false, foreign_key: true
+      t.boolean :tipo
+      t.string :mes
+      t.string :ano
 
       t.timestamps
     end

backend/test/controllers/acaos_controller_test.rb

@@ -17,7 +17,7 @@ class AcaosControllerTest < ActionDispatch::IntegrationTest
 
   test "should create acao" do
     assert_difference("Acao.count") do
-      post acaos_url, params: { acao: {  } }
+      post acaos_url, params: { acao: { ano: @acao.ano, mes: @acao.mes, tipo: @acao.tipo, titulo: @acao.titulo, valor: @acao.valor } }
     end
 
     assert_redirected_to acao_url(Acao.last)
@@ -34,7 +34,7 @@ class AcaosControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should update acao" do
-    patch acao_url(@acao), params: { acao: {  } }
+    patch acao_url(@acao), params: { acao: { ano: @acao.ano, mes: @acao.mes, tipo: @acao.tipo, titulo: @acao.titulo, valor: @acao.valor } }
     assert_redirected_to acao_url(@acao)
   end
 

backend/test/fixtures/acaos.yml

@@ -3,13 +3,13 @@
 one:
   titulo: MyString
   valor: 1.5
-  type: false
-  data: MyString
-  user: one
+  tipo: false
+  mes: MyString
+  ano: MyString
 
 two:
   titulo: MyString
   valor: 1.5
-  type: false
-  data: MyString
-  user: two
+  tipo: false
+  mes: MyString
+  ano: MyString

backend/test/system/acaos_test.rb

@@ -14,6 +14,11 @@ class AcaosTest < ApplicationSystemTestCase
     visit acaos_url
     click_on "New acao"
 
+    fill_in "Ano", with: @acao.ano
+    fill_in "Mes", with: @acao.mes
+    check "Tipo" if @acao.tipo
+    fill_in "Titulo", with: @acao.titulo
+    fill_in "Valor", with: @acao.valor
     click_on "Create Acao"
 
     assert_text "Acao was successfully created"
@@ -24,6 +29,11 @@ class AcaosTest < ApplicationSystemTestCase
     visit acao_url(@acao)
     click_on "Edit this acao", match: :first
 
+    fill_in "Ano", with: @acao.ano
+    fill_in "Mes", with: @acao.mes
+    check "Tipo" if @acao.tipo
+    fill_in "Titulo", with: @acao.titulo
+    fill_in "Valor", with: @acao.valor
     click_on "Update Acao"
 
     assert_text "Acao was successfully updated"

view/src/components/Header/Header.css

@@ -18,7 +18,7 @@ header {
 .navHeader {
     display: flex;
     align-items: center;
-   
+
 }
 
 .linksHeader {

view/src/components/Kanban/Kanban.css

@@ -1,14 +1,14 @@
 .kanban {
     text-align: center;
     margin-left: 120px;
-    
+
 }
 
 .bntTarefa {
     border: none;
     background-color: #414191;
     color: white;
-    font-size: 16px;
+    font-size: 15px;
     padding: 9px 22px;
     border-radius: 6px;
     cursor: pointer;
@@ -42,6 +42,7 @@
     text-align: center;
     border-radius: 5px;
     margin-bottom: 10px;
+    font-size: 13px;
 }
 
 .tarefaItem {
@@ -59,6 +60,7 @@
 .tarefaItem p {
     margin: 5px 0;
     color: black;
+    font-size: 13px;
 }
 
 .close {
@@ -91,7 +93,9 @@
 }
 
 .separador {
-  height: 1px;
-  background-color: black; /* Ou qualquer cor desejada */
-  margin: 10px 0; /* Adapte conforme necessário */
-  }
+    height: 1px;
+    background-color: black;
+    /* Ou qualquer cor desejada */
+    margin: 10px 0;
+    /* Adapte conforme necessário */
+}

view/src/components/Kanban/index.jsx

@@ -61,7 +61,7 @@ function Kanban() {
       setQuem('');
     }
   };
-  
+
 
   const handleRemoveTarefa = (column, index) => {
     const updatedTarefas = [...tarefas[column]];
@@ -113,8 +113,8 @@ function Kanban() {
     setCurrentColumn(column); // Define a coluna atual para uso na edição
     setShowPopup(true); // Mostrar o popup de edição
   };
-  
-  
+
+
 
   return (
     <div className='kanban'>