From 4427fa916ece46f03423cb1e740dabafb34015ae Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Mon, 11 Sep 2017 20:54:02 -0300 Subject: [PATCH] Fix manifest path. --- app/controllers/App.php | 2 +- app/helpers.php | 11 ++++++++--- package.json | 1 + resources/views/front-page.blade.php | 4 ++-- resources/views/page-catalog.blade.php | 4 ++-- resources/views/partials/footer.blade.php | 2 +- webpack.mix.js | 10 ++++++++++ yarn.lock | 13 ++++++++++++- 8 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app/controllers/App.php b/app/controllers/App.php index ef82d2d..419d5ce 100644 --- a/app/controllers/App.php +++ b/app/controllers/App.php @@ -12,7 +12,7 @@ class App extends Controller if (has_custom_logo()) { return wp_get_attachment_image($custom_logo_id, 'original'); } else { - return file_get_contents(get_theme_file_path() . '/dist/' . svg_path('images/logo.svg')); + return file_get_contents(get_theme_file_path() . '/dist/' . asset_dir('images/logo.svg')); } } diff --git a/app/helpers.php b/app/helpers.php index 442f2f3..b89c869 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -76,16 +76,16 @@ function template_path($file, $data = []) */ function asset_path($asset) { - return sage('assets')->getUri($asset); + return fix_path(sage('assets')->getUri('/' . $asset)); } /** * @param $asset * @return string */ -function svg_path($asset) +function asset_dir($asset) { - return sage('assets')->get($asset); + return fix_path(sage('assets')->get('/' . $asset)); } /** @@ -195,3 +195,8 @@ function contact_form_submission() } return false; } + +function fix_path($path) +{ + return str_replace('/dist//', '/dist/', $path); +} diff --git a/package.json b/package.json index c35f4b3..5da3e4c 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "devDependencies": { "browser-sync": "^2.18.13", "browser-sync-webpack-plugin": "^1.2.0", + "cross-env": "*", "eslint": "~4.2", "eslint-loader": "~1.9", "eslint-plugin-import": "~2.7", diff --git a/resources/views/front-page.blade.php b/resources/views/front-page.blade.php index f4090b5..00730cf 100644 --- a/resources/views/front-page.blade.php +++ b/resources/views/front-page.blade.php @@ -29,12 +29,12 @@ @if($previous_page) @endif @if($next_page <= $catalog_data['pages']) @endif diff --git a/resources/views/page-catalog.blade.php b/resources/views/page-catalog.blade.php index fbb9baa..8a65c8f 100644 --- a/resources/views/page-catalog.blade.php +++ b/resources/views/page-catalog.blade.php @@ -50,7 +50,7 @@ @if($catalog_data['pages'] > 1) @endif diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php index c4d04f4..6aedce9 100644 --- a/resources/views/partials/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -31,7 +31,7 @@
- @php(include get_theme_file_path() . '/dist/' . Aldine\svg_path('images/pb.svg')) + @php(include get_theme_file_path() . '/dist/' . Aldine\asset_dir('images/pb.svg'))

{!! sprintf(__('Powered by %s', 'aldine'), 'Pressbooks') !!}

    diff --git a/webpack.mix.js b/webpack.mix.js index abd1d0c..990c4eb 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -61,3 +61,13 @@ if (!mix.inProduction()) { if (mix.inProduction()) { mix.version(); } + +// Add Isotope support. +mix.webpackConfig({ + resolve: { + alias: { + 'masonry': 'masonry-layout', + 'isotope': 'isotope-layout', + }, + }, +}); diff --git a/yarn.lock b/yarn.lock index 0cdf20f..96c73b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1606,6 +1606,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-env@*: + version "5.0.5" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.5.tgz#4383d364d9660873dd185b398af3bfef5efffef3" + dependencies: + cross-spawn "^5.1.0" + is-windows "^1.0.0" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -1613,7 +1620,7 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1: +cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -3808,6 +3815,10 @@ is-valid-glob@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" +is-windows@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9" + is-zip@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-zip/-/is-zip-1.0.0.tgz#47b0a8ff4d38a76431ccfd99a8e15a4c86ba2325"