From 6cd21da12ccc3be76185ef2263c7aa9ddbff4dbb Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 3 Nov 2018 10:39:50 +0530 Subject: [PATCH 1/6] Common API Url changes : ps --- ng6-seed/src/app/AwsService/aws.service.ts | 3 ++- ng6-seed/src/app/AwsService/cognito.service.ts | 3 ++- .../pd-service/pd-triger.service.ts | 6 +++++- .../app/quality-check/qc-service/qc.service.ts | 7 ++++++- .../settings/service/masters/masters.service.ts | 6 ++++-- .../settings/service/masters/pd-team.service.ts | 13 +++++-------- .../src/app/settings/service/user.service.ts | 3 ++- .../template/service/masters/masters.service.ts | 16 +++++----------- .../service/questions/questions.service.ts | 6 +++++- .../service/templates/templates.service.ts | 8 ++++++-- ng6-seed/src/environments/environment.prod.ts | 5 +++-- ng6-seed/src/environments/environment.ts | 3 ++- 12 files changed, 47 insertions(+), 32 deletions(-) diff --git a/ng6-seed/src/app/AwsService/aws.service.ts b/ng6-seed/src/app/AwsService/aws.service.ts index 5eb076a8f..a2c865dcc 100755 --- a/ng6-seed/src/app/AwsService/aws.service.ts +++ b/ng6-seed/src/app/AwsService/aws.service.ts @@ -51,7 +51,8 @@ const sineedgeIdentity = "ap-south-1:9a551eab-97cf-4991-b677-2f9bcd058961";//"ap const lenderIdentity = "ap-south-1:ca22dabc-db59-4af5-9bb8-265f7ec95907"; const vendorIdenttiy = "ap-south-1:5ad3ce43-4260-4273-87b2-e6a377b8e874"; // serviceProvider -const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; +const apiurl = environment.apiEndpoint; +//const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; //const apiurl = "http://localhost/sparqapi/api/"; @Injectable({ diff --git a/ng6-seed/src/app/AwsService/cognito.service.ts b/ng6-seed/src/app/AwsService/cognito.service.ts index a568b7c1f..3b878b19c 100644 --- a/ng6-seed/src/app/AwsService/cognito.service.ts +++ b/ng6-seed/src/app/AwsService/cognito.service.ts @@ -40,7 +40,8 @@ const sineedgeIdentity = "ap-south-1:9a551eab-97cf-4991-b677-2f9bcd058961";//"ap const lenderIdentity = "ap-south-1:ca22dabc-db59-4af5-9bb8-265f7ec95907"; const vendorIdenttiy = ""; // serviceProvider -const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; +//const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; +const apiurl = environment.apiEndpoint; // const apiurl = "http://localhost/sparqapi/api/"; export interface Callback { diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 405f46144..33b989c0c 100644 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -8,6 +8,9 @@ import { of } from 'rxjs'; /** Imported Service Files Are., */ import { AwsService } from '../../AwsService/aws.service'; +/** Environment */ +import { environment } from 'environments/environment' + const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); /** Master Interface */ export interface Master { @@ -22,7 +25,8 @@ export class PdTrigerService { //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; //private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/"; - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + private apiUrl = environment.apiEndpoint; MAP_API_KEY: string; MAP_API_URL: string; constructor(private _http: HttpClient, diff --git a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts index 3a43347e2..101e6da51 100644 --- a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts +++ b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts @@ -8,6 +8,9 @@ import { of } from 'rxjs'; /** Imported Service Files Are., */ import { AwsService } from '../../AwsService/aws.service'; +/** Environment */ +import { environment } from 'environments/environment'; + const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); /** Master Interface */ export interface Master { @@ -26,7 +29,9 @@ export class QcService { //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; //private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/"; - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + private apiUrl = environment.apiEndpoint; + MAP_API_KEY: string; MAP_API_URL: string; constructor(private _http: HttpClient, diff --git a/ng6-seed/src/app/settings/service/masters/masters.service.ts b/ng6-seed/src/app/settings/service/masters/masters.service.ts index 16a5ce73c..eb8d45625 100644 --- a/ng6-seed/src/app/settings/service/masters/masters.service.ts +++ b/ng6-seed/src/app/settings/service/masters/masters.service.ts @@ -7,8 +7,9 @@ import { of } from 'rxjs'; /** Imported Service Files Are., */ import { AwsService } from '../../../AwsService/aws.service'; -//import { environment } from 'environments/environment'; +/** Environment */ +import { environment } from 'environments/environment'; /** Consant Value For Created Date And Updated Date */ const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); @@ -25,7 +26,8 @@ export interface Master { export class MastersService { - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; +// private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; +private apiUrl = environment.apiEndpoint; constructor(private _http: HttpClient, diff --git a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts index 729311d41..1a837032a 100644 --- a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts +++ b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts @@ -11,21 +11,18 @@ import { AwsService } from '../../../AwsService/aws.service'; /** Consant Value For Created Date And Updated Date */ const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); -/** Master Interface */ -export interface Master { - master_id:number; - master_name:string; - constant_name:string; -} +/** Environment */ +import { environment } from 'environments/environment'; @Injectable() export class PdTeamService { -private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; +// private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; // private apiUrl = "http://192.168.0.21:9999/AWSEC2/sparqapi/api/"; - pk: { "primary_key": any; }; +private apiUrl = environment.apiEndpoint; +pk: { "primary_key": any; }; constructor(private _http: HttpClient, diff --git a/ng6-seed/src/app/settings/service/user.service.ts b/ng6-seed/src/app/settings/service/user.service.ts index 47019ca84..9d1106215 100644 --- a/ng6-seed/src/app/settings/service/user.service.ts +++ b/ng6-seed/src/app/settings/service/user.service.ts @@ -3,8 +3,9 @@ import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs/internal/Observable'; import { AwsService } from '../../AwsService/aws.service'; import { environment } from 'environments/environment'; -const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; +// const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; // const apiurl = "http://localhost/sparqapi/api/"; +const apiurl = environment.apiEndpoint; const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); @Injectable({ diff --git a/ng6-seed/src/app/template/service/masters/masters.service.ts b/ng6-seed/src/app/template/service/masters/masters.service.ts index 0448504d2..1b33ce9ee 100644 --- a/ng6-seed/src/app/template/service/masters/masters.service.ts +++ b/ng6-seed/src/app/template/service/masters/masters.service.ts @@ -7,27 +7,21 @@ import { of } from 'rxjs'; /** Imported Service Files Are., */ import { AwsService } from '../../../AwsService/aws.service'; -//import { environment } from 'environments/environment'; +/** Environment */ +import { environment } from 'environments/environment'; /** Consant Value For Created Date And Updated Date */ const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); -/** Master Interface */ -export interface Master { - master_id:number; - master_name:string; - constant_name:string; -} - @Injectable() export class MastersService { - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; - - + //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + private apiUrl = environment.apiEndpoint; + constructor(private _http: HttpClient, private _aws:AwsService) { } diff --git a/ng6-seed/src/app/template/service/questions/questions.service.ts b/ng6-seed/src/app/template/service/questions/questions.service.ts index 1b532635c..ef9382c38 100644 --- a/ng6-seed/src/app/template/service/questions/questions.service.ts +++ b/ng6-seed/src/app/template/service/questions/questions.service.ts @@ -9,6 +9,8 @@ import 'rxjs/add/operator/map'; import { AwsService } from '../../../AwsService/aws.service'; /** Consant Value For Created Date And Updated Date */ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' '); +/** Environment */ +import { environment } from 'environments/environment'; @Injectable({ @@ -20,7 +22,9 @@ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' '); * Kdk */ export class QuestionsService { - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + + //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + private apiUrl = environment.apiEndpoint; private serviceUrl = 'https://jsonplaceholder.typicode.com/users'; constructor(private _http: HttpClient, diff --git a/ng6-seed/src/app/template/service/templates/templates.service.ts b/ng6-seed/src/app/template/service/templates/templates.service.ts index e7349be3a..b5fcce97a 100644 --- a/ng6-seed/src/app/template/service/templates/templates.service.ts +++ b/ng6-seed/src/app/template/service/templates/templates.service.ts @@ -9,13 +9,17 @@ import 'rxjs/add/operator/map'; import { AwsService } from '../../../AwsService/aws.service'; /** Consant Value For Created Date And Updated Date */ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' '); - +/** Environment */ +import { environment } from 'environments/environment'; @Injectable({ providedIn: 'root' }) + export class TemplatesService { - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + + //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + private apiUrl = environment.apiEndpoint; constructor(private _http: HttpClient, private _aws: AwsService) { } diff --git a/ng6-seed/src/environments/environment.prod.ts b/ng6-seed/src/environments/environment.prod.ts index 3612073bc..923b82d40 100644 --- a/ng6-seed/src/environments/environment.prod.ts +++ b/ng6-seed/src/environments/environment.prod.ts @@ -1,3 +1,4 @@ export const environment = { - production: true -}; + production: true, + apiEndpoint: 'http://ssa.sineedge.com/sparqtest/api/' +}; \ No newline at end of file diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index 7a2a068d0..adb47058a 100644 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -24,5 +24,6 @@ export const environment = { dynamodb_endpoint: '', s3_endpoint: '', accessToken:'', - apiUrl:'http://localhost/sparqapi/api/' + //apiUrl:'http://localhost/sparqapi/api/' + apiEndpoint: 'http://ssa.sineedge.com/sparqapi/api/' }; From 8a52cce60d69d360078982e31e1425768d88461c Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 3 Nov 2018 10:42:59 +0530 Subject: [PATCH 2/6] Common API Url changes : ps --- ng6-seed/src/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html index 51b54d9ba..84a9194ad 100644 --- a/ng6-seed/src/index.html +++ b/ng6-seed/src/index.html @@ -139,8 +139,8 @@ color:#000 !important; } - - + + From 4d4bed232bd4bd8ee0c25afa3a0d84ab57298b94 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Sat, 3 Nov 2018 11:29:59 +0530 Subject: [PATCH 3/6] Question List UI --- .../template/questions/list/list.component.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html index 4665b1381..99295c4c7 100644 --- a/ng6-seed/src/app/template/questions/list/list.component.html +++ b/ng6-seed/src/app/template/questions/list/list.component.html @@ -25,7 +25,8 @@ - + + @@ -45,11 +46,12 @@ - - - +
+ +
-
No Record Found ...
+ +
No Record Found ...
+ From 64816cd2d6d729d500f18352691b153b92ad3906 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Sat, 3 Nov 2018 14:01:59 +0530 Subject: [PATCH 4/6] Entity UI --- .../entity-edit-billing-info.component.html | 8 ++++---- .../entity-edit-region/entity-edit-region.component.html | 4 +++- .../entity-edit-tat/entity-add-tat.component.html | 2 +- .../entity-edit-tat/entity-edit-tat.component.html | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html index 28ffe3d7d..b8a07d63f 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html @@ -1,4 +1,4 @@ -
+
@@ -8,17 +8,17 @@
- {{data.addressline2}}, {{data.addressline3}} + {{data.addressline2}}, {{data.addressline3}}
- Pan: {{data.pan}}, Gst: {{data.gstno}} + Pan: {{data.pan}} , Gst: {{data.gstno}}
{{conts.contact_person}} - {{conts.contact_email}} - {{conts.contact_mobile_no}} ,
- +
\ No newline at end of file diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html index bcca26bbe..750981985 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html @@ -1,6 +1,7 @@
+
@@ -31,7 +32,7 @@ Branch Required.! --> -
+
@@ -41,6 +42,7 @@
+
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html index 921e2291d..b7de951e7 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html @@ -1,4 +1,4 @@ -
+
+
+
@@ -18,7 +18,7 @@ {{data.tatVal2}}
- +
\ No newline at end of file From 5d6682e40a539f8685acca411b4afa065fe03b1e Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Sat, 3 Nov 2018 14:26:42 +0530 Subject: [PATCH 5/6] Entity list UI --- .../entity-list/entity.list.component.html | 41 ++++++++++++++++++- .../questions/list/list.component.html | 6 +-- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html index 32b8be9c7..c6ce4f330 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html @@ -8,7 +8,40 @@
+ + + + + + {{ product.entity_name }} + + + + +
{{ product.full_name }} ({{product.short_name}})
+
{{ product.branch_name }}
+
{{product.city_name}}, {{product.state_name}}
+ + + + +
{{ product.phone_number }}
+
{{ product.official_email }}
 + + + + + + + + + + + + + + +
No Record Found ...
+ - + +
diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html index 99295c4c7..fd7fe1a92 100644 --- a/ng6-seed/src/app/template/questions/list/list.component.html +++ b/ng6-seed/src/app/template/questions/list/list.component.html @@ -29,17 +29,17 @@ - + {{ product.category_name }} - + {{ product.question }} - + From e4d7420a09b3c646bc25f89c4b1395623d20fb59 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 3 Nov 2018 15:32:01 +0530 Subject: [PATCH 6/6] Login css : ps --- .../app/session/login/login-component.html | 12 ++--- .../app/session/login/login-component.scss | 53 ++++++++++--------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 61229ce5e..41ee7e92e 100644 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -2,7 +2,7 @@
-

SINEEDGE +

SINEEDGE

@@ -11,7 +11,6 @@

Login

-
@@ -22,10 +21,11 @@
- + -
+
+
@@ -41,7 +41,7 @@