From 1bf475582867e4709c5b00649d2a23f8cde507fc Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Thu, 9 Dec 2021 10:20:49 +0200
Subject: [PATCH] add sinlge login properties in beta, minor change in
 customization - background

---
 package.json                                               | 2 +-
 src/app/pages/customization/background-upload.component.ts | 4 ++--
 src/app/pages/customization/customization.component.html   | 2 +-
 src/environments/environment.beta.ts                       | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 1873c9c..53ccacc 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "e2e": "ng e2e",
     "mining": "chmod +x interactivemining-install.sh && ./interactivemining-install.sh",
     "postinstall": "npm run mining",
-    "after-build-clean": "rm -rf dist/connect-admin/assets/common-assets/.svn/ dist/connect-admin/assets/dashboard-theme/.svn/"
+    "after-build-clean": "rm -rf dist/connect-admin/assets/common-assets/.git dist/connect-admin/assets/dashboard-theme/.git"
   },
   "private": true,
   "dependencies": {
diff --git a/src/app/pages/customization/background-upload.component.ts b/src/app/pages/customization/background-upload.component.ts
index 635a60f..3b7fda8 100644
--- a/src/app/pages/customization/background-upload.component.ts
+++ b/src/app/pages/customization/background-upload.component.ts
@@ -45,8 +45,8 @@ declare var UIkit;
           </button>
         </div>
       </div>
-    <div class="uk-margin-medium-top">
-      <div class="uk-text-bold uk-form-label uk-margin-small-bottom"> Position</div>
+    <div *ngIf="background.imageFile" class="uk-margin-top">
+      <div class="uk-text-bold uk-form-label uk-margin-small-bottom">Image position</div>
       <!--      <div class="uk-margin-bottom uk-form-hint "> hint</div>-->
       <div class="input-box ">
         <mat-form-field class="uk-width-1-1">
diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html
index 7fe08c5..56be2d1 100644
--- a/src/app/pages/customization/customization.component.html
+++ b/src/app/pages/customization/customization.component.html
@@ -101,7 +101,7 @@
               <background label="Form" [background]="draftCustomizationOptions.backgrounds.form"
                           [light]="true"
                           [oldBackground]="publishedCustomizationOptions.backgrounds.form" [communityId]="communityId"></background>
-              <div  class="uk-margin-medium-top uk-margin-small-bottom uk-text-bold">Form Background image</div>
+              <div  class="uk-margin-medium-top uk-margin-small-bottom uk-text-bold">Form background image</div>
               <background-upload label="Form" [background]="draftCustomizationOptions.backgrounds.form"
                             [oldBackground]="publishedCustomizationOptions.backgrounds.form" [communityId]="communityId"></background-upload>
               <div class="uk-margin-xlarge-top uk-text-uppercase uk-h5">Buttons </div>
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index bdfb635..be0e788 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -39,9 +39,9 @@ export let properties: EnvProperties = {
   vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
   piwikBaseUrl: " https://analytics.openaire.eu/piwik.php?idsite=6",
   registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
-  loginUrl: "https://beta.services.openaire.eu/connect-dashboard-login/openid_connect_login",
-  userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-  logoutUrl: "https://beta.services.openaire.eu/connect-dashboard-login/openid_logout",
+  loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
+  userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
+  logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
   cookieDomain: ".openaire.eu",
   feedbackmail: "feedback@openaire.eu",
   feedbackmailForMissingEntities: "feedback@openaire.eu",