From 48668e743369a7d267b0fe14e4a14b550887af01 Mon Sep 17 00:00:00 2001 From: poka Date: Tue, 19 Nov 2019 00:59:03 +0100 Subject: [PATCH 01/13] Add solde status to products when transaction is detected --- public/ajax/readRecords.php | 10 ++++++++-- scripts/check_sold.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100755 scripts/check_sold.sh diff --git a/public/ajax/readRecords.php b/public/ajax/readRecords.php index 8077419..ef7bc22 100644 --- a/public/ajax/readRecords.php +++ b/public/ajax/readRecords.php @@ -17,7 +17,7 @@ Prix en junes'; $params["antenne_slug"] = $antenne_slug; - $requete = "SELECT products.*, users.username, users.pubkey + $requete = "SELECT products.*, users.username, users.pubkey FROM products LEFT JOIN antennes ON antennes.id = products.antenne_id @@ -50,7 +50,13 @@ $number"; $prix = $row['prix']; $vendeur = $row['username']; - $produit = $row['name']; + $status = $row['status']; + if ($status == "solde") { + $produit = "[$status] "; + } else { + $produit = ""; + } + $produit .= $row['name']; $pubkey = $row['pubkey']; $pubkeyShort = substr($pubkey, 0, 8); $vendeur_format = "$vendeur"; diff --git a/scripts/check_sold.sh b/scripts/check_sold.sh new file mode 100755 index 0000000..dfb9953 --- /dev/null +++ b/scripts/check_sold.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +#DUNITER="http://192.168.9.54:45000" +DUNITER="https://duniter-g1.p2p.legal" +TXBLOCKS=$(curl -s ${DUNITER}/blockchain/with/tx | jq '.result.blocks[]') +TXBLOCKS=$(echo "$TXBLOCKS" | tail -n 5 | tr '\n' ' ') + +#echo "$TXBLOCKS" + +for i in $TXBLOCKS2; do + result=$(curl -s ${DUNITER}/blockchain/block/$i | jq '.transactions[].comment' | grep -v '""' | tr -d '"') + isSell=$(echo "$result" | grep "Merci") +# [[ ! -z $isSell ]] && echo $isSell +# echo --- + sleep 1 +done + + +isSell="[Achat GMarche] : testCesium" +isSell=$(echo $isSell | cut -d' ' -f4-) + +echo "$isSell est vendu" + +req="UPDATE products SET status = 'solde' WHERE name = '$isSell';" + +mysql --database gmarche -e "$req" +mysql --database gmarche -e "SELECT name,status FROM products;" + +exit 0 From 7da07e5b165b92d9353f3cc8063151119493f18b Mon Sep 17 00:00:00 2001 From: poka Date: Tue, 19 Nov 2019 17:44:36 +0100 Subject: [PATCH 02/13] Change [solde] to [Vendu] --- public/ajax/readRecords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/ajax/readRecords.php b/public/ajax/readRecords.php index ef7bc22..8ee0cbd 100644 --- a/public/ajax/readRecords.php +++ b/public/ajax/readRecords.php @@ -52,7 +52,7 @@ $vendeur = $row['username']; $status = $row['status']; if ($status == "solde") { - $produit = "[$status] "; + $produit = "[Vendu] "; } else { $produit = ""; } From f73d15220eb748a7e573f74a45530ba5a16d5147 Mon Sep 17 00:00:00 2001 From: poka Date: Sat, 23 Nov 2019 17:24:08 +0100 Subject: [PATCH 03/13] Standard g1 node from config, sudo mysql --- scripts/check_sold.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/check_sold.sh b/scripts/check_sold.sh index dfb9953..6486d52 100755 --- a/scripts/check_sold.sh +++ b/scripts/check_sold.sh @@ -1,29 +1,28 @@ #!/bin/bash -#DUNITER="http://192.168.9.54:45000" -DUNITER="https://duniter-g1.p2p.legal" -TXBLOCKS=$(curl -s ${DUNITER}/blockchain/with/tx | jq '.result.blocks[]') +DUNITER=$(grep g1_node ../config/config.php | awk '{ print $3}' | tr -d ';' | tr -d "'") +TXBLOCKS=$(curl -s $DUNITER/blockchain/with/tx | jq '.result.blocks[]') TXBLOCKS=$(echo "$TXBLOCKS" | tail -n 5 | tr '\n' ' ') +keyword="merci" -#echo "$TXBLOCKS" +for i in $TXBLOCKS; do + result=$(curl -s $DUNITER/blockchain/block/$i | jq '.transactions[].comment' | grep -v '""' | tr -d '"') -for i in $TXBLOCKS2; do - result=$(curl -s ${DUNITER}/blockchain/block/$i | jq '.transactions[].comment' | grep -v '""' | tr -d '"') - isSell=$(echo "$result" | grep "Merci") -# [[ ! -z $isSell ]] && echo $isSell -# echo --- +### TODO: Finaliser pour cas réel, prendre en compte plusieurs transactions gmarche dans même block, ainsi que transaction déjà passé en Vendu. + isSell=$(echo "$result" | grep "$keyword") + [[ ! -z $isSell ]] && echo $isSell + echo --- sleep 1 done - isSell="[Achat GMarche] : testCesium" isSell=$(echo $isSell | cut -d' ' -f4-) -echo "$isSell est vendu" +#echo "$isSell est vendu" req="UPDATE products SET status = 'solde' WHERE name = '$isSell';" -mysql --database gmarche -e "$req" -mysql --database gmarche -e "SELECT name,status FROM products;" +sudo mysql --database gmarche -e "$req" +sudo mysql --database gmarche -e "SELECT name,status FROM products;" exit 0 From 46a4b5411886ec0a7bb55b706ebfe6ca9fc9b2e6 Mon Sep 17 00:00:00 2001 From: poka Date: Sat, 23 Nov 2019 18:43:13 +0100 Subject: [PATCH 04/13] Add case for several solds --- scripts/check_sold.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/check_sold.sh b/scripts/check_sold.sh index 6486d52..7b743c8 100755 --- a/scripts/check_sold.sh +++ b/scripts/check_sold.sh @@ -3,26 +3,29 @@ DUNITER=$(grep g1_node ../config/config.php | awk '{ print $3}' | tr -d ';' | tr -d "'") TXBLOCKS=$(curl -s $DUNITER/blockchain/with/tx | jq '.result.blocks[]') TXBLOCKS=$(echo "$TXBLOCKS" | tail -n 5 | tr '\n' ' ') -keyword="merci" +keyword="\[Achat GMarche] : " for i in $TXBLOCKS; do result=$(curl -s $DUNITER/blockchain/block/$i | jq '.transactions[].comment' | grep -v '""' | tr -d '"') -### TODO: Finaliser pour cas réel, prendre en compte plusieurs transactions gmarche dans même block, ainsi que transaction déjà passé en Vendu. - isSell=$(echo "$result" | grep "$keyword") - [[ ! -z $isSell ]] && echo $isSell + #result=$(echo "$result" | grep "$keyword") + [[ ! -z $result ]] && isSell+=$(echo -e "$result;") && echo "$result" echo --- sleep 1 done -isSell="[Achat GMarche] : testCesium" -isSell=$(echo $isSell | cut -d' ' -f4-) +# isSell="[Achat GMarche] : testCesium" # Test hors sol +isSell=$(echo $isSell | sed "s/$keyword//g") -#echo "$isSell est vendu" +echo "$isSell est vendu" -req="UPDATE products SET status = 'solde' WHERE name = '$isSell';" +IFS=';'; ADDR=($isSell); unset IFS; +for i in "${ADDR[@]}"; do + req="UPDATE products SET status = 'solde' WHERE name = '$i';" + echo "$req" +# sudo mysql --database gmarche -e "$req" +done -sudo mysql --database gmarche -e "$req" sudo mysql --database gmarche -e "SELECT name,status FROM products;" exit 0 From 1987ca71b3effd0dcb7356ef28c89b8eae837d41 Mon Sep 17 00:00:00 2001 From: poka Date: Sun, 24 Nov 2019 03:48:51 +0100 Subject: [PATCH 05/13] Add piscine scanning. Deincrease quantity rather than status --- public/models/readRecords.php | 16 +++++++-------- scripts/check_sold.sh | 48 ++++++++++++++++++++++++++++++------------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/public/models/readRecords.php b/public/models/readRecords.php index 74ca4ae..b5a5de5 100644 --- a/public/models/readRecords.php +++ b/public/models/readRecords.php @@ -19,11 +19,11 @@ $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 + 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); @@ -51,8 +51,8 @@ $number"; $prix = $row['prix']; $vendeur = $row['username']; - $status = $row['status']; - if ($status == "solde") { + $quantite = $row['quantite']; + if ($quantite == "0") { $produit = "[Vendu] "; } else { $produit = ""; @@ -66,7 +66,7 @@ $data .= ''; $data .= ''.$vendeur_format.''; $data .= ''.$cle_pub_format.''; - $data .= ''.$row['quantite'].''; + $data .= ''.$quantite.''; $data .= ''.$prix.''; if ($row['username'] == $nom_connecte ) { $data .= ''; diff --git a/scripts/check_sold.sh b/scripts/check_sold.sh index 7b743c8..d856203 100755 --- a/scripts/check_sold.sh +++ b/scripts/check_sold.sh @@ -1,31 +1,51 @@ #!/bin/bash +## TODO: Prendre en compte les transactions déjà appliqués + +start=`date +%s` +date=$(date +'%d-%m-%y à %H:%M') +echo "### $date ###" + +## Inistialisation DUNITER=$(grep g1_node ../config/config.php | awk '{ print $3}' | tr -d ';' | tr -d "'") TXBLOCKS=$(curl -s $DUNITER/blockchain/with/tx | jq '.result.blocks[]') -TXBLOCKS=$(echo "$TXBLOCKS" | tail -n 5 | tr '\n' ' ') +TXBLOCKS=$(echo "$TXBLOCKS" | tail -n 2 | tr '\n' ' ') keyword="\[Achat GMarche] : " +## Récupération des transactions avec commentaire GMarche for i in $TXBLOCKS; do result=$(curl -s $DUNITER/blockchain/block/$i | jq '.transactions[].comment' | grep -v '""' | tr -d '"') - - #result=$(echo "$result" | grep "$keyword") - [[ ! -z $result ]] && isSell+=$(echo -e "$result;") && echo "$result" - echo --- + result=$(echo "$result" | grep "$keyword") + [[ ! -z $result ]] && isSell+=$(echo -e "$result;") sleep 1 done -# isSell="[Achat GMarche] : testCesium" # Test hors sol -isSell=$(echo $isSell | sed "s/$keyword//g") +## Ajout des transactions en piscine pour les users GMarche -echo "$isSell est vendu" +req="SELECT pubkey FROM users;" +usersPubkeys=$(sudo mysql --database gmarche -e "$req" | grep .) -IFS=';'; ADDR=($isSell); unset IFS; -for i in "${ADDR[@]}"; do - req="UPDATE products SET status = 'solde' WHERE name = '$i';" - echo "$req" -# sudo mysql --database gmarche -e "$req" +for i in $usersPubkeys; do + isSell+=$(curl -s $DUNITER/tx/history/$i/pending | jq '. | select(.history.sending == [])' | jq '.history.pending[].comment' | tr -d '"') + #[ ! -z "$pendingTX" ] && echo "$pendingTX" done -sudo mysql --database gmarche -e "SELECT name,status FROM products;" +## Retrait de l'identifiant gmarche des commentaires +isSell=$(echo $isSell | sed "s/$keyword//g") +[[ ! -z $isSell ]] && echo "$isSell est vendu" + +## Retrait d'un quantité pour les articles vendu +IFS=';'; ADDR=($isSell); unset IFS; +for i in "${ADDR[@]}"; do + #req="UPDATE products SET status = 'solde' WHERE name = '$i';" + req="UPDATE products SET quantite = CASE WHEN quantite = 0 THEN quantite ELSE quantite - 1 END WHERE name = '$i';" + sudo mysql --database gmarche -e "$req" +done + +#sudo mysql --database gmarche -e "SELECT name,status FROM products;" + +end=`date +%s` +runtime=$((end-start)) +echo "Temps d'execution: ${runtime}s" exit 0 From 022cf49eea1b2c84bc27585255b02d4f281ab745 Mon Sep 17 00:00:00 2001 From: poka Date: Sun, 24 Nov 2019 04:44:56 +0100 Subject: [PATCH 06/13] Lock transaction hash ever applied --- .gitignore | 3 ++- scripts/check_sold.sh | 23 +++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4df4448..c18e309 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ config/config.php +scripts/.loc_hash .idea /public/uploads /tmp vendor composer.json composer.lock -/src/Framework/SwiftMailerFactory.php \ No newline at end of file +/src/Framework/SwiftMailerFactory.php diff --git a/scripts/check_sold.sh b/scripts/check_sold.sh index d856203..1aaba9e 100755 --- a/scripts/check_sold.sh +++ b/scripts/check_sold.sh @@ -6,17 +6,23 @@ start=`date +%s` date=$(date +'%d-%m-%y à %H:%M') echo "### $date ###" -## Inistialisation +## Initialisation DUNITER=$(grep g1_node ../config/config.php | awk '{ print $3}' | tr -d ';' | tr -d "'") TXBLOCKS=$(curl -s $DUNITER/blockchain/with/tx | jq '.result.blocks[]') TXBLOCKS=$(echo "$TXBLOCKS" | tail -n 2 | tr '\n' ' ') keyword="\[Achat GMarche] : " +[ ! -e .loc_hash ] && touch .loc_hash ## Récupération des transactions avec commentaire GMarche + for i in $TXBLOCKS; do - result=$(curl -s $DUNITER/blockchain/block/$i | jq '.transactions[].comment' | grep -v '""' | tr -d '"') - result=$(echo "$result" | grep "$keyword") - [[ ! -z $result ]] && isSell+=$(echo -e "$result;") + result=$(curl -s $DUNITER/blockchain/block/$i | jq '.transactions[].hash, .transactions[].comment' | grep -v '""' | tr -d '"' | grep -B1 "$keyword") + rhash=$(echo "$result" | head -n1) + rcom=$(echo "$result" | tail -n1) + if [[ ! -z $result && -z $(grep $rhash .loc_hash) ]]; then + isSell+=$(echo -e "$rcom;") + echo "$rhash" >> .loc_hash + fi sleep 1 done @@ -26,8 +32,13 @@ req="SELECT pubkey FROM users;" usersPubkeys=$(sudo mysql --database gmarche -e "$req" | grep .) for i in $usersPubkeys; do - isSell+=$(curl -s $DUNITER/tx/history/$i/pending | jq '. | select(.history.sending == [])' | jq '.history.pending[].comment' | tr -d '"') - #[ ! -z "$pendingTX" ] && echo "$pendingTX" + result=$(curl -s $DUNITER/tx/history/$i/pending | jq '. | select(.history.sending == [])' | jq '.history.pending[].hash,.history.pending[].comment' | tr -d '"') + rhash=$(echo "$result" | head -n1) + rcom=$(echo "$result" | tail -n1) + if [[ ! -z $result && -z $(grep $rhash .loc_hash) ]]; then + isSell+=$(echo -e "$rcom;") + echo "$rhash" >> .loc_hash + fi done ## Retrait de l'identifiant gmarche des commentaires From 65fa5347438ddc2dda90e10a363f6c631b855fe2 Mon Sep 17 00:00:00 2001 From: poka Date: Sun, 24 Nov 2019 05:10:39 +0100 Subject: [PATCH 07/13] Fix relative path --- scripts/check_sold.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/check_sold.sh b/scripts/check_sold.sh index 1aaba9e..a245b45 100755 --- a/scripts/check_sold.sh +++ b/scripts/check_sold.sh @@ -1,17 +1,18 @@ #!/bin/bash -## TODO: Prendre en compte les transactions déjà appliqués +[ "$EUID" -ne 0 ] && sudo="sudo" || sudo="" +SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" start=`date +%s` date=$(date +'%d-%m-%y à %H:%M') echo "### $date ###" ## Initialisation -DUNITER=$(grep g1_node ../config/config.php | awk '{ print $3}' | tr -d ';' | tr -d "'") +DUNITER=$(grep g1_node $SCRIPTPATH/../config/config.php | awk '{ print $3}' | tr -d ';' | tr -d "'") TXBLOCKS=$(curl -s $DUNITER/blockchain/with/tx | jq '.result.blocks[]') TXBLOCKS=$(echo "$TXBLOCKS" | tail -n 2 | tr '\n' ' ') keyword="\[Achat GMarche] : " -[ ! -e .loc_hash ] && touch .loc_hash +[ ! -e $SCRIPTPATH/.loc_hash ] && touch $SCRIPTPATH/.loc_hash ## Récupération des transactions avec commentaire GMarche @@ -19,9 +20,9 @@ for i in $TXBLOCKS; do result=$(curl -s $DUNITER/blockchain/block/$i | jq '.transactions[].hash, .transactions[].comment' | grep -v '""' | tr -d '"' | grep -B1 "$keyword") rhash=$(echo "$result" | head -n1) rcom=$(echo "$result" | tail -n1) - if [[ ! -z $result && -z $(grep $rhash .loc_hash) ]]; then + if [[ ! -z $result && -z $(grep $rhash $SCRIPTPATH/.loc_hash) ]]; then isSell+=$(echo -e "$rcom;") - echo "$rhash" >> .loc_hash + echo "$rhash" >> $SCRIPTPATH/.loc_hash fi sleep 1 done @@ -29,15 +30,15 @@ done ## Ajout des transactions en piscine pour les users GMarche req="SELECT pubkey FROM users;" -usersPubkeys=$(sudo mysql --database gmarche -e "$req" | grep .) +usersPubkeys=$($sudo mysql --database gmarche -e "$req" | grep .) for i in $usersPubkeys; do result=$(curl -s $DUNITER/tx/history/$i/pending | jq '. | select(.history.sending == [])' | jq '.history.pending[].hash,.history.pending[].comment' | tr -d '"') rhash=$(echo "$result" | head -n1) rcom=$(echo "$result" | tail -n1) - if [[ ! -z $result && -z $(grep $rhash .loc_hash) ]]; then + if [[ ! -z $result && -z $(grep $rhash $SCRIPTPATH/.loc_hash) ]]; then isSell+=$(echo -e "$rcom;") - echo "$rhash" >> .loc_hash + echo "$rhash" >> $SCRIPTPATH/.loc_hash fi done @@ -51,10 +52,10 @@ IFS=';'; ADDR=($isSell); unset IFS; for i in "${ADDR[@]}"; do #req="UPDATE products SET status = 'solde' WHERE name = '$i';" req="UPDATE products SET quantite = CASE WHEN quantite = 0 THEN quantite ELSE quantite - 1 END WHERE name = '$i';" - sudo mysql --database gmarche -e "$req" + $sudo mysql --database gmarche -e "$req" done -#sudo mysql --database gmarche -e "SELECT name,status FROM products;" +#$sudo mysql --database gmarche -e "SELECT name,status FROM products;" end=`date +%s` runtime=$((end-start)) From f3728dd93958e56bff711c6de4e665a958a67543 Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 25 Nov 2019 00:51:24 +0100 Subject: [PATCH 08/13] Change button type to submit for Valider connexion --- views/layout.twig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/views/layout.twig b/views/layout.twig index deda089..e43967a 100644 --- a/views/layout.twig +++ b/views/layout.twig @@ -116,14 +116,16 @@
-
+ + - \ No newline at end of file + From 5b3332b798e1e2639e2d61a508c23e5e2f5f46e0 Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 25 Nov 2019 20:17:45 +0100 Subject: [PATCH 09/13] Add default pictures where no image uploaded for products --- .gitignore | 3 ++- public/models/readRecords.php | 7 ++++++- public/models/readRecords2.php | 17 +++++++++++------ public/uploads/default.png | Bin 0 -> 10234 bytes 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 public/uploads/default.png diff --git a/.gitignore b/.gitignore index c18e309..6199e3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ config/config.php scripts/.loc_hash .idea -/public/uploads +public/uploads/* +!public/uploads/default.png /tmp vendor composer.json diff --git a/public/models/readRecords.php b/public/models/readRecords.php index b5a5de5..ebef6c6 100644 --- a/public/models/readRecords.php +++ b/public/models/readRecords.php @@ -63,7 +63,12 @@ $vendeur_format = "$vendeur"; $cle_pub_format = " $pubkeyShort... "; $data .= ''.$produit.''; - $data .= ''; + $imagep = '../uploads/products/'.$antenne_slug.'/'.$row['image'].''; + if (file_exists($imagep) && $row['image']) { + $data .= ''; + } else { + $data .= ''; + } $data .= ''.$vendeur_format.''; $data .= ''.$cle_pub_format.''; $data .= ''.$quantite.''; diff --git a/public/models/readRecords2.php b/public/models/readRecords2.php index f866e88..109ce08 100644 --- a/public/models/readRecords2.php +++ b/public/models/readRecords2.php @@ -19,11 +19,11 @@ $params["antenne_slug"] = $antenne_slug; $requete = "SELECT souhaits.*, users.username, users.pubkey - FROM souhaits - LEFT JOIN antennes - ON antennes.id = souhaits.antenne_id - LEFT JOIN users - ON users.id = souhaits.user_id + FROM souhaits + LEFT JOIN antennes + ON antennes.id = souhaits.antenne_id + LEFT JOIN users + ON users.id = souhaits.user_id WHERE antennes.slug = :antenne_slug"; $stmt = $bdd->prepare($requete); $stmt2 = $bdd->prepare($requete); @@ -55,7 +55,12 @@ $vendeur_format = "$vendeur"; $pubkeyShort = substr($pubkey, 0, 8); $data .= ''.$produit.''; - $data .= ''; + $imagep = '../uploads/recherches/'.$antenne_slug.'/'.$row['image'].''; + if (file_exists($imagep) && $row['image']) { + $data .= ''; + } else { + $data .= ''; + } $data .= ''.$vendeur_format.''; $data .= ''.$pubkeyShort.'...'; $data .= ''.$row['quantite'].''; diff --git a/public/uploads/default.png b/public/uploads/default.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6994bd817b35bf32ccb7d784584d1a52a5e679 GIT binary patch literal 10234 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 SrRXaJ_^GRCDOW04z4 Date: Mon, 25 Nov 2019 21:28:28 +0100 Subject: [PATCH 10/13] Change CSS stuff in home page and products page, remove style= in twig template for style.css --- public/css/products.css | 82 +++++++++++++++++++ public/css/style.css | 111 +++++++++++++++++++++++++- public/models/readRecords.php | 2 +- public/models/readRecords2.php | 2 +- public/uploads/default.png | Bin src/Gmarche/views/index.twig | 34 ++++---- src/Product/views/admin/products/index.twig | 86 +------------------- src/Product/views/admin/recherches/index.twig | 86 +------------------- 8 files changed, 216 insertions(+), 187 deletions(-) create mode 100644 public/css/products.css mode change 100644 => 100755 public/uploads/default.png 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 c6653e5..c53aa18 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -19,10 +19,18 @@ btn-custom { -webkit-font-smoothing: antialiased; } +#logo_home { + width:30rem; + margin: 0 auto; + margin-bottom: 10px; + text-align: center; +} + img { max-width: 100%; height: auto; } + #la_page { text-align: center; width: 1174px; @@ -30,6 +38,7 @@ img { height:auto; margin-left: auto; margin-right: auto; + opacity:0.9; } #la_page a { @@ -58,6 +67,7 @@ li { background-size: 100% auto; font-family: Bree Serif, Arial, sans-serif; font-size: 14px; + opacity:0.97; } header.header { width: 389px; @@ -98,7 +108,20 @@ header.header img { } .container { font-family: Arial, sans-serif; + height:auto; width:28rem; + text-align:center;border: 0px } + +.row { + width:28rem; + margin-left: -5.1rem; +} + +.home_map { + font-size:1.2rem; + font-weight:bold; +} + .profil_user { height: 400px; width: 900px; @@ -169,7 +192,7 @@ header.header img { } body.loading .loadingPubkey { - overflow: hidden; + overflow: hidden; display: block; } @@ -268,3 +291,89 @@ body.loading .loadingPubkey { } } + +/* Fix products.css */ + + +.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/models/readRecords.php b/public/models/readRecords.php index ebef6c6..474c6d1 100644 --- a/public/models/readRecords.php +++ b/public/models/readRecords.php @@ -67,7 +67,7 @@ if (file_exists($imagep) && $row['image']) { $data .= ''; } else { - $data .= ''; + $data .= ''; } $data .= ''.$vendeur_format.''; $data .= ''.$cle_pub_format.''; diff --git a/public/models/readRecords2.php b/public/models/readRecords2.php index 109ce08..c6e9cb8 100644 --- a/public/models/readRecords2.php +++ b/public/models/readRecords2.php @@ -59,7 +59,7 @@ if (file_exists($imagep) && $row['image']) { $data .= ''; } else { - $data .= ''; + $data .= ''; } $data .= ''.$vendeur_format.''; $data .= ''.$pubkeyShort.'...'; diff --git a/public/uploads/default.png b/public/uploads/default.png old mode 100644 new mode 100755 diff --git a/src/Gmarche/views/index.twig b/src/Gmarche/views/index.twig index 37e89a4..86b5299 100644 --- a/src/Gmarche/views/index.twig +++ b/src/Gmarche/views/index.twig @@ -4,9 +4,9 @@ Ğ1-Marché : Régions {% if page > 1 %}, page {{ page }} {% endif %} {% endblock %} {% block body %} -
- -
+
+ +
    @@ -42,69 +42,69 @@ 'region-84': { value: "Auvergne-Rhône-Alpes", href: "france/auvergne-rhone-alpes", - tooltip: {content: "Auvergne-Rhône-Alpes"} + tooltip: {content: " Auvergne-Rhône-Alpes"} }, 'region-53': { value: "Bretagne", href: "france/bretagne", - tooltip: {content: "Bretagne"} + tooltip: {content: "Bretagne"} }, 'region-27': { value: "Bourgogne-Franche-Comté", href: "france/bourgogne-franche-comte", - tooltip: {content: "Bourgogne-Franche-Comté"} + tooltip: {content: "Bourgogne-Franche-Comté"} }, 'region-24': { value: "Centre-Val de Loire", href: "france/centre-val-de-loire", - tooltip: {content: "Centre-Val de Loire"} + tooltip: {content: "Centre-Val de Loire"} }, 'region-94': { value: "Corse", href: "france/corse", - tooltip: {content: "Corse"} + tooltip: {content: "Corse"} }, 'region-44': { value: "Grand-Est", href: "france/grand-est", - tooltip: {content: "Grand-Est"} + tooltip: {content: "Grand-Est"} }, 'region-32': { value: "Hauts-de-France", href: "france/hauts-de-france", - tooltip: {content: "Hauts-de-France"} + tooltip: {content: "Hauts-de-France"} }, 'region-11': { value: "Ile-de-France", href: "france/ile-de-france", - tooltip: {content: "Ile-de-France"} + tooltip: {content: "Ile-de-France"} }, 'region-28': { value: "Normandie", href: "france/normandie", - tooltip: {content: "Normandie"} + tooltip: {content: "Normandie"} }, 'region-75': { value: "Nouvelle-Aquitaine", href: "france/nouvelle-aquitaine", - tooltip: {content: "Nouvelle-Aquitaine"} + tooltip: {content: "Nouvelle-Aquitaine"} }, 'region-76': { value: "Occitanie", href: "france/occitanie", - tooltip: {content: "Occitanie"} + tooltip: {content: "Occitanie"} }, 'region-52': { value: "Pays de la Loire", href: "france/pays-de-la-loire", - tooltip: {content: "Pays de la Loire"} + tooltip: {content: "Pays de la Loire"} }, 'region-93': { value: "Provence-Alpes-Côte d'Azur", href: "france/provence-alpes-cote-d-azur", - tooltip: {content: "Provence-Alpes-Côte d'Azur"} + tooltip: {content: "Provence-Alpes-Côte d'Azur"} } } }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Product/views/admin/products/index.twig b/src/Product/views/admin/products/index.twig index f418154..0990c7e 100644 --- a/src/Product/views/admin/products/index.twig +++ b/src/Product/views/admin/products/index.twig @@ -2,91 +2,11 @@ {% extends 'layout.twig' %} {% block title "Ğ1-Marché - Produits" %} + {% block body %} - + -
    +