This commit is contained in:
afornerot 2024-11-21 08:32:59 +01:00
parent ce7f5a1b4a
commit 1289b22a93
9 changed files with 58 additions and 20 deletions

View File

@ -5,10 +5,16 @@ import $ from 'jquery';
window.$ = $; window.$ = $;
// Bootstrap // Bootstrap
import 'bootstrap'
import 'bootstrap/dist/css/bootstrap.min.css'; import 'bootstrap/dist/css/bootstrap.min.css';
// Fontawsome
import '@fortawesome/fontawesome-free'
import '@fortawesome/fontawesome-free/css/all.min.css';
// Local CSS // Local CSS
import './styles/bootswatch.min.css' import './styles/bootswatch.min.css'
import './styles/app.css'; import './styles/app.css';
console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉'); console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');

View File

@ -3,3 +3,8 @@
width:40px; width:40px;
margin-right:10px; margin-right:10px;
} }
.navbar-toggler {
border: none;
box-shadow: none !important;
}

View File

@ -20,6 +20,7 @@ security:
login_path: app_login login_path: app_login
check_path: app_login check_path: app_login
enable_csrf: true enable_csrf: true
default_target_path: /
logout: logout:
path: app_logout path: app_logout
# where to redirect after logout # where to redirect after logout
@ -34,8 +35,11 @@ security:
# Easy way to control access for large sections of your site # Easy way to control access for large sections of your site
# Note: Only the *first* access control that matches will be used # Note: Only the *first* access control that matches will be used
access_control: access_control:
# - { path: ^/admin, roles: ROLE_ADMIN } - { path: ^/login, roles: PUBLIC_ACCESS }
# - { path: ^/profile, roles: ROLE_USER } - { path: ^/register, roles: PUBLIC_ACCESS }
- { path: ^/admin, roles: ROLE_ADMIN }
- { path: ^/, roles: ROLE_USER }
when@test: when@test:
security: security:

View File

@ -32,4 +32,21 @@ return [
'version' => '5.3.3', 'version' => '5.3.3',
'type' => 'css', 'type' => 'css',
], ],
'@fortawesome/fontawesome-free' => [
'version' => '6.7.1',
],
'@fortawesome/fontawesome-free/css/fontawesome.min.css' => [
'version' => '6.7.1',
'type' => 'css',
],
'@fortawesome/fontawesome-free/css/all.min.css' => [
'version' => '6.7.1',
'type' => 'css',
],
'bootstrap' => [
'version' => '5.3.3',
],
'@popperjs/core' => [
'version' => '2.11.8',
],
]; ];

View File

@ -24,11 +24,11 @@ class Accounting
#[ORM\Column(length: 255)] #[ORM\Column(length: 255)]
private ?string $title = null; private ?string $title = null;
#[ORM\Column(length: 255)] #[ORM\Column(length: 255, nullable: true)]
private ?string $icon = null; private ?string $icon = null;
#[ORM\Column] #[ORM\Column(length: 255)]
private ?bool $actif = null; private ?string $category = null;
#[ORM\ManyToOne(inversedBy: 'accountings')] #[ORM\ManyToOne(inversedBy: 'accountings')]
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
@ -98,21 +98,21 @@ class Accounting
return $this->icon; return $this->icon;
} }
public function setIcon(string $icon): static public function setIcon(?string $icon): static
{ {
$this->icon = $icon; $this->icon = $icon;
return $this; return $this;
} }
public function isActif(): ?bool public function getCategory(): ?string
{ {
return $this->actif; return $this->category;
} }
public function setActif(bool $actif): static public function setCategory(string $category): static
{ {
$this->actif = $actif; $this->category = $category;
return $this; return $this;
} }

View File

@ -89,7 +89,7 @@ class Company
return $this->adress; return $this->adress;
} }
public function setAdress(string $adress): static public function setAdress(?string $adress): static
{ {
$this->adress = $adress; $this->adress = $adress;
@ -260,4 +260,5 @@ class Company
return $this; return $this;
} }
} }

View File

@ -95,4 +95,5 @@ class Operation
return $this; return $this;
} }
} }

View File

@ -27,15 +27,15 @@ class CompanySubscriber
$entityManager = $args->getObjectManager(); $entityManager = $args->getObjectManager();
// Génération des accounting par défaut // Génération des accounting par défaut
$this->insertAccounting($company,"512","000","Banque",true); $this->insertAccounting($company,"512","000","Banque","actif","fa-building-columns");
$this->insertAccounting($company,"530","000","Caisse",true); $this->insertAccounting($company,"530","000","Caisse","actif","fa-piggy-bank");
$this->insertAccounting($company,"600","000","Charge",false); $this->insertAccounting($company,"600","000","Charge","charge",null);
$this->insertAccounting($company,"700","000","Produit",false); $this->insertAccounting($company,"700","000","Produit","produit",null);
// Génération du year par // Génération du year par
} }
private function insertAccounting(Company $company,string $num01, string $num02, string $title, bool $isactif): void private function insertAccounting(Company $company,string $num01, string $num02, string $title, string $category, ?string $icon): void
{ {
$accounting=$this->em->getRepository("App\Entity\Accounting")->findOneBy(["company"=>$company,"num01"=>$num01,"num02"=>$num02]); $accounting=$this->em->getRepository("App\Entity\Accounting")->findOneBy(["company"=>$company,"num01"=>$num01,"num02"=>$num02]);
if(!$accounting) { if(!$accounting) {
@ -44,7 +44,7 @@ class CompanySubscriber
$accounting->setNum01($num01); $accounting->setNum01($num01);
$accounting->setNum02($num02); $accounting->setNum02($num02);
$accounting->setTitle($title); $accounting->setTitle($title);
$accounting->SetActif($isactif); $accounting->SetCategory($category);
$this->em->persist($accounting); $this->em->persist($accounting);
$this->em->flush(); $this->em->flush();
} }

View File

@ -14,10 +14,9 @@
<body> <body>
<nav class="navbar navbar-expand-lg bg-dark" data-bs-theme="dark"> <nav class="navbar navbar-expand-lg bg-dark" data-bs-theme="dark">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#"><img src="{{asset("medias/logo/logo.png")}}"> {{appName}}</a> <a class="navbar-brand" href="#"><img src="{{asset("medias/logo/logo.png")}}"> {{appName}}</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarColor02"> <div class="collapse navbar-collapse" id="navbarColor02">
<ul class="navbar-nav me-auto"> <ul class="navbar-nav me-auto">
<li class="nav-item"> <li class="nav-item">
@ -46,6 +45,11 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="navbar-nav ms-auto ps-3 d-flex flex-row position-absolute" style="right: 15px; top:15px">
<a class="nav-link px-2" href="#"><i class="fa-solid fa-user fa-2x"></i></a>
<a class="navbar-toggler nav-link px-2" href="#" data-bs-toggle="collapse" data-bs-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation"><i class="fa-solid fa-bars fa-2x"></i></a>
</div>
</div> </div>
</nav> </nav>