Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
N
nobu-web-v2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ari_darmawan
nobu-web-v2
Commits
c149c3c9
Commit
c149c3c9
authored
Jan 09, 2023
by
ari_darmawan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set config json
parent
565f5925
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
15 deletions
+25
-15
app.component.ts
src/app/app.component.ts
+4
-4
app.module.ts
src/app/app.module.ts
+3
-4
service-proxy.service.ts
src/shared/serviceproxy/service-proxy.service.ts
+18
-7
No files found.
src/app/app.component.ts
View file @
c149c3c9
import
{
Component
,
OnInit
,
Injector
,
Input
,
Output
,
EventEmitter
}
from
'@angular/core'
;
import
{
Router
}
from
'@angular/router'
;
import
{
ServiceProxyWeb
,
MicroService
}
from
'../shared/serviceproxy/service-proxy.service'
;
import
{
MicroService
}
from
'../shared/serviceproxy/service-proxy.service'
;
import
{
environment
}
from
'../environments/environment.prod'
;
import
*
as
$
from
'jquery'
;
declare
const
AratakaConfig
:
any
;
...
...
@@ -15,14 +15,14 @@ export class AppComponent implements OnInit{
public
UserInformationLogin
=
null
;
public
appLogo
=
this
.
_ServiceProxyWeb
.
SITE_LOGO
public
appLogo
=
'https://i0.wp.com/jogorogo.info/wp-content/uploads/2017/07/logo_visionet.png?fit=879%2C227'
;
public
isMenu
=
false
public
route
:
string
;
constructor
(
private
router
:
Router
,
private
_ServiceProxyWeb
:
ServiceProxyWeb
,
//
private _ServiceProxyWeb : ServiceProxyWeb,
private
MicroService
:
MicroService
)
{
}
...
...
@@ -30,7 +30,7 @@ export class AppComponent implements OnInit{
ngOnInit
()
{
this
.
getEnvironment
();
//
this.getEnvironment();
}
onActivateMenu
(
e
)
{
...
...
src/app/app.module.ts
View file @
c149c3c9
...
...
@@ -47,15 +47,14 @@ export const configFactory = (configService: ConfigService) => {
],
//exports: [RouterModule],
providers
:
[
HomeService
,
ServiceProxyWeb
,
AuthService
,
{
provide
:
APP_INITIALIZER
,
useFactory
:
configFactory
,
deps
:
[
ConfigService
],
multi
:
true
}
},
AuthService
,
HomeService
,
],
bootstrap
:
[
AppComponent
]
})
...
...
src/shared/serviceproxy/service-proxy.service.ts
View file @
c149c3c9
...
...
@@ -567,7 +567,6 @@ export class TicketService {
}
PublicReplySubmit
(
_data
)
{
console
.
log
(
_data
)
const
service
=
this
.
injector
.
get
(
ServiceProxyWeb
)
var
data
;
...
...
@@ -600,9 +599,6 @@ export class TicketService {
}
endPoint
=
API_URL
+
'v3/ticket/reject/'
+
_data
.
TicketID
console
.
log
(
"DataSubmit"
,
JSON
.
stringify
(
data
))
console
.
log
(
"EndPoint"
,
endPoint
)
}
else
{
data
=
{
user_login
:
_data
.
UserLogin
,
...
...
@@ -717,7 +713,6 @@ export class CustomerService {
id_number
:
_data
.
IdentityIDNumber
,
org_id
:
1
}
console
.
log
(
JSON
.
stringify
(
data
))
const
service
=
this
.
injector
.
get
(
ServiceProxyWeb
)
let
headers
=
new
HttpHeaders
({
...
...
@@ -752,7 +747,6 @@ export class ZendeskService {
GetUserByEmail
(
_data
)
{
const
service
=
this
.
injector
.
get
(
ServiceProxyWeb
)
console
.
log
(
btoa
(
service
.
ZENDESK_API_USER
+
':'
+
service
.
ZENDESK_API_PASS
))
let
data
=
_data
;
let
headers
=
new
HttpHeaders
({
'Content-Type'
:
'application/json'
,
...
...
@@ -1120,6 +1114,24 @@ export class ConfigService {
this
.
config
=
this
.
http
.
get
(
'./assets/configAPI.json'
)
.
subscribe
((
config
:
any
)
=>
{
environment
.
APIBASEURL
=
config
.
APIBASEURL
;
environment
.
MICROSERVICEURL
=
config
.
MICROSERVICEURL
;
environment
.
ckeConfig
=
config
.
ckeConfig
;
environment
.
SITE_NAME
=
config
.
SITE_NAME
;
environment
.
SITE_LOGO
=
config
.
SITE_LOGO
;
environment
.
COMPANY_NAME
=
config
.
COMPANY_NAME
;
environment
.
PARAM_AGENTROLEID
=
config
.
PARAM_AGENTROLEID
;
environment
.
PARAM_AGENTSPVROLEID
=
config
.
PARAM_AGENTSPVROLEID
;
environment
.
PARAM_SPV
=
config
.
PARAM_SPV
;
environment
.
PARAM_AGENT
=
config
.
PARAM_AGENT
;
environment
.
PARAM_SERVICEDESK
=
config
.
PARAM_SERVICEDESK
;
environment
.
PARAM_SUPPORT
=
config
.
PARAM_SUPPORT
;
environment
.
ZENDESK_API_URL
=
config
.
ZENDESK_API_URL
;
environment
.
ZENDESK_API_USER
=
config
.
ZENDESK_API_USER
;
environment
.
ZENDESK_API_PASS
=
config
.
ZENDESK_API_PASS
;
environment
.
category
=
config
.
category
;
environment
.
Team
=
config
.
Team
;
API_URL
=
config
.
APIBASEURL
;
API_MICROSERVICE
=
config
.
MICROSERVICEURL
;
ckConfig
=
config
.
ckeConfig
;
...
...
@@ -1135,7 +1147,6 @@ export class ConfigService {
ZENDESK_API_URL
=
config
.
ZENDESK_API_URL
;
ZENDESK_API_USER
=
config
.
ZENDESK_API_USER
;
ZENDESK_API_PASS
=
config
.
ZENDESK_API_PASS
;
CATEGORY
=
config
.
category
.
servicesubcategory_id
;
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment