dev BDDD paswword

Makefile

@@ -25,12 +25,12 @@ else
 DC=ENV=$(ENV) CLIENT=$(CLIENT) "$(DOCKERCOMPOSE)" --project-name "$(CLIENT)_$(ENV)" --file conf/docker-compose.win.yml $(DC_OVERRIDE) $(DC_OVERRIDE_ENV)
 endif
 
-
 default:
 	$(info $(USAGE))
 	$(error Exiting)
 
 docker-build:
+	$(DC) pull
 	$(DC) build
 	$(DC) up -d
 
@@ -64,8 +64,8 @@ config:
 
 	@echo "  --> Generating mysql auth file"
 	@cat conf/env/store-mysql.env \
-		| python -c "import sys; import string; v=sys.stdin.readline().split('MYSQL_ROOT_PASSWORD=')[1]; print(string.Template(open('conf/build/mysql/my.cnf').read()).substitute({'PASSWORD':v}))" \
-		| docker exec -i $(CLIENT).store-mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
+			| python -c "import sys; import string; v=sys.stdin.readline().split('MYSQL_ROOT_PASSWORD=')[1]; print(string.Template(open('conf/build/mysql/my.cnf').read()).substitute({'PASSWORD':v}))" \
+			| docker exec -i $(CLIENT).store-mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
 
 db-backup-all: db-backup-website db-backup-store
 
@@ -83,6 +83,11 @@ db-backup-store:
 
 db-restore-all: db-restore-website db-restore-store
 
+db-backup-script:
+	@mkdir -p backup/
+	@docker exec $(CLIENT).postgres.$(ENV) pg_dumpall --database database -c -U postgres > backup/postgres_$(ENV)_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+	@docker exec $(CLIENT).store-mysql.$(ENV) mysqldump -uroot database > backup/store-mysql_$(ENV)_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+
 db-restore-website:
 	@echo "Restoring file to database (backup/postgres.sql)"
 	@cat backup/postgres.sql | docker exec -i $(CLIENT).postgres.$(ENV) psql --dbname database -U user
@@ -114,4 +119,4 @@ es-populate:
 
 sys:
 	@echo $(SYS)
-	@echo $(DC)
+	@echo $(DC)

conf/build/php/Dockerfile

@@ -1,53 +1,54 @@
-FROM php:7.1-fpm
+FROM php:7.1-fpm-buster
 
 ENV TERM=xterm
 
-RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list.d/debian-backports.list
+#RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main\ndeb http://archive.debian.org/debian/ jessie-backports main" > /etc/apt/sources.list.d/debian-backports.list
+
 RUN apt-get clean \
-	&& apt-get update \
-	&& apt-get install -y lsof nano less git locales
+        && apt-get update \
+        && apt-get install -y lsof nano less git locales
 
 RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
-	&& /usr/sbin/locale-gen
+        && /usr/sbin/locale-gen
 
 RUN apt-get update \
     && apt-get -y install libgmp-dev \
-	&& ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/gmp.h \
-	&& docker-php-ext-install gmp \
-	&& docker-php-ext-configure gmp 
+        && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/gmp.h \
+        && docker-php-ext-install gmp \
+        && docker-php-ext-configure gmp
 
 
 RUN apt-get update \
-	&& apt-get install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client nodejs npm \
-	&& 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 \
-	&& pecl install geoip-1.1.1 redis imagick mongodb \
-	&& docker-php-ext-enable geoip redis imagick mongodb
+        && apt-get install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mariadb-client nodejs npm \
+        && 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 \
+        && pecl install geoip-1.1.1 redis imagick mongodb \
+        && docker-php-ext-enable geoip redis imagick mongodb
 
 RUN { \
-	echo 'opcache.memory_consumption=128'; \
-	echo 'opcache.interned_strings_buffer=8'; \
-	echo 'opcache.max_accelerated_files=4000'; \
-	echo 'opcache.revalidate_freq=60'; \
-	echo 'opcache.fast_shutdown=1'; \
-	echo 'opcache.enable_cli=1'; \
-	} >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.interned_strings_buffer=8'; \
+        echo 'opcache.max_accelerated_files=4000'; \
+        echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.fast_shutdown=1'; \
+        echo 'opcache.enable_cli=1'; \
+        } >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 
 COPY zz-logformat.conf /usr/local/etc/php-fpm.d/
 COPY php.ini /usr/local/etc/php/conf.d/
 
 RUN (curl --silent --show-error https://getcomposer.org/installer | php) \
-	&& mv composer.phar /usr/local/bin/composer
+        && mv composer.phar /usr/local/bin/composer
 
 RUN curl --location --silent --show-error https://symfony.com/installer -o /usr/local/bin/symfony \
-	&& chmod a+x /usr/local/bin/symfony
+        && chmod a+x /usr/local/bin/symfony
 
 RUN curl --location --silent --show-error https://s3.amazonaws.com/files.drush.org/drush.phar -o /usr/local/bin/drush \
-	&& chmod a+x /usr/local/bin/drush
+        && chmod a+x /usr/local/bin/drush
 
 RUN (npm install -g uglify-es) \
-	&& ln -s /usr/bin/nodejs /usr/local/bin/node
+        && ln -s /usr/bin/nodejs /usr/local/bin/node
 
 RUN apt-get clean \
-	&& rm -rf /var/lib/apt/lists/
+        && rm -rf /var/lib/apt/lists/

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/default/index.html.twig

@@ -19,7 +19,7 @@
                         </div>
                         <div class="header-video-inner">
                             <video loop="" preload="metadata" autoplay="" id="vid" muted="muted">
-                                {# <source src="/img/home_video.mp4" type="video/mp4"> #}
+                                 <source src="/img/home_video.mp4" type="video/mp4">
                             </video>
                         </div>
 

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/app/config/parameters-prod.yml

@@ -36,6 +36,6 @@ parameters:
         service_mail_subject: 'mailto:looping@talentstube.com'
         ttl: 300
         urgency: high
-            topic: Emploi
+        topic: Emploi
     push_params.public_key: BG2lV673DvB67dzEwX9GKfds3sXaEdtZo2oWO1cO2xUdTJAFZ_rV_UrP1nHQz-F8LJNO9HxG0kmQRIb54JL1ZCA
 

volume/www/website/www/src/AppBundle/Controller/Api/SecurityController.php

@@ -17,9 +17,7 @@ use AppBundle\Exception\ResourceValidationException;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
 class SecurityController extends FOSRestController
-
 {
-
   /**
    * @Rest\Post(path="/api/confirmAccount", name="api_confirm_account")
    * @Rest\View

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')