fix env files

open-template-hub · Sep 4, 2021 · 997caf5 · 997caf5
1 parent 454d50c
commit 997caf5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/src/app/page/landing-layout/login/login.component.html b/src/app/page/landing-layout/login/login.component.html
@@ -1,5 +1,5 @@
 <div class="landing-form-page">
-  <app-card1 [isSmall]="true" [title]="'Log in'" [topLayer]="true">
+  <app-card1 [isSmall]="true" [title]="'Log in'">
     <div body>
       <div fxLayout="row" fxLayoutAlign="center center">
         <app-social-button (click)="socialLogin(environmentCommon.website.facebook)"

diff --git a/src/app/page/landing-layout/sign-up/sign-up.component.html b/src/app/page/landing-layout/sign-up/sign-up.component.html
@@ -1,5 +1,5 @@
 <div class="landing-form-page">
-  <app-card1 [isSmall]="true" [title]="'Register'" [topLayer]="true">
+  <app-card1 [isSmall]="true" [title]="'Register'">
     <div body>
       <div fxLayout="row" fxLayoutAlign="center center">
         <app-social-button (click)="socialLogin(environmentCommon.website.facebook)"

diff --git a/src/app/page/raw-landing-layout/raw-landing-layout.component.html b/src/app/page/raw-landing-layout/raw-landing-layout.component.html
@@ -1,6 +1,5 @@
 <a *ngIf="environment.identity !== 'production'" [attr.data-ribbon]="environment.identity"
-   [class]="environment.identity === 'local' ? 'ribbon ribbon-error ribbon-top fixed' :
-   (environment.identity === 'staging' ? 'ribbon ribbon-warn ribbon-top fixed' : '')"
+   [class]="environment.identity ? environment.identity + ' ribbon ribbon-top fixed' : ''"
    [href]="environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/company-profile-ui-template'"
    target="_blank" rel="noreferrer" title="Identity"></a>
 <div>

diff --git a/src/environments/environment.local-to-staging-api.ts b/src/environments/environment.local-to-staging-api.ts
@@ -3,7 +3,7 @@ export const environment = {
 
   production: false,
 
-  serverUrl: 'https://oth-orchestration.herokuapp.com',
+  serverUrl: 'https://oth-server-orchestra-dev.herokuapp.com',
 
   clientUrl: 'http://localhost:4200',
 

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -3,10 +3,12 @@ export const environment = {
 
   production: true,
 
-  serverUrl: 'https://oth-orchestration.herokuapp.com',
+  // FIXME: After creating live env change this url
+  serverUrl: 'https://oth-server-orchestra-dev.herokuapp.com',
 
-  clientUrl: 'https://www.opentemplatehub.com',
+  clientUrl: 'https://opentemplatehub.com',
 
+  // FIXME: After switching to live, change this to false
   mockDataEnabled: true,
 
   oauth: {

diff --git a/src/environments/environment.staging.ts b/src/environments/environment.staging.ts
@@ -3,10 +3,11 @@ export const environment = {
 
   production: false,
 
-  serverUrl: 'https://oth-orchestration.herokuapp.com',
+  serverUrl: 'https://oth-server-orchestra-dev.herokuapp.com',
 
-  clientUrl: 'https://oth-company-profile-stg.herokuapp.com',
+  clientUrl: 'https://dev.opentemplatehub.com',
 
+  // FIXME: After switching to live, change this to false
   mockDataEnabled: true,
 
   oauth: {

diff --git a/src/styles/other/ribbon.scss b/src/styles/other/ribbon.scss
@@ -102,6 +102,14 @@
   background-color: var(--new);
 }
 
+.ribbon.local:before {
+  background-color: var(--brand-color-green-theme);
+}
+
+.ribbon.staging:before {
+  background-color: var(--brand-color-yellow-theme);
+}
+
 .ribbon:after {
   /* Set the text from the data-ribbon attribute */
   content: attr(data-ribbon);