Some fixes
This commit is contained in:
@@ -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({
|
||||
|
21
src/app/app.component.scss
Normal file
21
src/app/app.component.scss
Normal 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;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -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';
|
||||
|
@@ -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
3
src/app/theme.scss
Normal file
@@ -0,0 +1,3 @@
|
||||
//$theme-colors: ( "primary": #a7ce39, "secondary": #ffc800 );
|
||||
//$theme-colors: ( "primary": #a7ce39);
|
||||
|
Reference in New Issue
Block a user