ridiculous

.envrc

@@ -1 +0,0 @@
-use nix

.gitea/workflows/backend_build-deploy-prod.yaml

@@ -3,9 +3,6 @@ on:
     tags:
       - v*
 
-permissions:
-  pull-requests: write
-
 name: Build and deploy the backend to production
 
 jobs:
@@ -13,7 +10,15 @@ jobs:
     name: Build and push image
     uses: ./.gitea/workflows/workflow_build-image.yaml
     with:
-      # sets the tag to the git tag that triggered the workflow - the deployment (configured in a separate repository) will use this tag and be deployed to production by argocd
-      tag: ${{ github.ref_name }}
+      tag: stable
     secrets:
       PACKAGE_REGISTRY_ACCESS: ${{ secrets.PACKAGE_REGISTRY_ACCESS }}
+  
+  deploy-prod:
+    name: Deploy to production
+    uses: ./.gitea/workflows/workflow_deploy-container.yaml
+    with:
+      overlay: prod
+    secrets:
+      KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+    needs: build-and-push

.gitea/workflows/backend_build-deploy-stg.yaml

@@ -12,32 +12,15 @@ jobs:
     name: Build and push image
     uses: ./.gitea/workflows/workflow_build-image.yaml
     with:
-      # sets a unique tag for each commit in the PR - this gets deployed to a separate application instance using argocd
-      tag: sha${{ github.sha }}
+      tag: unstable
     secrets:
       PACKAGE_REGISTRY_ACCESS: ${{ secrets.PACKAGE_REGISTRY_ACCESS }}
-
-  notify:
-    runs-on: ubuntu-latest
-    name: Add a comment to the PR to notify about the deployment
-    steps:
-      - name: Download gitea client
-        run: |
-          curl -sSL -o tea https://dl.gitea.com/tea/0.11.0/tea-0.11.0-linux-amd64
-          chmod +x tea
-
-      - name: Login
-        run: |
-          ./tea login add --url git.kluster.moll.re --name bot --token ${{ secrets.GITEA_TOKEN }}
-          ./tea login default
-      - name: Post comment
-        run: |
-          ./tea comment --repo anydev/anyway --login bot ${{ github.event.number }} """
-          The backend has been deployed to staging with url https://pr-${{ github.event.number }}.anyway-stg.anydev.info. Check the deployment status in ArgoCD:
-
-          [![App Status](https://argocd.kluster.moll.re/api/badge?name=anydev-anyway-backend-stg-pr-${{ github.event.number }}&revision=true&showAppName=true)](https://argocd.kluster.moll.re/applications/anydev-anyway-backend-stg-pr-${{ github.event.number }})
-          """
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_BASE_URL: ${{ secrets.GITEA_BASE_URL }}
-          GITEA_REPO: ${{ secrets.GITEA_REPO }}
+  
+  deploy-prod:
+    name: Deploy to staging
+    uses: ./.gitea/workflows/workflow_deploy-container.yaml
+    with:
+      overlay: stg
+    secrets:
+      KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+    needs: build-and-push

.gitea/workflows/frontend_deploy-beta.yaml

@@ -5,7 +5,7 @@ on:
     paths:
       - frontend/**
 
-name: Build and release apps to beta track
+name: Build and release release apps to production track
 
 jobs:
   get-version:
@@ -13,7 +13,6 @@ jobs:
     runs-on: macos
     steps:
       - uses: https://gitea.com/actions/checkout@v4
-
       - name: Fetch tags from main branch
         # since this workflow is triggered by a pull request, we want to match the latest tag of the main branch
         id: version
@@ -21,34 +20,27 @@ jobs:
           git fetch origin main --tags
           LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
           # remove the 'v' prefix from the tag name
-          echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_OUTPUT
+          echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_ENV
 
-      - name: Output the version that is being used
-        run: |
-          echo "Building for version ${{ steps.version.outputs.BUILD_NAME }}"
-
-    outputs:
-      build_name: ${{ steps.version.outputs.BUILD_NAME }}
-
-  build-android:
-    name: Build and upload android app
-    uses: ./.gitea/workflows/workflow_build-app-android.yaml
-    with:
-      build_type: beta
-      build_name: ${{ needs.get-version.outputs.build_name }}
-    secrets:
-      ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}
-      ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}
-      ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
-      ANDROID_GOOGLE_MAPS_API_KEY: ${{ secrets.ANDROID_GOOGLE_MAPS_API_KEY }}
-    needs: get-version
+  # build-android:
+  #   name: Build and upload android app
+  #   uses: ./.gitea/workflows/workflow_build-app-android.yaml
+  #   with:
+  #     build_type: release # for current testing
+  #     build_name: ${{ env.BUILD_NAME }}
+  #   secrets:
+  #     ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}
+  #     ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}
+  #     ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+  #     ANDROID_GOOGLE_MAPS_API_KEY: ${{ secrets.ANDROID_GOOGLE_MAPS_API_KEY }}
+  #   needs: get-version
 
   build-ios:
     name: Build and upload ios app
     uses: ./.gitea/workflows/workflow_build-app-ios.yaml
     with:
-      build_type: beta
-      build_name: ${{ needs.get-version.outputs.build_name }}
+      build_type: release # for current testing
+      build_name: ${{ env.BUILD_NAME }}
     secrets:
       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
@@ -56,4 +48,6 @@ jobs:
       IOS_MATCH_REPO_SSH_KEY_BASE64: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
       IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }}
       IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}
-    needs: build-android # technically not needed, but this prevents the builds from running in parallel
+    needs: get-version
+
+    # needs: build-android # technically not needed, but this prevents the builds from running in parallel

.gitea/workflows/frontend_deploy-release.yaml

@@ -3,7 +3,7 @@ on:
     tags:
       - v*
 
-name: Build and release apps to production track
+name: Build and release release apps to production track
 
 jobs:
   get-version:
@@ -11,28 +11,21 @@ jobs:
     runs-on: macos
     steps:
       - uses: https://gitea.com/actions/checkout@v4
-
       - name: Get version from git tag
         id: version
         env: 
           REF_NAME: ${{ gitea.ref_name }}
         # remove the 'v' prefix from the tag name
         run: |
-          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_OUTPUT
+          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV
 
-      - name: Output the version that is being used
-        run: |
-          echo "Building for version ${{ steps.version.outputs.BUILD_NAME }}"
-
-    outputs:
-      build_name: ${{ steps.version.outputs.BUILD_NAME }}
 
   build-android:
     name: Build and upload android app
     uses: ./.gitea/workflows/workflow_build-app-android.yaml
     with:
       build_type: release
-      build_name: ${{ needs.get-version.outputs.build_name }}
+      build_name: ${{ env.BUILD_NAME }}
     secrets:
       ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}
       ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}
@@ -45,7 +38,7 @@ jobs:
     uses: ./.gitea/workflows/workflow_build-app-ios.yaml
     with:
       build_type: release
-      build_name: ${{ needs.get-version.outputs.build_name }}
+      build_name: ${{ env.BUILD_NAME }}
     secrets:
       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}

.gitea/workflows/workflow_build-app-android.yaml

@@ -27,7 +27,7 @@ defaults:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos
     env:
       # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ gitea.workspace }}/frontend/android/Gemfile

.gitea/workflows/workflow_build-app-ios.yaml

@@ -31,7 +31,7 @@ defaults:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos
     env:
       # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ gitea.workspace }}/frontend/ios/Gemfile
@@ -54,7 +54,6 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - uses: GuillaumeFalourd/setup-rsync@v1.2
-        # rsync is required by the google maps ios tools
 
       - name: Install dependencies and clean up
         run: |
@@ -73,11 +72,6 @@ jobs:
         env:
           MATCH_REPO_SSH_KEY: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
 
-      - name: Replace API Key from secret
-        # on a macOS runner, sed requires a replacement suffix after the -i flag
-        run: |
-          sed -i '' -e "s/IOS_GOOGLE_MAPS_API_KEY/${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}/g" Runner/AppDelegate.swift
-
       - name: Run fastlane lane
         run: bundle exec fastlane deploy_${{ inputs.build_type }}
         env:

.gitea/workflows/workflow_deploy-container.yaml

@@ -0,0 +1,35 @@
+on:
+  workflow_call:
+    inputs:
+      overlay:
+        required: true
+        type: string
+    secrets:
+      KUBE_CONFIG:
+        required: true
+
+
+name: Deploy the newly built container
+
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: https://gitea.com/actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: setup kubectl
+      uses: https://github.com/azure/setup-kubectl@v4
+
+    - name: Set kubeconfig
+      run: |
+        echo "${{ secrets.KUBE_CONFIG }}" > kubeconfig
+
+    - name: Deploy to k8s
+      run: |
+        kubectl apply -k backend/deployment/overlays/${{ inputs.overlay }} --kubeconfig=kubeconfig
+        kubectl -n anyway-backend rollout restart deployment/anyway-backend-${{ inputs.overlay }} --kubeconfig=kubeconfig

.gitignore

@@ -1,2 +1 @@
 cache/
-.direnv/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "backend/deployment"]
+	path = backend/deployment
+	url = https://git.kluster.moll.re/anydev/anyway-backend-deployment

.vscode/launch.json

@@ -9,7 +9,9 @@
             "name": "Backend - debug",
             "type": "debugpy",
             "request": "launch",
-            "envFile": "${workspaceFolder}/backend/debug.env",
+            "env": {
+                "DEBUG": "true"
+            },
             "jinja": true,
             "cwd": "${workspaceFolder}/backend",
             "module": "fastapi",
@@ -23,7 +25,9 @@
             "type": "debugpy",
             "request": "launch",
             "program": "src/tester.py",
-            "envFile": "${workspaceFolder}/backend/debug.env",
+            "env": {
+                "DEBUG": "true"
+            },
             "cwd": "${workspaceFolder}/backend"
         },
         // frontend - flutter app

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "nixEnvSelector.nixFile": "${workspaceFolder}/default.nix"
-}

backend/.gitignore

@@ -1,6 +1,3 @@
-# all .env files
-*.env
-
 # osm-cache
 cache_XML/
 
@@ -168,4 +165,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+#.idea/

default.nix

@@ -1,17 +0,0 @@
-{ pkgs ? import <nixpkgs> { config.android_sdk.accept_license = true; config.allowUnfree = true; } }:
-
-pkgs.mkShell {
-    buildInputs = [
-        pkgs.flutter
-        #pkgs.android-tools  # for adb
-        #pkgs.openjdk        # required for Android builds
-    ];
-
-    # Set up Android SDK paths if needed
-    shellHook = ''
-        export ANDROID_SDK_ROOT=${pkgs.androidsdk}/libexec/android-sdk
-        export PATH=$PATH:${pkgs.androidsdk}/libexec/android-sdk/platform-tools
-        echo "Flutter dev environment ready. 'adb' and 'flutter' are available."
-    '';
-}
-

frontend/.github/workflows/build_app_android.yaml

@@ -0,0 +1,59 @@
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up ruby env
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2.1
+          bundler-cache: true
+
+      - name: Setup java for android build
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+
+      - name: Setup android SDK
+        uses: android-actions/setup-android@v3
+      
+      - name: Install Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.22.0
+          cache: true
+
+      - name: Infer version number from git tag
+        id: version
+        env: 
+          REF_NAME: ${{ github.ref_name }}
+        run:
+          # remove the 'v' prefix from the tag name
+          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV
+
+      - name: Put selected secrets into files
+        run: |
+          echo "${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}" | base64 -d > secrets.properties
+          echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}" | base64 -d > google-key.json
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > release.keystore
+        working-directory: android
+
+      - name: Install fastlane
+        run: bundle install
+        working-directory: android
+
+      - name: Run fastlane lane
+        run: bundle exec fastlane deploy_release
+        working-directory: android
+        env:
+          BUILD_NUMBER: ${{ github.run_number }}
+          # BUILD_NAME is implicitly available
+          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}

frontend/.github/workflows/build_app_ios.yaml

@@ -0,0 +1,64 @@
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: macos-latest
+    env:
+      # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/ios/Gemfile
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up ruby env
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Install Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.22.0
+          cache: true
+
+      - name: Infer version number from git tag
+        id: version
+        env: 
+          REF_NAME: ${{ github.ref_name }}
+        run:
+          # remove the 'v' prefix from the tag name
+          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV
+
+      - name: Setup SSH key for match git repo
+        # and mark the host as known
+        run: |
+          echo $MATCH_REPO_SSH_KEY | base64 --decode > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -p 2222 git.kluster.moll.re > ~/.ssh/known_hosts
+        env:
+          MATCH_REPO_SSH_KEY: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
+
+      - name: Install dependencies and clean up
+        run: |
+          flutter pub get
+          bundle exec pod install
+          flutter clean
+          bundle exec pod cache clean --all
+        working-directory: ios
+
+      - name: Run fastlane lane
+        run: bundle exec fastlane deploy_release --verbose
+        working-directory: ios
+        env:
+          BUILD_NUMBER: ${{ github.run_number }}
+          # BUILD_NAME is implicitly available
+          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
+          IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
+          IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
+          IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }}
+          MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }}
+          IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}

frontend/android/fastlane/Fastfile

@@ -17,7 +17,7 @@ platform :android do
       )
     
     upload_to_play_store(
-      track: 'beta',
+      track: 'alpha',
       # upload aab files intstead
       skip_upload_apk: true,
       skip_upload_changelogs: true,

frontend/android/fastlane/metadata/en-US/full_description.txt

@@ -1,7 +1,7 @@
-AnyWay is an application that helps you plan truly unique city trips. When planning a new trip, you can specify your preferences and constraints and anyway generates a personalized itinerary just for you. 
+AnyWay is an application that helps you plan truly unique city trips. When planning a new trip, you can specify <your> preferences and constraints and anyway generates a personalized itinerary just for you. 
 
 Anyway follows these core principles:
-- Personalization: Trips should be match your interests - not just the most popular destinations.
-- Efficiency: Don't just walk in circles! Anyway creates the most efficient route for you.
-- Flexibility: Vacations are the time to be spontaneous. Anyway lets you update your plans on the go.
-- Discoverability: Tourism means exploration. Anyway encourages you to take detours and make spontaneous decisions.
+- **Personalization**: Trips should be match your interests - not just the most popular destinations.
+- **Efficiency**: Don't just walk in circles! Anyway creates the most efficient route for you.
+- **Flexibility**: Vacations are the time to be spontaneous. Anyway lets you update your plans on the go.
+- **Discoverability**: Tourism means exploration. Anyway encourages you to take detours and make spontaneous decisions.

frontend/ios/fastlane/Appfile

@@ -1,4 +1,4 @@
-app_identifier("info.anydev.anyway") # The bundle identifier of your app
+app_identifier("info.anydev.testing") # The bundle identifier of your app
 apple_id("me@moll.re") # Your Apple Developer Portal username
 
 itc_team_id("127439860") # App Store Connect Team ID

frontend/ios/fastlane/Fastfile

@@ -28,6 +28,17 @@ platform :ios do
       readonly: true,
     )
 
+    # replace secrets by real values, the stupid way
+    sh(
+      "sed",
+      "-i", 
+      '\'\'', 
+      "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g", 
+      "../Runner/AppDelegate.swift"
+    )
+    
+
+
     sh(
       "flutter",
       "build",
@@ -63,6 +74,15 @@ platform :ios do
       readonly: true,
     )
 
+    # replace secrets by real values, the stupid way
+    sh(
+      "sed",
+      "-i",
+      '\'\'', 
+      "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g",
+      "../Runner/AppDelegate.swift"
+    )
+
     sh(
       "flutter",
       "build",
@@ -81,9 +101,9 @@ platform :ios do
     upload_to_app_store(
       overwrite_screenshots: true,
       metadata_path: "fastlane/metadata",
-      screenshots_path: "fastlane/screenshots",
+      screenshot_path: "fastlane/screenshots",
       precheck_include_in_app_purchases: false,
-      force: true, # Skip HTMl report verification
+
       submit_for_review: true,
       automatic_release: true,
       # automatically release the app after review

frontend/ios/fastlane/metadata/copyright.txt

@@ -1 +1 @@
-2025 anydev
+

frontend/ios/fastlane/metadata/en-US/description.txt

@@ -1,7 +1,7 @@
-AnyWay is an application that helps you plan truly unique city trips. When planning a new trip, you can specify your preferences and constraints and anyway generates a personalized itinerary just for you. 
+AnyWay is an application that helps you plan truly unique city trips. When planning a new trip, you can specify <our> preferences and constraints and anyway generates a personalized itinerary just for you. 
 
 Anyway follows these core principles:
-- Personalization: Trips should be match your interests - not just the most popular destinations.
-- Efficiency: Don't just walk in circles! Anyway creates the most efficient route for you.
-- Flexibility: Vacations are the time to be spontaneous. Anyway lets you update your plans on the go.
-- Discoverability: Tourism means exploration. Anyway encourages you to take detours and make spontaneous decisions.
+- **Personalization**: Trips should be match your interests - not just the most popular destinations.
+- **Efficiency**: Don't just walk in circles! Anyway creates the most efficient route for you.
+- **Flexibility**: Vacations are the time to be spontaneous. Anyway lets you update your plans on the go.
+- **Discoverability**: Tourism means exploration. Anyway encourages you to take detours and make spontaneous decisions.

frontend/ios/fastlane/metadata/en-US/name.txt

@@ -1 +1 @@
-Any.Way
+AnyWay

frontend/ios/fastlane/metadata/primary_category.txt

@@ -1 +1 @@
-TRAVEL
+

frontend/ios/fastlane/metadata/review_information/email_address.txt

@@ -1 +1 @@
-anydev.anyway@gmail.com
+

frontend/ios/fastlane/metadata/review_information/first_name.txt

@@ -1 +1 @@
-Remy
+

frontend/ios/fastlane/metadata/review_information/last_name.txt

@@ -1 +1 @@
-Moll
+

frontend/ios/fastlane/metadata/review_information/phone_number.txt

@@ -1 +1 @@
-+4915128785827
+