diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a4802f..f29c119 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,8 +44,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 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; + } + } 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",