From 5be5280baa5e16fe3aec04a9e70770f537a27009 Mon Sep 17 00:00:00 2001 From: Spencer Flagg Date: Mon, 13 Dec 2021 12:28:23 +0100 Subject: [PATCH] fucking hardcoding all the base urls --- fl-run.sh | 14 +++++++------- login/index.js | 4 ++-- nuxt.config.js | 8 ++++---- plugins/env.js | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fl-run.sh b/fl-run.sh index 041b594..5e26c71 100644 --- a/fl-run.sh +++ b/fl-run.sh @@ -1,17 +1,17 @@ -echo -e "\r\n\r\n\e[44m *** Removing Code Directory *** \e[44m\r\n" +echo -e "\r\n\r\n\e[44m *** Removing Code Directory *** \e[0m\r\n" rm -r /usr/src/flylocal-web -echo "\r\n\r\n\e[44m *** Making Code Directory *** \e[44m\r\n" +echo -e "\r\n\r\n\e[44m *** Making Code Directory *** \e[0m\r\n" mkdir -p /usr/src/flylocal-web cd /usr/src -echo "\r\n\r\n\e[44m *** Getting Code from Gitea *** \e[44m\r\n" +echo -e "\r\n\r\n\e[44m *** Getting Code from Gitea *** \e[0m\r\n" git clone --depth 1 https://gitea.flylocal.us/spencer/flylocal-web.git cd flylocal-web curl -O https://spencerflagg.com/temp/flylocal-env/dev/.env -echo "\r\n\r\n\e[44m *** Killing Docker Containers *** \e[44m\r\n" +echo -e "\r\n\r\n\e[44m *** Killing Docker Containers *** \e[0m\r\n" sudo docker kill $(docker ps -q) -echo "\r\n\r\n\e[44m *** Pruning Old Docker Images *** \e[44m\r\n" +echo -e "\r\n\r\n\e[44m *** Pruning Old Docker Images *** \e[0m\r\n" sudo docker system prune -echo "\r\n\r\n\e[44m *** Building New Docker Image *** \e[44m\r\n" +echo -e "\r\n\r\n\e[44m *** Building New Docker Image *** \e[0m\r\n" sudo docker build -t flylocal-web . -echo "\r\n\r\n\e[44m *** Running Docker Image *** \e[44m\r\n" +echo -e "\r\n\r\n\e[44m *** Running Docker Image *** \e[0m\r\n" sudo docker run -it -p 3000:3000 flylocal-web \ No newline at end of file diff --git a/login/index.js b/login/index.js index 0a81a92..bb75d1f 100644 --- a/login/index.js +++ b/login/index.js @@ -32,7 +32,7 @@ dotenv.config({ path: './.env' }); const portier = new PortierClient({ //broker: process.env.PORTIER_URL, - redirectUri: process.env.BASE_URL + "/login/verify", + redirectUri: 'https://flylocal.us' + "/login/verify", }); @@ -248,7 +248,7 @@ app.post("/verify", formParser, (req, res) => { portier.verify(req.body.id_token).then((email) => { - const redirectButton = (req.query.redirect && typeof req.query.redirect !== 'undefined') ? `back to your flight` : `back to the map`; + const redirectButton = (req.query.redirect && typeof req.query.redirect !== 'undefined') ? `back to your flight` : `back to the map`; // needed to string .cookie and .type together res.cookie('email', email, diff --git a/nuxt.config.js b/nuxt.config.js index fa9af48..20f102f 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -27,16 +27,16 @@ export default { { name: 'format-detection', content: 'telephone=no' }, { itemprop: 'name', content: 'Small Planes, Big Experiences' }, { itemprop: 'description', content: 'FlyLocal is the best way to find local airlines that fly throughout the great state of Alaska. Explore the \'Last Frontier\' with FlyLocal.' }, - { itemprop: 'image', content: process.env.BASE_URL + '/screenshot.png' }, - { property: 'og:url', content: process.env.BASE_URL }, + { itemprop: 'image', content: 'https://flylocal.us' + '/screenshot.png' }, + { property: 'og:url', content: 'https://flylocal.us' }, { property: 'og:type', content: 'website' }, { property: 'og:title', content: 'Small Planes, Big Experiences' }, { property: 'og:description', content: 'FlyLocal is the best way to find local airlines that fly throughout the great state of Alaska. Explore the \'Last Frontier\' with FlyLocal.' }, - { property: 'og:image', content: process.env.BASE_URL + '/screenshot.png' }, + { property: 'og:image', content: 'https://flylocal.us' + '/screenshot.png' }, { name: 'twitter:card', content: 'summary_large_image' }, { name: 'twitter:title', content: 'Small Planes, Big Experiences' }, { name: 'twitter:description', content: 'FlyLocal is the best way to find local airlines that fly throughout the great state of Alaska. Explore the \'Last Frontier\' with FlyLocal.' }, - { name: 'twitter:image', content: process.env.BASE_URL + '/screenshot.png' } + { name: 'twitter:image', content: 'https://flylocal.us' + '/screenshot.png' } ], link: [ { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' } diff --git a/plugins/env.js b/plugins/env.js index 5f1b9bd..f3a3c14 100644 --- a/plugins/env.js +++ b/plugins/env.js @@ -1,5 +1,5 @@ export default ({ app }, inject) => { // Inject $hello(msg) in Vue, context and store. - inject('BASE_URL', () => process.env.BASE_URL) + inject('BASE_URL', () => 'https://flylocal.us') inject('hello', msg => console.log(`Hello ${msg}!`)) }