gitignore backup folder

#5739

.gitignore

@@ -5,8 +5,4 @@
 /volume/*
 !/volume/www
 /volume/www/**/conf/nginx.conf
-/backup
-/conf/env/*.env
-volume/www/website/.idea
-/volume/www/website/store/themes/talentstube-20170413/cache/*
-/volume/www/website/store/img/tmp/*
+/backup

Makefile

@@ -84,7 +84,7 @@ db-restore-website:
 
 db-restore-store:
 	@echo "Restoring file to database (backup/store-mysql.sql)"
-	@docker exec -i $(CLIENT).store-mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql
+	@docker exec -i $(CLIENT).mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql
 
 cc:
 	@echo "Clearing symfony cache"

conf/build/nginx/Dockerfile

@@ -10,8 +10,6 @@ RUN rm /etc/nginx/conf.d/default.conf \
 	&& sed -i 's|include /etc/nginx/conf.d/\*.conf;|include /etc/nginx/conf.d/\*.conf;\ninclude /etc/nginx/sites-enabled/\*.conf;\n|' /etc/nginx/nginx.conf
 
 COPY log_format.conf /etc/nginx/conf.d/
-COPY tt-dev.crt /etc/nginx/ssl/server.crt
-COPY tt-dev.key /etc/nginx/ssl/server.key
 
 RUN apt-get clean \
 	&& rm -rf /var/lib/apt/lists/

conf/build/nginx/tt-dev.crt

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrjCCApYCCQD0c9mokUtilTANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMC
-RlIxDDAKBgNVBAgMA0JaSDEOMAwGA1UEBwwFQXVyYXkxGTAXBgNVBAoMEHRhbGVu
-dHN0dWJlLnRlc3QxETAPBgNVBAsMCGUtZGVjbGljMRkwFwYDVQQDDBB0YWxlbnRz
-dHViZS50ZXN0MSIwIAYJKoZIhvcNAQkBFhN0aG9tYXNAZS1kZWNsaWMuY29tMB4X
-DTE4MDQzMDA5MTkwMVoXDTE5MDQzMDA5MTkwMVowgZgxCzAJBgNVBAYTAkZSMQww
-CgYDVQQIDANCWkgxDjAMBgNVBAcMBUF1cmF5MRkwFwYDVQQKDBB0YWxlbnRzdHVi
-ZS50ZXN0MREwDwYDVQQLDAhlLWRlY2xpYzEZMBcGA1UEAwwQdGFsZW50c3R1YmUu
-dGVzdDEiMCAGCSqGSIb3DQEJARYTdGhvbWFzQGUtZGVjbGljLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANVTxapL6RtTjEoO4wWTswIqTW/zTI4B
-bETbPHYOeb8+kgLTxH04ETmVzPYz0b5RfkotY0EZzwntv3c5JsLnqqrQAXN4fcl3
-iIXCXMKUo1Nrbp0yAMGzGDmnpmvABE/nkg0ZJ3YeKV9xkEYcyMCU+DhUuazd1W3d
-odjMs/BHeuoZau9HRE+6lE+/tqWhHrmgRghP8g2Z2g8lrHak5BuQNwnvVmg6oJae
-94DWygKV7ZJ3vBHRkLIOaG+mVI8FRjrlHQke/tFStD2dd3TgsqvzYBM3f1VBm85y
-qhyIxr2s+xgOl2/Z0VZzmVgI2jAPhvN8VNvXtlFM6BOkyHAFwm7jCtcCAwEAATAN
-BgkqhkiG9w0BAQsFAAOCAQEAjlPu5wtZwW0jP0cBBBvZWLRe9+Wlz9uJXiOb2AMF
-ibYeKgcGNbruY8Ayvmm++C/mMpkm50NG5ycEiO5rB/1665zB5ibWAswRD+F5rjzx
-8qM4YsUVDkiuW5ul0RI2KO6llAbdQaCfaqXtsCZ+b/XVwe41S1ZkvigLaL99pscU
-ghgD9yz/RY6C7PHPS+8dF0Uc+YND3vqWfAhUQCXdXetXndPMxwBOXnT08RQOWMBK
-lTSHIsFACFhynL3wfQ6xH4+/TQkquxzqqh3MeB1LpqHiFChCoNmBPKWf7ZvFkg/p
-4DzXTkLs6G6/WM7DuBmwB6e5tevJfe/BSkzCLaJKABDaOA==
------END CERTIFICATE-----

conf/build/nginx/tt-dev.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVU8WqS+kbU4xK
-DuMFk7MCKk1v80yOAWxE2zx2Dnm/PpIC08R9OBE5lcz2M9G+UX5KLWNBGc8J7b93
-OSbC56qq0AFzeH3Jd4iFwlzClKNTa26dMgDBsxg5p6ZrwARP55INGSd2HilfcZBG
-HMjAlPg4VLms3dVt3aHYzLPwR3rqGWrvR0RPupRPv7aloR65oEYIT/INmdoPJax2
-pOQbkDcJ71ZoOqCWnveA1soCle2Sd7wR0ZCyDmhvplSPBUY65R0JHv7RUrQ9nXd0
-4LKr82ATN39VQZvOcqociMa9rPsYDpdv2dFWc5lYCNowD4bzfFTb17ZRTOgTpMhw
-BcJu4wrXAgMBAAECggEACj5ikIHiqLBDXU8Hsb3c666yVzzcoTkKROguKBEb4YYU
-ptQabFTj5tr9o5jranMpWFCDop2lpnlnJ0d0SAmt1VP1reDMUX9O6/VgVOukSB4x
-ipTbGnIKKMKXKDdpPZkGF2Ds1ywtmmqund9F+JFute3DmLxyQjtRSULTJSeZjGIj
-kk4mUHIZr71q2KocBEhDZhoaf6aiM3tfyXIlg0C6GzcfGKk4a2C6Ia7D24icPLa7
-JE4Omh6w8duQsme8YeFbbixLlwm+74qvo7k8ubqZAvvODQlKz4xiT1App4cTq6nm
-PbAuFvLX0DtkndBSgAUa3h8iuchdv15M2FkUWkenaQKBgQD7iup0vZqqIFh6Sk08
-k3Skbit6TXwMt4yjP9/JTgMaIO5LfZiht2xyxN4gN2XVp6k4Jn5SPxGuGV+e5QSr
-9R04x5wN6NwZAprL70UuztHZdXpzNVogF4hF4LdGDT8CbeFF5ciiTQaAKwX9euOT
-HRf6RGT80qiKVcZ+C3zhR6CxAwKBgQDZG39+6DzdGetLzls7B6R1PPV7RLOn6bts
-jbxSkx/VksHkS1Q4lG1fXM2q/VdSTFg/gNNKzLCADDVrO9KonvVrvMZlshiSLXTJ
-GVgfe+UGSL7VjbH4G4bAqznK5zK8ADI1BRyCU3UrzFqRHoV9h9e2qIfjJrK4taX7
-G5KAukDUnQKBgQC6GBLOnTtgY5+xkWjEyP6Ba7QkvlBpBB465FWGk31+BiDlnpyd
-/5pu6jC/OtzPDUQG84t/A4Pr/n+ciShEo4mj6SENtVmn8yJcf776Gy5rKBuYQj9U
-ALTjpZVRcRlNjccctBwT3tJRXgMHfbQBsYN8tr7TwHHKLh00QQF5lUlPywKBgB2a
-SkAbmnDrX9HuSTI7UIlLzo0ISRbUH+IlUVBRDz4nzJg8TTeJxYADP2fZM1bdYgsG
-ncjNMCPFhmMgvRCQ3BXcn5CuP/tuh0YEVqe0VP4OXTbxIxsZZb5Pmom4DIrl2/Ku
-x7xddNSMAK1Y5ArBwv/86spmNGhLHF6o28kBnGVhAoGAOcGzpJi1l0BzNUKBS512
-XlLUYswFW6OqcEk1iGTvEFUzZ9Agp2Yc7HZ3MrmCAjugx37tAfNKQglF2/AJ9Uuy
-yoUpPtdXX6CuPTMkzCkvAYbRGohE/cw7ZjI6vTqoEPiyrQA1lJYTIMQm3FYivjJl
-z84K0Vlv64BeiIpJrvzW+2A=
------END PRIVATE KEY-----

conf/docker-compose.dev.yml

@@ -3,9 +3,6 @@ version: '3'
 services:
 
   nginx:
-    ports:
-      - "80:80"
-      - "443:443"
     volumes:
       - ../volume/www:/home/www:cached
     restart: "no"

conf/docker-compose.preprod.yml

@@ -1,13 +0,0 @@
-version: '3'
-
-services:
-  nginx:
-    networks:
-      - default
-      - frontnginx_front
-
-networks:
-  default:
-    driver: bridge
-  frontnginx_front:
-    external: true

conf/docker-compose.yml

@@ -9,6 +9,8 @@ services:
     build: build/nginx
     container_name: ${CLIENT}.nginx.${ENV}
     hostname: nginx
+    ports:
+      - "80:80"
     volumes:
       - ../volume/nginx/etc.nginx.sites-enabled:/etc/nginx/sites-enabled
       - ../volume/www:/home/www

conf/env/postgres.env

@@ -0,0 +1,3 @@
+POSTGRES_DB=database
+POSTGRES_USER=user
+POSTGRES_PASSWORD=edcl56

conf/env/store-mysql.env

@@ -0,0 +1,4 @@
+MYSQL_ROOT_PASSWORD=n1O060}8S<()+G;X
+MYSQL_DATABASE=db
+MYSQL_USER=dbuser
+MYSQL_PASSWORD=|;YR1,rf-E}ICoh5

volume/www/website/conf/nginx-dev.conf

@@ -8,18 +8,15 @@ upstream store_php {
 }
 
 server {
-    listen 80;
-    listen 443 ssl;
+
     server_name talentstube.test;
     root /home/www/website/www/web;
     client_max_body_size 500M;
     sendfile off;
-    ssl_certificate /etc/nginx/ssl/server.crt;
-    ssl_certificate_key /etc/nginx/ssl/server.key;
 
     # DEV
     location / {
-        try_files $uri /app.php$is_args$args;
+        try_files $uri /app_dev.php$is_args$args;
     }
 
     location ~ ^/(app_dev|config)\.php(/|$) {

volume/www/website/conf/nginx-preprod.conf

@@ -1,22 +1,44 @@
+
 upstream website_php-preprod {
-    server tt-website.php.preprod:9000;
+    server tt.website-preprod:9000;
 }
 
 upstream store_php-preprod {
-    server tt-website.store-php.preprod:9000;
+    server tt.store-preprod:9000;
 }
 
 server {
-    listen 80;
+       listen 80;
+       server_name pp.talentstube.com;
+       return 301 https://pp.talentstube.com$request_uri;
+}
+
+server {
+    listen 443 ssl http2;
     server_name pp.talentstube.com;
 
     client_max_body_size 500M;
-    root /home/www/website/www/web;
 
-    access_log /home/www/website/log/access.log vhosts;
-    error_log  /home/www/website/log/error.log;
+    root /home/www/pp.talentstube.com/www/web;
+
+    access_log /home/www/pp.talentstube.com/log/access.log vhosts;
+    error_log  /home/www/pp.talentstube.com/log/error.log;
+
+    ssl on;
+    ssl_certificate /etc/ssl/private/talentstube.com.chain.crt;
+    ssl_certificate_key /etc/ssl/private/talentstube.com.key;
+
+    ssl_session_timeout 24h;
+    ssl_session_cache shared:SSL:10m;
+
+    ssl_dhparam /etc/ssl/dhparam.pem;
+
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
+    ssl_prefer_server_ciphers on;
 
     location / {
+        # try to serve file directly, fallback to app.php
         try_files $uri /app.php$is_args$args;
     }
 
@@ -36,7 +58,6 @@ server {
         # for more information).
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         fastcgi_param DOCUMENT_ROOT $realpath_root;
-        fastcgi_param  HTTPS on;
     }
 
     # PROD
@@ -57,13 +78,12 @@ server {
         # http://domain.tld/app.php/some-path
         # Remove the internal directive to allow URIs like this
         internal;
-        fastcgi_param  HTTPS on;
     }
 
     # ---- PRESTASHOP ----
     location ^~ /store/ {
 
-        root /home/www/website;
+        root /home/www/pp.talentstube.com;
         index index.php;
         try_files $uri $uri/ /www/index.php;
 
@@ -93,6 +113,6 @@ server {
 
     sendfile off;
 
-    include /home/www/website/conf/redirect.conf;
-    include /home/www/website/conf/expires.conf;
+    include /home/www/pp.talentstube.com/conf/redirect.conf;
+    include /home/www/pp.talentstube.com/conf/expires.conf;
 }

volume/www/website/conf/nginx-prod.conf

@@ -6,21 +6,6 @@ upstream store_php {
     server tt-website.store-php.prod:9000;
 }
 
-server {
-       listen 80;
-       server_name static.talentstube.com;
-
-       index index.html;
-       root /home/www/website/www/web/uploads/;
-
-       access_log /home/www/website/log/access.log vhosts;
-       error_log /home/www/website/log/error.log;
-
-       location / {
-                try_files $uri $uri/ /index.html;
-       }
-}
-
 server {
 
     listen 80;
@@ -28,7 +13,7 @@ server {
 
     client_max_body_size 500M;
 
-    root /home/www/website/www/web;
+    root /home/www/www.talentstube.com/www/web;
 
     access_log /home/www/website/log/access.log vhosts;
     error_log  /home/www/website/log/error.log;

volume/www/website/conf/redirect.conf

@@ -9,7 +9,4 @@ rewrite  ^/plateforme$  https://www.talentstube.com/ permanent;
 rewrite  ^/page/les-conseils$  https://www.talentstube.com/accompagnement-entreprise permanent;
 rewrite  ^/page/presentation-talent$  https://www.talentstube.com/cv-video permanent;
 rewrite  ^/page/la-plateforme$  https://www.talentstube.com/ permanent;
-rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise permanent;
-rewrite ^/annonce/38-charge-de-projets-developpement-h-f$  https://www.talentstube.com/annonce/38-charge-de-projets-developpement-cosmetique-h-f permanent;
-rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
-rewrite  ^/territoire/1573-communaute-d-agglomeration-castres-mazamet/$  https://www.talentstube.com/territoire/1573-castres-mazamet/ permanent;
+rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise permanent;

volume/www/website/store/config/settings-prod.inc.php

@@ -1,8 +1,8 @@
 <?php
-define('_DB_SERVER_', 'tt-website.store-mysql.prod');
+define('_DB_SERVER_', 'tt-website.store-php.prod');
 define('_DB_NAME_', 'database');
 define('_DB_USER_', 'user');
-define('_DB_PASSWD_', 'O}lk|45&J,kT+DDM{uk[');
+define('_DB_PASSWD_', '|;YR1,rf-E}ICoh5');
 define('_DB_PREFIX_', '');
 define('_MYSQL_ENGINE_', 'InnoDB');
 define('_PS_CACHING_SYSTEM_', 'CacheFs');

volume/www/website/store/config/xml/blog-fr.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8" ?><rss version="2.0" xml:base="https://www.prestashop.com/fr/blog/feed.xml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:og="http://ogp.me/ns#" xmlns:article="http://ogp.me/ns/article#" xmlns:book="http://ogp.me/ns/book#" xmlns:profile="http://ogp.me/ns/profile#" xmlns:video="http://ogp.me/ns/video#" xmlns:product="http://ogp.me/ns/product#" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:sioc="http://rdfs.org/sioc/ns#" xmlns:sioct="http://rdfs.org/sioc/types#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
+  <channel>
+    <title>Blog Feed</title>
+    <link>https://www.prestashop.com/fr/blog/feed.xml</link>
+    <description></description>
+    <language>fr</language>
+     <atom:link href="https://www.prestashop.com/fr/blog/feed.xml" rel="self" type="application/rss+xml" />
+      <item>
+    <title>4 moyens d’augmenter votre taux de conversion grâce à votre page de paiement</title>
+    <link>https://www.prestashop.com/fr/4-moyens-daugmenter-votre-taux-de-conversion-grace-a-votre-page-de-paiement-6</link>
+    <description>Par 
+Dernier contact entre un marchand et son client, nous savons que le check-out est un passage délicat dans le tunnel de conversion.
+</description>
+     <pubDate>Thu, 20 Jul 2017 16:30:04 +0200</pubDate>
+ <dc:creator>Anonymous</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/4-moyens-daugmenter-votre-taux-de-conversion-grace-a-votre-page-de-paiement-6</guid>
+  </item>
+  <item>
+    <title>Comment une agence de développement web peut-elle vous être utile ?</title>
+    <link>https://www.prestashop.com/fr/comment-une-agence-de-developpement-web-peut-elle-vous-etre-utile</link>
+    <description>Par 
+Lorsqu’un marchand nous contacte pour la première fois, l’une des questions récurrentes est : &quot;Pourquoi confier ses développements à une agence ?&quot;. Puis, à propos de PrestaShop: &quot;Puisque le logiciel est gratuit, ai-je vraiment besoin d&#039;un prestataire technique ?&quot;.
+</description>
+     <pubDate>Thu, 20 Jul 2017 14:46:24 +0200</pubDate>
+ <dc:creator>Anonymous</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/comment-une-agence-de-developpement-web-peut-elle-vous-etre-utile</guid>
+  </item>
+  <item>
+    <title>Rencontrez Nicolas, Ambassadeur du mois | Juillet 2017</title>
+    <link>https://www.prestashop.com/fr/blog/prestashop-ambassadors/rencontrez-nicolas-ambassadeur-du-mois-juillet-2017-2</link>
+    <description>CreaNico est notre Ambassadeur à Montpellier, France, et est très actif dans la région.</description>
+     <pubDate>Tue, 18 Jul 2017 17:27:38 +0200</pubDate>
+ <dc:creator>Manon Plommet</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/prestashop-ambassadors/rencontrez-nicolas-ambassadeur-du-mois-juillet-2017-2</guid>
+  </item>
+  <item>
+    <title>Zoom sur l&amp;#039;e-commerce italien</title>
+    <link>https://www.prestashop.com/fr/blog/tendances-e-commerce/zoom-sur-le-commerce-italien</link>
+    <description>Avec un taux de croissance des ventes de 18% en 2016, une base d’acheteurs en ligne de 18 millions de personnes et un panier moyen en augmentation, le e-commerce italie</description>
+     <pubDate>Mon, 17 Jul 2017 18:34:12 +0200</pubDate>
+ <dc:creator>vMartelli</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/tendances-e-commerce/zoom-sur-le-commerce-italien</guid>
+  </item>
+  <item>
+    <title>Rentrée, Black Friday, Noël : Téléchargez votre guide e-commerce de fin d&amp;#039;année</title>
+    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/rentree-black-friday-noel-telechargez-votre-guide-e-commerce-de-fin-dannee-1</link>
+    <description>La rentrée, Black Friday, Noël : en quelques mois seulement se joue la majeure partie du chiffre d’affaires de l’activité e-commerce.</description>
+     <pubDate>Mon, 17 Jul 2017 14:28:47 +0200</pubDate>
+ <dc:creator>Cécile Dubouis</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/rentree-black-friday-noel-telechargez-votre-guide-e-commerce-de-fin-dannee-1</guid>
+  </item>
+  <item>
+    <title>Lutte contre la fraude à la TVA, allègement de la loi</title>
+    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/lutte-fraude-tva-allegement-loi</link>
+    <description>Suite à notre article Conformité à l’articl</description>
+     <pubDate>Mon, 26 Jun 2017 10:10:00 +0200</pubDate>
+ <dc:creator>Mohammed Bellamine</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/lutte-fraude-tva-allegement-loi</guid>
+  </item>
+  <item>
+    <title>Planning et astuces pour créer des promotions efficaces sur PrestaShop</title>
+    <link>https://www.prestashop.com/fr/blog/conseils-e-commerce/planning-et-astuces-pour-creer-des-promotions-efficaces-sur-prestashop</link>
+    <description>Été, rentrée, Black Friday, Noël… Les promotions de fin d’année sont primordiales en e-commerce, mais leur préparation peut être chronophage.</description>
+     <pubDate>Mon, 19 Jun 2017 11:24:19 +0200</pubDate>
+ <dc:creator>Cécile Dubouis</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/conseils-e-commerce/planning-et-astuces-pour-creer-des-promotions-efficaces-sur-prestashop</guid>
+  </item>
+  <item>
+    <title>10 ans – 10 interviews « portrait » : Keiko ITO, développeuse web au Japon  </title>
+    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-keiko-ito-developpeuse-web-au-japon</link>
+    <description>Le pitch / Originaire de Kobe, au Japon, Keiko est passionnée par le web et la France.</description>
+     <pubDate>Fri, 16 Jun 2017 16:17:35 +0200</pubDate>
+ <dc:creator>Mpierrot</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-keiko-ito-developpeuse-web-au-japon</guid>
+  </item>
+  <item>
+    <title>Rencontrez Claudia, Ambassadrice du mois | Juin 2017</title>
+    <link>https://www.prestashop.com/fr/blog/prestashop-ambassadors/clone-of-meet-claudia-ambassador-of-the-month-june-2017</link>
+    <description>Claudia est notre Ambassadrice à Monterrey, Mexique, et y organise des meetups très régulièrement. Elle est toujours partante pour parler de PrestaShop !</description>
+     <pubDate>Fri, 16 Jun 2017 11:38:21 +0200</pubDate>
+ <dc:creator>Manon Plommet</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/prestashop-ambassadors/clone-of-meet-claudia-ambassador-of-the-month-june-2017</guid>
+  </item>
+  <item>
+    <title>10 ans – 10 interviews « portrait » : Corinne Lejbowicz, CEO de PrestaShop</title>
+    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-corinne-lejbowicz-ceo-de-prestashop</link>
+    <description>Le pitch / En 2007, Corinne Lejbowicz est CEO de LeGuide.com, où elle rencontre le jeune Bruno Lévêque.</description>
+     <pubDate>Wed, 14 Jun 2017 15:06:02 +0200</pubDate>
+ <dc:creator>Mpierrot</dc:creator>
+ <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-corinne-lejbowicz-ceo-de-prestashop</guid>
+  </item>
+  </channel>
+</rss>

volume/www/website/store/config/xml/tab_modules_list.xml

@@ -261,7 +261,7 @@
 </tab>
 <tab class_name="AdminPayment" display_type="default_list">
 <module name="secureframe" position="1"/>
-<module name="paypal" position="13"/>
+<module name="paypalmx" position="2"/>
 <module name="mercadopagobr" position="3"/>
 <module name="payulatam" position="4"/>
 <module name="dotpay" position="5"/>
@@ -272,14 +272,14 @@
 <module name="simplifycommerce" position="10"/>
 <module name="klarnaofficial" position="11"/>
 <module name="spsrsmartsepa" position="12"/>
-<module name="payplug" position="2"/>
-<module name="oyst" position="14"/>
-<module name="ewayrapid" position="15"/>
-<module name="fcpayone" position="16"/>
-<module name="pagseguro" position="17"/>
-<module name="ewayrapid" position="18"/>
-<module name="hipay" position="19"/>
-<module name="ogone" position="20"/>
+<module name="oyst" position="13"/>
+<module name="ewayrapid" position="14"/>
+<module name="fcpayone" position="15"/>
+<module name="pagseguro" position="16"/>
+<module name="ewayrapid" position="17"/>
+<module name="hipay" position="18"/>
+<module name="ogone" position="19"/>
+<module name="payplug" position="20"/>
 <module name="realexredirect" position="21"/>
 <module name="stripe_official" position="22"/>
 <module name="skrill" position="23"/>

volume/www/website/store/config/xml/untrusted_modules_list.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<modules_list><modules type="untrusted"><module name="blockreinsurance"/><module name="etransactions"/><module name="trackingfront"/></modules></modules_list>

volume/www/website/store/themes/talentstube-20170413/cache/v_29_65fa0811aee897efa910cda0a6dda4c6_print.css

@@ -0,0 +1,2 @@
+@charset "UTF-8";
+@media only print{#header .nav,#header .banner,#header .row > div{display:none}#header .row div#header_logo{display:block}#center_column{width:100% !important}#left_column,#right_column{display:none}.no-print,#quantity_wanted_p > a,a.quick-view{display:none !important}div.selector,div.selector span,div.selector select{background:none}#thumbs_list li a:hover,#thumbs_list li a.shown{border-color:#fff}.product_attributes,.box-cart-bottom{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.pb-left-column #views_block{margin-top:10px;width:278px !important}#thumbs_list_frame,#thumbs_list{width:100% !important;height:100% !important}#thumbs_list li,#thumbs_list li:first-child{margin:4px;width:82px;height:82px}#view_scroll_left,#view_scroll_right,.view_scroll_spacer{display:none !important}.bx-wrapper{width:100% !important;max-width:100% !important}.bx-viewport{height:auto !important}#bxslider,#bxslider1,#crossselling_list_car{width:100% !important;height:auto !important;overflow:visible !important}#bxslider1 .product-box{min-height:200px}.bx-controls-direction{display:none}#footer .row > div,#footer .row > section{display:none}#footer .row > div#block_contact_infos,#footer .row > section#block_contact_infos{display:block;width:100%;border-left:none;border-top:1px solid #515151;padding-top:20px}.footer-container #footer h4:after{display:none}}

volume/www/website/store/themes/talentstube-20170413/header.tpl

@@ -51,8 +51,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 			<meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
 		{/if}
 		<meta name="generator" content="PrestaShop" />
-		<!-- <meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" /> -->
-		<meta name="robots" content="noindex, nofollow" />
+		<meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" />
 		<meta name="viewport" content="width=device-width, minimum-scale=0.25, maximum-scale=1.6, initial-scale=1.0" />
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />

volume/www/website/www/app/AppKernel.php

@@ -44,13 +44,6 @@ class AppKernel extends Kernel
             new Edeclic\PrestashopBridgeBundle\EdeclicPrestashopBridgeBundle(),
             new Edeclic\HistoryBundle\EdeclicHistoryBundle(),
             new AppBundle\AppBundle(),
-
-            //oAuth
-            new Http\HttplugBundle\HttplugBundle(),
-            new HWI\Bundle\OAuthBundle\HWIOAuthBundle(),
-
-            //CookieBar
-            new Fairlane\CookieConsentBundle\FairlaneCookieConsentBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig

@@ -3,26 +3,18 @@
 {% trans_default_domain 'FOSUserBundle' %}
 
 {% block content %}
-
-    <div class="container contentWrapper">
-        <div class="row">
-            <div class="col push-s3 s6">
-                <h1 class="m-t-20 alttitle center-align">{{'user.register.title'|trans({},"messages") }}</h1>
-                <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
-                {% if targetUrl %}
-                    <p>
-                        <a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a>
-                    </p>
-                {% endif %}
-                <br/><br/>
-                {% if app.request.cookies.get('redirect_register') is defined and app.request.cookies.get('redirect_register') is not null %}
-                    <div class="center">
-                        <a href="{{ app.request.cookies.get('redirect_register') }}" class="btn btn-default">Poursuivre votre candidature</a>
-                    </div>
-                {% endif %}
-            </div>
+<div class="container contentWrapper">
+  <div class="row">
+        <div class="col push-s3 s6">
+          <h1 class="m-t-20 alttitle center-align">{{'user.register.title'|trans({},"messages") }}</h1>
+          <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
+          {% if targetUrl %}
+          <p><a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a></p>
+          {% endif %}
+          <br /><br />
         </div>
-    </div>
+  </div>
+</div>
 {% endblock %}
 
 {% block metarobot %}

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig

@@ -38,20 +38,20 @@
             {{ form_row(form.plainPassword.second, {'label': 'Répéter le mot de passe'}) }}
             </div>
         </div>
-        {% if destination_login is defined %}
-            <input type="hidden" name="_target_path" value="{{ destination_login }}" />
-        {% endif %}
          <div class="row">
             <div class="input-field col s12">
             {% set label = 'user.cgu.label'|trans({'%link_start%' : '<a href="'~path('service_cgu')~'">', '%link_end%' : '</a>'}, 'messages') | raw %}
             {{ form_errors(form.cgu) }}
             {{ form_widget(form.cgu) }}
             {{ form_label(form.cgu) }}
+            <br />
+            {#{{ form_widget(form.cgu) }}
+            {{ form_label(form.cgu) }}#}
             </div>
         </div>
         <div class="row">
             <div class="input-field col s12">
-                Lire les conditions générales d'utilisations</a>
+                <a href="{{ path('service_cgu') }}" title="conditions d'utilisations" style="margin-left:45px;">Lire les conditions générales d'utilisations</a>
                 <br /><br />
             </div>
         </div>

volume/www/website/www/app/Resources/FOSUserBundle/views/Security/loginModal.html.twig

@@ -1,78 +1,16 @@
 {% block fos_user_content %}
-    <div class="row login_face active_face">
-        <div class="col s12 col-login-first col-login">
-            <h4 class="color-blue1 pull-left">Connexion</h4>
-            <div class="pull-right">
-                ou
-                <a href="#" class="color-blue1 change_to_register">
-                    Créer un compte
-                </a>
-            </div>
-            <br class="clearfix"/>
+    <div class="row">
+        <div class="col s12 m12 l6 col-login-first col-login">
+            <h4>Connexion</h4>
             {{ include('@FOSUser/Security/login_content.html.twig') }}
         </div>
-    </div>
-    <div class="row register_face">
-        <div class="col s12 col-login-first col-login">
-            <h4 class="color-blue1 pull-left">Créer un compte</h4>
-            <div class="pull-right">
-                ou
-                <a href="#" class="color-blue1 change_to_login">
-                    Se connecter
-                </a>
+        <div class="col s12 m12 l6  col-login-first col-login-subscribe hide-on-med-and-down">
+            <div class="center-align">
+                <strong>Je ne possède pas de<br />compte Talents Tube</strong>
             </div>
-            <br class="clearfix"/>
-            {{ form_start(register_form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
-                {{ form_errors(register_form) }}
-                <div class="row">
-                    <div class="input-field col s6">
-                        {{ form_row(register_form.firstname, {'label': 'Prénom'}) }}
-                    </div>
-                    <div class="input-field col s6">
-                        {{ form_row(register_form.lastname, {'label': 'Nom'}) }}
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="input-field col s12">
-                        {{ form_row(register_form.email, {'label': 'E-mail'}) }}
-                    </div>
-                </div>
-                <div class="hide">
-                    {{ form_row(register_form.username, {'label': 'Username'}) }}
-                </div>
-                <div class="row">
-                    <div class="input-field col s12">
-                    {{ form_row(register_form.plainPassword.first, {'label': 'Mot de passe'}) }}
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="input-field col s12">
-                    {{ form_row(register_form.plainPassword.second, {'label': 'Répéter le mot de passe'}) }}
-                    </div>
-                </div>
-                {% if destination_login is defined %}
-                    <input type="hidden" name="_target_path" value="{{ destination_login }}" />
-                {% endif %}
-                <div class="row">
-                    <div class="input-field col s12">
-                        {% set label = 'user.cgu.label'|trans({'%link_start%' : '<a style="margin-bottom:25px;" target="_blank" href="'~path('service_cgu')~'">', '%link_end%' : '</a>'}, 'messages') | raw %}
-                        {{ form_errors(register_form.cgu) }}
-                        {{ form_widget(register_form.cgu) }}
-                        {% block form_label %}
-                            {% spaceless %}
-                                <label for="fos_user_registration_form_cgu">
-                                    Je déclare avoir pris connaissance et accepté les termes et les <a target="_blank" href="{{ path("service_cgu") }}">conditions générales d’utilisation</a>
-                                </label>
-                            {% endspaceless %}
-                        {% endblock %}
-                    </div>
-                </div>
-                <div class="row m-t-30">
-                    <div class="col s12 center-align">
-                        <input class="btn btn-default btn-round" type="submit" id="_submit_register" name="_submit_register" value="Créer un compte" />
-                    </div>
-                </div>
-            {{ form_end(register_form) }}
+            <a href="{{ path('fos_user_registration_register') }}" class="btn btn-default btn-round">
+                Créer un compte
+            </a>
         </div>
     </div>
 {% endblock fos_user_content %}