Add content.

Allow for no video.

index.go.html

@@ -79,10 +79,16 @@
                     <div class="content">{{ .GetContent }}</div>
                 </div>
                 <div class="item-table-360">
-                    <div><video controls width="360">
+                    <div>
-                        <source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}">
+                    {{ if eq .VideoLocation "" }}
-                        <a href="{{ .VideoLocation }}">The Video</a>
+                        <img src="{{ $.Data.NoVideoImageLocation }}" alt="No Video">
-                    </video></div>
+                    {{ else }}
+                        <video controls width="360">
+                            <source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}">
+                            <a href="{{ .VideoLocation }}">The Video</a>
+                        </video>
+                    {{ end }
+                    </div>
                 </div>
             </div>
             {{ if not (eq .GetImageCount 0) }}

index.go.yml

@@ -2,6 +2,7 @@ cssBaseURL: "https://cityuni.captainalm.com/resources/assets/base.css"
 cssDarkURL: "https://cityuni.captainalm.com/resources/assets/dark.css"
 cssLightURL: "https://cityuni.captainalm.com/resources/assets/light.css"
 jScriptURL: "https://cityuni.captainalm.com/resources/assets/index.js"
+noVideoImageLocation: "https://cityuni.captainalm.com/resources/assets/novideo.png"
 headerLinks:
   Main Portfolio: "https://portfolio.captainalm.com/"
   Root Site Home: "https://www.captainalm.com/"
@@ -9,10 +10,37 @@ headerLinks:
 about:
   title: "Alfred Manville (Captain ALM)"
   content: >
-    <p>test</p>
+    <p>
-    <p>#age#</p>
+    Hello, I'm Alfred Manville (#age# Years Old).
-    <p>#birth#</p>
+    I'm a free and open-source developer who enjoys networking my laptops together,
-  thumbnailLocation: "https://cityuni.captainalm.com/resources/assets/imageofyou.jpg"
+    writes network software to communicate between them and then tries to break said software.
+    I also have a <a href="https://youtube.com/c/CaptainALM">Youtube Channel</a> which is in the process of being resumed from a hiatus.
+    </p>
+    <p>
+    On the programming side, I know Visual Basic .net, C# .net, C, Java, Go, Javascript (Circa. 2000), Processing and Microsoft Smallbasic
+    (I have also dabbled in C++, Python and Bash/Batch).
+    I am currently in the progress of writing infrastructure software in Go, in the past, I wrote a command console in VB .net for my own
+    pluggable libraries (I created a CMD emulator to get past the school disabling interactive CMD) and some network communication applications
+    (Including a peer-to-peer VOIP client using NAudio as the audio library and my own network wrapper library).
+    </p>
+    <p>
+    On the cracking / hacking side, I've used virtual machines a lot (Mainly infrastructure testing
+    but I did at one point try creating and breaking into a test windows domain network I had setup).
+    I've also used VMs to pull perform a PXE boot off a network and analyse the partially deployed image
+    (And this is why the deployment servers should be switched off when unneeded, especially since PXE
+    auto-domain-join would store its credentials in the image).
+    I also played around with accessing the RDP servers when I was in secondary school (Turns out remote apps
+    is just a glorified application auto-launcher with window size detection).
+    </p>
+    <p>
+    I also <a href="https://subsection.captainalm.com/">bake bread</a> although this sub-site is still under construction (Mostly learnt from my grandma).
+    I also play video-games and am an expert at using lower-end hardware.
+    </p>
+    <p>
+    I used to do Karate (Kyokushin Brown Belt) and I wish I could still fit my bike.
+    My <a href="https://cdn.captainalm.com/download/keys/alfred@captainalm.com.asc">GPG Key</a> for my email address.
+    </p>
+  thumbnailLocation: "https://cityuni.captainalm.com/resources/assets/imageofyou_t.jpg"
   imageLocation: "https://cityuni.captainalm.com/resources/assets/imageofyou.jpg"
   imageAltText: "Image of me."
   birthYear: 2002
@@ -23,6 +51,7 @@ entries:
       <p>
       My first programming task at City, concluding the 2 week 2021 Programming Bootcamp,
       although I have only spent 3 days programming this and was a tad bit too ambitious.
+      (I could have started earlier though)
       </p>
       <p>
       This Processing project show that I can use arrays, loops, mouse and keyboard interaction and geometric transforms.
@@ -33,55 +62,93 @@ entries:
       I ran out of time before the submission to actually even start on the game. But you can play around with the main code and build your own GUIs too so... 
       </p>
       <p>
-      <a href="https://github.com/Captain-ALM/Ninjaformer-Processing">https://github.com/Captain-ALM/Ninjaformer-Processing</a>
+      Here is the repo: <a href="https://github.com/Captain-ALM/Ninjaformer-Processing">https://github.com/Captain-ALM/Ninjaformer-Processing</a>
       </p>
     startDate: "01/10/2021"
     endDate: "31/10/2021"
     videoLocation: "https://cityuni.captainalm.com/resources/stream/vid1.mp4"
     videoContentType: "video/mp4"
     thumbnailLocations:
-      - "https://cityuni.captainalm.com/resources/assets/pic1.png"
+      - "https://cityuni.captainalm.com/resources/assets/pic1_t.png"
-      - "https://cityuni.captainalm.com/resources/assets/pic2.png"
+      - "https://cityuni.captainalm.com/resources/assets/pic2_t.png"
-      - "https://cityuni.captainalm.com/resources/assets/pic3.png"
+      - "https://cityuni.captainalm.com/resources/assets/pic3_t.png"
     imageLocations:
       - "https://cityuni.captainalm.com/resources/assets/pic1.png"
       - "https://cityuni.captainalm.com/resources/assets/pic2.png"
       - "https://cityuni.captainalm.com/resources/assets/pic3.png"
     imageAltTexts:
-      - "Picture 1."
+      - "Level select screen."
-      - "Picture 2."
+      - "Empty content interface (Gameplay)."
-      - "Picture 3."
+      - "Level editor screen."
   - name: "City Game Project 2022: Ninjaformer (Alpha, Beta)"
     content: >
       <p>
-      My third programming task and first major project at City, concluding 2.2 Months of programming.
+      My first major project at City (A Java Game), concluding 2.2 Months of programming.
+      This game uses the University provided game library (Which is just JBox2D extended).
       </p>
       <p>
       Looking back on this, I wish I started earlier (Like January) that way I could have implemented all the features I wanted.
       This project allows for levels to be designed within the program and allows them to be edited as XML outside the program.
       </p>
       <p>
-      The code is extensible and it is relatively straight forward to impliment new features. There are a few bugs that can crop up
+      The code is extensible and it is relatively straight forward to implement new features. There are a few bugs that can crop up
       (Such as sticking to surfaces due to ground body updates) but I already know ways to fix them.
       This project relies on part of a GUI library I built in it and I had to modify the CityGame library by extending it.
-      The audio and assets were also created by me.
+      The audio and assets were also created by me, although they're a bit amateurish as I'm a computer scientist not an artist!
       </p>
       <p>
-      <a href="https://github.com/cityteaching/citygame2122-Captain-ALM"><strike><del>Not public due to university anti-plagiarism policy.</del></strike></a>
+      This game is designed to be a story based game... The tutorial level at the beginning of the game is the dream in which the main
+      character dreams of being a ninja, this allows for the player to learn the controls and basic mechanics of the game.
+      The next level is the training level in which the ninja trains within a monastery.
+      The final level allows the ninja to "complete" the game while exploring a set of caves.
+      </p>
+      <p>
+      Here is the repo: <a href="https://github.com/cityteaching/citygame2122-Captain-ALM"><strike><del>Not public due to university anti-plagiarism policy.</del></strike></a>
       </p>
     startDate: "25/02/2022"
     endDate: "08/05/2022"
     videoLocation: "https://cityuni.captainalm.com/resources/stream/vid2.mp4"
     videoContentType: "video/mp4"
     thumbnailLocations:
-      - "https://cityuni.captainalm.com/resources/assets/pic4.png"
+      - "https://cityuni.captainalm.com/resources/assets/pic4_t.png"
-      - "https://cityuni.captainalm.com/resources/assets/pic5.png"
+      - "https://cityuni.captainalm.com/resources/assets/pic5_t.png"
-      - "https://cityuni.captainalm.com/resources/assets/pic6.png"
+      - "https://cityuni.captainalm.com/resources/assets/pic6_t.png"
     imageLocations:
       - "https://cityuni.captainalm.com/resources/assets/pic4.png"
       - "https://cityuni.captainalm.com/resources/assets/pic5.png"
       - "https://cityuni.captainalm.com/resources/assets/pic6.png"
     imageAltTexts:
-      - "Picture 4."
+      - "Cave level."
-      - "Picture 5."
+      - "Tutorial level."
-      - "Picture 6."
+      - "Training level."
+  - name: "Global Game Jam January 2022 : Shadow work"
+    content: >
+      <p>
+      I may have not done any programming for this (Even though I know C#) but I helped write a good chunk of the background story
+      (I also helped with the level design although it turns out 48 hours is hard to get polished stuff done in, so some stuff had to be axed).
+      </p>
+      <p>
+      Read about and get the game files from: <a href="https://globalgamejam.org/2022/games/shadow-work-8">https://globalgamejam.org/2022/games/shadow-work-8</a>
+      </p>
+      <p>
+      Download the windows executable from: <a href="https://cdn.captainalm.com/download/ShadowWorkExecutable.zip">https://cdn.captainalm.com/download/ShadowWorkExecutable.zip</a>
+      </p>
+    startDate: "20/01/2022"
+    endDate: "30/01/2022"
+    #videoLocation: "https://cityuni.captainalm.com/resources/stream/vid3.mp4"
+    #videoContentType: "video/mp4"
+  - name: "City-University Portfolio"
+    content: >
+      <p>
+      This project is what's outputting this page at the moment! The backend is written in Go and there is both custom front-end Javascript and CSS!
+      The pages support theming and the entries can be sorted through Javascript or on the backend through GET parameters.
+      </p>
+      <p>
+      This project is under the BSD-3-Clause License, so if reusing, you must scrub references to me, the yml file this is written in is under
+      Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International <a href="https://creativecommons.org/licenses/by-nc-nd/4.0/">
+      <img src="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-nd.png" alt="License"></a>.
+      </p>
+      <p>
+      Find the source code here: <a href="https://code.mrmelon54.xyz/alfred/cityuni-webserver">https://code.mrmelon54.xyz/alfred/cityuni-webserver</a>
+      </p>
+    startDate: "13/07/2022"

pageHandler/pages/index/data.go

@@ -3,13 +3,14 @@ package index
 import "html/template"
 
 type DataYaml struct {
-	HeaderLinks map[string]template.URL `yaml:"headerLinks"`
+	HeaderLinks          map[string]template.URL `yaml:"headerLinks"`
-	CSSBaseURL  template.URL            `yaml:"cssBaseURL"`
+	CSSBaseURL           template.URL            `yaml:"cssBaseURL"`
-	CSSLightURL template.URL            `yaml:"cssLightURL"`
+	CSSLightURL          template.URL            `yaml:"cssLightURL"`
-	CSSDarkURL  template.URL            `yaml:"cssDarkURL"`
+	CSSDarkURL           template.URL            `yaml:"cssDarkURL"`
-	JScriptURL  template.URL            `yaml:"jScriptURL"`
+	JScriptURL           template.URL            `yaml:"jScriptURL"`
-	About       AboutYaml               `yaml:"about"`
+	NoVideoImageLocation template.URL            `yaml:"noVideoImageLocation"`
-	Entries     []EntryYaml             `yaml:"entries"`
+	About                AboutYaml               `yaml:"about"`
+	Entries              []EntryYaml             `yaml:"entries"`
 }
 
 func (dy DataYaml) GetHeaderLabels() []string {