diff --git a/src/Controller/GuiController.php b/src/Controller/GuiController.php index f5b68df..cf6dddb 100644 --- a/src/Controller/GuiController.php +++ b/src/Controller/GuiController.php @@ -1,13 +1,17 @@ render('/index.html.twig'); + #[Template('/index.html.twig')] + public function index(): Array { + return [ + 'title' => 'Joe Carstairs', + 'description' => 'Joe Carstairs\' personal website', + ]; } } diff --git a/templates/base.html.twig b/templates/base.html.twig index 3cda30f..584f205 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,17 +1,19 @@ - - - - {% block title %}Welcome!{% endblock %} - - {% block stylesheets %} - {% endblock %} + + + {{ include('components/head/_meta.html.twig') }} + {{ include('components/head/_indie_web.html.twig') }} + {{ include('components/head/_stylesheets.html.twig') }} + {{ include('components/head/_feeds.html.twig') }} + {{ include('components/head/_open_graph.html.twig') }} + {{ include('components/head/_twitter.html.twig') }} + - {% block javascripts %} - {% block importmap %}{{ importmap('app') }}{% endblock %} - {% endblock %} - - - {% block body %}{% endblock %} - + + {{ include('components/_navbar.html.twig') }} + +
+ {% block content %}{% endblock %} +
+ diff --git a/templates/components/_navbar.html.twig b/templates/components/_navbar.html.twig new file mode 100644 index 0000000..0cbd663 --- /dev/null +++ b/templates/components/_navbar.html.twig @@ -0,0 +1,13 @@ + diff --git a/templates/components/head/_feeds.html.twig b/templates/components/head/_feeds.html.twig new file mode 100644 index 0000000..05e2642 --- /dev/null +++ b/templates/components/head/_feeds.html.twig @@ -0,0 +1,2 @@ + + diff --git a/templates/components/head/_indie_web.html.twig b/templates/components/head/_indie_web.html.twig new file mode 100644 index 0000000..d80bd6b --- /dev/null +++ b/templates/components/head/_indie_web.html.twig @@ -0,0 +1,3 @@ + + + diff --git a/templates/components/head/_meta.html.twig b/templates/components/head/_meta.html.twig new file mode 100644 index 0000000..5ffcf3b --- /dev/null +++ b/templates/components/head/_meta.html.twig @@ -0,0 +1,7 @@ + + + + +{{ title }} + + diff --git a/templates/components/head/_open_graph.html.twig b/templates/components/head/_open_graph.html.twig new file mode 100644 index 0000000..3f59c2e --- /dev/null +++ b/templates/components/head/_open_graph.html.twig @@ -0,0 +1,5 @@ + + + + + diff --git a/templates/components/head/_stylesheets.html.twig b/templates/components/head/_stylesheets.html.twig new file mode 100644 index 0000000..d6e4762 --- /dev/null +++ b/templates/components/head/_stylesheets.html.twig @@ -0,0 +1,4 @@ + + + + diff --git a/templates/components/head/_twitter.html.twig b/templates/components/head/_twitter.html.twig new file mode 100644 index 0000000..bb74e53 --- /dev/null +++ b/templates/components/head/_twitter.html.twig @@ -0,0 +1,5 @@ + + + + + diff --git a/templates/index.html.twig b/templates/index.html.twig index 7226fcd..420007a 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -1,116 +1,54 @@ - - - - - - - +{% extends 'base.html.twig' %} - - - - - +{% block content %} +
+
+ +
- - - - - +
+

+ Joe Carstairs +

- - + +
- - {title} - - +
+

+ Hi! 👋 My name is Joe + Carstairs. I’m a + software developer at + Scott Logic, a + graduate of Philosophy and Mathematics at the University of Edinburgh, + a committed Christian and a pretty rubbish poet. +

- - - - - - +

+ I’m also the secretary of the + Scots Language Society. + Help me maintain our website! +

- - - - - - +

+ HMU with your thoughts on philosophy of science, Scots verse and + John the Evangelist. +

- - - - - - - - -
-
-
- -
- -
-

- Joe Carstairs -

- - -
- -
-

- Hi! 👋 My name is Joe - Carstairs. I’m a - software developer at - Scott Logic, a - graduate of Philosophy and Mathematics at the University of Edinburgh, - a committed Christian and a pretty rubbish poet. -

- -

- I’m also the secretary of the - Scots Language Society. - Help me maintain our website! -

- -

- HMU with your thoughts on philosophy of science, Scots verse and - John the Evangelist. -

- -

- - Or get me on - Facebook, - Mastodon, - LinkedIn, - BlueSky, - or GitHub. - -

-
-
-
- - +

+ + Or get me on + Facebook, + Mastodon, + LinkedIn, + BlueSky, + or GitHub. + +

+
+
+{% endblock %}