Skip to content

Alterado app.blade.php, fixed-plugin.blade.php, navbar.blade.php e to… #572

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

Closed
LManuela wants to merge 2 commits into from
Closed

Alterado app.blade.php, fixed-plugin.blade.php, navbar.blade.php e to… #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9115cce
Alterado app.blade.php, fixed-plugin.blade.php, navbar.blade.php e to…
lmanu18 Apr 7, 2025
9205edf
Merge branch 'develop' into grupo2
MatheusCiocca May 27, 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
16 changes: 16 additions & 0 deletions resources/js/custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,22 @@ function getEventTarget(e) {
return e.target || e.srcElement;
}

// Fix dropdown style when shown
document.addEventListener("DOMContentLoaded", function() {
document.querySelectorAll('.dropdown').forEach(drop => {
drop.addEventListener('show.bs.dropdown', function () {
const menu = this.querySelector('.dropdown-menu');
if (menu) {
menu.style.maxHeight = 'none';
menu.style.overflowY = 'visible';
menu.style.position = 'absolute';
menu.style.inset = 'unset';
menu.style.zIndex = '1050';
}
});
});
});

// End tabs navigation

// Light Mode / Dark Mode
Expand Down
13 changes: 12 additions & 1 deletion resources/scss/argon-dashboard/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@
}
}

.dropdown-menu {
max-height: none !important;
overflow: visible !important;
position: absolute !important;
inset: unset !important;
z-index: 1050;
}


.dropdown {
&.dropdown-hover .dropdown-menu,
.dropdown-menu {
Expand Down Expand Up @@ -140,9 +149,11 @@
}
.dropdown.nav-item .dropdown-menu {
background-color: transparent;
overflow: scroll;
overflow: visible;
position: relative;
}


}

.dropdown {
Expand Down
14 changes: 11 additions & 3 deletions resources/views/components/fixed-plugin.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,14 @@

<!-- Dropdown de idiomas -->
<div class="dropdown">
<a href="#" class="btn btn-secondary dropdown-toggle mb-0" data-bs-toggle="dropdown" id="navbarDropdownMenuLink2">
<i class="fas fa-globe opacity-6 text-dark me-1" style="color: #FFFFFF !important"></i>
{{ __('nav/nav.language') }} <!-- Texto do idioma atual -->
<a
href="#"
class="nav-link dropdown-toggle px-2 text-dark"
data-bs-toggle="dropdown"
id="navbarDropdownMenuLink2"
>
<i class="fas fa-globe me-1"></i>
{{ __('nav/nav.language') }}
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink2">
<!-- Opção: Inglês -->
Expand All @@ -48,8 +53,11 @@
</li>
</ul>
</div>
<!-- End Language Selector Dropdown -->
<!-- Sidebar Backgrounds -->

<!-- Seção de seleção de cor da sidebar -->

<div>
<h6 class="mb-0 mt-3">{{ __('nav/side.sidebar_color') }}</h6>
</div>
Expand Down
112 changes: 112 additions & 0 deletions resources/views/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,118 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<meta name="csrf-token" content="{{ csrf_token() }}">

<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<link
rel="apple-touch-icon"
sizes="76x76"
href="{{ asset("img/apple-icon.png") }}"
/>
<link
rel="icon"
type="image/png"
href="{{ asset("img/favicon.png") }}"
/>
<title>Thoth :: Tool for SLR</title>
<!-- PWA -->
<meta name="theme-color" content="#c9c5b1" />
<link rel="apple-touch-icon" href="{{ asset("logo.PNG") }}" />
<link rel="manifest" href="{{ asset("/manifest.json") }}" />

<!-- Fonts and icons -->
<link
href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700"
rel="stylesheet"
/>
<!-- Nucleo Icons -->
<link
href="{{ asset("assets/css/nucleo-icons.css") }}"
rel="stylesheet"
/>
<link
href="{{ asset("assets/css/nucleo-svg.css") }}"
rel="stylesheet"
/>

<link
href="{{ asset("assets/css/nucleo-svg.css") }}"
rel="stylesheet"
/>

<link
href="{{ asset("assets/fontawesome-free-6.6.0-web/css/all.min.css") }}"
rel="stylesheet"
/>

<!-- CSS Files -->
<link
id="pagestyle"
href="{{ asset("assets/css/argon-dashboard.css") }}"
rel="stylesheet"
/>
<link rel="stylesheet" href="{{ asset("assets/css/select.css") }}" />
<link rel="stylesheet" href="{{ asset("assets/css/styles.css") }}" />

<!-- Google reCaptcha-->
@if(request()->is('register'))
<script src="https://www.google.com/recaptcha/api.js?render={{ config('services.recaptcha.site_key') }}"></script>
@endif


<!--editor de richtexto Quill -->
<script src="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.js"></script>
<link href="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.snow.css" rel="stylesheet">

<script src="https://cdn.jsdelivr.net/npm/choices.js@9.0.1/public/assets/scripts/choices.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
@livewireStyles


<style>
/* Permite scroll vertical */
html, body {
overflow-x: hidden !important;
margin: 0 !important;
padding: 0 !important;
height: 100% !important;
overflow-y: auto;
}


/* Remove o scroll horizontal aleatorio que o Perfect Scrollbar cria*/
.ps__rail-x {
display: none !important;
height: 0 !important;
}

/*faz os elementos não conseguirem ultrapassar a largura da tela*/
.container-fluid,
.navbar,
.navbar-collapse{
max-width: 100% !important;
}

</style>




@stack('styles')


</head>

<body class="g-sidenav-show overflow-x-hidden {{ in_array( request()->route()->getName(),["login", "reset-password", "change-password","message"],) ? "bg-white" : "bg-gray-300" }}"
>

@guest

<head>
<meta charset="utf-8" />
<meta name="csrf-token" content="{{ csrf_token() }}">
Expand Down
9 changes: 5 additions & 4 deletions resources/views/layouts/navbars/auth/topnav.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<!-- Navbar -->
<nav class="navbar navbar-main navbar-expand-lg px-0 mx-4 shadow-none border-radius-xl
{{ str_contains(Request::url(), 'virtual-reality') == true ? ' mt-3 mx-3 bg-primary' : '' }}"
id="navbarBlur" data-scroll="false">
<div id="top" class="container-fluid py-1 px-3">
<nav class="navbar navbar-main navbar-expand-lg px-0 mx-0 shadow-none border-radius-xl w-100"
id="navbarBlur" data-scroll="false">
<div id="top" class="container-fluid py-1 px-3 ">


<nav aria-label="breadcrumb">
<ol class="breadcrumb bg-transparent mb-0 pb-0 pt-1 px-0 me-sm-6 me-5">
<li class="breadcrumb-item text-sm"><a class="opacity-5 text-white" href="javascript:;">{{ __('nav/nav.pages') }}</a></li>
Expand Down
86 changes: 35 additions & 51 deletions resources/views/layouts/navbars/guest/navbar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,25 @@
<!-- Container principal da navbar, fixado no topo da página -->
<div class="container position-sticky z-index-sticky top-0">
<div class="position-sticky z-index-sticky top-0">
<div class="row">
<div class="col-12">
<!-- Início da Navbar -->
<!-- Navbar -->
<nav class="navbar navbar-expand-lg blur border-radius-lg top-0 z-index-3 shadow position-absolute mt-4 py-2 start-0 end-0 mx-4">
<div class="container-fluid">

<!-- Logotipo com link para a home -->
<a class="navbar-brand font-weight-bolder ms-lg-0 ms-3" href="{{ route("home") }}">
<img src="/img/logo.svg" alt="{{ __("Logo Thoth") }}" width="25" height="35" />
</a>
<div class="container-fluid d-flex justify-content-between align-items-center px-3">

<!-- Título ao lado do logo -->
<h1 class="title-thoth">{{ __("Thoth") }}</h1>
<!-- Logo e Título -->
<a class="navbar-brand d-flex align-items-center" href="{{ route('home') }}">
<img src="/img/logo.svg" alt="{{ __('Logo Thoth') }}" width="25" height="35">
<h1 class="title-thoth ms-2 mb-0">{{ __('Thoth') }}</h1>
</a>

<!-- Botão hamburguer para telas pequenas -->
<button
class="navbar-toggler shadow-none ms-2"
type="button"
data-bs-toggle="collapse"
data-bs-target="#navigation"
aria-controls="navigation"
aria-expanded="false"
aria-label="Toggle navigation"
>
<!-- Botão responsivo -->
<button class="navbar-toggler shadow-none ms-2" type="button" data-bs-toggle="collapse" data-bs-target="#navigation" aria-controls="navigation" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon mt-2">
<span class="navbar-toggler-bar bar1"></span>
<span class="navbar-toggler-bar bar2"></span>
<span class="navbar-toggler-bar bar3"></span>
</span>
</button>

<!-- Itens do menu (colapsáveis) -->
<div class="collapse navbar-collapse" id="navigation">

Expand Down Expand Up @@ -83,6 +72,7 @@ class="navbar-toggler shadow-none ms-2"
@auth
<!-- Link para Perfil -->
<li class="nav-item">

<a class="nav-link d-flex align-items-center justify-content-center" href="{{ route("profile") }}">
<i class="fas fa-user-circle opacity-6 text-dark me-1"></i>
{{ __("nav/nav.profile") }}
Expand All @@ -99,50 +89,44 @@ class="navbar-toggler shadow-none ms-2"

<!-- Botão para Logout com formulário -->
<li class="nav-item">
<form method="post" action="{{ route("logout") }}" id="logout-form">
<form method="POST" action="{{ route('logout') }}" id="logout-form">
@csrf
<a
href="{{ route("logout") }}"
onclick="event.preventDefault(); document.getElementById('logout-form').submit();"
class="nav-link d-flex align-items-center justify-content-center me-1"
>
<i
class="fa fa-sign-out-alt me-1 text-secondary"
></i>
<span>
{{ __('nav/nav.logout') }}
</span>
<a class="nav-link d-flex align-items-center me-1" href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
<i class="fa fa-user opacity-6 text-dark me-1"></i>
<span class="d-sm-inline d-none">{{ __('nav/nav.logout') }}</span>
</a>
</form>
</li>
@endauth

<!-- ✅ Botão de Configuração sempre visível -->
<li class="nav-item px-2 d-flex align-items-center">
<a href="javascript:;" class="nav-link text-dark p-0 d-flex align-items-center">
<i class="fa fa-cog opacity-6 me-1 fixed-plugin-button-nav cursor-pointer"></i>
<span class="d-sm-inline d-none">Configuração</span>
</a>
</li>
<!-- Dropdown Idioma -->
<li class="nav-item dropdown">
<a
class="nav-link dropdown-toggle"
href="#"
id="navbarDropdownMenuLink2"
role="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>
<i class="fas fa-globe me-1"></i>
{{ __("nav/nav.language") }}
</a>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownMenuLink2">
<li><a class="dropdown-item" href="{{ route('localization', 'en') }}">English</a></li>
<li><a class="dropdown-item" href="{{ route('localization', 'pt_BR') }}">Português (Brasil)</a></li>
</ul>
</li>
</ul>

<!-- Dropdown de idiomas -->
<div class="dropdown">
<a href="#" class="btn btn-secondary dropdown-toggle mb-0" data-bs-toggle="dropdown" id="navbarDropdownMenuLink2">
{{ __("nav/nav.language") }}
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink2">
<li>
<a class="dropdown-item" href="{{ route('localization', 'en') }}">English</a>
</li>
<li>
<a class="dropdown-item" href="{{ route('localization', 'pt_BR') }}">Português (Brasil)</a>
</li>
</ul>
</div>
<!-- Fim do dropdown de idiomas -->

</div>

</div>
</nav>
<!-- Fim da Navbar -->
Expand Down
Loading