ztimson/map-alliance
ztimson/map-alliance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Activity

Allow spaces in names!

Browse Source
This commit is contained in:
Zakary Timson 2019-09-08 12:33:08 -04:00
parent 02c5b60e5d
commit 0732d1c4a6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/adjectives.ts
View File

@ -1,6 +1,6 @@
export const Adjectives = [ export const Adjectives = [
'Strict', 'Strict',
'poor', 'Poor',
'Old', 'Old',
'Hot', 'Hot',
'Huge', 'Huge',

3
src/app/services/sync.service.ts
View File

@ -98,11 +98,10 @@ export class SyncService {
load(mapCode: string, username: string) { load(mapCode: string, username: string) {
this.mapCode = mapCode; this.mapCode = mapCode;
this.username = username; this.username = username.replace(/\s/g, '');
this.mapDoc = this.db.collection(MAP_COLLECTION).doc(mapCode); this.mapDoc = this.db.collection(MAP_COLLECTION).doc(mapCode);
this.locationDoc = this.mapDoc.collection(LOCATION_COLLECTION).doc(username); this.locationDoc = this.mapDoc.collection(LOCATION_COLLECTION).doc(username);
this.mapSub = combineLatest(this.mapDoc.valueChanges(), this.mapDoc.collection(LOCATION_COLLECTION, ref => { this.mapSub = combineLatest(this.mapDoc.valueChanges(), this.mapDoc.collection(LOCATION_COLLECTION, ref => {
let aMinuteAgo = new Date(); let aMinuteAgo = new Date();
aMinuteAgo.setMinutes(aMinuteAgo.getMinutes() - 1); aMinuteAgo.setMinutes(aMinuteAgo.getMinutes() - 1);

6
src/app/views/map/map.component.ts
View File

@ -1,4 +1,4 @@
import {Component, isDevMode, OnDestroy, OnInit} from "@angular/core"; import {Component, OnDestroy, OnInit} from "@angular/core";
import {PhysicsService} from "../../services/physics.service"; import {PhysicsService} from "../../services/physics.service";
import {filter, finalize, skip, take} from "rxjs/operators"; import {filter, finalize, skip, take} from "rxjs/operators";
import {MatBottomSheet, MatSnackBar} from "@angular/material"; import {MatBottomSheet, MatSnackBar} from "@angular/material";
@ -12,7 +12,7 @@ import {ActivatedRoute} from "@angular/router";
import {DimensionsDialogComponent} from "../../components/dimensionsDialog/dimensionsDialog.component"; import {DimensionsDialogComponent} from "../../components/dimensionsDialog/dimensionsDialog.component";
import {MatDialog} from "@angular/material/dialog"; import {MatDialog} from "@angular/material/dialog";
import {SyncService} from "../../services/sync.service"; import {SyncService} from "../../services/sync.service";
import {MapData, MapSymbol, Marker} from "../../models/mapSymbol"; import {MapData, Marker} from "../../models/mapSymbol";
import {Adjectives} from "../../adjectives"; import {Adjectives} from "../../adjectives";
import {Nouns} from "../../nounes"; import {Nouns} from "../../nounes";
import {EditSymbolComponent} from "../../components/editSymbol/editSymbol.component"; import {EditSymbolComponent} from "../../components/editSymbol/editSymbol.component";
@ -44,7 +44,7 @@ export class MapComponent implements OnDestroy, OnInit {
constructor(public physicsService: PhysicsService, public syncService: SyncService, private snackBar: MatSnackBar, private bottomSheet: MatBottomSheet, private dialog: MatDialog, private route: ActivatedRoute) { constructor(public physicsService: PhysicsService, public syncService: SyncService, private snackBar: MatSnackBar, private bottomSheet: MatBottomSheet, private dialog: MatDialog, private route: ActivatedRoute) {
this.name = localStorage.getItem('callSign'); this.name = localStorage.getItem('callSign');
if(!this.name) { if(!this.name) {
this.name = Adjectives[Math.floor(Math.random() * Adjectives.length)] + Nouns[Math.floor(Math.random() * Nouns.length)]; this.name = Adjectives[Math.floor(Math.random() * Adjectives.length)] + ' ' + Nouns[Math.floor(Math.random() * Nouns.length)];
localStorage.setItem('callSign', this.name); localStorage.setItem('callSign', this.name);
} }