diff --git a/trainerbox/README.md b/trainerbox/README.md index 3857942..8f9305f 100644 --- a/trainerbox/README.md +++ b/trainerbox/README.md @@ -6,6 +6,15 @@ Startseite: ![Startseite](images/prototype/Bildschirmfoto%202025-04-10%20um%2012.57.18.png) + +Seiten & Funktionen: + +![Startseite](images/prototype/Bildschirmfoto%202025-04-10%20um%2014.38.29.png) + +LEANCANVAS: + +![Startseite](images/prototype/Bildschirmfoto%2025-04-24%um%13.36.01.png) + Von Julian, Jannic und Laurent diff --git a/trainerbox/images/prototype/Bildschirmfoto 2025-04-10 um 14.35.43.png b/trainerbox/images/prototype/Bildschirmfoto 2025-04-10 um 14.35.43.png deleted file mode 100644 index cd08e6b..0000000 Binary files a/trainerbox/images/prototype/Bildschirmfoto 2025-04-10 um 14.35.43.png and /dev/null differ diff --git a/trainerbox/images/prototype/leancanvas1.png b/trainerbox/images/prototype/leancanvas1.png new file mode 100644 index 0000000..c59987c Binary files /dev/null and b/trainerbox/images/prototype/leancanvas1.png differ diff --git a/trainerbox/images/prototype/Bildschirmfoto 2025-04-10 um 12.57.18.png b/trainerbox/images/prototype/prototype1.png similarity index 100% rename from trainerbox/images/prototype/Bildschirmfoto 2025-04-10 um 12.57.18.png rename to trainerbox/images/prototype/prototype1.png diff --git a/trainerbox/images/prototype/Bildschirmfoto 2025-04-10 um 14.38.29.png b/trainerbox/images/prototype/prototype2.png similarity index 100% rename from trainerbox/images/prototype/Bildschirmfoto 2025-04-10 um 14.38.29.png rename to trainerbox/images/prototype/prototype2.png diff --git a/trainerbox/ios/Flutter/Debug.xcconfig b/trainerbox/ios/Flutter/Debug.xcconfig index 592ceee..ec97fc6 100644 --- a/trainerbox/ios/Flutter/Debug.xcconfig +++ b/trainerbox/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/trainerbox/ios/Flutter/Release.xcconfig b/trainerbox/ios/Flutter/Release.xcconfig index 592ceee..c4855bf 100644 --- a/trainerbox/ios/Flutter/Release.xcconfig +++ b/trainerbox/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/trainerbox/ios/Podfile b/trainerbox/ios/Podfile new file mode 100644 index 0000000..e549ee2 --- /dev/null +++ b/trainerbox/ios/Podfile @@ -0,0 +1,43 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '12.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/trainerbox/macos/Flutter/Flutter-Debug.xcconfig b/trainerbox/macos/Flutter/Flutter-Debug.xcconfig index c2efd0b..4b81f9b 100644 --- a/trainerbox/macos/Flutter/Flutter-Debug.xcconfig +++ b/trainerbox/macos/Flutter/Flutter-Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/trainerbox/macos/Flutter/Flutter-Release.xcconfig b/trainerbox/macos/Flutter/Flutter-Release.xcconfig index c2efd0b..5caa9d1 100644 --- a/trainerbox/macos/Flutter/Flutter-Release.xcconfig +++ b/trainerbox/macos/Flutter/Flutter-Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/trainerbox/macos/Flutter/GeneratedPluginRegistrant.swift b/trainerbox/macos/Flutter/GeneratedPluginRegistrant.swift index 804ef2f..e46c39f 100644 --- a/trainerbox/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/trainerbox/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,12 +5,8 @@ import FlutterMacOS import Foundation -import cloud_firestore -import firebase_auth import firebase_core func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) - FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin")) FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) } diff --git a/trainerbox/macos/Podfile b/trainerbox/macos/Podfile new file mode 100644 index 0000000..29c8eb3 --- /dev/null +++ b/trainerbox/macos/Podfile @@ -0,0 +1,42 @@ +platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/trainerbox/pubspec.lock b/trainerbox/pubspec.lock index 273684d..4016704 100644 --- a/trainerbox/pubspec.lock +++ b/trainerbox/pubspec.lock @@ -1,14 +1,6 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - _flutterfire_internals: - dependency: transitive - description: - name: _flutterfire_internals - sha256: "37a42d06068e2fe3deddb2da079a8c4d105f241225ba27b7122b37e9865fd8f7" - url: "https://pub.dev" - source: hosted - version: "1.3.35" async: dependency: transitive description: @@ -41,30 +33,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.2" - cloud_firestore: - dependency: "direct main" - description: - name: cloud_firestore - sha256: a0f161b92610e078b4962d7e6ebeb66dc9cce0ada3514aeee442f68165d78185 - url: "https://pub.dev" - source: hosted - version: "4.17.5" - cloud_firestore_platform_interface: - dependency: transitive - description: - name: cloud_firestore_platform_interface - sha256: "6a55b319f8d33c307396b9104512e8130a61904528ab7bd8b5402678fca54b81" - url: "https://pub.dev" - source: hosted - version: "6.2.5" - cloud_firestore_web: - dependency: transitive - description: - name: cloud_firestore_web - sha256: "89dfa1304d3da48b3039abbb2865e3d30896ef858e569a16804a99f4362283a9" - url: "https://pub.dev" - source: hosted - version: "3.12.5" collection: dependency: transitive description: @@ -89,38 +57,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - firebase_auth: - dependency: "direct main" - description: - name: firebase_auth - sha256: cfc2d970829202eca09e2896f0a5aa7c87302817ecc0bdfa954f026046bf10ba - url: "https://pub.dev" - source: hosted - version: "4.20.0" - firebase_auth_platform_interface: - dependency: transitive - description: - name: firebase_auth_platform_interface - sha256: a0270e1db3b2098a14cb2a2342b3cd2e7e458e0c391b1f64f6f78b14296ec093 - url: "https://pub.dev" - source: hosted - version: "7.3.0" - firebase_auth_web: - dependency: transitive - description: - name: firebase_auth_web - sha256: "64e067e763c6378b7e774e872f0f59f6812885e43020e25cde08f42e9459837b" - url: "https://pub.dev" - source: hosted - version: "5.12.0" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c" + sha256: "017d17d9915670e6117497e640b2859e0b868026ea36bf3a57feb28c3b97debe" url: "https://pub.dev" source: hosted - version: "2.32.0" + version: "3.13.0" firebase_core_platform_interface: dependency: transitive description: @@ -133,10 +77,10 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "362e52457ed2b7b180964769c1e04d1e0ea0259fdf7025fdfedd019d4ae2bd88" + sha256: "129a34d1e0fb62e2b488d988a1fc26cc15636357e50944ffee2862efe8929b23" url: "https://pub.dev" source: hosted - version: "2.17.5" + version: "2.22.0" flutter: dependency: "direct main" description: flutter @@ -160,14 +104,6 @@ packages: description: flutter source: sdk version: "0.0.0" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.dev" - source: hosted - version: "4.1.2" leak_tracker: dependency: transitive description: @@ -293,14 +229,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.4" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" - source: hosted - version: "1.4.0" vector_math: dependency: transitive description: @@ -321,10 +249,10 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.1" sdks: dart: ">=3.7.2 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.22.0" diff --git a/trainerbox/pubspec.yaml b/trainerbox/pubspec.yaml index 6aca7ce..02d9935 100644 --- a/trainerbox/pubspec.yaml +++ b/trainerbox/pubspec.yaml @@ -34,6 +34,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + firebase_core: ^3.13.0 dev_dependencies: flutter_test: diff --git a/trainerbox/windows/flutter/generated_plugin_registrant.cc b/trainerbox/windows/flutter/generated_plugin_registrant.cc index bf6d21a..1a82e7d 100644 --- a/trainerbox/windows/flutter/generated_plugin_registrant.cc +++ b/trainerbox/windows/flutter/generated_plugin_registrant.cc @@ -6,15 +6,9 @@ #include "generated_plugin_registrant.h" -#include -#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { - CloudFirestorePluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("CloudFirestorePluginCApi")); - FirebaseAuthPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi")); FirebaseCorePluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); } diff --git a/trainerbox/windows/flutter/generated_plugins.cmake b/trainerbox/windows/flutter/generated_plugins.cmake index b83b40a..fa8a39b 100644 --- a/trainerbox/windows/flutter/generated_plugins.cmake +++ b/trainerbox/windows/flutter/generated_plugins.cmake @@ -3,8 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - cloud_firestore - firebase_auth firebase_core )