Compare commits

..

14 Commits

Author SHA1 Message Date
Thomas MONCHICOURT e6316504f1 Feat : Voeux 2018 #5816 @2h 2018-01-18 11:21:05 +01:00
Thomas MONCHICOURT d8ac0993d6 Fix : port docker dev 2018-01-17 14:59:17 +01:00
Thomas MONCHICOURT 67575e53e4 Fix : stats 2018-01-15 11:27:29 +01:00
Thomas MONCHICOURT 182a1b5078 Fix : nginx conf prod 2018-01-11 11:00:33 +01:00
Thomas MONCHICOURT 4b9cd98266 Fix : correction 2018-01-11 10:50:58 +01:00
Thomas MONCHICOURT cf4e5020f5 Fix : conf static 2017-12-27 11:40:41 +01:00
sstolz 6a0b64c184 merge from develop
commit 6a05e05bf97e4e8f5bd30b81c192f0854f7746a8
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 12:22:53 2017 +0100

    update nginx docker listening port

commit 4f9b143d9d7de5fd303bd178014e54765c473fe1
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:25 2017 +0100

    gitignore env files

commit 7a03258d039f1d778b651485d57418173cf02534
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:16 2017 +0100

    remove unwanted env files

commit 9608afbd6068c114de14d08cb9505d0b72f2ed98
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:03 2017 +0100

    update production store database credential

commit 1ca654b460b85d6a198df72ad2863bc8e943235a
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 09:44:18 2017 +0100

    merge feature refactor docker

    commit 644eec0e84
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:19 2017 +0100

        gitignore backup folder

    commit 851ca86cb7
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:11 2017 +0100

        add mongo backup/restore

    commit a01e857b72
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:35:33 2017 +0100

        move store to right location :)

    commit 1363060c07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:42 2017 +0100

        symfony conf update

    commit c781458763
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:22 2017 +0100

        nginx conf update

    commit aa60d39522
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:07 2017 +0100

        docker conf refactoring

    commit 3ddc3bbd00
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:33 2017 +0100

        remove mlocate package on containers

    commit f2a0b27418
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:05 2017 +0100

        add volume to gitignore

    commit b638c63812
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 10:08:55 2017 +0100

        first docker struct

    commit 71c6f90685
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:51:30 2017 +0100

        rename nginx config file

    commit d667905f07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:38:27 2017 +0100

        add store to repo

    commit 3ef1d29081
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:27 2017 +0100

        move website gitignore patterns to new location

    commit 03604e29ff
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:03 2017 +0100

        move website files to new folder

    commit 722db3bb55
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:19 2017 +0100

        gitignore

    commit d5eb5b2f86
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:06 2017 +0100

        remove gitsubmodule config file

    commit ff5ca40f3f
    Author: Sébastien STOLZ <sstolz@zaxxon.local>
    Date:   Wed Dec 20 09:21:41 2017 +0100

        remove store submodule

commit deec5da92f9b430e60b97b5145f44dce33c6a508
Merge: d32c00c2 5c805db6
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Wed Dec 20 14:29:31 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit d32c00c2a3e8c9d63d9859c7cd9340e190df3fde
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 5c805db64e2f68f5b3e774cd64401122fdb7cfce
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Wed Dec 20 10:08:27 2017 +0100

    Fix: dashboard territory

commit 65b4ec05b9
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:56:19 2017 +0100

    Fix : date

commit 188e40fda4
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:53:30 2017 +0100

    Fix : probleme heure pour jour complet  #5737 @0h15

commit 0b1af02535
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:33:30 2017 +0100

    Fix : bug stats array

commit d277462d40
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 7f7678737c
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:08:11 2017 +0100

    Feat : ajout du chevron #5737 @0h15

commit 46aef95e61
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 14:33:07 2017 +0100

    Fix : date js

commit 1b8dbdf0b6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:41:36 2017 +0100

    Fix : no stats

commit 4409b75edf
Merge: 5652cbf9 b630d2fb
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:43 2017 +0100

    Merge branch 'develop' of https://git.e-declic.net/talents-tube/website into develop

commit 5652cbf9d1
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:31 2017 +0100

    Fix : calcul #5737 @0h30

commit b630d2fb4e
Merge: bac003c3 58ac0b9e
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:48 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit bac003c30d
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:44 2017 +0100

    Fix : Display full lastname

    #5739

commit 58ac0b9e91
Merge: 1e9df9ce 73eb2761
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:41:12 2017 +0100

    Merge branch 'feat/stats_ajax' into develop

commit 73eb2761c6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:38:32 2017 +0100

    Feat : Modification des stats en ajax #5737  @4h30

commit 1e9df9ce55
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 09:31:22 2017 +0100

    Fix : missing typo in ad meta description

    #5746
2017-12-21 12:24:19 +01:00
sstolz e2b7c43c23 delete unwanted env files 2017-12-21 11:57:49 +01:00
sstolz d7731b78be merge from develop (minor docker fix)
commit 4f9b143d9d7de5fd303bd178014e54765c473fe1
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:25 2017 +0100

    gitignore env files

commit 7a03258d039f1d778b651485d57418173cf02534
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:16 2017 +0100

    remove unwanted env files

commit 9608afbd6068c114de14d08cb9505d0b72f2ed98
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:03 2017 +0100

    update production store database credential

commit 1ca654b460b85d6a198df72ad2863bc8e943235a
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 09:44:18 2017 +0100

    merge feature refactor docker

    commit 644eec0e84
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:19 2017 +0100

        gitignore backup folder

    commit 851ca86cb7
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:11 2017 +0100

        add mongo backup/restore

    commit a01e857b72
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:35:33 2017 +0100

        move store to right location :)

    commit 1363060c07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:42 2017 +0100

        symfony conf update

    commit c781458763
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:22 2017 +0100

        nginx conf update

    commit aa60d39522
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:07 2017 +0100

        docker conf refactoring

    commit 3ddc3bbd00
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:33 2017 +0100

        remove mlocate package on containers

    commit f2a0b27418
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:05 2017 +0100

        add volume to gitignore

    commit b638c63812
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 10:08:55 2017 +0100

        first docker struct

    commit 71c6f90685
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:51:30 2017 +0100

        rename nginx config file

    commit d667905f07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:38:27 2017 +0100

        add store to repo

    commit 3ef1d29081
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:27 2017 +0100

        move website gitignore patterns to new location

    commit 03604e29ff
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:03 2017 +0100

        move website files to new folder

    commit 722db3bb55
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:19 2017 +0100

        gitignore

    commit d5eb5b2f86
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:06 2017 +0100

        remove gitsubmodule config file

    commit ff5ca40f3f
    Author: Sébastien STOLZ <sstolz@zaxxon.local>
    Date:   Wed Dec 20 09:21:41 2017 +0100

        remove store submodule

commit deec5da92f9b430e60b97b5145f44dce33c6a508
Merge: d32c00c2 5c805db6
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Wed Dec 20 14:29:31 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit d32c00c2a3e8c9d63d9859c7cd9340e190df3fde
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 5c805db64e2f68f5b3e774cd64401122fdb7cfce
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Wed Dec 20 10:08:27 2017 +0100

    Fix: dashboard territory

commit 65b4ec05b9
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:56:19 2017 +0100

    Fix : date

commit 188e40fda4
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:53:30 2017 +0100

    Fix : probleme heure pour jour complet  #5737 @0h15

commit 0b1af02535
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:33:30 2017 +0100

    Fix : bug stats array

commit d277462d40
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 7f7678737c
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:08:11 2017 +0100

    Feat : ajout du chevron #5737 @0h15

commit 46aef95e61
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 14:33:07 2017 +0100

    Fix : date js

commit 1b8dbdf0b6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:41:36 2017 +0100

    Fix : no stats

commit 4409b75edf
Merge: 5652cbf9 b630d2fb
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:43 2017 +0100

    Merge branch 'develop' of https://git.e-declic.net/talents-tube/website into develop

commit 5652cbf9d1
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:31 2017 +0100

    Fix : calcul #5737 @0h30

commit b630d2fb4e
Merge: bac003c3 58ac0b9e
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:48 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit bac003c30d
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:44 2017 +0100

    Fix : Display full lastname

    #5739

commit 58ac0b9e91
Merge: 1e9df9ce 73eb2761
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:41:12 2017 +0100

    Merge branch 'feat/stats_ajax' into develop

commit 73eb2761c6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:38:32 2017 +0100

    Feat : Modification des stats en ajax #5737  @4h30

commit 1e9df9ce55
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 09:31:22 2017 +0100

    Fix : missing typo in ad meta description

    #5746
2017-12-21 11:56:07 +01:00
sstolz aa4b8de814 merge from delevlop (docker refactor)
commit 1ca654b460b85d6a198df72ad2863bc8e943235a
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 09:44:18 2017 +0100

    merge feature refactor docker

    commit 644eec0e84
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:19 2017 +0100

        gitignore backup folder

    commit 851ca86cb7
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:11 2017 +0100

        add mongo backup/restore

    commit a01e857b72
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:35:33 2017 +0100

        move store to right location :)

    commit 1363060c07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:42 2017 +0100

        symfony conf update

    commit c781458763
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:22 2017 +0100

        nginx conf update

    commit aa60d39522
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:07 2017 +0100

        docker conf refactoring

    commit 3ddc3bbd00
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:33 2017 +0100

        remove mlocate package on containers

    commit f2a0b27418
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:05 2017 +0100

        add volume to gitignore

    commit b638c63812
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 10:08:55 2017 +0100

        first docker struct

    commit 71c6f90685
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:51:30 2017 +0100

        rename nginx config file

    commit d667905f07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:38:27 2017 +0100

        add store to repo

    commit 3ef1d29081
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:27 2017 +0100

        move website gitignore patterns to new location

    commit 03604e29ff
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:03 2017 +0100

        move website files to new folder

    commit 722db3bb55
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:19 2017 +0100

        gitignore

    commit d5eb5b2f86
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:06 2017 +0100

        remove gitsubmodule config file

    commit ff5ca40f3f
    Author: Sébastien STOLZ <sstolz@zaxxon.local>
    Date:   Wed Dec 20 09:21:41 2017 +0100

        remove store submodule

commit deec5da92f9b430e60b97b5145f44dce33c6a508
Merge: d32c00c2 5c805db6
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Wed Dec 20 14:29:31 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit d32c00c2a3e8c9d63d9859c7cd9340e190df3fde
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 5c805db64e2f68f5b3e774cd64401122fdb7cfce
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Wed Dec 20 10:08:27 2017 +0100

    Fix: dashboard territory

commit 65b4ec05b9
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:56:19 2017 +0100

    Fix : date

commit 188e40fda4
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:53:30 2017 +0100

    Fix : probleme heure pour jour complet  #5737 @0h15

commit 0b1af02535
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:33:30 2017 +0100

    Fix : bug stats array

commit d277462d40
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 7f7678737c
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:08:11 2017 +0100

    Feat : ajout du chevron #5737 @0h15

commit 46aef95e61
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 14:33:07 2017 +0100

    Fix : date js

commit 1b8dbdf0b6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:41:36 2017 +0100

    Fix : no stats

commit 4409b75edf
Merge: 5652cbf9 b630d2fb
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:43 2017 +0100

    Merge branch 'develop' of https://git.e-declic.net/talents-tube/website into develop

commit 5652cbf9d1
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:31 2017 +0100

    Fix : calcul #5737 @0h30

commit b630d2fb4e
Merge: bac003c3 58ac0b9e
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:48 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit bac003c30d
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:44 2017 +0100

    Fix : Display full lastname

    #5739

commit 58ac0b9e91
Merge: 1e9df9ce 73eb2761
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:41:12 2017 +0100

    Merge branch 'feat/stats_ajax' into develop

commit 73eb2761c6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:38:32 2017 +0100

    Feat : Modification des stats en ajax #5737  @4h30

commit 1e9df9ce55
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 09:31:22 2017 +0100

    Fix : missing typo in ad meta description

    #5746
2017-12-21 11:47:55 +01:00
Maxime Thévenot 4c9021033c Merge branch 'develop' 2017-12-18 16:44:32 +01:00
Maxime Thévenot 7dd0609353 Merge branch 'develop' 2017-12-15 10:10:56 +01:00
Maxime Thévenot 0ee59a3fcf Merge remote-tracking branch 'origin/master' 2017-12-13 12:09:41 +01:00
Maxime Thévenot ba32941fd1 Merge branch 'develop' 2017-12-13 12:09:35 +01:00
22 changed files with 299 additions and 159 deletions
+2 -1
View File
@@ -5,4 +5,5 @@
/volume/*
!/volume/www
/volume/www/**/conf/nginx.conf
/backup
/backup
/conf/env/*.env
+2
View File
@@ -3,6 +3,8 @@ version: '3'
services:
nginx:
ports:
- "80:80"
volumes:
- ../volume/www:/home/www:cached
restart: "no"
-2
View File
@@ -9,8 +9,6 @@ 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
-3
View File
@@ -1,3 +0,0 @@
POSTGRES_DB=database
POSTGRES_USER=user
POSTGRES_PASSWORD=edcl56
-4
View File
@@ -1,4 +0,0 @@
MYSQL_ROOT_PASSWORD=n1O060}8S<()+G;X
MYSQL_DATABASE=db
MYSQL_USER=dbuser
MYSQL_PASSWORD=|;YR1,rf-E}ICoh5
+16 -1
View File
@@ -6,6 +6,21 @@ 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;
@@ -13,7 +28,7 @@ server {
client_max_body_size 500M;
root /home/www/www.talentstube.com/www/web;
root /home/www/website/www/web;
access_log /home/www/website/log/access.log vhosts;
error_log /home/www/website/log/error.log;
@@ -2,7 +2,7 @@
define('_DB_SERVER_', 'tt-website.store-php.prod');
define('_DB_NAME_', 'database');
define('_DB_USER_', 'user');
define('_DB_PASSWD_', '|;YR1,rf-E}ICoh5');
define('_DB_PASSWD_', 'O}lk|45&J,kT+DDM{uk[');
define('_DB_PREFIX_', '');
define('_MYSQL_ENGINE_', 'InnoDB');
define('_PS_CACHING_SYSTEM_', 'CacheFs');
@@ -21,7 +21,7 @@
{% endif %}
{% endif %}
<a href="{{ path('company_show',{'alias': ad.company.alias }) }}" title="{{ ad.company.brandName }}" class="btn btn-default btn-small-grey">
Découvir l'employeur
Découvrir l'employeur
</a>
<p class="profil-name">
<a href="{{ path('company_show',{'alias': company.alias }) }}" title="{{ company.brandName }}">
@@ -10,11 +10,16 @@
<div class="col l12 m12 s12 home-content col-noPadding">
<div id="homeTeaser" class="valign-wrapper">
<h1 class="white-text center-align">1er job board <span>100% vidéo</span></h1><br />
<a data-target="modal_concept" href="#!" class="btn btn-default btn-round btn-concept modal-trigger">
Le concept en vidéo &nbsp;&nbsp;&nbsp;
<img src="{{asset('img/bouton-play.png')}}" />
</a>
<div class="link-home-head">
<a data-target="modal_concept" href="#!" class="btn btn-default btn-round btn-concept modal-trigger">
Le concept en vidéo &nbsp;&nbsp;&nbsp;
<img src="{{asset('img/bouton-play.png')}}" />
</a>
<a data-target="modal_voeux" href="#!" class="btn btn-default btn-round btn-voeux modal-trigger">
Voeux 2018 en vidéo &nbsp;&nbsp;&nbsp;
<img src="{{asset('img/bouton-play.png')}}" />
</a>
</div>
<div class="header-video-inner">
<video loop="" preload="metadata" autoplay="" id="vid" muted>
<source src="/img/home_video.mp4" type="video/mp4">
@@ -210,6 +215,17 @@
<a href="#!" class="modal-action modal-close btn btn-default button-round-small">Fermer</a>
</div>
</div>
<div id="modal_voeux" class="modal modal-fixed-footer">
<div class="modal-content">
<div class="video-container">
<iframe id="iframe_concept" src="" frameborder="0" webkitallowfullscreen mozallowfullscreen
allowfullscreen></iframe>
</div>
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close btn btn-default button-round-small">Fermer</a>
</div>
</div>
{% endblock %}
{% block javascripts %}
@@ -16,43 +16,37 @@
</div>
</div>
{% endif %}
<div class="col s5">
<div class="col s3">
<h5 class="blue-text no-margin-top">Volumes des visites</h5>
</div>
<div class="col s2 choiceMonthWrapper right-align">
<select id="choiceMonth">
{% set thisYear = "now"|date("Y") %}
{% set thisMonth = "now"|date("m") %}
{% for month in 1..thisMonth %}
{% set date = month ~ "/01/" ~ thisYear %}
<option {% if loop.last %}selected{% endif %} value="{{ date|date("m") }}">{{ date|datetime('%B') }}</option>
{% endfor %}
</select>
</div>
<div class="col s5 right-align">
{% set totalAds = 0 %}
{% if arrayByAds is defined %}
{% for record in arrayByAds %}
{% set totalAds = totalAds + record.count %}
{% endfor %}
{% endif %}
<span class="btn-countVisitsAds">{{ totalAds }} visites</span>
<span class="btn-countVisitsCompany">{{ totalRecordsCompany }} visites</span>
<div class="col s9 choiceMonthWrapper right-align">
{% set thisYear = "now"|date("Y") %}
{% set thisMonth = "now"|date("m") %}
{% set thisDay = "now"|date("d") %}
{% set dateTextMoins = "now -1 Month"|date("d-m-Y") %}
{% set dateText = "now"|date("d-m-Y") %}
<input id="choiceMonth" type="text" name="daterange" value="{{ dateTextMoins }} au {{ dateText }}" />
<i class="fa fa-refresh fa-spin fa-fw"></i>
<span class="sr-only">Loading...</span>
</div>
<div class="col s12">
<canvas id="nb_visits" width="600" height="300"></canvas>
</div>
<div class="col s12">
<div class="col s6 countLegend">
<p><span class="btn-countVisitsAds">&nbsp;</span>Nombre de visites d'annonces rattachées à votre territoire</p>
<p><span class="btn-countVisitsCompany">&nbsp;</span>Nombre de visites de votre page territoire</p>
</div>
<div class="col s6 countBlock">
<span class="btn-countVisitsAds"><span class="countVisitsAds"></span>&nbsp;visites</span>
<span class="btn-countVisitsCompany"><span class="countVisitsCompany"></span>&nbsp;visites</span>
</div>
</div>
<div id="donutChart-wrapper" class="row bg-bordered p-20">
<div class="col s6">
<h5 class="blue-text no-margin-top">Répartition des visites</h5>
<canvas id="donught_visits" width="300" height="300"></canvas>
</div>
<div class="col s6 donutLegend">
<div class="col s6 donutLegend countLegend">
<p><span class="btn-count btn-countVisitsTalentByCompany">&nbsp;</span>Visites de talents</p>
<p><span class="btn-count btn-countVisitsCompanyByCompany">&nbsp;</span>Visites d'entreprises</p>
<p><span class="btn-count btn-countVisitsAnonymByCompany">&nbsp;</span>Visites d'internautes non-inscrits</p>
@@ -61,61 +55,123 @@
{% endblock %}
{% block javascripts %}
{{ parent() }}
<script src="{{ asset('/js/vendors/Chart.bundle.min.js') }}"></script>
<script type="text/javascript">
$('#choiceMonth').on('change',function(){
currentMonth = $(this).val();
setArrayValues();
dataLine.labels = arrayCurrentsLabel;
dataLine.datasets[0].data = arrayCurrentsAdsValues;
dataLine.datasets[1].data = arrayCurrentsCompanyValues;
myChart.update();
});
var currentMonth = '{{ "now"|date("m") }}';
var arrayRecords = JSON.parse('{{ lineRecords|json_encode()|raw }}');
var arrayCurrentsLabel,arrayCurrentsAdsValues,arrayCurrentsCompanyValues;
{{ parent() }}
<script src="{{ asset('/js/vendors/Chart.bundle.min.js') }}"></script>
<script type="text/javascript">
var currentMonth = '{{ "now"|date("m") }}';
var arrayRecords;
var ctx,myChart,arrayCurrentsLabel,arrayCurrentsAdsValues,arrayCurrentsCompanyValues,donughtRecords;
var sumVisitsAds = 0;
var sumCompanyValues = 0;
function loadChartData() {
setArrayValues();
myChart.update();
myDoughnutChart.update();
}
function setArrayValues(){
arrayCurrentsLabel = [];
arrayCurrentsAdsValues = [];
arrayCurrentsCompanyValues = [];
arrayRecords['labels'].forEach(function(element, index) {
var date = element.split("-");
if(date[1] == currentMonth){
var dateAffiche = date[2]+"-"+date[1]+"-"+date[0];
arrayCurrentsLabel.push(dateAffiche);
arrayCurrentsAdsValues.push(arrayRecords['datasetsAd'][index]);
arrayCurrentsCompanyValues.push(arrayRecords['datasetsCompany'][index]);
function getChartData(date1,date2) {
$.ajax({
type: "POST",
url: '{{ path("territory_ajax_dashboard") }}',
data: 'date1='+date1+'&date2='+date2,
dataType: "json",
success: function (data) {
arrayRecords = data.lineRecords;
donughtRecords = data.donughtRecords;
myDoughnutChart.data.datasets[0].data = donughtRecords;
loadChartData();
$('.fa-refresh').hide();
},
error: function (data) {
$('.fa-refresh').hide();
}
});
}
document.addEventListener("DOMContentLoaded", function(event) {
$('.fa-refresh').hide();
getChartData(0, 0);
configDatePicker = {
applyBtnClass: 'btn btn-default',
format: 'DD-MM-YYYY',
separator: ' au ',
endDate: new Date(),
maxDays: 365
}
$('#choiceMonth').dateRangePicker(configDatePicker).bind('datepicker-apply',function(event,obj) {
$('.fa-refresh').show();
var month1 = obj.date1.getMonth();
var day1 = obj.date1.getDate();
var year1 = obj.date1.getUTCFullYear();
var month2 = obj.date2.getMonth();
var day2 = obj.date2.getDate();
var year2 = obj.date2.getUTCFullYear();
var date1 = (month1 + 1) + "/" + day1 + "/" + year1 +" 00:00:00";
var date2 = (month2 + 1) +"/" + day2 + "/" + year2 +" 23:59:59";
getChartData(date1, date2);
});
$('.apply-btn').attr('value','Valider');
});
function setArrayValues(){
arrayCurrentsLabel = [];
arrayCurrentsAdsValues = [];
arrayCurrentsCompanyValues = [];
arrayRecords['labels'].forEach(function(element, index) {
var date = element.split("-");
var dateAffiche = date[2]+"-"+date[1]+"-"+date[0];
arrayCurrentsLabel.push(dateAffiche);
arrayCurrentsAdsValues.push(arrayRecords['datasetsAd'][index]);
arrayCurrentsCompanyValues.push(arrayRecords['datasetsCompany'][index]);
});
myChart.data.labels = arrayCurrentsLabel;
myChart.data.datasets[0].data = arrayCurrentsAdsValues;
myChart.data.datasets[1].data = arrayCurrentsCompanyValues;
if (arrayCurrentsAdsValues.length > 0) {
sumVisitsAds = arrayCurrentsAdsValues.reduce(function(memo, val) {
let value = val || 0;
if (value != null) {
return memo + value;
}
});
} else {
sumVisitsAds = 0;
}
if (arrayCurrentsCompanyValues.length > 0) {
sumCompanyValues = arrayCurrentsCompanyValues.reduce(function(memo, val) {
let value = val || 0;
if (value != null) {
return memo + value;
}
});
} else {
sumCompanyValues = 0;
}
var dataLine = {
labels: arrayCurrentsLabel,
datasets: [
{
label: "Nombre de visite d'annonce par jour",
fill: false,
fontColor: "rgba(39,139,231,1)",
backgroundColor: "rgba(39,139,231,1)",
borderColor: "rgba(39,139,231,1)",
data: arrayCurrentsAdsValues
}, {
label: "Nombre de visite de votre page entreprise",
fill: false,
fontColor: "#F9C339",
backgroundColor: "#F9C339",
borderColor: "#F9C339",
data: arrayCurrentsCompanyValues
}
]
};
$('.countVisitsAds').html(sumVisitsAds);
$('.countVisitsCompany').html(sumCompanyValues);
}
var ctx = document.getElementById("nb_visits");
var dataLine = {
datasets: [
{
label: "Nombre de visite d'annonce par jour",
fill: false,
fontColor: "rgba(39,139,231,1)",
backgroundColor: "rgba(39,139,231,1)",
borderColor: "rgba(39,139,231,1)"
}, {
label: "Nombre de visite de votre page entreprise",
fill: false,
fontColor: "#F9C339",
backgroundColor: "#F9C339",
borderColor: "#F9C339"
}
]
};
var ctx = document.getElementById("nb_visits");
var myChart = new Chart(ctx, {
type: 'line',
data: dataLine,
@@ -125,59 +181,58 @@
},
scales: {
xAxes: [{
display: true,
scaleLabel: {
display: true,
labelString: 'Date'
}
display: true,
scaleLabel: {
display: true,
labelString: 'Date'
}
}],
yAxes: [{
ticks: {
min: 0
},
scaleLabel: {
display: true,
labelString: 'Valeur'
}
}]
scaleLabel: {
display: true,
labelString: 'Valeur'
}
}]
}
}
});
var dataDonught = {
labels: [
"Visites de talents",
"Visites d'entreprises",
"Visites d'internautes non inscrit"
],
datasets: [
{
data: {{ donughtRecords|json_encode() }},
backgroundColor: [
"#FF6384",
"#36A2EB",
"#FFCE56"
],
hoverBackgroundColor: [
"#FF6384",
"#36A2EB",
"#FFCE56"
]
}]
};
var ctxDonught = document.getElementById("donught_visits");
var myDoughnutChart = new Chart(ctxDonught, {
type: 'doughnut',
data: dataDonught,
options: {
legend: {
display: false,
},
animation: {
animateScale: true
}
var dataDonught = {
labels: [
"Visites de talents",
"Visites d'entreprises",
"Visites d'internautes non inscrit"
],
datasets: [
{
data: donughtRecords,
backgroundColor: [
"#FF6384",
"#36A2EB",
"#FFCE56"
],
hoverBackgroundColor: [
"#FF6384",
"#36A2EB",
"#FFCE56"
]
}]
};
var ctxDonught = document.getElementById("donught_visits");
var myDoughnutChart = new Chart(ctxDonught, {
type: 'doughnut',
data: dataDonught,
options: {
legend: {
display: false,
},
animation: {
animateScale: true
}
});
}
});
</script>
{% endblock %}
@@ -23,15 +23,39 @@ class TerritoryController extends Controller
{
setlocale(LC_ALL, 'fr_FR.utf-8');
$stats = $this->get("app.stats_manager");
$records = $stats->getTerritoryDashboard($this->getUser()->getCompany()->getId());
$records = $stats->getTerritoryDashboard($this->getUser()->getCompany()->getId(), null);
$em = $this->getDoctrine()->getManager();
return $this->render('territory/dashboard.html.twig', [
"arrayByAds" => $records['arrayByAds']
]);
}
/**
* @Route("/territoire/me/ajax/dashboard", name="territory_ajax_dashboard")
*/
public function territoryAjaxDashboardAction(Request $request)
{
$stats = $this->get("app.stats_manager");
if( ($request->request->get('date1') != 0) && ($request->request->get('date2') != 0) ) {
$dateBegin = new \DateTime();
$dateEnd = new \DateTime();
$dateBegin->setTimestamp(strtotime($request->request->get('date1')));
$dateEnd->setTimestamp(strtotime($request->request->get('date2')));
$arrayDate['dateBegin'] = $dateBegin;
$arrayDate['dateEnd'] = $dateEnd;
} else {
$arrayDate['dateBegin'] = new \DateTime('now -1 Month');
$arrayDate['dateEnd'] = new \DateTime('now');
}
$records = $stats->getTerritoryDashboard($this->getUser()->getCompany()->getId(), $arrayDate);
return new JsonResponse([
"lineRecords" => $records['lineRecords'],
"donughtRecords" => $records['donughtRecords'],
"totalRecords" => $records['totalRecords'],
"totalRecordsCompany" => $records['totalRecordsCompany'],
"arrayByAds" => $records['arrayByAds']
"arrayByAds" => $records['arrayByAds'],
]);
}
@@ -29,7 +29,7 @@ class StatsManager
* @param $idCompany
* @return array
*/
public function getTerritoryDashboard($idCompany)
public function getTerritoryDashboard($idCompany, $dateArray)
{
$arrByAd = array();
$arrDatasetsAd = array();
@@ -52,7 +52,7 @@ class StatsManager
$ad = $territoryAd->getAd();
if($ad) {
$arrByAd[$ad->getId()]['count'] = 0;
$recordAd = $this->history->recordShow(null, "r", 'AppBundle\Entity\Ad', $ad->getId(), 0);
$recordAd = $this->history->recordShow(null, "r", 'AppBundle\Entity\Ad', $ad->getId(), 0, $dateArray);
foreach ($recordAd as $record) {
if ($record->getUserId() == 0) {
$nbVisitAnonym = $nbVisitAnonym + 1;
@@ -87,13 +87,13 @@ class StatsManager
$lineDatesLabel[] = $stringDate;
}
}
$arrByAd[$ad->getId()]['count'] ++;
}
$arrByAd[$ad->getId()]['count'] = $nbVisitTalentByAd + $nbVisitCompanyByAd + $nbVisitAnonymByAd;
$arrByAd[$ad->getId()]['object'] = $ad;
}
}
$recordCompany = $this->history->recordShow(null, "r", 'AppBundle\Entity\Company', $idCompany, 0);
$recordCompany = $this->history->recordShow(null, "r", 'AppBundle\Entity\Company', $idCompany, 0, $dateArray);
$nbVisitTalentByCompany = 0;
$nbVisitCompanyByCompany = 0;
$nbVisitAnonymByCompany = 0;
@@ -117,6 +117,9 @@ class StatsManager
$date = $record->getCtime();
$stringDate = $date->format('Y-m-d');
if(!isset($arrayRecords['ad'][$stringDate][$idCompany])){
$arrayRecords['ad'][$stringDate][$idCompany] = 0;
}
if (!isset($arrayRecords['company'][$stringDate][$idCompany])) {
$arrayRecords['company'][$stringDate][$idCompany] = 1;
} else {
@@ -225,9 +228,9 @@ class StatsManager
$lineDatesLabel[] = $stringDate;
}
}
$arrByAd[$ad->getId()]['count'] ++;
}
}
$arrByAd[$ad->getId()]['count'] = $nbVisitTalentByAd + $nbVisitCompanyByAd + $nbVisitAnonymByAd;
$arrByAd[$ad->getId()]['object'] = $ad;
}
}
@@ -1,15 +0,0 @@
{% extends 'company/base_dashboard_company.html.twig' %}
{% block title %}{{ 'profile.company.title'|trans }}{% endblock %}
{% block dashContent %}
{% include 'default/flash_message.html.twig' %}
<div class="row bg-bordered p-20">
{#<h1 class="alttitle">{{ 'profile.company.title'|trans }}</h1>#}
{{ form_start(form, { 'action': path('company_profile'), 'attr': { 'class': 'fos_user_profile_edit' } }) }}
{{ form_widget(form) }}
<br/>
<input class="btn btn-default" type="submit" value="{{ 'profile.edit.submit'|trans }}"/>
{{ form_end(form) }}
</div>
{% endblock %}
@@ -292,6 +292,18 @@ $(document).ready(function () {
var src= $('#iframe_concept').attr('src');
$('#iframe_concept').attr('src',src);
});
$('#modal_voeux').modal({
dismissible: true,
ready: function(modal, trigger) {
$('#modal_voeux').find("iframe").attr('src',"https://player.vimeo.com/video/251612981?autoplay=1");
}
}
);
$('#modal_voeux').find('.modal-close').on('click',function(){
$('#modal_voeux').find("iframe").attr('src',"");
});
});
$('.roleUser').click(function(){
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+11
View File
@@ -14982,6 +14982,17 @@ h6 {
.btn-countVisitsAnonymByCompany {
background-color: #F9C339; }
.link-home-head {
display: flex;
flex-direction: row; }
.btn-voeux {
background-color: #FF9800;
background: linear-gradient(135deg, #ec9511 0%, #FF9800 100%);
margin-left: 25px; }
.btn-voeux:hover {
background: linear-gradient(135deg, #f1aa3f 0%, #ffad33 100%); }
.btn-small-grey {
padding: 0px 5px;
margin: 10px 0 20px 0;
File diff suppressed because one or more lines are too long
Binary file not shown.
+12
View File
@@ -292,5 +292,17 @@ $(document).ready(function () {
var src= $('#iframe_concept').attr('src');
$('#iframe_concept').attr('src',src);
});
$('#modal_voeux').modal({
dismissible: true,
ready: function(modal, trigger) {
$('#modal_voeux').find("iframe").attr('src',"https://player.vimeo.com/video/251612981?autoplay=1");
}
}
);
$('#modal_voeux').find('.modal-close').on('click',function(){
$('#modal_voeux').find("iframe").attr('src',"");
});
});
@@ -254,6 +254,19 @@
background-color: #F9C339;
}
.link-home-head{
display: flex;
flex-direction: row;
}
.btn-voeux {
background-color: #FF9800;
background: linear-gradient(135deg,rgb(236, 149, 17) 0%,#FF9800 100%);
&:hover{
background: linear-gradient(135deg,lighten(rgb(236, 149, 17), 10%) 0%,lighten(#FF9800, 10%) 100%)
}
margin-left: 25px;
}
.btn-small-grey {
padding: 0px 5px;
margin: 10px 0 20px 0;