diff --git a/capacitor.config.ts b/capacitor.config.ts index 0e92b40..c45bf74 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -1,12 +1,17 @@ import { CapacitorConfig } from '@capacitor/cli' +import { execSync } from 'child_process' + +const ipAddress = execSync(`ipconfig getifaddr en0`, { + encoding: 'utf-8', +}).trim() const config: CapacitorConfig = { appId: 'com.example.app', appName: 'senseBox:Bike X SIMPORT', webDir: 'out', - // server: { - // url: 'http://192.168.0.220:3000', - // }, + server: { + url: `http://${ipAddress}:3000`, + }, } export default config diff --git a/ios/App/App/capacitor.config.json b/ios/App/App/capacitor.config.json index 49ee4d2..e9b2f45 100644 --- a/ios/App/App/capacitor.config.json +++ b/ios/App/App/capacitor.config.json @@ -1,8 +1,8 @@ { - "appId": "com.example.app", - "appName": "senseBox:Bike X SIMPORT", - "webDir": "out", - "server": { - "url": "http://192.168.0.220:3000" - } + "appId": "com.example.app", + "appName": "senseBox:Bike X SIMPORT", + "webDir": "out", + "server": { + "url": "http://192.168.2.135:3000" + } } diff --git a/ios/App/Podfile b/ios/App/Podfile index 19f43dd..0985d56 100644 --- 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 index 5a58dca..cdc533f 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - Capacitor (5.3.0): + - Capacitor (5.4.2): - CapacitorCordova - CapacitorCommunityBackgroundGeolocation (0.0.1): - Capacitor - - CapacitorCommunityBluetoothLe (3.0.1): + - CapacitorCommunityBluetoothLe (3.0.2): - Capacitor - - CapacitorCordova (5.3.0) + - CapacitorCordova (5.4.2) DEPENDENCIES: - "Capacitor (from `../../node_modules/@capacitor/ios`)" @@ -24,11 +24,11 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/ios" SPEC CHECKSUMS: - Capacitor: 1ac9165943bc4f2137642d218c5ba05df811de69 + Capacitor: 8a9db42d105f55843cd8ed2a3cb54e2b78e7f102 CapacitorCommunityBackgroundGeolocation: 6f26f4290377dbd1d6dec21e62cb66f008f61ec7 - CapacitorCommunityBluetoothLe: 308770c1ee9499c216776159326bc2b9a49076b4 - CapacitorCordova: b9374d68e63ce29e96ab5db994cf14fbefd722c9 + CapacitorCommunityBluetoothLe: 83b0de348b2ec461e0f9fa0e48c9e79c8378ddb0 + CapacitorCordova: cfcc06b698481da655415985eeb2b8da363f8451 -PODFILE CHECKSUM: 6e41747aee00f59e1e4a8249f9aa31ede26dcdf5 +PODFILE CHECKSUM: 12d4cb362d5c8d4fe865a752ab1c768fe69eac2d COCOAPODS: 1.11.3 diff --git a/ios/capacitor-cordova-ios-plugins/CordovaPlugins.podspec b/ios/capacitor-cordova-ios-plugins/CordovaPlugins.podspec index 2025a42..23a6e4c 100644 --- a/ios/capacitor-cordova-ios-plugins/CordovaPlugins.podspec +++ b/ios/capacitor-cordova-ios-plugins/CordovaPlugins.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = 'CordovaPlugins' - s.version = '5.3.0' + s.version = '5.4.2' s.summary = 'Autogenerated spec' s.license = 'Unknown' s.homepage = 'https://example.com' s.authors = { 'Capacitor Generator' => 'hi@example.com' } - s.source = { :git => 'https://github.com/ionic-team/does-not-exist.git', :tag => '5.3.0' } + s.source = { :git => 'https://github.com/ionic-team/does-not-exist.git', :tag => '5.4.2' } s.source_files = 'sources/**/*.{swift,h,m,c,cc,mm,cpp}' s.ios.deployment_target = '13.0' s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1 WK_WEB_VIEW_ONLY=1' } diff --git a/ios/capacitor-cordova-ios-plugins/CordovaPluginsStatic.podspec b/ios/capacitor-cordova-ios-plugins/CordovaPluginsStatic.podspec index 33e362c..cce935f 100644 --- a/ios/capacitor-cordova-ios-plugins/CordovaPluginsStatic.podspec +++ b/ios/capacitor-cordova-ios-plugins/CordovaPluginsStatic.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = 'CordovaPluginsStatic' - s.version = '5.3.0' + s.version = '5.4.2' s.summary = 'Autogenerated spec' s.license = 'Unknown' s.homepage = 'https://example.com' s.authors = { 'Capacitor Generator' => 'hi@example.com' } - s.source = { :git => 'https://github.com/ionic-team/does-not-exist.git', :tag => '5.3.0' } + s.source = { :git => 'https://github.com/ionic-team/does-not-exist.git', :tag => '5.4.2' } s.source_files = 'sourcesstatic/**/*.{swift,h,m,c,cc,mm,cpp}' s.ios.deployment_target = '13.0' s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1 WK_WEB_VIEW_ONLY=1' } diff --git a/package.json b/package.json index 60f0f42..3255552 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "static": "next build && next export" }, "dependencies": { - "@capacitor-community/background-geolocation": "felixerdy/background-geolocation", + "@capacitor-community/background-geolocation": "felixerdy/background-geolocation#feat/process-external-location", "@capacitor-community/bluetooth-le": "^3.0.1", "@capacitor/android": "^5.3.0", "@capacitor/core": "^5.3.0", @@ -27,6 +27,7 @@ "@radix-ui/react-toast": "^1.1.4", "@radix-ui/react-toggle": "^1.0.3", "@turf/circle": "^6.5.0", + "@turf/helpers": "^6.5.0", "autoprefixer": "10.4.15", "class-variance-authority": "^0.7.0", "clsx": "^2.0.0", diff --git a/src/app/device/page.tsx b/src/app/device/page.tsx index 1e4a181..27a940d 100644 --- a/src/app/device/page.tsx +++ b/src/app/device/page.tsx @@ -5,37 +5,18 @@ import { useEffect, useState } from 'react' import MeasurementsOverview from '@/components/Map/MeasurementsOverview' import ControlBar from '@/components/Map/ControlBar' import useSenseBox from '@/lib/useSenseBox' -import { Source, Layer } from 'react-map-gl/maplibre' import LocationMarker from '@/components/Map/LocationMarker' +import LocationHistory from '@/components/Map/LocationHistory' export default function Home() { - const [recording, setRecording] = useState(false) - - const { values, connect, isConnected, disconnect } = useSenseBox() - - useEffect(() => { - if (recording && !isConnected) { - connect() - return - } - if (!recording && isConnected) { - disconnect() - return - } - }) + const { values, isConnected } = useSenseBox() return (