From fe796234641cb075f0e9d9b65e129590485b31f8 Mon Sep 17 00:00:00 2001
From: Bangara Raju Kottedi <bangararaju.kottedi@gmail.com>
Date: Mon, 6 May 2024 23:20:51 +0530
Subject: [PATCH] code refactoring

---
 src/app/blog/blog.component.html            | 4 ++--
 src/app/blog/blog.component.ts              | 3 ++-
 src/app/blog/blog.model.ts                  | 1 +
 src/app/models/post.model.ts                | 2 +-
 src/app/models/project.model.ts             | 2 +-
 src/app/projects/projects.component.html    | 4 ++--
 src/app/projects/projects.component.scss    | 7 +++++++
 src/app/projects/projects.component.ts      | 2 +-
 src/environments/environment.development.ts | 1 -
 src/environments/environment.ts             | 1 -
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/app/blog/blog.component.html b/src/app/blog/blog.component.html
index a542298..b63cedd 100644
--- a/src/app/blog/blog.component.html
+++ b/src/app/blog/blog.component.html
@@ -12,13 +12,13 @@
           <a [href]="post.postUrl" target="_blank">
 
             <figure class="blog-banner-box" *ngIf="post.image">
-              <img src="{{blogImageUrl + post.image}}" [alt]="post.title" loading="lazy">
+              <img src="{{blogUrl + post.image}}" [alt]="post.title" loading="lazy">
             </figure>
 
             <div class="blog-content">
 
               <div class="blog-meta">
-                <p class="blog-category">{{post.categories}}</p>
+                <p class="blog-category" *ngFor="let category of post.categories; index as i">{{post.categories.length - i > 1 ? category + ',' : category}}</p>
 
                 <span class="dot"></span>
 
diff --git a/src/app/blog/blog.component.ts b/src/app/blog/blog.component.ts
index fbd85ff..ee222f2 100644
--- a/src/app/blog/blog.component.ts
+++ b/src/app/blog/blog.component.ts
@@ -10,7 +10,7 @@ import { environment } from 'src/environments/environment';
   styleUrl: './blog.component.scss'
 })
 export class BlogComponent extends BaseComponent<IBlog> implements OnInit{
-  blogImageUrl: string = environment.blogImagesUrl;
+  blogUrl!: string;
   constructor(svc: CvService){
     super(svc);
   }
@@ -23,6 +23,7 @@ export class BlogComponent extends BaseComponent<IBlog> implements OnInit{
     this.svc.getBlog(this.candidateId).subscribe((response: IBlog) => {
       this.svc.blog = this.svc.blog ?? response;
       this.assignData(response);
+      this.blogUrl = this.svc.blog.blogUrl;
     });
   }
 }
diff --git a/src/app/blog/blog.model.ts b/src/app/blog/blog.model.ts
index 0e29ccc..606d46a 100644
--- a/src/app/blog/blog.model.ts
+++ b/src/app/blog/blog.model.ts
@@ -1,5 +1,6 @@
 import { IPost } from "../models/post.model";
 
 export interface IBlog{
+    blogUrl: string;
     posts: IPost[];
 }
\ No newline at end of file
diff --git a/src/app/models/post.model.ts b/src/app/models/post.model.ts
index a90587d..0e47b4f 100644
--- a/src/app/models/post.model.ts
+++ b/src/app/models/post.model.ts
@@ -3,7 +3,7 @@ export interface IPost{
     slug: string;
     title: string;
     description: string;
-    categories: string;
+    categories: string[];
     postUrl: string;
     likes: number;
     views: number;
diff --git a/src/app/models/project.model.ts b/src/app/models/project.model.ts
index e31cdfe..4aedc7e 100644
--- a/src/app/models/project.model.ts
+++ b/src/app/models/project.model.ts
@@ -2,7 +2,7 @@ export interface IProject{
     projectId: number;
     name: string;
     description: string;
-    categories: string;
+    categories: string[];
     categoryList: string[];
     roles: string[];
     responsibilities: string[];
diff --git a/src/app/projects/projects.component.html b/src/app/projects/projects.component.html
index 0e5a1cc..6c43e02 100644
--- a/src/app/projects/projects.component.html
+++ b/src/app/projects/projects.component.html
@@ -53,12 +53,12 @@
                 <ion-icon name="eye-outline"></ion-icon>
               </div> -->
 
-              <img src="{{imagesOrigin + project.imagePath}}" [alt]="project.categories" loading="lazy">
+              <img src="{{imagesOrigin + project.imagePath}}" loading="lazy">
             </figure>
 
             <h3 class="project-title">{{project.name}}</h3>
 
-            <p class="project-category">{{project.categories}}</p>
+            <span class="project-category" *ngFor="let category of project.categories; index as i" [ngClass]="i > 0 ? 'inline no-margin' : 'inline'">{{i > 0 ? ', ' + category : category}}</span>
 
           </a>
         </li>
diff --git a/src/app/projects/projects.component.scss b/src/app/projects/projects.component.scss
index e69de29..cc380e9 100644
--- a/src/app/projects/projects.component.scss
+++ b/src/app/projects/projects.component.scss
@@ -0,0 +1,7 @@
+.inline{
+    display: inline;
+}
+
+.no-margin{
+    margin-left: 0px;
+}
\ No newline at end of file
diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts
index d5acc5e..9399765 100644
--- a/src/app/projects/projects.component.ts
+++ b/src/app/projects/projects.component.ts
@@ -38,7 +38,7 @@ categoryClicked: boolean = false;
       ? this.model.projects
       : this.model.projects.filter(
         (project: IProject) => {
-          return project.categoryList.includes(category)
+          return project.categories.includes(category)
         });
   }
 }
diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
index d8f088d..bc4974b 100644
--- a/src/environments/environment.development.ts
+++ b/src/environments/environment.development.ts
@@ -1,5 +1,4 @@
 export const environment = {
     apiUrl: 'https://localhost:7013',
-    blogImagesUrl: 'https://bangararaju-uat.kottedi.in/blog/assets/img/posts/',
     apiKey: "c6eAXYcNT873TT7BfMgQyS4ii7hxa53TLEUN7pAGaaU="
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index d8f088d..bc4974b 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,5 +1,4 @@
 export const environment = {
     apiUrl: 'https://localhost:7013',
-    blogImagesUrl: 'https://bangararaju-uat.kottedi.in/blog/assets/img/posts/',
     apiKey: "c6eAXYcNT873TT7BfMgQyS4ii7hxa53TLEUN7pAGaaU="
 };