Skip to content

Commit a0025ed

Browse files
barshathakuribarshathakuri
committed
chore(mapswipe-deployment): Update environment variables
1 parent 608baa0 commit a0025ed

File tree

4 files changed

+48
-55
lines changed

4 files changed

+48
-55
lines changed

‎.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

‎Dockerfile‎

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,44 +19,41 @@ COPY ./package.json ./yarn.lock /code/
1919
RUN yarn install
2020
COPY . /code/
2121

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
22+
ENV VITE_FIREBASE_API_KEY=12
23+
ENV VITE_FIREBASE_AUTH_DOMAIN=1234
24+
ENV VITE_FIREBASE_DATABASE_URL=https://mapswipe.org
25+
ENV VITE_FIREBASE_PROJECT_ID=1235
26+
ENV VITE_FIREBASE_STORAGE_BUCKET=1245
27+
ENV VITE_FIREBASE_MESSAGING_SENDER_ID=124
28+
ENV VITE_FIREBASE_APP_ID=134
29+
ENV VITE_COMMUNITY_DASHBOARD_URL=https://mapswipe.org
30+
31+
ENV VITE_FIREBASE_MEASUREMENT_ID=
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

@@ -68,7 +65,6 @@ FROM ghcr.io/toggle-corp/web-app-serve:v0.1.2 AS web-app-serve
6865
LABEL org.opencontainers.image.source="github.com/mapswipe/mapswipe-web"
6966
LABEL org.opencontainers.image.authors="[email protected]"
7067

71-
7268
# Env for apply-config script
7369
ENV APPLY_CONFIG__SOURCE_DIRECTORY=/code/build/
7470

‎env.ts‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,21 @@ 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(),
33-
VITE_APP_LOGO: Schema.string.optional(),
28+
VITE_BASE_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
29+
VITE_IMPRINT_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
30+
VITE_APP_NAME: Schema.string.optional(),
31+
VITE_APP_ATTRIBUTION_TITLE: Schema.string.optional(),
32+
VITE_APP_ATTRIBUTION_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
33+
VITE_APP_WEBSITE_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
34+
VITE_APP_LOG: Schema.string.optional(),
3435
VITE_PROJECTS_FALLBACK_IMAGE: Schema.string.optional(),
3536
VITE_ALLOW_UNVERIFIED_USERS: Schema.string.optional(),
3637

@@ -48,12 +49,7 @@ export default defineConfig({
4849
VITE_THEME_LIGHT_SUCCESS: Schema.string.optional(),
4950
VITE_THEME_LIGHT_NEUTRAL: Schema.string.optional(),
5051

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(),
52+
VITE_COMMUNITY_DASHBOARD_URL: Schema.string({ format: 'url', protocol: true, tld: false }),
5753

5854
VITE_MAPILLARY_API_KEY: Schema.string.optional(),
5955
},

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
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",
22+
"@julr/vite-plugin-validate-env": "git+https://github.com/toggle-corp/vite-plugin-validate-env#v2.2.0-tc.1",
2323
"base-64": "^1.0.0",
2424
"firebase": "^11.8.1",
2525
"mapillary-js": "^4.1.2",
@@ -64,5 +64,6 @@
6464
"vite": "^6.3.5",
6565
"vitest": "^3.1.4",
6666
"vue-tsc": "^2.2.10"
67-
}
67+
},
68+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
6869
}

0 commit comments

Comments
 (0)