diff --git a/backend/src/plugins/cors.ts b/backend/src/plugins/cors.ts index e62e9c3..3bc7d1a 100644 --- a/backend/src/plugins/cors.ts +++ b/backend/src/plugins/cors.ts @@ -9,7 +9,7 @@ export default fp(async (server: FastifyInstance) => { "http://localhost:3001", // dein Nuxt-Frontend "http://127.0.0.1:3000", // dein Nuxt-Frontend "http://192.168.1.227:3001", // dein Nuxt-Frontend - "http://192.168.1.227:3000", // dein Nuxt-Frontend + "http://192.168.1.113:3000", // dein Nuxt-Frontend "https://beta.fedeo.de", // dein Nuxt-Frontend "https://app.fedeo.de", // dein Nuxt-Frontend "capacitor://localhost", // dein Nuxt-Frontend diff --git a/docker-compose.yml b/docker-compose.yml index f37747a..ce5dce1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,9 +4,58 @@ services: web: image: reg.federspiel.software/fedeo/software:beta restart: always + environment: + - INFISICAL_CLIENT_ID=abc + - INFISICAL_CLIENT_SECRET=abc backend: image: reg.federspiel.software/fedeo/backend:main restart: always - environment: - + - NUXT_PUBLIC_API_BASE= + - NUXT_PUBLIC_PDF_LICENSE= + db: + image: postgres + restart: always + shm_size: 128mb + environment: + POSTGRES_PASSWORD: abc + POSTGRES_USER: sandelcom + POSTGRES_DB: sensorfy + volumes: + - ./pg-data:/var/lib/postgresql/data + ports: + - "5432:5432" + traefik: + image: traefik:v2.2 + restart: unless-stopped + container_name: traefik + command: + - "--api.insecure=false" + - "--api.dashboard=true" + - "--api.debug=false" + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--providers.docker.network=traefik" + - "--entrypoints.web.address=:80" + - "--entrypoints.web-secured.address=:443" + - "--accesslog=true" + - "--accesslog.filepath=/logs/access.log" + - "--accesslog.bufferingsize=5000" + - "--accesslog.fields.defaultMode=keep" + - "--accesslog.fields.headers.defaultMode=keep" + - "--certificatesresolvers.mytlschallenge.acme.tlschallenge=true" # <== Enable TLS-ALPN-01 to generate and renew ACME certs + - "--certificatesresolvers.mytlschallenge.acme.email=info@sandelcom.de" # <== Setting email for certs + - "--certificatesresolvers.mytlschallenge.acme.storage=/letsencrypt/acme.json" # <== Defining acme file to store cert information + ports: + - 80:80 + - 8080:8080 + - 443:443 + volumes: + - "./traefik/letsencrypt:/letsencrypt" # <== Volume for certs (TLS) + - "/var/run/docker.sock:/var/run/docker.sock:ro" + - "./traefik/logs:/logs" + labels: + #### Labels define the behavior and rules of the traefik proxy for this container #### + - "traefik.enable=true" # <== Enable traefik on itself to view dashboard and assign subdomain to view it + - "traefik.http.routers.api.rule=Host(`srv1.drinkingteam.de`)" # <== Setting the domain for the dashboard + - "traefik.http.routers.api.service=api@internal" # <== Enabling the api to be a service to access diff --git a/frontend/app.vue b/frontend/app.vue index f2f0d80..1ee8844 100644 --- a/frontend/app.vue +++ b/frontend/app.vue @@ -3,17 +3,7 @@ import * as Sentry from "@sentry/browser" -/*watch(viewport.breakpoint, (newBreakpoint, oldBreakpoint) => { - console.log('Breakpoint updated:', oldBreakpoint, '->', newBreakpoint) -})*/ - -const platform = ref('default') - const setup = async () => { - if(await useCapacitor().getIsPhone()) { - platform.value = "mobile" - } - const dev = process.dev console.log(dev) } @@ -21,10 +11,10 @@ setup() -Sentry.init({ +/*Sentry.init({ dsn: "https://62e62ff08e1a438591fe5eb4dd9de244@glitchtip.federspiel.software/3", tracesSampleRate: 0.01, -}); +});*/ @@ -40,12 +30,12 @@ useHead({ lang: 'de' }, script: [ - { + /*{ defer: true, src: "/umami.js", "data-website-id":"2a9782fa-2fdf-4434-981d-93592d39edef", "data-host-url":"https://umami.federspiel.software" - } + }*/ ] }) @@ -61,8 +51,7 @@ useSeoMeta({ - - + diff --git a/frontend/capacitor.config.ts b/frontend/capacitor.config.ts deleted file mode 100644 index 4b11956..0000000 --- a/frontend/capacitor.config.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { CapacitorConfig } from '@capacitor/cli'; - -const config: CapacitorConfig = { - appId: 'software.federspiel.fedeo', - appName: 'FEDEO', - webDir: 'dist', - ios: { - handleApplicationNotifications: false - }, - /*server: { - url: "http://192.168.1.226:3000", - cleartext: true - }*/ -}; - -export default config; diff --git a/frontend/components/DocumentDisplayModal.vue b/frontend/components/DocumentDisplayModal.vue index a501448..fd82c60 100644 --- a/frontend/components/DocumentDisplayModal.vue +++ b/frontend/components/DocumentDisplayModal.vue @@ -171,7 +171,7 @@ const moveFile = async () => {
-
+
@@ -183,7 +183,7 @@ const moveFile = async () => { v-else />
-
+
{ - if(await useCapacitor().getIsPhone()) platform.value = "mobile" if(props.type && props.elementId){ items.value = await useNuxtApp().$api(`/api/resource/${props.type}/${props.elementId}/history`) diff --git a/frontend/components/displayPinnendLinks.vue b/frontend/components/displayPinnendLinks.vue index f33b598..931a3a8 100644 --- a/frontend/components/displayPinnendLinks.vue +++ b/frontend/components/displayPinnendLinks.vue @@ -15,14 +15,8 @@ const props = defineProps({ */ async function openLink(link) { if (link.external) { - if (useCapacitor().getIsNative()) { - await Browser.open({ - url: link.to, - presentationStyle: "popover", - }) - } else { - window.open(link.to, "_blank") - } + window.open(link.to, "_blank") + } else { return navigateTo(link.to) } diff --git a/frontend/components/displayRunningTime.vue b/frontend/components/displayRunningTime.vue index e8a431a..277ac86 100644 --- a/frontend/components/displayRunningTime.vue +++ b/frontend/components/displayRunningTime.vue @@ -13,11 +13,9 @@ const platform = ref("default") const setupPage = async () => { runningTimeInfo.value = (await supabase.from("times").select().eq("profile", profileStore.activeProfile.id).is("endDate", null).single()).data || {} - projects.value = (await useSupabaseSelect("projects")) + //projects.value = (await useSupabaseSelect("projects")) + - if(await useCapacitor().getIsPhone()) { - platform.value = "mobile" - } } diff --git a/frontend/composables/useCapacitor.js b/frontend/composables/useCapacitor.js deleted file mode 100644 index 1e4c198..0000000 --- a/frontend/composables/useCapacitor.js +++ /dev/null @@ -1,32 +0,0 @@ -import {Capacitor} from "@capacitor/core"; -import {Device} from "@capacitor/device"; -import {Network} from "@capacitor/network"; - -const override = false - -export const useCapacitor = () => { - const getPlatform = () => { - return Capacitor.getPlatform() - } - - const getDeviceInfo = async () => { - return await Device.getInfo() - } - - const getIsPhone = async () => { - let deviceInfo = await useCapacitor().getDeviceInfo() - - return override || deviceInfo.model.toLowerCase().includes('iphone') - } - - const getIsNative = () => { - return override || Capacitor.isNativePlatform() - } - - const getNetworkStatus = async () => { - return await Network.getStatus() - } - - - return {getPlatform, getDeviceInfo, getNetworkStatus, getIsPhone, getIsNative} -} \ No newline at end of file diff --git a/frontend/ios/.gitignore b/frontend/ios/.gitignore deleted file mode 100644 index f470299..0000000 --- a/frontend/ios/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -App/build -App/Pods -App/output -App/App/public -DerivedData -xcuserdata - -# Cordova plugins for Capacitor -capacitor-cordova-ios-plugins - -# Generated Config files -App/App/capacitor.config.json -App/App/config.xml diff --git a/frontend/ios/App/App.xcodeproj/project.pbxproj b/frontend/ios/App/App.xcodeproj/project.pbxproj deleted file mode 100644 index 31a573e..0000000 --- a/frontend/ios/App/App.xcodeproj/project.pbxproj +++ /dev/null @@ -1,641 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 77; - objects = { - -/* Begin PBXBuildFile section */ - 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; - 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; }; - 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; - 504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; }; - 504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; }; - 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; - 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; - 7E144E961F6CA2C63512098E /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DF9D76ED77CB578563C2573 /* Pods_OneSignalNotificationServiceExtension.framework */; }; - A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; }; - D5A301A42D970BAC002A22E9 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D5A3019D2D970BAC002A22E9 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - D5A301A22D970BAC002A22E9 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 504EC2FC1FED79650016851F /* Project object */; - proxyType = 1; - remoteGlobalIDString = D5A3019C2D970BAC002A22E9; - remoteInfo = OneSignalNotificationServiceExtension; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - D5A301A92D970BAC002A22E9 /* Embed Foundation Extensions */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 13; - files = ( - D5A301A42D970BAC002A22E9 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */, - ); - name = "Embed Foundation Extensions"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; - 37F7155EDCE8C061367E30A9 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; sourceTree = ""; }; - 4DF9D76ED77CB578563C2573 /* Pods_OneSignalNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneSignalNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; - 504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 504EC30C1FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 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 = ""; }; - 6CB294319AEF8406BACB8AC1 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.release.xcconfig"; path = "Pods/Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.release.xcconfig"; 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 = ""; }; - D5A301982D970B67002A22E9 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = ""; }; - D5A3019D2D970BAC002A22E9 /* OneSignalNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OneSignalNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - 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 = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ - D5A301A52D970BAC002A22E9 /* Exceptions for "OneSignalNotificationServiceExtension" folder in "OneSignalNotificationServiceExtension" target */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - Info.plist, - ); - target = D5A3019C2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */; - }; -/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ - -/* Begin PBXFileSystemSynchronizedRootGroup section */ - D5A3019E2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */ = { - isa = PBXFileSystemSynchronizedRootGroup; - exceptions = ( - D5A301A52D970BAC002A22E9 /* Exceptions for "OneSignalNotificationServiceExtension" folder in "OneSignalNotificationServiceExtension" target */, - ); - path = OneSignalNotificationServiceExtension; - sourceTree = ""; - }; -/* End PBXFileSystemSynchronizedRootGroup section */ - -/* Begin PBXFrameworksBuildPhase section */ - 504EC3011FED79650016851F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D5A3019A2D970BAC002A22E9 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 7E144E961F6CA2C63512098E /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = { - isa = PBXGroup; - children = ( - AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */, - 4DF9D76ED77CB578563C2573 /* Pods_OneSignalNotificationServiceExtension.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 504EC2FB1FED79650016851F = { - isa = PBXGroup; - children = ( - 504EC3061FED79650016851F /* App */, - D5A3019E2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */, - 504EC3051FED79650016851F /* Products */, - 7F8756D8B27F46E3366F6CEA /* Pods */, - 27E2DDA53C4D2A4D1A88CE4A /* Frameworks */, - ); - sourceTree = ""; - }; - 504EC3051FED79650016851F /* Products */ = { - isa = PBXGroup; - children = ( - 504EC3041FED79650016851F /* App.app */, - D5A3019D2D970BAC002A22E9 /* OneSignalNotificationServiceExtension.appex */, - ); - name = Products; - sourceTree = ""; - }; - 504EC3061FED79650016851F /* App */ = { - isa = PBXGroup; - children = ( - D5A301982D970B67002A22E9 /* App.entitlements */, - 50379B222058CBB4000EE86E /* capacitor.config.json */, - 504EC3071FED79650016851F /* AppDelegate.swift */, - 504EC30B1FED79650016851F /* Main.storyboard */, - 504EC30E1FED79650016851F /* Assets.xcassets */, - 504EC3101FED79650016851F /* LaunchScreen.storyboard */, - 504EC3131FED79650016851F /* Info.plist */, - 2FAD9762203C412B000D30F8 /* config.xml */, - 50B271D01FEDC1A000F3C39B /* public */, - ); - path = App; - sourceTree = ""; - }; - 7F8756D8B27F46E3366F6CEA /* Pods */ = { - isa = PBXGroup; - children = ( - FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */, - AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */, - 37F7155EDCE8C061367E30A9 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */, - 6CB294319AEF8406BACB8AC1 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 504EC3031FED79650016851F /* App */ = { - isa = PBXNativeTarget; - buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */; - buildPhases = ( - 6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */, - 504EC3001FED79650016851F /* Sources */, - 504EC3011FED79650016851F /* Frameworks */, - 504EC3021FED79650016851F /* Resources */, - 9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */, - D5A301A92D970BAC002A22E9 /* Embed Foundation Extensions */, - ); - buildRules = ( - ); - dependencies = ( - D5A301A32D970BAC002A22E9 /* PBXTargetDependency */, - ); - name = App; - productName = App; - productReference = 504EC3041FED79650016851F /* App.app */; - productType = "com.apple.product-type.application"; - }; - D5A3019C2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */ = { - isa = PBXNativeTarget; - buildConfigurationList = D5A301A62D970BAC002A22E9 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */; - buildPhases = ( - D76E39AEACB5B9B2BDC681BF /* [CP] Check Pods Manifest.lock */, - D5A301992D970BAC002A22E9 /* Sources */, - D5A3019A2D970BAC002A22E9 /* Frameworks */, - D5A3019B2D970BAC002A22E9 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - fileSystemSynchronizedGroups = ( - D5A3019E2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */, - ); - name = OneSignalNotificationServiceExtension; - productName = OneSignalNotificationServiceExtension; - productReference = D5A3019D2D970BAC002A22E9 /* OneSignalNotificationServiceExtension.appex */; - productType = "com.apple.product-type.app-extension"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 504EC2FC1FED79650016851F /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1620; - LastUpgradeCheck = 0920; - TargetAttributes = { - 504EC3031FED79650016851F = { - CreatedOnToolsVersion = 9.2; - LastSwiftMigration = 1100; - ProvisioningStyle = Automatic; - }; - D5A3019C2D970BAC002A22E9 = { - CreatedOnToolsVersion = 16.2; - }; - }; - }; - buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 504EC2FB1FED79650016851F; - preferredProjectObjectVersion = 77; - productRefGroup = 504EC3051FED79650016851F /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 504EC3031FED79650016851F /* App */, - D5A3019C2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 504EC3021FED79650016851F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */, - 50B271D11FEDC1A000F3C39B /* public in Resources */, - 504EC30F1FED79650016851F /* Assets.xcassets in Resources */, - 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */, - 504EC30D1FED79650016851F /* Main.storyboard in Resources */, - 2FAD9763203C412B000D30F8 /* config.xml in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D5A3019B2D970BAC002A22E9 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - D76E39AEACB5B9B2BDC681BF /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OneSignalNotificationServiceExtension-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 504EC3001FED79650016851F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 504EC3081FED79650016851F /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D5A301992D970BAC002A22E9 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - D5A301A32D970BAC002A22E9 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D5A3019C2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */; - targetProxy = D5A301A22D970BAC002A22E9 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 504EC30B1FED79650016851F /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 504EC30C1FED79650016851F /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 504EC3101FED79650016851F /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 504EC3111FED79650016851F /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 504EC3141FED79650016851F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 504EC3151FED79650016851F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 504EC3171FED79650016851F /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = App/App.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = GMCGQ8KK2P; - INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 2.0; - OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; - PRODUCT_BUNDLE_IDENTIFIER = software.federspiel.fedeo; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 504EC3181FED79650016851F /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = App/App.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = GMCGQ8KK2P; - INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 2.0; - PRODUCT_BUNDLE_IDENTIFIER = software.federspiel.fedeo; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - D5A301A72D970BAC002A22E9 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 37F7155EDCE8C061367E30A9 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = GMCGQ8KK2P; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = OneSignalNotificationServiceExtension; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = software.federspiel.fedeo.OneSignalNotificationServiceExtension; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - D5A301A82D970BAC002A22E9 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 6CB294319AEF8406BACB8AC1 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = GMCGQ8KK2P; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = OneSignalNotificationServiceExtension; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = software.federspiel.fedeo.OneSignalNotificationServiceExtension; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 504EC3141FED79650016851F /* Debug */, - 504EC3151FED79650016851F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 504EC3171FED79650016851F /* Debug */, - 504EC3181FED79650016851F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - D5A301A62D970BAC002A22E9 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D5A301A72D970BAC002A22E9 /* Debug */, - D5A301A82D970BAC002A22E9 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 504EC2FC1FED79650016851F /* Project object */; -} diff --git a/frontend/ios/App/App.xcworkspace/contents.xcworkspacedata b/frontend/ios/App/App.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index b301e82..0000000 --- a/frontend/ios/App/App.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/frontend/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/frontend/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/frontend/ios/App/App/App.entitlements b/frontend/ios/App/App/App.entitlements deleted file mode 100644 index b3e03fe..0000000 --- a/frontend/ios/App/App/App.entitlements +++ /dev/null @@ -1,12 +0,0 @@ - - - - - aps-environment - development - com.apple.security.application-groups - - group.software.federspiel.fedeo.onesignal - - - diff --git a/frontend/ios/App/App/AppDelegate.swift b/frontend/ios/App/App/AppDelegate.swift deleted file mode 100644 index c3cd83b..0000000 --- a/frontend/ios/App/App/AppDelegate.swift +++ /dev/null @@ -1,49 +0,0 @@ -import UIKit -import Capacitor - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - - var window: UIWindow? - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Override point for customization after application launch. - return true - } - - func applicationWillResignActive(_ application: UIApplication) { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. - } - - func applicationDidEnterBackground(_ application: UIApplication) { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. - } - - func applicationWillEnterForeground(_ application: UIApplication) { - // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. - } - - func applicationDidBecomeActive(_ application: UIApplication) { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - } - - func applicationWillTerminate(_ application: UIApplication) { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. - } - - func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool { - // Called when the app was launched with a url. Feel free to add additional processing here, - // but if you want the App API to support tracking app url opens, make sure to keep this call - return ApplicationDelegateProxy.shared.application(app, open: url, options: options) - } - - func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool { - // Called when the app was launched with an activity, including Universal Links. - // Feel free to add additional processing here, but if you want the App API to support - // tracking app url opens, make sure to keep this call - return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler) - } - -} diff --git a/frontend/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/frontend/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index 10bff7e..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index b1a8483..0000000 --- a/frontend/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "size": "1024x1024", - "filename": "AppIcon-512@2x.png", - "platform": "ios" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} \ No newline at end of file diff --git a/frontend/ios/App/App/Assets.xcassets/Contents.json b/frontend/ios/App/App/Assets.xcassets/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/frontend/ios/App/App/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json deleted file mode 100644 index 84a416d..0000000 --- a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "filename": "Default@1x~universal~anyany.png", - "scale": "1x" - }, - { - "idiom": "universal", - "filename": "Default@2x~universal~anyany.png", - "scale": "2x" - }, - { - "idiom": "universal", - "filename": "Default@3x~universal~anyany.png", - "scale": "3x" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "universal", - "scale": "1x", - "filename": "Default@1x~universal~anyany-dark.png" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "universal", - "scale": "2x", - "filename": "Default@2x~universal~anyany-dark.png" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "universal", - "scale": "3x", - "filename": "Default@3x~universal~anyany-dark.png" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany-dark.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany-dark.png deleted file mode 100644 index 40c4f81..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany-dark.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany.png deleted file mode 100644 index 92401d9..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany-dark.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany-dark.png deleted file mode 100644 index 40c4f81..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany-dark.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany.png deleted file mode 100644 index 92401d9..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany-dark.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany-dark.png deleted file mode 100644 index 40c4f81..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany-dark.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany.png deleted file mode 100644 index 92401d9..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png deleted file mode 100644 index 33ea6c9..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png deleted file mode 100644 index 33ea6c9..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png and /dev/null differ diff --git a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png b/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png deleted file mode 100644 index 33ea6c9..0000000 Binary files a/frontend/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png and /dev/null differ diff --git a/frontend/ios/App/App/Base.lproj/LaunchScreen.storyboard b/frontend/ios/App/App/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index e7ae5d7..0000000 --- a/frontend/ios/App/App/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/ios/App/App/Base.lproj/Main.storyboard b/frontend/ios/App/App/Base.lproj/Main.storyboard deleted file mode 100644 index b44df7b..0000000 --- a/frontend/ios/App/App/Base.lproj/Main.storyboard +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/frontend/ios/App/App/Info.plist b/frontend/ios/App/App/Info.plist deleted file mode 100644 index ee6faae..0000000 --- a/frontend/ios/App/App/Info.plist +++ /dev/null @@ -1,69 +0,0 @@ - - - - - CFBundleDevelopmentRegion - de - CFBundleDisplayName - FEDEO - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleURLTypes - - - CFBundleURLSchemes - - fedeo - - - - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - LSRequiresIPhoneOS - - NSLocationAlwaysUsageDescription - One Signal Notifications - NSLocationWhenInUseUsageDescription - One Signal Notifications - NSSupportsLiveActivities - - NSSupportsLiveActivitiesFrequentUpdates - - UIBackgroundModes - - remote-notification - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - - UIViewControllerBasedStatusBarAppearance - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - - diff --git a/frontend/ios/App/OneSignalNotificationServiceExtension/Info.plist b/frontend/ios/App/OneSignalNotificationServiceExtension/Info.plist deleted file mode 100644 index 57421eb..0000000 --- a/frontend/ios/App/OneSignalNotificationServiceExtension/Info.plist +++ /dev/null @@ -1,13 +0,0 @@ - - - - - NSExtension - - NSExtensionPointIdentifier - com.apple.usernotifications.service - NSExtensionPrincipalClass - $(PRODUCT_MODULE_NAME).NotificationService - - - diff --git a/frontend/ios/App/OneSignalNotificationServiceExtension/NotificationService.swift b/frontend/ios/App/OneSignalNotificationServiceExtension/NotificationService.swift deleted file mode 100644 index 14c7ff4..0000000 --- a/frontend/ios/App/OneSignalNotificationServiceExtension/NotificationService.swift +++ /dev/null @@ -1,35 +0,0 @@ -import UserNotifications - -import OneSignalExtension - -class NotificationService: UNNotificationServiceExtension { - - var contentHandler: ((UNNotificationContent) -> Void)? - var receivedRequest: UNNotificationRequest! - var bestAttemptContent: UNMutableNotificationContent? - - override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) { - self.receivedRequest = request - self.contentHandler = contentHandler - self.bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent) - - if let bestAttemptContent = bestAttemptContent { - /* DEBUGGING: Uncomment the 2 lines below to check this extension is executing - Note, this extension only runs when mutable-content is set - Setting an attachment or action buttons automatically adds this */ - // print("Running NotificationServiceExtension") - // bestAttemptContent.body = "[Modified] " + bestAttemptContent.body - - OneSignalExtension.didReceiveNotificationExtensionRequest(self.receivedRequest, with: bestAttemptContent, withContentHandler: self.contentHandler) - } - } - - override func serviceExtensionTimeWillExpire() { - // Called just before the extension will be terminated by the system. - // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used. - if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent { - OneSignalExtension.serviceExtensionTimeWillExpireRequest(self.receivedRequest, with: self.bestAttemptContent) - contentHandler(bestAttemptContent) - } - } -} \ No newline at end of file diff --git a/frontend/ios/App/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements b/frontend/ios/App/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements deleted file mode 100644 index 4971b49..0000000 --- a/frontend/ios/App/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements +++ /dev/null @@ -1,10 +0,0 @@ - - - - - com.apple.security.application-groups - - group.software.federspiel.fedeo.onesignal - - - diff --git a/frontend/ios/App/Podfile b/frontend/ios/App/Podfile deleted file mode 100644 index e0e2f1d..0000000 --- a/frontend/ios/App/Podfile +++ /dev/null @@ -1,41 +0,0 @@ -require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers' - -platform :ios, '14.0' -use_frameworks! - -# workaround to avoid Xcode caching of Pods that requires -# Product -> Clean Build Folder after new Cordova plugins installed -# Requires CocoaPods 1.6 or newer -install! 'cocoapods', :disable_input_output_paths => true - -def capacitor_pods - pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' - pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' - pod 'CapacitorBrowser', :path => '../../node_modules/@capacitor/browser' - pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device' - pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network' - pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences' - pod 'CapacitorPluginSafeArea', :path => '../../node_modules/capacitor-plugin-safe-area' - pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins' -end - -target 'App' do - capacitor_pods - # Add your Pods here -end - -post_install do |installer| - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - # iOS Deployment Target erzwingen - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0' - - # Alle Warnungen auf inherited setzen, falls Pods Dinge überschreiben - config.build_settings['CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER'] = '$(inherited)' - end - end -end - -target 'OneSignalNotificationServiceExtension' do - pod 'OneSignalXCFramework', '>= 5.0', '< 6.0' -end diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue index 4993db6..918536c 100644 --- a/frontend/layouts/default.vue +++ b/frontend/layouts/default.vue @@ -3,7 +3,6 @@ import MainNav from "~/components/MainNav.vue"; import dayjs from "dayjs"; -import {useCapacitor} from "../composables/useCapacitor.js"; import GlobalMessages from "~/components/GlobalMessages.vue"; import TenantDropdown from "~/components/TenantDropdown.vue"; import LabelPrinterButton from "~/components/LabelPrinterButton.vue"; @@ -228,13 +227,6 @@ const footerLinks = [ - - - @@ -266,11 +258,6 @@ const footerLinks = [ -
diff --git a/frontend/layouts/mobile.vue b/frontend/layouts/mobile.vue deleted file mode 100644 index cb232c1..0000000 --- a/frontend/layouts/mobile.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/middleware/redirectToMobileIndex.ts b/frontend/middleware/redirectToMobileIndex.ts deleted file mode 100644 index e332a1b..0000000 --- a/frontend/middleware/redirectToMobileIndex.ts +++ /dev/null @@ -1,9 +0,0 @@ -export default defineNuxtRouteMiddleware(async (to, _from) => { - const router = useRouter() - - console.log(useCapacitor().getIsNative()) - - if(useCapacitor().getIsNative() && _from.path !== '/mobile') { - return router.push('/mobile') - } -}) diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue index 41cb992..57b60d9 100644 --- a/frontend/pages/index.vue +++ b/frontend/pages/index.vue @@ -80,9 +80,6 @@ import Nimbot from "~/components/nimbot.vue"; import LabelPrintModal from "~/components/LabelPrintModal.vue"; -definePageMeta({ - middleware: 'redirect-to-mobile-index' -}) const modal = useModal(); diff --git a/frontend/pages/login.vue b/frontend/pages/login.vue index 70f0b2a..db40e74 100644 --- a/frontend/pages/login.vue +++ b/frontend/pages/login.vue @@ -7,19 +7,14 @@ const auth = useAuthStore() const toast = useToast() const router = useRouter() -const platformIsNative = useCapacitor().getIsNative() - - const doLogin = async (data:any) => { try { await auth.login(data.email, data.password) // Weiterleiten nach erfolgreichem Login toast.add({title:"Einloggen erfolgreich"}) - if(platformIsNative) { - await router.push("/mobile") - } else { - await router.push("/") - } + + await router.push("/") + } catch (err: any) { toast.add({title:"Zugangsdaten falsch. Bitte überprüfen Sie Ihre Eingaben",color:"rose"}) } @@ -27,7 +22,7 @@ const doLogin = async (data:any) => { -
+ \ No newline at end of file diff --git a/frontend/pages/mobile/index.vue b/frontend/pages/mobile/index.vue deleted file mode 100644 index 71f1c29..0000000 --- a/frontend/pages/mobile/index.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/pages/mobile/menu.vue b/frontend/pages/mobile/menu.vue deleted file mode 100644 index ee39712..0000000 --- a/frontend/pages/mobile/menu.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/pages/staff/time/[id]/evaluate.vue b/frontend/pages/staff/time/[id]/evaluate.vue index 8f75226..32da562 100644 --- a/frontend/pages/staff/time/[id]/evaluate.vue +++ b/frontend/pages/staff/time/[id]/evaluate.vue @@ -24,7 +24,7 @@ const workingTimeInfo = ref<{ } | null; // Neue Struktur für die Zusammenfassung } | null>(null) -const platformIsNative = ref(useCapacitor().getIsNative()) +const platformIsNative = ref(false) const selectedPresetRange = ref("Dieser Monat bis heute") const selectedStartDay = ref("") diff --git a/frontend/pages/staff/time/index.vue b/frontend/pages/staff/time/index.vue index a546533..fb6e4e8 100644 --- a/frontend/pages/staff/time/index.vue +++ b/frontend/pages/staff/time/index.vue @@ -14,7 +14,7 @@ const toast = useToast() const { $dayjs } = useNuxtApp() // MOBILE DETECTION -const platformIsNative = useCapacitor().getIsNative() +const platformIsNative = false // STATE const loading = ref(false) diff --git a/frontend/pages/standardEntity/[type]/[mode]/[[id]].vue b/frontend/pages/standardEntity/[type]/[mode]/[[id]].vue index 0bf2688..1aea203 100644 --- a/frontend/pages/standardEntity/[type]/[mode]/[[id]].vue +++ b/frontend/pages/standardEntity/[type]/[mode]/[[id]].vue @@ -1,7 +1,5 @@