Merge pull request #3 from oofsauce/improved_assets

Improved assets
alanpq · Apr 18, 2022 · a0f8ea4 · a0f8ea4
2 parents 0ca1777 + af22417
commit a0f8ea4
Show file tree

Hide file tree

Showing 42 changed files with 888 additions and 675 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,4 @@
 Cargo.lock
 
 # These are backup files generated by rustfmt
-**/*.rs.bk
-
-
-projects/*
+**/*.rs.bk
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,10 +14,11 @@ path = "src/main.rs"
 actix-web = "3"
 actix-files = "0.4.0"
 log = "0.4.11"
-handlebars = { version = "3.5.1", features = ["dir_source"] }
+simple_logger = "2.1.0"
+handlebars = { version = "4", features = ["dir_source"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sass-rs = "0.2.1"
+rsass = "0.23.4"
 lazy_static = "1.4.0"
 notify = "4.0.15"
 yaml-rust = "0.4.5"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.48
+FROM rust:slim-buster
 
 WORKDIR /website
 RUN chmod -R +rwx .

diff --git a/awards/1_treeprot.yml b/awards/1_treeprot.yml
@@ -0,0 +1,4 @@
+id: tree
+title: CoderDojo Coolest Projects Competition
+date: "2013"
+body: Made a <a href="/projects/tree">game</a>, which won 1st place in the 'Games/Web Apps' category. The competition had 60 projects total across all categories that year.
diff --git a/awards/2_aipo.yml b/awards/2_aipo.yml
@@ -0,0 +1,4 @@
+id: aipo
+title: All Ireland Programming Olympiad (AIPO)
+date: "2014"
+body: 2nd place in the Junior Category at DCU
diff --git a/awards/3_irlcpc1.yml b/awards/3_irlcpc1.yml
@@ -0,0 +1,4 @@
+id: irlcpc1
+title: Irish Collegiate Programming Contest (IrlCPC)
+date: 2015 & 2014
+body: Awarded 3rd place both times with my team of 3 in the Junior Category
diff --git a/awards/4_btyse.yml b/awards/4_btyse.yml
@@ -0,0 +1,4 @@
+id: btyse
+title: BT Young Scientist Exhibition
+date: 01/2016
+body: Created a <a href="/projects/hastyhop">Unity game</a> that won 3rd place in the 'Individual Junior Technology' category, as well as a special award from Broadcom MASTERS International, where I was brought to Phoenix, Arizona as an opportunity to meet other like minded students and observe the Intel International Science and Engineering Fair.
diff --git a/awards/5_irlcpc2.yml b/awards/5_irlcpc2.yml
@@ -0,0 +1,9 @@
+id: irlcpc2
+title: Irish Collegiate Programming Contest (IrlCPC)
+date: 03/2021
+body: 1st place in a group of 3, out of a total of 31 teams. The competition lasted a total of 4 hours, where we solved the problems using Python for convenience.
+links:
+  - href: http://acm.ucc.ie/irlcpc2020.html
+    name: Link to IrlCPC
+  - href: https://twitter.com/uccacm/status/1373392053258829824
+    name: Tweet with scoreboard
diff --git a/awards/6_ieeextreme.yml b/awards/6_ieeextreme.yml
@@ -0,0 +1,4 @@
+id: ieeextreme
+title: IEEExtreme Programming Competition 15.0
+date: 10/2021
+body: Placed top 700 out of 5561 teams. The competition lasted a full 24 hours, with my 2 teammates and I participating for around 8 hours. 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,9 +7,11 @@ services:
       - "8081:9090"
     environment:
       - "DEV=true"
+      - "PATH_ROOT=/website"
+      - "RUST_LOG=debug"
       - "RUST_BACKTRACE=full"
-    volumes:
-      - .:/website
+    # volumes:
+    #   - .:/website
       # - type: bind
       #   source: ./.cargo/
       #   target: /root/.cargo/

diff --git a/src/projects/100_ascii-trace.yml → projects/100_ascii-trace.yml b/src/projects/100_ascii-trace.yml → projects/100_ascii-trace.yml
@@ -1,4 +1,5 @@
 id: ascii-trace
+category: main
 title: ascii-trace
 github: https://github.com/oofsauce/ascii-trace
 description: "ASCII ray tracer written in Rust."

diff --git a/src/projects/101_website.yml → projects/101_website.yml b/src/projects/101_website.yml → projects/101_website.yml
@@ -1,4 +1,5 @@
 id: website
+category: main
 title: website
 github: https://github.com/oofsauce/website
 url: https://alanp.me/

diff --git a/src/projects/103_hastyhop.yml → projects/103_hastyhop.yml b/src/projects/103_hastyhop.yml → projects/103_hastyhop.yml
@@ -1,4 +1,5 @@
 id: hastyhop
+category: archive
 title: Hasty Hop
 description: "Unity Game made for the BTYSTE."
 body: "<p>Written in C#, released on the Apple App store in 2015, was available for ~3 years.</p>"
diff --git a/src/projects/104_tree.yml → projects/104_tree.yml b/src/projects/104_tree.yml → projects/104_tree.yml
@@ -1,4 +1,5 @@
 id: tree
+category: archive
 title: Tree Protectors
 description: "A small game made in 2013."
 body: "<p>Written in GameMaker's scripting language GML, this game was made for the CoderDojo Coolest Projects Competition.</p>"
diff --git a/src/projects/99_pitch-test.yml → projects/99_pitch-test.yml b/src/projects/99_pitch-test.yml → projects/99_pitch-test.yml
@@ -1,4 +1,5 @@
 id: pitch-test
+category: main
 title: Interval Quiz
 description: "Small project to learn the Web Audio API"
 body: "<p>Served via a barebones express server, and all static files compiled with <a href='https://gulpjs.com/'>Gulp</a></p>"

diff --git a/projects/categories.yml b/projects/categories.yml
@@ -0,0 +1,7 @@
+categories:
+  - 
+    name: main
+    hidden: true
+  -
+    name: archive
+    blurb: really really old projects
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1 @@
+tab_spaces = 4