aboutsummaryrefslogtreecommitdiff
path: root/dhall/types
diff options
context:
space:
mode:
authorXe Iaso <me@christine.website>2022-11-25 19:01:10 -0500
committerGitHub <noreply@github.com>2022-11-25 19:01:10 -0500
commitcc933b31fd23bb06e95bf41f848a1c99353d44ae (patch)
treeaf8288dbd4db2ad886d6b326bffb1c9d5b568de3 /dhall/types
parent551e0384c923ff3ee98cfddf7e3eb42c6dbb2941 (diff)
downloadxesite-cc933b31fd23bb06e95bf41f848a1c99353d44ae.tar.xz
xesite-cc933b31fd23bb06e95bf41f848a1c99353d44ae.zip
Start version 3 (#573)
* Start version 3 * Change version to 3.0.0 in Cargo.toml * Add metadata for series * Change types for signal boosts * Add start of LaTeX resume generation at Nix time * Add start of proper author tagging for posts in JSONFeed and ldjson * Convert templates to use Maud * Add start of dynamic resume generation from dhall * Make patrons page embed thumbnails TODO: * [ ] Remove the rest of the old templates * [ ] Bring in Xeact for the share on mastodon button * [ ] Site update post Signed-off-by: Xe <me@christine.website> * fix nix builds Signed-off-by: Xe Iaso <me@christine.website> * fix dhall build Signed-off-by: Xe Iaso <me@christine.website> * fix non-flakes build Signed-off-by: Xe Iaso <me@christine.website> * make new mastodon share button Signed-off-by: Xe Iaso <me@christine.website> * remove the rest of the ructe templates that I can remove Signed-off-by: Xe Iaso <me@christine.website> * refactor blogposts to its own file Signed-off-by: Xe Iaso <me@christine.website> * move resume to be generated by nix Signed-off-by: Xe Iaso <me@christine.website> * write article Signed-off-by: Xe Iaso <me@christine.website> * blog/site-update-v3: hero image Signed-off-by: Xe Iaso <me@christine.website> * add site update series tag to site updates Signed-off-by: Xe Iaso <me@christine.website> Signed-off-by: Xe <me@christine.website> Signed-off-by: Xe Iaso <me@christine.website>
Diffstat (limited to 'dhall/types')
-rw-r--r--dhall/types/Author.dhall16
-rw-r--r--dhall/types/Config.dhall18
-rw-r--r--dhall/types/Link.dhall4
-rw-r--r--dhall/types/Person.dhall25
-rw-r--r--dhall/types/Resume.dhall10
-rw-r--r--dhall/types/SeriesDescription.dhall3
-rw-r--r--dhall/types/package.dhall1
7 files changed, 45 insertions, 32 deletions
diff --git a/dhall/types/Author.dhall b/dhall/types/Author.dhall
index dc0b1c3..79cab6c 100644
--- a/dhall/types/Author.dhall
+++ b/dhall/types/Author.dhall
@@ -1,19 +1,19 @@
{ Type =
{ name : Text
, handle : Text
- , picUrl : Optional Text
- , link : Optional Text
- , twitter : Optional Text
- , default : Bool
+ , image : Optional Text
+ , url : Optional Text
+ , sameAs : List Text
+ , jobTitle : Text
, inSystem : Bool
}
, default =
{ name = ""
, handle = ""
- , picUrl = None Text
- , link = None Text
- , twitter = None Text
- , default = False
+ , image = None Text
+ , url = None Text
+ , sameAs = [] : List Text
+ , jobTitle = ""
, inSystem = False
}
}
diff --git a/dhall/types/Config.dhall b/dhall/types/Config.dhall
index 3934a11..914c89a 100644
--- a/dhall/types/Config.dhall
+++ b/dhall/types/Config.dhall
@@ -4,8 +4,14 @@ let Author = ./Author.dhall
let Job = ./Job.dhall
+let Link = ./Link.dhall
+
let NagMessage = ./NagMessage.dhall
+let SeriesDescription = ./SeriesDescription.dhall
+
+let Prelude = ../Prelude.dhall
+
let defaultPort = env:PORT ? 3030
let defaultWebMentionEndpoint =
@@ -14,16 +20,22 @@ let defaultWebMentionEndpoint =
in { Type =
{ signalboost : List Person.Type
- , authors : List Author.Type
+ , defaultAuthor : Author.Type
+ , authors : Prelude.Map.Type Text Author.Type
, port : Natural
, clackSet : List Text
, resumeFname : Text
, webMentionEndpoint : Text
, miToken : Text
, jobHistory : List Job.Type
+ , seriesDescriptions : List SeriesDescription.Type
+ , seriesDescMap : Prelude.Map.Type Text Text
+ , notableProjects : List Link.Type
+ , contactLinks : List Link.Type
}
, default =
{ signalboost = [] : List Person.Type
+ , defaultAuthor = Author::{=}
, authors = [] : List Author.Type
, port = defaultPort
, clackSet = [ "Ashlynn" ]
@@ -31,5 +43,9 @@ in { Type =
, webMentionEndpoint = defaultWebMentionEndpoint
, miToken = "${env:MI_TOKEN as Text ? ""}"
, jobHistory = [] : List Job.Type
+ , seriesDescriptions = [] : List SeriesDescription.Type
+ , seriesDescMap = [] : Prelude.Map.Type Text Text
+ , notableProjects = [] : List Link.Type
+ , contactLinks = [] : List Link.Type
}
}
diff --git a/dhall/types/Link.dhall b/dhall/types/Link.dhall
index 443e0a6..153767f 100644
--- a/dhall/types/Link.dhall
+++ b/dhall/types/Link.dhall
@@ -1 +1,3 @@
-{ Type = { url : Text, title : Text }, default = { url = "", title = "" } }
+{ Type = { url : Text, title : Text, description : Text }
+, default = { url = "", title = "", description = "" }
+}
diff --git a/dhall/types/Person.dhall b/dhall/types/Person.dhall
index cee28f1..3d6033e 100644
--- a/dhall/types/Person.dhall
+++ b/dhall/types/Person.dhall
@@ -1,21 +1,6 @@
-{ Type =
- { name : Text
- , tags : List Text
- , gitLink : Optional Text
- , twitter : Optional Text
- , linkedin : Optional Text
- , fediverse : Optional Text
- , coverLetter : Optional Text
- , website : Optional Text
+let Link = ./Link.dhall
+
+in { Type = { name : Text, tags : List Text, links : List Link.Type }
+ , default =
+ { name = "", tags = [] : List Text, links = [] : List Link.Type }
}
-, default =
- { name = ""
- , tags = [] : List Text
- , gitLink = None Text
- , twitter = None Text
- , linkedin = None Text
- , fediverse = None Text
- , coverLetter = None Text
- , website = None Text
- }
-}
diff --git a/dhall/types/Resume.dhall b/dhall/types/Resume.dhall
index 20f365f..6331100 100644
--- a/dhall/types/Resume.dhall
+++ b/dhall/types/Resume.dhall
@@ -2,11 +2,15 @@ let Location = ./Location.dhall
let Link = ./Link.dhall
+let Job = ./Job.dhall
+
in { Type =
{ name : Text
, tagline : Text
, location : Location.Type
- , hnLinks : List Link.Type
+ , buzzwords : List Text
+ , jobs : List Job.Type
+ , notablePublications : List Link.Type
}
, default =
{ name = "Xe Iaso"
@@ -16,6 +20,8 @@ in { Type =
, stateOrProvince = "ON"
, country = "CAN"
}
- , hnLinks = [] : List Link.Type
+ , buzzwords = [] : List Text
+ , jobs = [] : List Job.Type
+ , notablePublications = [] : List Link.Type
}
}
diff --git a/dhall/types/SeriesDescription.dhall b/dhall/types/SeriesDescription.dhall
new file mode 100644
index 0000000..9c922c6
--- /dev/null
+++ b/dhall/types/SeriesDescription.dhall
@@ -0,0 +1,3 @@
+{ Type = { name : Text, details : Text }
+, default = { name = "", details = "" }
+}
diff --git a/dhall/types/package.dhall b/dhall/types/package.dhall
index d64d9b9..4f4166e 100644
--- a/dhall/types/package.dhall
+++ b/dhall/types/package.dhall
@@ -8,6 +8,7 @@
, Person = ./Person.dhall
, Resume = ./Resume.dhall
, Salary = ./Salary.dhall
+, SeriesDescription = ./SeriesDescription.dhall
, Stock = ./Stock.dhall
, StockKind = ./StockKind.dhall
}