diff --git a/app.vue b/app.vue index d4950eb..c3a2747 100644 --- a/app.vue +++ b/app.vue @@ -19,7 +19,7 @@ const dev = process.dev useHead({ title:"FEDEO", meta: [ - { name: 'viewport', content: 'width=device-width, initial-scale=1' } + { name: 'viewport', content: 'width=device-width, initial-scale=1, viewport-fit=cover' }, ], link: [ { rel: 'icon', href: '/favicon.ico' } @@ -45,14 +45,17 @@ useSeoMeta({ @@ -122,5 +125,11 @@ useSeoMeta({ color: #69c350 } - +.safearea { + margin-top: env(safe-area-inset-top, 10px) !important; + margin-left: env(safe-area-inset-left, 5px) !important; + margin-right: env(safe-area-inset-right, 5px) !important; + margin-bottom: env(safe-area-inset-bottom, 37px) !important; + /*background-color: grey;*/ +} \ No newline at end of file diff --git a/capacitor.config.ts b/capacitor.config.ts index b74cd84..6e25aa1 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -6,6 +6,10 @@ const config: CapacitorConfig = { webDir: 'dist', ios: { handleApplicationNotifications: false + }, + server: { + url: "http://192.168.1.226:3000", + cleartext: true } }; diff --git a/composables/useCapacitor.js b/composables/useCapacitor.js new file mode 100644 index 0000000..e8456a0 --- /dev/null +++ b/composables/useCapacitor.js @@ -0,0 +1,30 @@ +import {Capacitor} from "@capacitor/core"; +import {Device} from "@capacitor/device"; +import {Network} from "@capacitor/network"; + +export const useCapacitor = () => { + const getPlatform = () => { + return Capacitor.getPlatform() + } + + const getDeviceInfo = async () => { + return await Device.getInfo() + } + + const getIsPhone = async () => { + let deviceInfo = await useCapacitor().getDeviceInfo() + + if(deviceInfo.model.toLowerCase().includes('iphone')) { + return true + } else { + return false + } + } + + const getNetworkStatus = async () => { + return await Network.getStatus() + } + + + return {getPlatform, getDeviceInfo, getNetworkStatus, getIsPhone} +} \ No newline at end of file diff --git a/composables/useFiles.js b/composables/useFiles.js index 82a278f..20250ef 100644 --- a/composables/useFiles.js +++ b/composables/useFiles.js @@ -1,4 +1,3 @@ -import index from "v-calendar"; export const useFiles = () => { const supabase = useSupabaseClient() diff --git a/ios/App/Podfile b/ios/App/Podfile index e49fb6e..05c9cc3 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -13,6 +13,7 @@ def capacitor_pods pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device' pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network' + pod 'CapacitorPluginSafeArea', :path => '../../node_modules/capacitor-plugin-safe-area' pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins' end diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index 921b6c4..5510ba5 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -6,6 +6,8 @@ PODS: - Capacitor - CapacitorNetwork (7.0.0): - Capacitor + - CapacitorPluginSafeArea (4.0.0): + - Capacitor - CordovaPluginsStatic (7.1.0): - CapacitorCordova - OneSignalXCFramework (= 5.2.10) @@ -61,6 +63,7 @@ DEPENDENCIES: - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)" - "CapacitorDevice (from `../../node_modules/@capacitor/device`)" - "CapacitorNetwork (from `../../node_modules/@capacitor/network`)" + - CapacitorPluginSafeArea (from `../../node_modules/capacitor-plugin-safe-area`) - CordovaPluginsStatic (from `../capacitor-cordova-ios-plugins`) - OneSignalXCFramework (< 6.0, >= 5.0) @@ -77,6 +80,8 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/device" CapacitorNetwork: :path: "../../node_modules/@capacitor/network" + CapacitorPluginSafeArea: + :path: "../../node_modules/capacitor-plugin-safe-area" CordovaPluginsStatic: :path: "../capacitor-cordova-ios-plugins" @@ -85,9 +90,10 @@ SPEC CHECKSUMS: CapacitorCordova: 866217f32c1d25b326c568a10ea3ed0c36b13e29 CapacitorDevice: 069faf433b3a99c3d5f0e500fbe634f60a8c6a84 CapacitorNetwork: 30c2e78a0ed32530656cb426c8ee6c2caec10dbf + CapacitorPluginSafeArea: 22031c3436269ca80fac90ec2c94bc7c1e59a81d CordovaPluginsStatic: f722d4ff434f50099581e690d579b7c108f490e6 OneSignalXCFramework: 1a3b28dfbff23aabce585796d23c1bef37772774 -PODFILE CHECKSUM: a76b76ce1d80d4f5e496b01be96018c23d93b734 +PODFILE CHECKSUM: ccfbce7f13cfefd953204fe26b280d6431731aa5 COCOAPODS: 1.16.2 diff --git a/layouts/default.vue b/layouts/default.vue index 16b0a10..e1f611b 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -4,6 +4,7 @@ import MainNav from "~/components/MainNav.vue"; import dayjs from "dayjs"; import {useProfileStore} from "~/stores/profile.js"; +import {useCapacitor} from "../composables/useCapacitor.js"; const dataStore = useDataStore() const profileStore = useProfileStore() @@ -107,14 +108,13 @@ const footerLinks = [/*{ click: () => isHelpSlideoverOpen.value = true }] -