Commit 91acaebe authored by okhin's avatar okhin 🚴

Merge branch 'preprod' into 'master'

Preprod

See merge request !38
parents afd3808d be580b60
Pipeline #2154 failed with stages
in 1 minute and 7 seconds
......@@ -243,7 +243,7 @@
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="radio" name="quoi" id="quoi1" class="radio" checked <check if="{{ @infos.cumul < 30 }}">disabled</check> value="piplome">
<label></label>
<label for="quoi1"></label>
</div>
<div class="col-md-3 text-center">
<p>
......@@ -274,7 +274,7 @@
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="radio" class="radio" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag">
<label></label>
<label for="quoi2"></label>
</div>
<div class="col-md-3 text-center">
<p>
......@@ -285,10 +285,13 @@
<div class="form-group text-left">
<label for="quoi2">
<h3 class="text-left">{{ _("Pibag")}}</h3>
<p>{{ _("Ainsi que le piplome.") }}</p>
<h5>{{ _("Ainsi que le piplome.") }}</h5>
</label>
</div>
</div>
<div class="c-prixcontrepartie">
<p>50&nbsp;</p>
</div>
</div>
</div>
</div><!-- / Pibag -->
......@@ -299,7 +302,7 @@
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="radio" class="radio" id="quoi3" name="quoi" <check if="{{ @infos.cumul < 100 }}">disabled</check> value="pishirt">
<label></label>
<label for="quoi3"></label>
</div>
<div class="col-md-3 text-center">
<p>
......@@ -310,7 +313,7 @@
<div class="form-group text-left">
<label for="quoi3">
<h3 class="text-left">{{ _("Pi-Shirt")}}</h3>
<p>{{ _("Ainsi que le piplome et le pibag.") }}</p>
<h5>{{ _("Ainsi que le piplome et le pibag.") }}</h5>
</label>
<form class="text-left">
<div class="form-group text-left">
......@@ -336,7 +339,7 @@
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="radio" class="radio" id="quoi4" name="quoi"<check if="{{ @infos.cumul < 250 }}">disabled</check> value="hoopie">
<label></label>
<label for="quoi4"></label>
</div>
<div class="col-md-3 text-center">
<p>
......@@ -347,7 +350,7 @@
<div class="form-group text-left">
<label for="quoi4">
<h3 class="text-left">{{ _("Hoodie")}}</h3>
<p>{{ _("Ainsi que le pi-shirt, le piplome et le pibag.") }}</p>
<h5>{{ _("Ainsi que le pi-shirt, le piplome et le pibag.") }}</h5>
</label>
<form class="text-left">
<div class="form-group text-left">
......@@ -396,7 +399,7 @@
<div class="modal-content c-modale">
<div class="modal-body">
<h3>{{ _("Envoyer à l'adresse&nbsp;:") }}</h3>
<p>
<p class="addressmodal">
{{ @adresses[@GET['adresse_id']].nom }}<br>
{{ @adresses[@GET['adresse_id']].adresse }}<br>
{{ @adresses[@GET['adresse_id']].adresse2 }}<br>
......@@ -411,44 +414,44 @@
<img class="media-object" src="/static/img/piplome.svg" alt="">
</div>
<div class="media-body">
{{ _("Piplome") }}
{{ _("Un piplôme") }}
</div>
</li>
</check>
<check if="{{ in_array(@GET['quoi'], array('pibag', 'pishirt', 'hoopie')) }}">
<li class="media">
<div class="media-left">
<img class="media-object" src="/static/img/pibag.svg" alt="">
<img class="media-object" src="/static/img/pibag2.svg" alt="">
</div>
<div class="media-body">
{{ _("Pibag") }}
{{ _("Un pibag et un piplôme") }}
</div>
</li>
</check>
<check if="{{ in_array(@GET['quoi'], array('pishirt', 'hoopie')) }}">
<li class="media">
<div class="media-left">
<img class="media-object" src="/static/img/pishirt.svg" alt="">
<img class="media-object" src="/static/img/pishirt2.svg" alt="">
</div>
<div class="media-body">
{{ _("Pi-Shirt - Taille&nbsp;: @atailles[@taille]") }}
{{ _("Un pi-shirt - Taille&nbsp;: @atailles[@taille], un pibag et piplôme") }}
</div>
</li>
</check>
<check if="{{ in_array(@GET['quoi'], array('hoopie')) }}">
<li class="media">
<div class="media-left">
<img class="media-object" src="/static/img/hoopie.svg" alt="">
<img class="media-object" src="/static/img/hoopie2.svg" alt="">
</div>
<div class="media-body">
{{ _("Hoopie - Taille&nbsp;: @atailles[@taille_h]") }}
{{ _("Un hoopie - Taille&nbsp;: @atailles[@taille_h], un pi-shirt - Taille&nbsp;: @atailles[@taille], un pibag et piplôme") }}
</div>
</li>
</check>
</ul>
</div>
<div class="form-group text-left">
<label for="commentaire"><h3>{{ _("Un commentaire&nbsp;?") }}</h3></label>
<label for="commentaire"><h3>{{ _("Un commentaire&nbsp;? Si il y a un objet du pack que vous ne voulez pas indiquez-le nous :)") }}</h3></label>
<textarea class="form-control" id="commentaire" name="commentaire" placeholder="" row="3"></textarea>
<div class="modal-footer">
<input type="hidden" name="csrf" value="{{ @CSRF }}">
......
......@@ -3,7 +3,7 @@
"description": "Site de soutien LQDN",
"require": {
"bcosca/fatfree": "^3.5",
"robmorgan/phinx": "^0.6.4",
"robmorgan/phinx": "^0.10.0",
"vlucas/phpdotenv": "^2.4",
"pimple/pimple": "^3.0",
"doctrine/dbal": "^2.5",
......
This diff is collapsed.
......@@ -28,7 +28,7 @@ class RemoveBonusTable extends AbstractMigration
public function change()
{
if ($this->hasTable('bonus')) {
$this->dropTable('bonus');
$this->table('bonus')->drop()->save();
}
}
}
<?php
use Phinx\Migration\AbstractMigration;
class UserEmailUnique extends AbstractMigration
{
/**
* Change Method.
*
* Write your reversible migrations using this method.
*
* More information on writing migrations is available here:
* http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
*
* The following commands can be used in this method and Phinx will
* automatically reverse them when rolling back:
*
* createTable
* renameTable
* addColumn
* addCustomColumn
* renameColumn
* addIndex
* addForeignKey
*
* Any other destructive changes will result in an error when trying to
* rollback the migration.
*
* Remember to call "create()" or "update()" and NOT "save()" when working
* with the Table class.
*/
public function change()
{
$table = $this->table('users');
$table->addIndex(['email'], ['unique' => true, 'name' => 'idx_users_emails'])
->update();
}
}
#!/bin/bash
# Cette monstruosité utilise un import/export par CSV de psql vers mariadb des utilisqteurs nécessaires. On pipe l'un dans l'autre. Il faut exécuter ce script avec des droits sudo.
PSQL_QUERY="COPY (SELECT DISTINCT ON (auth_user.email) email, auth_user.username pseudo FROM auth_user WHERE email NOT LIKE '' AND is_active = 't') TO STDOUT WITH (FORMAT CSV, HEADER, DELIMITER ',');"
MYSQL_QUERY="LOAD DATA LOCAL INFILE '/dev/stdin' INTO TABLE users FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\"' ESCAPED BY '\\"' LINES TERMINATED BY '\n' IGNORE 1 LINES (email, pseudo);"
sudo -u postgres psql -d soutien -c "$PSQL_QUERY" | mysql $SQL_DATABASE -u $SQL_USER -p$SQL_PASSWORD --local-infile=1 -e "$MYSQL_QUERY"
......@@ -8,6 +8,9 @@ p a {
color: #3B68B0;
text-decoration: underline;
}
.addressmodal {
padding-left:15px;
}
.panel-heading {
padding-left: 2em;
......@@ -237,6 +240,9 @@ transform: rotate(-90deg);
#subtitle {
margin:0 5px;
}
.addressmodal {
padding-left:15px;
}
/* Problèmes de css à répercuter plus tard */
.col-md- { /* marge gauche arbitraire qui semblait destinée à centrer : .col-md-offset-1 { margin-left: 8.33333333%;} dans bootstrap.css ligne 2086 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment