Compare commits

..

No commits in common. "7fe8414b978df83fb07e54574c28bed4d9f0f9a6" and "354a3ac83f841be7e86edf3943569d09043309fe" have entirely different histories.

2 changed files with 13 additions and 12 deletions

View File

@ -1,7 +1,7 @@
--- ---
kind: pipeline kind: pipeline
type: ssh type: ssh
name: Metiers du patrimoine | Déploiment du Thème en production name: Metiers du patrimoine | Déploiment du Thème
clone: clone:
disable: true disable: true
@ -18,6 +18,8 @@ steps:
- name: Clonage du Repo - name: Clonage du Repo
commands: commands:
- git clone https://git.deligraph.be/Antoine/Metiers_du_patrimoine_theme.git - git clone https://git.deligraph.be/Antoine/Metiers_du_patrimoine_theme.git
- git clone https://git.deligraph.be/Antoine/homegrade_theme_production.git
- mv homegrade_theme_production Homegrade_Theme
- name: Installation du package - name: Installation du package
commands: commands:
- cd Metiers_du_patrimoine_theme - cd Metiers_du_patrimoine_theme
@ -26,10 +28,10 @@ steps:
commands: commands:
- cd Metiers_du_patrimoine_theme - cd Metiers_du_patrimoine_theme
- npm run production - npm run production
- name: Déploiement sur le serveur de production - name: Déploiement sur le serveur de dev
environment: environment:
PROD_SERVER_PATH: DEV_SERVER_PATH:
from_secret: prod_server_path from_secret: dev_server_path
commands: commands:
- cd Metiers_du_patrimoine_theme - cd Metiers_du_patrimoine_theme
- rsync -avhp -e 'ssh' ./ $PROD_SERVER_PATH:~/public_html/wp-content/themes/Metiers_du_patrimoine_test --delete --exclude 'node_modules' --exclude 'Makefile' --exclude '.git' --exclude '.env' --exclude '.env_prod' --exclude '.env_dev' - rsync -avhp -e 'ssh -p 1982' ./ $DEV_SERVER_PATH:~/homegrade-network/wordpress/wp-content/themes/Metiers_du_patrimoine --delete --exclude 'node_modules' --exclude 'Makefile' --exclude '.git' --exclude '.env' --exclude '.env_prod' --exclude '.env_dev'

View File

@ -1,18 +1,17 @@
<?php <?php
$postID = $args['post_ID'];
// global $post; // global $post;
// $post = get_post($postID); $postID = $args['post_ID'];
// $post_name = $post->post_name; $post = get_post($postID);
$post_name = get_post_field('post_name', $postID);
$current_lang = apply_filters('wpml_current_language', null); $current_lang = apply_filters('wpml_current_language', null);
$post_thumbnail = get_the_post_thumbnail($postID, 'full', array('class' => 'card-artisans__thumbnail card-post__thumbnail')) ?? null; $post_thumbnail = get_the_post_thumbnail($postID, 'full', array('class' => 'card-artisans__thumbnail card-post__thumbnail')) ?? null;
$postDefautlThumbnail = get_stylesheet_directory_uri() . '/resources/img/illustrations/Homegrade_resultats-filtres.svg'; $postDefautlThumbnail = get_stylesheet_directory_uri() . '/resources/img/illustrations/Homegrade_resultats-filtres.svg';
$post_title = $args['post_title']; $post_title = $args['post_title'];
$post_permalink = get_the_permalink($postID); $post_permalink = get_the_permalink($postID);
$artisans_clean_url = get_home_url(null, '/') . 'artisans/' . $post_name; $artisans_clean_url = get_home_url(null, '/') . 'artisans/' . $post->post_name;
$company_members = get_field('company_members', $postID); $company_members = get_field('company_members', $postID);
$currentTaxonomy = $args['current_taxonomy']; $currentTaxonomy = $args['current_taxonomy'];
@ -29,7 +28,7 @@ $email = get_field('email', $postID);
$website = get_field('website', $postID); $website = get_field('website', $postID);
$adresse = get_field('adresse', $postID); $adresse = get_field('adresse', $postID);
$translated_city = isset($adresse['city']) ? translate_city_name($adresse['city'], $current_lang) : ''; $translated_city = translate_city_name($adresse['city'], $current_lang);
$cover_image = get_field('artisan_cover', $postID); $cover_image = get_field('artisan_cover', $postID);
@ -67,7 +66,7 @@ $cover_image = get_field('artisan_cover', $postID);
<?php if ($adresse): ?> <?php if ($adresse): ?>
<p class="card-artisans__adresse"> <p class="card-artisans__adresse">
<?= ($adresse['post_code'] ?? '') . ' ' . ($translated_city) ?> <?= ($adresse['post_code'] ?? '') . ' ' . ($adresse['city'] ?? '') ?>
</p> </p>
<?php endif; ?> <?php endif; ?>