diff --git a/about/index.hs b/about/index.hs index ba0e317..d91e73b 100644 --- a/about/index.hs +++ b/about/index.hs @@ -4,13 +4,13 @@ import HtmlGen import Templates lastModified :: String -lastModified = "2018-05-13" +lastModified = "2018-09-19" sitemap :: Sitemap sitemap = baseSitemap aboutUrl `withLastMod` lastModified `withPriority` "0.8" - `withChangeFreq` "weekly" + `withChangeFreq` "monthly" page :: Html page = simplePage "About James" "James" lastModified $ @@ -18,14 +18,20 @@ page = simplePage "About James" "James" lastModified $ %> (h1 %>> "About") %> (h2 %>> "Hello,") %> (p - %>> "I'm James Martin, a student at Hazen High School with an insatiable love of learning. " - %>> "Right now I'm working on a " %> (href githubQiplUrl $ text "fully reversible programming language") - %>> ", and actively studying " %> (href "https://homotopytypetheory.org/" $ text "homotopy type theory") %>> "." + %>> "I'm James Martin, a student at Hazen High School with an insatiable love of learning, " + %>> "programmer, musician, and moderator of " + %> (href "https://reddit.com/r/ProgrammingLanguages/" $ text "/r/ProgrammingLanguages") + %>> ". " + %>> "Right now I'm working on my project " %> (href "https://qipl.org" $ text "Qipl") %>> ", " + %>> "which includes a compiler and bootable development environment. " + %>> "I'm a moderator of " + ) %> (p %>> "When I'm not busy with my head in some books or deep into writing some proof, " %>> "you can find me involved in various school activities. " - %>> "I'm a member of the Hazen Marching Band, and the zero-period jazz band. " + %>> "I'm a member of the Hazen Marching Band, the zero-period jazz band, " + %>> "Film Club, the weekly D&D meetings. " %>> "In addition I write Java for " %> (href "https://github.com/HazenRobotics/" $ text "robotics club") %>> ". " @@ -37,17 +43,14 @@ page = simplePage "About James" "James" lastModified $ %>> "or a challenging slope covered in fresh powder." ) %> (h2 %>> "Accounts" %% ("id", "accounts")) - %> (p %>> "This is intended to be the exhaustive and canonical list of my online accounts. Anything not listed here is not me.") - %> (href "https://github.com/lijerom/" githubMark) - %> (href "https://www.linkedin.com/in/jtmarlijero/" linkedinLogo) - %> (href "https://www.reddit.com/user/lijero" redditLogo) - %> (href "https://www.youtube.com/channel/UCdLV1echQeS2BZxF7uSmubw" youtubeLogo) - %> (href "https://en.wikipedia.org/wiki/User:Lijero" wikipediaLogo) - %> (href "https://webchat.freenode.net/?channels=%23lijero" freenodeLogo) - %> (href "https://stackexchange.com/users/10815798/james-martin" $ img "James Martin's Stack Exchange profile" "https://stackexchange.com/users/flair/10815798.png" %% accountIconClass) + %> (p %>> "This is intended to be the exhaustive and canonical list of my online accounts. Anything not listed here is not me, or no longer active.") + %> (href githubUserUrl githubMark) + %> (href redditUserUrl redditLogo) + %> (href youtubeUserUrl youtubeLogo) + %> (href wikipediaUserUrl wikipediaLogo) + %> stackexchangeProfile %> (h2 %>> "Contact" %% ("id", "contact")) %> (p %>> "You may email me at " %> italic "james@[this website]" %>> ". " - %>> "I may also be found on Freenode as " %> italic "jtmar" %>> ". " - %>> "A PDF of my resume may be found " %> href resumeUrl (text "here") %>> "." + %>> "I may also be found on Freenode as " %> italic "jammar" %>> ". " ) diff --git a/index.hs b/index.hs index e244089..2909158 100644 --- a/index.hs +++ b/index.hs @@ -5,7 +5,7 @@ import Templates import HtmlGen lastModified :: String -lastModified = "2018-05-11" +lastModified = "2018-09-19" sitemap :: Sitemap sitemap = baseSitemap "https://jtmar.me/" @@ -18,6 +18,6 @@ page = simplePage "James Martin" "James" lastModified $ article %> (h1 %>> "Home") %> (p - %>> "Sorry! This site is currently under construction. " - %>> "However, you'll find that some of the other pages are more complete." + %>> "I have not yet released any blog posts. " + %>> "However, the other pages still are a bit more complete. " ) diff --git a/projects/index.hs b/projects/index.hs index 2c36455..8a893a7 100644 --- a/projects/index.hs +++ b/projects/index.hs @@ -4,7 +4,7 @@ import HtmlGen import Templates lastModified :: String -lastModified = "2018-05-11" +lastModified = "2018-09-19" sitemap :: Sitemap sitemap = baseSitemap projectsUrl @@ -21,15 +21,22 @@ page = simplePage "James's Projects" "James" lastModified $ %>> "All of my active programming projects may be found on " %> (href githubUserUrl $ text "my Github page") %>> ". My most notable projects include my work-in-progress programming language " - %> (href (githubQiplProjectUrl "qipl-agda") $ text "Qipl") + %> (href (githubQiplProjectUrl "qipl-asm") $ text "Qipl") %>> " and my contributions to " %> (href (githubUrl ++ "HazenRobotics/ftc_app") $ text "Hazen Robotics") + %>> ". I also have a planned bootable Qipl-based operating system, named " + %> (href (githubQiplProjectUrl "quos-kernel") $ text "Quos") %>> "." ) - %> (h2 %>> "Audiobooks") %> (p - %>> "I am currently working on recording The Grapes of Wrath for my English teacher " - %>> "due to a lack of quality recordings of it. You may find that series in " - %> (href (baseUrl ++ "gow/") $ text "its YouTube playlist") + %>> "In addition, we have the static site generator I wrote for this website, " + %> (href (githubProjectUrl "html-generator") $ text "html-generator") + %>> ", and of course " + %> (href (githubProjectUrl "jtmar.me") $ text "the source code for this website itself") %>> "." ) + %> (h2 %>> "Music") + %> (p + %>> "Writing music is one of my other hobbies. " + %>> "However, I have not yet released anything. " + ) diff --git a/resume.pdf b/resume.pdf deleted file mode 100644 index 67d68cd..0000000 Binary files a/resume.pdf and /dev/null differ diff --git a/templates/src/Templates/Icons.hs b/templates/src/Templates/Icons.hs index 57924f1..eaa2ca8 100644 --- a/templates/src/Templates/Icons.hs +++ b/templates/src/Templates/Icons.hs @@ -82,3 +82,6 @@ freenodeLogoUrl = iconUrl ++ "freenode-logo.svg" freenodeLogo :: Html freenodeLogo = img "Freenode" freenodeLogoUrl %% accountIconClass + +stackexchangeProfile :: Html +stackexchangeProfile = href stackexchangeUserUrl $ img "James Martin's Stack Exchange profile" stackexchangeFlairUrl %% accountIconClass diff --git a/templates/src/Templates/Urls.hs b/templates/src/Templates/Urls.hs index 4abdc2d..0df8341 100644 --- a/templates/src/Templates/Urls.hs +++ b/templates/src/Templates/Urls.hs @@ -25,7 +25,7 @@ githubUrl :: String githubUrl = "https://github.com/" githubUserUrl :: String -githubUserUrl = githubUrl ++ "LijeroM/" +githubUserUrl = githubUrl ++ "jammar/" githubProjectUrl :: String -> String githubProjectUrl name = githubUserUrl ++ name ++ "/" @@ -41,3 +41,18 @@ resumeUrl = baseUrl ++ "resume.pdf" qiplUrl :: String qiplUrl = "https://qipl.org" + +redditUserUrl :: String +redditUserUrl = "https://reddit.com/user/lijero" + +youtubeUserUrl :: String +youtubeUserUrl = "https://www.youtube.com/channel/UC_nCB91N-0zNbFiMoMu6-3w/" + +wikipediaUserUrl :: String +wikipediaUserUrl = "https://en.wikipedia.org/wiki/User:Lijero" + +stackexchangeUserUrl :: String +stackexchangeUserUrl = "https://stackexchange.com/users/10815798/james-martin" + +stackexchangeFlairUrl :: String +stackexchangeFlairUrl = "https://stackexchange.com/users/flair/10815798.png"