From 37e5c3ccb97578c772b84ebe958ae390cd9deff5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 May 2019 19:41:03 +0100 Subject: [PATCH 1/4] Make site link relative --- source/_partials/layout/navbar.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_partials/layout/navbar.html.twig b/source/_partials/layout/navbar.html.twig index 372e885c..fb66b371 100644 --- a/source/_partials/layout/navbar.html.twig +++ b/source/_partials/layout/navbar.html.twig @@ -2,7 +2,7 @@
From 039885f1b7eaf499258a5f09d3c6981625423116 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 May 2019 19:55:29 +0100 Subject: [PATCH 2/4] Use deploy URL --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 686bde72..eea8c4da 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ command = """ composer lint -- --dry-run yarn lint --fix-dry-run composer test -composer prod +composer prod -- --url ${DEPLOY_URL} yarn prod cp -R source/dist output_prod """ From c36476cd89faf0c0ff338039353b5978cd44b593 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 May 2019 19:57:07 +0100 Subject: [PATCH 3/4] Revert "Use deploy URL" This reverts commit 039885f1b7eaf499258a5f09d3c6981625423116. --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index eea8c4da..686bde72 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ command = """ composer lint -- --dry-run yarn lint --fix-dry-run composer test -composer prod -- --url ${DEPLOY_URL} +composer prod yarn prod cp -R source/dist output_prod """ From 3026cb8979299f7f799ef25de1672f512ba78d13 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 May 2019 19:57:23 +0100 Subject: [PATCH 4/4] Update both site URLs --- resources/js/components/Navbar.vue | 6 +----- source/_partials/layout/navbar.html.twig | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/resources/js/components/Navbar.vue b/resources/js/components/Navbar.vue index 9bf130db..b4fcd6ae 100644 --- a/resources/js/components/Navbar.vue +++ b/resources/js/components/Navbar.vue @@ -5,7 +5,7 @@