From 055b445b7c9c5faccedf6858ba8c2c0c4993b349 Mon Sep 17 00:00:00 2001 From: Chris Wells Date: Sun, 8 Feb 2026 14:32:59 -0600 Subject: Updated images for employment --- app/Main.hs | 3 +++ data/people.yaml | 3 +++ flake.lock | 26 +++++++++++++------------- flake.nix | 35 ++++++++++++----------------------- src/Prolog.hs | 8 ++++---- templates/default.html | 12 +++++++----- www/contact/index.html | 2 +- www/img/au_logo.png | Bin 0 -> 349655 bytes www/img/chris.jpg | Bin 0 -> 2377781 bytes www/img/cmu_seal.png | Bin 0 -> 185870 bytes www/img/isu_logo.png | Bin 0 -> 142673 bytes www/img/isu_seal.png | Bin 0 -> 149581 bytes www/index.html | 39 ++++++++++++++++++++++----------------- 13 files changed, 65 insertions(+), 63 deletions(-) create mode 100644 www/img/au_logo.png create mode 100644 www/img/chris.jpg create mode 100644 www/img/cmu_seal.png create mode 100644 www/img/isu_logo.png create mode 100644 www/img/isu_seal.png diff --git a/app/Main.hs b/app/Main.hs index 9510471..bce890b 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -49,6 +49,9 @@ main = do -- route $ dropParentRoute 1 -- compile $ minify <<$>> getResourceLBS + match "www/img/**" $ do + route $ dropParentRoute 1 + compile copyFileCompiler let baseCtxt :: Context String baseCtxt = fold $ diff --git a/data/people.yaml b/data/people.yaml index caf26c4..4cbc90e 100644 --- a/data/people.yaml +++ b/data/people.yaml @@ -48,6 +48,9 @@ - name: Enrique Gomez-Leos +- name: Emily Heath + webpage: "https://sites.google.com/view/emilyheath/home" + - name: Owen Henderschedt webpage: "https://www.owenh-math.com/home" diff --git a/flake.lock b/flake.lock index bd92cc8..efbfdd1 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739120049, - "narHash": "sha256-6X+c/vkU4Lxy0dvcpaLD5gGHdLWFQiHhhctNmWhEy2A=", + "lastModified": 1770580651, + "narHash": "sha256-yZ5a0phemTlDkHi9rb550ikDDzmvZM5iWj+RibRVSqg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f73f996c0e3bbf3c49ab15ee52b731db5d56166", + "rev": "0298fc501eb1d7c33c31b5e295cd4494c58983e6", "type": "github" }, "original": { @@ -65,11 +65,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770388997, - "narHash": "sha256-eh56UdQY6NlcB8uMwKaMoXdKtKwjIZYQ7z5ZYM7VDQI=", + "lastModified": 1770582573, + "narHash": "sha256-dmFQ5Wis0XZznnvARSX7kHt+GFl7X9KTWSVchQ8MK1c=", "ref": "refs/heads/master", - "rev": "7bd883e0316cf1a62395b65ce7f5a2bc13768acb", - "revCount": 6, + "rev": "f3ab054aef8cce1fc2b56fec48a20e1764e017a1", + "revCount": 9, "type": "git", "url": "git://git.mathematicaster.org/www/assets.git" }, diff --git a/flake.nix b/flake.nix index 79c9327..447b8b8 100644 --- a/flake.nix +++ b/flake.nix @@ -105,6 +105,18 @@ ${www-main-exe}/bin/www-main deploy ''; }; + mkassets = pkgs.writeShellApplication { + name = "mkassets"; + text = '' + toplevel="$(git rev-parse --show-toplevel)" + cd "$toplevel" + + dir="$toplevel/assets" + rm -rf "$dir" + cp -r "${pkgs.www-assets}" "$dir" + chmod -R +w "$dir" + ''; + }; }; devShells.default = pkgs.haskellPackages.shellFor { @@ -118,29 +130,6 @@ pkgs.haskell-language-server pkgs.zlib pkgs.icu - (pkgs.writeShellApplication { - name = "site-rebuild"; - text = '' - nix run ${self}#www-main-exe -- rebuild "''${@}" - ''; - }) - (pkgs.writeShellApplication { - name = "site-watch"; - text = '' - nix run ${self}#www-main-exe -- watch "''${@}" - ''; - }) - (pkgs.writeShellApplication { - name = "mkassets"; - text = '' - toplevel="$(git rev-parse --show-toplevel)" - cd "$toplevel" - - dir="$toplevel/assets" - rm -rf "$dir" - cp -r "${pkgs.www-assets}" "$dir" - ''; - }) ]; }; }; diff --git a/src/Prolog.hs b/src/Prolog.hs index 1910a78..32f7c61 100644 --- a/src/Prolog.hs +++ b/src/Prolog.hs @@ -241,7 +241,7 @@ instance StringConv Html String where strConv _ = strip . BS.renderHtml where strip :: String -> String - strip = + strip = let d = L.dropWhile C.isSpace in L.reverse . d . L.reverse . d @@ -320,8 +320,8 @@ instance MonadThrow H.Compiler where throwM = throwError . pure . displayException -- | Huh, I guess I need a version bump for this guy? -instance A.FromJSON URI where - parseJSON = A.withText "URI" $ maybe (fail "Invalid URI") pure . parseURI . toSL +-- instance A.FromJSON URI where +-- parseJSON = A.withText "URI" $ maybe (fail "Invalid URI") pure . parseURI . toSL -deriving instance Generic Time.Day +-- deriving instance Generic Time.Day deriving newtype instance Binary Time.Day diff --git a/templates/default.html b/templates/default.html index 878963c..68424ff 100644 --- a/templates/default.html +++ b/templates/default.html @@ -7,11 +7,13 @@ - + - - - + + + + + @@ -41,7 +43,7 @@ Research Teaching Links - Code + Contact CV diff --git a/www/contact/index.html b/www/contact/index.html index 1945684..6c5b967 100644 --- a/www/contact/index.html +++ b/www/contact/index.html @@ -8,7 +8,7 @@ short_title: Contact
- + diff --git a/www/img/au_logo.png b/www/img/au_logo.png new file mode 100644 index 0000000..dfadb08 Binary files /dev/null and b/www/img/au_logo.png differ diff --git a/www/img/chris.jpg b/www/img/chris.jpg new file mode 100644 index 0000000..c2188fb Binary files /dev/null and b/www/img/chris.jpg differ diff --git a/www/img/cmu_seal.png b/www/img/cmu_seal.png new file mode 100644 index 0000000..3c3cd08 Binary files /dev/null and b/www/img/cmu_seal.png differ diff --git a/www/img/isu_logo.png b/www/img/isu_logo.png new file mode 100644 index 0000000..5ff8ca6 Binary files /dev/null and b/www/img/isu_logo.png differ diff --git a/www/img/isu_seal.png b/www/img/isu_seal.png new file mode 100644 index 0000000..f569ad6 Binary files /dev/null and b/www/img/isu_seal.png differ diff --git a/www/index.html b/www/index.html index 18b93c8..300ef63 100644 --- a/www/index.html +++ b/www/index.html @@ -22,52 +22,57 @@ short_title: Chris Wells

Education

- -
+ +
PhD in Algorithms, Combinatorics and Optimization
+ CMU
  • 2020
  • Carnegie Mellon University
  • Major Professor: $personA("Boris Bukh")$
-
+
-
+
MS in Mathematics
+ ISU
  • 2015
  • Iowa State University
  • Major Professor: $personA("Derrick Stolee")$
-
+
-
+
BS in Mathematics
-
    -
  • 2014
    • -
  • Iowa State University
    • -
  • Thesis Adviser: $personA("Steve Butler")$
    • -
-
+ ISU + +

Employment

-
+
Postdoctoral Research Associate
+ AU
  • 2023–Present
  • Auburn University
-
-
+ +
RTG Postdoctoral Research Associate
+ ISU
  • 2020–2023
  • Iowa State University
-
- + +
-- cgit v1.2.3
$workEmail$