FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Willem Dantuma
2019-11-01 15:57:50 +01:00
parent 173be180ce
commit ca6331e053
30 changed files with 707 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/app-routing.module.ts
View File

@@ -1,13 +1,28 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { AuthGuard } from '@farmmaps/common';
import { AuthGuard,FullScreenGuard } from '@farmmaps/common';
import { MapComponent} from '@farmmaps/common-map';
import { AppContentComponent} from './app-content.component';
import { AppSidePanelTestComponent } from './app-side-panel-test.component';
const routes = [
{ path: '', canLoad: [AuthGuard], component: AppContentComponent},
{ path: 'sidepanel', canLoad: [AuthGuard], component: AppSidePanelTestComponent}
{
path: '',
redirectTo: 'map',
pathMatch: 'full'
},
{ path: 'sidepanel', canLoad: [AuthGuard], component: AppSidePanelTestComponent},
{ path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [
{
path: '',
component: MapComponent
},
{
path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState',
component: MapComponent
}
]},
];
@NgModule({

0
src/app/app.component.css
View File

21
src/app/app.component.scss Normal file
View File

@@ -0,0 +1,21 @@
@import "theme.scss";
$fa-font-path: "~font-awesome/fonts";
@import "~bootstrap/scss/bootstrap.scss";
@import "~font-awesome/scss/font-awesome.scss";
:host ::ng-deep .btn:focus {
box-shadow:none;
}
:host ::ng-deep .input-group > .form-control:focus {
z-index: auto;
}
:host ::ng-deep .form-control:focus {
box-shadow: none;
border-color: $input-border-color;
}

2
src/app/app.component.ts
View File

@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
styleUrls: ['./app.component.scss']
})
export class AppComponent {
title = 'farmmaps-lib-app';

2
src/app/app.module.ts
View File

@@ -10,6 +10,7 @@ import { AppComponent } from './app.component';
import { AppContentComponent } from './app-content.component';
import { AppSidePanelTestComponent } from './app-side-panel-test.component';
import { AppCommonModule } from '@farmmaps/common';
import { AppCommonMapModule} from '@farmmaps/common-map';
import {StoreModule, Store} from '@ngrx/store';
import {EffectsModule, EffectSources} from '@ngrx/effects';
@@ -51,6 +52,7 @@ export function provideBootstrapEffects(effects: Type<any>[]) {
imports: [
AppRoutingModule,
AppCommonModule.forRoot() ,
AppCommonMapModule.forRoot(),
BrowserModule,
StoreModule.forRoot({}),
EffectsModule.forRoot([])

3
src/app/theme.scss Normal file
View File

@@ -0,0 +1,3 @@
//$theme-colors: ( "primary": #a7ce39, "secondary": #ffc800 );
//$theme-colors: ( "primary": #a7ce39);

0
src/favicon.ico → src/assets/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
src/assets/images/farmmapslogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

7
src/assets/silent-refresh.html Normal file
View File

@@ -0,0 +1,7 @@
<html>
<body>
<script>
parent.postMessage(location.hash, location.origin);
</script>
</body>
</html>

4
src/configuration.json
View File

@@ -1,8 +1,8 @@
{
"issuer": "http://accounts.awtest.nl",
"clientId": "v1t",
"audience": "http://localhost:8083/,http://awtest.nl/,http://aan.awtest.nl",
"audience": "http://farmmaps.awtest.nl/,http://awtest.nl/,http://aan.awtest.nl",
"requireHttps": false,
"apiEndPoint": "http://localhost:8083"
"apiEndPoint": "http://farmmaps.awtest.nl"
}

1
src/index.html
View File

@@ -7,7 +7,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link href="assets/bootstrap.min.css" rel="stylesheet">
</head>
<body>
<app-root></app-root>