-
Notifications
You must be signed in to change notification settings - Fork 7
/
differences-detailed.log
647 lines (633 loc) · 22.4 KB
/
differences-detailed.log
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
diff --git a/./src/app/app-routing.module.ts b/../gsrs-client/src/app/app-routing.module.ts
index bb39753..626b802 100644
--- a/./src/app/app-routing.module.ts
+++ b/../gsrs-client/src/app/app-routing.module.ts
@@ -6,10 +6,6 @@ import { HomeComponent } from './home/home.component';
import { BrowseSubstanceComponent } from './browse-substance/browse-substance.component';
const childRoutes: Routes = [
- {
- path: '',
- component: HomeComponent
- },
{
path: 'home',
component: HomeComponent
diff --git a/./src/app/app.module.ts b/../gsrs-client/src/app/app.module.ts
index ce7c479..a8af86a 100644
--- a/./src/app/app.module.ts
+++ b/../gsrs-client/src/app/app.module.ts
@@ -1,6 +1,7 @@
import { BrowserModule } from '@angular/platform-browser';
-import { NgModule, APP_INITIALIZER } from '@angular/core';
-import { HttpClientModule } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule, FormsModule } from '@angular/forms';
+import { HttpClientModule, HttpClientJsonpModule } from '@angular/common/http';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
@@ -8,15 +9,17 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatSidenavModule } from '@angular/material/sidenav';
-import {MatCardModule} from '@angular/material/card';
+import { MatCardModule } from '@angular/material/card';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
import { CoreComponent } from './core/core.component';
import { HomeComponent } from './home/home.component';
import { BrowseSubstanceComponent } from './browse-substance/browse-substance.component';
-import { TestComponent } from './testing-directory/test/test.component';
-import { configServiceFactory } from './config/config.factory';
-import { ConfigService } from './config/config.service';
@NgModule({
declarations: [
@@ -24,8 +27,7 @@ import { ConfigService } from './config/config.service';
PageNotFoundComponent,
CoreComponent,
HomeComponent,
- BrowseSubstanceComponent,
- TestComponent
+ BrowseSubstanceComponent
],
imports: [
BrowserModule.withServerTransition({ appId: 'gsrs' }),
@@ -34,17 +36,17 @@ import { ConfigService } from './config/config.service';
MatToolbarModule,
MatSidenavModule,
MatCardModule,
- HttpClientModule
- ],
- providers: [
- ConfigService,
- {
- provide: APP_INITIALIZER,
- useFactory: configServiceFactory,
- deps: [ConfigService],
- multi: true
- }
+ MatAutocompleteModule,
+ ReactiveFormsModule,
+ FormsModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatButtonModule,
+ MatIconModule,
+ HttpClientModule,
+ HttpClientJsonpModule
],
+ providers: [],
bootstrap: [AppComponent]
})
export class AppModule { }
diff --git a/./src/app/config/config.factory.ts b/./src/app/config/config.factory.ts
deleted file mode 100644
index 934a707..0000000
--- a/./src/app/config/config.factory.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ConfigService } from './config.service';
-
-export function configServiceFactory(startupService: ConfigService): Function {
- return () => startupService.load();
-}
\ No newline at end of file
diff --git a/./src/app/config/config.service.spec.ts b/./src/app/config/config.service.spec.ts
deleted file mode 100644
index a20d4ba..0000000
--- a/./src/app/config/config.service.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, inject } from '@angular/core/testing';
-
-import { ConfigService } from './config.service';
-
-describe('ConfigService', () => {
- beforeEach(() => {
- TestBed.configureTestingModule({
- providers: [ConfigService]
- });
- });
-
- it('should be created', inject([ConfigService], (service: ConfigService) => {
- expect(service).toBeTruthy();
- }));
-});
diff --git a/./src/app/config/config.service.ts b/./src/app/config/config.service.ts
deleted file mode 100644
index 7d61e5c..0000000
--- a/./src/app/config/config.service.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { map } from 'rxjs/operators';
-
-@Injectable()
-export class ConfigService {
-
- private _configData: any;
-
- constructor(private http: HttpClient) { }
-
- // This is the method you want to call at bootstrap
- // Important: It should return a Promise
- load(): Promise<any> {
-
- this._configData = null;
-
- return this.http
- .get('/assets/data/config.json')
- .toPromise()
- .then((data: any) => this._configData = data)
- .catch((err: any) => Promise.resolve());
- }
-
- get configData(): any {
- return this._configData;
- }
-}
diff --git a/./src/app/core/core.component.html b/../gsrs-client/src/app/core/core.component.html
index f89dd91..97803d9 100644
--- a/./src/app/core/core.component.html
+++ b/../gsrs-client/src/app/core/core.component.html
@@ -12,5 +12,20 @@
</span>
</span>
<span class="middle-fill"></span>
+ <span>
+ <form>
+ <mat-form-field [floatLabel]="'never'" class="search-form-field space-right-small">
+ <input type="text" placeholder="Search" aria-label="Search substances" matInput [formControl]="searchControl" [matAutocomplete]="auto">
+ <mat-autocomplete #auto="matAutocomplete">
+ <mat-option *ngFor="let option of autoCompleteOptions" [value]="option.key">
+ {{option.key}}
+ </mat-option>
+ </mat-autocomplete>
+ </mat-form-field>
+ <button mat-icon-button>
+ <mat-icon>search</mat-icon>
+ </button>
+ </form>
+ </span>
</mat-toolbar>
-<router-outlet></router-outlet>
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/./src/app/core/core.component.scss b/../gsrs-client/src/app/core/core.component.scss
index f34f38b..527ee4b 100644
--- a/./src/app/core/core.component.scss
+++ b/../gsrs-client/src/app/core/core.component.scss
@@ -33,4 +33,8 @@
}
}
}
+}
+
+.search-form-field {
+ width: 300px;
}
\ No newline at end of file
diff --git a/./src/app/core/core.component.ts b/../gsrs-client/src/app/core/core.component.ts
index f931adc..034394a 100644
--- a/./src/app/core/core.component.ts
+++ b/../gsrs-client/src/app/core/core.component.ts
@@ -1,4 +1,7 @@
import { Component, OnInit } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { UtilsService } from '../utils/utils.service';
+import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators';
@Component({
selector: 'app-core',
@@ -6,10 +9,31 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./core.component.scss']
})
export class CoreComponent implements OnInit {
+ searchControl = new FormControl();
+ autoCompleteOptions: Array<any>;
- constructor() { }
+ constructor(
+ private utilsService: UtilsService
+ ) {
+ this.autoCompleteOptions = [];
+ }
ngOnInit() {
+ this.searchControl.valueChanges.pipe(
+ debounceTime(500),
+ distinctUntilChanged(),
+ switchMap(searchValue =>
+ this.utilsService.getStructureSearchSuggestions(searchValue)
+ )
+ ).subscribe((response: any) => {
+ this.autoCompleteOptions = response.Name;
+ }, error => {
+ console.log(error);
+ });
+ }
+
+ updateAutoCompleteOptions(searchValue: string) {
+
}
}
diff --git a/./src/app/home/home.component.ts b/../gsrs-client/src/app/home/home.component.ts
index 65a447d..f56c8c1 100644
--- a/./src/app/home/home.component.ts
+++ b/../gsrs-client/src/app/home/home.component.ts
@@ -1,6 +1,4 @@
import { Component, OnInit } from '@angular/core';
-import { environment} from '../../environments/environment';
-import { ConfigService } from '../config/config.service';
@Component({
selector: 'app-home',
@@ -9,15 +7,9 @@ import { ConfigService } from '../config/config.service';
})
export class HomeComponent implements OnInit {
- constructor(
- private configService: ConfigService
- ) { }
+ constructor() { }
ngOnInit() {
- if (environment.version == 'gsrs'){
- console.log(environment);
- }
-
- console.log(this.configService.configData);
}
+
}
diff --git a/./src/app/testing-directory/test/test.component.html b/./src/app/testing-directory/test/test.component.html
deleted file mode 100644
index 2395704..0000000
--- a/./src/app/testing-directory/test/test.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
- test works!
-</p>
diff --git a/./src/app/testing-directory/test/test.component.scss b/./src/app/testing-directory/test/test.component.scss
deleted file mode 100644
index 8eba5a2..0000000
--- a/./src/app/testing-directory/test/test.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.mat-side-nav {
- background-color: white;
-}
\ No newline at end of file
diff --git a/./src/app/testing-directory/test/test.component.spec.ts b/./src/app/testing-directory/test/test.component.spec.ts
deleted file mode 100644
index ef4e38c..0000000
--- a/./src/app/testing-directory/test/test.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TestComponent } from './test.component';
-
-describe('TestComponent', () => {
- let component: TestComponent;
- let fixture: ComponentFixture<TestComponent>;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ TestComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(TestComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/./src/app/testing-directory/test/test.component.ts b/./src/app/testing-directory/test/test.component.ts
deleted file mode 100644
index 7293823..0000000
--- a/./src/app/testing-directory/test/test.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-test',
- templateUrl: './test.component.html',
- styleUrls: ['./test.component.scss']
-})
-export class TestComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-
-}
\ No newline at end of file
diff --git a/./src/assets/data/config.json b/./src/assets/data/config.json
deleted file mode 100644
index cde32bf..0000000
--- a/./src/assets/data/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "test": "this is a test of the config file"
-}
\ No newline at end of file
diff --git a/./src/environments/_base-environment.ts b/./src/environments/_base-environment.ts
deleted file mode 100644
index 170a5bd..0000000
--- a/./src/environments/_base-environment.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const baseEnvironment = {
- production: false,
- version: '',
- apiBase: ''
-}
diff --git a/./src/environments/environment.abase.dev.ts b/../gsrs-client/src/environments/environment.abase.dev.ts
index 2f3d094..464f4f3 100644
--- a/./src/environments/environment.abase.dev.ts
+++ b/../gsrs-client/src/environments/environment.abase.dev.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'abase';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
+export const environment = {
+ production: false,
+ version: 'abase'
+ };
diff --git a/./src/environments/environment.abase.local.ts b/../gsrs-client/src/environments/environment.abase.local.ts
index 2ce3c76..4eb765c 100644
--- a/./src/environments/environment.abase.local.ts
+++ b/../gsrs-client/src/environments/environment.abase.local.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'abase';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'abase'
+ };
\ No newline at end of file
diff --git a/./src/environments/environment.abase.pre-prod.ts b/../gsrs-client/src/environments/environment.abase.pre-prod.ts
index 2ce3c76..8ac0b7e 100644
--- a/./src/environments/environment.abase.pre-prod.ts
+++ b/../gsrs-client/src/environments/environment.abase.pre-prod.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'abase';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'abase'
+};
diff --git a/./src/environments/environment.abase.prod.ts b/../gsrs-client/src/environments/environment.abase.prod.ts
index 7a94c4e..5990c97 100644
--- a/./src/environments/environment.abase.prod.ts
+++ b/../gsrs-client/src/environments/environment.abase.prod.ts
@@ -1,6 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.production = true;
-environment.version = 'abase';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
+export const environment = {
+ production: true,
+ version: 'abase'
+};
diff --git a/./src/environments/environment.fda.dev.ts b/../gsrs-client/src/environments/environment.fda.dev.ts
index a023a43..d523e76 100644
--- a/./src/environments/environment.fda.dev.ts
+++ b/../gsrs-client/src/environments/environment.fda.dev.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'fda';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'fda'
+ };
\ No newline at end of file
diff --git a/./src/environments/environment.fda.local.ts b/../gsrs-client/src/environments/environment.fda.local.ts
index a023a43..d523e76 100644
--- a/./src/environments/environment.fda.local.ts
+++ b/../gsrs-client/src/environments/environment.fda.local.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'fda';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'fda'
+ };
\ No newline at end of file
diff --git a/./src/environments/environment.fda.pre-prod.ts b/../gsrs-client/src/environments/environment.fda.pre-prod.ts
index a023a43..410c009 100644
--- a/./src/environments/environment.fda.pre-prod.ts
+++ b/../gsrs-client/src/environments/environment.fda.pre-prod.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'fda';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'fda'
+};
diff --git a/./src/environments/environment.fda.prod.ts b/../gsrs-client/src/environments/environment.fda.prod.ts
index 3434a3c..fe36f57 100644
--- a/./src/environments/environment.fda.prod.ts
+++ b/../gsrs-client/src/environments/environment.fda.prod.ts
@@ -1,6 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.production = true;
-environment.version = 'fda';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: true,
+ version: 'fda'
+};
diff --git a/./src/environments/environment.gsrs.dev.ts b/../gsrs-client/src/environments/environment.gsrs.dev.ts
index 113442a..328319c 100644
--- a/./src/environments/environment.gsrs.dev.ts
+++ b/../gsrs-client/src/environments/environment.gsrs.dev.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'gsrs';
-environment.apiBase = 'https://tripod.nih.gov/ginas/app/api/v1';
+export const environment = {
+ production: false,
+ version: 'gsrs'
+ };
\ No newline at end of file
diff --git a/./src/environments/environment.gsrs.local.ts b/../gsrs-client/src/environments/environment.gsrs.local.ts
index 3f61411..328319c 100644
--- a/./src/environments/environment.gsrs.local.ts
+++ b/../gsrs-client/src/environments/environment.gsrs.local.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'gsrs';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'gsrs'
+ };
\ No newline at end of file
diff --git a/./src/environments/environment.gsrs.pre-prod.ts b/../gsrs-client/src/environments/environment.gsrs.pre-prod.ts
index 3f61411..0e254a5 100644
--- a/./src/environments/environment.gsrs.pre-prod.ts
+++ b/../gsrs-client/src/environments/environment.gsrs.pre-prod.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'gsrs';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'gsrs'
+};
diff --git a/./src/environments/environment.gsrs.prod.ts b/../gsrs-client/src/environments/environment.gsrs.prod.ts
index 6b4615f..7b0bae3 100644
--- a/./src/environments/environment.gsrs.prod.ts
+++ b/../gsrs-client/src/environments/environment.gsrs.prod.ts
@@ -1,6 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.production = true;
-environment.version = 'gsrs';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
+export const environment = {
+ production: true,
+ version: 'gsrs'
+};
diff --git a/./src/environments/environment.inxight.dev.ts b/../gsrs-client/src/environments/environment.inxight.dev.ts
index bf7d0a3..d4e7c78 100644
--- a/./src/environments/environment.inxight.dev.ts
+++ b/../gsrs-client/src/environments/environment.inxight.dev.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'inxight';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'inxight'
+ };
\ No newline at end of file
diff --git a/./src/environments/environment.inxight.local.ts b/../gsrs-client/src/environments/environment.inxight.local.ts
index bf7d0a3..d4e7c78 100644
--- a/./src/environments/environment.inxight.local.ts
+++ b/../gsrs-client/src/environments/environment.inxight.local.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'inxight';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
\ No newline at end of file
+export const environment = {
+ production: false,
+ version: 'inxight'
+ };
\ No newline at end of file
diff --git a/./src/environments/environment.inxight.pre-prod.ts b/../gsrs-client/src/environments/environment.inxight.pre-prod.ts
index 7dd04fe..36f01cd 100644
--- a/./src/environments/environment.inxight.pre-prod.ts
+++ b/../gsrs-client/src/environments/environment.inxight.pre-prod.ts
@@ -1,5 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.version = 'inxight';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
+export const environment = {
+ production: false,
+ version: 'inxight'
+};
diff --git a/./src/environments/environment.inxight.prod.ts b/../gsrs-client/src/environments/environment.inxight.prod.ts
index a342bba..564c8da 100644
--- a/./src/environments/environment.inxight.prod.ts
+++ b/../gsrs-client/src/environments/environment.inxight.prod.ts
@@ -1,6 +1,4 @@
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
-environment.production = true;
-environment.version = 'inxight';
-environment.apiBase = 'https://localhost:9000/ginas/app/api/v1';
+export const environment = {
+ production: true,
+ version: 'inxight'
+};
diff --git a/./src/environments/environment.ts b/../gsrs-client/src/environments/environment.ts
index c74d5ab..600fdaf 100644
--- a/./src/environments/environment.ts
+++ b/../gsrs-client/src/environments/environment.ts
@@ -2,9 +2,9 @@
// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
-import { baseEnvironment } from './_base-environment';
-
-export const environment = baseEnvironment;
+export const environment = {
+ production: false
+};
/*
* In development mode, for easier debugging, you can ignore zone related error
diff --git a/../gsrs-client/src/styles/_utils.scss b/../gsrs-client/src/styles/_utils.scss
new file mode 100644
index 0000000..eb639f9
--- /dev/null
+++ b/../gsrs-client/src/styles/_utils.scss
@@ -0,0 +1,3 @@
+.space-right-small {
+ margin-right: 5px;
+}
\ No newline at end of file
diff --git a/./src/styles/main.scss b/../gsrs-client/src/styles/main.scss
index e4f7d6d..56c9dc9 100644
--- a/./src/styles/main.scss
+++ b/../gsrs-client/src/styles/main.scss
@@ -1,2 +1,3 @@
@import 'material-design-theme';
-@import 'base';
\ No newline at end of file
+@import 'base';
+@import 'utils';
\ No newline at end of file