From 266c3ac0ac045a6a091f30a0dc61119bdd4f99a5 Mon Sep 17 00:00:00 2001 From: Angela Quinton Date: Sat, 11 Mar 2023 22:12:17 -0500 Subject: [PATCH 1/4] add asdf tool-versions file --- .tool-versions | 1 + 1 file changed, 1 insertion(+) create mode 100644 .tool-versions 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 From 79407a3db35db3eb83d19f65a5bbd021697d0743 Mon Sep 17 00:00:00 2001 From: Angela Quinton Date: Sat, 11 Mar 2023 23:39:51 -0500 Subject: [PATCH 2/4] partials for header and footer --- app.js | 10 ++++++++-- src/views/home.handlebars | 7 +++---- src/views/individual.handlebars | 6 ++---- src/views/layouts/main.handlebars | 8 ++++++-- src/views/partials/footer.handlebars | 11 +++++++++++ src/views/partials/header.handlebars | 1 + 6 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 src/views/partials/footer.handlebars create mode 100644 src/views/partials/header.handlebars diff --git a/app.js b/app.js index 700e28c..7b67f54 100644 --- a/app.js +++ b/app.js @@ -9,8 +9,11 @@ app.set('views', './src/views') app.use(express.static('dist')) +const siteName = "Pronoun Site" + app.get('/', (req, res) => { - res.render('home') + const pageTitle = siteName; + res.render('home', { siteName, pageTitle } ) }) app.get('/:nominative/:accusative/:pronominal_possessive/:predicative_possessive/:reflexive', (req, res) => { @@ -21,8 +24,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/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..146875f 100644 --- a/src/views/individual.handlebars +++ b/src/views/individual.handlebars @@ -1,4 +1,2 @@ -
-

Individual

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

Individual

+{{nominative}}/{{accusative}}/{{pronominalPossessive}}/{{predicativePossessive}}/{{reflexive}} diff --git a/src/views/layouts/main.handlebars b/src/views/layouts/main.handlebars index 9bc4aee..eda6a0f 100644 --- a/src/views/layouts/main.handlebars +++ b/src/views/layouts/main.handlebars @@ -2,10 +2,14 @@ - 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..cd5b54f --- /dev/null +++ b/src/views/partials/footer.handlebars @@ -0,0 +1,11 @@ +

Made by monsters

+ + + +

This site has a license of some sort, and that's linked here.

+ +

Thanks for visiting!

\ 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..06ccc3f --- /dev/null +++ b/src/views/partials/header.handlebars @@ -0,0 +1 @@ +

{{{siteName}}}

\ No newline at end of file From 154f301a23a1c0c9f4e4afd87ebe9a89e29011de Mon Sep 17 00:00:00 2001 From: Angela Quinton Date: Sun, 12 Mar 2023 00:14:14 -0500 Subject: [PATCH 3/4] basic theme colours and font faces --- src/app.css | 27 +++++++++++++++++++++++++++ src/views/layouts/main.handlebars | 4 ++++ src/views/partials/footer.handlebars | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/app.css b/src/app.css index b5c61c9..f1d05c4 100644 --- a/src/app.css +++ b/src/app.css @@ -1,3 +1,30 @@ @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 { + font-weight: 700; +} + +h1 { + font-family: "Redaction", Georgia, 'Times New Roman', Times, serif; +} + +h2, h3, h4 { + font-family: "Redaction 10", Georgia, 'Times New Roman', Times, serif; +} \ No newline at end of file diff --git a/src/views/layouts/main.handlebars b/src/views/layouts/main.handlebars index eda6a0f..acb8ab4 100644 --- a/src/views/layouts/main.handlebars +++ b/src/views/layouts/main.handlebars @@ -3,6 +3,10 @@ {{{pageTitle}}} + + + + diff --git a/src/views/partials/footer.handlebars b/src/views/partials/footer.handlebars index cd5b54f..5dc4920 100644 --- a/src/views/partials/footer.handlebars +++ b/src/views/partials/footer.handlebars @@ -1,7 +1,7 @@

Made by monsters

    -
  • Gaiety who uses she/her, fae/faer
    • +
  • Gaiety who uses fae/faer, she/her
  • Angela who uses it/its, she/her
  • Rizzo who uses he/him, they/them, xier/xies
From fe2eda5729103fa8f29d6302c7d988c5b0ad3e96 Mon Sep 17 00:00:00 2001 From: Angela Quinton Date: Sun, 12 Mar 2023 01:16:08 -0500 Subject: [PATCH 4/4] header, footer, whitespace for all responsive breakpoints, text styling --- src/app.css | 15 ++++++++++----- src/views/individual.handlebars | 3 +-- src/views/layouts/main.handlebars | 10 ++++++---- src/views/partials/footer.handlebars | 23 +++++++++++++++-------- src/views/partials/header.handlebars | 4 +++- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/app.css b/src/app.css index f1d05c4..7ffafcd 100644 --- a/src/app.css +++ b/src/app.css @@ -4,10 +4,10 @@ :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 */ + --callout: #ECEFED; /* Sage/Light/4 */ + --stroke: #D7DCDA; /* Sage/Light/7 */ + --text-shout: #164430; /* Green/Dark/6 */ + --text-murmur: #113123; /* Green/Dark/4 */ } body { @@ -18,6 +18,7 @@ body { } h1, h2, h3, h4 { + color: var(--text-shout); font-weight: 700; } @@ -25,6 +26,10 @@ h1 { font-family: "Redaction", Georgia, 'Times New Roman', Times, serif; } -h2, h3, h4 { +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/individual.handlebars b/src/views/individual.handlebars index 146875f..cee9462 100644 --- a/src/views/individual.handlebars +++ b/src/views/individual.handlebars @@ -1,2 +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 acb8ab4..8c309f3 100644 --- a/src/views/layouts/main.handlebars +++ b/src/views/layouts/main.handlebars @@ -9,10 +9,12 @@ - -
- {{> header siteName=siteName }} - {{{body}}} + + {{> header siteName=siteName }} +
+
+ {{{body}}} +
{{> footer }}
diff --git a/src/views/partials/footer.handlebars b/src/views/partials/footer.handlebars index 5dc4920..6afd05d 100644 --- a/src/views/partials/footer.handlebars +++ b/src/views/partials/footer.handlebars @@ -1,11 +1,18 @@ -

Made by monsters

+
-
    -
  • Gaiety who uses fae/faer, she/her
    • -
  • Angela who uses it/its, she/her
    • -
  • Rizzo who uses he/him, they/them, xier/xies
    • -
+
+

Made by monsters

-

This site has a license of some sort, and that's linked here.

+
    +
  • Gaiety who uses fae/faer, she/her
    • +
  • Angela who uses it/its, she/her
    • +
  • Rizzo who uses he/him, they/them, xier/xies
    • +
+
-

Thanks for visiting!

\ No newline at end of file +
+

This site has a license of some sort, and that's linked here.

+ +

Thanks for visiting!

+
+
\ No newline at end of file diff --git a/src/views/partials/header.handlebars b/src/views/partials/header.handlebars index 06ccc3f..8ebf1a8 100644 --- a/src/views/partials/header.handlebars +++ b/src/views/partials/header.handlebars @@ -1 +1,3 @@ -

{{{siteName}}}

\ No newline at end of file +
+

{{{siteName}}}

+
\ No newline at end of file