diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8d221e74ee0082cdfe1b8873e80dde5e6bcb1d4..8849252eacbba4f3bb11e2aadc5859183a7ee2ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ deploy_development: - docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml up -d environment: name: development - url: https://data-reloaded-dev.datalab.erasme.org + url: https://data-reloaded-dev.alpha.grandlyon.com build_staging: stage: build @@ -46,4 +46,4 @@ deploy_staging: - docker-compose --project-name data-reloaded-rec -f docker-compose-staging.yml up -d environment: name: staging - url: https://data-reloaded-rec.datalab.erasme.org \ No newline at end of file + url: https://data-reloaded-rec.alpha.grandlyon.com \ No newline at end of file diff --git a/nginx-development.conf b/nginx-development.conf index c6d6f616be8b006bf5fd6039655968b0584d579b..b6711ba55767e339190eac17aef334b59ff6639a 100644 --- a/nginx-development.conf +++ b/nginx-development.conf @@ -31,11 +31,11 @@ server { # Particular configuration to be able to call the elasticsearch service location /elasticsearch/ { #proxy_pass https://elastic2.recette.data.grandlyon.com/elastic/; - proxy_pass https://elastic.datalab.erasme.org/; + proxy_pass https://elastic.alpha.grandlyon.com/; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; #proxy_set_header Host $http_host; - proxy_set_header Host elastic.datalab.erasme.org; + proxy_set_header Host elastic.alpha.grandlyon.com; add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Credentials' 'true'; add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS'; @@ -49,8 +49,8 @@ server { sub_filter_once off; sub_filter_types *; - sub_filter 'http:\/\/192.168.62.15:8000' 'https:\/\/data-reloaded-dev.datalab.erasme.org\/wordpress'; - sub_filter "http://192.168.62.15:8000" "https://data-reloaded-dev.datalab.erasme.org/wordpress"; + sub_filter 'http:\/\/192.168.62.15:8000' 'https:\/\/data-reloaded-dev.alpha.grandlyon.com\/wordpress'; + sub_filter "http://192.168.62.15:8000" "https://data-reloaded-dev.alpha.grandlyon.com/wordpress"; } } diff --git a/nginx-staging.conf b/nginx-staging.conf index ddabb09b2a76c5c1c62d44ce14c410f0d26b7af8..da5aa6582e79b95051b58fc6bc0be78d693b0fb9 100644 --- a/nginx-staging.conf +++ b/nginx-staging.conf @@ -31,11 +31,11 @@ server { # Particular configuration to be able to call the elasticsearch service location /elasticsearch/ { #proxy_pass https://elastic2.recette.data.grandlyon.com/elastic/; - proxy_pass https://elastic.datalab.erasme.org/; + proxy_pass https://elastic.alpha.grandlyon.com/; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; #proxy_set_header Host $http_host; - proxy_set_header Host elastic.datalab.erasme.org; + proxy_set_header Host elastic.alpha.grandlyon.com; add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Credentials' 'true'; add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS'; @@ -43,20 +43,14 @@ server { } location /wordpress/ { - #proxy_pass https://elastic2.recette.data.grandlyon.com/elastic/; - sub_filter 'http:\/\/192.168.62.15:8000\/' 'https:\/\/data-reloaded-rec.datalab.erasme.org\/wordpress\/'; + proxy_set_header Accept-Encoding ""; + proxy_pass http://192.168.62.15:8000/; + sub_filter_once off; sub_filter_types *; - proxy_pass http://192.168.62.15:8000/; - # proxy_set_header X-Real-IP $remote_addr; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - #proxy_set_header Host $http_host; - # proxy_set_header Host elastic.datalab.erasme.org; - # add_header 'Access-Control-Allow-Origin' '*'; - # add_header 'Access-Control-Allow-Credentials' 'true'; - # add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS'; - # add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; + + sub_filter 'http:\/\/192.168.62.15:8000' 'https:\/\/data-reloaded-rec.alpha.grandlyon.com\/wordpress'; + sub_filter "http://192.168.62.15:8000" "https://data-reloaded-rec.alpha.grandlyon.com/wordpress"; } - } diff --git a/readme.md b/readme.md index 5b13b05fc6892f764e30e828993df36dacad9725..21810901d7d95765804b995798481c853d3e25f8 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -[](https://gitlab.datalab.erasme.org/refonte-data/portail-data/commits/master) +[](https://gitlab.alpha.grandlyon.com/refonte-data/portail-data/commits/master) ## Requirements diff --git a/webapp/package-lock.json b/webapp/package-lock.json index c1a489d6c1e492faed77b993cf74a4c39ebe5feb..3560cd7890a7c8708a6c071a3073c7b543827a90 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -3551,6 +3551,11 @@ "debug": "2.6.9" } }, + "font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", + "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", diff --git a/webapp/package.json b/webapp/package.json index 492ba6e7a439097974850e91f4067fc88a3cf99b..7701183d52d59a3d31fa6b7165d6bfca5104ecb7 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -33,6 +33,7 @@ "@angular/router": "^5.2.0", "bulma": "^0.7.1", "core-js": "^2.4.1", + "font-awesome": "^4.7.0", "rxjs": "^5.5.6", "zone.js": "^0.8.19" }, diff --git a/webapp/src/app/core/components/footer/footer.component.html b/webapp/src/app/core/components/footer/footer.component.html index 0bb3ca506f1ba786cefe3d9538cea7140d023e42..500c25d7ce2e23227c5aeb184b11b79142f761b3 100644 --- a/webapp/src/app/core/components/footer/footer.component.html +++ b/webapp/src/app/core/components/footer/footer.component.html @@ -1,12 +1,60 @@ <footer class="footer"> - <div class="container"> - <div class="content"> - <div class="columns"> - <a class="column is-offset-2 is-2 accessibility-link" routerLink="/accessibilite" i18n="@@footer.accessibility">Accessibility</a> - <a class="column is-2 site-map-link" routerLink="/plan-du-site" i18n="@@footer.sitemap">Site Map</a> - <a class="column is-2 legal-mentions-link" routerLink="/mentions-legales" i18n="@@footer.notices">Legal Notices</a> - <a class="column" routerLink="/" i18n="@@footer.contactus">Contact Us</a> + <div class="container"> + <div class="content"> + <div class="columns"> + <div class="column is-2 has-text-centered"> + <ul> + <li> + <a href="https://download.data.grandlyon.com/catalogue/srv/fre/rss.search?sortBy=publicationDate&georss=simplepoint&data" + title="Flux RSS" target="_blank"> + <i class="social-network-link fas fa-rss-square"></i> + </a> + </li> + <li class="left-border"> + <a href="http://www.facebook.com/legrandlyon" title="Facebook" target="_blank"> + <i class="social-network-link fab fa-facebook-square"></i> + </a> + </li> + <li class="left-border"> + <a href="https://twitter.com/grandlyon" title="Twitter" target="_blank"> + <i class="social-network-link fab fa-twitter-square"></i> + </a> + </li> + </ul> + </div> + <div class="column is-7 has-text-centered"> + <ul> + <li class="left-border"> + <a class="accessibility-link" routerLink="/accessibilite" i18n="@@footer.accessibility">Accessibility</a> + </li> + <li class="left-border"> + <a class="site-map-link" routerLink="/plan-du-site" i18n="@@footer.sitemap">Site Map</a> + </li> + <li class="left-border"> + <a class="legal-mentions-link" routerLink="/mentions-legales" i18n="@@footer.notices">Legal Notices</a> + </li> + <li class="left-border"> + <a routerLink="/" i18n="@@footer.contactus">Contact Us</a> + </li> + </ul> + </div> + <div class="column is-3 has-text-centered"> + <ul> + <li> + <a href="https://www.grandlyon.com/" target="_blank"> + <img i18n-title="@@footer.metropole.site.title" title="Access the Lyon Metropolis website (new window)" class="plus-logo" + src="./assets/img/footer-plus.png" alt="plus-logo"> + </a> + </li> + <li> + <a class="metropolis-website-link" i18n-title="@@footer.metropole.site.title" title="Access the Lyon Metropolis website (new window)" + href="https://www.grandlyon.com/" target="_blank" i18n="@@footer.metropole.site"> + A Lyon Metropolis website + </a> + </li> + </ul> </div> </div> </div> - </footer> \ No newline at end of file + </div> +</footer> \ No newline at end of file diff --git a/webapp/src/app/core/components/footer/footer.component.scss b/webapp/src/app/core/components/footer/footer.component.scss index b30ce67f112f48fce5bbfccad79684828e7e8842..8be8f2276a2b672bd7962858c70fa9fb1a91cc05 100644 --- a/webapp/src/app/core/components/footer/footer.component.scss +++ b/webapp/src/app/core/components/footer/footer.component.scss @@ -8,3 +8,22 @@ } +img, .social-network-link { + vertical-align: middle; +} + +ul { + padding-left: 0px; + margin: 0px; + li { + display: inline; + } +} + +.plus-logo { + height: 14px; +} + +.metropolis-website-link:hover { + text-decoration: underline; +} \ No newline at end of file diff --git a/webapp/src/app/editorialisation/components/wordpress-posts-list/wordpress-posts-list.component.html b/webapp/src/app/editorialisation/components/wordpress-posts-list/wordpress-posts-list.component.html index 28cc6f7d150f94f6b4e62fddf247a10c354a39d4..329352ccd08f4b84e5c022e88ea35e5dce5a5169 100644 --- a/webapp/src/app/editorialisation/components/wordpress-posts-list/wordpress-posts-list.component.html +++ b/webapp/src/app/editorialisation/components/wordpress-posts-list/wordpress-posts-list.component.html @@ -1,7 +1,8 @@ <div class="tile is-ancestor" *ngIf="posts"> - <ng-container *ngFor="let post of posts"> - <app-wordpress-posts-list-tile class="tile is-parent" [post]='post'> - </app-wordpress-posts-list-tile> -</ng-container> - -</div> + <div class="row"> + <div class="col-md-4" *ngFor="let post of posts | slice:0:3" style="margin-top: 20px;"> + <app-wordpress-posts-list-tile class="tile is-parent" [post]='post'> + </app-wordpress-posts-list-tile> + </div> + </div> +</div> \ No newline at end of file diff --git a/webapp/src/assets/img/footer-plus.png b/webapp/src/assets/img/footer-plus.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe4a61d993e24e77cfea67aab5ef2dd4215788e Binary files /dev/null and b/webapp/src/assets/img/footer-plus.png differ diff --git a/webapp/src/environments/environment.ts b/webapp/src/environments/environment.ts index e11d3f14d66718ed89ba5f2818fdf8d6223f8fb0..45d82e1098bbd9e4a368d416ba00b326a28454d3 100644 --- a/webapp/src/environments/environment.ts +++ b/webapp/src/environments/environment.ts @@ -16,7 +16,7 @@ export const environment = { en: '/en' }, - wordpressUrl: 'http://localhost:8000/wp-json/wp/v2/', + wordpressUrl: 'http://192.168.62.15:8000/wp-json/wp/v2/', wordpressStaticPages: { approach: 'la-demarche', diff --git a/webapp/src/i18n/messages.en.xlf b/webapp/src/i18n/messages.en.xlf index 926f0a6fbfa0f19da8d8f4482be6cd70cf03df6a..50ece07c33ba6180d553ba79f693937a404a372f 100644 --- a/webapp/src/i18n/messages.en.xlf +++ b/webapp/src/i18n/messages.en.xlf @@ -30,6 +30,14 @@ <source>Contact Us</source> <target>Contact Us</target> </trans-unit> + <trans-unit id="footer.metropole.site" datatype="html"> + <source>A Lyon Metropolis website</source> + <target>A Lyon Metropolis website</target> + </trans-unit> + <trans-unit id="footer.metropole.site.title" datatype="html"> + <source>Access the Lyon Metropolis website (new window)</source> + <target>Access the Lyon Metropolis website (new window)</target> + </trans-unit> <trans-unit id="header.logoEnglish" datatype="html"> <source>English</source> <target>English</target> diff --git a/webapp/src/i18n/messages.fr.xlf b/webapp/src/i18n/messages.fr.xlf index ed0f33a95593ac302bd288273272fa49b0edcc8a..3c98bfbd7786ecae0a0802924d90cf136cbc604a 100644 --- a/webapp/src/i18n/messages.fr.xlf +++ b/webapp/src/i18n/messages.fr.xlf @@ -30,6 +30,14 @@ <source>Contact Us</source> <target>Nous contacter</target> </trans-unit> + <trans-unit id="footer.metropole.site" datatype="html"> + <source>A Lyon Metropolis website</source> + <target>Un site de la métrople de Lyon</target> + </trans-unit> + <trans-unit id="footer.metropole.site.title" datatype="html"> + <source>Access the Lyon Metropolis website (new window)</source> + <target>Accéder au site de la Métropole de Lyon (nouvelle fenêtre)</target> + </trans-unit> <trans-unit id="header.logoEnglish" datatype="html"> <source>English</source> <target>Anglais</target>