From 8789390c6702bbef476ff3d96c3a569bc9927587 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Wed, 7 Jul 2021 14:28:10 +0930 Subject: [PATCH 1/3] updated links due to domain changes --- src/app/shared/models/links.model.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/models/links.model.ts b/src/app/shared/models/links.model.ts index b6f7547..6df0d83 100644 --- a/src/app/shared/models/links.model.ts +++ b/src/app/shared/models/links.model.ts @@ -17,15 +17,15 @@ export const Links: Array = }, { name: "known", - location: "https://www.inkletblot.com/known/" + location: "https://proxy.inkletblot.com/known/" }, { name: "tng", - location: "https://www.inkletblot.com/tng/" + location: "https://proxy.inkletblot.com/tng/" }, { name: "pasty", - location: "https://www.inkletblot.com/pasty/" + location: "https://proxy.inkletblot.com/pasty/" }, { name: "mail", From 9e12a95bfe51a318ea71980c45291880b8eefd28 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Wed, 7 Jul 2021 14:52:51 +0930 Subject: [PATCH 2/3] added basic filter to projects so gitlab and uncategorized are separate --- src/app/projects/projects.component.html | 4 +++- src/app/projects/projects.component.ts | 29 ++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/app/projects/projects.component.html b/src/app/projects/projects.component.html index 4a04f43..4611afb 100644 --- a/src/app/projects/projects.component.html +++ b/src/app/projects/projects.component.html @@ -1,8 +1,10 @@

Projects on git

These are my projects as can be found on my gitlab. Mainly my programming projects that are quality enough for me to be happy for the world to see them. There are more in the works but they are currently private.

+ +

Projects of a personal nature

This is (will be) a summary of my personal projects be they my homelab, general electronics projects, or anything else.

- + \ No newline at end of file diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts index 6da1e8b..cc5c319 100644 --- a/src/app/projects/projects.component.ts +++ b/src/app/projects/projects.component.ts @@ -14,7 +14,9 @@ import { ProjectsService } from './projects.service'; export class ProjectsComponent implements OnInit, OnDestroy { _unsubscribe$: Subject = new Subject(); - uncategorizedProjects: Array; + allProjects: Array; + private _gitlabProjects: Array = new Array(); + private _uncategorizedProjects: Array = new Array(); constructor(private navService: NavService, private projectsService: ProjectsService) { } @@ -24,8 +26,9 @@ export class ProjectsComponent implements OnInit, OnDestroy { this.projectsService.allProjects$ .pipe(takeUntil(this._unsubscribe$)) .subscribe((result: Project[]) => { - this.uncategorizedProjects = result; + this.allProjects = result; }); + this.projectsService.getProjects(); } @@ -34,4 +37,26 @@ export class ProjectsComponent implements OnInit, OnDestroy { this._unsubscribe$.complete(); } + filterProjects(): void { + this._gitlabProjects = []; + this._uncategorizedProjects = []; + this.allProjects.forEach((project) => { + if (project.category === 'gitlab') { + this._gitlabProjects.push(project); + } else { + this._uncategorizedProjects.push(project); + } + }) + } + + gitlabProjects(): Array { + this.filterProjects(); + return this._gitlabProjects; + } + + uncategorizedProjects(): Array { + this.filterProjects(); + return this._uncategorizedProjects; + } + } From 16c8d4c6ae0a21a75c69454db31fae39d8cfca8a Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Wed, 7 Jul 2021 05:27:35 +0000 Subject: [PATCH 3/3] Update .gitlab-ci.yml to use ssh jump host --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c77337e..374d823 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,8 +45,8 @@ deploy-job: - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config' script: - tar zcf ../inkletblot-com.tar.gz ./dist - - scp -P "$Live_Server_Access_Port" -o StrictHostKeyChecking=no ../inkletblot-com.tar.gz "$Live_Server_User"@"$Live_Server_IP":/var/www/html - - ssh -p "$Live_Server_Access_Port" "$Live_Server_User"@"$Live_Server_IP" "rm -Rf /var/www/html/inkletblot-com_old && mv /var/www/html/inkletblot-com /var/www/html/inkletblot-com_old && mkdir /var/www/html/inkletblot-com_build && mkdir /var/www/html/inkletblot-com && tar zxf /var/www/html/inkletblot-com.tar.gz -C /var/www/html/inkletblot-com_build && mv /var/www/html/inkletblot-com_build/dist/inkletblot-com/* /var/www/html/inkletblot-com && rm -Rf /var/www/html/inkletblot-com_build && chmod -R 755 /var/www/html/inkletblot-com && exit" + - scp -o 'ProxyJump "$Live_Server_User"@"$Live_Server_IP"' -o StrictHostKeyChecking=no ../inkletblot-com.tar.gz "$Live_Server_User"@"$Live_Server_Target":/var/www/html + - ssh -J "$Live_Server_User"@"$Live_Server_IP" "$Live_Server_User"@"$Live_Server_Target" "rm -Rf /var/www/html/inkletblot-com_old && mv /var/www/html/inkletblot-com /var/www/html/inkletblot-com_old && mkdir /var/www/html/inkletblot-com_build && mkdir /var/www/html/inkletblot-com && tar zxf /var/www/html/inkletblot-com.tar.gz -C /var/www/html/inkletblot-com_build && mv /var/www/html/inkletblot-com_build/dist/inkletblot-com/* /var/www/html/inkletblot-com && rm -Rf /var/www/html/inkletblot-com_build && chmod -R 755 /var/www/html/inkletblot-com && exit" only: - master