Skip to content

G
getme
Commit e0f80096 by muhsin
Options

merge conflict

parents 8594a2d4 e76b0c87
Showing with 72 additions and 50 deletions
.scannerwork/css-bundle/package.json 0 → 100644
{
"name": "css-bundle",
"version": "1.0.0",
"description": "Simple node project to run stylelint from SonarCSS",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "LGPL-3.0",
"dependencies": {
"stylelint": "10.1.0"
}
}
.scannerwork/css-bundle/stylelintconfig.json 0 → 100644
{"rules":{"block-no-empty":true,"string-no-newline":true,"comment-no-empty":true,"function-linear-gradient-no-nonstandard-direction":true,"media-feature-name-no-unknown":true,"color-no-invalid-hex":true,"font-family-no-duplicate-names":true,"no-duplicate-at-import-rules":true,"no-empty-source":true,"declaration-block-no-duplicate-properties":[true,{"ignore":["consecutive-duplicates-with-different-values"]}],"selector-type-no-unknown":[true,{"ignoreTypes":["/^mat-/"]}],"at-rule-no-unknown":[true,{"ignoreAtRules":["value","at-root","content","debug","each","else","error","for","function","if","include","mixin","return","warn","while","extend"]}],"no-duplicate-selectors":true,"font-family-no-missing-generic-family-keyword":true,"no-extra-semicolons":true,"no-invalid-double-slash-comments":true,"selector-pseudo-element-no-unknown":true,"selector-pseudo-class-no-unknown":[true,{"ignorePseudoClasses":["local","global","export","import"]}],"keyframe-declaration-no-important":true,"function-calc-no-unspaced-operator":true,"property-no-unknown":[true,{"ignoreProperties":["composes","exportedKey","localAlias"]}],"declaration-block-no-shorthand-property-overrides":true,"unit-no-unknown":[true,{"ignoreUnits":["x"]}]}}
.scannerwork/report-task.txt 0 → 100644
projectKey=GetmiUser
serverUrl=http://sonarqube.techlabz.in
serverVersion=7.9.2.30863
dashboardUrl=http://sonarqube.techlabz.in/dashboard?id=GetmiUser
ceTaskId=AW_wM7iyfQ91M3jwRMen
ceTaskUrl=http://sonarqube.techlabz.in/api/ce/task?id=AW_wM7iyfQ91M3jwRMen
src/app/home/home.page.ts
import { Component, OnInit } from "@angular/core";
import { Location } from "@angular/common";
import { trigger, transition, animate, style } from "@angular/animations";
import { MapsAPILoader, MouseEvent } from "@agm/core";
import { Router, ActivatedRoute } from "@angular/router";
import { MenuController } from "@ionic/angular";
import { CenterService } from "./../../config/center.service";
import { ShoppersService } from "./../../config/shopper.service";
import { CategoriesService } from "./../../config/category.service";
import { ServiceService } from "./../../config/service.service";
import { AddressService } from "./../../config/address.service";
import { SearchService } from "./../../config/search.service";
import { ProductsService } from "./../../config/products.service";
import { from } from "rxjs";
import { ModalController } from "@ionic/angular";
import { SearchmodalPage } from "../searchmodal/searchmodal.page";
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
import { trigger, transition, animate, style } from '@angular/animations';
import { MapsAPILoader, MouseEvent } from '@agm/core';
import { Router, ActivatedRoute } from '@angular/router';
import { MenuController } from '@ionic/angular';
import { CenterService } from './../../config/center.service';
import { ShoppersService } from './../../config/shopper.service';
import { CategoriesService } from './../../config/category.service';
import { ServiceService } from './../../config/service.service';
import { AddressService } from './../../config/address.service';
import { SearchService } from './../../config/search.service';
import { ProductsService } from './../../config/products.service';
import { from } from 'rxjs';
import { ModalController } from '@ionic/angular';
import { SearchmodalPage } from '../searchmodal/searchmodal.page';
@Component({
selector: "app-home",
templateUrl: "./home.page.html",
styleUrls: ["./home.page.scss"],
selector: 'app-home',
templateUrl: './home.page.html',
styleUrls: ['./home.page.scss'],
animations: [
trigger("slideInOut", [
transition(":enter", [
style({ transform: "translateY(100%)" }),
animate("200ms ease-in", style({ transform: "translateY(0%)" }))
trigger('slideInOut', [
transition(':enter', [
style({ transform: 'translateY(100%)' }),
animate('200ms ease-in', style({ transform: 'translateY(0%)' }))
]),
transition(":leave", [
animate("200ms ease-out", style({ transform: "translateY(100%)" }))
transition(':leave', [
animate('200ms ease-out', style({ transform: 'translateY(100%)' }))
])
])
]
......@@ -65,7 +65,7 @@ export class HomePage implements OnInit {
this.geoCoder = new google.maps.Geocoder();
});
this.menuCtrl.enable(true);
const users = this.service.get("user").then(data => {
const users = this.service.get('user').then(data => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
......@@ -75,7 +75,7 @@ export class HomePage implements OnInit {
}
private setCurrentLocation() {
if ("geolocation" in navigator) {
if ('geolocation' in navigator) {
navigator.geolocation.getCurrentPosition(position => {
this.lat = position.coords.latitude;
this.lng = position.coords.longitude;
......@@ -90,16 +90,16 @@ export class HomePage implements OnInit {
(results, status) => {
console.log(results);
console.log(status);
if (status === "OK") {
if (status === 'OK') {
if (results[0]) {
const addressData = results[0].formatted_address.split(", ");
this.address = addressData[0] + ", " + addressData[1];
const addressData = results[0].formatted_address.split(', ');
this.address = addressData[0] + ', ' + addressData[1];
console.log(this.address);
} else {
window.alert("No results found");
window.alert('No results found');
}
} else {
window.alert("Geocoder failed due to: " + status);
window.alert('Geocoder failed due to: ' + status);
}
}
);
......@@ -124,7 +124,7 @@ export class HomePage implements OnInit {
goToPage(path, data = null) {
console.log(data);
this.service.set("params", data);
this.service.set('params', data);
this.router.navigateByUrl(path, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
......@@ -141,19 +141,19 @@ export class HomePage implements OnInit {
console.log(datas);
let data;
let url;
if (datas.type === "shopper") {
if (datas.type === 'shopper') {
data = datas.data;
this.service.set("params", data);
url = "productlist";
} else if (datas.type === "category") {
this.service.set('params', data);
url = 'productlist';
} else if (datas.type === 'category') {
data = datas.data;
this.service.set("params", data);
url = "catstorelist";
this.service.set('params', data);
url = 'catstorelist';
} else {
data = datas.data;
data.size = this.service.splitSep(data.size);
data.tag = this.service.splitSep(data.tag);
(data.color = this.service.splitSep(data.color)), (url = "productdetail");
(data.color = this.service.splitSep(data.color)), (url = 'productdetail');
this.productsService.setProd(data);
}
this.searchClose();
......@@ -162,6 +162,7 @@ export class HomePage implements OnInit {
}
searchFun(data: string) {
this.searchShow = true;
this.searchService.search(data);
}
......
src/config/search.service.ts
......@@ -29,8 +29,8 @@ export class SearchService {
ref
.where("status", "==", state)
.orderBy("name")
.startAt(inputText)
.endAt(inputText + "\uf8ff")
.startAt(inputText.toUpperCase())
.endAt(inputText.toLowerCase() + "\uf8ff")
.limit(5)
);
orderRef.valueChanges().subscribe(value => {
......@@ -55,15 +55,15 @@ export class SearchService {
ref
.where("status", "==", state)
.orderBy("prodName")
.startAt(inputText)
.endAt(inputText + "\uf8ff")
.startAt(inputText.toUpperCase())
.endAt(inputText.toLowerCase() + "\uf8ff")
.limit(5)
);
prodRef.valueChanges().subscribe(values => {
const result = values;
if (result.length > 0) {
result.forEach(item => {
// console.log(item);
console.log(item);
const prod: Search = {
text: item.prodName,
data: item,
......@@ -71,7 +71,7 @@ export class SearchService {
};
this.searchList.push(prod);
});
// console.log(this.searchList);
console.log(this.searchList);
}
});
......@@ -82,15 +82,15 @@ export class SearchService {
ref
.where("status", "==", state)
.orderBy("catName")
.startAt(inputText)
.endAt(inputText + "\uf8ff")
.startAt(inputText.toUpperCase())
.endAt(inputText.toLowerCase() + "\uf8ff")
.limit(5)
);
feaRef.valueChanges().subscribe(values => {
const result = values;
if (result.length > 0) {
result.forEach(item => {
// console.log(item);
console.log(item);
const prod: Search = {
text: item.catName,
data: item,
......@@ -98,7 +98,7 @@ export class SearchService {
};
this.searchList.push(prod);
});
// console.log(this.searchList);
console.log(this.searchList);
}
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment