Skip to content
Snippets Groups Projects
Commit 7f5e3b8f authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

multiple fixes

parent 90dfa204
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 12 additions and 83 deletions
core/classes/Admin.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -30,7 +30,7 @@ class Admin{
}
// Récupérer les dépendances
public static function getDepedencies(){
public static function getDependencies(){
require 'pages/admin/includes/dependencies.php';
}
......
core/classes/Client.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -24,7 +24,7 @@ class Client{
}
// Récupérer les dépendances
public static function getDepedencies(){
public static function getDependencies(){
require 'pages/client/includes/dependencies.php';
}
......
pages/admin/includes/dependencies.php
+ 3
− 3
View file @ 7f5e3b8f
......@@ -22,16 +22,16 @@
<!-- Font Awesome -->
<link rel="stylesheet" type="text/css" href="pages/assets/vendors/fontawesome/css/all.min.css">
<script src="pages/assets/vendors/fontawesome/js/all.min.js" data-auto-replace-svg="nest"></script>
<script src="/pages/assets/vendors/fontawesome/js/all.min.js" data-auto-replace-svg="nest"></script>
<!-- Intégration de JS Snackbar -->
<link rel="stylesheet" href="/pages/assets/vendors/js-snackbar/css/js-snackbar.css?v=2.0.0" />
<script src="/pages/assets/vendors/js-snackbar/js/js-snackbar.js?v=1.2.0"></script>
<!-- Fonction JS du panel -->
<script src="pages/assets/js/manager.js"></script>
<script src="/pages/assets/js/manager.js"></script>
<!-- Styles -->
<link rel="stylesheet" href="pages/assets/css/manager.css">
<link rel="stylesheet" href="/pages/assets/css/manager.css">
<!-- Animate CSS -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"/>
pages/admin/index.php
+ 1
− 72
View file @ 7f5e3b8f
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Marmiuton | Administration</title>
<?=Admin::getDepedencies()?>
<?=Admin::getDependencies()?>
</head>
<body>
<?=Admin::getNavbar()?>
......@@ -14,7 +14,6 @@
<div class="userLogo" style="background-image: url('<?=$_SESSION['userProfilePic']?>');"></div>
<div class="ml-5">
<h3>Bienvenue <?=$_SESSION["userName"]?>!</h3>
<p><?=$updateMessage?>
<br><strong>Vous êtes sur une version de développement de VBcms.</strong></p>
</div>
</div>
......@@ -23,76 +22,6 @@
<h3>Tableau de bord</h3>
<p>Bienvenu sur le paneau d’administration. Voici un bref résumé de l'activité de cette semaine.</p>
<!-- Debut de la liste des cartes -->
<!--
<div id="indexCards" class="row" style="">
<div class="col-xl-6">
<div id="indexCardOne" class="indexCard mb-3 overflow-hidden">
<div style="position: absolute; z-index: 1;height: 100%; width: 100%; background-image: url(<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/mainIndexCardBg.png); background-position: right bottom; background-repeat: no-repeat; background-size: 100%;"></div>
<div class="indexCardBody">
<h5>Nouvelles licences</h5>
<h3>15</h3>
<p class="subText">+15% que la semaine dernière</p>
<a href="#" class="btn btn-light">Voir les liscences</a>
</div>
</div>
</div>
<div class="col-xl-6">
<div class="row">
<div class="col-sm-6">
<div id="indexCardTwo" class="indexCard overflow-hidden">
<div class="indexCardImg">
<img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/globe.png">
</div>
<div class="indexCardBody">
<h5>Visites</h5>
<h3>20</h3>
<p class="subText">+5% que la semaine dernière</p>
<a href="#" class="text-light">Voir les statistiques <i class="fas fa-arrow-right"></i></a>
</div>
</div>
<div id="indexCardThree" class="indexCard overflow-hidden">
<div class="indexCardImg">
<img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/ticket.png">
</div>
<div class="indexCardBody">
<h5>Tickets support</h5>
<h3>4</h3>
<p class="subText">14 depuis le début de la semaine</p>
<a href="#" class="text-light">Voir les tickets <i class="fas fa-arrow-right"></i></a>
</div>
</div>
</div>
<div class="col-sm-6">
<div id="indexCardFour" class="indexCard overflow-hidden">
<div class="indexCardImg">
<img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/puzzle.png">
</div>
<div class="indexCardBody">
<h5>Nouveaux addons</h5>
<h3>15</h3>
<p class="subText">+15% que la semaine dernière</p>
<a href="#" class="text-light">Voir les addons <i class="fas fa-arrow-right"></i></a>
</div>
</div>
<div id="indexCardFive" class="indexCard overflow-hidden">
<div class="indexCardImg">
<img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/hourglass.png">
</div>
<div class="indexCardBody">
<h5>Inscriptions en attente</h5>
<h3>15</h3>
<p class="subText">+15% que la semaine dernière</p>
<a href="#" class="text-light">Voir les inscriptions <i class="fas fa-arrow-right"></i></a>
</div>
</div>
</div>
</div>
</div>
</div>
-->
<!-- Fin de la liste des cartes -->
<div class="mt-3">
<h3>Merci de participer aux tests!</h3>
<p>Salut et merci d'avoir accepté de participer aux tests de pré-sortie. Tu es là sur une version très primaire de ce que sera VBcms 2.0 à la fin, et comme tu l'as peut-être déjà remarqué, il n'y a pas grand chose de terminé.</p><br>
......
pages/client/404.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -2,7 +2,7 @@
<head>
<meta charset="UTF-8">
<!-- Dépendances -->
<?=getDepedencies()?>
<?=getDependencies()?>
<title>404</title>
<link rel="stylesheet" href="pages/assets/css/404.css">
<link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@600;900&display=swap" rel="stylesheet">
......
pages/client/lesRecettes.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<!-- Dépendances -->
<?=Client::getDepedencies()?>
<?=Client::getDependencies()?>
<title>Marmiuton</title>
<!-- Embed -->
......
pages/client/login.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -19,7 +19,7 @@ if(isset($_SESSION['userId'])){
<meta content="#ed8930" data-react-helmet="true" name="theme-color" />
<!-- Dépendances -->
<?=Client::getDepedencies()?>
<?=Client::getDependencies()?>
<link rel="stylesheet" href="pages/assets/css/connexion.css">
<!-- Recaptcha -->
......
pages/client/recette.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8">
<!-- Dépendances -->
<?=Client::getDepedencies()?>
<?=Client::getDependencies()?>
<link rel="stylesheet" href="pages/assets/css/recette.css">
<!-- Embed -->
......
pages/client/register.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -10,7 +10,7 @@ if(isset($_SESSION['userId'])){
<head>
<meta charset="UTF-8">
<!-- Dépendances -->
<?=Client::getDepedencies()?>
<?=Client::getDependencies()?>
<link rel="stylesheet" href="pages/assets/css/connexion.css">
<title>Inscription</title>
......
pages/client/vitrine.php
+ 1
− 1
View file @ 7f5e3b8f
......@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<!-- Dépendances -->
<?=Client::getDepedencies()?>
<?=Client::getDependencies()?>
<title>Marmiuton</title>
<!-- Embed -->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment