added merch

UWCS · May 1, 2024 · 02a2dfe · 02a2dfe
1 parent 3f6883d
commit 02a2dfe
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 32 deletions.
diff --git a/content/merch/_index.md b/content/merch/_index.md
@@ -7,7 +7,7 @@ page_template = "merch_page.html"
 
 [extra]
 hide = true
-start = "2024-05-06T18:00:00+01:00"
+start = "2024-05-03T18:00:00+01:00"
 end = "2024-05-10T23:59:59+01:00"
 preview = true
 +++

diff --git a/content/merch/accessories/deskmats/index.md b/content/merch/accessories/deskmats/index.md
@@ -3,7 +3,7 @@ title = "Desk Mats"
 
 [extra]
 price = "30.05"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274100/"
 
 +++
 

diff --git a/content/merch/accessories/ducks/duck.png b/content/merch/accessories/ducks/duck.png
diff --git a/content/merch/accessories/ducks/index.md b/content/merch/accessories/ducks/index.md
@@ -3,7 +3,7 @@ title = "Rubber Duck"
 
 [extra]
 price = "1.71"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274130/"
 
 +++
 

diff --git a/content/merch/accessories/lanyards/index.md b/content/merch/accessories/lanyards/index.md
@@ -3,7 +3,7 @@ title = "Lanyards"
 
 [extra]
 price = "1.70"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274160/"
 
 +++
 

diff --git a/content/merch/accessories/mousemats/index.md b/content/merch/accessories/mousemats/index.md
@@ -3,7 +3,7 @@ title = "Mouse Mats"
 
 [extra]
 price = "25.05"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274110/"
 
 +++
 

diff --git a/content/merch/accessories/mousemats/mousemat.png b/content/merch/accessories/mousemats/mousemat.png
diff --git a/content/merch/accessories/mugs/index.md b/content/merch/accessories/mugs/index.md
@@ -3,7 +3,7 @@ title = "Mugs"
 
 [extra]
 price = "6.10"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274090/"
 
 +++
 

diff --git a/content/merch/accessories/stickers/index.md b/content/merch/accessories/stickers/index.md
@@ -3,8 +3,8 @@ title = "Sticker Pack"
 
 [extra]
 price = "1.49"
-link = "https://youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274180/"
 
 +++
 
-Whether you're looking to slap these bad boys on the back of your laptop, want to show off the superiority of "GitHub" on the fridge, or let tech no they've failed at their jobs, now's your chance!
+Whether you're looking to slap these bad boys on the back of your laptop, want to show off the superiority of "GitHub" on the fridge, or let tech know they've failed at their jobs, now's your chance!
diff --git a/content/merch/hoodies/pullovers/front.jpg b/content/merch/hoodies/pullovers/front.jpg
diff --git a/content/merch/hoodies/pullovers/index.md b/content/merch/hoodies/pullovers/index.md
@@ -3,7 +3,7 @@ title = "Pullover Hoodie"
 
 [extra]
 price = "28.10"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274140/"
 
 +++
 

diff --git a/content/merch/hoodies/pullovers/side1.jpg b/content/merch/hoodies/pullovers/side1.jpg
diff --git a/content/merch/hoodies/pullovers/side2.jpg b/content/merch/hoodies/pullovers/side2.jpg
diff --git a/content/merch/hoodies/zippers/index.md b/content/merch/hoodies/zippers/index.md
@@ -2,8 +2,8 @@
 title = "Zipped Hoodie"
 
 [extra]
-price = "30.10"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+price = "35.10"
+link = "https://www.warwicksu.com/shop/product/10274150/"
 
 +++
 

diff --git a/content/merch/other/beanies/index.md b/content/merch/other/beanies/index.md
@@ -2,9 +2,9 @@
 title = "Beanies"
 
 [extra]
-price = "12.80"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+price = "9.45"
+link = "https://www.warwicksu.com/shop/product/10274190/"
 
 +++
 
-Warming the noggin
+Warming the noggin'
diff --git a/content/merch/other/quarterzips/index.md b/content/merch/other/quarterzips/index.md
diff --git a/content/merch/other/socks/index.md b/content/merch/other/socks/index.md
@@ -3,12 +3,10 @@ title = "Programming Socks"
 
 [extra]
 price = "1.96"
-link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+link = "https://www.warwicksu.com/shop/product/10274170/"
 
 +++
 
-OwO what's this?
-
 Unleash your full programming potential with these lovely, colour-coordinated, thigh-high socks! Guaranteed to increase your mark by at least 10* percentage points across all modules. They only come in a single size, but they are quite stretchy.
 
 *may not actually increase grades, we haven't done a scientific study (noone was aviailable to be the control as everyone already had them)

diff --git a/content/merch/other/tshirts/blackshirt.png b/content/merch/other/tshirts/blackshirt.png
diff --git a/content/merch/other/tshirts/greyshirt.png b/content/merch/other/tshirts/greyshirt.png
diff --git a/content/merch/other/tshirts/whiteshirt.png b/content/merch/other/tshirts/whiteshirt.png
diff --git a/content/resources/docker.md b/content/resources/docker.md
@@ -68,15 +68,15 @@ That's the short version, see <https://docs.docker.com/get-started/> for more: t
 Create a file called `Dockerfile` (case sensitive), which is where the description of our container image will go. We’ll create our Dockerfile line by line.
 
 The first line is
-```docker
+```dockerfile
 FROM python:3.9
 ```
 
 Here, we give Docker a name of another image that we want to use as a base for our image. We’re using the Python one from Docker hub: <https://hub.docker.com/_/python>, version 3.9. Docker hub is container registry, where people publish images for others to use.
 
 The next thing we want to do is install pipenv so we can use it within our container. Remember that container builds are isolated from the rest of the system, so any tools we want to use we need to install in our container:
 
-```docker
+```dockerfile
 RUN pip install pipenv
 ```
 
@@ -102,14 +102,14 @@ RUN pipenv install --system
 
 We’ve set up everything we need for our app, so now we tell Docker how to run it. The `CMD` command tells the container how to start the process when we do `docker run`. We want to use gunicorn to start our flask app as a HTTP server. We do this instead of using the development server, because using the development server for production is [bad](https://stackoverflow.com/questions/12269537/is-the-server-bundled-with-flask-safe-to-use-in-production)
 
-```docker
+```dockerfile
 CMD gunicorn app:app -b 0.0.0.0:8080
 ```
 
 We tell gunicorn to run `app:app`, which means the Flask application called `app` within the file `app` that we created (confusing, I know). We also tell it to listen for connections from on  `0.0.0.0:8080`, which means the server will accept connections on port `8080`.
 
 Your complete dockerfile should look like this:
-```docker
+```dockerfile
 FROM python:3.9
 RUN pip install pipenv
 WORKDIR /app

diff --git a/themes/uwcs b/themes/uwcs
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ title = "Desk Mats" @@
     [extra]
     price = "30.05"
-    link = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+    link = "https://www.warwicksu.com/shop/product/10274100/"
     +++
@@ Expand Down @@