axiom-team
/
gmarche
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into dev-check-sold

This commit is contained in:
poka 2019-11-22 18:48:20 +01:00
parent 7da07e5b16 4f7d557147
commit 49ea6216d6
35 changed files with 135 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,8 +1,8 @@
config/config.php
config/conf.php
.idea
/public/uploads
/tmp
vendor
composer.json
composer.lock
/src/Framework/SwiftMailerFactory.php

4
README.md Normal file
View File

@ -0,0 +1,4 @@
# Plateforme événementielle de mise en relation des Ḡmarchés.
## Site en construction
### TODO: README

4
config.php
View File

@ -1,4 +0,0 @@
<?php
return [
'gmarche.prefix' => '/news'
];

53
config/apply.php Normal file
View File

@ -0,0 +1,53 @@
<?php
include 'config.php';
use App\Framework\Twig\UrlExtension;
use Framework\Middleware\CsrfMiddleware;
use Framework\Renderer\RendererInterface;
use Framework\Renderer\TwigRendererFactory;
use Framework\Router;
use Framework\Router\RouterFactory;
use Framework\Router\RouterTwigExtension;
use Framework\Session\PHPSession;
use Framework\Session\SessionInterface;
use Framework\Twig\{
CsrfExtension, FlashExtension, FormExtension, PagerFantaExtension, TextExtension, TimeExtension
};
return [
'env' => \DI\env('ENV', 'production'),
'database.host' => "$db_server",
'database.username' => "$db_username",
'database.password' => "$db_password",
'database.name' => "$db_name",
'views.path' => dirname(__DIR__) . '/views',
'twig.extensions' => [
\DI\get(RouterTwigExtension::class),
\DI\get(PagerFantaExtension::class),
\DI\get(TextExtension::class),
\DI\get(TimeExtension::class),
\DI\get(FlashExtension::class),
\DI\get(FormExtension::class),
\DI\get(CsrfExtension::class),
\DI\get(UrlExtension::class)
],
SessionInterface::class => \DI\object(PHPSession::class),
CsrfMiddleware::class => \DI\object()->constructor(\DI\get(SessionInterface::class)),
Router::class => \DI\factory(RouterFactory::class),
RendererInterface::class => \DI\factory(TwigRendererFactory::class),
\PDO::class => function (\Psr\Container\ContainerInterface $c) {
return new PDO(
'mysql:host='. $c->get('database.host') . ';dbname=' . $c->get('database.name'),
$c->get('database.username'),
$c->get('database.password'),
[
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
]
);
},
// MAILER
'mail.to' => 'admin@gmarche-testmail.com',
'mail.from' => '$mail_from',
Swift_Mailer::class => \DI\factory(\Framework\SwiftMailerFactory::class)
];

5
config/conf-sample.php
View File

@ -1,5 +0,0 @@
<?php
$host = '';
$username = '';
$password = '';
$database_name = '';

57
config/config-sample.php
View File

@ -1,52 +1,7 @@
<?php
use App\Framework\Twig\UrlExtension;
use Framework\Middleware\CsrfMiddleware;
use Framework\Renderer\RendererInterface;
use Framework\Renderer\TwigRendererFactory;
use Framework\Router;
use Framework\Router\RouterFactory;
use Framework\Router\RouterTwigExtension;
use Framework\Session\PHPSession;
use Framework\Session\SessionInterface;
use Framework\Twig\{
CsrfExtension, FlashExtension, FormExtension, PagerFantaExtension, TextExtension, TimeExtension
};
return [
'env' => \DI\env('ENV', 'production'),
'database.host' => '',
'database.username' => '',
'database.password' => '',
'database.name' => '',
'views.path' => dirname(__DIR__) . '/views',
'twig.extensions' => [
\DI\get(RouterTwigExtension::class),
\DI\get(PagerFantaExtension::class),
\DI\get(TextExtension::class),
\DI\get(TimeExtension::class),
\DI\get(FlashExtension::class),
\DI\get(FormExtension::class),
\DI\get(CsrfExtension::class),
\DI\get(UrlExtension::class)
],
SessionInterface::class => \DI\object(PHPSession::class),
CsrfMiddleware::class => \DI\object()->constructor(\DI\get(SessionInterface::class)),
Router::class => \DI\factory(RouterFactory::class),
RendererInterface::class => \DI\factory(TwigRendererFactory::class),
\PDO::class => function (\Psr\Container\ContainerInterface $c) {
return new PDO(
'mysql:host='. $c->get('database.host') . ';dbname=' . $c->get('database.name'),
$c->get('database.username'),
$c->get('database.password'),
[
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
]
);
},
// MAILER
'mail.to' => 'admin@gmarche-testmail.com',
'mail.from' => 'no-reply@admin.fr',
Swift_Mailer::class => \DI\factory(\Framework\SwiftMailerFactory::class)
];
$db_server = '';
$db_username = '';
$db_password = '';
$db_name = '';
$mail_from = '';
$g1_node = 'https://duniter-g1.p2p.legal';

3
public/index.php
View File

@ -24,8 +24,7 @@ require 'vendor/autoload.php';
$chemin = $_SERVER['DOCUMENT_ROOT'];
$chemin_new = substr($chemin,0,-6);
$app = (new \Framework\App( $chemin_new .'/config/config.php'))
//$app = (new \Framework\App( '../config/config.php'))
$app = (new \Framework\App( $chemin_new .'config/apply.php'))
->addModule(AdminModule::class)
->addModule(ContactModule::class)
->addModule(ProductModule::class)

5
public/js/connex.js
View File

@ -1,6 +1,5 @@
function connexion(nom_connecte, mdp) {
$.post("/ajax/connexion.php", {
function connexion(nom_connecte, mdp, chemin) {
$.post('/models/connexion.php', {
nom_connecte: nom_connecte,
mdp: mdp
}, function (data, status) {

28
public/js/script.js
View File

@ -9,7 +9,7 @@ function addRecord(antenne_slug, antenne_id, nom_connecte, id_user) {
var quantite = $("#quantite").val();
var prix = $("#prix").val();
// Add record
$.post("/ajax/addRecord.php", {
$.post("/models/addRecord.php", {
produit: produit,
image: nom_image,
vendeur: vendeur,
@ -46,7 +46,7 @@ function addRecord2(antenne_slug, antenne_id, nom_connecte, id_user) {
var quantite = $("#quantite").val();
var prix = $("#prix").val();
// Add record
$.post("/ajax/addRecord2.php", {
$.post("/models/addRecord2.php", {
produit: produit,
image: nom_image,
acheteur: acheteur,
@ -75,7 +75,7 @@ function addRecord2(antenne_slug, antenne_id, nom_connecte, id_user) {
// READ records
function readRecords(antenne_slug, nom_connecte) {
$.get("/ajax/readRecords.php", {
$.get("/models/readRecords.php", {
antenne_slug: antenne_slug,
nom_connecte: nom_connecte
}, function (data, status) {
@ -84,7 +84,7 @@ function readRecords(antenne_slug, nom_connecte) {
}
// READ records2
function readRecords2(antenne_slug, nom_connecte) {
$.get("/ajax/readRecords2.php", {
$.get("/models/readRecords2.php", {
antenne_slug: antenne_slug,
nom_connecte: nom_connecte
}, function (data, status) {
@ -96,7 +96,7 @@ function DeleteProduits(id, antenne_slug, nom_image) {
$("#hidden_antenne_slug").val(antenne_slug);
var conf = confirm("Etes-vous sûr(e) de vouloir supprimer ce bien ou service ?");
if (conf == true) {
$.post("/ajax/deleteProduits.php", {
$.post("/models/deleteProduits.php", {
id: id,
antenne_slug: antenne_slug,
nom_image: nom_image
@ -114,7 +114,7 @@ function DeleteRecherches(id, antenne_slug, nom_image) {
$("#hidden_antenne_slug_r").val(antenne_slug);
var conf = confirm("Etes-vous sûr(e) de vouloir supprimer ce bien ou service ?");
if (conf == true) {
$.post("/ajax/deleteRecherches.php", {
$.post("/models/deleteRecherches.php", {
id_r: id,
antenne_slug: antenne_slug,
nom_image: nom_image
@ -132,7 +132,7 @@ function GetProduitsDetails(id, antenne_slug, nom_image) {
$("#hidden_user_id").val(id);
$("#hidden_antenne_slug").val(antenne_slug);
$("#hidden_image_name").val(nom_image);
$.post("/ajax/readProduitsDetails.php", {
$.post("/models/readProduitsDetails.php", {
id: id
},
function (data, status) {
@ -153,7 +153,7 @@ function GetRecherchesDetails(id, antenne_slug, nom_image) {
$("#hidden_user_id_r").val(id);
$("#hidden_antenne_slug_r").val(antenne_slug);
$("#hidden_image_name_r").val(nom_image);
$.post("/ajax/readRecherchesDetails.php", {
$.post("/models/readRecherchesDetails.php", {
id_r: id
},
function (data, status) {
@ -180,7 +180,7 @@ function UpdateProduitsDetails(nom_connecte) {
// Champs cachés
var id = $("#hidden_user_id").val();
var antenne_slug = $("#hidden_antenne_slug").val();
$.post("/ajax/updateProduitsDetails.php", {
$.post("/models/updateProduitsDetails.php", {
id: id,
produit: produit,
image: nom_image,
@ -208,7 +208,7 @@ function UpdateRecherchesDetails(nom_connecte) {
var id = $("#hidden_user_id_r").val();
var antenne_slug = $("#hidden_antenne_slug_r").val();
// Update the details by requesting to the server using ajax
$.post("/ajax/updateRecherchesDetails.php", {
$.post("/models/updateRecherchesDetails.php", {
id: id,
produit: produit,
image: nom_image,
@ -229,8 +229,8 @@ function UpdateRecherchesDetails(nom_connecte) {
$(document).ready(function () {
// On récupère le nom de l'antenne dans l'url pour afficher les biens/services de celle-ci
var url = document.location.href;
var antenne_slug = url.split('/')[5];
var affichage_slug = url.split('/')[6];
var antenne_slug = url.split('/')[4];
var affichage_slug = url.split('/')[5];
var nom_connecte = $("#nom_connecte").text();
if (affichage_slug == 'produits') {
@ -252,7 +252,7 @@ $(document).ready(function () {
// requête AJAX pour copier la photo et l'afficher
$.ajax({
url: '/ajax/upload.php',
url: '/models/upload.php',
type: 'post',
data: fd_add,
contentType: false,
@ -283,7 +283,7 @@ $(document).ready(function () {
fd.append('source',source);
// requête AJAX pour copier la photo et l'afficher
$.ajax({
url: '/ajax/upload.php',
url: '/models/upload.php',
type: 'post',
data: fd,
contentType: false,

4
public/ajax/addRecord.php → public/models/addRecord.php
View File

@ -3,8 +3,8 @@ ini_set('display_errors', 0);
if ($_POST['produit']!== '' && $_POST['vendeur']!== null && $_POST['quantite']>0 && $_POST['prix']>=0) {
// Connexion à la base de données
include '../../config/conf.php';
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
include '../../config/config.php';
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
// Récupération des informations du formulaire
$params = array();

4
public/ajax/addRecord2.php → public/models/addRecord2.php
View File

@ -3,8 +3,8 @@
if(isset($_POST['produit']) && isset($_POST['acheteur']) && isset($_POST['quantite']) )
{
// Connexion à la base de données
include '../../config/conf.php';
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
include '../../config/config.php';
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
// Récupération des informations du formulaire
$params = array();

4
public/ajax/connexion.php → public/models/connexion.php
View File

@ -1,10 +1,10 @@
<?php
include '../../config/conf.php';
include '../../config/config.php';
try {
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
if (isset($_POST['nom_connecte']) && isset($_POST['mdp']) != "") {
$params["username"] = $_POST['nom_connecte'];

4
public/ajax/deleteProduits.php → public/models/deleteProduits.php
View File

@ -1,10 +1,10 @@
<?php
include '../../config/conf.php';
include '../../config/config.php';
if($_POST['id'] !== null)
{
// Connexion à la base de données
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
$params['product_id'] = $_POST['id'];
$filename = $_POST['nom_image'];

4
public/ajax/deleteRecherches.php → public/models/deleteRecherches.php
View File

@ -1,10 +1,10 @@
<?php
include '../../config/conf.php';
include '../../config/config.php';
if($_POST['id_r'] !== null)
{
// Connexion à la base de données
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
$params['souhait_id'] = $_POST['id_r'];
$filename = $_POST['nom_image'];

2
public/ajax/getG1PubKey.php → public/models/getG1PubKey.php
View File

@ -1,6 +1,6 @@
<?php
ini_set('display_errors', 0);
include '../../config/conf.php';
include '../../config/config.php';
if(isset($_GET['vendeur']))
{
// Get public key from pseudo

4
public/ajax/readProduitsDetails.php → public/models/readProduitsDetails.php
View File

@ -1,10 +1,10 @@
<?php
include '../../config/conf.php';
include '../../config/config.php';
try {
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
if (isset($_POST['id']) && isset($_POST['id']) != "") {
$product_id = $_POST['id'];

4
public/ajax/readRecherchesDetails.php → public/models/readRecherchesDetails.php
View File

@ -1,10 +1,10 @@
<?php
include '../../config/conf.php';
include '../../config/config.php';
try {
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
if (isset($_POST['id_r']) && isset($_POST['id_r']) != "") {
$souhait_id = $_POST['id_r'];

9
public/ajax/readRecords.php → public/models/readRecords.php
View File

@ -1,9 +1,10 @@
<?php
session_start();
ini_set('display_errors', 0);
include '../../config/conf.php';
include '../../config/config.php';
$antenne_slug = $_GET['antenne_slug'];
$nom_connecte = $_GET['nom_connecte'];
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$nom_connecte = $_SESSION['user'];
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
// Affichage des intitulés de colonnes
$data = '<table class="table table-bordered table-striped">
@ -67,7 +68,7 @@
$data .= '<td>'.$cle_pub_format.'</td>';
$data .= '<td>'.$row['quantite'].'</td>';
$data .= '<td>'.$prix.'</td>';
if ($row['username'] == $_GET['nom_connecte'] ) {
if ($row['username'] == $nom_connecte ) {
$data .= '<td>';
$data .= '<button onclick="GetProduitsDetails(\'';
$data .= $row['id'];

9
public/ajax/readRecords2.php → public/models/readRecords2.php
View File

@ -1,9 +1,10 @@
<?php
session_start();
ini_set('display_errors', 0);
include '../../config/conf.php';
include '../../config/config.php';
$antenne_slug = $_GET['antenne_slug'];
$nom_connecte = $_GET['nom_connecte'];
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$nom_connecte = $_SESSION['user'];
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
// Affichage des intitulés de colonnes
$data = '<table class="table table-bordered table-striped">
@ -59,7 +60,7 @@
$data .= '<td>'.$pubkeyShort.'...</td>';
$data .= '<td>'.$row['quantite'].'</td>';
$data .= '<td>'.$prix.'</td>';
if ($row['username'] == $_GET['nom_connecte'] ) {
if ($row['username'] == $nom_connecte ) {
$data .= '<td>';
$data .= '<button onclick="GetRecherchesDetails(\'';
$data .= $row['id'];

0
public/ajax/readRecords2_sav.php → public/models/readRecords2_sav.php
View File

4
public/ajax/updateProduitsDetails.php → public/models/updateProduitsDetails.php
View File

@ -1,8 +1,8 @@
<?php
include '../../config/conf.php';
include '../../config/config.php';
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
if(isset($_POST))
{

4
public/ajax/updateRecherchesDetails.php → public/models/updateRecherchesDetails.php
View File

@ -1,8 +1,8 @@
<?php
include '../../config/conf.php';
include '../../config/config.php';
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
if(isset($_POST))
{

0
public/ajax/upload.php → public/models/upload.php
View File

2
readme.md
View File

@ -1,2 +0,0 @@
test
commit du fichier

2
src/Account/views/signup.twig
View File

@ -44,7 +44,7 @@ textInput.onkeyup = function (e) {
}
}
$body.addClass("loading");
xmlhttp.open("GET","/ajax/getG1PubKey.php?vendeur="+textInput.value,true);
xmlhttp.open("GET","/models/getG1PubKey.php?vendeur="+textInput.value,true);
xmlhttp.send();
}, 800);
};

5
src/Auth/Action/LoginAttemptAction.php
View File

@ -50,7 +50,10 @@ class LoginAttemptAction
$params = $request->getParsedBody();
$user = $this->auth->login($params['username'], $params['password']);
if ($user) {
$path = $this->session->get('auth.redirect');
if(!isset($_SESSION)) {
session_start();
}
$nom_user = $_SESSION['user'] = $params['username'];
$path = $this->session->get('auth.redirect') ?? $this->router->generateUri('gmarche.index');
$this->session->delete('auth.redirect');
return new RedirectResponse($path);

4
src/Framework/Middleware/NotFoundMiddleware.php
View File

@ -14,7 +14,7 @@ class NotFoundMiddleware {
background:url(\'/images/bildreich_1275.jpg\') no-repeat;background-size: cover;">
<div class="container" style="padding: 2rem;margin: 5rem 2rem;width:15rem;height:14rem;background-color: #c9c9c9;">
<h4>Erreur 404</h4><br />Cette url n\'existe pas.<br /><br />
<a class="btn btn-primary btn-md" href="https://gmarche.monnaie-libre.fr/france" role="button">
<a class="btn btn-primary btn-md" href="/" role="button">
Retour à l\'accueil</a></div></div></html>');
}
}
}

4
src/Framework/Middleware/TrailingSlashMiddleware.php
View File

@ -8,7 +8,7 @@ class TrailingSlashMiddleware {
public function __invoke(ServerRequestInterface $request, callable $next)
{
$uri = $request->getUri()->getPath();
if (!empty($uri) && $uri[-1] === "/") {
if (!empty($uri) && $uri[-1] === "/" && $uri !== "/") {
return (new \GuzzleHttp\Psr7\Response())
->withStatus(301)
->withHeader('Location', substr($uri, 0, -1));
@ -16,4 +16,4 @@ class TrailingSlashMiddleware {
return $next($request);
}
}
}

4
src/Gmarche/GmarcheModule.php
View File

@ -20,7 +20,7 @@ class GmarcheModule extends Module
$gmarchePrefix = $container->get('gmarche.prefix');
$container->get(RendererInterface::class)->addPath('gmarche', __DIR__ . '/views');
$router = $container->get(Router::class);
$router->get( "$gmarchePrefix", RegionIndexAction::class, 'gmarche.index');
$router->get("$gmarchePrefix/{slug:[a-z\-0-9]+}", AntenneShowAction::class, 'gmarche.antenne');
$router->get("$gmarchePrefix", RegionIndexAction::class, 'gmarche.index');
$router->get("$gmarchePrefix{slug:[a-z\-0-9]+}", AntenneShowAction::class, 'gmarche.antenne');
}
}

2
src/Gmarche/config.php
View File

@ -5,5 +5,5 @@ use function \Di\object;
use function \Di\get;
/* Chemin */
return [
'gmarche.prefix' => '/france'
'gmarche.prefix' => '/'
];

4
src/Product/ProductModule.php
View File

@ -20,8 +20,8 @@ class ProductModule extends Module
$container->get(RendererInterface::class)->addPath('product', __DIR__ . '/views');
$router = $container->get(Router::class);
$router->get("$gmarchePrefix/{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/produits", ProductIndexAction::class, 'product.ville');
$router->get("$gmarchePrefix/{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/recherches", RechIndexAction::class, 'product.recherches');
$router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/produits", ProductIndexAction::class, 'product.ville');
$router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/recherches", RechIndexAction::class, 'product.recherches');
// $router->crud("$gmarchePrefix/{region:[a-z\-]+}/{slug:[a-z\-0-9]+}/{antenne:[0-9]{1,}}",[LoggedInMiddleware::class, ProductCrudAction::class],'product.admin');
}

4
src/Product/views/admin/products/index.twig
View File

@ -93,7 +93,7 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}/{{ region_slug }}">{{ region_name }}</a></li>
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
<li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
<div class="toggle_radio">
@ -102,7 +102,7 @@
<label for="first_toggle"><p>PRODUITS</p></label>
<label for="second_toggle">
<p>
<a style="color:black;" href="{{ gmarchePrefix }}/{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
<a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
</p>
</label>
<div class="toggle_option_slider">

4
src/Product/views/admin/recherches/index.twig
View File

@ -93,14 +93,14 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}/{{ region_slug }}">{{ region_name }}</a></li>
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
<li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
<div class="toggle_radio">
<input type="radio" class="toggle_option" id="first_toggle" name="toggle_option">
<input style="color:black;" type="radio" checked class="toggle_option" id="second_toggle" name="toggle_option">
<label for="first_toggle">
<a style="color:black;" href="{{ gmarchePrefix }}/{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
<a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
</label>
<label for="second_toggle">
<p>RECHERCHES</p>

12
vendor/nikic/fast-route/src/DataGenerator/RegexBasedAbstract.php vendored
View File

@ -91,12 +91,12 @@ abstract class RegexBasedAbstract implements DataGenerator
if (isset($this->methodToRegexToRoutesMap[$httpMethod])) {
foreach ($this->methodToRegexToRoutesMap[$httpMethod] as $route) {
if ($route->matches($routeStr)) {
throw new BadRouteException(sprintf(
'Static route "%s" is shadowed by previously defined variable route "%s" for method "%s"',
$routeStr, $route->regex, $httpMethod
));
}
// if ($route->matches($routeStr)) {
// throw new BadRouteException(sprintf(
// 'Static route "%s" is shadowed by previously defined variable route "%s" for method "%s"',
// $routeStr, $route->regex, $httpMethod
// ));
// }
}
}

2
views/layout.twig
View File

@ -115,7 +115,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="button" class="btn btn-primary"
onclick="connexion(document.getElementById('pseudo').value,document.getElementById('mdp').value)">Valider</button>
onclick="connexion(document.getElementById('pseudo').value,document.getElementById('mdp').value)">Valider</button>
</div>
</div>
</div>