diff --git a/about/index.hs b/about/index.hs index 94c251b..a3274d0 100644 --- a/about/index.hs +++ b/about/index.hs @@ -4,7 +4,7 @@ import HtmlGen import Templates lastModified :: String -lastModified = "2018-09-19" +lastModified = "2018-09-22" sitemap :: Sitemap sitemap = baseSitemap aboutUrl @@ -16,39 +16,43 @@ page :: Html page = simplePage "About James" "James" lastModified $ article %> (h1 %>> "About") - %> (h2 %>> "Hello,") + %> (h2 %% ("id", "bio") %>> "Hello,") %> (p - %>> "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 James T Martin, also known as " %> italic "jtmar" %>> " or " %> italic "jammar" %>> ". " + %>> "Music is my passion, and programming is my hobby. " + %>> "I enjoy hiking and skiing. " + %>> "I value honesty, simplicity, and independence. " + %>> "I dislike materialism, arrogance, and dogmatic thinking, " + %>> "and seek to banish these traits from myself. " + %>> "I have many flaws, but try to make an improvement in myself every day, " + %>> "so that I might live life to its fullest. " ) %> (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, 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") - %>> ". " - ) - %> (p - %>> "When the outdoors call you'll find me hiking or skiing. " - %>> "There isn't anywhere quite like a mountaintop in clear weather, " - %>> "a crystal-clear alpine lake, " - %>> "or a challenging slope covered in fresh powder." + %>> "I am a member of my school marching band, jazz band, robotics club, and film club. " + %>> "I am a moderator of " + %> (href "https://reddit.com/r/ProgrammingLanguages/" $ text "/r/ProgrammingLanguages") %>> ". " + %>> "I also work on my various projects, which are listed " %> (href projectsUrl $ text "here") %>> ". " ) %> (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, or no longer active.") + %> (p %>> "These are the places I am active on the internet.") %> (href githubUserUrl githubMark) - %> (href redditUserUrl redditLogo) %> (href youtubeUserUrl youtubeLogo) - %> (href wikipediaUserUrl wikipediaLogo) - %> stackexchangeProfile + %> (href redditUserUrl redditLogo) +-- %> stackexchangeProfile + %> (p %>> "I am not on any social networking sites. Do not mistake any accounts for mine!") %> (h2 %>> "Contact" %% ("id", "contact")) + %> (h3 %>> "Email" %% ("id", "email")) + %> (p %> italic "james@[this website]" %>> ". ") + %> (h3 %>> "IRC" %% ("id", "irc")) %> (p - %>> "You may email me at " %> italic "james@[this website]" %>> ". " - %>> "I may also be found on Freenode as " %> italic "jammar" %>> ". " + %>> "I am on freenode as " %> italic "jammar" %>> ". " + %>> "If you want to hang out, drop by in " %> italic "#lijero" %>> ". " + %>> "Just because I am connected does not mean I am online, " + %>> "so please do not expect an immediate reply. " + %> unorderedList + [ href "http://webchat.freenode.net/?channels=%23lijero" $ text "Freenode webchat." + , href "ircs://chat.freenode.net/lijero" $ text "An IRCS link." + , href "https://hexchat.github.io/" $ text "HexChat download." + , text "For connecting via a phone, go download an app. " + ] ) diff --git a/contact/index.hs b/contact/index.hs deleted file mode 100644 index 6eb446f..0000000 --- a/contact/index.hs +++ /dev/null @@ -1,84 +0,0 @@ -module Page where - -import HtmlGen -import Templates - -lastModified :: String -lastModified = "2018-09-19" - -sitemap :: Sitemap -sitemap = baseSitemap aboutUrl - `withLastMod` lastModified - `withPriority` "0.2" - `withChangeFreq` "monthly" - -page :: Html -page = simplePage "Contact James" "James" lastModified $ - article - %> (h1 %>> "Contact Me") - %> (h2 %>> "How " %> (newTag "em" %>> "not") %>> " to contact me") - %> (p - %>> "Contacting me is very straightforward, " - %>> "but first I must clarify how not to contact me. " - %> unorderedList - [ text "I do not use social media like Facebook or Twitter. " - , text "I do not use proprietary chats like Discord or Skype. " - , text "I do not carry a phone, so no calls or texts. " - , text "I do not accept letters, even hand-written ones." - ] - ) - %> (h2 %>> "How to actually contact me") - %> (h3 %>> "Email") - %> (p - %> italic "james@[this website]" %>> ". " - ) - %> (h3 %>> "IRC") - %> (p - %>> "IRC is the only option to chat with me in real-time. " - %>> "I am exclusively on " %> bold "freenode" %>> ", " - %>> "under either " - %> italic "jammar" %>> " or " %> italic "jtmar" %>> ". " - ) - %> (p - %> italic "#lijero" %>> " is my hangout chat. " - %>> "Feel free to invite your friends too, though do be discerning in your choices. " - ) - %> (h4 %>> "IRC FAQ") - %> (p - %> unorderedList - [ text "How do I send images or media? You can't." - , text "How do I send emoji? You tell me ;)" - , text "Why isn't anyone responding? Be patient." - , text "How do I PM you? /query jammar" - , text "How do I join your channel? /join #lijero" - , text "Why am I named `Guest`? Because you didn't pick a unique nickname, try /nick SomeOtherName." - ] - ) - %> (h4 %>> "Connecting to Freenode") - %> (p - %>> "Make sure you pick a unique nickname when connecting. " - %>> "If it wasn't unique, you will be renamed to Guest1234. " - %>> "You can try again using /nick SomeOtherName. " - %> unorderedList - [ href "http://webchat.freenode.net/?channels=%23lijero" $ text "link to freenode webchat #lijero" - , href "ircs://chat.freenode.net/lijero" $ text "a direct ircs link if your browser supports it" - , href "https://hexchat.github.io/" $ text "a downloadable IRC client, HexChat" - , text "For connecting via a phone, go download an app. " - ] - ) - %> (p - %>> "If you want to get messages people send when you're offline, " - %>> "just let me know and I can set you up with my ZNC bouncer. " - ) - %> (h3 %>> "Reddit") - %> (p - %>> "This certainly isn't my preferred method, " - %>> "but feel free to PM " - %> (href redditUserUrl $ text "my reddit account") %>> "." - ) - %> (h3 %>> "Voice chat") - %> (p - %>> "If you want to hear my beautiful voice, " - %>> "just let me know and I can set up Mumble or something. " - %>> "For now though, you can't voice chat with me. " - ) diff --git a/index.hs b/index.hs index 2909158..6e13e6d 100644 --- a/index.hs +++ b/index.hs @@ -5,7 +5,7 @@ import Templates import HtmlGen lastModified :: String -lastModified = "2018-09-19" +lastModified = "2018-09-22" sitemap :: Sitemap sitemap = baseSitemap "https://jtmar.me/" @@ -18,6 +18,7 @@ page = simplePage "James Martin" "James" lastModified $ article %> (h1 %>> "Home") %> (p - %>> "I have not yet released any blog posts. " + %>> "I have not yet released any blog posts, " + %>> "or even finished the page generator to be able to make them. " %>> "However, the other pages still are a bit more complete. " ) diff --git a/projects/index.hs b/projects/index.hs index 8a893a7..8a2d718 100644 --- a/projects/index.hs +++ b/projects/index.hs @@ -15,28 +15,42 @@ sitemap = baseSitemap projectsUrl page :: Html page = simplePage "James's Projects" "James" lastModified $ article - %> (h1 %>> "Projects") - %> (h2 %>> "Programming") + %> (h1 %% ("id", "projects") %>> "Projects") + %> (h2 %% ("id", "programming") %>> "Programming") + %> (h3 %>> "QIPL") %> (p - %>> "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-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") - %>> "." + %>> "QIPL Is a Programming Language, among other things. " + %>> "It is intended to be the embodiment of my programming philosophy: " + %>> "simple sucks less. " + %>> "More information can be found on " + %> (href qiplUrl $ text "its website") %>> ". " + ) + %> (h3 %>> "Hazen Robotics") + %> (p + %>> "I am a programmer for the Hazen Robotics team. " + %>> "All of our code can be found " + %> (href (githubUrl ++ "HazenRobotics/") $ text "our GitHub organization") %>> ". " + ) + %> (h3 %>> "html-generator") + %> (p + %>> "This website was written using a static site generator I wrote myself. " + %>> "It's got a really, really long way to go, but you can watch it develop " + %> (href (githubProjectUrl "html-generator") $ text "on GitHub") %>> ". " ) %> (p - %>> "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") + %>> "There's also the source code for both " + %> (href (githubProjectUrl "jtmar.me") $ text "jtmar.me") + %>> " and " + %> (href (githubQiplProjectUrl "qipl.org") $ text "qipl.org") %>> "." ) + %> (h3 %>> "Other Projects") + %> (p + %>> "I used to have a whole bunch of other cool projects and games " + %>> "lying around, but they've all been lost in the Great Purge, " + %>> "which I generally regard as one of the worst mistakes I've ever made. " + ) %> (h2 %>> "Music") %> (p - %>> "Writing music is one of my other hobbies. " - %>> "However, I have not yet released anything. " + %>> "Writing music is one of my other hobbies, but I have not yet released anything. " )