diff --git a/.gitignore b/.gitignore
index 63eb14d..b4cc05f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
config/config.php
+scripts/.loc_hash
.idea
-public/uploads
+public/uploads/*
+!public/uploads/default.png
tmp
vendor
composer.json
composer.lock
-src/Framework/SwiftMailerFactory.php
\ No newline at end of file
+src/Framework/SwiftMailerFactory.php
+
diff --git a/public/css/mapael.css b/public/css/mapael.css
index 3ff5edc..dc3f3c8 100644
--- a/public/css/mapael.css
+++ b/public/css/mapael.css
@@ -1,8 +1,19 @@
.mapael .map {
- background-color: #cddee0;
+ background-color: rgba(0, 0, 0, 0.3);
+ padding: 15px;
margin-bottom: 10px;
position: relative;
+ width: 60%;
+ left: 50%;
+ transform: translateX(-50%);
+ border-radius: 10%;
}
+
+.home_map {
+ font-size:1.2rem;
+ font-weight:bold;
+}
+
/* For all zoom buttons */
.mapael .zoomButton {
background-color: #fff;
@@ -38,7 +49,7 @@
}
.mapael .mapTooltip {
position: absolute;
- background-color: #474c4b;
+ background-color: #1D1D1D;
moz-opacity: 0.70;
opacity: 0.70;
filter: alpha(opacity=70);
@@ -48,4 +59,4 @@
max-width: 200px;
display: none;
color: #fff;
-}
\ No newline at end of file
+}
diff --git a/public/css/products.css b/public/css/products.css
new file mode 100644
index 0000000..870b7c9
--- /dev/null
+++ b/public/css/products.css
@@ -0,0 +1,82 @@
+.container_main {
+ background-color: #2E2E2E;
+}
+.tableau {
+ width:100%;
+ background-color: white;
+ table-layout: fixed;
+ border-collapse: collapse;
+ /* border-spacing: 1px; // pour contrer les style de base */
+}
+/* Entête */
+.tableau th {
+ border-spacing: 0;
+ border-collapse: collapse;
+ padding: 0rem;
+ text-align: center;
+ border-left: lightgray 1px solid;
+ background-color:#999690;
+ color:#fff;
+}
+.tableau .colonne_image {
+ padding: 0; !important;
+}
+.tableau td {
+ border-bottom: solid 1px black;
+ border-left: lightgray 1px solid;
+ padding-left: 0.7rem;
+}
+.align_droite {
+
+ text-align: right;
+ padding-right: 2rem;
+}
+.breadcrumb {
+ font-size: 1rem;
+}
+
+.toggle_radio {
+ position: relative;
+ background: rgba(0,0,0,.1);
+ margin: -3px auto 4px 10px;
+ overflow: hidden;
+ padding: 0 !important;
+ border-radius: 50px;
+ height: 28px;
+ width: 215px;
+}
+.toggle_radio > * {
+ float: left;
+}
+.toggle_radio input[type=radio]{
+ display: none;
+}
+.toggle_radio label{
+ color: rgba(0,0,0,.9);
+ z-index: 0;
+ display: block;
+ width: 100px;
+ height: 20px;
+ margin: 3px 3px;
+ border-radius: 50px;
+ cursor: pointer;
+ z-index: 1;
+ text-align: center;
+}
+.toggle_option_slider{
+ width: 100px;
+ height: 20px;
+ position: absolute;
+ top: 4px;
+ border-radius: 50px;
+ transition: all .4s ease;
+}
+
+#first_toggle:checked ~ .toggle_option_slider{
+ background: rgba(0,0,0,.3);
+ left: 3px;
+}
+#second_toggle:checked ~ .toggle_option_slider{
+ background: rgba(0,0,0,.3);
+ left: 109px;
+}
diff --git a/public/css/style.css b/public/css/style.css
index 71a6f6f..6706233 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -19,10 +19,19 @@ btn-custom {
-webkit-font-smoothing: antialiased;
}
+#logo_home {
+ width:30rem;
+ margin: 0 auto;
+ margin-top: -15px;
+ margin-bottom: 10px;
+ text-align: center;
+}
+
img {
max-width: 100%;
height: auto;
}
+
#la_page {
text-align: center;
width: 1174px;
@@ -30,6 +39,7 @@ img {
height:auto;
margin-left: auto;
margin-right: auto;
+ opacity:0.9;
}
#la_page a {
@@ -58,7 +68,9 @@ li {
background-size: 100% auto;
font-family: Bree Serif, Arial, sans-serif;
font-size: 14px;
+ opacity:0.97;
}
+
header.header {
width: 389px;
height: 259px;
@@ -86,19 +98,24 @@ header.header img {
font-size: 26px;
}
-.article {
- width:auto;
- height:auto;
- font-size: 24px;
-}
-.article2 {
+.article .article2 {
width:auto;
height:auto;
font-size: 24px;
}
+
.container {
font-family: Arial, sans-serif;
}
+
+.container.home {
+ font-family: Arial, sans-serif;
+ height:auto;
+ width:60rem;
+ text-align:center;
+ border: 0px;
+}
+
.profil_user {
height: 400px;
width: 900px;
@@ -175,7 +192,7 @@ header.header img {
}
body.loading .loadingPubkey {
- overflow: hidden;
+ overflow: hidden;
display: block;
}
diff --git a/public/models/readRecords.php b/public/models/readRecords.php
index 8b740c0..f679ae9 100644
--- a/public/models/readRecords.php
+++ b/public/models/readRecords.php
@@ -2,28 +2,28 @@
session_start();
ini_set('display_errors', 0);
include '../../config/config.php';
-$antenne_slug = $_GET['antenne_slug'];
-$nom_connecte = $_SESSION['user'];
-$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password);
+ $antenne_slug = $_GET['antenne_slug'];
+ $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 = '
-
- No. |
- Bien / service |
- Photo |
- Vendeur |
- Clé publique |
- Quantité |
- Prix en junes | ';
+ // Affichage des intitulés de colonnes
+ $data = '
+
+ No. |
+ Bien / service |
+ Photo |
+ Vendeur |
+ Clé publique |
+ Quantité |
+ Prix en junes | ';
-$params["antenne_slug"] = $antenne_slug;
-$requete = "SELECT products.*, users.username, users.pubkey
- FROM products
- LEFT JOIN antennes
- ON antennes.id = products.antenne_id
- LEFT JOIN users
- ON users.id = products.user_id
+ $params["antenne_slug"] = $antenne_slug;
+ $requete = "SELECT products.*, users.username, users.pubkey
+ FROM products
+ LEFT JOIN antennes
+ ON antennes.id = products.antenne_id
+ LEFT JOIN users
+ ON users.id = products.user_id
WHERE antennes.slug = :antenne_slug";
$stmt = $bdd->prepare($requete);
$stmt2 = $bdd->prepare($requete);
@@ -49,49 +49,61 @@ if ($count > 0)
$data .= "
$number | ";
- $prix = $row['prix'];
- $vendeur = $row['username'];
- $produit = $row['name'];
- $pubkey = $row['pubkey'];
- $pubkeyShort = substr($pubkey, 0, 8);
- $vendeur_format = "$vendeur";
- $cle_pub_format = " $pubkeyShort... ";
- $data .= ''.$produit.' | ';
- $data .= ' | ';
- $data .= ''.$vendeur_format.' | ';
- $data .= ''.$cle_pub_format.' | ';
- $data .= ''.$row['quantite'].' | ';
- $data .= ''.$prix.' | ';
- if ($row['username'] == $nom_connecte ) {
- $data .= '';
- $data .= ' |