From 75f6a039d5546edb69394255ee0ae764db705769 Mon Sep 17 00:00:00 2001 From: webprofusion-chrisc Date: Tue, 30 Jul 2024 12:32:31 +0800 Subject: [PATCH] Update ionic version --- LICENSE | 2 +- android/app/build.gradle | 6 +- .../app/src/main/assets/capacitor.config.json | 2 +- android/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/variables.gradle | 14 ++-- angular.json | 2 +- capacitor.config.ts | 2 +- package.json | 64 +++++++++---------- .../poi-equipment-editor.html | 27 +++----- src/app/pages/poi-editor/poi-editor.page.html | 49 +++++--------- src/app/pages/signin/signin.html | 6 +- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 +- src/global.scss | 25 -------- src/index.html | 2 - 16 files changed, 78 insertions(+), 135 deletions(-) diff --git a/LICENSE b/LICENSE index 34e050f1..a4a6c28b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2011 - 2021 Webprofusion Pty Ltd for Open Charge Map +Copyright (c) 2011 - 2024 Webprofusion Pty Ltd for Open Charge Map Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/android/app/build.gradle b/android/app/build.gradle index 05805e1d..764fb9e0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.application' android { namespace "com.webprofusion.openchargemap" - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion defaultConfig { applicationId "com.webprofusion.openchargemap" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 80857 - versionName "8.5.7" + versionCode 80870 + versionName "8.7.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json index 40722c1d..a9bd00cf 100644 --- a/android/app/src/main/assets/capacitor.config.json +++ b/android/app/src/main/assets/capacitor.config.json @@ -1,6 +1,6 @@ { "appId": "com.webprofusion.openchargemap", "appName": "Open Charge Map", - "webDir": "www", + "webDir": "www/browser", "android": {} } diff --git a/android/build.gradle b/android/build.gradle index e914ead1..85a5dda2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,8 +7,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' - classpath 'com.google.gms:google-services:4.3.15' + classpath 'com.android.tools.build:gradle:8.2.1' + classpath 'com.google.gms:google-services:4.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 761b8f08..9b0a13f0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/variables.gradle b/android/variables.gradle index 5946adab..8ef305d0 100644 --- a/android/variables.gradle +++ b/android/variables.gradle @@ -1,14 +1,14 @@ ext { minSdkVersion = 22 - compileSdkVersion = 33 - targetSdkVersion = 33 - androidxActivityVersion = '1.7.0' + compileSdkVersion = 34 + targetSdkVersion = 34 + androidxActivityVersion = '1.8.0' androidxAppCompatVersion = '1.6.1' androidxCoordinatorLayoutVersion = '1.2.0' - androidxCoreVersion = '1.10.0' - androidxFragmentVersion = '1.5.6' - coreSplashScreenVersion = '1.0.0' - androidxWebkitVersion = '1.6.1' + androidxCoreVersion = '1.12.0' + androidxFragmentVersion = '1.6.2' + coreSplashScreenVersion = '1.0.1' + androidxWebkitVersion = '1.9.0' junitVersion = '4.13.2' androidxJunitVersion = '1.1.5' androidxEspressoCoreVersion = '3.5.1' diff --git a/angular.json b/angular.json index 7f7a503f..acf615ac 100644 --- a/angular.json +++ b/angular.json @@ -13,7 +13,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "www", + "outputPath": "www/browser", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", diff --git a/capacitor.config.ts b/capacitor.config.ts index 7eb810a6..8eff8876 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -3,7 +3,7 @@ import { CapacitorConfig } from "@capacitor/cli"; const config: CapacitorConfig = { appId: "com.webprofusion.openchargemap", appName: "Open Charge Map", - webDir: "www\browser", + webDir: "www/browser", android: { buildOptions: { keystorePath: "c:/Work/GIT/ocm-private/Certs/Android/android.keystore", diff --git a/package.json b/package.json index 9913e9a2..a8544cb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "io.openchargemap.app", - "version": "8.6.1", + "version": "8.7.0", "author": "Webprofusion", "homepage": "https://openchargemap.org", "scripts": { @@ -16,25 +16,25 @@ }, "private": true, "dependencies": { - "@angular/common": "17.1.1", - "@angular/core": "17.1.1", - "@angular/forms": "17.1.1", - "@angular/localize": "17.1.1", - "@angular/platform-browser": "17.1.1", - "@angular/platform-browser-dynamic": "17.1.1", - "@angular/router": "17.1.1", - "@angular/service-worker": "17.1.1", + "@angular/common": "18.1.2", + "@angular/core": "18.1.2", + "@angular/forms": "18.1.2", + "@angular/localize": "18.1.2", + "@angular/platform-browser": "18.1.2", + "@angular/platform-browser-dynamic": "18.1.2", + "@angular/router": "18.1.2", + "@angular/service-worker": "18.1.2", "@auth0/angular-jwt": "5.2.0", - "@capacitor/android": "5.5.1", - "@capacitor/app": "5.0.6", - "@capacitor/core": "5.5.1", - "@capacitor/geolocation": "5.0.6", - "@capacitor/haptics": "5.0.6", - "@capacitor/ios": "5.5.1", - "@capacitor/keyboard": "5.0.6", - "@capacitor/push-notifications": "5.1.0", - "@capacitor/splash-screen": "5.0.6", - "@capacitor/status-bar": "5.0.6", + "@capacitor/android": "^6.0.0", + "@capacitor/app": "^6.0.0", + "@capacitor/core": "^6.0.0", + "@capacitor/geolocation": "^6.0.0", + "@capacitor/haptics": "^6.0.0", + "@capacitor/ios": "^6.0.0", + "@capacitor/keyboard": "^6.0.0", + "@capacitor/push-notifications": "^6.0.0", + "@capacitor/splash-screen": "^6.0.0", + "@capacitor/status-bar": "^6.0.0", "@ionic/angular": "^8.2.6", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", @@ -46,17 +46,17 @@ "zone.js": "0.14.2" }, "devDependencies": { - "@angular-devkit/build-angular": "17.1.1", - "@angular-eslint/builder": "17.2.1", - "@angular-eslint/eslint-plugin": "17.2.1", - "@angular-eslint/eslint-plugin-template": "17.2.1", - "@angular-eslint/schematics": "17.2.1", - "@angular-eslint/template-parser": "17.2.1", - "@angular/cli": "17.1.1", - "@angular/compiler": "17.1.1", - "@angular/compiler-cli": "17.1.1", - "@angular/language-service": "17.1.1", - "@capacitor/cli": "5.6.0", + "@angular-devkit/build-angular": "18.1.2", + "@angular-eslint/builder": "18.1.0", + "@angular-eslint/eslint-plugin": "18.1.0", + "@angular-eslint/eslint-plugin-template": "18.1.0", + "@angular-eslint/schematics": "18.1.0", + "@angular-eslint/template-parser": "18.1.0", + "@angular/cli": "18.1.2", + "@angular/compiler": "18.1.2", + "@angular/compiler-cli": "18.1.2", + "@angular/language-service": "18.1.2", + "@capacitor/cli": "^6.0.0", "@ionic/angular-toolkit": "11.0.1", "@ionic/lab": "3.2.15", "@types/google.maps": "3.53.4", @@ -71,7 +71,7 @@ "karma-jasmine": "5.1.0", "karma-jasmine-html-reporter": "2.1.0", "ts-node": "10.9.1", - "typescript": "5.2.2", + "typescript": "5.5.4", "webpack-dev-server": "^4.13.1" }, "browserslist": [ @@ -79,4 +79,4 @@ "not IE 11" ], "description": "Open Charge Map" -} +} \ No newline at end of file diff --git a/src/app/components/poi-equipment-editor/poi-equipment-editor.html b/src/app/components/poi-equipment-editor/poi-equipment-editor.html index 5e9d7721..6fed5d6c 100644 --- a/src/app/components/poi-equipment-editor/poi-equipment-editor.html +++ b/src/app/components/poi-equipment-editor/poi-equipment-editor.html @@ -9,49 +9,40 @@

Please provide as much information as you can about the equipment. If you don't know then leave the field blank. At a minimum you should include the Connection Type and approximate Power kW (max).

- Connection Type - + Unknown {{t.Title}} - Supply Type - + Unknown {{t.Title}} - Power (kW) - + - Amps - + - Voltage - + - Status - + {{t.Title}} - Quantity Available - + - Comment - + - Operators Reference - + diff --git a/src/app/pages/poi-editor/poi-editor.page.html b/src/app/pages/poi-editor/poi-editor.page.html index 9e6f2ee4..1c8f3c82 100644 --- a/src/app/pages/poi-editor/poi-editor.page.html +++ b/src/app/pages/poi-editor/poi-editor.page.html @@ -38,42 +38,32 @@ - Location Name - + - Address Line 1 - + - Address Line 2 - + - Town - + - State or Province - + - Postal Code - + - Country - + {{c.Title}} - - - @@ -175,41 +165,32 @@

Equipment

Please provide any other facts related to this site. Additional comments (your charging experiences etc) can be added as check-in comments once the site is listed.

- Operational Status (All Equipment)) - + {{i.Title}} - Usage Type - + {{i.Title}} - Usage Cost - + - General Comments - + - - Main Telephone Number - + - Other Telephone Number - + - Access Comments - + - Related Website - + diff --git a/src/app/pages/signin/signin.html b/src/app/pages/signin/signin.html index 30258db2..1cf5c377 100644 --- a/src/app/pages/signin/signin.html +++ b/src/app/pages/signin/signin.html @@ -27,13 +27,11 @@

- Email - + - Password - + diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 00dee659..719e933d 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -2,7 +2,7 @@ import { MappingAPI } from "../app/services/mapping/interfaces/mapping"; export const environment = { name: 'prod', - version: '8.6.1', + version: '8.7.0', production: true, analyticsId: '', googleMapsKey: '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 9c528a2d..168ac8e5 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ import { MappingAPI } from "../app/services/mapping/interfaces/mapping"; // The list of which env maps to which file can be found in `.angular-cli.json`. export const environment = { name: 'dev', - version: '8.6.1-dev', + version: '8.7.0-dev', production: false, analyticsId: '', googleMapsKey: '', @@ -16,7 +16,7 @@ export const environment = { defaultMapProvider: 4, // 1: GM native 4: MapBox // 5:MappingAPI.MAPKIT_JS //6: mapbox GL with Maptiler, apiBase: 'https://api-01.openchargemap.io', apiKey: '1d192491-c085-4563-9dbb-b1f09a2e9c66', - enabledFeatures: ['MAP', 'ADD_COMMENT', 'ADD_PHOTO', 'FAVOURITES', 'FILTER_OPTIONS_BY_COUNTRY', 'ADD_POI', 'EDIT_POI','LAYERS'] + enabledFeatures: ['MAP', 'ADD_COMMENT', 'ADD_PHOTO', 'FAVOURITES', 'FILTER_OPTIONS_BY_COUNTRY', 'ADD_POI', 'EDIT_POI', 'LAYERS'] }; /* diff --git a/src/global.scss b/src/global.scss index 56e99154..9ec089c5 100644 --- a/src/global.scss +++ b/src/global.scss @@ -28,28 +28,3 @@ color: var(--ion-color-medium); font-size: 80%; } -/* -ion-refresher { - z-index: 10; - background-color: #ffffff33; -} -.alert-radio-label.sc-ion-alert-md, -.alert-checkbox-label.sc-ion-alert-md { - padding-left: 52px; - padding-right: 26px; - padding-top: 13px; - padding-bottom: 13px; - flex: 1; - color: var(--ion-color-step-850, #262626); - font-size: 14px; - text-overflow: ellipsis; - white-space: pre-line; -} - -.alert-radio-label.sc-ion-alert-ios, -.alert-checkbox-label.sc-ion-alert-ios { - white-space: pre-line; - font-size: 13px; - padding-bottom: 2px; -} -*/ \ No newline at end of file diff --git a/src/index.html b/src/index.html index 6bf298f1..7bd42e5c 100644 --- a/src/index.html +++ b/src/index.html @@ -19,8 +19,6 @@ - -