Compare commits
No commits in common. "1bec8c20381e49da3b6db3f28f3367d244c54638" and "123bf2943ab42d2c7c0a56dc65adcadb088b8945" have entirely different histories.
1bec8c2038
...
123bf2943a
@ -1,7 +1,7 @@
|
|||||||
<div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async)}">
|
<div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async)}">
|
||||||
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
|
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
|
||||||
<button type="button" class="btn btn-outline-light" (click)="handleToggleMenu($event)"><i class="fa fa-bars" aria-hidden="true"></i></button>
|
<button type="button" class="btn btn-outline-light" (click)="handleToggleMenu($event)"><i class="fa fa-bars" aria-hidden="true"></i></button>
|
||||||
<router-outlet name="menu" class="ml-4"></router-outlet>
|
<router-outlet name="menu ml-4 float-right"></router-outlet>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="body">
|
<div class="body">
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
|
@ -5,7 +5,6 @@ import { AuthGuard,FullScreenGuard } from '@farmmaps/common';
|
|||||||
import { MapComponent } from '@farmmaps/common-map';
|
import { MapComponent } from '@farmmaps/common-map';
|
||||||
import { LogoComponent } from './logo/logo.component';
|
import { LogoComponent } from './logo/logo.component';
|
||||||
import { MenuComponent } from './menu/menu.component';
|
import { MenuComponent } from './menu/menu.component';
|
||||||
import {RegisterDeviceComponent} from './registerdevice/registerdevice.component';
|
|
||||||
import {NotImplementedComponent} from '@farmmaps/common';
|
import {NotImplementedComponent} from '@farmmaps/common';
|
||||||
import { NavBarGuard } from 'projects/common/src/public-api';
|
import { NavBarGuard } from 'projects/common/src/public-api';
|
||||||
|
|
||||||
@ -48,12 +47,7 @@ const routes = [
|
|||||||
path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState',
|
path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState',
|
||||||
component: MapComponent
|
component: MapComponent
|
||||||
}
|
}
|
||||||
]},
|
]}
|
||||||
{
|
|
||||||
path:'registerdevice/:deviceToken',
|
|
||||||
canActivate:[FullScreenGuard],
|
|
||||||
component:RegisterDeviceComponent
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
@ -18,7 +18,6 @@ import { StoreRouterConnectingModule} from '@ngrx/router-store';
|
|||||||
import {AppRoutingModule} from './app-routing.module';
|
import {AppRoutingModule} from './app-routing.module';
|
||||||
import { LogoComponent } from './logo/logo.component';
|
import { LogoComponent } from './logo/logo.component';
|
||||||
import { MenuComponent } from './menu/menu.component';
|
import { MenuComponent } from './menu/menu.component';
|
||||||
import {RegisterDeviceComponent} from './registerdevice/registerdevice.component';
|
|
||||||
import { SecureOAuthStorage} from '@farmmaps/common';
|
import { SecureOAuthStorage} from '@farmmaps/common';
|
||||||
import { OAuthStorage } from 'angular-oauth2-oidc';
|
import { OAuthStorage } from 'angular-oauth2-oidc';
|
||||||
|
|
||||||
@ -51,8 +50,7 @@ export function provideBootstrapEffects(effects: Type<any>[]) {
|
|||||||
declarations: [
|
declarations: [
|
||||||
AppRootComponent,
|
AppRootComponent,
|
||||||
LogoComponent,
|
LogoComponent,
|
||||||
MenuComponent,
|
MenuComponent
|
||||||
RegisterDeviceComponent
|
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
AppRoutingModule,
|
AppRoutingModule,
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
<div class="container text-center pt-10">
|
|
||||||
<img class="logo" src="/images/farmmapslogo.png" alt="FarmMaps logo">
|
|
||||||
<div class="message" i18n>To register this device<br/> download the FarmMaps app and create an account or login. <br/><br/>Next scan this QR code with the function "Register device" from the menu</div>
|
|
||||||
<a href="https://play.google.com/store/apps/details?id=ag.farmmaps.app"><img class="play-badge" src="/images/google-play-badge.png" alt="Get it on google play"></a>
|
|
||||||
</div>
|
|
@ -1,32 +0,0 @@
|
|||||||
.container {
|
|
||||||
width:100%;
|
|
||||||
height:100;
|
|
||||||
padding-top: 5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.logo {
|
|
||||||
max-width: 80%;
|
|
||||||
margin-bottom: 1.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.play-badge {
|
|
||||||
margin-top: 1.5em;
|
|
||||||
max-width: 45%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.message {
|
|
||||||
margin:auto;
|
|
||||||
font-size: 1.5em;
|
|
||||||
line-height: 1.5em;
|
|
||||||
max-width: 90%;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (min-width:44rem) {
|
|
||||||
.logo {
|
|
||||||
max-width: 22rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.play-badge {
|
|
||||||
max-width: 10rem;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'registerdevice',
|
|
||||||
templateUrl: './registerdevice.component.html',
|
|
||||||
styleUrls: ['./registerdevice.component.scss']
|
|
||||||
})
|
|
||||||
export class RegisterDeviceComponent implements OnInit {
|
|
||||||
|
|
||||||
|
|
||||||
constructor( ) { }
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 14 KiB |
Loading…
Reference in New Issue
Block a user