Update ionic + angular version

openchargemap · Jul 30, 2024 · 2549241 · 2549241
1 parent e21c479
commit 2549241
Show file tree

Hide file tree

Showing 16 changed files with 78 additions and 135 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,12 +71,12 @@
     "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": [
     "defaults",
     "not IE 11"
   ],
   "description": "Open Charge Map"
-}
+}
diff --git 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 @@
 
   <p>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).</p>
   <ion-item>
-    <ion-label position="floating">Connection Type</ion-label>
-    <ion-select [(ngModel)]="conn.ConnectionTypeID">
+    <ion-select label="Connection Type" label-placement="floating" [(ngModel)]="conn.ConnectionTypeID">
       <ion-select-option value="0">Unknown</ion-select-option>
       <ion-select-option *ngFor="let t of connectionTypes" [value]="t.ID">{{t.Title}}</ion-select-option>
     </ion-select>
   </ion-item>
 
   <ion-item>
-    <ion-label position="floating">Supply Type</ion-label>
-    <ion-select [(ngModel)]="conn.CurrentTypeID">
+    <ion-select label="Supply Type" label-placement="floating" [(ngModel)]="conn.CurrentTypeID">
       <ion-select-option value="0">Unknown</ion-select-option>
       <ion-select-option *ngFor="let t of currentTypes" [value]="t.ID">{{t.Title}}</ion-select-option>
     </ion-select>
   </ion-item>
   <ion-item>
-    <ion-label position="floating">Power (kW)</ion-label>
-    <ion-input type="number" [(ngModel)]="conn.PowerKW"></ion-input>
+    <ion-input label="Power (kW)" label-placement="floating" type="number" [(ngModel)]="conn.PowerKW"></ion-input>
   </ion-item>
   <ion-item>
-    <ion-label position="floating">Amps</ion-label>
-    <ion-input type="number" [(ngModel)]="conn.Amps"></ion-input>
+    <ion-input label="Amps" label-placement="floating" type="number" [(ngModel)]="conn.Amps"></ion-input>
   </ion-item>
   <ion-item>
-    <ion-label position="floating">Voltage</ion-label>
-    <ion-input type="number" [(ngModel)]="conn.Voltage"></ion-input>
+    <ion-input label="Voltage" label-placement="floating" type="number" [(ngModel)]="conn.Voltage"></ion-input>
   </ion-item>
   <ion-item>
-    <ion-label position="floating">Status</ion-label>
-    <ion-select [(ngModel)]="conn.StatusTypeID">
+    <ion-select label="Status" label-placement="floating" [(ngModel)]="conn.StatusTypeID">
       <ion-select-option *ngFor="let t of statusTypes" [value]="t.ID">{{t.Title}}</ion-select-option>
     </ion-select>
   </ion-item>
   <ion-item>
-    <ion-label position="floating">Quantity Available</ion-label>
-    <ion-input type="number" [(ngModel)]="conn.Quantity"></ion-input>
+    <ion-input label="Quantity Available" label-placement="floating" type="number" [(ngModel)]="conn.Quantity"></ion-input>
   </ion-item>
   <ion-item>
-    <ion-label position="floating">Comment</ion-label>
-    <ion-input type="text" [(ngModel)]="conn.Comments" placeholder="(optional) other comments"></ion-input>
+    <ion-input label="Comment" label-placement="floating" type="text" [(ngModel)]="conn.Comments" placeholder="(optional) other comments"></ion-input>
   </ion-item>
   <ion-item>
-    <ion-label position="floating">Operators Reference</ion-label>
-    <ion-input type="text" [(ngModel)]="conn.Reference"></ion-input>
+    <ion-input label="Operators Reference" label-placement="floating" type="text" [(ngModel)]="conn.Reference" placeholder="(optional)"></ion-input>
   </ion-item>
 </ion-content>
 <ion-footer>

diff --git a/src/app/pages/poi-editor/poi-editor.page.html b/src/app/pages/poi-editor/poi-editor.page.html
@@ -38,42 +38,32 @@
 
         <ion-list>
           <ion-item>
-            <ion-label position="floating">Location Name</ion-label>
-            <ion-input type="text" [(ngModel)]="item.AddressInfo.Title" autocapitalize="words" placeholder="A title for this location"></ion-input>
+            <ion-input label="Location Name" label-placement="floating" type="text" [(ngModel)]="item.AddressInfo.Title" autocapitalize="words" placeholder="A title for this location"></ion-input>
           </ion-item>
           <ion-item>
-            <ion-label position="floating">Address Line 1</ion-label>
-            <ion-input type="text" [(ngModel)]="item.AddressInfo.AddressLine1" autocapitalize="words" placeholder="The nearest street address"></ion-input>
+            <ion-input label="Address Line 1" label-placement="floating" type="text" [(ngModel)]="item.AddressInfo.AddressLine1" autocapitalize="words" placeholder="The nearest street address"></ion-input>
           </ion-item>
           <ion-item>
-            <ion-label position="floating">Address Line 2</ion-label>
-            <ion-input type="text" [(ngModel)]="item.AddressInfo.AddressLine2" autocapitalize="words"  placeholder="Optional"></ion-input>
+            <ion-input label="Address Line 2" label-placement="floating" type="text" [(ngModel)]="item.AddressInfo.AddressLine2" autocapitalize="words"  placeholder="Optional"></ion-input>
           </ion-item>
           <ion-item>
-            <ion-label position="floating">Town</ion-label>
-            <ion-input type="text" [(ngModel)]="item.AddressInfo.Town" autocapitalize="words" placeholder="Town or City"></ion-input>
+            <ion-input label="Town" label-placement="floating" type="text" [(ngModel)]="item.AddressInfo.Town" autocapitalize="words" placeholder="Town or City"></ion-input>
           </ion-item>
           <ion-item>
-            <ion-label position="floating">State or Province</ion-label>
-            <ion-input type="text" [(ngModel)]="item.AddressInfo.StateOrProvince"></ion-input>
+            <ion-input label="State or Province" label-placement="floating" type="text" [(ngModel)]="item.AddressInfo.StateOrProvince"></ion-input>
           </ion-item>
           <ion-item>
-            <ion-label position="floating">Postal Code</ion-label>
-            <ion-input type="text" [(ngModel)]="item.AddressInfo.Postcode" autocapitalize="words"  placeholder="Optional Postal Code"></ion-input>
+            <ion-input label="Postal Code" label-placement="floating" type="text" [(ngModel)]="item.AddressInfo.Postcode" autocapitalize="words"  placeholder="Optional Postal Code"></ion-input>
           </ion-item>
           <ion-item>
-            <ion-label position="floating">Country</ion-label>
-            <ion-select [(ngModel)]="item.AddressInfo.CountryID" (ionChange)="onCountryChange()">
+            <ion-select label="Country" label-placement="floating" [(ngModel)]="item.AddressInfo.CountryID" (ionChange)="onCountryChange()">
               <ion-select-option *ngFor="let c of countries" [value]="c.ID">{{c.Title}}</ion-select-option>
             </ion-select>
-
           </ion-item>
           <ion-item>
-
             <ion-input label="Latitude" labelPlacement="floating" type="number" [(ngModel)]="item.AddressInfo.Latitude" placeholder="Latitude (if entering manually)"></ion-input>
           </ion-item>
           <ion-item>
-
             <ion-input label="Longitude" labelPlacement="floating" type="number" [(ngModel)]="item.AddressInfo.Longitude" placeholder="Longitude (if entering manually)"></ion-input>
           </ion-item>
 
@@ -175,41 +165,32 @@ <h4>Equipment</h4>
       <p>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.</p>
 
       <ion-item>
-        <ion-label position="floating">Operational Status (All Equipment))</ion-label>
-        <ion-select [(ngModel)]="item.StatusTypeID">
+        <ion-select label="Operational Status (All Equipment)" label-placement="floating" [(ngModel)]="item.StatusTypeID">
           <ion-select-option *ngFor="let i of statusTypes" [value]="i.ID">{{i.Title}}</ion-select-option>
         </ion-select>
       </ion-item>
       <ion-item>
-        <ion-label position="floating">Usage Type</ion-label>
-        <ion-select [(ngModel)]="item.UsageTypeID">
+        <ion-select label="Usage Type" label-placement="floating" [(ngModel)]="item.UsageTypeID">
           <ion-select-option *ngFor="let i of usageTypes" [value]="i.ID">{{i.Title}}</ion-select-option>
         </ion-select>
       </ion-item>
       <ion-item>
-        <ion-label position="floating">Usage Cost</ion-label>
-        <ion-input type="text" [(ngModel)]="item.UsageCost"></ion-input>
+        <ion-input label="Usage Cost" label-placement="floating" type="text" [(ngModel)]="item.UsageCost"></ion-input>
       </ion-item>
       <ion-item>
-        <ion-label position="floating">General Comments</ion-label>
-        <ion-input type="text" [(ngModel)]="item.GeneralComments" autocapitalize="sentences" ></ion-input>
+        <ion-input label="General Comments" label-placement="floating" type="text" [(ngModel)]="item.GeneralComments" autocapitalize="sentences" ></ion-input>
       </ion-item>
-
       <ion-item>
-        <ion-label position="floating">Main Telephone Number </ion-label>
-        <ion-input type="tel" [(ngModel)]="item.AddressInfo.ContactTelephone1" placeholder=""></ion-input>
+        <ion-input label="Main Telephone Number" label-placement="floating" type="tel" [(ngModel)]="item.AddressInfo.ContactTelephone1" placeholder=""></ion-input>
       </ion-item>
       <ion-item>
-        <ion-label position="floating">Other Telephone Number </ion-label>
-        <ion-input type="tel" [(ngModel)]="item.AddressInfo.ContactTelephone2" placeholder=""></ion-input>
+        <ion-input label="Other Telephone Number" label-placement="floating"  type="tel" [(ngModel)]="item.AddressInfo.ContactTelephone2" placeholder=""></ion-input>
       </ion-item>
       <ion-item>
-        <ion-label position="floating">Access Comments</ion-label>
-        <ion-input type="text" [(ngModel)]="item.AddressInfo.AccessComments" autocapitalize="sentences"  placeholder="Instructions for access or tips for finding charging location"></ion-input>
+        <ion-input label="Access Comments" label-placement="floating"  type="text" [(ngModel)]="item.AddressInfo.AccessComments" autocapitalize="sentences"  placeholder="Instructions for access or tips for finding charging location"></ion-input>
       </ion-item>
       <ion-item>
-        <ion-label position="floating">Related Website</ion-label>
-        <ion-input type="url" [(ngModel)]="item.AddressInfo.RelatedURL" placeholder="Website related to this site"></ion-input>
+        <ion-input label="Related Website" label-placement="floating" type="url" [(ngModel)]="item.AddressInfo.RelatedURL" placeholder="Website related to this site"></ion-input>
       </ion-item>
 
     </ng-container>

diff --git a/src/app/pages/signin/signin.html b/src/app/pages/signin/signin.html
@@ -27,13 +27,11 @@
     </p>
         <ion-list>
             <ion-item>
-                <ion-label position="floating">Email</ion-label>
-                <ion-input type="text" [(ngModel)]="email"></ion-input>
+                <ion-input label="Email" label-placement="floating" type="text" [(ngModel)]="email"></ion-input>
             </ion-item>
 
             <ion-item>
-                <ion-label position="floating">Password</ion-label>
-                <ion-input type="password" [(ngModel)]="password"></ion-input>
+                <ion-input label="Password" label-placement="floating" type="password" [(ngModel)]="password"></ion-input>
             </ion-item>
 
         </ion-list>

diff --git 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
@@ -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']
 };
 
 /*