Merge Edge with data #1

Merged
alfred merged 49 commits from edge into master 2022-07-27 14:13:41 +01:00
4 changed files with 70 additions and 10 deletions
Showing only changes of commit d8d509c001 - Show all commits

View File

@ -115,8 +115,7 @@ main{
background-color: transparent; background-color: transparent;
box-sizing: inherit; box-sizing: inherit;
} }
.item-table-full, .item-table-half, .item-table-240{ .item-table-full, .item-table-240{
display: table-cell;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
background-color: transparent; background-color: transparent;
@ -124,13 +123,20 @@ main{
box-sizing: inherit; box-sizing: inherit;
} }
.item-table-full{ .item-table-full{
display: table-cell;
width: 100%; width: 100%;
} }
.item-table-half{
width: 50%;
}
.item-table-240{ .item-table-240{
display: none;
}
@media (min-width: 320px){
.main-table > div > div > div{
margin: 5px;
}
.item-table-240{
display: table-cell;
width: 240px; width: 240px;
}
} }
@media (min-width: 480px){ @media (min-width: 480px){
.nav{ .nav{
@ -149,7 +155,4 @@ main{
.hmb{ .hmb{
display: none; display: none;
} }
.main-table > div > div > div{
margin: 5px;
}
} }

View File

@ -51,6 +51,34 @@
</div> </div>
</div> </div>
</div> </div>
{{ range .Data.Entries }}
<div>
<div>
<div>
<div class="item-table">
<div>
<div class="item-table-full">
<div class="centered padded-2px"><h1>{{ .Name }}</h1></div>
</div>
<div class="item-table-240">
<div class="centered padded-2px"><h4>{{ .GetStartDate }} - {{ .GetEndDate }}</h4></div>
</div>
</div>
<div>
<div class="item-table-full">
<div class="padded-2px">{{ .GetContent }}</div>
</div>
<div class="item-table-240">
<div><video controls="" width="240">
<source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}">
</video></div>
</div>
</div>
</div>
</div>
</div>
</div>
{{ end }}
</main> </main>
</body> </body>
</html> </html>

View File

@ -17,3 +17,32 @@ about:
birthYear: 2002 birthYear: 2002
contactEmail: "alfred@captainalm.com" contactEmail: "alfred@captainalm.com"
entries: entries:
- name: "Bootcamp 2021: Ninjaformer GUI"
content: >
<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.
This Processing project show that I can use arrays, loops, mouse and keyboard interaction and geometric transforms.
The project contains a GUI library that I made to create the menu system for my ninjaformer game,
unfortunately, while the code for loading tile, sprite and level information exists (JSON, sprite sheet support),
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>
startDate: "01/10/2021"
endDate: "31/10/2021"
videoLocation: "https://cityuni.captainalm.com/resources/stream/vid1.mp4"
videoContentType: "video/mp4"
- 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.
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.
The code is extensible and it is relatively straight forward to impliment 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.
</p>
startDate: "25/02/2021"
endDate: "08/05/2022"
videoLocation: "https://cityuni.captainalm.com/resources/stream/vid2.mp4"
videoContentType: "video/mp4"

View File

@ -6,7 +6,7 @@ import (
"time" "time"
) )
const dateFormat = "2006-01-02" const dateFormat = "2006-01"
type EntryYaml struct { type EntryYaml struct {
Name string `yaml:"name"` Name string `yaml:"name"`