Feat : remise en ligne annonce rocher

conf/build/nginx/Dockerfile

@@ -10,6 +10,8 @@ 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

@@ -0,0 +1,22 @@
+-----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

@@ -0,0 +1,28 @@
+-----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

@@ -5,6 +5,7 @@ services:
   nginx:
     ports:
       - "80:80"
+      - "443:443"
     volumes:
       - ../volume/www:/home/www:cached
     restart: "no"

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

@@ -8,11 +8,14 @@ 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 / {

volume/www/website/conf/redirect.conf

@@ -9,4 +9,5 @@ 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 ^/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;

volume/www/website/www/app/Resources/views/default/ad_show.html.twig

@@ -35,17 +35,17 @@
                 <div class="col s12 m12 l8 xl9">
                     {% if ad.video and ad.status != "CLOSED" %}
                         <div class="row m-b-0" id="adVideo">
-                            {% if ad.id == 38 %}
+                            {#{% if ad.id == 38 %}
                                 <img class="responsive-img" src="{{asset('/img/GROUPE-ROCHER-TT.jpg')}}">
-                            {% else %}
-                                <div class="embed-responsive embed-responsive-16by9">
-                                    <div class="col s12">
-                                        <iframe src="https://player.vimeo.com/video/{{ ad.video.cdnUrl|replace({ "/videos/": ""}) }}"
-                                                width="100%" height="640" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                                                allowfullscreen></iframe>
-                                    </div>
+                            {% else %}#}
+                            <div class="embed-responsive embed-responsive-16by9">
+                                <div class="col s12">
+                                    <iframe src="https://player.vimeo.com/video/{{ ad.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                                            width="100%" height="640" frameborder="0" webkitallowfullscreen mozallowfullscreen
+                                            allowfullscreen></iframe>
                                 </div>
-                            {% endif %}
+                            </div>
+                            {#{% endif %}#}
                             {% if ad.isPromoted %}
                                 <div class="isPromoted"><img src="{{asset('/img/offre-pourvue-gauche.png')}}" alt="promoted"></div>
                             {% endif %}

volume/www/website/www/app/Resources/views/default/index.html.twig

@@ -68,7 +68,7 @@
                             <div class="row">
                                 <div class="col s12 col-noPadding">
                                     <div class="owl-carousel owl-carousel-home home-company-carousel">
-                                        {% if talents|length > 0 %}
+                                        {% if companies|length > 0 %}
                                             {% include 'default/company_card.html.twig' with {'companies': companies } %}
                                         {% endif %}
                                     </div>

volume/www/website/www/app/Resources/views/default/talent_card.html.twig

@@ -4,7 +4,7 @@
         <div class="item">
             <a href="{{ path('talent_show',{'alias': talent.alias }) }}"
                 title="{{ user.firstname }} {{ user.lastname }}">
-                {% if user.socialPicture is not null %}
+                {% if user.socialPicture is not null and user.photo is null %}
                     <img class="circle z-depth-3" src="{{ user.socialPicture }}" alt="{{ user.firstname }} {{ user.lastname }}"/>
                 {% elseif user.photo %}
                     <img class="circle z-depth-3" src="{{ user.webPath | imagine_filter('profile_square') }}" alt="{{ user.firstname }} {{ user.lastname }}"/>

volume/www/website/www/app/Resources/views/talent/talent_show.html.twig

@@ -14,10 +14,10 @@
                     <div class="profil center-align">
                         {% set company = user.company %}
                             <div class="profil-picture">
-                                {% if user.photo %}
-                                    <img src="{{ user.webPath | imagine_filter('profile_square') }}"
-                                        alt="{{ user.firstname }} {{ user.lastname|first|upper }}"
-                                        class="circle responsive-img"/>
+                                {% if user.socialPicture is not null and user.photo is null %}
+                                    <img class="circle responsive-img" src="{{ user.socialPicture }}" alt="{{ user.firstname }} {{ user.lastname|first|upper }}"/>
+                                {% elseif user.photo %}
+                                    <img class="circle responsive-img" src="{{ user.webPath | imagine_filter('profile_square') }}" alt="{{ user.firstname }} {{ user.lastname }}"/>
                                 {% else %}
                                     <div class="circle-letters font-2">{{ user.firstname|first|upper }}{{ user.lastname|first|upper }}</div>
                                 {% endif %}

volume/www/website/www/src/AppBundle/Controller/Admin/UserController.php

@@ -114,8 +114,14 @@ class UserController extends Controller
             $em->persist($company);
             $em->flush();
         }
-        // $this->deleteRelation($user);
-        $userManager->deleteUser($user);
+        $this->deleteRelation($user);
+        $em->remove($user);
+        $em->flush();
+        if ($company) {
+            $em->remove($company);
+            $em->flush();
+        }
+
         // if ($company) {
         //     $em->remove($company);
         // }

volume/www/website/www/src/AppBundle/Entity/User.php

@@ -63,7 +63,7 @@ class User extends BaseUser
     private $status;
 
     /**
-     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Company", inversedBy="users", cascade={"persist", "remove"})
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Company", inversedBy="users", cascade={"persist"})
      */
     private $company;
 

volume/www/website/www/src/Edeclic/PrestashopBridgeBundle/EventListener/PrestaBridgeListener.php

@@ -71,14 +71,14 @@ class PrestaBridgeListener implements EventSubscriberInterface
     {
         if (!$this->avoidMode) {
             $user = $this->security->getToken()->getUser();
-            $prestaBridge = new PrestashopBridge($this->pathToPrestashop, $this->idShop, $this->cookieKey);
-
-            if (!$prestaBridge->userExist($user->getEmail()))
-                $prestaBridge->createUser($user);
-
-            $prestaBridge->login($user->getEmail());
+            if($user->hasRole('ROLE_TALENT') || $user->hasRole('ROLE_COMPANY') || $user->hasRole('ROLE_TERRITORY')) {
+                $prestaBridge = new PrestashopBridge($this->pathToPrestashop, $this->idShop, $this->cookieKey);
+                if (!$prestaBridge->userExist($user->getEmail()))
+                    $prestaBridge->createUser($user);
+    
+                $prestaBridge->login($user->getEmail());
+            }
         }
-
     }
 
     /**

volume/www/website/www/web/css/styles.css

@@ -15606,6 +15606,7 @@ table.highlight > tbody > tr:hover {
   #answerPage .col-content.bg-arrow {
     background: url(/img/img_popupcv/step_arrow.svg) 40px no-repeat #FFFFFF; }
   #answerPage #modal-tuto {
+    width: 80%;
     min-height: 540px;
     background: #FFFFFF; }
     #answerPage #modal-tuto .col-content {
@@ -15650,6 +15651,22 @@ table.highlight > tbody > tr:hover {
         color: #FFF;
         text-decoration: none; }
 
+@media only screen and (max-width: 800px) {
+  #modal-tuto {
+    width: 98%; }
+    #modal-tuto .modal-content {
+      padding: 10px; }
+      #modal-tuto .modal-content h3 {
+        font-size: 1.5rem; }
+      #modal-tuto .modal-content .col {
+        padding: 0; }
+      #modal-tuto .modal-content .owl-dots {
+        display: none; }
+      #modal-tuto .modal-content .carousel-fixed-item {
+        margin-top: 0;
+        margin-right: 0;
+        font-size: 13px;
+        margin-bottom: 50px; } }
 /*Pages
 ---------------------------------------------------*/
 #ad_show .bg-bordered {

volume/www/website/www/web/js/answer.js

@@ -16,6 +16,11 @@ function openModal(){
 }
 
 $(document).ready(function(){
+    var width = (window.innerWidth > 0) ? window.innerWidth : screen.width;
+    padding = 0;
+    if(width > 800){
+        var padding = 45;
+    }
     $('#modal-tuto').modal({
         dismissible: false,
         ready: function(modal, trigger) {
@@ -25,7 +30,7 @@ $(document).ready(function(){
                 nav: true,
                 loop: false,
                 margin: 50,
-                stagePadding: 45,
+                stagePadding: padding,
                 navRewind:false,
                 navText: ['<span class="left-arrow"></span>', '<span class="right-arrow"></span>']
             });
@@ -95,19 +100,20 @@ function eraseCookie(name) {
 
 /* GESTON de la webcam */
 var elementExists = document.getElementById("myCvVideo");
+
 if(document.body.contains(elementExists)){
     var player = videojs("myCvVideo",
         {
             controls: true,
             width: 320,
             height: 240,
+            fluid: false,
             plugins: {
                 record: {
                     audio: true,
                     video: true,
                     maxLength: 300,
-                    debug: true,
-                    videoMimeType: 'video/mp4',
+                    debug: true
                 }
             }
         });

volume/www/website/www/web/sass/modules/_answerTutorial.scss

@@ -74,6 +74,7 @@
         background: url(/img/img_popupcv/step_arrow.svg) 40px no-repeat #FFFFFF;;
     } 
     #modal-tuto{
+        width: 80%;
         min-height: 540px;
         background: $white;
         .col-content{
@@ -141,4 +142,28 @@
             }
         }
     }
+}
+
+@media only screen and (max-width: 800px) {
+    #modal-tuto {
+        width: 98%;
+        .modal-content{
+            h3{
+                font-size: 1.5rem;
+            }
+            padding:10px;
+            .col{
+                padding: 0;
+            }
+            .owl-dots{
+                display: none;
+            }
+            .carousel-fixed-item{
+                margin-top:0;
+                margin-right:0;
+                font-size: 13px;
+                margin-bottom:50px;
+            }
+        }
+    }
 }