env common updates

open-template-hub · Sep 4, 2021 · 3b8b0ed · 3b8b0ed
1 parent c93a4c1
commit 3b8b0ed
Show file tree

Hide file tree

Showing 24 changed files with 298 additions and 421 deletions.
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -1,10 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { environment } from '../environments/environment';
-import { EventComponent } from './page/dashboard-layout/event/event.component';
+import { environmentCommon } from '../environments/environment-common';
+import { AuthGuard } from './guard/auth/auth.guard';
+import { PublicProfileGuard } from './guard/public-profile/public-profile.guard';
 import { CreateEventComponent } from './page/dashboard-layout/create-event/create-event.component';
 import { DashboardLayoutComponent } from './page/dashboard-layout/dashboard-layout.component';
 import { DashboardComponent } from './page/dashboard-layout/dashboard/dashboard.component';
+import { EventComponent } from './page/dashboard-layout/event/event.component';
 import { LearnComponent } from './page/dashboard-layout/learn/learn.component';
 import { MyProfileComponent } from './page/dashboard-layout/my-profile/my-profile.component';
 import { PublicProfileComponent } from './page/dashboard-layout/public-profile/public-profile.component';
@@ -30,8 +32,6 @@ import { SettingsLayoutComponent } from './page/settings-layout/settings-layout.
 import { WelcomeComponent } from './page/settings-layout/welcome/welcome.component';
 import { CallbackComponent } from './page/splash-layout/callback/callback.component';
 import { SplashLayoutComponent } from './page/splash-layout/splash-layout.component';
-import { AuthGuard } from './guard/auth/auth.guard';
-import { PublicProfileGuard } from './guard/public-profile/public-profile.guard';
 
 const routes: Routes = [
   {
@@ -68,15 +68,15 @@ const routes: Routes = [
     component: SplashLayoutComponent,
     data: { layout: 'splash-layout' },
     children: [
-      { path: 'google', component: CallbackComponent, data: { social: environment.social.google } },
-      { path: 'facebook', component: CallbackComponent, data: { social: environment.social.facebook } },
-      { path: 'twitter', component: CallbackComponent, data: { social: environment.social.twitter } },
-      { path: 'linkedin', component: CallbackComponent, data: { social: environment.social.linkedin } },
-      { path: 'twitch', component: CallbackComponent, data: { social: environment.social.twitch } },
-      { path: 'dribbble', component: CallbackComponent, data: { social: environment.social.dribbble } },
-      { path: 'reddit', component: CallbackComponent, data: { social: environment.social.reddit } },
-      { path: 'github', component: CallbackComponent, data: { social: environment.social.github } },
-      { path: 'stripe', component: CallbackComponent, data: { payment: environment.payment.stripe } }
+      { path: 'google', component: CallbackComponent, data: { oauth: environmentCommon.website.google } },
+      { path: 'facebook', component: CallbackComponent, data: { oauth: environmentCommon.website.facebook } },
+      { path: 'twitter', component: CallbackComponent, data: { oauth: environmentCommon.website.twitter } },
+      { path: 'linkedin', component: CallbackComponent, data: { oauth: environmentCommon.website.linkedin } },
+      { path: 'twitch', component: CallbackComponent, data: { oauth: environmentCommon.website.twitch } },
+      { path: 'dribbble', component: CallbackComponent, data: { oauth: environmentCommon.website.dribbble } },
+      { path: 'reddit', component: CallbackComponent, data: { oauth: environmentCommon.website.reddit } },
+      { path: 'github', component: CallbackComponent, data: { oauth: environmentCommon.website.github } },
+      { path: 'stripe', component: CallbackComponent, data: { payment: environmentCommon.website.stripe } }
     ]
   },
   {

diff --git a/src/app/component/common/block/event-data/event-data.component.ts b/src/app/component/common/block/event-data/event-data.component.ts
@@ -3,21 +3,25 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { Router } from '@angular/router';
 import { createEvent, DateArray, EventAttributes } from 'ics';
 import { environment } from 'src/environments/environment';
+import { environmentCommon } from '../../../../../environments/environment-common';
+import { URLS } from '../../../../data/constant';
 import { EventService } from '../../../../service/event/event.service';
 import { InformationService } from '../../../../service/information/information.service';
 import { LoadingService } from '../../../../service/loading/loading.service';
 import { PaymentService } from '../../../../service/payment/payment.service';
 import { UserActivityService } from '../../../../service/user-activity/user-activity.service';
-import { URLS } from '../../../../data/constant';
 
 @Component( {
   selector: 'app-event-data',
   templateUrl: './event-data.component.html',
   styleUrls: [ './event-data.component.scss' ]
 } )
 export class EventDataComponent implements OnInit {
+
   selectedRate = 0;
+
   environment = environment;
+  environmentCommon = environmentCommon;
 
   @Input() title: string = undefined;
   @Input() user: any = undefined;
@@ -170,9 +174,9 @@ export class EventDataComponent implements OnInit {
 
   onMarkAsCompletedClick() {
     this.eventService.markAsCompleted( this.id ).subscribe( () => {
-      this.informationService.setInformation( `Completed ${ this.title }`, 'info' )
-      this.markAsCompletedButtonClicked.emit( this.id )
-    } )
+      this.informationService.setInformation( `Completed ${ this.title }`, 'info' );
+      this.markAsCompletedButtonClicked.emit( this.id );
+    } );
   }
 
   onEditClick() {
@@ -183,36 +187,36 @@ export class EventDataComponent implements OnInit {
 
   onCategoryClick() {
     this.router.navigate( [ URLS.dashboard.learn ],
-      {
-        queryParams: {
-          category: this.category.id,
-          'sub-category': this.subCategory?.id,
-          'leaf-category': this.leafCategory?.id
-        }
-      } );
+        {
+          queryParams: {
+            category: this.category.id,
+            'sub-category': this.subCategory?.id,
+            'leaf-category': this.leafCategory?.id
+          }
+        } );
   }
 
   onRateClick() {
     this.userActivityService.rate( this.id, this.selectedRate ).subscribe( () => {
-      this.informationService.setInformation( `Rated ${ this.title }`, 'info' )
+      this.informationService.setInformation( `Rated ${ this.title }`, 'info' );
       this.rateButtonClicked.emit();
-    });
+    } );
   }
 
   shareVia( brand: string ) {
-    let eventUrl: string
+    let eventUrl: string;
 
     switch ( brand ) {
       case 'twitter':
         const related = this.category.name + ( this.subCategory ? ',' + this.subCategory.name : '' ) +
-            ( this.leafCategory ? ',' + this.leafCategory.name : '' )
-        eventUrl = environment.social.twitter.shareUrl + environment.clientUrl
-          + URLS.dashboard.event + '?event_id=' + this.id + '&text=' + this.title + '&via=wecontribute_io'
-          + '&related=' + related
-        break
+            ( this.leafCategory ? ',' + this.leafCategory.name : '' );
+        eventUrl = environmentCommon.website.twitter.shareUrl + environment.clientUrl
+            + URLS.dashboard.event + '?event_id=' + this.id + '&text=' + this.title + '&via=wecontribute_io'
+            + '&related=' + related;
+        break;
       case 'linkedin':
-        eventUrl = environment.social.linkedin.shareUrl + encodeURIComponent(  environment.clientUrl + URLS.dashboard.event
-          + '?event_id=' + this.id )
+        eventUrl = environmentCommon.website.linkedin.shareUrl + encodeURIComponent( environment.clientUrl + URLS.dashboard.event
+            + '?event_id=' + this.id );
     }
 
     window.open( eventUrl, '_blank' );

diff --git a/src/app/component/common/block/event-hamburger-menu/event-hamburger-menu.component.html b/src/app/component/common/block/event-hamburger-menu/event-hamburger-menu.component.html
@@ -6,13 +6,13 @@
       <hr>
       <div fxLayout="row" class="content">
         <a class="twitter-area" (click)="shareViaClicked.emit( 'twitter' )">
-          <app-social-button [brand]="environment.social.twitter.cssClass"
+          <app-social-button [brand]="environmentCommon.website.twitter.cssClass"
                              [circle]="true" [isSmallLogo]="true"></app-social-button>
           <p>Twitter</p>
         </a>
         <a class="linkedin-area" style="margin-left: 30px;">
           <a class="linkedin- area" (click)="shareViaClicked.emit( 'linkedin' )">
-            <app-social-button [brand]="environment.social.linkedin.cssClass"
+            <app-social-button [brand]="environmentCommon.website.linkedin.cssClass"
                                [circle]="true" [isSmallLogo]="true"></app-social-button>
             <p>Linkedin</p>
           </a>
@@ -23,15 +23,16 @@
       <p>Calendar</p>
       <hr>
       <div fxLayout="row" class="content">
-        <app-social-button (click)="calendarClicked.emit(true)" [brand]="environment.social.appleCalendar.cssClass"
+        <app-social-button (click)="calendarClicked.emit(true)"
+                           [brand]="environmentCommon.website.appleCalendar.cssClass"
                            [flexStart]="true"
-                           [localImage]="environment.social.appleCalendar.logo"
+                           [localImage]="environmentCommon.website.appleCalendar.logo"
                            [noTextStyle]="true"
                            class="apple-calendar"></app-social-button>
         <app-social-button style="margin-left: 30px;" (click)="calendarClicked.emit(true)"
-                           [brand]="environment.social.googleCalendar.cssClass"
+                           [brand]="environmentCommon.website.googleCalendar.cssClass"
                            [flexStart]="true"
-                           [localImage]="environment.social.googleCalendar.logo"
+                           [localImage]="environmentCommon.website.googleCalendar.logo"
                            [noTextStyle]="true"
                            class="google-calendar"></app-social-button>
       </div>

diff --git a/src/app/component/common/block/event-hamburger-menu/event-hamburger-menu.component.ts b/src/app/component/common/block/event-hamburger-menu/event-hamburger-menu.component.ts
@@ -1,16 +1,18 @@
 import { Component, ElementRef, EventEmitter, HostListener, Input, Output, ViewChild } from '@angular/core';
 import { environment } from '../../../../../environments/environment';
+import { environmentCommon } from '../../../../../environments/environment-common';
 
-@Component({
+@Component( {
   selector: 'app-event-hamburger-menu',
   templateUrl: './event-hamburger-menu.component.html',
-  styleUrls: ['./event-hamburger-menu.component.scss']
-})
+  styleUrls: [ './event-hamburger-menu.component.scss' ]
+} )
 export class EventHamburgerMenuComponent {
 
-  display = false
-  environment = environment
-  url = environment.serverUrl
+  display = false;
+
+  environment = environment;
+  environmentCommon = environmentCommon;
 
   @ViewChild( 'menu' ) menu: ElementRef;
   @ViewChild( 'icon' ) icon: ElementRef;
@@ -20,17 +22,14 @@ export class EventHamburgerMenuComponent {
   @Output() shareViaClicked = new EventEmitter<string>();
 
   constructor(
-    private _eref: ElementRef
-  ) { }
+      private _eref: ElementRef
+  ) {
+  }
 
   @HostListener( 'document:click', [ '$event' ] )
   onDocumentClick( event ) {
     if ( this.icon?.nativeElement.contains( event.target ) ) {
-      this.display = !this.display
-    } else if ( this.menu?.nativeElement.contains( event.target ) ) {
-      this.display = true;
-    } else {
-      this.display = false;
-    }
+      this.display = !this.display;
+    } else this.display = !!this.menu?.nativeElement.contains( event.target );
   }
 }
diff --git a/src/app/component/common/card/testimonial-card/testimonial-card.component.html b/src/app/component/common/card/testimonial-card/testimonial-card.component.html
@@ -14,13 +14,15 @@
         <span>Open Template Hub</span>
       </a>
       <div class="footer-social">
-        <a [href]="environment.social.twitter.url + '/' + environmentCommon.oth.social.twitter" target="_blank"
+        <a [href]="environmentCommon.website.twitter.url + '/' + environmentCommon.oth.social.twitter" target="_blank"
            aria-label="twitter" rel=noopener>
-          <i aria-hidden="true" [style.color]="option.style.themeColor" [class]="'fab fa-' + environment.social.twitter.cssClass + ' fa-2x fa-fw'"></i>
+          <i aria-hidden="true" [style.color]="option.style.themeColor"
+             [class]="'fab fa-' + environmentCommon.website.twitter.cssClass + ' fa-2x fa-fw'"></i>
         </a>
-        <a [href]="environment.social.linkedin.url + '/company/' + environmentCommon.oth.social.linkedin"
+        <a [href]="environmentCommon.website.linkedin.url + '/company/' + environmentCommon.oth.social.linkedin"
            target="_blank" aria-label="linkedin" rel=noopener>
-          <i aria-hidden="true" [style.color]="option.style.themeColor" [class]="'fab fa-' + environment.social.linkedin.cssClass + ' fa-2x fa-fw'"></i>
+          <i aria-hidden="true" [style.color]="option.style.themeColor"
+             [class]="'fab fa-' + environmentCommon.website.linkedin.cssClass + ' fa-2x fa-fw'"></i>
         </a>
       </div>
     </div>

diff --git a/src/app/component/nav/common/footer/footer.component.html b/src/app/component/nav/common/footer/footer.component.html
@@ -44,21 +44,21 @@
       <h2>Open Template Hub <span class="copyright">&#169; 2021</span></h2>
     </a>
     <div class="footer-social">
-      <a [href]="environment.social.twitter.url + '/' + environmentCommon.oth.social.twitter" target="_blank"
+      <a [href]="environmentCommon.website.twitter.url + '/' + environmentCommon.oth.social.twitter" target="_blank"
          rel=noopener aria-label="twitter">
-        <i aria-hidden="true" [class]="'fab fa-' + environment.social.twitter.cssClass + ' fa-2x fa-fw'"></i>
+        <i aria-hidden="true" [class]="'fab fa-' + environmentCommon.website.twitter.cssClass + ' fa-2x fa-fw'"></i>
       </a>
-      <a [href]="environment.social.github.url + '/' + environmentCommon.oth.social.github"
+      <a [href]="environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github"
          target="_blank" rel=noopener aria-label="github">
-        <i aria-hidden="true" [class]="'fab fa-' + environment.social.github.cssClass + ' fa-2x fa-fw'"></i>
+        <i aria-hidden="true" [class]="'fab fa-' + environmentCommon.website.github.cssClass + ' fa-2x fa-fw'"></i>
       </a>
-      <a [href]="environment.social.productHunt.url + environmentCommon.oth.social.productHunt"
+      <a [href]="environmentCommon.website.productHunt.url + environmentCommon.oth.social.productHunt"
          target="_blank" rel=noopener aria-label="producthunt">
-        <i aria-hidden="true" [class]="'fab fa-' + environment.social.productHunt.cssClass + ' fa-2x fa-fw'"></i>
+        <i aria-hidden="true" [class]="'fab fa-' + environmentCommon.website.productHunt.cssClass + ' fa-2x fa-fw'"></i>
       </a>
-      <a [href]="environment.social.linkedin.url + '/company/' + environmentCommon.oth.social.linkedin"
+      <a [href]="environmentCommon.website.linkedin.url + '/company/' + environmentCommon.oth.social.linkedin"
          target="_blank" rel=noopener aria-label="linkedin">
-        <i aria-hidden="true" [class]="'fab fa-' + environment.social.linkedin.cssClass + ' fa-2x fa-fw'"></i>
+        <i aria-hidden="true" [class]="'fab fa-' + environmentCommon.website.linkedin.cssClass + ' fa-2x fa-fw'"></i>
       </a>
     </div>
     <div class="footer-version">{{' v-' + appVersion}}</div>

diff --git a/src/app/page/dashboard-layout/my-profile/my-profile.component.html b/src/app/page/dashboard-layout/my-profile/my-profile.component.html
@@ -77,15 +77,15 @@
           </app-label-with-icon-data>
           <app-label-with-icon-data *ngIf="userInfo?.payload?.social?.twitter" [brand]="'twitter'"
                                     [data]="userInfo.payload.social.twitter"
-                                    [urlPrefix]="environment.social.twitter.url">
+                                    [urlPrefix]="environmentCommon.website.twitter.url">
           </app-label-with-icon-data>
           <app-label-with-icon-data *ngIf="userInfo?.payload?.social?.facebook" [brand]="'facebook'"
                                     [data]="userInfo.payload.social.facebook"
-                                    [urlPrefix]="environment.social.facebook.url">
+                                    [urlPrefix]="environmentCommon.website.facebook.url">
           </app-label-with-icon-data>
           <app-label-with-icon-data *ngIf="userInfo?.payload?.social?.youtube" [brand]="'youtube'"
                                     [data]="userInfo.payload.social.youtube"
-                                    [urlPrefix]="environment.social.youtube.url + '/c'">
+                                    [urlPrefix]="environmentCommon.website.youtube.url + '/c'">
 
           </app-label-with-icon-data>
         </div>

diff --git a/src/app/page/dashboard-layout/my-profile/my-profile.component.ts b/src/app/page/dashboard-layout/my-profile/my-profile.component.ts
@@ -1,7 +1,9 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 import { environment } from '../../../../environments/environment';
+import { environmentCommon } from '../../../../environments/environment-common';
 import { Rate } from '../../../component/common/rate-bar/rate-bar.component';
+import { PROFILE_IMG, URLS } from '../../../data/constant';
 import { AuthToken } from '../../../model/AuthToken';
 import { AuthenticationService } from '../../../service/auth/authentication.service';
 import { BasicInfoService } from '../../../service/basic-info/basic-info.service';
@@ -14,7 +16,6 @@ import { InformationService } from '../../../service/information/information.ser
 import { LoadingService } from '../../../service/loading/loading.service';
 import { ThemeService } from '../../../service/theme/theme.service';
 import { UserActivityService } from '../../../service/user-activity/user-activity.service';
-import { PROFILE_IMG, URLS } from '../../../data/constant';
 
 @Component( {
   selector: 'app-my-profile',
@@ -25,7 +26,10 @@ export class MyProfileComponent implements OnDestroy {
 
   currentUser: AuthToken;
   userInfo: any = {};
+
   environment = environment;
+  environmentCommon = environmentCommon;
+
   profileImg = PROFILE_IMG;
   loading = false;
   loadingCount = false;

diff --git a/src/app/page/dashboard-layout/public-profile/public-profile.component.html b/src/app/page/dashboard-layout/public-profile/public-profile.component.html
@@ -82,15 +82,15 @@
           </app-label-with-icon-data>
           <app-label-with-icon-data *ngIf="userInfo?.payload?.social?.twitter" [brand]="'twitter'"
                                     [data]="userInfo.payload.social.twitter"
-                                    [urlPrefix]="environment.social.twitter.url">
+                                    [urlPrefix]="environmentCommon.website.twitter.url">
           </app-label-with-icon-data>
           <app-label-with-icon-data *ngIf="userInfo?.payload?.social?.facebook" [brand]="'facebook'"
                                     [data]="userInfo.payload.social.facebook"
-                                    [urlPrefix]="environment.social.facebook.url">
+                                    [urlPrefix]="environmentCommon.website.facebook.url">
           </app-label-with-icon-data>
           <app-label-with-icon-data *ngIf="userInfo?.payload?.social?.youtube" [brand]="'youtube'"
                                     [data]="userInfo.payload.social.youtube"
-                                    [urlPrefix]="environment.social.youtube.url + '/c'">
+                                    [urlPrefix]="environmentCommon.website.youtube.url + '/c'">
 
           </app-label-with-icon-data>
         </div>