diff options
4 files changed, 13 insertions, 31 deletions
diff --git a/portal-FE-common/src/app/pages/get-access/get-access.component.ts b/portal-FE-common/src/app/pages/get-access/get-access.component.ts index a7454894..5edd17b9 100644 --- a/portal-FE-common/src/app/pages/get-access/get-access.component.ts +++ b/portal-FE-common/src/app/pages/get-access/get-access.component.ts @@ -31,7 +31,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ============LICENSE_END============================================ + * ============LICENSE_END=========================================== * * */ @@ -47,16 +47,16 @@ import { environment } from '../../../environments/environment'; styleUrls: ['./get-access.component.scss'] }) export class GetAccessComponent implements OnInit { - + api = environment.api; isLoadingTable: boolean; appTable: any[]; displayedColumns: string[] = ['function', 'applicationName', 'roleName', 'currentRole', 'requestStatus']; getAccessDataSource = new MatTableDataSource(this.appTable); @ViewChild(MatPaginator) paginator: MatPaginator; showSpinner: boolean; - getAccessUrl = environment.getAccessUrl; - getAccessName = environment.getAccessName; - getAccessInfo = environment.getAccessInfo; + getAccessUrl = this.api.getAccessUrl; + getAccessName = this.api.getAccessName; + getAccessInfo = this.api.getAccessInfo; constructor(private getAccessService: GetAccessService) { } diff --git a/portal-FE-common/src/styles/_fonts.scss b/portal-FE-common/src/styles/_fonts.scss index 77118314..5e6626ee 100644 --- a/portal-FE-common/src/styles/_fonts.scss +++ b/portal-FE-common/src/styles/_fonts.scss @@ -35,27 +35,3 @@ * * */ -@font-face { - font-family: Omnes-ECOMP-W02, Arial; - src: local("Omnes-ECOMP-W02"), url(../assets/fonts/omnesatt2-regular-webfont.ttf) format("truetype"), - url(../assets/fonts/omnesatt2-regular-webfont.woff) format("woff"), - url(../assets/fonts/omnesatt2-regular-webfont.eot) format("eot"); -} - -@font-face { - font-family: Omnes-ECOMP-W02-Medium, Arial; - src: url(../assets/fonts/omnesatt2-medium-webfont.ttf) format("truetype"); -} - -@font-face { - font-family: Omnes-ECOMP-W02-Light, Arial; - src: url(../assets/fonts/omnesatt2-light-webfont.ttf) format("truetype"); -} -@font-face { - font-family: Omnes-ECOMP-W02-Italic, Arial; - src: url(../assets/fonts/omnesatt2-lightitalic-webfont.ttf) format("truetype"); -} -@font-face { - font-family: Omnes-ECOMP-W02-Bold, Arial; - src: url(../assets/fonts/omnesatt2-bold-webfont.ttf) format("truetype"); -} diff --git a/portal-FE-os/src/environments/environment.prod.ts b/portal-FE-os/src/environments/environment.prod.ts index e8dbe0f5..89c97435 100644 --- a/portal-FE-os/src/environments/environment.prod.ts +++ b/portal-FE-os/src/environments/environment.prod.ts @@ -125,7 +125,10 @@ export const environment = { "footerLogoImagePath": "", "footerLogoText": "", "intraSearcLink": "", - "extraSpecSearcLink": "https://wiki.onap.org/dosearchsite.action?cql=siteSearch+~+searchStringPlaceHolder&queryString=searchStringPlaceHolder" + "extraSearcLink": "https://wiki.onap.org/dosearchsite.action?cql=siteSearch+~+searchStringPlaceHolder&queryString=searchStringPlaceHolder", + "getAccessUrl": "", + "getAccessName":"", + "getAccessInfo":"" }, "cookieDomain": "att.com" }; diff --git a/portal-FE-os/src/environments/environment.ts b/portal-FE-os/src/environments/environment.ts index 470b0c2a..1f57ef71 100644 --- a/portal-FE-os/src/environments/environment.ts +++ b/portal-FE-os/src/environments/environment.ts @@ -129,7 +129,10 @@ export const environment = { "footerLogoImagePath": "", "footerLogoText": "", "intraSearcLink": "", - "extraSpecSearcLink": "https://wiki.onap.org/dosearchsite.action?cql=siteSearch+~+searchStringPlaceHolder&queryString=searchStringPlaceHolder" + "extraSearcLink": "https://wiki.onap.org/dosearchsite.action?cql=siteSearch+~+searchStringPlaceHolder&queryString=searchStringPlaceHolder", + "getAccessUrl": "", + "getAccessName":"", + "getAccessInfo":"" }, "cookieDomain": "att.com" }; |