From f9af066333a92776ff27d443063f5673243e653f Mon Sep 17 00:00:00 2001 From: Vivian Phung Date: Mon, 26 Feb 2024 17:45:51 -0500 Subject: [PATCH] merge conflict and env.example --- packages/frontend/.env.example | 3 +- packages/frontend/public/index.html | 31 ++++++++++++++------- packages/frontend/public/site.webmanifest | 34 +++++++++++------------ packages/frontend/src/index.css | 2 +- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/packages/frontend/.env.example b/packages/frontend/.env.example index ed25da52..06d048c4 100644 --- a/packages/frontend/.env.example +++ b/packages/frontend/.env.example @@ -1,6 +1,7 @@ REACT_APP_SERVER_URL = 'http://localhost:8000' REACT_APP_GITHUB_CLIENT_ID = -REACT_APP_GITHUB_TEMPLATE_REPO = +REACT_APP_GITHUB_PWA_TEMPLATE_REPO = +REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = REACT_APP_WALLET_CONNECT_ID = \ No newline at end of file diff --git a/packages/frontend/public/index.html b/packages/frontend/public/index.html index 271ccc60..dcd5ded0 100644 --- a/packages/frontend/public/index.html +++ b/packages/frontend/public/index.html @@ -3,18 +3,29 @@ - + - - - - - - + + + + + + Snowball diff --git a/packages/frontend/public/site.webmanifest b/packages/frontend/public/site.webmanifest index fd691d95..930233c3 100644 --- a/packages/frontend/public/site.webmanifest +++ b/packages/frontend/public/site.webmanifest @@ -1,19 +1,19 @@ { - "name": "Snowball Tools Dashboard", - "short_name": "snowball tools", - "icons": [ - { - "src": "/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/android-chrome-512x512.png", - "sizes": "512x512", - "type": "image/png" - } - ], - "theme_color": "#ffffff", - "background_color": "#ffffff", - "display": "standalone" + "name": "Snowball Tools Dashboard", + "short_name": "snowball tools", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" } diff --git a/packages/frontend/src/index.css b/packages/frontend/src/index.css index 5f6197b6..c1375286 100644 --- a/packages/frontend/src/index.css +++ b/packages/frontend/src/index.css @@ -6,4 +6,4 @@ .focus-ring { @apply focus-visible:ring-[3px] focus-visible:ring-snowball-200 focus-visible:ring-offset-1 focus-visible:ring-offset-snowball-500 focus-visible:outline-none; } -} \ No newline at end of file +}