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

Correction de la connexion user sur tous les écrans

This commit is contained in:
nox 2019-11-14 00:49:03 +01:00
parent 64114df2ff
commit 0e895c8ae1
11 changed files with 60 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
public/ajax/getG1PubKey.php
View File

@ -1,27 +1,28 @@
<?php <?php
ini_set('display_errors', 0);
include '../../config/conf.php'; include '../../config/conf.php';
if(isset($_GET['vendeur'])) if(isset($_GET['vendeur']))
{ {
// Get public key from pseudo // Get public key from pseudo
$parseUser = $_GET['vendeur']; $parseUser = $_GET['vendeur'];
putenv("parseUser=$parseUser"); putenv("parseUser=$parseUser");
putenv("g1_node=$g1_node"); putenv("g1_node=$g1_node");
$silkPubKey = system('curl -s $g1_node/wot/members | grep -w -i -B 1 $parseUser | grep "pubkey" | awk -F \'"\' \'{ print $4 }\''); $silkPubKey = system('curl -s $g1_node/wot/members | grep -w -i -B 1 $parseUser | grep "pubkey" | awk -F \'"\' \'{ print $4 }\'');
if (empty($silkPubKey)) if (empty($silkPubKey))
{
$silkPubKeyUser = shell_exec('curl -s $g1_node/wot/lookup/$parseUser | head | grep -i -w -A 3 "pubkey" | awk -F \'"\' \'{ print $4 }\' | awk \'NF > 0\'');
putenv("silkPubKeyUser=$silkPubKeyUser");
$silkUser = system('echo "$silkPubKeyUser" | tail -n2 | head -n1');
if ($silkUser == $parseUser)
{ {
$silkPubKeyUser = shell_exec('curl -s $g1_node/wot/lookup/$parseUser | head | grep -i -w -A 3 "pubkey" | awk -F \'"\' \'{ print $4 }\' | awk \'NF > 0\''); $silkPubKey = system('echo "$silkPubKeyUser" | head -n1');
putenv("silkPubKeyUser=$silkPubKeyUser");
$silkUser = system('echo "$silkPubKeyUser" | tail -n2 | head -n1');
if ($silkUser == $parseUser)
{
$silkPubKey = system('echo "$silkPubKeyUser" | head -n1');
}
} }
}
if (empty($silkPubKey)) if (empty($silkPubKey))
{ {
echo "Aucune clé n'a été trouvé à partir de ce pseudo"; echo "Aucune clé n'a été trouvée à partir de ce pseudo";
} }
} }
?> ?>

10
public/js/script.js
View File

@ -21,7 +21,8 @@ function addRecord(antenne_slug, antenne_id, nom_connecte, id_user) {
}, function (data, status) { }, function (data, status) {
// close the popup // close the popup
$("#add_new_record_modal").modal("hide"); $("#add_new_record_modal").modal("hide");
// On recharge la page pour tenir compte de la connexion de l'utilisateur
window.location.reload(true);
// On relit les enregistrements // On relit les enregistrements
readRecords(antenne_slug, nom_connecte); readRecords(antenne_slug, nom_connecte);
// On efface les champs du popup // On efface les champs du popup
@ -57,7 +58,8 @@ function addRecord2(antenne_slug, antenne_id, nom_connecte, id_user) {
}, function (data, status) { }, function (data, status) {
// close the popup // close the popup
$("#add_new_record_modal").modal("hide"); $("#add_new_record_modal").modal("hide");
// On recharge la page pour tenir compte de la connexion de l'utilisateur
window.location.reload(true);
// On relit les enregistrements // On relit les enregistrements
readRecords2(antenne_slug, nom_connecte); readRecords2(antenne_slug, nom_connecte);
@ -188,6 +190,8 @@ function UpdateProduitsDetails(nom_connecte) {
function (data, status) { function (data, status) {
// Fermeture de la fenêtre modale // Fermeture de la fenêtre modale
$("#update_user_modal").modal("hide"); $("#update_user_modal").modal("hide");
// On recharge la page pour tenir compte de la connexion de l'utilisateur
window.location.reload(true);
// Réaffichage des biens/services // Réaffichage des biens/services
readRecords(antenne_slug, nom_connecte); readRecords(antenne_slug, nom_connecte);
} }
@ -214,6 +218,8 @@ function UpdateRecherchesDetails(nom_connecte) {
function (data, status) { function (data, status) {
// hide modal popup // hide modal popup
$("#update_user_modal").modal("hide"); $("#update_user_modal").modal("hide");
// On recharge la page pour tenir compte de la connexion de l'utilisateur
window.location.reload(true);
// reload Recherches by using readRecords2(); // reload Recherches by using readRecords2();
readRecords2(antenne_slug, nom_connecte); readRecords2(antenne_slug, nom_connecte);
} }

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

@ -1,7 +1,6 @@
{% extends 'layout.twig' %} {% extends 'layout.twig' %}
{% block body %} {% block body %}
<!-- <script type="text/javascript" src="../../../public/js/script.js"></script>-->
<div class="container" id="signupContain"> <div class="container" id="signupContain">
<form action="{{ path('account.signup') }}" method="post"> <form action="{{ path('account.signup') }}" method="post">
{{ csrf_input() }} {{ csrf_input() }}
@ -35,7 +34,7 @@ textInput.onkeyup = function (e) {
xmlhttp.onreadystatechange=function() { xmlhttp.onreadystatechange=function() {
if (this.readyState==4 && this.status==200) { if (this.readyState==4 && this.status==200) {
pubkeyAnswer=this.responseText; pubkeyAnswer=this.responseText;
pubkeyIsNull = pubkeyAnswer.includes("Aucune clé n'a été trouvé à partir de ce pseudo"); pubkeyIsNull = pubkeyAnswer.includes("Aucune clé n'a été trouvée à partir de ce pseudo");
// (pubkeyIsNull) ? sentenceAnswer=this.responseText : sentenceAnswer="j'ai trouvé ta clé publique Ḡ1 !"; // (pubkeyIsNull) ? sentenceAnswer=this.responseText : sentenceAnswer="j'ai trouvé ta clé publique Ḡ1 !";
// sentenceAnswer=this.responseText; // sentenceAnswer=this.responseText;
(pubkeyIsNull) ? document.getElementById("livesearch-pubkey").innerHTML=pubkeyAnswer : document.getElementById("livesearch-pubkey").innerHTML='ḠTrouvé une clé ! =)<br>Clé publique: ' + pubkeyAnswer; (pubkeyIsNull) ? document.getElementById("livesearch-pubkey").innerHTML=pubkeyAnswer : document.getElementById("livesearch-pubkey").innerHTML='ḠTrouvé une clé ! =)<br>Clé publique: ' + pubkeyAnswer;

8
src/Contact/ContactAction.php
View File

@ -26,7 +26,13 @@ class ContactAction
public function __invoke(ServerRequestInterface $request) public function __invoke(ServerRequestInterface $request)
{ {
if ($request->getMethod() === 'GET') { if ($request->getMethod() === 'GET') {
return $this->renderer->render('@contact/contact'); session_start();
if (isset($_SESSION['user'])) {
$nom_user = $_SESSION['user'];
} else {
$nom_user = '';
}
return $this->renderer->render('@contact/contact',compact('nom_user'));
} }
} }
} }

6
src/Gmarche/Actions/AntenneShowAction.php
View File

@ -62,10 +62,10 @@ class AntenneShowAction
}*/ }*/
session_start(); session_start();
if (isset($_SESSION['user'])) { if (isset($_SESSION['user'])) {
$user = $_SESSION['user']; $nom_user = $_SESSION['user'];
} else { } else {
$user = ''; $nom_user = '';
} }
return $this->renderer->render('@gmarche/antenne', compact('user','slug', 'region', 'gmarchePrefix','antennes', 'page')); return $this->renderer->render('@gmarche/antenne', compact('nom_user','slug', 'region', 'gmarchePrefix','antennes', 'page'));
} }
} }

6
src/Gmarche/Actions/RegionIndexAction.php
View File

@ -35,10 +35,10 @@ class RegionIndexAction
$regions = $this->regionTable->findAll()->paginate(15, $params['p'] ?? 1); $regions = $this->regionTable->findAll()->paginate(15, $params['p'] ?? 1);
session_start(); session_start();
if (isset($_SESSION['user'])) { if (isset($_SESSION['user'])) {
$user = $_SESSION['user']; $nom_user = $_SESSION['user'];
} else { } else {
$user = ''; $nom_user = '';
} }
return $this->renderer->render('@gmarche/index', compact('user','regions')); return $this->renderer->render('@gmarche/index', compact('nom_user','regions'));
} }
} }

10
src/Product/Actions/ProductIndexAction.php
View File

@ -54,19 +54,17 @@ class ProductIndexAction
$requete_region = $this->regionTable->findBy('slug', $region_slug); $requete_region = $this->regionTable->findBy('slug', $region_slug);
$region_name = $requete_region->name; $region_name = $requete_region->name;
$page = $params['p'] ?? 1; $page = $params['p'] ?? 1;
//$routePrefix = 'product.admin';
//$routePrefix = 'product.index';
$viewPath = '@product/admin/products'; $viewPath = '@product/admin/products';
$items = $this->productTable->findByAntenneId('antenne_id', $antenne_id)->paginate(20, $page); $items = $this->productTable->findByAntenneId('antenne_id', $antenne_id)->paginate(20, $page);
session_start(); session_start();
if (isset($_SESSION['user'])) { if (isset($_SESSION['user'])) {
$user = $_SESSION['user']; $nom_user = $_SESSION['user'];
$requete_user = $this->userTable->findBy('username', $user); $requete_user = $this->userTable->findBy('username', $nom_user);
$user_id = $requete_user->id; $user_id = $requete_user->id;
} else { } else {
$user = ''; $nom_user = '';
$user_id = ''; $user_id = '';
} }
return $this->renderer->render($viewPath.'/index', compact('user','user_id', 'antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' )); return $this->renderer->render($viewPath.'/index', compact('nom_user','user_id', 'antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' ));
} }
} }

8
src/Product/Actions/RechIndexAction.php
View File

@ -60,13 +60,13 @@ class RechIndexAction
$items = $this->rechTable->findByAntenneId('antenne_id', $antenne_id)->paginate(20, $page); $items = $this->rechTable->findByAntenneId('antenne_id', $antenne_id)->paginate(20, $page);
session_start(); session_start();
if (isset($_SESSION['user'])) { if (isset($_SESSION['user'])) {
$user = $_SESSION['user']; $nom_user = $_SESSION['user'];
$requete_user = $this->userTable->findBy('username', $user); $requete_user = $this->userTable->findBy('username', $nom_user);
$user_id = $requete_user->id; $user_id = $requete_user->id;
} else { } else {
$user = ''; $nom_user = '';
$user_id = ''; $user_id = '';
} }
return $this->renderer->render($viewPath.'/index', compact('user','user_id','antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' )); return $this->renderer->render($viewPath.'/index', compact('nom_user','user_id','antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' ));
} }
} }

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

@ -132,7 +132,7 @@
Mettez bien le pseudo, la clé publique, le bien ou service, et le prix en june. Mettez bien le pseudo, la clé publique, le bien ou service, et le prix en june.
</div> </div>
<p> <p>
{% if user != '' %} {% if nom_user != '' %}
<button style="color:white; font-size: 14px;" class="btn btn-primary" data-toggle="modal" data-target="#add_new_record_modal">Ajouter un bien ou service <button style="color:white; font-size: 14px;" class="btn btn-primary" data-toggle="modal" data-target="#add_new_record_modal">Ajouter un bien ou service
{% else %} {% else %}
<p> <p>
@ -157,7 +157,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="vendeur">Vendeur</label> <label for="vendeur">Vendeur</label>
<input type="text" id="vendeur" disabled="disabled" placeholder="{{ user }}" value="{{ user }}" class="form-control"/> <input type="text" id="vendeur" disabled="disabled" placeholder="{{ nom_user }}" value="{{ nom_user }}" class="form-control"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="produit">Bien ou service</label> <label for="produit">Bien ou service</label>
@ -189,7 +189,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button> <button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onclick="addRecord('{{ antenne_slug }}','{{ antenne_id }}','{{ user }}','{{ user_id }}')">Ajouter</button> onclick="addRecord('{{ antenne_slug }}','{{ antenne_id }}','{{ nom_user }}','{{ user_id }}')">Ajouter</button>
</div> </div>
</div> </div>
</div> </div>
@ -232,7 +232,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button> <button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="button" class="btn btn-primary" onclick="UpdateProduitsDetails('{{ user }}')" >Sauvegarder</button> <button type="button" class="btn btn-primary" onclick="UpdateProduitsDetails('{{ nom_user }}')" >Sauvegarder</button>
<input type="hidden" id="hidden_user_id"> <input type="hidden" id="hidden_user_id">
<input type="hidden" id="hidden_antenne_slug"> <input type="hidden" id="hidden_antenne_slug">
<input type="hidden" id="hidden_image_name"> <input type="hidden" id="hidden_image_name">

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

@ -132,7 +132,7 @@
Mettez bien le pseudo, la clé publique, le bien ou service, et le prix en june. Mettez bien le pseudo, la clé publique, le bien ou service, et le prix en june.
</div> </div>
<p> <p>
{% if user != '' %} {% if nom_user != '' %}
<button style="color:white; font-size: 14px;" class="btn btn-primary" data-toggle="modal" data-target="#add_new_record_modal">Ajouter un bien ou service <button style="color:white; font-size: 14px;" class="btn btn-primary" data-toggle="modal" data-target="#add_new_record_modal">Ajouter un bien ou service
{% else %} {% else %}
<p> <p>
@ -156,7 +156,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="acheteur">Acheteur</label> <label for="acheteur">Acheteur</label>
<input type="text" id="acheteur" disabled="disabled" placeholder="{{ user }}" value="{{ user }}" class="form-control"/> <input type="text" id="acheteur" disabled="disabled" placeholder="{{ nom_user }}" value="{{ nom_user }}" class="form-control"/>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -193,7 +193,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button> <button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onclick="addRecord2('{{ antenne_slug }}','{{ antenne_id }}','{{ user }}','{{ user_id }}')">Ajouter</button> onclick="addRecord2('{{ antenne_slug }}','{{ antenne_id }}','{{ nom_user }}','{{ user_id }}')">Ajouter</button>
</div> </div>
</div> </div>
</div> </div>
@ -235,7 +235,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button> <button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="button" class="btn btn-primary" onclick="UpdateRecherchesDetails('{{ user }}')" >Sauvegarder</button> <button type="button" class="btn btn-primary" onclick="UpdateRecherchesDetails('{{ nom_user }}')" >Sauvegarder</button>
<input type="hidden" id="hidden_user_id_r"> <input type="hidden" id="hidden_user_id_r">
<input type="hidden" id="hidden_antenne_slug_r"> <input type="hidden" id="hidden_antenne_slug_r">
<input type="hidden" id="hidden_image_name_r"> <input type="hidden" id="hidden_image_name_r">
@ -243,21 +243,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--crochet% set token_input = csrf_input %crochet
<!-- <table style="padding:0.15rem;" class="table-striped tableau">
<thead>
<tr>
<th style="width:8rem;">Produit</th>
<th style="width:8rem;">Photo</th>
<th style="width:7rem;">Vendeur</th>
<th style="width:5rem;">Quantité</th>
<th style="width:6rem;">Prix</th>
<th style="width:6rem;">Màj le</th>
<th style="width:12rem;" colspan="2">Actions</th>
</tr>
</thead>
<tbody>
crochet% set token_input = csrf_input %crochet
paginate(items, routePrefix ~ '.index', {id: item.id, region: explodeUrl()[2], paginate(items, routePrefix ~ '.index', {id: item.id, region: explodeUrl()[2],
slug: explodeUrl()[3], antenne: explodeUrl()[4]}) --> slug: explodeUrl()[3], antenne: explodeUrl()[4]}) -->

6
views/layout.twig
View File

@ -51,9 +51,9 @@
{{ "now"|date('d/m/y') }} {{ "now"|date('d/m/y') }}
</div> </div>
<!--{pourcent if current_user() pourcent}--> <!--{pourcent if current_user() pourcent}-->
{% if user != '' %} {% if nom_user != '' %}
<div class="navbar-text" id="user"><span><img src="\avatar_user.png" width="22" height="22" /></span> <div class="navbar-text" id="user"><span><img src="\avatar_user.png" width="22" height="22" /></span>
<span id="nom_connecte">{{ user }}</span> <span id="nom_connecte">{{ nom_user }}</span>
</div> </div>
<form method="post" action="{{ path('auth.logout') }}"> <form method="post" action="{{ path('auth.logout') }}">
<!-- csrf_input() }}--> <!-- csrf_input() }}-->
@ -96,7 +96,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="pseudo">Pseudo</label> <label for="pseudo">Pseudo</label>
<input type="text" id="pseudo" placeholder="{{ user }}" class="form-control"/> <input type="text" id="pseudo" placeholder="{{ nom_user }}" class="form-control"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="mdp">Mot de passe</label> <label for="mdp">Mot de passe</label>