dev BDDD paswword

conf/build/php_light/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm
+FROM php:7.1-fpm-buster
 
 ENV TERM=xterm
 
@@ -10,7 +10,7 @@ RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
 	&& /usr/sbin/locale-gen
 
 RUN apt-get update \
-	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client \
+	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mariadb-client \
 	&& apt-get install -y --no-install-recommends libmagickwand-dev \
 	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
 	&& docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache \

volume/www/website/www/README.md

@@ -14,6 +14,12 @@ Copy this before composer require : COMPOSER_MEMORY_LIMIT=-1
 In php container, root@php:/home/www/website/www# php bin/console doctrine:schema:update --force
 It'll update database based on entities
 
+## For Js : use assetic commande inside server container
+- do a cache-clear to update the assectic.yml file
+bin/console cache:clear --env=prod --no-debug
+- then
+php bin/console assetic:dump --env=prod --no-debug
+
 ## To push notifications
 - Create new .json file in web/push folder.
 

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

@@ -33,7 +33,7 @@
 
                 <input type="checkbox" id="notificationChecked" name="notificationChecked" {{isNotificationAllowed ? "checked=checked":""}}/>
 
-                <label for="notificationChecked">Autoriser les notificaitons</label>
+                <label for="notificationChecked">Autoriser les notifications</label>
 
             </div>
         </div>

volume/www/website/www/app/config/assetic.yml

@@ -5,8 +5,8 @@ assetic:
     filters:
         cssrewrite: ~
         uglifyjs2:
-             bin: /usr/lib/node_modules/uglify-es/bin/uglifyjs
-        #    bin: /usr/local/bin/uglifyjs2
+             #bin: /usr/lib/node_modules/uglify-es/bin/uglifyjs
+            bin: /usr/local/bin/uglifyjs #sym linked in container (see makefile)
     assets:
         vendors:
             inputs:
@@ -46,6 +46,8 @@ assetic:
                 - 'js/vendors/datepicker.min.js'
                 - 'js/vendors/jquery.validate.min.js'
                 - 'js/talent.js'
+                - 'js/EdeclicTools.js'
+                - 'js/EdeclicPushAndNotificationClient.js'
         admin:
             inputs:
                 - 'admin/AdminLTE/plugins/jQuery/jquery-2.2.3.min.js'

volume/www/website/www/app/config/parameters-dev.yml

@@ -10,7 +10,7 @@ parameters:
     database_port: '5432'
     database_name: database
     database_user: user
-    database_password: edcl56
+    database_password: b|RN:iR<g,TNMqM6
     mongodb_server: 'mongodb://tt-website.mongo.dev:27017'
     prestashop_key: 9YUQ5jPqT4Z4x5s9B25pb1yuGBtpaeBDxpWDgicPF3CuP8F2p9aK18ZS
     prestashop_path: /home/projects/prestashop1/store

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

@@ -60,7 +60,7 @@ class Company
      *
      * @ORM\Column(name="brand_name", type="string", length=255, options={"comment":"Nom commercial"}, nullable=true)
      * 
-     * @Groups({"ad_detail", "company_list", "company_detail", "answer_list", "answer_detail"})
+     *  @Groups({"ad_detail", "ad_list", "company_list", "company_detail","answer_detail","answer_list"})
      */
     private $brandName;
 

volume/www/website/www/src/AppBundle/Repository/AdRepository.php

@@ -23,8 +23,9 @@ class AdRepository extends AbstractRepository
             ->createQueryBuilder('a')
             ->select('a')
             ->where('a.isVisible = true')
-            ->orderBy('a.title', $order);
-
+            ->andWhere('a.isPrivate = false')
+            ->orderBy('a.title', $order)
+            ->orderBy('a.publishedAt', 'desc');
 
         $qb
             ->andWhere('a.isPromoted = ?3')

volume/www/website/www/src/AppBundle/Repository/CompanyRepository.php

@@ -77,21 +77,10 @@ class CompanyRepository extends AbstractRepository
     public function search($term, $order = 'asc', $limit = 10, $offset = 1,
     $isEmphasis)
     {
-        
-        // $qb = $this
-        //     ->createQueryBuilder('c')
-        //     ->select('c')
-        //     ->leftJoin('c.ads', 'a', 'WITH', 'a.status =:status')
-        //     ->setParameter(':status', "PUBLISHED")
-        //     ->where("c.type = 'COMPANY'")
-        //     ->orWhere('c.presentationVideo IS NOT NULL')
-        //     ->orderBy('a.publishedAt', 'DESC')
-        //     ->orderBy('c.cTime', 'DESC');
-
-
         $qb = $this->createQueryBuilder('c')
                 ->select('c')
                 ->where("c.type = 'COMPANY'")
+                ->andWhere("c.isPrivate = false")
                 ->leftJoin('c.ads', 'a', 'WITH', 'a.status =:status')
                 ->setParameter(':status', "PUBLISHED")
                 ->orderBy('a.publishedAt', 'DESC')