diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 9747f27..21aad65 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -8,12 +8,30 @@ on: - release paths: - "website/**" + - "mobile/**" - ".github/workflows/firebase-hosting-merge.yml" jobs: deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + channel: stable + + - name: Install Dependencies + run: flutter pub get + working-directory: mobile + + - name: Build Web App + run: flutter build web --base-href /app/ + working-directory: mobile + + - name: Copy Web App to Website + run: cp -r mobile/build/web website/app + - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index 97ed931..6c61b39 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -3,6 +3,7 @@ on: pull_request: paths: - "website/**" + - "mobile/**" - ".github/workflows/firebase-hosting-pull-request.yml" permissions: checks: write @@ -14,6 +15,23 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + channel: stable + + - name: Install Dependencies + run: flutter pub get + working-directory: mobile + + - name: Build Web App + run: flutter build web --base-href /app/ + working-directory: mobile + + - name: Copy Web App to Website + run: cp -r mobile/build/web website/app + - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/mobile-pull-request.yaml b/.github/workflows/mobile-pull-request.yaml index 9c96c48..28a07c4 100644 --- a/.github/workflows/mobile-pull-request.yaml +++ b/.github/workflows/mobile-pull-request.yaml @@ -14,7 +14,6 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.38.5 channel: stable - name: Install Dependencies @@ -36,7 +35,6 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.38.5 channel: stable - name: Install Dependencies @@ -58,7 +56,6 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.38.5 channel: stable - name: Install Dependencies diff --git a/.github/workflows/mobile-push.yaml b/.github/workflows/mobile-push.yaml index 5dca271..9aacb7a 100644 --- a/.github/workflows/mobile-push.yaml +++ b/.github/workflows/mobile-push.yaml @@ -19,7 +19,6 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.38.5 channel: stable - name: Decode Keystore diff --git a/README.md b/README.md index b155a77..09d3caf 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ This project is open-source but currently has no license. This means: - You **may not** redistribute, modify, or rebrand the project without explicit permission. ## Website -Visit [finance.twoaxis.org](https://finance.twoaxis.org) for more details about the app. Note that there is no web version of TwoAxis Finance at this time. +Visit [finance.twoaxis.org](https://finance.twoaxis.org) for more details about the app. The web version of TwoAxis Finance is available at [finance.twoaxis.org/app](https://finance.twoaxis.org/app). ## Contact For inquiries, reach out at [contact@twoaxis.org](mailto:contact@twoaxis.org). diff --git a/firebase.json b/firebase.json index 3119217..a34ba87 100644 --- a/firebase.json +++ b/firebase.json @@ -43,6 +43,12 @@ "firebase.json", "**/.*", "**/node_modules/**" + ], + "rewrites": [ + { + "source": "/app/**", + "destination": "/app/index.html" + } ] } ] diff --git a/mobile/.metadata b/mobile/.metadata new file mode 100644 index 0000000..ab7697c --- /dev/null +++ b/mobile/.metadata @@ -0,0 +1,30 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "90673a4eef275d1a6692c26ac80d6d746d41a73a" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a + base_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a + - platform: web + create_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a + base_revision: 90673a4eef275d1a6692c26ac80d6d746d41a73a + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 23fc17a..5be40c5 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" clock: dependency: transitive description: @@ -436,18 +436,18 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.18" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.13.0" meta: dependency: transitive description: @@ -665,10 +665,10 @@ packages: dependency: transitive description: name: test_api - sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 + sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" url: "https://pub.dev" source: hosted - version: "0.7.7" + version: "0.7.9" typed_data: dependency: transitive description: diff --git a/mobile/web/favicon.png b/mobile/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/mobile/web/favicon.png differ diff --git a/mobile/web/icons/Icon-192.png b/mobile/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/mobile/web/icons/Icon-192.png differ diff --git a/mobile/web/icons/Icon-512.png b/mobile/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/mobile/web/icons/Icon-512.png differ diff --git a/mobile/web/icons/Icon-maskable-192.png b/mobile/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/mobile/web/icons/Icon-maskable-192.png differ diff --git a/mobile/web/icons/Icon-maskable-512.png b/mobile/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/mobile/web/icons/Icon-maskable-512.png differ diff --git a/mobile/web/index.html b/mobile/web/index.html new file mode 100644 index 0000000..19bb9b8 --- /dev/null +++ b/mobile/web/index.html @@ -0,0 +1,46 @@ + + +
+ +