updated for failing deployment

Merge branch 'develop' into 'master'
updated links and gitignore See merge request inkletblot/inkletblot-com-v2!19
2022-05-26 22:15:01 +09:30 · 2022-05-26 12:33:49 +00:00 · 2022-05-26 22:03:45 +09:30 · 2021-12-21 22:42:54 +00:00 · 2021-12-22 09:12:33 +10:30 · 2021-12-21 10:58:52 +00:00
73 changed files with 9720 additions and 18762 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,6 +4,7 @@
 /dist
 /tmp
 /out-tsc
+/.angular
 # Only exists if Bazel was run
 /bazel-out

@ -32,7 +33,9 @@ speed-measure-plugin*.json
 .history/*

 # misc
+/.angular/cache
 /.sass-cache
+/.scss-cache
 /connect.lock
 /coverage
 /libpeerconnection.log
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,11 +1,59 @@
 stages:
  - build
+  - deploy
+  - test

-build-code-job:
+develop-build-job:
  stage: build
  tags:
-    - build
    - node
  script:
-    - echo "Run 'npm build' and deploy to server"
+    - echo "Install dependencies..."
+    - npm install
+    - npm run build
+  only:
+    - develop

+master-build-job:
+  stage: build
+  tags:
+    - node
+  script:
+    - echo "Install dependencies..."
+    - npm install
+    - npm run build --prod
+  artifacts:
+    paths:
+      - dist/
+  only:
+    - master
+
+deploy-job:
+  stage: deploy    
+  tags:
+    - node
+  environment:
+    name: Production
+    url: "$Live_Server_IP"
+  before_script:
+  - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y)'
+  - eval $(ssh-agent -s)
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
+  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config'
+  script:
+    - tar zcf ../inkletblot-com.tar.gz ./dist
+    - 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
+
+test:
+  stage: test
+  tags:
+    - node
+  script: 
+    - echo "I don't care about standard merges into dev as a build has to happen for a merge into master, I don't think there is a way to specify that so I need this here."
+  only:
+    - merge_requests
--- a/angular.json
+++ b/angular.json
@ -7,7 +7,7 @@
      "projectType": "application",
      "schematics": {
        "@schematics/angular:component": {
-          "style": "sass"
+          "style": "scss"
        }
      },
      "root": "",
@ -22,15 +22,20 @@
            "main": "src/main.ts",
            "polyfills": "src/polyfills.ts",
            "tsConfig": "tsconfig.app.json",
-            "aot": true,
            "assets": [
              "src/favicon.ico",
              "src/assets"
            ],
            "styles": [
-              "src/styles.sass"
+              "src/styles.scss"
            ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
          },
          "configurations": {
            "production": {
@ -60,7 +65,8 @@
                }
              ]
            }
-          }
+          },
+          "defaultConfiguration": ""
        },
        "serve": {
          "builder": "@angular-devkit/build-angular:dev-server",
@ -91,24 +97,11 @@
              "src/assets"
            ],
            "styles": [
-              "src/styles.sass"
+              "src/styles.scss"
            ],
            "scripts": []
          }
        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
        "e2e": {
          "builder": "@angular-devkit/build-angular:protractor",
          "options": {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -11,28 +11,28 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "~11.2.7",
-    "@angular/common": "~11.2.7",
-    "@angular/compiler": "~11.2.7",
-    "@angular/core": "~11.2.7",
-    "@angular/forms": "~11.2.7",
-    "@angular/platform-browser": "~11.2.7",
-    "@angular/platform-browser-dynamic": "~11.2.7",
-    "@angular/router": "~11.2.7",
+    "@angular/animations": "~13.1.1",
+    "@angular/common": "~13.1.1",
+    "@angular/compiler": "~13.1.1",
+    "@angular/core": "~13.1.1",
+    "@angular/forms": "~13.1.1",
+    "@angular/platform-browser": "~13.1.1",
+    "@angular/platform-browser-dynamic": "~13.1.1",
+    "@angular/router": "~13.1.1",
    "rxjs": "~6.6.0",
    "tslib": "^2.0.0",
-    "zone.js": "~0.11.3"
+    "zone.js": "~0.11.4"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1102.6",
-    "@angular/cli": "~11.2.6",
-    "@angular/compiler-cli": "~11.2.7",
+    "@angular-devkit/build-angular": "^13.1.2",
+    "@angular/cli": "~13.1.2",
+    "@angular/compiler-cli": "~13.1.1",
    "@types/jasmine": "~3.6.0",
    "@types/node": "^12.11.1",
    "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "~3.7.0",
    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.1.0",
+    "karma": "~6.3.9",
    "karma-chrome-launcher": "~3.1.0",
    "karma-coverage": "~2.0.3",
    "karma-jasmine": "~4.0.0",
@ -40,6 +40,6 @@
    "protractor": "~7.0.0",
    "ts-node": "~8.3.0",
    "tslint": "~6.1.0",
-    "typescript": "~4.1.5"
+    "typescript": "~4.5.4"
  }
 }
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@ -1,7 +1,20 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { HomeComponent } from './home/home.component';
+import { LinksComponent } from './links/links.component';
+import { Page404Component } from './page404/page404.component';
+import { PetComponent } from './pet/pet.component';
+import { ProjectsComponent } from './projects/projects.component';
+import { Pages } from './shared/models/pages.model';

-const routes: Routes = [];
+const routes: Routes = [
+  { path: Pages.HOME, component: HomeComponent },
+  { path: Pages.PROJECTS, loadChildren: () => import('./projects/projects.module').then((m) => m.ProjectsModule) },
+  // { path: AppRoutes.CORE, loadChildren: () => import('./galler/gallery.module').then((m) => m.GalleryModule) }, // for future use maybe
+  { path: Pages.LINKS, component: LinksComponent },
+  { path: Pages.PET, component: PetComponent },
+  { path: Pages.PAGE_404, component: Page404Component },
+  { path: '**', redirectTo: Pages.HOME, pathMatch: 'full' }];

@NgModule({
  imports: [RouterModule.forRoot(routes)],
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@ -1,520 +1,8 @@
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * Delete the template below * * * * * * * * * * -->
-<!-- * * * * * * * to get started with your project! * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<style>
-  :host {
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-    font-size: 14px;
-    color: #333;
-    box-sizing: border-box;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    margin: 8px 0;
-  }
-
-  p {
-    margin: 0;
-  }
-
-  .spacer {
-    flex: 1;
-  }
-
-  .toolbar {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    height: 60px;
-    display: flex;
-    align-items: center;
-    background-color: #1976d2;
-    color: white;
-    font-weight: 600;
-  }
-
-  .toolbar img {
-    margin: 0 16px;
-  }
-
-  .toolbar #twitter-logo {
-    height: 40px;
-    margin: 0 8px;
-  }
-
-  .toolbar #youtube-logo {
-    height: 40px;
-    margin: 0 16px;
-  }
-
-  .toolbar #twitter-logo:hover,
-  .toolbar #youtube-logo:hover {
-    opacity: 0.8;
-  }
-
-  .content {
-    display: flex;
-    margin: 82px auto 32px;
-    padding: 0 16px;
-    max-width: 960px;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  svg.material-icons {
-    height: 24px;
-    width: auto;
-  }
-
-  svg.material-icons:not(:last-child) {
-    margin-right: 8px;
-  }
-
-  .card svg.material-icons path {
-    fill: #888;
-  }
-
-  .card-container {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    margin-top: 16px;
-  }
-
-  .card {
-    border-radius: 4px;
-    border: 1px solid #eee;
-    background-color: #fafafa;
-    height: 40px;
-    width: 200px;
-    margin: 0 8px 16px;
-    padding: 16px;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    transition: all 0.2s ease-in-out;
-    line-height: 24px;
-  }
-
-  .card-container .card:not(:last-child) {
-    margin-right: 0;
-  }
-
-  .card.card-small {
-    height: 16px;
-    width: 168px;
-  }
-
-  .card-container .card:not(.highlight-card) {
-    cursor: pointer;
-  }
-
-  .card-container .card:not(.highlight-card):hover {
-    transform: translateY(-3px);
-    box-shadow: 0 4px 17px rgba(0, 0, 0, 0.35);
-  }
-
-  .card-container .card:not(.highlight-card):hover .material-icons path {
-    fill: rgb(105, 103, 103);
-  }
-
-  .card.highlight-card {
-    background-color: #1976d2;
-    color: white;
-    font-weight: 600;
-    border: none;
-    width: auto;
-    min-width: 30%;
-    position: relative;
-  }
-
-  .card.card.highlight-card span {
-    margin-left: 60px;
-  }
-
-  svg#rocket {
-    width: 80px;
-    position: absolute;
-    left: -10px;
-    top: -24px;
-  }
-
-  svg#rocket-smoke {
-    height: calc(100vh - 95px);
-    position: absolute;
-    top: 10px;
-    right: 180px;
-    z-index: -10;
-  }
-
-  a,
-  a:visited,
-  a:hover {
-    color: #1976d2;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #125699;
-  }
-
-  .terminal {
-    position: relative;
-    width: 80%;
-    max-width: 600px;
-    border-radius: 6px;
-    padding-top: 45px;
-    margin-top: 8px;
-    overflow: hidden;
-    background-color: rgb(15, 15, 16);
-  }
-
-  .terminal::before {
-    content: "\2022 \2022 \2022";
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 4px;
-    background: rgb(58, 58, 58);
-    color: #c2c3c4;
-    width: 100%;
-    font-size: 2rem;
-    line-height: 0;
-    padding: 14px 0;
-    text-indent: 4px;
-  }
-
-  .terminal pre {
-    font-family: SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace;
-    color: white;
-    padding: 0 1rem 1rem;
-    margin: 0;
-  }
-
-  .circle-link {
-    height: 40px;
-    width: 40px;
-    border-radius: 40px;
-    margin: 8px;
-    background-color: white;
-    border: 1px solid #eeeeee;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
-    transition: 1s ease-out;
-  }
-
-  .circle-link:hover {
-    transform: translateY(-0.25rem);
-    box-shadow: 0px 3px 15px rgba(0, 0, 0, 0.2);
-  }
-
-  footer {
-    margin-top: 8px;
-    display: flex;
-    align-items: center;
-    line-height: 20px;
-  }
-
-  footer a {
-    display: flex;
-    align-items: center;
-  }
-
-  .github-star-badge {
-    color: #24292e;
-    display: flex;
-    align-items: center;
-    font-size: 12px;
-    padding: 3px 10px;
-    border: 1px solid rgba(27,31,35,.2);
-    border-radius: 3px;
-    background-image: linear-gradient(-180deg,#fafbfc,#eff3f6 90%);
-    margin-left: 4px;
-    font-weight: 600;
-    font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
-  }
-
-  .github-star-badge:hover {
-    background-image: linear-gradient(-180deg,#f0f3f6,#e6ebf1 90%);
-    border-color: rgba(27,31,35,.35);
-    background-position: -.5em;
-  }
-
-  .github-star-badge .material-icons {
-    height: 16px;
-    width: 16px;
-    margin-right: 4px;
-  }
-
-  svg#clouds {
-    position: fixed;
-    bottom: -160px;
-    left: -230px;
-    z-index: -10;
-    width: 1920px;
-  }
-
-
-  /* Responsive Styles */
-  @media screen and (max-width: 767px) {
-
-    .card-container > *:not(.circle-link) ,
-    .terminal {
-      width: 100%;
-    }
-
-    .card:not(.highlight-card) {
-      height: 16px;
-      margin: 8px 0;
-    }
-
-    .card.highlight-card span {
-      margin-left: 72px;
-    }
-
-    svg#rocket-smoke {
-      right: 120px;
-      transform: rotate(-5deg);
-    }
-  }
-
-  @media screen and (max-width: 575px) {
-    svg#rocket-smoke {
-      display: none;
-      visibility: hidden;
-    }
-  }
-</style>
-
-<!-- Toolbar -->
-<div class="toolbar" role="banner">
-  <img
-    width="40"
-    alt="Angular Logo"
-    src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg=="
-  />
-  <span>Welcome</span>
-    <div class="spacer"></div>
-    <a aria-label="Angular on twitter" target="_blank" rel="noopener" href="https://twitter.com/angular" title="Twitter">
-      <svg id="twitter-logo" height="24" data-name="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400">
-        <rect width="400" height="400" fill="none"/>
-        <path d="M153.62,301.59c94.34,0,145.94-78.16,145.94-145.94,0-2.22,0-4.43-.15-6.63A104.36,104.36,0,0,0,325,122.47a102.38,102.38,0,0,1-29.46,8.07,51.47,51.47,0,0,0,22.55-28.37,102.79,102.79,0,0,1-32.57,12.45,51.34,51.34,0,0,0-87.41,46.78A145.62,145.62,0,0,1,92.4,107.81a51.33,51.33,0,0,0,15.88,68.47A50.91,50.91,0,0,1,85,169.86c0,.21,0,.43,0,.65a51.31,51.31,0,0,0,41.15,50.28,51.21,51.21,0,0,1-23.16.88,51.35,51.35,0,0,0,47.92,35.62,102.92,102.92,0,0,1-63.7,22A104.41,104.41,0,0,1,75,278.55a145.21,145.21,0,0,0,78.62,23" fill="#fff"/>
-      </svg>
-    </a>
-    <a aria-label="Angular on YouTube" target="_blank" rel="noopener" href="https://youtube.com/angular" title="YouTube">
-      <svg id="youtube-logo" height="24" width="24" data-name="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#fff">
-        <path d="M0 0h24v24H0V0z" fill="none"/>
-        <path d="M21.58 7.19c-.23-.86-.91-1.54-1.77-1.77C18.25 5 12 5 12 5s-6.25 0-7.81.42c-.86.23-1.54.91-1.77 1.77C2 8.75 2 12 2 12s0 3.25.42 4.81c.23.86.91 1.54 1.77 1.77C5.75 19 12 19 12 19s6.25 0 7.81-.42c.86-.23 1.54-.91 1.77-1.77C22 15.25 22 12 22 12s0-3.25-.42-4.81zM10 15V9l5.2 3-5.2 3z"/>
-      </svg>
-    </a>
+<app-nav></app-nav>
+<div class="page-fixed">
+  <div class="no-scroll-bar">
+    <app-header></app-header>
+    <router-outlet></router-outlet>
+    <app-footer></app-footer>
+  </div>
 </div>
-
-<div class="content" role="main">
-
-  <!-- Highlight Card -->
-  <div class="card highlight-card card-small">
-
-    <svg id="rocket" xmlns="http://www.w3.org/2000/svg" width="101.678" height="101.678" viewBox="0 0 101.678 101.678">
-      <title>Rocket Ship</title>
-      <g id="Group_83" data-name="Group 83" transform="translate(-141 -696)">
-        <circle id="Ellipse_8" data-name="Ellipse 8" cx="50.839" cy="50.839" r="50.839" transform="translate(141 696)" fill="#dd0031"/>
-        <g id="Group_47" data-name="Group 47" transform="translate(165.185 720.185)">
-          <path id="Path_33" data-name="Path 33" d="M3.4,42.615a3.084,3.084,0,0,0,3.553,3.553,21.419,21.419,0,0,0,12.215-6.107L9.511,30.4A21.419,21.419,0,0,0,3.4,42.615Z" transform="translate(0.371 3.363)" fill="#fff"/>
-          <path id="Path_34" data-name="Path 34" d="M53.3,3.221A3.09,3.09,0,0,0,50.081,0,48.227,48.227,0,0,0,18.322,13.437c-6-1.666-14.991-1.221-18.322,7.218A33.892,33.892,0,0,1,9.439,25.1l-.333.666a3.013,3.013,0,0,0,.555,3.553L23.985,43.641a2.9,2.9,0,0,0,3.553.555l.666-.333A33.892,33.892,0,0,1,32.647,53.3c8.55-3.664,8.884-12.326,7.218-18.322A48.227,48.227,0,0,0,53.3,3.221ZM34.424,9.772a6.439,6.439,0,1,1,9.106,9.106,6.368,6.368,0,0,1-9.106,0A6.467,6.467,0,0,1,34.424,9.772Z" transform="translate(0 0.005)" fill="#fff"/>
-        </g>
-      </g>
-    </svg>
-
-    <span>{{ title }} app is running!</span>
-
-    <svg id="rocket-smoke" xmlns="http://www.w3.org/2000/svg" width="516.119" height="1083.632" viewBox="0 0 516.119 1083.632">
-      <title>Rocket Ship Smoke</title>
-      <path id="Path_40" data-name="Path 40" d="M644.6,141S143.02,215.537,147.049,870.207s342.774,201.755,342.774,201.755S404.659,847.213,388.815,762.2c-27.116-145.51-11.551-384.124,271.9-609.1C671.15,139.365,644.6,141,644.6,141Z" transform="translate(-147.025 -140.939)" fill="#f5f5f5"/>
-    </svg>
-
-  </div>
-
-  <!-- Resources -->
-  <h2>Resources</h2>
-  <p>Here are some links to help you get started:</p>
-
-  <div class="card-container">
-    <a class="card" target="_blank" rel="noopener" href="https://angular.io/tutorial">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z"/></svg>
-
-      <span>Learn Angular</span>
-
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>    </a>
-
-    <a class="card" target="_blank" rel="noopener" href="https://angular.io/cli">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-
-      <span>CLI Documentation</span>
-
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
-    </a>
-
-    <a class="card" target="_blank" rel="noopener" href="https://blog.angular.io/">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8z"/></svg>
-
-      <span>Angular Blog</span>
-
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
-    </a>
-
-  </div>
-
-  <!-- Next Steps -->
-  <h2>Next Steps</h2>
-  <p>What do you want to do next with your app?</p>
-
-  <input type="hidden" #selection>
-
-  <div class="card-container">
-    <div class="card card-small" (click)="selection.value = 'component'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
-      <span>New Component</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'material'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
-      <span>Angular Material</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
-      <span>Add PWA Support</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
-      <span>Add Dependency</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'test'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
-      <span>Run and Watch Tests</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'build'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
-      <span>Build for Production</span>
-    </div>
-  </div>
-
-  <!-- Terminal -->
-  <div class="terminal" [ngSwitch]="selection.value">
-      <pre *ngSwitchDefault>ng generate component xyz</pre>
-      <pre *ngSwitchCase="'material'">ng add @angular/material</pre>
-      <pre *ngSwitchCase="'pwa'">ng add @angular/pwa</pre>
-      <pre *ngSwitchCase="'dependency'">ng add _____</pre>
-      <pre *ngSwitchCase="'test'">ng test</pre>
-      <pre *ngSwitchCase="'build'">ng build --prod</pre>
-  </div>
-
-  <!-- Links -->
-  <div class="card-container">
-    <a class="circle-link" title="Animations" href="https://angular.io/guide/animations" target="_blank" rel="noopener">
-      <svg id="Group_20" data-name="Group 20" xmlns="http://www.w3.org/2000/svg" width="21.813" height="23.453" viewBox="0 0 21.813 23.453">
-        <path id="Path_15" data-name="Path 15" d="M4099.584,972.736h0l-10.882,3.9,1.637,14.4,9.245,5.153,9.245-5.153,1.686-14.4Z" transform="translate(-4088.702 -972.736)" fill="#ffa726"/>
-        <path id="Path_16" data-name="Path 16" d="M4181.516,972.736v23.453l9.245-5.153,1.686-14.4Z" transform="translate(-4170.633 -972.736)" fill="#fb8c00"/>
-        <path id="Path_17" data-name="Path 17" d="M4137.529,1076.127l-7.7-3.723,4.417-2.721,7.753,3.723Z" transform="translate(-4125.003 -1058.315)" fill="#ffe0b2"/>
-        <path id="Path_18" data-name="Path 18" d="M4137.529,1051.705l-7.7-3.723,4.417-2.721,7.753,3.723Z" transform="translate(-4125.003 -1036.757)" fill="#fff3e0"/>
-        <path id="Path_19" data-name="Path 19" d="M4137.529,1027.283l-7.7-3.723,4.417-2.721,7.753,3.723Z" transform="translate(-4125.003 -1015.199)" fill="#fff"/>
-      </svg>
-    </a>
-
-    <a class="circle-link" title="CLI" href="https://cli.angular.io/" target="_blank" rel="noopener">
-      <svg xmlns="http://www.w3.org/2000/svg" width="21.762" height="23.447" viewBox="0 0 21.762 23.447">
-        <title>Angular CLI Logo</title>
-        <g id="Group_21" data-name="Group 21" transform="translate(0)">
-          <path id="Path_20" data-name="Path 20" d="M2660.313,313.618h0l-10.833,3.9,1.637,14.4,9.2,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-2649.48 -313.618)" fill="#37474f"/>
-          <path id="Path_21" data-name="Path 21" d="M2741.883,313.618v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-2731.05 -313.618)" fill="#263238"/>
-          <path id="Path_22" data-name="Path 22" d="M2692.293,379.169h11.724V368.618h-11.724Zm11.159-.6h-10.608v-9.345h10.621v9.345Z" transform="translate(-2687.274 -362.17)" fill="#fff"/>
-          <path id="Path_23" data-name="Path 23" d="M2709.331,393.688l.4.416,2.265-2.28-2.294-2.294-.4.4,1.893,1.893Z" transform="translate(-2702.289 -380.631)" fill="#fff"/>
-          <rect id="Rectangle_12" data-name="Rectangle 12" width="3.517" height="0.469" transform="translate(9.709 13.744)" fill="#fff"/>
-        </g>
-      </svg>
-    </a>
-
-    <a class="circle-link" title="Protractor" href="https://www.protractortest.org/" target="_blank" rel="noopener">
-      <svg xmlns="http://www.w3.org/2000/svg" width="21.81" height="23.447" viewBox="0 0 21.81 23.447">
-        <title>Angular Protractor Logo</title>
-        <g id="Group_26" data-name="Group 26" transform="translate(0)">
-          <path id="Path_28" data-name="Path 28" d="M4620.155,311.417h0l-10.881,3.9,1.637,14.4,9.244,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-4609.274 -311.417)" fill="#e13439"/>
-          <path id="Path_29" data-name="Path 29" d="M4702.088,311.417v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-4691.207 -311.417)" fill="#b52f32"/>
-          <path id="Path_30" data-name="Path 30" d="M4651.044,369.58v-.421h1.483a7.6,7.6,0,0,0-2.106-5.052l-1.123,1.123-.3-.3,1.122-1.121a7.588,7.588,0,0,0-4.946-2.055v1.482h-.421v-1.485a7.589,7.589,0,0,0-5.051,2.058l1.122,1.121-.3.3-1.123-1.123a7.591,7.591,0,0,0-2.106,5.052h1.482v.421h-1.489v1.734h15.241V369.58Zm-10.966-.263a4.835,4.835,0,0,1,9.67,0Z" transform="translate(-4634.008 -355.852)" fill="#fff"/>
-        </g>
-      </svg>
-    </a>
-
-    <a class="circle-link" title="Find a Local Meetup" href="https://www.meetup.com/find/?keywords=angular" target="_blank" rel="noopener">
-      <svg xmlns="http://www.w3.org/2000/svg" width="24.607" height="23.447" viewBox="0 0 24.607 23.447">
-        <title>Meetup Logo</title>
-        <path id="logo--mSwarm" d="M21.221,14.95A4.393,4.393,0,0,1,17.6,19.281a4.452,4.452,0,0,1-.8.069c-.09,0-.125.035-.154.117a2.939,2.939,0,0,1-2.506,2.091,2.868,2.868,0,0,1-2.248-.624.168.168,0,0,0-.245-.005,3.926,3.926,0,0,1-2.589.741,4.015,4.015,0,0,1-3.7-3.347,2.7,2.7,0,0,1-.043-.38c0-.106-.042-.146-.143-.166a3.524,3.524,0,0,1-1.516-.69A3.623,3.623,0,0,1,2.23,14.557a3.66,3.66,0,0,1,1.077-3.085.138.138,0,0,0,.026-.2,3.348,3.348,0,0,1-.451-1.821,3.46,3.46,0,0,1,2.749-3.28.44.44,0,0,0,.355-.281,5.072,5.072,0,0,1,3.863-3,5.028,5.028,0,0,1,3.555.666.31.31,0,0,0,.271.03A4.5,4.5,0,0,1,18.3,4.7a4.4,4.4,0,0,1,1.334,2.751,3.658,3.658,0,0,1,.022.706.131.131,0,0,0,.1.157,2.432,2.432,0,0,1,1.574,1.645,2.464,2.464,0,0,1-.7,2.616c-.065.064-.051.1-.014.166A4.321,4.321,0,0,1,21.221,14.95ZM13.4,14.607a2.09,2.09,0,0,0,1.409,1.982,4.7,4.7,0,0,0,1.275.221,1.807,1.807,0,0,0,.9-.151.542.542,0,0,0,.321-.545.558.558,0,0,0-.359-.534,1.2,1.2,0,0,0-.254-.078c-.262-.047-.526-.086-.787-.138a.674.674,0,0,1-.617-.75,3.394,3.394,0,0,1,.218-1.109c.217-.658.509-1.286.79-1.918a15.609,15.609,0,0,0,.745-1.86,1.95,1.95,0,0,0,.06-1.073,1.286,1.286,0,0,0-1.051-1.033,1.977,1.977,0,0,0-1.521.2.339.339,0,0,1-.446-.042c-.1-.092-.2-.189-.307-.284a1.214,1.214,0,0,0-1.643-.061,7.563,7.563,0,0,1-.614.512A.588.588,0,0,1,10.883,8c-.215-.115-.437-.215-.659-.316a2.153,2.153,0,0,0-.695-.248A2.091,2.091,0,0,0,7.541,8.562a9.915,9.915,0,0,0-.405.986c-.559,1.545-1.015,3.123-1.487,4.7a1.528,1.528,0,0,0,.634,1.777,1.755,1.755,0,0,0,1.5.211,1.35,1.35,0,0,0,.824-.858c.543-1.281,1.032-2.584,1.55-3.875.142-.355.28-.712.432-1.064a.548.548,0,0,1,.851-.24.622.622,0,0,1,.185.539,2.161,2.161,0,0,1-.181.621c-.337.852-.68,1.7-1.018,2.552a2.564,2.564,0,0,0-.173.528.624.624,0,0,0,.333.71,1.073,1.073,0,0,0,.814.034,1.22,1.22,0,0,0,.657-.655q.758-1.488,1.511-2.978.35-.687.709-1.37a1.073,1.073,0,0,1,.357-.434.43.43,0,0,1,.463-.016.373.373,0,0,1,.153.387.7.7,0,0,1-.057.236c-.065.157-.127.316-.2.469-.42.883-.846,1.763-1.262,2.648A2.463,2.463,0,0,0,13.4,14.607Zm5.888,6.508a1.09,1.09,0,0,0-2.179.006,1.09,1.09,0,0,0,2.179-.006ZM1.028,12.139a1.038,1.038,0,1,0,.01-2.075,1.038,1.038,0,0,0-.01,2.075ZM13.782.528a1.027,1.027,0,1,0-.011,2.055A1.027,1.027,0,0,0,13.782.528ZM22.21,6.95a.882.882,0,0,0-1.763.011A.882.882,0,0,0,22.21,6.95ZM4.153,4.439a.785.785,0,1,0,.787-.78A.766.766,0,0,0,4.153,4.439Zm8.221,18.22a.676.676,0,1,0-.677.666A.671.671,0,0,0,12.374,22.658ZM22.872,12.2a.674.674,0,0,0-.665.665.656.656,0,0,0,.655.643.634.634,0,0,0,.655-.644A.654.654,0,0,0,22.872,12.2ZM7.171-.123A.546.546,0,0,0,6.613.43a.553.553,0,1,0,1.106,0A.539.539,0,0,0,7.171-.123ZM24.119,9.234a.507.507,0,0,0-.493.488.494.494,0,0,0,.494.494.48.48,0,0,0,.487-.483A.491.491,0,0,0,24.119,9.234Zm-19.454,9.7a.5.5,0,0,0-.488-.488.491.491,0,0,0-.487.5.483.483,0,0,0,.491.479A.49.49,0,0,0,4.665,18.936Z" transform="translate(0 0.123)" fill="#f64060"/>
-      </svg>
-    </a>
-
-    <a class="circle-link" title="Join the Conversation on Discord" href="https://discord.gg/angular" target="_blank" rel="noopener">
-      <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 245 240">
-        <title>Discord Logo</title>
-        <path d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/>
-        <path d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/>
-      </svg>
-    </a>
-  </div>
-
-  <!-- Footer -->
-  <footer>
-      Love Angular?&nbsp;
-      <a href="https://github.com/angular/angular" target="_blank" rel="noopener"> Give our repo a star.
-        <div class="github-star-badge">
-            <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/></svg>
-          Star
-        </div>
-      </a>
-      <a href="https://github.com/angular/angular" target="_blank" rel="noopener">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" fill="#1976d2"/><path d="M0 0h24v24H0z" fill="none"/></svg>
-      </a>
-  </footer>
-
-  <svg id="clouds" xmlns="http://www.w3.org/2000/svg" width="2611.084" height="485.677" viewBox="0 0 2611.084 485.677">
-    <title>Gray Clouds Background</title>
-    <path id="Path_39" data-name="Path 39" d="M2379.709,863.793c10-93-77-171-168-149-52-114-225-105-264,15-75,3-140,59-152,133-30,2.83-66.725,9.829-93.5,26.25-26.771-16.421-63.5-23.42-93.5-26.25-12-74-77-130-152-133-39-120-212-129-264-15-54.084-13.075-106.753,9.173-138.488,48.9-31.734-39.726-84.4-61.974-138.487-48.9-52-114-225-105-264,15a162.027,162.027,0,0,0-103.147,43.044c-30.633-45.365-87.1-72.091-145.206-58.044-52-114-225-105-264,15-75,3-140,59-152,133-53,5-127,23-130,83-2,42,35,72,70,86,49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33,61.112,8.015,113.854-5.72,150.492-29.764a165.62,165.62,0,0,0,110.861-3.236c47,94,178,113,251,33,31.385,4.116,60.563,2.495,86.487-3.311,25.924,5.806,55.1,7.427,86.488,3.311,73,80,204,61,251-33a165.625,165.625,0,0,0,120,0c51,13,108,15,157-5a147.188,147.188,0,0,0,33.5-18.694,147.217,147.217,0,0,0,33.5,18.694c49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33C2446.709,1093.793,2554.709,922.793,2379.709,863.793Z" transform="translate(142.69 -634.312)" fill="#eee"/>
-  </svg>
-
-</div>
-
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content above * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<router-outlet></router-outlet>
--- a/src/app/app.component.sass
+++ b/src/app/app.component.sass
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@ -0,0 +1,37 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+}
+
+.page-fixed {
+    width: 1000px;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    background-color: colors.$inklets-color-grey;
+}
+
+/* Hide scrollbar for Chrome, Safari and Opera */
+.no-scroll-bar::-webkit-scrollbar {
+    display: none;
+    overflow: auto;
+    width: 100%;
+    height: 100%;
+}
+
+/* Hide scrollbar for IE, Edge and Firefox */
+.no-scroll-bar {
+    -ms-overflow-style: none; /* IE and Edge */
+    scrollbar-width: none; /* Firefox */
+    overflow: auto;
+    width: 100%;
+    height: 100%;
+}
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@ -3,7 +3,7 @@ import { Component } from '@angular/core';
@Component({
  selector: 'app-root',
  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.sass']
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
  title = 'inkletblot-com';
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -1,16 +1,36 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";

 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
+import { HeaderComponent } from './header/header.component';
+import { NavComponent } from './nav/nav.component';
+import { FooterComponent } from './footer/footer.component';
+import { SharedModule } from './shared/shared.module';
+import { HomeComponent } from './home/home.component';
+import { LinksComponent } from './links/links.component';
+import { PetComponent } from './pet/pet.component';
+import { HttpClientModule } from '@angular/common/http';
+import { Page404Component } from './page404/page404.component';

@NgModule({
  declarations: [
-    AppComponent
+    AppComponent,
+    HeaderComponent,
+    NavComponent,
+    FooterComponent,
+    HomeComponent,
+    LinksComponent,
+    PetComponent,
+    Page404Component
  ],
  imports: [
+    SharedModule,
    BrowserModule,
-    AppRoutingModule
+    BrowserAnimationsModule,
+    AppRoutingModule,
+    HttpClientModule
  ],
  providers: [],
  bootstrap: [AppComponent]
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@ -0,0 +1 @@
+<p>Everything on this site is free for all possible public use.</p>
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@ -0,0 +1,11 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    padding: 0 20px 0 20px;
+    margin: 10px 0 10px 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+	font-size: 9pt;
+	color: #FAFAFA;
+}
--- a/src/app/footer/footer.component.spec.ts
+++ b/src/app/footer/footer.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FooterComponent } from './footer.component';
+
+describe('FooterComponent', () => {
+  let component: FooterComponent;
+  let fixture: ComponentFixture<FooterComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FooterComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FooterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-footer',
+  templateUrl: './footer.component.html',
+  styleUrls: ['./footer.component.scss']
+})
+export class FooterComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@ -0,0 +1 @@
+<h1>Inks {{ pageTitle }}</h1>
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@ -0,0 +1,5 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    padding: 0 20px 0 20px;
+}
--- a/src/app/header/header.component.spec.ts
+++ b/src/app/header/header.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeaderComponent } from './header.component';
+
+describe('HeaderComponent', () => {
+  let component: HeaderComponent;
+  let fixture: ComponentFixture<HeaderComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ HeaderComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HeaderComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@ -0,0 +1,32 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { NavService } from '../nav/nav.service';
+
+@Component({
+  selector: 'app-header',
+  templateUrl: './header.component.html',
+  styleUrls: ['./header.component.scss']
+})
+export class HeaderComponent implements OnInit {
+  _unsubscribe$: Subject<boolean> = new Subject();
+
+  pageTitle: string;
+
+  constructor(public navService: NavService) { }
+
+  ngOnInit(): void {
+    this.navService.currentPage$
+      .pipe(takeUntil(this._unsubscribe$))
+      .subscribe((page: string) => {
+        this.pageTitle = page;
+      });
+  }
+
+  ngOnDestroy(): void {
+    this._unsubscribe$.next(false);
+    this._unsubscribe$.complete();
+  }
+
+}
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@ -0,0 +1,16 @@
+<div class="bio">
+    <div class="top">
+        <img class="headshot" src="../../assets/head.jpg" alt="A headshot of Solomon Laing">
+        <div class="text">
+            <h1>Inkletblot
+                <a href="https://www.linkedin.com/in/inkletblot/" target="_blank"><img class="contact-icon" src="../../assets/linkedin.png"></a>
+                <a href="mailto:solomonlaing@pm.me"><img class="contact-icon" src="../../assets/envelope.png"></a>
+            </h1>
+            <p>My name is Solomon Laing. I'm a twenty something year old uni student and IT professional from Adelaide, Australia. I'm passionate about Technology and IT, it as been a hobby of mine for most of my life in one way or another and I predict will be for many years to come. Should you wish to know more, I'm sure you'll be able to find some footprint of me online. Regardless of how hard I try to remove it.</p>
+        </div>
+    </div>
+    <p>This website serves as a personal website for myself. A place for me to put my projects, experiments, important links and the such-like. Projects relate to my publically accessable projects. Be it my linux config files, builds of applications, website, or anything else I decide to add. Links, the most important page to me, is where all of my services sit that I host myself.</p>
+    <p>On of the projects that you will not find listed on the projects page is my server that I operate from my loungeroom. It hosts this website, nextcloud, a mail server and client, many game servers, my gitlab instance, and many local services which I use at home. Part of this is a small Kubernetes cluster consiting of Odroid-MC1s (by Hardkernel) which run the very simple api for this site and the slightly more complicated api for my forum.</p>
+    <p>This site is a simple testement to my passion for technology, it is not supposed to be particularly eye-catching or engaging. I expect that few will ever see it. But if you are one of the few, 'Hello and Welcome'.</p>
+    <div class="attributions">Icons made by <a href="https://www.freepik.com" title="Freepik">Freepik</a> and <a href="https://www.flaticon.com/authors/gregor-cresnar" title="Gregor Cresnar">Gregor Cresnar</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div>
+</div>
--- a/src/app/home/home.component.scss
+++ b/src/app/home/home.component.scss
@ -0,0 +1,56 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    overflow-y: auto;
+    padding: 0 20px 0 20px;
+}
+
+.bio {
+    text-align: justify;
+
+    .top {
+        display: flex;
+        flex-direction: row;
+
+    
+        .headshot {
+            width: 200px;
+            height: 200px;
+            border: colors.$inklets-color-red-light 5px solid;
+            border-radius: 100px;
+        }
+    
+        .text {
+            margin-left: 30px;
+
+            h1 {
+                border-bottom: colors.$inklets-color-red-light 2px dashed;
+
+                img {
+                    width: 30px;
+                    height: 30px;
+                    margin-left: 10px;
+                }
+            }
+
+            p{
+                padding-bottom: 0;
+                margin-bottom: 0;
+            }
+        }
+    }
+
+    .attributions {
+        font-size: 8px;
+        > a {
+            text-decoration: none;
+            color: colors.$inklets-color-white;
+        }
+        > a:hover {
+            color: colors.$inklets-color-red-light;
+        }
+    }
+}
--- a/src/app/home/home.component.spec.ts
+++ b/src/app/home/home.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HomeComponent } from './home.component';
+
+describe('HomeComponent', () => {
+  let component: HomeComponent;
+  let fixture: ComponentFixture<HomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ HomeComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+import { NavService } from '../nav/nav.service';
+import { Pages } from '../shared/models/pages.model';
+
+@Component({
+  selector: 'app-home',
+  templateUrl: './home.component.html',
+  styleUrls: ['./home.component.scss']
+})
+export class HomeComponent implements OnInit {
+
+  constructor(private navService: NavService) { }
+
+  ngOnInit(): void {
+    this.navService.setPageTitle(Pages.HOME);
+  }
+
+}
--- a/src/app/links/links.component.html
+++ b/src/app/links/links.component.html
@ -0,0 +1,6 @@
+<div class="card-wrapper">
+    <a *ngFor="let link of links" href="{{link.location}}" target="_blank">
+        <p class="text">item: {{link.name}}</p>
+        <h1 class="text">CLICK!</h1>
+    </a>
+</div>
--- a/src/app/links/links.component.scss
+++ b/src/app/links/links.component.scss
@ -0,0 +1,42 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    padding: 0 20px 0 20px;
+    display: flex;
+    align-items: center;
+    justify-items: center;
+}
+
+// padding 20, total width 1000, width 700 so 280/2 = margin left and right of 140
+.card-wrapper {
+    padding-top: 20px;
+    display: grid;
+    grid-template-columns: auto auto auto auto;
+    grid-template-rows: auto auto auto auto;
+    row-gap: 50px;
+    column-gap: 50px;
+    width: 960px;
+    height: fit-content;
+}
+
+a {
+    text-decoration: none;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-items: center;
+    margin: 0;
+    color: colors.$inklets-color-white;
+    background-color: colors.$inklets-color-black;
+    border: 2px solid colors.$inklets-color-red-dark;
+    border-radius: 10px;
+
+    > * {
+        margin: 10px;
+        padding: 0;
+    }
+}
+
+a:hover {
+    border: colors.$inklets-color-red-light 2px solid;
+  }
--- a/src/app/links/links.component.spec.ts
+++ b/src/app/links/links.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LinksComponent } from './links.component';
+
+describe('LinksComponent', () => {
+  let component: LinksComponent;
+  let fixture: ComponentFixture<LinksComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ LinksComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LinksComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/links/links.component.ts
+++ b/src/app/links/links.component.ts
@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { NavService } from '../nav/nav.service';
+import { Link } from '../shared/models/link.model';
+import { Links } from '../shared/models/links.model';
+import { Pages } from '../shared/models/pages.model';
+
+@Component({
+  selector: 'app-links',
+  templateUrl: './links.component.html',
+  styleUrls: ['./links.component.scss']
+})
+export class LinksComponent implements OnInit {
+
+  constructor(private navService: NavService) { }
+
+  links: Array<Link> = Links;
+
+  ngOnInit(): void {
+    this.navService.setPageTitle(Pages.LINKS);
+  }
+
+}
--- a/src/app/nav/nav.component.html
+++ b/src/app/nav/nav.component.html
@ -0,0 +1,6 @@
+<ul>
+    <li (mouseover)="state[0] = 'bump'" (mouseout)="state[0] = 'norm'"><a [@openClose]="state[0]" routerLink="{{Pages.HOME}}" routerLinkActive="activeRoute">{{Pages.HOME}}</a></li>
+    <li (mouseover)="state[1] = 'bump'" (mouseout)="state[1] = 'norm'"><a [@openClose]="state[1]"  routerLink="{{Pages.PROJECTS}}" routerLinkActive="activeRoute">{{Pages.PROJECTS}}</a></li>
+    <!-- <li><a routerLink="{{Pages.GALLERY}}" routerLinkActive="activeRoute">{{Pages.GALLERY}}</a></li> -->
+    <li (mouseover)="state[2] = 'bump'" (mouseout)="state[2] = 'norm'"><a [@openClose]="state[2]"  routerLink="{{Pages.LINKS}}" routerLinkActive="activeRoute">{{Pages.LINKS}}</a></li>
+</ul>
--- a/src/app/nav/nav.component.scss
+++ b/src/app/nav/nav.component.scss
@ -0,0 +1,45 @@
+@use 'src/app/shared/styles/_variables.color'as colors;
+
+ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+li {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 25px;
+  width: 120px;
+  height: 120px;
+}
+
+li a {
+  border-radius: 50px;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  color: colors.$inklets-color-white;
+  background-color: colors.$inklets-color-red-dark;
+  display: block;
+  text-align: center;
+  text-decoration: none;
+}
+
+li .activeRoute {
+  background-color: colors.$inklets-color-red-light;
+  color: colors.$inklets-color-black;
+}
+
+// li a:hover {
+//   background-color: colors.$inklets-color-blue-dark;
+//   color: colors.$inklets-color-white;
+// }
+
+
+//  li a:hover.activeRoute {
+//   background-color: colors.$inklets-color-blue-light;
+//   color: colors.$inklets-color-black;
+// }
--- a/src/app/nav/nav.component.spec.ts
+++ b/src/app/nav/nav.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NavComponent } from './nav.component';
+
+describe('NavComponent', () => {
+  let component: NavComponent;
+  let fixture: ComponentFixture<NavComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NavComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NavComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/nav/nav.component.ts
+++ b/src/app/nav/nav.component.ts
@ -0,0 +1,84 @@
+import { animate, keyframes, state, style, transition, trigger } from '@angular/animations';
+import { Component, OnInit } from '@angular/core';
+import { Pages } from '../shared/models/pages.model';
+
+@Component({
+    selector: 'app-nav',
+    animations: [
+        trigger('openClose', [
+            state(
+                'bump',
+                style({
+                    width: '110px',
+                    height: '110px',
+                    'line-height': '110px',
+                    'border-radius': '55px'
+                })
+            ),
+            state(
+                'norm',
+                style({
+                    width: '100px',
+                    height: '100px',
+                    'line-height': '100px',
+                    'border-radius': '50px'
+                })
+            ),
+            transition('norm => bump', [
+                animate(
+                    '0.2s', keyframes([
+                        style({
+                            width: '100px',
+                            height: '100px',
+                            'line-height': '100px',
+                            'border-radius': '50px'
+                        }),
+                        style({
+                            width: '120px',
+                            height: '120px',
+                            'line-height': '120px',
+                            'border-radius': '60px'
+                        }),
+                        style({
+                            width: '110px',
+                            height: '110px',
+                            'line-height': '110px',
+                            'border-radius': '55px'
+                        })
+                    ])
+                )
+            ]),
+            transition('bump => norm', [
+                animate(
+                    '0.1s', keyframes([
+                        style({
+                            width: '110px',
+                            height: '110px',
+                            'line-height': '110px',
+                            'border-radius': '55px'
+                        }),
+                        style({
+                            width: '100px',
+                            height: '100px',
+                            'line-height': '100px',
+                            'border-radius': '50px'
+                        })
+                    ])
+                )
+            ])
+        ])
+    ],
+    templateUrl: './nav.component.html',
+    styleUrls: ['./nav.component.scss']
+})
+export class NavComponent implements OnInit {
+
+    Pages = Pages;
+    state: string[] = ['norm', 'norm', 'norm'];
+
+    constructor() { }
+
+    ngOnInit(): void {
+    }
+
+}
--- a/src/app/nav/nav.service.spec.ts
+++ b/src/app/nav/nav.service.spec.ts
@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NavService } from './nav.service';
+
+describe('NavService', () => {
+  let service: NavService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(NavService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
--- a/src/app/nav/nav.service.ts
+++ b/src/app/nav/nav.service.ts
@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { Pages } from '../shared/models/pages.model';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NavService {
+
+  private _currentPage = new BehaviorSubject<string>(Pages.HOME);
+  readonly currentPage$ = this._currentPage.asObservable();
+
+  private set currentPage(currentPage: string) {
+      this._currentPage.next(currentPage);
+  }
+  private get currentPage(): string {
+      return this._currentPage.getValue();
+  }
+
+  constructor() { }
+
+  setPageTitle(page: Pages): void {
+    this.currentPage = page;
+  }
+}
--- a/src/app/page404/page404.component.html
+++ b/src/app/page404/page404.component.html
@ -0,0 +1,2 @@
+<h1>Page Not Found?</h1>
+<h3>Sorry.</h3>
--- a/src/app/page404/page404.component.scss
+++ b/src/app/page404/page404.component.scss
@ -0,0 +1,5 @@
+:host {
+    display: flex;
+    flex-direction: column;
+    text-align: center;
+}
--- a/src/app/page404/page404.component.spec.ts
+++ b/src/app/page404/page404.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Page404Component } from './page404.component';
+
+describe('Page404Component', () => {
+  let component: Page404Component;
+  let fixture: ComponentFixture<Page404Component>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ Page404Component ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(Page404Component);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/page404/page404.component.ts
+++ b/src/app/page404/page404.component.ts
@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-page404',
+  templateUrl: './page404.component.html',
+  styleUrls: ['./page404.component.scss']
+})
+export class Page404Component implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
--- a/src/app/pet/pet.component.html
+++ b/src/app/pet/pet.component.html
@ -0,0 +1 @@
+<p>pet</p>
--- a/src/app/pet/pet.component.scss
+++ b/src/app/pet/pet.component.scss
@ -0,0 +1,10 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    overflow-y: auto;
+    padding: 0 20px 0 20px;
+    margin: 0 140px 10px 140px;
+}
--- a/src/app/pet/pet.component.spec.ts
+++ b/src/app/pet/pet.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PetComponent } from './pet.component';
+
+describe('PetComponent', () => {
+  let component: PetComponent;
+  let fixture: ComponentFixture<PetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/pet/pet.component.ts
+++ b/src/app/pet/pet.component.ts
@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-pet',
+  templateUrl: './pet.component.html',
+  styleUrls: ['./pet.component.scss']
+})
+export class PetComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
--- a/src/app/projects/project-card/project-card.component.html
+++ b/src/app/projects/project-card/project-card.component.html
@ -0,0 +1,4 @@
+<a routerLink="{{project.slug}}">
+    {{project.title + " - " + project.date}}
+    <span class="right">{{project.category}}</span>
+</a>
--- a/src/app/projects/project-card/project-card.component.scss
+++ b/src/app/projects/project-card/project-card.component.scss
@ -0,0 +1,24 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    flex-direction: column;
+    display: flex;
+    margin-bottom: 20px;
+
+    a {
+        color: colors.$inklets-color-white;
+        background-color: colors.$inklets-color-black;
+        border: 2px solid colors.$inklets-color-red-dark;
+        text-decoration: none;
+        padding: 15px 20px 15px 20px;
+        border-radius: 10px;
+    }
+
+    a:hover {
+        border: 2px solid colors.$inklets-color-red-light;
+    }
+
+    .right {
+        float: right;
+    }
+}
--- a/src/app/projects/project-card/project-card.component.spec.ts
+++ b/src/app/projects/project-card/project-card.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProjectCardComponent } from './project-card.component';
+
+describe('ProjectCardComponent', () => {
+  let component: ProjectCardComponent;
+  let fixture: ComponentFixture<ProjectCardComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ProjectCardComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProjectCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/projects/project-card/project-card.component.ts
+++ b/src/app/projects/project-card/project-card.component.ts
@ -0,0 +1,19 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Project } from 'src/app/shared/models/project.model';
+
+@Component({
+  selector: 'app-project-card',
+  templateUrl: './project-card.component.html',
+  styleUrls: ['./project-card.component.scss']
+})
+export class ProjectCardComponent implements OnInit {
+
+  @Input()
+  project: Project;
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
--- a/src/app/projects/project/project.component.html
+++ b/src/app/projects/project/project.component.html
@ -0,0 +1,3 @@
+<a routerLink="..">&lt; back</a>
+<span [innerHTML]="project.content"></span>
+<a routerLink="..">&lt; back</a>
--- a/src/app/projects/project/project.component.scss
+++ b/src/app/projects/project/project.component.scss
@ -0,0 +1,9 @@
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+:host {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    overflow-y: auto;
+    padding: 0 40px 0 40px;
+}
--- a/src/app/projects/project/project.component.spec.ts
+++ b/src/app/projects/project/project.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProjectComponent } from './project.component';
+
+describe('ProjectComponent', () => {
+  let component: ProjectComponent;
+  let fixture: ComponentFixture<ProjectComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ProjectComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProjectComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/projects/project/project.component.ts
+++ b/src/app/projects/project/project.component.ts
@ -0,0 +1,53 @@
+import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { Project } from 'src/app/shared/models/project.model';
+import { ProjectsService } from '../projects.service';
+
+@Component({
+  selector: 'app-project',
+  templateUrl: './project.component.html',
+  // encapsulation: ViewEncapsulation.None,
+  styleUrls: ['./project.component.scss']
+})
+export class ProjectComponent implements OnInit, OnDestroy {
+  _unsubscribe$: Subject<boolean> = new Subject();
+
+  project: Project = {
+    slug: '',
+    title: '',
+    date: '',
+    category: '',
+    content: '',
+  };
+
+  constructor(
+    private route: ActivatedRoute,
+    private projectsService: ProjectsService
+    ) { }
+
+  ngOnInit(): void {
+    let id: string;
+    this.route.paramMap.subscribe((params) => {
+        id = params.get('id');
+    });
+
+    this.projectsService.getProject(id);
+
+    this.projectsService.currentProject$
+    .pipe(takeUntil(this._unsubscribe$))
+    .subscribe((result: Project) => {
+      if (!!result) {
+        this.project = result;
+      }
+    });
+
+  }
+
+  ngOnDestroy(): void {
+      this._unsubscribe$.next(false);
+      this._unsubscribe$.complete();
+  }
+
+}
--- a/src/app/projects/projects-routing.module.ts
+++ b/src/app/projects/projects-routing.module.ts
@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ProjectComponent } from './project/project.component';
+import { ProjectsComponent } from './projects.component';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: ProjectsComponent
+    },
+    {
+        path: ':id',
+        component: ProjectComponent
+    }
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class ProjectsRoutingModule {}
--- a/src/app/projects/projects.component.html
+++ b/src/app/projects/projects.component.html
@ -0,0 +1,10 @@
+<h2>Projects on git</h2>
+<p>These are my projects as can be found on my <a href="https://gitlab.inkletblot.com/explore">gitlab</a>. 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.</p>
+<app-project-card *ngFor="let project of gitlabProjects()" [project]="project">
+</app-project-card>
+
+<h2>Projects of a personal nature</h2>
+<p>This is (will be) a summary of my personal projects be they my homelab, general electronics projects, or anything else.</p>
+
+<app-project-card *ngFor="let project of uncategorizedProjects()" [project]="project">
+</app-project-card>
--- a/src/app/projects/projects.component.scss
+++ b/src/app/projects/projects.component.scss
@ -0,0 +1,13 @@
+@use 'src/app/shared/styles/_variables.color'as colors;
+
+:host {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  overflow-y: auto;
+  padding: 0 20px 0 20px;
+
+  h2 {
+      border-bottom: colors.$inklets-color-red-light 2px dashed;
+  }
+}
--- a/src/app/projects/projects.component.spec.ts
+++ b/src/app/projects/projects.component.spec.ts
@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProjectsComponent } from './projects.component';
+
+describe('ProjectsComponent', () => {
+  let component: ProjectsComponent;
+  let fixture: ComponentFixture<ProjectsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ProjectsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProjectsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/projects/projects.component.ts
+++ b/src/app/projects/projects.component.ts
@ -0,0 +1,62 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { NavService } from '../nav/nav.service';
+import { Pages } from '../shared/models/pages.model';
+import { Project } from '../shared/models/project.model';
+import { ProjectsService } from './projects.service';
+
+@Component({
+  selector: 'app-projects',
+  templateUrl: './projects.component.html',
+  styleUrls: ['./projects.component.scss']
+})
+export class ProjectsComponent implements OnInit, OnDestroy {
+  _unsubscribe$: Subject<boolean> = new Subject();
+
+  allProjects: Array<Project>;
+  private _gitlabProjects: Array<Project> = new Array<Project>();
+  private _uncategorizedProjects: Array<Project> = new Array<Project>();
+
+  constructor(private navService: NavService, private projectsService: ProjectsService) { }
+
+  ngOnInit(): void {
+    this.navService.setPageTitle(Pages.PROJECTS);
+
+    this.projectsService.allProjects$
+        .pipe(takeUntil(this._unsubscribe$))
+        .subscribe((result: Project[]) => {
+          this.allProjects = result;
+        });
+
+    this.projectsService.getProjects();
+  }
+
+  ngOnDestroy(): void {
+      this._unsubscribe$.next(false);
+      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<Project> { 
+    this.filterProjects();
+    return this._gitlabProjects; 
+  }
+  
+  uncategorizedProjects(): Array<Project> { 
+    this.filterProjects();
+    return this._uncategorizedProjects; 
+  }
+
+}
--- a/src/app/projects/projects.module.ts
+++ b/src/app/projects/projects.module.ts
@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ProjectCardComponent } from './project-card/project-card.component';
+import { ProjectComponent } from './project/project.component';
+import { ProjectsComponent } from './projects.component';
+import { ProjectsRoutingModule } from './projects-routing.module';
+
+@NgModule({
+  declarations: [ProjectsComponent, ProjectCardComponent, ProjectComponent],
+  imports: [
+    CommonModule,
+    ProjectsRoutingModule
+  ],
+  providers: []
+})
+export class ProjectsModule { }
--- a/src/app/projects/projects.service.spec.ts
+++ b/src/app/projects/projects.service.spec.ts
@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ProjectsService } from './projects.service';
+
+describe('ProjectsService', () => {
+  let service: ProjectsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ProjectsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
--- a/src/app/projects/projects.service.ts
+++ b/src/app/projects/projects.service.ts
@ -0,0 +1,110 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { BehaviorSubject } from 'rxjs';
+import { Project } from '../shared/models/project.model';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ProjectsService {
+
+  private _allProjects = new BehaviorSubject<Array<Project>>([]);
+  readonly allProjects$ = this._allProjects.asObservable();
+
+  private set allProjects(projects: Array<Project>) {
+      this._allProjects.next(projects);
+  }
+  private get allProjects(): Array<Project> {
+      return this._allProjects.getValue();
+  }
+
+  private _currentProject = new BehaviorSubject<Project>(null);
+  readonly currentProject$ = this._currentProject.asObservable();
+
+  private set currentProject(project: Project) {
+      this._currentProject.next(project);
+  }
+  private get currentProject(): Project {
+      return this._currentProject.getValue();
+  }
+
+  private _apiErrored = new BehaviorSubject<boolean>(false);
+  readonly apiErrored$ = this._apiErrored.asObservable();
+
+  private set apiErrored(errored: boolean) {
+      this._apiErrored.next(errored);
+  }
+  private get apiErrored(): boolean {
+      return this._apiErrored.getValue();
+  }
+
+  /**
+   * I am actively avoiding any kind of environment management, this is a very basic site and currently this is the only api call.
+   */
+
+  private PROJECT_API_URL = "https://cms.inkletblot.com"
+
+  constructor(private http: HttpClient, private router: Router) { }
+
+  httpOptions = {
+      headers: new HttpHeaders({
+          'Content-Type': 'text/plain'
+      })
+  };
+
+  getProjects(): void {
+    this.http
+        .get(`${this.PROJECT_API_URL}/posts`, this.httpOptions)
+        .subscribe(
+            (response: Project[]) => {
+                if (response) {
+                    // using text/plain so as to not get the preflight options request
+                    // as such : Project[] does not work as expected and objects must be parsed.
+                    this.allProjects = response;
+                    // filter out different categories here currently only one
+                }
+            },
+            (error) => {
+                this.apiErrored = true;
+            }
+        );
+    }
+
+    getSingleProject(id: string): void {
+      this.http
+          .get(`${this.PROJECT_API_URL}/post/${id}`, this.httpOptions)
+          .subscribe(
+              (response: Project) => {
+                  if (response) {
+                      // using text/plain so as to not get the preflight options request
+                      // as such : Project[] does not work as expected and objects must be parsed.
+                      this.currentProject = response;
+                      // filter out different categories here currently only one
+                  }
+              },
+              (error) => {
+                  this.apiErrored = true;
+                  this.router.navigate(['not-found'])
+              }
+          );
+      }
+
+    /**
+     * This is not very efficient code but I'm not planning on having that many projects and (if this turns into a blog) blog posts
+     * If this does become a general blog, then I will make this a bit more efficient.
+     * @param id slug of project to get
+     */
+    getProject(id: string): void {
+        let found = false;
+        this.allProjects.forEach((project) => {
+            if (project.slug === id) {
+                found = true;
+                this.currentProject = project;
+            }
+        })
+        if (!found) {
+            this.getSingleProject(id)
+        }
+    }
+}
--- a/src/app/shared/models/link.model.ts
+++ b/src/app/shared/models/link.model.ts
@ -0,0 +1,4 @@
+export interface Link {
+    name: string;
+    location: string;
+}
--- a/src/app/shared/models/links.model.ts
+++ b/src/app/shared/models/links.model.ts
@ -0,0 +1,58 @@
+import { Link } from "./link.model";
+import { Pages } from "./pages.model";
+
+export const Links: Array<Link> =
+[
+    {
+        name: "cloud",
+        location: "https://cloud.inkletblot.com"
+    },
+    {
+        name: "pet",
+        location: Pages.PET
+    },
+    {
+        name: "gitlab",
+        location: "https://gitlab.inkletblot.com/"
+    },
+    {
+        name: "streamer",
+        location: "https://streamer.inkletblot.com/"
+    },
+    {
+        name: "rancher",
+        location: "https://rancher.inkletblot.com/"
+    },
+    {
+        name: "hab",
+        location: "https://hab.inkletblot.com/"
+    },
+    {
+        name: "tng",
+        location: "https://proxy.inkletblot.com/tng/"
+    },
+    {
+        name: "pasty",
+        location: "https://proxy.inkletblot.com/pasty/"
+    },
+    {
+        name: "mail",
+        location: "https://mail.inkletblot.com/"
+    },
+    {
+        name: "chk",
+        location: "https://www.chkseven.com"
+    },
+    {
+        name: "pve",
+        location: "https://pve.inkletblot.com:8006/"
+    },
+    {
+        name: "bitwarden",
+        location: "https://bw.inkletblot.com/"
+    },
+    {
+        name: "matrix",
+        location: "https://homeserver.inkletblot.com/"
+    }
+]
--- a/src/app/shared/models/pages.model.ts
+++ b/src/app/shared/models/pages.model.ts
@ -0,0 +1,11 @@
+/**
+ * Defines routes for the site, makes it easy to change later
+ */
+export enum Pages {
+    HOME = 'home',
+    PROJECTS = 'projects',
+    GALLERY = 'gallery',
+    LINKS = 'links',
+    PET = 'pet',
+    PAGE_404 = 'not-found' 
+}
--- a/src/app/shared/models/project.model.ts
+++ b/src/app/shared/models/project.model.ts
@ -0,0 +1,7 @@
+export interface Project {
+    slug: string,
+    title: string,
+    date: string,
+    category: string,
+    content: string
+}
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule
+  ]
+})
+export class SharedModule { }
--- a/src/app/shared/styles/_variables.color.scss
+++ b/src/app/shared/styles/_variables.color.scss
@ -0,0 +1,21 @@
+/*
+* To use this partial import it into your css file with the 'use' directive.
+*
+* e.g. @use 'relative/path/to/styles/variables.color' as colors;
+*
+* By default the 'namespace' applied to the partial is the file name (which in this case is a little messy) so providing the 'as' keyword lets us rename it.
+* In this case we are renaming to something a little more sensible, which is simply 'colors'.
+*
+* We can then use the color variable in place of a hex code.
+*
+* e.g. body { background-color: colors.$inklets-color-black; }
+*/
+
+$inklets-color-black: #0e0906;
+$inklets-color-grey: #191511;
+$inklets-color-white: #f4efea;
+$inklets-color-red-dark:#6d1d00;
+$inklets-color-red-light:#e6906c;
+$inklets-color-blue-dark: #181846;
+$inklets-color-blue-light:#6a9ccc;
+$inklets-color-text-highlight: #f5d870;
--- a/src/assets/envelope.png
+++ b/src/assets/envelope.png
--- a/src/assets/head.jpg
+++ b/src/assets/head.jpg
--- a/src/assets/linkedin.png
+++ b/src/assets/linkedin.png
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@ -13,4 +13,4 @@ export const environment = {
 * This import should be commented out in production mode because it will have a negative impact
 * on performance if an error is thrown.
 */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.
--- a/src/favicon.ico
+++ b/src/favicon.ico
--- a/src/index.html
+++ b/src/index.html
@ -2,7 +2,7 @@
 <html lang="en">
 <head>
  <meta charset="utf-8">
-  <title>InkletblotCom</title>
+  <title>Inklet's Space</title>
  <base href="/">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="icon" type="image/x-icon" href="favicon.ico">
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@ -18,18 +18,6 @@
 * BROWSER POLYFILLS
 */

-/**
- * IE11 requires the following for NgClass support on SVG elements
- */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
 * By default, zone.js will patch all possible macroTask and DomEvents
 * user can disable parts of macroTask/DomEvents patch by setting following flags
@ -57,7 +45,7 @@
 /***************************************************************************************************
 * Zone JS is required by default for Angular itself.
 */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
+import 'zone.js';  // Included with Angular CLI.


 /***************************************************************************************************
--- a/src/styles.sass
+++ b/src/styles.sass
@ -1 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
--- a/src/styles.scss
+++ b/src/styles.scss
@ -0,0 +1,108 @@
+/* You can add global styles to this file, and also import other style files */
+@use 'src/app/shared/styles/_variables.color' as colors;
+
+html, body {
+    height: 100%;
+}
+
+body {
+    margin: 0;
+    font-family: Roboto, 'Helvetica Neue', sans-serif;
+    background-color: colors.$inklets-color-grey;
+    color: colors.$inklets-color-white;
+}
+
+/*
+
+    Codehilite styles for api content
+
+*/
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #979797; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+span.linenos.special { color: #979797; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+.codehilite .hll { background-color: #ffffcc }
+.codehilite { background: colors.$inklets-color-black; padding: 5px; }
+.codehilite .c { color: #408080; font-style: italic } /* Comment */
+.codehilite .err { border: 1px solid #FF0000 } /* Error */
+.codehilite .k { color: #008000; font-weight: bold } /* Keyword */
+.codehilite .o { color: #666666 } /* Operator */
+.codehilite .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
+.codehilite .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+.codehilite .cp { color: #BC7A00 } /* Comment.Preproc */
+.codehilite .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
+.codehilite .c1 { color: #408080; font-style: italic } /* Comment.Single */
+.codehilite .cs { color: #408080; font-style: italic } /* Comment.Special */
+.codehilite .gd { color: #A00000 } /* Generic.Deleted */
+.codehilite .ge { font-style: italic } /* Generic.Emph */
+.codehilite .gr { color: #FF0000 } /* Generic.Error */
+.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.codehilite .gi { color: #00A000 } /* Generic.Inserted */
+.codehilite .go { color: #888888 } /* Generic.Output */
+.codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.codehilite .gs { font-weight: bold } /* Generic.Strong */
+.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.codehilite .gt { color: #0044DD } /* Generic.Traceback */
+.codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.codehilite .kp { color: #008000 } /* Keyword.Pseudo */
+.codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.codehilite .kt { color: #B00040 } /* Keyword.Type */
+.codehilite .m { color: #666666 } /* Literal.Number */
+.codehilite .s { color: #BA2121 } /* Literal.String */
+.codehilite .na { color: #7D9029 } /* Name.Attribute */
+.codehilite .nb { color: #008000 } /* Name.Builtin */
+.codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.codehilite .no { color: #880000 } /* Name.Constant */
+.codehilite .nd { color: #AA22FF } /* Name.Decorator */
+.codehilite .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.codehilite .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.codehilite .nf { color: #0000FF } /* Name.Function */
+.codehilite .nl { color: #A0A000 } /* Name.Label */
+.codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.codehilite .nv { color: #19177C } /* Name.Variable */
+.codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.codehilite .w { color: #bbbbbb } /* Text.Whitespace */
+.codehilite .mb { color: #666666 } /* Literal.Number.Bin */
+.codehilite .mf { color: #666666 } /* Literal.Number.Float */
+.codehilite .mh { color: #666666 } /* Literal.Number.Hex */
+.codehilite .mi { color: #666666 } /* Literal.Number.Integer */
+.codehilite .mo { color: #666666 } /* Literal.Number.Oct */
+.codehilite .sa { color: #BA2121 } /* Literal.String.Affix */
+.codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */
+.codehilite .sc { color: #BA2121 } /* Literal.String.Char */
+.codehilite .dl { color: #BA2121 } /* Literal.String.Delimiter */
+.codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.codehilite .s2 { color: #BA2121 } /* Literal.String.Double */
+.codehilite .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */
+.codehilite .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.codehilite .sx { color: #008000 } /* Literal.String.Other */
+.codehilite .sr { color: #BB6688 } /* Literal.String.Regex */
+.codehilite .s1 { color: #BA2121 } /* Literal.String.Single */
+.codehilite .ss { color: #19177C } /* Literal.String.Symbol */
+.codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */
+.codehilite .fm { color: #0000FF } /* Name.Function.Magic */
+.codehilite .vc { color: #19177C } /* Name.Variable.Class */
+.codehilite .vg { color: #19177C } /* Name.Variable.Global */
+.codehilite .vi { color: #19177C } /* Name.Variable.Instance */
+.codehilite .vm { color: #19177C } /* Name.Variable.Magic */
+.codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
+
+
+* a {
+    text-decoration: none;
+    color: colors.$inklets-color-text-highlight;
+}
+
+* a:hover {
+    color: colors.$inklets-color-blue-light;
+}
+
+* img {
+    max-width: 400px;
+    max-height: 500px;
+}
--- a/src/test.ts
+++ b/src/test.ts
@ -1,6 +1,6 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files

-import 'zone.js/dist/zone-testing';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
  BrowserDynamicTestingModule,
@ -17,7 +17,9 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
Author	SHA1	Message	Date
Solomon Laing	a115a65840	updated for failing deployment	2022-05-26 22:15:01 +09:30
Solomon Laing	b6682e7d79	Merge branch 'develop' into 'master' updated links and gitignore See merge request inkletblot/inkletblot-com-v2!19	2022-05-26 12:33:49 +00:00
Solomon Laing	58997e59bc	updated links and gitignore	2022-05-26 22:03:45 +09:30
Solomon Laing	e31204a235	Merge branch 'angular-13-upgrade' into 'master' update to angular 13 See merge request inkletblot/inkletblot-com-v2!18	2021-12-21 22:42:54 +00:00
Solomon Laing	aa125b836f	update to angular 13	2021-12-22 09:12:33 +10:30
Solomon Laing	877f94a89e	Merge branch 'projects-width' into 'master' updated projects width, kinda broken with code though, need to make sure to keep things slim See merge request inkletblot/inkletblot-com-v2!17	2021-12-21 10:58:52 +00:00
Solomon Laing	3dfb91424c	updated projects width, kinda broken with code though, need to make sure to keep things slim	2021-12-21 21:23:44 +10:30
Solomon Laing	1bd02ad4e5	Merge branch 'more-links' into 'master' added some new links to links :) See merge request inkletblot/inkletblot-com-v2!16	2021-12-21 04:37:42 +00:00
Solomon Laing	8cb4204800	added some new links to links :)	2021-12-21 15:04:28 +10:30
Solomon Laing	26cc45cb45	Merge branch 'develop' into 'master' minor updates due to domain changes, project filtering and cicd See merge request inkletblot/inkletblot-com-v2!15	2021-07-07 05:30:31 +00:00
Solomon Laing	16c8d4c6ae	Update .gitlab-ci.yml to use ssh jump host	2021-07-07 05:27:35 +00:00
Solomon Laing	9e12a95bfe	added basic filter to projects so gitlab and uncategorized are separate	2021-07-07 14:52:51 +09:30
Solomon Laing	8789390c67	updated links due to domain changes	2021-07-07 14:28:10 +09:30
Solomon Laing	c13b67dd82	Merge branch 'develop' into 'master' retheme of nav and removal of scrolling bug See merge request inkletblot/inkletblot-com-v2!14	2021-06-15 10:51:00 +00:00
Solomon Laing	1e24dc45dd	Merge branch 'feature/nav-theme' into 'develop' Feature/nav theme See merge request inkletblot/inkletblot-com-v2!13	2021-06-15 10:46:27 +00:00
Solomon Laing	2935df9b90	finished nav re-theme and fixed scrolling bug	2021-06-15 20:15:28 +09:30
Solomon Laing	a4e891c8b5	first go of nav restyle is complete, removed blue and replaced with visual que	2021-06-14 16:19:37 +09:30
Solomon Laing	86f7aa143a	first go of nav restyle is complete, removed blue and replaced with visual que	2021-06-14 16:14:19 +09:30
Solomon Laing	8f3a17266e	Merge branch 'inkletblot-master-patch-88271' into 'master' Update .gitlab-ci.yml See merge request inkletblot/inkletblot-com-v2!12	2021-06-13 09:41:51 +00:00
Solomon Laing	444f0f62fa	Update .gitlab-ci.yml	2021-06-13 09:40:03 +00:00
Solomon Laing	0e22c689c8	Merge branch 'develop' into 'master' added image bounding for posts See merge request inkletblot/inkletblot-com-v2!11	2021-06-13 09:38:52 +00:00
Solomon Laing	585826a60f	added image bounding for posts	2021-06-13 19:06:54 +09:30
Solomon Laing	a1341d5f06	Merge branch 'develop' into 'master' Release of re-theme See merge request inkletblot/inkletblot-com-v2!10	2021-06-13 06:14:51 +00:00
Solomon Laing	72b99bb748	Merge branch 'feature/re-theme' into 'develop' completed first re-theme, colors are red and brown/grey now also layout is drasitaclly changed See merge request inkletblot/inkletblot-com-v2!9	2021-06-13 06:08:07 +00:00
Solomon Laing	979481b39c	completed first re-theme, colors are red and brown/grey now also layout is drasitaclly changed	2021-06-13 15:36:11 +09:30
Solomon Laing	671d34d552	Merge branch 'develop' into 'master' pushing through some changes to links See merge request inkletblot/inkletblot-com-v2!8	2021-06-06 04:49:56 +00:00
Solomon Laing	0bbe8e4627	Merge branch 'bugfix/dead-links-removal' into 'develop' added some links and removed old borked ones See merge request inkletblot/inkletblot-com-v2!7	2021-06-06 04:47:29 +00:00
Solomon Laing	8ea795def4	added merge only ci test	2021-06-06 14:17:20 +09:30
Solomon Laing	17c578a1e2	added merge only ci test	2021-06-06 14:16:24 +09:30
Solomon Laing	ff1e72b3df	added merge only ci test	2021-06-06 14:12:46 +09:30
Solomon Laing	8147d0db77	added some links and removed old borked ones	2021-06-06 14:07:25 +09:30
Solomon Laing	f906145242	Merge branch 'develop' into 'master' Release of projects See merge request inkletblot/inkletblot-com-v2!6	2021-06-06 04:04:24 +00:00
Solomon Laing	2c6d486967	Merge branch 'feature/projects' into 'develop' Projects is complete See merge request inkletblot/inkletblot-com-v2!5	2021-06-06 04:00:53 +00:00
Solomon Laing	ac430a46d1	first release of projects ready	2021-06-06 13:27:11 +09:30
Solomon Laing	5d754396da	updated code (started to) for new api, npm install is busted due to out of date deps I think, moving to different computer	2021-06-06 12:10:25 +09:30
Solomon Laing	17e74a18a3	got basic implementation of project cards and the suppporting services/routing working. need to style project page now and will have first pass done	2021-06-06 12:10:25 +09:30
Solomon Laing	036f48b3f0	Got api request working. I added the necessary header to the api server and then changed the content type of the request to text/plain to disabled the preflight OPTIONS request which the server was erroring on. Not sure about the security of all this but it's a very basic website and I don't think it'll be an issue.	2021-06-06 12:10:25 +09:30
Solomon Laing	fbb00cdecc	started implementation of projects page. currently need to work out cors	2021-06-06 12:10:25 +09:30
Solomon Laing	fd70c64fc2	updated npm deps, I think?	2021-06-05 21:10:17 +09:30
Solomon Laing	a6ef143e11	Update .gitlab-ci.yml	2021-06-05 11:24:49 +00:00
solomon laing	eec0319361	Merge branch 'develop' into 'master' Develop See merge request inkletblot/inkletblot-com-v2!4	2021-04-13 00:04:02 +00:00
solomon laing	49c751b284	Merge branch 'feature/homepage' into 'develop' added home page content, I am yet to add mobile layouts but the content of teh page is complete. See merge request inkletblot/inkletblot-com-v2!3	2021-04-13 00:01:20 +00:00
Solomon Laing	49baafc3c7	added home page content, I am yet to add mobile layouts but the content of teh page is complete.	2021-04-05 21:16:31 +09:30
solomon laing	e5375d5df7	Merge branch 'develop' into 'master' Develop See merge request inkletblot/inkletblot-com-v2!2	2021-04-02 11:43:20 +00:00
Solomon Laing	9d568df286	minor stylings for initial release	2021-04-02 22:06:19 +10:30
Solomon Laing	8fd679489c	merged master into develop	2021-04-02 22:06:12 +10:30
Solomon Laing	5ee955e93c	merged master into develop	2021-04-02 22:05:47 +10:30
Solomon Laing	4e309f4d30	merged master into develop	2021-04-02 22:04:26 +10:30
Solomon Laing	ff3de207cf	updated gitlab-ci	2021-04-01 20:57:51 +10:30
Solomon Laing	9aeb084045	updated gitlab-ci	2021-04-01 20:49:53 +10:30
Solomon Laing	68a5f93c52	updated gitlab-ci	2021-04-01 20:31:20 +10:30
Solomon Laing	2ab5e33e0f	updated gitlab-ci	2021-04-01 20:28:44 +10:30
Solomon Laing	f6e9a1f38d	updated gitlab-ci	2021-04-01 20:25:42 +10:30
Solomon Laing	672614cc19	updated gitlab-ci	2021-04-01 20:17:14 +10:30
solomon laing	c4604f1725	Update .gitlab-ci.yml	2021-04-01 09:40:04 +00:00
solomon laing	e4ecebaa8f	Update .gitlab-ci.yml	2021-04-01 09:26:02 +00:00
Solomon Laing	bda36663ce	updated gitlab-ci	2021-04-01 19:50:50 +10:30
Solomon Laing	1327c627c7	updated gitlab-ci	2021-04-01 19:38:52 +10:30
Solomon Laing	5e9645d52a	updated gitlab-ci	2021-04-01 19:32:17 +10:30
solomon laing	d5e173ee80	Merge branch 'develop' into 'master' initial commit See merge request inkletblot/inkletblot-com-v2!1	2021-04-01 02:46:26 +00:00
				`@ -0,0 +1 @@`
				`<p>Everything on this site is free for all possible public use.</p>`
				`@ -1 +0,0 @@`
				`/* You can add global styles to this file, and also import other style files */`