diff --git a/.github/workflows/deploy_app_dev.yaml b/.github/workflows/deploy_app_dev.yaml index c17d9165f..9e18b835e 100644 --- a/.github/workflows/deploy_app_dev.yaml +++ b/.github/workflows/deploy_app_dev.yaml @@ -5,9 +5,6 @@ on: branches: - main -env: - CROSSWORD_URL: https://e7b2896c65fabc0480edc6c0e.web.app - jobs: deploy-dev: runs-on: ubuntu-latest @@ -32,7 +29,7 @@ jobs: channel: beta flutter-version: 3.23.0-0.1.pre - run: flutter packages get - - run: flutter build web -t lib/main_development.dart --dart-define CROSSWORD_URL=${{ env.CROSSWORD_URL }} --dart-define RECAPTCHA_KEY=${{ secrets.RECAPTCHA_KEY }} --wasm + - run: flutter build web -t lib/main_development.dart --dart-define RECAPTCHA_KEY=${{ secrets.RECAPTCHA_KEY }} --wasm - name: Move build files to public folder run: | diff --git a/.github/workflows/deploy_app_prod.yaml b/.github/workflows/deploy_app_prod.yaml index 8c485d46a..c062f8b13 100644 --- a/.github/workflows/deploy_app_prod.yaml +++ b/.github/workflows/deploy_app_prod.yaml @@ -2,9 +2,6 @@ name: deploy_app_prod on: workflow_dispatch -env: - CROSSWORD_URL: https://crossword.withgoogle.com - jobs: deploy-dev: runs-on: ubuntu-latest @@ -29,7 +26,7 @@ jobs: channel: beta flutter-version: 3.23.0-0.1.pre - run: flutter packages get - - run: flutter build web -t lib/main_production.dart --dart-define CROSSWORD_URL=${{ env.CROSSWORD_URL }} --dart-define RECAPTCHA_KEY=${{ secrets.RECAPTCHA_KEY_PROD }} --wasm + - run: flutter build web -t lib/main_production.dart --dart-define RECAPTCHA_KEY=${{ secrets.RECAPTCHA_KEY_PROD }} --wasm - name: Move build files to public folder run: | diff --git a/.github/workflows/deploy_app_staging.yaml b/.github/workflows/deploy_app_staging.yaml index 10a1d8e30..9e00ed005 100644 --- a/.github/workflows/deploy_app_staging.yaml +++ b/.github/workflows/deploy_app_staging.yaml @@ -2,9 +2,6 @@ name: deploy_app_staging on: workflow_dispatch -env: - CROSSWORD_URL: https://stg-e7b2896c65fabc0480edc6c0e.web.app - jobs: deploy-dev: runs-on: ubuntu-latest @@ -29,7 +26,7 @@ jobs: channel: beta flutter-version: 3.23.0-0.1.pre - run: flutter packages get - - run: flutter build web -t lib/main_staging.dart --dart-define CROSSWORD_URL=${{ env.CROSSWORD_URL }} --dart-define RECAPTCHA_KEY=${{ secrets.RECAPTCHA_KEY }} --wasm + - run: flutter build web -t lib/main_staging.dart --dart-define RECAPTCHA_KEY=${{ secrets.RECAPTCHA_KEY }} --wasm - name: Move build files to public folder run: | diff --git a/README.md b/README.md index d2a30921c..ab515e6f6 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ This project has different entry points. - `main_local.dart` that targets a local api that should be run first (see how to do it [here][api_readme]). ```sh -$ flutter run -d chrome --target lib/main_local.dart --web-port 24514 --dart-define RECAPTCHA_KEY= --dart-define APPCHECK_DEBUG_TOKEN= --dart-define CROSSWORD_URL=https://crossword.withgoogle.com +$ flutter run -d chrome --target lib/main_local.dart --web-port 24514 --dart-define RECAPTCHA_KEY= --dart-define APPCHECK_DEBUG_TOKEN= ``` The specified web port is just an example that matches with the one set in the [helper script][start_api_script] to run the api. @@ -30,25 +30,25 @@ The specified web port is just an example that matches with the one set in the [ - `main_development.dart` that targets the dev api. ```sh -$ flutter run -d chrome --target lib/main_development.dart --dart-define RECAPTCHA_KEY= --dart-define APPCHECK_DEBUG_TOKEN= --dart-define CROSSWORD_URL=https://crossword.withgoogle.com +$ flutter run -d chrome --target lib/main_development.dart --dart-define RECAPTCHA_KEY= --dart-define APPCHECK_DEBUG_TOKEN= ``` - `main_debug.dart` that targets the dev api and adds a visual layer to debug the crossword sections, their position, fps and other items. ```sh -$ flutter run -d chrome --target lib/main_debug.dart --dart-define RECAPTCHA_KEY= --dart-define APPCHECK_DEBUG_TOKEN= --dart-define CROSSWORD_URL=https://crossword.withgoogle.com +$ flutter run -d chrome --target lib/main_debug.dart --dart-define RECAPTCHA_KEY= --dart-define APPCHECK_DEBUG_TOKEN= ``` - `main_staging.dart` that targets the staging api. ```sh -$ flutter run -d chrome --target lib/main_staging.dart --dart-define RECAPTCHA_KEY= --dart-define CROSSWORD_URL=https://crossword.withgoogle.com +$ flutter run -d chrome --target lib/main_staging.dart --dart-define RECAPTCHA_KEY= ``` - `main_production.dart` that targets the production api. ```sh -$ flutter run -d chrome --target lib/main_production.dart --dart-define RECAPTCHA_KEY= --dart-define CROSSWORD_URL=https://crossword.withgoogle.com +$ flutter run -d chrome --target lib/main_production.dart --dart-define RECAPTCHA_KEY= ``` _\*I/O Crossword works on Web._ diff --git a/lib/extensions/context_ext.dart b/lib/extensions/context_ext.dart index 443bb188b..5da70dee4 100644 --- a/lib/extensions/context_ext.dart +++ b/lib/extensions/context_ext.dart @@ -27,7 +27,7 @@ extension ContextExt on BuildContext { Future shareTwitter({required String shareUrl}) { final content = _encode([ - 'Check out IOCrossword #GoogleIO!', + 'Check out #IOCrossword built for Google I/O 2024!', shareUrl, ]); diff --git a/lib/project_details/link/project_details_links.dart b/lib/project_details/link/project_details_links.dart index ae4adc6a8..9d492f90d 100644 --- a/lib/project_details/link/project_details_links.dart +++ b/lib/project_details/link/project_details_links.dart @@ -6,10 +6,7 @@ class ProjectDetailsLinks { static const claimBadge = 'https://developers.google.com/profile/badges/events/io/2024/crossword/award'; static const googleAI = 'https://ai.google.dev/'; - static const crossword = String.fromEnvironment( - 'CROSSWORD_URL', - defaultValue: 'https://crossword.withgoogle.com', - ); + static const crossword = 'https://crossword.withgoogle.com'; static const developerPathway = 'https://developers.google.com/learn/pathways/solution-crossword'; static const geminiDeveloperCompetition = 'https://ai.google.dev/competition'; diff --git a/test/share/widgets/share_dialog_test.dart b/test/share/widgets/share_dialog_test.dart index 3be2635d9..0ecb0e071 100644 --- a/test/share/widgets/share_dialog_test.dart +++ b/test/share/widgets/share_dialog_test.dart @@ -97,7 +97,7 @@ void main() { verify( () => urlLauncher.launchUrl( - 'https://twitter.com/intent/tweet?text=Check%20out%20IOCrossword%20%23GoogleIO!%0A$url', + 'https://twitter.com/intent/tweet?text=Check%20out%20%23IOCrossword%20built%20for%20Google%20I/O%202024!%0A$url', any(), ), ).called(1);