Skip to content

Fix: Soluçao problemas 68 e 69 da planilha #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegocomis merged 7 commits into from
May 28, 2025
Merged

Fix: Soluçao problemas 68 e 69 da planilha #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7380dac
fix: improve data deletion request buggin with muiltiple requests
ARTHUR9011 Apr 14, 2025
970bd72
refactor: remove repeated toast notification component from layout
ARTHUR9011 Apr 14, 2025
66a6aeb
Comentarios Blades
ARTHUR9011 May 12, 2025
a787a9e
refactor: alteração nos botões recusar e aceitar novas bases de dados
ARTHUR9011 May 26, 2025
32ff03b
refactor: Melhoria nos botões do gerenciamento de usuarios
ARTHUR9011 May 26, 2025
000c27b
refactor: Melhoria campo criação de usuario (Botão visualizar a senha)
ARTHUR9011 May 26, 2025
8753118
Merge branch 'develop' into Bug_Solving_W4
MatheusCiocca May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion resources/views/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,4 +901,3 @@ function refreshSuggestions(inputId, inputName, datalistId, showAlert = true) {
</script>
</body>
</html>

2 changes: 2 additions & 0 deletions resources/views/pages/about.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@section("content")
@include("layouts.navbars.guest.navbar", ["title" => "Home"])

<!-- Container for displaying the "About" page with various sections on features, technologies, development -->
<div class="container mt-8 mb-3">
<div class="page-header d-flex flex-column pt-4 pb-11 border-radius-lg">
<div
Expand Down Expand Up @@ -529,6 +530,7 @@ class="card-title h5 d-block text-darker"
@endif
});

// Function to accept terms and LGPD
function acceptTermsAndLgpd() {
fetch("{{ route('accept.lgpd') }}", {
method: 'POST',
Expand Down
5 changes: 5 additions & 0 deletions resources/views/pages/dashboard.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

@section("content")
@include("layouts.navbars.auth.topnav", ["title" => "Dashboard"])
<!-- Section displaying cards with financial and user statistics for the day, users, clients, and sales -->
<div class="container-fluid py-4">
<div class="row">
<div class="col-xl-3 col-sm-6 mb-xl-0 mb-4">
Expand Down Expand Up @@ -149,6 +150,7 @@ class="ni ni-cart text-lg opacity-10"
</div>
</div>
</div>
<!-- Section displaying sales overview chart and carousel with promotional images and captions -->
<div class="row mt-4">
<div class="col-lg-7 mb-lg-0 mb-4">
<div class="card z-index-2 h-100">
Expand Down Expand Up @@ -287,6 +289,7 @@ class="carousel-control-next-icon"
</div>
</div>
</div>
<!-- Table displaying sales data by country with flags, sales count, value, and bounce rate -->
<div class="row mt-4">
<div class="col-lg-7 mb-lg-0 mb-4">
<div class="card">
Expand Down Expand Up @@ -527,6 +530,7 @@ class="text-xs font-weight-bold mb-0"
</div>
</div>
</div>
<!-- Category list with icons and data displaying different sections such as Devices, Tickets, Error Logs, and Happy Users -->
<div class="col-lg-5">
<div class="card">
<div class="card-header pb-0 p-3">
Expand Down Expand Up @@ -677,6 +681,7 @@ class="ni ni-bold-right"
@endsection

@push("js")
<!-- Script to render a line chart using Chart.js, with gradient fill and custom styling -->
<script src="./assets/js/plugins/chartjs.min.js"></script>
<script>
var ctx1 = document.getElementById('chart-line').getContext('2d');
Expand Down
2 changes: 2 additions & 0 deletions resources/views/pages/database-manager.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

@section("content")
@include("layouts.navbars.guest.navbar", ["title" => "pages.home.home"])
<!-- Page header section for the database manager, displaying title and description -->
<div class="container mt-8 mb-3">
<div class="page-header d-flex flex-column pt-4 pb-11 border-radius-lg">
<div
Expand All @@ -19,6 +20,7 @@ class="row justify-content-center rounded-3 py-4 bg-gradient-faded-dark opacity-
</div>
</div>
</div>
<!-- Container for the database manager component rendered via Livewire -->
<div class="container">
<div class="row">
<div class="mt-lg-n12 mt-md-n13 mt-n12 justify-content-center">
Expand Down
3 changes: 3 additions & 0 deletions resources/views/pages/help.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@section('content')
@include('layouts.navbars.guest.navbar', ['title' => 'Help'])
<div class="container mt-8 mb-3">
<!-- Displays a page header with a title and description -->
<div class="page-header d-flex flex-column pt-4 pb-9 border-radius-lg">
<div
class="row justify-content-center rounded-3 py-4 bg-gradient-faded-dark opacity-8 "
Expand All @@ -16,6 +17,7 @@ class="row justify-content-center rounded-3 py-4 bg-gradient-faded-dark opacity-
</div>
</div>
</div>
<!-- Displays a card with a title and description -->
<div class="row">
<div class="mt-lg-n12 mt-md-n13 mt-n12 justify-content-center">
<div class="card d-inline-flex p-3 mt-8 mb-5">
Expand All @@ -28,6 +30,7 @@ class="row justify-content-center rounded-3 py-4 bg-gradient-faded-dark opacity-
{{ __('pages/help.common_questions') }}
</a>
</div>
<!-- Accordion item for a collapsible question-answer section with dynamic content -->
<div class="accordion" id="accordionExample">
<div class="accordion-item1">
<h2 class="accordion-header">
Expand Down
10 changes: 8 additions & 2 deletions resources/views/pages/home.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@endif
</div>

<!-- Displays a page with a header, description, and a dynamic grid of cards with icons and translated text -->
<div class="container mt-8 mb-3">
<div class="page-header d-flex flex-column pt-4 pb-11 border-radius-lg">
<div class="row justify-content-center rounded-3 py-4 bg-gradient-faded-dark opacity-8" style="width: 100%">
Expand Down Expand Up @@ -64,7 +65,8 @@
</div>
</div>
</div>


<!-- Row displaying four statistics cards: total projects, total users, completed projects, and ongoing projects -->
<div class="row mt-3">
<div class="col-lg-3 col-md-6 mb-4">
<div class="card text-center h-100">
Expand All @@ -89,7 +91,6 @@
</div>
</div>
</div>

<div class="col-lg-3 col-md-6 mb-4">
<div class="card text-center h-100">
<div class="card-body d-flex flex-column">
Expand Down Expand Up @@ -144,6 +145,7 @@
</div>
@endsection


@push("js")
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
Expand All @@ -153,6 +155,7 @@
const totalFinishedProjects = {{ $total_finished_projects }};
const totalOngoingProjects = {{ $total_ongoing_projects }};

// Function to animate the value from start to end
function animateValue(id, start, end, duration) {
const range = end - start;
let current = start;
Expand All @@ -173,6 +176,7 @@ function animateValue(id, start, end, duration) {
}, stepTime);
}

// Function to check if the element is in the viewport
function isElementInViewport(el) {
const rect = el.getBoundingClientRect();
return (
Expand All @@ -183,6 +187,7 @@ function isElementInViewport(el) {
);
}

// Function to animate the value when the element is visible
function animateIfVisible(id, value) {
const observer = new IntersectionObserver(function(entries) {
entries.forEach(function(entry) {
Expand All @@ -197,6 +202,7 @@ function animateIfVisible(id, value) {
observer.observe(target);
}

// Animate the values when the elements are visible
animateIfVisible('user-count', totalUsers);
animateIfVisible('project-count', totalProjects);
animateIfVisible('total-finished-projects-count', totalFinishedProjects);
Expand Down
14 changes: 14 additions & 0 deletions resources/views/pages/tables.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<div class="card-header pb-0">
<h6>Authors table</h6>
</div>
<!-- Table displaying authors, their roles, status, and employment details -->
<div class="card-body px-0 pt-0 pb-2">
<div class="table-responsive p-0">
<table class="table align-items-center mb-0">
Expand All @@ -29,7 +30,9 @@ class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opa
</thead>
<tbody>
<tr>
<!-- Table row displaying user details including profile picture, role, status, employment date, and edit option -->
<td>

<div class="d-flex px-2 py-1">
<div>
<img src="/img/team-2.jpg" class="avatar avatar-sm me-3" alt="user1">
Expand Down Expand Up @@ -57,6 +60,7 @@ class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opa
</a>
</td>
</tr>
<!-- Table row displaying user details including profile picture, role, status, employment date, and edit option -->
<tr>
<td>
<div class="d-flex px-2 py-1">
Expand Down Expand Up @@ -86,6 +90,7 @@ class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opa
</a>
</td>
</tr>
<!-- Table row displaying user details for Laurent Perrier including profile picture, role, status, employment date, and edit option -->
<tr>
<td>
<div class="d-flex px-2 py-1">
Expand Down Expand Up @@ -144,6 +149,7 @@ class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opa
</a>
</td>
</tr>
<!-- Table row displaying user details for Richard Gran, including profile picture, role, status, employment date, and edit option -->
<tr>
<td>
<div class="d-flex px-2 py-1">
Expand Down Expand Up @@ -173,6 +179,7 @@ class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opa
</a>
</td>
</tr>
<!-- Table row displaying user details for Miriam Eric, including profile picture, role, status, employment date, and edit option -->
<tr>
<td>
<div class="d-flex px-2 py-1">
Expand Down Expand Up @@ -210,6 +217,7 @@ class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opa
</div>
</div>
</div>
<!-- Table displaying project details such as project name, budget, status, completion percentage, and actions -->
<div class="row">
<div class="col-12">
<div class="card mb-4">
Expand Down Expand Up @@ -237,6 +245,7 @@ class="text-uppercase text-secondary text-xxs font-weight-bolder text-center opa
</thead>
<tbody>
<tr>
<!-- Table row displaying project information with project name, budget, status, and completion progress -->
<td>
<div class="d-flex px-2">
<div>
Expand Down Expand Up @@ -272,6 +281,7 @@ class="avatar avatar-sm rounded-circle me-2" alt="spotify">
</button>
</td>
</tr>
<!-- Table row displaying project information with project name, budget, status, and completion progress for "Invision" -->
<tr>
<td>
<div class="d-flex px-2">
Expand Down Expand Up @@ -309,6 +319,7 @@ class="avatar avatar-sm rounded-circle me-2" alt="invision">
</button>
</td>
</tr>
<!-- Table row displaying project information with project name, budget, status, and completion progress for "Jira" -->
<tr>
<td>
<div class="d-flex px-2">
Expand Down Expand Up @@ -346,6 +357,7 @@ class="avatar avatar-sm rounded-circle me-2" alt="jira">
</button>
</td>
</tr>
<!-- Table row displaying project information with project name, budget, status, and completion progress for "Slack" -->
<tr>
<td>
<div class="d-flex px-2">
Expand Down Expand Up @@ -383,6 +395,7 @@ class="avatar avatar-sm rounded-circle me-2" alt="slack">
</button>
</td>
</tr>
<!-- Table row displaying project information with project name, budget, status, and completion progress for "Webdev" -->
<tr>
<td>
<div class="d-flex px-2">
Expand Down Expand Up @@ -420,6 +433,7 @@ class="avatar avatar-sm rounded-circle me-2" alt="webdev">
</button>
</td>
</tr>
<!-- Table row displaying project information with project name, budget, status, and completion progress for "Adobe XD" -->
<tr>
<td>
<div class="d-flex px-2">
Expand Down
1 change: 1 addition & 0 deletions resources/views/pages/terms.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
</div>
</div>
</div>
<!-- Displays various sections of the terms using cards. Each section includes a title and a description. -->
<div class="row">
<div class="mt-lg-n12 mt-md-n13 mt-n12 justify-content-center">
<div class="card d-inline-flex p-3 mt-5">
Expand Down
2 changes: 2 additions & 0 deletions resources/views/pages/user-edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<div class="container mt-8 mb-3">

<!-- Displays the card header with the authenticated user's name and the name of the user being edited -->
<div class="card shadow-lg ">
<div class="card-body">
<div class="row gx-4">
Expand All @@ -24,6 +25,7 @@
</div>
</div>

<!-- Displays the user edit form with basic details and role assignment -->
<br>
<div id="alert">
@include('components.alert')
Expand Down
Loading
Loading