From a617758459a5606bd94714905bc28f7fad2121c2 Mon Sep 17 00:00:00 2001 From: Marco Crapts Date: Tue, 6 Jun 2023 21:38:32 +0200 Subject: [PATCH] add iOS --- ios/App/App.xcodeproj/project.pbxproj | 6 ++ ios/App/App/GoogleService-Info.plist | 38 ++++++++++++ ios/App/App/Info.plist | 15 ++++- ios/App/Podfile | 3 - ios/App/Podfile.lock | 84 ++++++++++++++++++++++++++- src/App.vue | 2 +- 6 files changed, 142 insertions(+), 6 deletions(-) create mode 100644 ios/App/App/GoogleService-Info.plist diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index e68c63d..22fbbf0 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; }; + A9A186E62A2FB826009CBA16 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A9A186E52A2FB826009CBA16 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -27,6 +28,7 @@ 504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = ""; }; + A9A186E52A2FB826009CBA16 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; @@ -74,6 +76,7 @@ isa = PBXGroup; children = ( 50379B222058CBB4000EE86E /* capacitor.config.json */, + A9A186E52A2FB826009CBA16 /* GoogleService-Info.plist */, 504EC3071FED79650016851F /* AppDelegate.swift */, 504EC30B1FED79650016851F /* Main.storyboard */, 504EC30E1FED79650016851F /* Assets.xcassets */, @@ -161,6 +164,7 @@ 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */, 504EC30D1FED79650016851F /* Main.storyboard in Resources */, 2FAD9763203C412B000D30F8 /* config.xml in Resources */, + A9A186E62A2FB826009CBA16 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -347,6 +351,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 5XQS3G6YV7; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -367,6 +372,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 5XQS3G6YV7; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/ios/App/App/GoogleService-Info.plist b/ios/App/App/GoogleService-Info.plist new file mode 100644 index 0000000..ceb5702 --- /dev/null +++ b/ios/App/App/GoogleService-Info.plist @@ -0,0 +1,38 @@ + + + + + CLIENT_ID + 1048273547256-fes4qqj6po81ki21doggnst5ptjsa940.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.1048273547256-fes4qqj6po81ki21doggnst5ptjsa940 + ANDROID_CLIENT_ID + 1048273547256-qq9j4hcvni377p8cva7v10u9us1pjrc9.apps.googleusercontent.com + API_KEY + AIzaSyCkN_Fm0wGcDZJJ6ltz5NHDvs9zPgKiSTQ + GCM_SENDER_ID + 1048273547256 + PLIST_VERSION + 1 + BUNDLE_ID + com.contexted.app + PROJECT_ID + contexted-f8b4e + STORAGE_BUCKET + contexted-f8b4e.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:1048273547256:ios:e57d78bd483100900f700d + DATABASE_URL + https://contexted-f8b4e.firebaseio.com + + \ No newline at end of file diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index a6d62e1..0af0bed 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - Contexted + Contexted CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -18,6 +18,19 @@ APPL CFBundleShortVersionString $(MARKETING_VERSION) + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLName + Firebase + CFBundleURLSchemes + + com.googleusercontent.apps.1048273547256-fes4qqj6po81ki21doggnst5ptjsa940 + + + CFBundleVersion $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS diff --git a/ios/App/Podfile b/ios/App/Podfile index 80db1e6..69c1972 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -26,9 +26,6 @@ end post_install do |installer| assertDeploymentTarget(installer) -end - -post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle" diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index 75f43b8..f9eee49 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -1,24 +1,93 @@ PODS: + - AppAuth (1.6.2): + - AppAuth/Core (= 1.6.2) + - AppAuth/ExternalUserAgent (= 1.6.2) + - AppAuth/Core (1.6.2) + - AppAuth/ExternalUserAgent (1.6.2): + - AppAuth/Core - Capacitor (5.0.4): - CapacitorCordova - CapacitorCordova (5.0.4) - CapacitorDialog (5.0.2): - Capacitor + - CapacitorFirebaseAuthentication (5.0.0): + - Capacitor + - CapacitorFirebaseAuthentication/Lite (= 5.0.0) + - FirebaseAuth (= 10.8.0) + - CapacitorFirebaseAuthentication/Google (5.0.0): + - Capacitor + - FirebaseAuth (= 10.8.0) + - GoogleSignIn (= 7.0.0) + - CapacitorFirebaseAuthentication/Lite (5.0.0): + - Capacitor + - FirebaseAuth (= 10.8.0) - CapacitorHaptics (5.0.2): - Capacitor - CapacitorKeyboard (5.0.2): - Capacitor - CapacitorStatusBar (5.0.2): - Capacitor + - FirebaseAppCheckInterop (10.10.0) + - FirebaseAuth (10.8.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseCore (10.10.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreInternal (10.10.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - GoogleSignIn (7.0.0): + - AppAuth (~> 1.5) + - GTMAppAuth (< 3.0, >= 1.3) + - GTMSessionFetcher/Core (< 4.0, >= 1.1) + - GoogleUtilities/AppDelegateSwizzler (7.11.1): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Environment (7.11.1): + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.11.1): + - GoogleUtilities/Environment + - GoogleUtilities/Network (7.11.1): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (7.11.1)" + - GoogleUtilities/Reachability (7.11.1): + - GoogleUtilities/Logger + - GTMAppAuth (2.0.0): + - AppAuth/Core (~> 1.6) + - GTMSessionFetcher/Core (< 4.0, >= 1.5) + - GTMSessionFetcher/Core (3.1.1) + - PromisesObjC (2.2.0) DEPENDENCIES: - "Capacitor (from `../../node_modules/@capacitor/ios`)" - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)" - "CapacitorDialog (from `../../node_modules/@capacitor/dialog`)" + - "CapacitorFirebaseAuthentication (from `../../node_modules/@capacitor-firebase/authentication`)" + - "CapacitorFirebaseAuthentication/Google (from `../../node_modules/@capacitor-firebase/authentication`)" - "CapacitorHaptics (from `../../node_modules/@capacitor/haptics`)" - "CapacitorKeyboard (from `../../node_modules/@capacitor/keyboard`)" - "CapacitorStatusBar (from `../../node_modules/@capacitor/status-bar`)" +SPEC REPOS: + trunk: + - AppAuth + - FirebaseAppCheckInterop + - FirebaseAuth + - FirebaseCore + - FirebaseCoreInternal + - GoogleSignIn + - GoogleUtilities + - GTMAppAuth + - GTMSessionFetcher + - PromisesObjC + EXTERNAL SOURCES: Capacitor: :path: "../../node_modules/@capacitor/ios" @@ -26,6 +95,8 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/ios" CapacitorDialog: :path: "../../node_modules/@capacitor/dialog" + CapacitorFirebaseAuthentication: + :path: "../../node_modules/@capacitor-firebase/authentication" CapacitorHaptics: :path: "../../node_modules/@capacitor/haptics" CapacitorKeyboard: @@ -34,13 +105,24 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/status-bar" SPEC CHECKSUMS: + AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570 Capacitor: d3d4463573438b9fa65326d1f3549da6f4c21634 CapacitorCordova: b1fe6bf1f36974a8e4a9044b342d22d49c0996d6 CapacitorDialog: 01c49f7f4b37e7ad59e38fd317a6e5f006f23cdc + CapacitorFirebaseAuthentication: f2e3c2a7488b87078025855588670840f93a721e CapacitorHaptics: 864585542a435bd41eaabf7f30d9ff5ec03024d3 CapacitorKeyboard: e628d4e66d621c69e449945ebabded17c5b9c2e8 CapacitorStatusBar: 48f2899f6846cc7d8431b251ebfc58e1c10e3d58 + FirebaseAppCheckInterop: 7d3521f56872cf74a01792c0a095a30e054ff6ae + FirebaseAuth: 28e6fff787467cd15ab51c8c7aa904003b2f57aa + FirebaseCore: d027ff503d37edb78db98429b11f580a24a7df2a + FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893 + GoogleSignIn: b232380cf495a429b8095d3178a8d5855b42e842 + GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749 + GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae + GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72 + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef -PODFILE CHECKSUM: b469cdc64593e190968b9aa15066224f10938107 +PODFILE CHECKSUM: c3ab1574d20a76c5b3fe3c086022e7c73a4e21eb COCOAPODS: 1.12.1 diff --git a/src/App.vue b/src/App.vue index 0783521..33b7485 100644 --- a/src/App.vue +++ b/src/App.vue @@ -92,7 +92,7 @@ const topBarHeightWithSafeArea = computed(() => `calc(${topBarHeight}px + var(-- class="transition[margin-left] z-10 mx-auto flex h-full w-full max-w-app flex-col overflow-y-auto border-x-[1px] bg-white pb-[var(--safe-area-bottom)] duration-200 ease-out" :class="sideBarCollapsed ? 'ml-0' : 'sm:ml-sidebar'" > -
+