Skip to content

Commit

Permalink
Merge branch 'wip_signin'
Browse files Browse the repository at this point in the history
  • Loading branch information
@webprofusion-chrisc
webprofusion-chrisc committed Nov 29, 2023
2 parents 71b6b57 + 947f0c2 commit 145a19b
Show file tree
Hide file tree
Showing 13 changed files with 247 additions and 125 deletions.
120 changes: 52 additions & 68 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"newProjectRoot": "projects",
"projects": {
"app": {
"projectType": "application",
"schematics": {},
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
Expand All @@ -17,7 +17,8 @@
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
{
"glob": "**/*",
Expand All @@ -30,37 +31,11 @@
"output": "./svg"
}
],
"styles": [
{
"input": "src/theme/variables.scss"
},
{
"input": "src/global.scss"
}
],
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
"styles": ["src/theme/variables.scss", "src/global.scss"],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
Expand All @@ -69,37 +44,51 @@
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "2kb",
"maximumError": "4kb"
}
]
},
"ci": {
"budgets": [
],
"fileReplacements": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
},
"ci": {
"progress": false
}
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "app:build"
},
"configurations": {
"production": {
"browserTarget": "app:build:production"
"buildTarget": "app:build:production"
},
"ci": {}
}
"development": {
"buildTarget": "app:build:development"
},
"ci": {
"progress": false
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "app:build"
"buildTarget": "app:build"
}
},
"test": {
Expand All @@ -109,20 +98,21 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": [],
"scripts": [],
"inlineStyleLanguage": "scss",
"assets": [
{
"glob": "favicon.ico",
"input": "src/",
"output": "/"
},
{
"glob": "**/*",
"input": "src/assets",
"output": "/assets"
"output": "assets"
},
{
"glob": "**/*.svg",
"input": "node_modules/ionicons/dist/ionicons/svg",
"output": "./svg"
}
]
],
"styles": ["src/theme/variables.scss", "src/global.scss"],
"scripts": []
},
"configurations": {
"ci": {
Expand All @@ -131,19 +121,13 @@
}
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "app:serve"
},
"configurations": {
"production": {
"devServerTarget": "app:serve:production"
},
"ci": {
"devServerTarget": "app:serve:ci"
}
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
Expand All @@ -162,4 +146,4 @@
"styleext": "scss"
}
}
}
}
2 changes: 1 addition & 1 deletion capacitor.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CapacitorConfig } from "@capacitor/cli";
const config: CapacitorConfig = {
appId: "com.webprofusion.openchargemap",
appName: "Open Charge Map",
webDir: "www",
webDir: "www\browser",
android: {
buildOptions: {
keystorePath: "c:/Work/GIT/ocm-private/Certs/Android/android.keystore",
Expand Down
54 changes: 30 additions & 24 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "io.openchargemap.app",
"version": "8.5.7",
"version": "8.5.8",
"author": "Webprofusion",
"homepage": "https://openchargemap.org",
"scripts": {
Expand All @@ -16,41 +16,47 @@
},
"private": true,
"dependencies": {
"@angular/common": "16.2.2",
"@angular/core": "16.2.2",
"@angular/forms": "16.2.2",
"@angular/localize": "16.2.2",
"@angular/platform-browser": "16.2.2",
"@angular/platform-browser-dynamic": "16.2.2",
"@angular/router": "16.2.2",
"@angular/service-worker": "16.2.2",
"@auth0/angular-jwt": "5.1.2",
"@capacitor/android": "5.3.0",
"@angular/common": "17.0.4",
"@angular/core": "17.0.4",
"@angular/forms": "17.0.4",
"@angular/localize": "17.0.4",
"@angular/platform-browser": "17.0.4",
"@angular/platform-browser-dynamic": "17.0.4",
"@angular/router": "17.0.4",
"@angular/service-worker": "17.0.4",
"@auth0/angular-jwt": "5.2.0",
"@capacitor/android": "5.5.1",
"@capacitor/app": "5.0.6",
"@capacitor/core": "5.3.0",
"@capacitor/core": "5.5.1",
"@capacitor/geolocation": "5.0.6",
"@capacitor/haptics": "5.0.6",
"@capacitor/ios": "5.3.0",
"@capacitor/ios": "5.5.1",
"@capacitor/keyboard": "5.0.6",
"@capacitor/push-notifications": "5.0.6",
"@capacitor/push-notifications": "5.1.0",
"@capacitor/splash-screen": "5.0.6",
"@capacitor/status-bar": "5.0.6",
"@ionic/angular": "7.3.1",
"@ionic/angular": "7.5.6",
"@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0",
"ajv": "^8.12.0",
"core-js": "3.31.1",
"core-js": "3.33.3",
"mapbox-gl": "^2.15.0",
"rxjs": "7.8.1",
"zone.js": "0.13.1"
"tslib": "^2.3.0",
"zone.js": "0.14.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "16.2.0",
"@angular/cli": "16.2.0",
"@angular/compiler": "16.2.2",
"@angular/compiler-cli": "16.2.2",
"@angular/language-service": "16.2.2",
"@capacitor/cli": "5.3.0",
"@angular-devkit/build-angular": "17.0.3",
"@angular-eslint/builder": "^17.0.0",
"@angular-eslint/eslint-plugin": "^17.0.0",
"@angular-eslint/eslint-plugin-template": "^17.0.0",
"@angular-eslint/schematics": "^17.0.0",
"@angular-eslint/template-parser": "^17.0.0",
"@angular/cli": "17.0.3",
"@angular/compiler": "17.0.4",
"@angular/compiler-cli": "17.0.4",
"@angular/language-service": "17.0.4",
"@capacitor/cli": "5.5.1",
"@ionic/angular-toolkit": "10.0.0",
"@ionic/lab": "3.2.15",
"@types/google.maps": "3.53.4",
Expand All @@ -65,7 +71,7 @@
"karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.1.0",
"ts-node": "10.9.1",
"typescript": "5.1.6",
"typescript": "5.2.2",
"webpack-dev-server": "^4.13.1"
},
"browserslist": [
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/route-planner/route-planner.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class RoutePlanner {
this.routeStartPlace.Location.latitude + ',' + this.routeStartPlace.Location.longitude,
this.routeDestinationPlace.Location.latitude + ',' +
this.routeDestinationPlace.Location.longitude)
.then((result: google.maps.DirectionsResult) => {
.then((result: any) => {
if (result.routes != null && result.routes.length > 0) {
this.logging.log('Got route directions, analysing..');
this.routePolyline = (<any>result.routes[0]).overview_polyline;
Expand Down
63 changes: 50 additions & 13 deletions src/app/pages/signin/signin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,63 @@
<ion-avatar item-left>
<img src="assets/images/icons/branding/AppIcon_128x128.png"/>
</ion-avatar>
<p class="ion-padding">

<ion-segment [(ngModel)]="mode">
<ion-segment-button value="signin">
<ion-label>Sign In</ion-label>
</ion-segment-button>
<ion-segment-button value="register">
<ion-label>Create Account</ion-label>
</ion-segment-button>
</ion-segment>

<ng-container *ngIf="mode=='signin'">
<p class="ion-padding">
Sign in using your Open Charge Map account.
</p>
<ion-list>
<ion-item>
<ion-label position="floating">Email</ion-label>
<ion-input type="text" [(ngModel)]="email"></ion-input>
</ion-item>
<ion-list>
<ion-item>
<ion-label position="floating">Email</ion-label>
<ion-input 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-item>

<ion-item>
<ion-label position="floating">Password</ion-label>
<ion-input type="password" [(ngModel)]="password"></ion-input>
</ion-item>
</ion-list>

</ion-list>
<p>
<a (click)="appManager.launchWebPage('https://openchargemap.org/site/loginprovider/passwordreset')">Reset your password</a>
</p>

<p>or <a (click)="appManager.launchWebPage('https://openchargemap.org/site/loginprovider/register')">Register as New User</a>
or <a (click)="appManager.launchWebPage('https://openchargemap.org/site/loginprovider/passwordreset')">Reset your password</a>
</ng-container>
<ng-container *ngIf="mode=='register'">
<p class="ion-padding">
Create a new Open Charge Map account.
</p>
<ion-list>
<ion-item>
<ion-label position="floating">Email</ion-label>
<ion-input type="text" [(ngModel)]="email"></ion-input>
</ion-item>
<ion-item>
<ion-label position="floating">Display Name or Nickname</ion-label>
<ion-input type="text" [(ngModel)]="username"></ion-input>
</ion-item>
<ion-item>
<ion-label position="floating">Password</ion-label>
<ion-input type="password" [(ngModel)]="password"></ion-input>
</ion-item>
<ion-item>
<ion-label position="floating">Confirm Password</ion-label>
<ion-input type="password" [(ngModel)]="confirmpassword"></ion-input>
</ion-item>

</ion-list>

</ng-container>
</ion-content>
<ion-footer>
<ion-toolbar>
Expand Down
Loading

0 comments on commit 145a19b

Please sign in to comment.