From f60e04ada4c51f992127dfcd71b343435c9a1c72 Mon Sep 17 00:00:00 2001 From: Captain ALM Date: Wed, 28 Dec 2022 20:36:13 +0000 Subject: [PATCH] Squash and merge edge. --- .drone.yml | 8 ----- .woodpecker/build.yml | 12 ++++++++ index.go.yml | 44 +++++++++++++++++++++++++-- index.js | 6 ++-- pageHandler/pages/index/index-page.go | 6 ++-- 5 files changed, 59 insertions(+), 17 deletions(-) delete mode 100644 .drone.yml create mode 100644 .woodpecker/build.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 55a244b..0000000 --- a/.drone.yml +++ /dev/null @@ -1,8 +0,0 @@ -kind: pipeline -name: default - -steps: -- name: build - image: golang - commands: - - make build diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml new file mode 100644 index 0000000..9cb0961 --- /dev/null +++ b/.woodpecker/build.yml @@ -0,0 +1,12 @@ +platform: linux/amd64 + +pipeline: + format: + image: golang + commands: + - files=$(gofmt -l .) && echo "$files" && [ -z "$files" ] + build: + image: golang + commands: + - make build + diff --git a/index.go.yml b/index.go.yml index e4fd359..8481ab8 100644 --- a/index.go.yml +++ b/index.go.yml @@ -13,7 +13,7 @@ sortImageLocation: "resources/assets/sort.png" headerLinks: Main Portfolio: "https://portfolio.captainalm.com/" Root Site Home: "https://www.captainalm.com/" - Github: "https://github.com/Captain-ALM/" + LinkedIn: "https://www.linkedin.com/in/alfred-manville/" about: title: "Alfred Manville (Captain ALM)" content: > @@ -24,14 +24,18 @@ about: I also have a Youtube Channel which is in the process of being resumed from a hiatus.

- On the programming side, I know Visual Basic .net, C# .net, C, Java, Go, Javascript (Circa. 2000 ECMAScript although I am learning the latest version of the language), - Processing and Microsoft Smallbasic (I have also dabbled in C++, Python and Bash/Batch). + On the programming side, I know Visual Basic .net, C# .net, C, Java, Go, Javascript, C++, Python, + Processing and Microsoft Smallbasic (I have also dabbled in 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, however, it is in need of bug-fixing at the moment).

+ My github username is Captain-ALM and has half my public programming projects, + the other half is located at: https://code.mrmelon54.com/alfred +

+

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 @@ -219,3 +223,37 @@ entries: Find the source code here: https://code.mrmelon54.com/alfred/cityuni-webserver

startDate: "13/07/2022" + - name: "Python Communicator" + content: > +

+ After learning python for my portfolio development option, I wanted to showcase what I knew in python. + I usually make a network application in each of the new programming languages that I learn. + For the repo showing me learning python please go to: https://code.mrmelon54.com/alfred/LearningPy +

+

+ This project is a message based network communicator written in python and has a module for networking. + The project allows the sending of text messages and files over a network. + It also comes with a nice twist, in that if you select the pickle protocol, you can inject code into another client by sending a specially crafted message! +

+

+ Find the source code here: https://github.com/Captain-ALM/CALMPyNetworker +

+ startDate: "10/12/2022" + endDate: "10/12/2022" + videoLocation: "resources/stream/vid-pycom.mp4" + videoContentType: "video/mp4" + thumbnailLocations: + - "resources/assets/pycom-1_t.jpg" + - "resources/assets/pycom-2_t.jpg" + - "resources/assets/pycom-3_t.jpg" + - "resources/assets/pycom-4_t.jpg" + imageLocations: + - "resources/assets/pycom-1.jpg" + - "resources/assets/pycom-2.jpg" + - "resources/assets/pycom-3.jpg" + - "resources/assets/pycom-4.jpg" + imageAltTexts: + - "Text Messaging." + - "File Messaging." + - "Exploit Testing." + - "Failed Exploit Testing." diff --git a/index.js b/index.js index 19b5d40..9ee1de0 100644 --- a/index.js +++ b/index.js @@ -186,10 +186,10 @@ function EntrySort(o, s) { SortValue = s } if (chg || OrderValue !== o) { - if (ts === "desc" || ts === "descending") { - ts = -1 - } else { + if (ts === "asc" || ts === "ascending") { ts = 1 + } else { + ts = -1 } var to = o.toString().toLowerCase() if (to === "start") { diff --git a/pageHandler/pages/index/index-page.go b/pageHandler/pages/index/index-page.go index 878dd29..1196073 100644 --- a/pageHandler/pages/index/index-page.go +++ b/pageHandler/pages/index/index-page.go @@ -195,9 +195,9 @@ func (p *Page) getPageData() (*DataYaml, error) { } func getSortValue(toCheckIn string) int8 { - if toCheckIn == "desc" || toCheckIn == "descending" { - return -1 - } else { + if toCheckIn == "asc" || toCheckIn == "ascending" { return 1 + } else { + return -1 } }