.gitlab-ci.yml

@@ -1,44 +1,46 @@
-# image: shockrah/website:latest
-# 
-# stages:
-#   - build
-#   - deploy
-# 
-# 
-# ############## ################## ##############
-# ############## Build Site Content ##############
-# ############## ################## ##############
-# 
-# 
-# build-content:
-#   stage: build
-#   image: shockrah/website:latest
-#   only:
-#     refs:
-#       - master
-#   script:
-#     - cd main-site/ && hugo
-#   artifacts:
-#     expire_in: 1 week
-#     paths:
-#       - main-site/public/
-# 
-# 
-# 
-# ############## ################ ##############
-# ############## Build Site Image ##############
-# ############## ################ ##############
-# 
-# build-image:
-#   stage: deploy
-#   image: docker:stable
-#   services:
-#     - docker:dind
-#   only:
-#     refs:
-#       - master
-#   # Login to registery
-#   before_script:
-#     - docker login -u $DOCKER_USERNAME --password-stdin << $TOKEN
-#   script:
-#     - cd ./main-site/ && docker build . -t $
+image: shockrah/website:latest
+
+stages:
+  - build
+  - deploy
+
+
+############## ################## ##############
+############## Build Site Content ##############
+############## ################## ##############
+
+
+build-content:
+  stage: build
+  image: shockrah/website:latest
+  only:
+    refs:
+      - master
+  script:
+    - cd main-site/ && hugo
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - main-site/public/
+
+
+
+
+############## ################## ##############
+##############     Deploy Site    ##############
+############## ################## ##############
+
+deploy-to-s3:
+  stage: deploy
+  # Override entrypoint to avoid weird auto start shenanigans
+  image:
+    name: amazon/aws-cli:2.2.25
+    entrypoint: [""]
+  needs:
+    - build-content
+  before_script:
+    - bash ci/verify-aws-fields.sh
+  script:
+    # Upload the content to the bucket itself
+    - cd main-site/ && aws s3 cp public s3://temper.tv/ --recursive
+

main-site/.gitignore

@@ -1,10 +1,3 @@
 static/img/13-nov-2023/*.jpg
 static/img/13-nov-2023/*.png
 static/img/13-nov-2023/*.mp4
-
-static/img/04-feb-2024/*jpg
-static/img/04-feb-2024/*png
-
-static/img/float/*png
-static/img/float/*jpg
-static/img/float/*mp4

main-site/content/feed/trinket-making.md

@@ -1,40 +0,0 @@
----
-title: 'Trinket Making'
-description: from doom scrolling to doom sewing
-date: 2024-07-26T17:24:35-07:00
-thumbnail: /img/26-07-2024/qtpi.jpg
-ContentThumbnail: true
-article: true
----
-
-> Quick one here :racing_car: i haven't been documenting anything recently
-
-
-I've somehow found a new hobby of sewing and making random clothing items
-
-As a result I've updated my rave hat with some glitter on the Snoiler Room
-patch since it kept getting lost in the dark and now I'm making an IRL version
-of my 3.7 model's jacket. More simple from a details perspective but still
-something that will be pretty "busy" once it's completely done.
-
-
-> *****Should mention the weird looking smudges on there are from the glue that i 
-more/less**
-
-{{< pic "/img/26-07-2024/jacket-s1.jpg" >}}
-
-
-
-> Here is the Snoiler Rooom patch that I _yassified_
-
-Got glitter everywhere for this one
-
-
-{{< pic "/img/26-07-2024/snoiler.jpg" >}}
-
-> Finally a fun mini patch that I just really like :))))
-
-
-{{< pic "/img/26-07-2024/qtpi.jpg" >}}
-
-

main-site/content/files/_index.md

@@ -1,26 +1 @@
----
-folders:
-  uk-sound-series-2024-02-17:
-    - 'Replay_2024-02-17_19-55-36.mkv'
-    - 'Replay_2024-02-17_19-57-46.mkv'
-    - 'Replay_2024-02-17_20-03-08.mkv'
-    - 'Replay_2024-02-17_20-11-46.mkv'
-    - 'Replay_2024-02-17_20-14-23.mkv'
-    - 'Replay_2024-02-17_20-19-32.mkv'
-    - 'Replay_2024-02-17_20-22-52.mkv'
-    - 'Replay_2024-02-17_20-29-42.mkv'
-    - 'Replay_2024-02-17_20-35-39.mkv'
-    - 'Replay_2024-02-17_20-40-47.mkv'
-    - 'Replay_2024-02-17_20-43-57.mkv'
-    - 'Replay_2024-02-17_20-50-06.mkv'
-    - 'Replay_2024-02-17_20-54-09.mkv'
-    - 'Replay_2024-02-17_20-58-13.mkv'
-    - 'Replay_2024-02-17_21-21-15.mkv'
-    - 'Replay_2024-02-17_21-35-05.mkv'
-    - 'Replay_2024-02-17_21-47-39.mkv'
-    - 'Replay_2024-02-17_21-53-41.mkv'
-    - 'Replay_2024-02-17_21-55-56.mkv'
-    - 'Replay_2024-02-17_21-59-18.mkv'
-
----
 Just some files that I haphazardly link on this one page :))))

main-site/hugo.yaml

@@ -25,6 +25,3 @@ Params:
     - name: Dev Blog
       description: Dev stuff
       uri: /dev
-    - name: Files
-      description: Links to files
-      uri: /files

main-site/static/.well-known/discord

@@ -1 +0,0 @@
-dh=50e1589447a1aa9d7e94c6d582ab7d8ebc222aa0

main-site/themes/temper/layouts/_default/list.html

@@ -7,49 +7,32 @@
       <h5>/feed</h5>
     {{ else if eq .Dir "dev/" }}
       <h5>/dev</h5>
-    {{ else if eq .Dir "files/" }}
-      <h5>/files</h5>
     {{ end }}
   {{ end }}
   <p>{{ .Content }}</p>
   {{ $colors := slice "cyan" "yellow" "pink"}}
-  {{ if hasPrefix $path "files" }}
-    {{ range $folder, $files := .Params.folders }}
-      {{ $opt := mod (len $folder) (len $colors) }}
-      <div class="card" style="border-color: {{ index $colors $opt }}">
-        <h5 class="card-header postcard card-title">{{ $folder }}</h5>
-        {{ range $file := $files }}
-          <ul>
-            <a href={{ print "/files/" $folder "/" $file }}>{{ $file}}</a>
-          </ul>
-        {{ end }}
-      </div>
-    {{ end }}
-  {{ end }}
+  {{ $opts   := len $colors }}
   {{ range $i, $page := .Pages.ByDate.Reverse }}
-    {{ $opt := mod $i (len $colors) }}
-    <div class="card" style="border-color: {{ index $colors $opt }}">
-      <a href="{{ anchorize .Page.Name }}">
-        <h5 class="card-header postcard card-title">
-          {{ .Title }}
-          {{ emojify ":link:" }}
-        </h5>
-      </a>
-      <div class="card-body postcard">
-        {{  if .Page.Params.Article }}
-          <p class="card-text">{{ .Description }}</p>
-        {{ else }}
-          <p class="card-text">{{ .Content }}</p>
-        {{ end }}
-        {{  if .Page.Params.Thumbnail }}
-          <a href="{{ .Params.Thumbnail }}">
-            <img class="card-img" src="{{ .Params.Thumbnail }}">
-          </a>
-        {{ end }}
-      </div>
-      <div class="card-footer text-muted postcard">
-        {{ .Date | time.Format ":date_short" }} {{ .Date | time.Format ":time_long"}}
-      </div>
+  {{ $opt := mod $i $opts }}
+  <div class="card" style="border-color: {{ index $colors $opt }}">
+    <a href="{{ anchorize .Page.Name }}">
+      <h5 class="card-header postcard card-title">{{ .Title }}</h5>
+    </a>
+    <div class="card-body postcard">
+      {{  if .Page.Params.Article }}
+        <p class="card-text">{{ .Description }}</p>
+      {{ else }}
+        <p class="card-text">{{ .Content }}</p>
+      {{ end }}
+      {{  if .Page.Params.Thumbnail }}
+        <a href="{{ .Params.Thumbnail }}">
+          <img class="card-img" src="{{ .Params.Thumbnail }}">
+        </a>
+      {{ end }}
     </div>
+    <div class="card-footer text-muted postcard">
+      {{ .Date | time.Format ":date_short" }} {{ .Date | time.Format ":time_long"}}
+    </div>
+  </div>
   {{ end }}
 {{ end }}