Merge branch 'main' of github.com:pizzapanther/wildwoodag-v2

pizzapanther · Dec 31, 2023 · f44703a · f44703a
2 parents 576dab4 + d141c52
commit f44703a
Show file tree

Hide file tree

Showing 9 changed files with 524 additions and 359 deletions.
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -364,7 +364,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.10;
+				MARKETING_VERSION = 1.0.19;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.wildwoodag.church;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -393,7 +393,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.10;
+				MARKETING_VERSION = 1.0.19;
 				PRODUCT_BUNDLE_IDENTIFIER = com.wildwoodag.church;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -1,15 +1,4 @@
-def assertDeploymentTarget(installer)
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      # ensure IPHONEOS_DEPLOYMENT_TARGET is at least 13.0
-      deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f
-      should_upgrade = deployment_target < 13.0 && deployment_target != 0.0
-      if should_upgrade
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
-      end
-    end
-  end
-end
+require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '13.0'
 use_frameworks!

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
   - Alamofire (5.8.0)
-  - Capacitor (5.3.0):
+  - Capacitor (5.5.1):
     - CapacitorCordova
-  - CapacitorCordova (5.3.0)
+  - CapacitorCordova (5.5.1)
   - CapacitorDialog (5.0.6):
     - Capacitor
-  - CapgoCapacitorUpdater (5.3.9):
+  - CapgoCapacitorUpdater (5.3.26):
     - Alamofire
     - Capacitor
     - SSZipArchive
@@ -37,13 +37,13 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 0e92e751b3e9e66d7982db43919d01f313b8eb91
-  Capacitor: 1ac9165943bc4f2137642d218c5ba05df811de69
-  CapacitorCordova: b9374d68e63ce29e96ab5db994cf14fbefd722c9
+  Capacitor: 9da0a2415e3b6098511f8b5ffdb578d91ee79f8f
+  CapacitorCordova: e128cc7688c070ca0bfa439898a5f609da8dbcfe
   CapacitorDialog: 0f3c15dfe9414b83bc64aef4078f1b92bcfead26
-  CapgoCapacitorUpdater: 399a4f3b10e9e732da6df768d8450d92967c7ace
+  CapgoCapacitorUpdater: 3d4120b5df80b95b930fc80e3d9e5a62ce785a01
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   Version: de5907f2c5d0f3cf21708db7801d1d5401139486
 
-PODFILE CHECKSUM: 75d5a5e0b51204ba17b6d697673f341de6b4aab8
+PODFILE CHECKSUM: d62d021d4d8e9d4ac9aaec43c675b80cf963dcfe
 
 COCOAPODS: 1.12.1
diff --git a/layouts/partials/footer/custom.html b/layouts/partials/footer/custom.html
@@ -18,8 +18,24 @@
   document.querySelector(".site-footer").prepend(clon);
 }
 
+function load_platform() {
+  if (window.Capacitor) {
+    if (window.Capacitor) {
+      var ele = document.querySelector('body');
+      console.log(Capacitor.getPlatform());
+      if (ele) {
+        ele.classList.add(Capacitor.getPlatform());
+      } else {
+        setTimeout(10, load_platform);
+      }
+    }
+  }
+}
+
 window.addEventListener("load", (event) => {
   move_social();
+
+  load_platform();
 });
 
 if (window.Capacitor) {

diff --git a/layouts/partials/head/custom.html b/layouts/partials/head/custom.html
@@ -4,7 +4,6 @@
     const script = document.createElement('script');
     script.src = '/app.js';
     document.head.appendChild(script);
-    document.querySelector('.main-container').classList.add(Capacitor.getPlatform());
   }
 }
 </script>

diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html
@@ -0,0 +1,26 @@
+<meta charset='utf-8'>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
+
+{{- $description := partialCached "data/description" . .RelPermalink -}}
+<meta name='description' content='{{ $description }}'>
+{{ with .Params.Keywords }}<meta name="keywords" content="{{ delimit . ", " }}">{{ end }}
+
+{{- $title := partialCached "data/title" . .RelPermalink -}}
+<title>{{ $title }}</title>
+
+<link rel='canonical' href='{{ .Permalink }}'>
+
+{{- partial "head/style.html" . -}}
+{{- partial "head/script.html" . -}}
+{{- partial "head/opengraph/include.html" . -}}
+
+{{- range .AlternativeOutputFormats -}}
+    <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}">
+{{- end -}}
+
+{{ with .Site.Params.favicon }}
+    <link rel="shortcut icon" href="{{ . }}" />
+{{ end }}
+
+{{- template "_internal/google_analytics.html" . -}}
+{{- partial "head/custom.html" . -}}