diff --git a/components/Map.vue b/components/Map.vue
index 2c5cd47..16f91bf 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -442,7 +442,7 @@ export default {
} */
#map-wrap .marker-cluster-small {
- background-color: rgba(47, 151, 255, 0.9);
+ background-color: rgba(47, 151, 255, 0.5);
height: 30px !important;
width: 30px !important;
}
@@ -458,7 +458,7 @@ export default {
}
#map-wrap .marker-cluster-medium {
- background-color: rgba(47, 151, 255, 0.9);
+ background-color: rgba(47, 151, 255, 0.5);
}
#map-wrap .marker-cluster-medium div {
@@ -470,7 +470,7 @@ export default {
}
#map-wrap .marker-cluster-large {
- background-color: rgba(47, 151, 255, 0.9);
+ background-color: rgba(47, 151, 255, 0.5);
height: 50px !important;
width: 50px !important;
}
diff --git a/fl-run.sh b/fl-run.sh
index 09aa7be..041b594 100644
--- a/fl-run.sh
+++ b/fl-run.sh
@@ -6,6 +6,7 @@ cd /usr/src
echo "\r\n\r\n\e[44m *** Getting Code from Gitea *** \e[44m\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"
sudo docker kill $(docker ps -q)
echo "\r\n\r\n\e[44m *** Pruning Old Docker Images *** \e[44m\r\n"
diff --git a/login/index.js b/login/index.js
index 61165a6..316f52d 100644
--- a/login/index.js
+++ b/login/index.js
@@ -11,9 +11,9 @@ const cookieParser = require('cookie-parser');
const baseURL = function () {
switch (process.env.FLYLOCAL_ENV) {
case "prod":
- return process.env.PROD_ENV;
+ return process.env.PROD_URL;
case "dev":
- return process.env.DEV_ENV;
+ return process.env.DEV_URL;
case "local":
return "http://" + process.env.LOCAL_IP + ":" + process.env.LOCAL_PORT;
default:
@@ -223,6 +223,9 @@ app.get("/", (req, res) => {
});
app.post("/auth", formParser, (req, res) => {
+
+ console.log(baseURL());
+
//console.log(req.body);
portier.authenticate(req.body.email).then((authUrl) => {
if (req.body.redirect && typeof req.body.redirect !== 'undefined') {
@@ -236,6 +239,8 @@ app.post("/auth", formParser, (req, res) => {
app.post("/verify", formParser, (req, res) => {
//console.log(req.body);
+ console.log(baseURL());
+
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`;
diff --git a/plugins/env.js b/plugins/env.js
index 9d778ef..50d5057 100644
--- a/plugins/env.js
+++ b/plugins/env.js
@@ -1,9 +1,9 @@
const BASE_URL = function () {
switch (process.env.FLYLOCAL_ENV) {
case "prod":
- return process.env.PROD_ENV;
+ return process.env.PROD_URL;
case "dev":
- return process.env.DEV_ENV;
+ return process.env.DEV_URL;
case "local":
return "http://" + process.env.LOCAL_IP + ":" + process.env.LOCAL_PORT;
default: