Skip to content

make both fw-child/apps/app-download.php and app-map.php to have only code as differences #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renoirb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

make both fw-child/apps/app-download.php and app-map.php to have only code as differences #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions fw-child/apps/app-download.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* Template Name: Download app
* Template Name: fw-child/apps/app-download.php
*
* To ensure the download React app loads correctly without any JavaScript or CSS conflicts
* To ensure the app loads correctly without any JavaScript or CSS conflicts
* with the theme's assets, a custom WP page template was created instead of using
* a builder template.
*
Expand All @@ -13,7 +13,7 @@
$assets = cdc_app_asset_load( 'download' );

if ( ! is_array( $assets ) || empty( $assets ) ) {
wp_die( 'Error: could not load the download app!' );
wp_die( 'Error: could not load the app!' );
}

// Initialize current language.
Expand All @@ -34,8 +34,8 @@
];

$locale_data = cdc_extract_locale_data( 'react-apps', get_locale() );
?>

?>
<!DOCTYPE html>
<html lang="<?php echo esc_attr( $current_lang ); ?>">
<head>
Expand All @@ -48,7 +48,7 @@
// Add favicon.
add_favicon();

// Load the translation data for the download app
// Load the translation data for the app
if ( count( $locale_data ) ) {
?>
<script src="<?php echo esc_url( get_site_url() . '/wp-includes/js/dist/hooks.min.js' ); ?>"></script>
Expand All @@ -64,13 +64,13 @@
?>

<script>
// DATA URL for the download app
// DATA URL for the app
window.DATA_URL = '<?php echo isset( $GLOBALS['vars']['data_url'] ) ? htmlspecialchars( $GLOBALS['vars']['data_url'], ENT_QUOTES, 'UTF-8' ) : ''; ?>';

// Disable Leaflet's 3D features
L_DISABLE_3D = true;

// WP AJAX URL for the download app
// WP AJAX URL for the app
window.wpAjaxUrl = '<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>';
</script>

Expand Down
16 changes: 8 additions & 8 deletions fw-child/apps/app-map.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* Template Name: Map app
* Template Name: fw-child/apps/app-map.php
*
* To ensure the map React app loads correctly without any JavaScript or CSS conflicts
* To ensure the app loads correctly without any JavaScript or CSS conflicts
* with the theme's assets, a custom WP page template was created instead of using
* a builder template.
*
Expand All @@ -13,7 +13,7 @@
$assets = cdc_app_asset_load( 'map' );

if ( ! is_array( $assets ) || empty( $assets ) ) {
wp_die( 'Error: could not load the map app!' );
wp_die( 'Error: could not load the app!' );
}

// Initialize current language.
Expand Down Expand Up @@ -44,8 +44,8 @@
];

$locale_data = cdc_extract_locale_data( 'react-apps', get_locale() );
?>

?>
<!DOCTYPE html>
<html lang="<?php echo esc_attr( $current_lang ); ?>">
<head>
Expand All @@ -58,7 +58,7 @@
// Add favicon.
add_favicon();

// Load the translation data for the map app
// Load the translation data for the app
if ( count( $locale_data ) ) {
?>
<script src="<?php echo esc_url( get_site_url() . '/wp-includes/js/dist/hooks.min.js' ); ?>"></script>
Expand All @@ -74,16 +74,16 @@
?>

<script>
// URL encoder salt for the map app
// URL encoder salt for the app
window.URL_ENCODER_SALT = '<?php echo isset( $GLOBALS['vars']['url_encoder_salt'] ) ? htmlspecialchars( $GLOBALS['vars']['url_encoder_salt'], ENT_QUOTES, 'UTF-8' ) : ''; ?>';

// DATA URL for the map app
// DATA URL for the app
window.DATA_URL = '<?php echo isset( $GLOBALS['vars']['data_url'] ) ? htmlspecialchars( $GLOBALS['vars']['data_url'], ENT_QUOTES, 'UTF-8' ) : ''; ?>';

// Disable Leaflet's 3D features
L_DISABLE_3D = true;

// WP AJAX URL for the map app
// WP AJAX URL for the app
window.wpAjaxUrl = '<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>';
</script>

Expand Down