Add credits for images and history information.

Add link to Langley Whale Center.
Add history information. Sourced from langleywa.org, as linked.
2024-03-17 17:18:34 +00:00 · 2024-03-17 17:13:28 +00:00 · 2024-03-17 17:12:18 +00:00 · 2024-03-17 16:48:01 +00:00 · 2024-03-16 23:43:01 +00:00 · 2024-03-16 21:25:06 +00:00
12 changed files with 137 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /build/
 /.direnv/
 .DS_Store
+/latex.out/
+built.tar.gz
--- a/base.html
+++ b/base.html
@@ -1,13 +1,15 @@
 <!doctype html>
 <html>
 <head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>{% block title %}{% endblock title %}</title>
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 	<link href="/static/theme.css" rel="stylesheet">
 </head>
 <body>
 	<nav class="navbar navbar-expand-md bg-dark navbar-dark">
-		<a class="navbar-brand ms-2" href="/">
+		<a class="navbar-brand ms-2" href="/home.html">
 			<img src="/static/logo.png" alt="Langley Logo" height="34">
 			Langley
 		</a>
@@ -16,7 +18,7 @@
 		</button>
 		<div class="collapse navbar-collapse" id="nav-collapse">
 			<ul class="navbar-nav">
-				<li class="nav-item ms-2"><a class="nav-link {% block home_active %}{% endblock %}" href="/">Home</a></li>
+				<li class="nav-item ms-2"><a class="nav-link {% block home_active %}{% endblock %}" href="/home.html">Home</a></li>
 				<li class="nav-item ms-2"><a class="nav-link {% block history_active %}{% endblock %}" href="/history.html">History</a></li>
 				<li class="nav-item ms-2"><a class="nav-link {% block visit_active %}{% endblock %}" href="/visit.html">Visit</a></li>
 			</ul>
--- a/flake.nix
+++ b/flake.nix
@@ -18,6 +18,9 @@
          simple-http-server
          watchexec
          (python3.withPackages (ps: with ps; [jinja2]))
+          latexrun
+          texlive.combined.scheme-full
+          ansifilter
        ];
      };
    });
--- a/31
+++ b/31
@@ -19,3 +19,34 @@ serve: build
 watch:
 	watchexec --restart -- just serve

+log:
+	#!/usr/bin/env bash
+	set -exuo pipefail
+	{
+		cat <<EOP
+	\documentclass{article}
+	\usepackage[utf8]{inputenc}
+	\usepackage{color}
+	\usepackage[margin=0.25in]{geometry}
+	\usepackage{hyperref}
+	\newcommand{\ws}[1]{\textcolor[rgb]{0,0,0}{#1}}
+
+	\DeclareUnicodeCharacter{22EE}{│}
+	\usepackage{pmboxdraw}
+
+	\begin{document}
+	\ttfamily
+	\section*{}
+	EOP
+		git log -p --format=tformat:'(((RULE)))%h: %s%nBy %aN <%aE> at %ai%n%b%n' -n 5 \
+		| delta --light -w 110 --plus-style '"#339933" bold' --plus-emph-style '"#339933"' --minus-style 'red bold' --minus-emph-style 'red'  --zero-style 'gray dim' --no-gitconfig --line-numbers --syntax-theme none \
+		| ansifilter --latex -f \
+		| sed -e '0,/(((RULE)))/s///' -e 's/(((RULE)))/\\hrule\n\\section*{}/g'
+		echo '\hrule'
+		echo '\end{document}'
+	} > build/commits.tex 
+	latexrun -o build/commits.pdf build/commits.tex
+	rm build/commits.tex
+
+codio: build log
+	tar c build/ | gzip > built.tar.gz
--- a/pages/history.html
+++ b/pages/history.html
@@ -2,4 +2,19 @@
 {% block title %}History{% endblock %}
 {% block history_active %}active{% endblock %}
 {% block main %}
+<div class="container mt-3">
+  <p>
+    Langley was founded by Jacob Anthes, a German who moved to and bought land
+    in the area in 1881. In 1890, he gave his land to the newly-formed Langley
+    Land and Improvement Company, which officially founded the town of Langley
+    in 1891. A dock was soon built, along with a general store and post office
+    run by Jacob Anthes. In 1898, the school district was founded.
+  </p>
+  <p>
+    Langley was incorporated as a self-governing town in 1913, and a fire station
+    and a jail were soon constructed.
+  </p>
+  Information from <a href="https://www.langleywa.org/visitors/history_of_langley.php">Langley's official history page</a>.
+  See there for more information.
+</div>
 {% endblock %}
--- a/pages/home.html
+++ b/pages/home.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{% block title %}Home{% endblock %}
+{% block home_active %}active{% endblock %}
+{% block main %}
+<div class="container-fluid bg-dark text-light text-center">
+  <hr class="my-0">
+  <div class="pt-4 pb-2">
+    <h1 class="display-1">Langley</h1>
+    <span class="fst-italic">The Village by The Sea</span>
+    <p>Founded in 1891</p>
+  </div>
+</div>
+<main class="pt-2 container">
+  <p>Langley is a small town on Whidbey Island in Washington, USA.</p>
+  <p>As of the 2020 Census, the population was 1147.</p>
+</main>
+<div class="container-md mt-2 text-end">
+  <iframe
+    src="https://www.openstreetmap.org/export/embed.html?bbox=-127.02392578125001%2C46.32796494040748%2C-117.79541015625001%2C49.688954878870305&amp;layer=mapnik&amp;marker=48.035855735787315%2C-122.40966796875"
+    style="height: 50vh; width: 100%;"
+  ></iframe>
+    <a href="https://www.openstreetmap.org/?mlat=48.036&amp;mlon=-122.410#map=8/48.036/-122.410"><small>View Larger Map</small></a>
+</div>
+{% endblock %}
--- a/pages/index.html
+++ b/pages/index.html
@@ -1,20 +1 @@
 {% extends "base.html" %}
-{% block title %}Home{% endblock %}
-{% block home_active %}active{% endblock %}
-{% block main %}
-<div class="container-fluid bg-dark text-light text-center">
-  <hr class="my-0">
-  <div class="py-4">
-    <h1 class="display-1">Langley</h1>
-    <span class="fst-italic">The Village by The Sea</span>
-    <br><span>Incorporated 1913</span>
-  </div>
-</div>
-<div class="container-md mt-2 text-end">
-  <iframe
-    src="https://www.openstreetmap.org/export/embed.html?bbox=-127.02392578125001%2C46.32796494040748%2C-117.79541015625001%2C49.688954878870305&amp;layer=mapnik&amp;marker=48.035855735787315%2C-122.40966796875"
-    style="height: 50vh; width: 100%;"
-  ></iframe>
-    <a href="https://www.openstreetmap.org/?mlat=48.036&amp;mlon=-122.410#map=8/48.036/-122.410"><small>View Larger Map</small></a>
-</div>
-{% endblock %}
--- a/pages/visit.html
+++ b/pages/visit.html
@@ -2,5 +2,36 @@
 {% block title %}Visit{% endblock %}
 {% block visit_active %}active{% endblock %}
 {% block main %}
+<div class="container-md mt-3">
+  <div class="row justify-content-around">
+    <div class="col-md-7 align-self-center">
+      The annual Mystery Weekend at the end of February is a great way
+      to explore Langley as many locals take on roles in the mystery and
+      businesses hand out clues. There are also prizes to be won for guessing
+      the murderer correctly.
+    </div>
+    <div class="col-md-5">
+      <figure class="figure container">
+        <img src="static/mysteryposter.jpg" alt="The poster for the 2024 Mystery Weekend" class="figure-img img-fluid visit-img">
+        <figcaption class="figure-caption">The poster for the 2024 Mystery Weekend, courtesy Langley Chamber of Commerce</figcaption>
+      </figure>
+    </div>
+  </div>
+  <div class="row justify-content-around">
+    <div class="col-md-5">
+      <figure class="figure container">
+        <img src="static/orcas.jpg" alt="Orcas resident near Whidbey Island" class="figure-img img-fluid visit-img">
+        <figcaption class="figure-caption">Orcas resident near Whidbey Island, courtesy NOAA</figcaption>
+      </figure>
+    </div>
+    <div class="col-md-7 align-self-center">
+      The annual Welcome the Whales festival in April and the
+      <a href="https://www.orcanetwork.org/langley-whale-center">Langley Whale Center</a>
+      celebrate the cetaceans in the Puget Sound around Whidbey Island. These are
+      primarily orcas, but there is a small pod of grey whales inhabiting the area,
+      and humpbacks can sometimes be seen.
+    </div>
+  </div>
+</div>
 {% endblock %}

--- a/readme.md
+++ b/readme.md
@@ -0,0 +1,23 @@
+# CS1534CA3
+Benjamin Soroos, Student ID 52317014
+
+## Design Decisions
+I didn't decide to do anything particularly unusual with regard to layout or
+navigation - a static navbar, collapsing on mobile, is possibly the most common
+form of responsive navigation, and the required 7:5 columnar layout on the visit
+page ended up being a quite typical way of attaching images to small paragraphs
+of text.
+
+As I have very little ability to judge the aesthetics of color combinations, I
+used a single background/accent color, which is the purple used by the city of
+Langely on their website and elsewhere.
+
+## Challenges Faced
+I didn't face any particular technical challenges, but judging aesthetics proved
+quite difficult (not at all surprisingly). I'm still unsure if the banner on the
+home page qualifies as 'attention-grabbing'.
+
+Also, 'static map' didn't seem to be well-defined, so for that reason and
+because it's difficult to find a single scale of map which usefully shows the
+location of Langley to people unfamiliar with maps of the Pacific North-West, I
+inserted a dynamic map instead.
--- a/static/mysteryposter.jpg
+++ b/static/mysteryposter.jpg
--- a/static/orcas.jpg
+++ b/static/orcas.jpg
--- a/static/theme.css
+++ b/static/theme.css
@@ -2,3 +2,7 @@
 	--bs-dark: #270042;
 	--bs-dark-rgb: 39, 0, 66; 
 }
+
+.visit-img {
+	max-height: 300px;
+}
Author	SHA1	Message	Date
Ben Soroos	f3ae22aa5b	Add credits for images and history information.	2024-03-17 17:18:34 +00:00
Ben Soroos	760d5c9d34	Add link to Langley Whale Center.	2024-03-17 17:13:28 +00:00
Ben Soroos	a86ce6a88e	Add history information. Sourced from langleywa.org, as linked.	2024-03-17 17:12:18 +00:00
Ben Soroos	92644fc56d	Add readme.md with name, student id, design decisions, and challenges faced	2024-03-17 16:48:01 +00:00
Ben Soroos	84ac0c306d	Further tooling: commit log generation & copy in codio	2024-03-16 23:43:01 +00:00
Ben Soroos	5b5135f134	Initial Visit content - Annual Mystery Weekend - Whales Also add population to home.	2024-03-16 21:25:06 +00:00
Ben Soroos	8f0a17764f	Switch index to home.html, add blank index New information on the requirements - a separate index.html is required.	2024-03-14 15:18:23 +00:00
Ben Soroos	be2e90d182	Add responsiveness meta and charset	2024-03-12 12:34:02 +00:00
Ben Soroos	05b83025a1	Use more appropriate element for new line of text	2024-03-12 12:26:27 +00:00