Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Instimapnav two #126

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Instimapnav two #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b702be
ui fixed for mobile devices
amanmoon Jun 23, 2023
cea6dee
Merge branch 'master' of https://github.com/Krishna-Baldwa/instiapp-a…
Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions src/app/page/map/map.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@
#searchbox {
display: flex;
flex-direction: column;
justify-content: center; /* Center vertically */
align-items: center; /* Center horizontally */
top: 100px;
}

#searchbox-origin {
display: flex;
flex-direction: column;
Expand All @@ -37,10 +40,11 @@
background: white;
z-index: 2;
}

#searchbox-destination {
position: fixed;
right: 40px;
top: calc(100px);
top: 100px;
background: white;
z-index: 2;
}
Expand Down Expand Up @@ -134,11 +138,29 @@

@media (max-width: 560px) {
#searchbox {
top: 56px;
width: 100%;
right: unset;
left: 0;
background-color: var(--primary-color);
display: flex;
flex-direction: column;
justify-content: center; /* Center vertically */
align-items: center; /* Center horizontally */
top: 10px;
}

#searchbox-origin {
display: flex;
flex-direction: column;
position: fixed;
right: 10px;
top: 70px;
background: white;
z-index: 2;
}

#searchbox-destination {
position: fixed;
right: 10px;
top: 70px;
background: white;
z-index: 2;
}

.search::-webkit-input-placeholder {
Expand Down
130 changes: 68 additions & 62 deletions src/app/page/map/map.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ import {
ElementRef,
OnInit,
OnDestroy,
} from '@angular/core';
import { MatAutocompleteTrigger } from '@angular/material/autocomplete';
import { MatSnackBar } from '@angular/material/snack-bar';
import { Location } from '@angular/common';
import { ActivatedRoute, Params, Router } from '@angular/router';
import { FormControl } from '@angular/forms';

import * as InstiMap from 'instimapline';

import * as Fuse from 'fuse.js';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ILocation } from '../../interfaces';
import { API } from '../../../api';
import { Helpers } from '../../helpers';
import { DataService } from '../../data.service';
import { EnterFade } from '../../animations';
import { HttpClient } from '@angular/common/http';
import { IPath } from '../../interfaces';
} from "@angular/core";
import { MatAutocompleteTrigger } from "@angular/material/autocomplete";
import { MatSnackBar } from "@angular/material/snack-bar";
import { Location } from "@angular/common";
import { ActivatedRoute, Params, Router } from "@angular/router";
import { FormControl } from "@angular/forms";

import * as InstiMap from "instimapline";

import * as Fuse from "fuse.js";
import { Observable } from "rxjs";
import { map } from "rxjs/operators";
import { ILocation } from "../../interfaces";
import { API } from "../../../api";
import { Helpers } from "../../helpers";
import { DataService } from "../../data.service";
import { EnterFade } from "../../animations";
import { HttpClient } from "@angular/common/http";
import { IPath } from "../../interfaces";

@Component({
selector: 'app-map',
templateUrl: './map.component.html',
styleUrls: ['./map.component.css'],
selector: "app-map",
templateUrl: "./map.component.html",
styleUrls: ["./map.component.css"],
animations: [EnterFade],
})
export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
Expand All @@ -37,7 +37,7 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
public selectedLocation: ILocation;

/* Helpers */
@ViewChild('searchbox', { static: true }) searchBoxEl: ElementRef;
@ViewChild("searchbox", { static: true }) searchBoxEl: ElementRef;
@ViewChild(MatAutocompleteTrigger, { static: true })
autoComplete: MatAutocompleteTrigger;

Expand Down Expand Up @@ -67,11 +67,11 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
distance: 7,
maxPatternLength: 10,
minMatchCharLength: 1,
keys: ['name', 'short_name'],
keys: ["name", "short_name"],
};
originAndDestinationData: IPath = {
origin: '',
destination: '',
origin: "",
destination: "",
};
public fuse;

Expand All @@ -86,18 +86,18 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
this.searchForm = new FormControl();
/* Check for initial marker */
this.activatedRoute.params.subscribe((params: Params) => {
this.initialMarker = params['name'];
this.initialMarker = params["name"];
});
}

ngOnInit() {
console.log(InstiMap.getGeolocationLast());

this.dataService.setTitle('InstiMap');
this.dataService.setTitle("InstiMap");
this.filteredOptions = this.searchForm.valueChanges.pipe(
map((result) => this.filteredLocations(result))
);
document.getElementById('searchbox-origin').style.visibility = 'hidden';
document.getElementById("searchbox-origin").style.visibility = "hidden";
}

ngAfterViewInit() {
Expand Down Expand Up @@ -127,14 +127,14 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
showLoc() {
InstiMap.getMap(
{
mapPath: 'assets/map.jpg',
mapMinPath: 'assets/map-min.jpg',
markersBase: '/assets/map/',
mapPath: "assets/map.jpg",
mapMinPath: "assets/map-min.jpg",
markersBase: "/assets/map/",
attributions:
'<a href="http://mrane.com/" target="_blank">Prof. Mandar Rane</a>',
map_id: 'map',
marker_id: 'marker',
user_marker_id: 'user-marker',
map_id: "map",
marker_id: "marker",
user_marker_id: "user-marker",
},
this.locations,
(loc: ILocation) => {
Expand Down Expand Up @@ -182,7 +182,7 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
*/
setURL(location: ILocation) {
const urlParam =
location != null ? `/${Helpers.getPassable(location.short_name)}` : '';
location != null ? `/${Helpers.getPassable(location.short_name)}` : "";
const urlTree = this.router.createUrlTree([`/map${urlParam}`], {
relativeTo: this.activatedRoute,
});
Expand All @@ -204,11 +204,11 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
toggleResidences() {
this.showResidences = !this.showResidences;
InstiMap.setResidencesVisible(this.showResidences);
let msg = 'Residences Visible';
let msg = "Residences Visible";
if (!this.showResidences) {
msg = 'Residences Hidden';
msg = "Residences Hidden";
}
this.snackBar.open(msg, 'Dismiss', {
this.snackBar.open(msg, "Dismiss", {
duration: 2000,
});
}
Expand All @@ -234,14 +234,14 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {

/** boolean to boolean string */
bstr(b: boolean) {
return b ? 'true' : 'false';
return b ? "true" : "false";
}

/** If has institute role to update location */
hasUpdateRole() {
return (
!this.dataService.isMobile() &&
this.dataService.HasInstitutePermission('Location')
this.dataService.HasInstitutePermission("Location")
);
}

Expand All @@ -262,19 +262,19 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
.FirePUT(API.Location, location, { id: location.id })
.subscribe(
() => {
this.snackBar.open('Location Updated', 'Dismiss', { duration: 2000 });
this.snackBar.open("Location Updated", "Dismiss", { duration: 2000 });
},
() => {
this.snackBar.open('Updating Failed!', 'Dismiss', { duration: 2000 });
this.snackBar.open("Updating Failed!", "Dismiss", { duration: 2000 });
}
);
}
searchChangedDestination(e) {
let lname;
if ('target' in e) {
if ("target" in e) {
this.autoComplete.closePanel();
this.initLocBox = false;
} else if ('option' in e) {
} else if ("option" in e) {
lname = e.option.value;
}

Expand All @@ -291,10 +291,10 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
}
searchChangedOrigin(e) {
let lname;
if ('target' in e) {
if ("target" in e) {
this.autoComplete.closePanel();
this.initLocBox = false;
} else if ('option' in e) {
} else if ("option" in e) {
lname = e.option.value;
}

Expand All @@ -310,10 +310,11 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
}

originAndDestination() {
this.dataService.FirePOST<IPath>(API.ShortestPath, this.originAndDestinationData).subscribe((res) => {
this.makelineonmap(res);
}
);
this.dataService
.FirePOST<IPath>(API.ShortestPath, this.originAndDestinationData)
.subscribe((res) => {
this.makelineonmap(res);
});
}
markDestination() {
this.initLocBox = false;
Expand All @@ -324,13 +325,16 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
buttonVisiblity() {}
searchAndInfoBoxPosition() {
if (this.searchandinfoboxposition) {
document.getElementById('searchbox-origin').style.visibility = 'visible';
document.getElementById('searchbox-destination').style.top =
'calc(200px)';
document.getElementById("searchbox-origin").style.visibility = "visible";
if (window.innerWidth < 768) {
document.getElementById("searchbox-destination").style.top = "110px";
} else {
document.getElementById("searchbox-destination").style.top = "170px";
}
} else {
document.getElementById('searchbox-origin').style.visibility = 'hidden';
document.getElementById('searchbox-destination').style.top =
'calc(100px)';
document.getElementById("searchbox-origin").style.visibility = "hidden";
document.getElementById("searchbox-destination").style.top =
"calc(100px)";
}
}

Expand All @@ -344,9 +348,9 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
response[i][1],
response[i + 1][0],
response[i + 1][1],
'red',
"red",
5
);
);
this.lastres[i] = this.templine;
}
}
Expand All @@ -362,8 +366,10 @@ export class MapComponent implements OnInit, AfterViewInit, OnDestroy {
getCurrentLocation() {
console.log(InstiMap.getGeolocationLast());
this.originAndDestinationData.origin = InstiMap.getGeolocationLast();
this.dataService.FirePOST<IPath>(API.ShortestPath, this.originAndDestinationData).subscribe((res) => {
this.makelineonmap(res);
});
this.dataService
.FirePOST<IPath>(API.ShortestPath, this.originAndDestinationData)
.subscribe((res) => {
this.makelineonmap(res);
});
}
}