diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..92de2b2 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 19.7.0 diff --git a/app.js b/app.js index 8288f3a..cce4da4 100644 --- a/app.js +++ b/app.js @@ -14,8 +14,11 @@ app.set('views', './src/views') app.use(express.static('dist')) +const siteName = "Pronoun Site" + app.get('/', () => { - res.render('home') + const pageTitle = siteName; + res.render('home', { siteName, pageTitle } ) }) app.get('/:nominative/:accusative/:predicative_possessive/:reflexive', (req, res) => { @@ -38,8 +41,11 @@ app.get('/:nominative/:accusative/:pronominal_possessive/:predicative_possessive predicative_possessive: predicativePossessive, reflexive, } = req.params + + const pageTitle = [nominative, accusative, pronominalPossessive, predicativePossessive, reflexive].join("/") + " - " + siteName; + res.render('individual', { - nominative, accusative, pronominalPossessive, predicativePossessive, reflexive + siteName, pageTitle, nominative, accusative, pronominalPossessive, predicativePossessive, reflexive }) }) diff --git a/src/app.css b/src/app.css index b5c61c9..7ffafcd 100644 --- a/src/app.css +++ b/src/app.css @@ -1,3 +1,35 @@ @tailwind base; @tailwind components; @tailwind utilities; + +:root { + --background: #F8FAF9; /* Sage/Light/2 */ + --callout: #ECEFED; /* Sage/Light/4 */ + --stroke: #D7DCDA; /* Sage/Light/7 */ + --text-shout: #164430; /* Green/Dark/6 */ + --text-murmur: #113123; /* Green/Dark/4 */ +} + +body { + background-color: var(--background); + color: var(--text-murmur); + font-family: Manrope, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + font-weight: 500; +} + +h1, h2, h3, h4 { + color: var(--text-shout); + font-weight: 700; +} + +h1 { + font-family: "Redaction", Georgia, 'Times New Roman', Times, serif; +} + +h2 { + font-family: "Redaction 10", Georgia, 'Times New Roman', Times, serif; +} + +footer { + border-color: var(--stroke); +} \ No newline at end of file diff --git a/src/views/home.handlebars b/src/views/home.handlebars index 3a275c6..9ca80a9 100644 --- a/src/views/home.handlebars +++ b/src/views/home.handlebars @@ -1,4 +1,3 @@ -
-

This is going to be such a cool site!

-

Check the readme!

-
+

This is going to be such a cool site!

+

Check the readme!

+ diff --git a/src/views/individual.handlebars b/src/views/individual.handlebars index 8dee023..cee9462 100644 --- a/src/views/individual.handlebars +++ b/src/views/individual.handlebars @@ -1,4 +1 @@ -
-

Individual

- {{nominative}}/{{accusative}}/{{pronominalPossessive}}/{{predicativePossessive}}/{{reflexive}} -
+

{{nominative}}/​{{accusative}}/​{{pronominalPossessive}}/​{{predicativePossessive}}/​{{reflexive}}

diff --git a/src/views/layouts/main.handlebars b/src/views/layouts/main.handlebars index 9bc4aee..8c309f3 100644 --- a/src/views/layouts/main.handlebars +++ b/src/views/layouts/main.handlebars @@ -2,10 +2,20 @@ - Example App + {{{pageTitle}}} + + + + - - {{{body}}} + + {{> header siteName=siteName }} +
+
+ {{{body}}} +
+ {{> footer }} +
diff --git a/src/views/partials/footer.handlebars b/src/views/partials/footer.handlebars new file mode 100644 index 0000000..6afd05d --- /dev/null +++ b/src/views/partials/footer.handlebars @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/src/views/partials/header.handlebars b/src/views/partials/header.handlebars new file mode 100644 index 0000000..8ebf1a8 --- /dev/null +++ b/src/views/partials/header.handlebars @@ -0,0 +1,3 @@ +
+

{{{siteName}}}

+
\ No newline at end of file