Skip to content

Commit 7658808

Browse files
barshathakurifrozenhelium
barshathakuri
authored and
frozenhelium
committed
chore(mapswipe-deployment): Update environment variables
1 parent cb847d9 commit 7658808

File tree

9 files changed

+58
-70
lines changed

9 files changed

+58
-70
lines changed

‎.env‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
VITE_BASE_URL='https://mapswipe.org/privacy'
1+
VITE_BASE_URL=
22
VITE_PRIVACY_POLICY_URL='https://mapswipe.org/privacy/'
3-
VITE_IMPRINT_URL="https://mapswipe.org/privacy/"
3+
VITE_IMPRINT_URL=
44
VITE_APP_LOGO='./img/mapswipe-white.svg'
55
VITE_PROJECTS_FALLBACK_IMAGE="./img/map-pin-600x400.jpg"
66
VITE_ALLOW_UNVERIFIED_USERS=true
@@ -24,5 +24,5 @@ VITE_THEME_LIGHT_NEUTRAL="#272727"
2424
# App Attribution
2525
VITE_APP_NAME="MapSwipe"
2626
VITE_APP_WEBSITE_URL="https://mapswipe.org"
27-
VITE_APP_ATTRIBUTION_TITLE="MapSwipe"
28-
VITE_APP_ATTRIBUTION_URL="https://mapswipe.org/privacy/"
27+
VITE_APP_ATTRIBUTION_TITLE=
28+
VITE_APP_ATTRIBUTION_URL=

‎.github/workflows/publish-web-app-serve.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- develop
8-
- feature/alpha-deployment
8+
- feature/mapswipe-deployment
99

1010
permissions:
1111
packages: write

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ logs
44
npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
7-
yarn-debug.log*
7+
pnpm-debug.log*
88
lerna-debug.log*
99

1010
node_modules

‎Dockerfile‎

Lines changed: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ FROM node:22-bullseye AS dev
55
RUN apt-get update -y \
66
&& apt-get install -y --no-install-recommends git \
77
&& rm -rf /var/lib/apt/lists/* \
8-
# NOTE: yarn > 1.22.19 breaks yarn-install invoked by yarn
9-
&& npm install -g [email protected] [email protected] --force \
8+
&& npm install -g [email protected] --force \
109
&& git config --global --add safe.directory /code
1110

1211
WORKDIR /code
@@ -19,61 +18,53 @@ COPY ./package.json ./yarn.lock /code/
1918
RUN yarn install
2019
COPY . /code/
2120

22-
ENV VITE_FIREBASE_API_KEY=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_API_KEY
23-
ENV VITE_FIREBASE_AUTH_DOMAIN=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_AUTH_DOMAIN
24-
ENV VITE_FIREBASE_DATABASE_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_DATABASE_URL
25-
ENV VITE_FIREBASE_PROJECT_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_PROJECT_ID
26-
ENV VITE_FIREBASE_STORAGE_BUCKET=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_STORAGE_BUCKET
27-
ENV VITE_FIREBASE_MESSAGING_SENDER_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_MESSAGING_SENDER_ID
28-
ENV VITE_FIREBASE_APP_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_APP_ID
29-
ENV VITE_FIREBASE_MEASUREMENT_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_MEASUREMENT_ID
30-
31-
ENV VITE_COMMUNITY_DASHBOARD_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_COMMUNITY_DASHBOARD_URL
32-
ENV VITE_BASE_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_BASE_URL
33-
ENV VITE_PRIVACY_POLICY_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_PRIVACY_POLICY_URL
34-
ENV VITE_IMPRINT_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_IMPRINT_URL
35-
36-
ENV VITE_APP_LOGO=WEB_APP_SERVE_PLACEHOLDER__VITE_APP_LOGO
37-
ENV VITE_PROJECTS_FALLBACK_IMAGE=WEB_APP_SERVE_PLACEHOLDER__VITE_PROJECTS_FALLBACK_IMAGE
38-
ENV VITE_ALLOW_UNVERIFIED_USERS=WEB_APP_SERVE_PLACEHOLDER__VITE_ALLOW_UNVERIFIED_USERS
39-
40-
# Locales
41-
ENV VITE_DEFAULT_LOCALE=WEB_APP_SERVE_PLACEHOLDER__VITE_DEFAULT_LOCALE
42-
ENV VITE_FALLBACK_LOCALE=WEB_APP_SERVE_PLACEHOLDER__VITE_FALLBACK_LOCALE
43-
ENV VITE_SUPPORTED_LOCALES=WEB_APP_SERVE_PLACEHOLDER__VITE_SUPPORTED_LOCALES
44-
45-
# Theme
46-
ENV VITE_THEME_LIGHT_PRIMARY=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_PRIMARY
47-
ENV VITE_THEME_LIGHT_SECONDARY=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_SECONDARY
48-
ENV VITE_THEME_LIGHT_TERTIARY=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_TERTIARY
49-
ENV VITE_THEME_LIGHT_ACCENT=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_ACCENT
50-
ENV VITE_THEME_LIGHT_ERROR=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_ERROR
51-
ENV VITE_THEME_LIGHT_WARNING=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_WARNING
52-
ENV VITE_THEME_LIGHT_INFO=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_INFO
53-
ENV VITE_THEME_LIGHT_SUCCESS=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_SUCCESS
54-
ENV VITE_THEME_LIGHT_NEUTRAL=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_NEUTRAL
55-
56-
ENV VITE_APP_NAME=WEB_APP_SERVE_PLACEHOLDER__VITE_APP_NAME
57-
ENV VITE_APP_WEBSITE_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_APP_WEBSITE_URL
58-
ENV VITE_APP_ATTRIBUTION_TITLE=WEB_APP_SERVE_PLACEHOLDER__VITE_APP_ATTRIBUTION_TITLE
59-
ENV VITE_APP_ATTRIBUTION_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_APP_ATTRIBUTION_URL
21+
ENV VITE_FIREBASE_API_KEY=ExampleF1rebaseAP1k3y
22+
ENV VITE_FIREBASE_AUTH_DOMAIN=example-key.firebaseapp.com
23+
ENV VITE_FIREBASE_DATABASE_URL=https://example-database.firebaseio.com
24+
ENV VITE_FIREBASE_PROJECT_ID=example
25+
ENV VITE_FIREBASE_STORAGE_BUCKET=example.appspot.com
26+
ENV VITE_FIREBASE_MESSAGING_SENDER_ID=123123456123
27+
ENV VITE_FIREBASE_APP_ID=1:23456789:web:1abc234def567
28+
ENV VITE_COMMUNITY_DASHBOARD_URL=https://mapswipe.org
29+
30+
ENV VITE_FIREBASE_MEASUREMENT_ID=
31+
ENV VITE_MAPILLARY_API_KEY=
32+
ENV VITE_BASE_URL=https://mapswipe.org/privacy
33+
ENV VITE_PRIVACY_POLICY_URL=https://mapswipe.org/privacy/
34+
ENV VITE_IMPRINT_URL=https://mapswipe.org/privacy/
35+
ENV VITE_APP_LOGO=./img/mapswipe-white.svg
36+
ENV VITE_PROJECTS_FALLBACK_IMAGE=./img/map-pin-600x400.jpg
37+
ENV VITE_ALLOW_UNVERIFIED_USERS=true
38+
39+
ENV VITE_DEFAULT_LOCALE=en
40+
ENV VITE_FALLBACK_LOCALE=en
41+
ENV VITE_SUPPORTED_LOCALES=en,de,fr
42+
43+
ENV VITE_THEME_LIGHT_PRIMARY=#060E2F
44+
ENV VITE_THEME_LIGHT_SECONDARY=#0D1949
45+
ENV VITE_THEME_LIGHT_TERTIARY=#EEF2FB
46+
ENV VITE_THEME_LIGHT_ACCENT=#589AE3
47+
ENV VITE_THEME_LIGHT_ERROR=#C62828
48+
ENV VITE_THEME_LIGHT_WARNING=#8E0000
49+
ENV VITE_THEME_LIGHT_INFO=#2196f3
50+
ENV VITE_THEME_LIGHT_SUCCESS=#4caf50
51+
ENV VITE_THEME_LIGHT_NEUTRAL=#272727
52+
53+
ENV VITE_APP_NAME=MapSwipe
54+
ENV VITE_APP_WEBSITE_URL=https://mapswipe.org
55+
ENV VITE_APP_ATTRIBUTION_TITLE=MapSwipe
56+
ENV VITE_APP_ATTRIBUTION_URL=https://mapswipe.org/privacy/
6057

6158
RUN WEB_APP_SERVE_ENABLED=true yarn build-only --outDir=/code/build
6259

63-
# FROM web-app-serve AS web-app-serve-example
64-
65-
# LABEL maintainer="Togglecorp"
6660
FROM ghcr.io/toggle-corp/web-app-serve:v0.1.2 AS web-app-serve
6761

6862
LABEL org.opencontainers.image.source="github.com/mapswipe/mapswipe-web"
6963
LABEL org.opencontainers.image.authors="[email protected]"
7064

71-
72-
# Env for apply-config script
7365
ENV APPLY_CONFIG__SOURCE_DIRECTORY=/code/build/
7466

7567
COPY ./web-app-serve/web-app-apply-config.sh /code/
7668
ENV APPLY_CONFIG__APPLY_CONFIG_PATH=/code/web-app-apply-config.sh
77-
RUN ls /code/
7869

7970
COPY --from=web-app-serve-build /code/build "$APPLY_CONFIG__SOURCE_DIRECTORY"

‎env.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference types="vite/client" />

‎env.ts‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,24 @@ export default defineConfig({
1717
overrideDefine,
1818
validator: 'builtin',
1919
schema: {
20-
// NOTE: These are the dynamic env variables
2120
VITE_FIREBASE_API_KEY: Schema.string.optional(),
2221
VITE_FIREBASE_AUTH_DOMAIN: Schema.string.optional(),
23-
VITE_FIREBASE_DATABASE_URL: Schema.string.optional(),
22+
VITE_FIREBASE_DATABASE_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
2423
VITE_FIREBASE_PROJECT_ID: Schema.string.optional(),
2524
VITE_FIREBASE_STORAGE_BUCKET: Schema.string.optional(),
2625
VITE_FIREBASE_MESSAGING_SENDER_ID: Schema.string.optional(),
2726
VITE_FIREBASE_APP_ID: Schema.string.optional(),
2827
VITE_FIREBASE_MEASUREMENT_ID: Schema.string.optional(),
29-
30-
VITE_BASE_URL: Schema.string.optional(),
31-
VITE_PRIVACY_POLICY_URL: Schema.string.optional(),
32-
VITE_IMPRINT_URL: Schema.string.optional(),
28+
VITE_BASE_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
29+
VITE_PRIVACY_POLICY_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
30+
VITE_IMPRINT_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
31+
VITE_APP_NAME: Schema.string.optional(),
32+
VITE_APP_ATTRIBUTION_TITLE: Schema.string.optional(),
33+
VITE_APP_ATTRIBUTION_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
34+
VITE_APP_WEBSITE_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
3335
VITE_APP_LOGO: Schema.string.optional(),
3436
VITE_PROJECTS_FALLBACK_IMAGE: Schema.string.optional(),
35-
VITE_ALLOW_UNVERIFIED_USERS: Schema.string.optional(),
37+
VITE_ALLOW_UNVERIFIED_USERS: Schema.boolean(),
3638

3739
VITE_DEFAULT_LOCALE: Schema.string.optional(),
3840
VITE_FALLBACK_LOCALE: Schema.string.optional(),
@@ -48,12 +50,7 @@ export default defineConfig({
4850
VITE_THEME_LIGHT_SUCCESS: Schema.string.optional(),
4951
VITE_THEME_LIGHT_NEUTRAL: Schema.string.optional(),
5052

51-
VITE_APP_NAME: Schema.string(),
52-
VITE_APP_WEBSITE_URL: Schema.string.optional(),
53-
VITE_APP_ATTRIBUTION_TITLE: Schema.string.optional(),
54-
VITE_APP_ATTRIBUTION_URL: Schema.string.optional(),
55-
56-
VITE_COMMUNITY_DASHBOARD_URL: Schema.string.optional(),
53+
VITE_COMMUNITY_DASHBOARD_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
5754

5855
VITE_MAPILLARY_API_KEY: Schema.string.optional(),
5956
},

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"@intlify/unplugin-vue-i18n": "^6.0.8",
2020
"@togglecorp/fujs": "^2.2.0",
2121
"@turf/bbox": "^7.2.0",
22-
"@julr/vite-plugin-validate-env": "github:toggle-corp/vite-plugin-validate-env#v2.2.0-tc.1",
2322
"base-64": "^1.0.0",
2423
"firebase": "^11.8.1",
2524
"mapillary-js": "^4.1.2",

‎web-app-serve/.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ build/
1111
generated/
1212
coverage/
1313
stats.html
14-
.env
15-
.env
14+
.env

‎web-app-serve/web-app-apply-config.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -xe
44

55
while IFS='=' read -r KEY VALUE; do
6-
# FIXME: If js and value is empty string, replace it with undefined?
7-
find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<WEB_APP_SERVE_PLACEHOLDER__$KEY\>|$VALUE|g" {} +
6+
REPLACEMENT="${VALUE:-undefined}"
7+
find "$DESTINATION_DIRECTORY" -type f \
8+
-exec sed -i "s|\<WEB_APP_SERVE_PLACEHOLDER__$KEY\>|$REPLACEMENT|g" {} +
89
done < <(env | grep '^VITE_')

0 commit comments

Comments
 (0)