diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ceac6a17c..36102b907 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,7 +26,7 @@ resources: type: github name: Safelite/AzureDevOps endpoint: Safelite - ref: DigitalConsumer + ref: DigitalConsumer #refs/tags/t5.3.4 variables: - group: Digital-Infrastructure @@ -45,7 +45,7 @@ stages: summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml # Dev Build/Deploy - - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - ${{ else }}: - stage: Dev variables: - group: FixMyGlassDev diff --git a/src/App.vue b/src/App.vue index b2e017e53..40ae758d2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,5 +12,4 @@ export default { components: { } -} diff --git a/src/utilities/component-loader.js b/src/router/dynamic-routing/component-loader.js similarity index 100% rename from src/utilities/component-loader.js rename to src/router/dynamic-routing/component-loader.js diff --git a/src/utilities/route-compile.js b/src/router/dynamic-routing/route-compile.js similarity index 90% rename from src/utilities/route-compile.js rename to src/router/dynamic-routing/route-compile.js index 42a0d9498..ab2088ff0 100644 --- a/src/utilities/route-compile.js +++ b/src/router/dynamic-routing/route-compile.js @@ -1,10 +1,11 @@ import axios from "axios"; -import { lazyLoadComponent } from "@/utilities/component-loader.js"; +import { lazyLoadComponent } from "@/router/dyanmic-routing/component-loader.js"; export function getRouteData(relativeUrl) { return axios .get("https://mockey.qa.sagaws.net/service/content/sitemap" + relativeUrl) .then((response) => { + // This is really only for Mockey. In a real case, this would just be a 404 and we would check status code. if (response.data.Result === undefined) { return Promise.reject("Could not find any details about given route."); diff --git a/src/router/index.js b/src/router/index.js index 265d7b2c0..edf6f8ab9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,5 +1,5 @@ import { createWebHistory, createRouter } from "vue-router"; -import { getRouteData } from "@/utilities/route-compile.js"; +import { getRouteData } from "@/router/dynamic-routing/route-compile.js"; import NotFound from "@/layouts/NotFound.vue"; import Home from "@/layouts/Home.vue"; diff --git a/vue.config.js b/vue.config.js index e69de29bb..8e5d9a4ce 100644 --- a/vue.config.js +++ b/vue.config.js @@ -0,0 +1,13 @@ +module.exports = { + publicPath: '/', + devServer: { + port: 8080, + proxy: { + 'api/v1/content*':{ + target: 'https://localhost:44360/', + ws: false, + changeOrigin: true + } + } + } +} \ No newline at end of file