From 034dc7091e6b7d6911bb3f251bc499611c4c92c4 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 20:44:47 +0100 Subject: [PATCH 01/21] Initial test of PHP templating --- new_index.php | 21 +++++++ new_index.html => page-blocks/MASTER.html | 0 page-blocks/footer.php | 6 +- page-blocks/head-img-face.php | 4 ++ page-blocks/head-img.php | 7 +++ page-blocks/head.php | 9 +-- page-blocks/menu.php | 69 +++++++++++++++++++---- page-blocks/micro-content.php | 6 ++ page-blocks/template.php | 21 ------- 9 files changed, 105 insertions(+), 38 deletions(-) create mode 100644 new_index.php rename new_index.html => page-blocks/MASTER.html (100%) create mode 100644 page-blocks/head-img-face.php create mode 100644 page-blocks/head-img.php create mode 100644 page-blocks/micro-content.php delete mode 100644 page-blocks/template.php diff --git a/new_index.php b/new_index.php new file mode 100644 index 0000000..2975518 --- /dev/null +++ b/new_index.php @@ -0,0 +1,21 @@ + + + + + + + + + + +
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ut eros leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Cras tempus, leo sit amet placerat sollicitudin, magna massa vehicula nisi, sed malesuada odio velit iaculis est. Cras egestas nec lectus ac ultrices. Interdum et malesuada fames ac ante ipsum primis in faucibus. Suspendisse cursus odio et massa finibus consequat non sed dolor. Suspendisse eu leo ut nunc tincidunt lacinia. Sed faucibus eu enim sit amet commodo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Quisque commodo laoreet odio, ac sollicitudin odio.

+

Sed volutpat, dolor quis dignissim varius, risus urna tincidunt nulla, non bibendum urna ante eget enim. Pellentesque sit amet neque lobortis, auctor nulla sagittis, bibendum nisl. Proin fermentum tristique dolor, in vehicula mi efficitur et. Fusce ac justo nulla. In eget odio felis. Suspendisse et tellus tincidunt, consequat mi eu, gravida neque. In elementum lacus ut convallis ornare. Mauris elementum lorem felis, et tincidunt massa consectetur in. Suspendisse ut augue blandit, efficitur augue nec, pellentesque odio. Nulla aliquet arcu vitae vehicula ultricies.

+

Ispum

+

Sed eleifend massa sed sagittis malesuada. Phasellus velit urna, congue sit amet felis dictum, congue ornare tortor. Donec consequat lectus sit amet iaculis ornare. Pellentesque luctus, orci a sagittis efficitur, dolor justo convallis dolor, vitae aliquam dolor eros a nunc. Sed suscipit volutpat est ac ultrices. Cras tempus tellus est, eu tristique est gravida eget. Nulla turpis odio, aliquam id vehicula non, dignissim egestas orci. Suspendisse pulvinar enim eu tortor tincidunt, vel luctus purus pellentesque. Curabitur efficitur mollis est, at imperdiet dui auctor a. Ut malesuada lacus ac nulla tempor sollicitudin. Pellentesque enim elit, eleifend eget ligula sit amet, sagittis efficitur elit. Donec blandit tellus ut vestibulum iaculis. Fusce vel ipsum non felis bibendum porttitor a ut dui. Donec ornare augue augue, a elementum justo ornare quis. Praesent ante tellus, blandit in ultricies id, bibendum sit amet mi. Suspendisse tristique ornare erat.

+

Praesent malesuada sit amet libero eu volutpat. Duis lacinia turpis sit amet malesuada bibendum. Pellentesque ut velit at turpis placerat consequat id sed augue. Cras eleifend augue sem, sed hendrerit nibh feugiat eu. Nam cursus lectus fermentum quam feugiat porttitor. Sed bibendum a enim ut commodo. Maecenas lacinia dolor ante, vel bibendum nulla venenatis aliquam. Aenean ultricies felis eros, quis cursus arcu dictum vitae.

+

Ut magna urna, pretium tincidunt congue id, sodales sed lacus. Suspendisse potenti. Aenean nec quam ultrices, dignissim velit sit amet, cursus nisl. Duis nec risus a nisl porta fringilla. Phasellus vel fermentum justo, a malesuada ex. Nullam eu metus quis arcu sodales vestibulum. Maecenas efficitur gravida risus vitae pretium. Donec non nulla sodales, consectetur est ut, tristique nisl. Phasellus sed dui sed erat efficitur cursus. Vestibulum eget est purus. Aliquam mi ante, hendrerit ac ornare ac, imperdiet et diam. Nunc fermentum nunc faucibus massa finibus mattis.

+
+ + + \ No newline at end of file diff --git a/new_index.html b/page-blocks/MASTER.html similarity index 100% rename from new_index.html rename to page-blocks/MASTER.html diff --git a/page-blocks/footer.php b/page-blocks/footer.php index 9dae3cd..0842d09 100644 --- a/page-blocks/footer.php +++ b/page-blocks/footer.php @@ -1 +1,5 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/page-blocks/head-img-face.php b/page-blocks/head-img-face.php new file mode 100644 index 0000000..2899b57 --- /dev/null +++ b/page-blocks/head-img-face.php @@ -0,0 +1,4 @@ + + + Face image + \ No newline at end of file diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php new file mode 100644 index 0000000..643c0dc --- /dev/null +++ b/page-blocks/head-img.php @@ -0,0 +1,7 @@ +
+
+ + +

+
+
\ No newline at end of file diff --git a/page-blocks/head.php b/page-blocks/head.php index e7e3305..e1e487b 100644 --- a/page-blocks/head.php +++ b/page-blocks/head.php @@ -1,7 +1,8 @@ + - - - - \ No newline at end of file + + + <?php echo $page_title ?> + \ No newline at end of file diff --git a/page-blocks/menu.php b/page-blocks/menu.php index d0d03e7..df2a447 100644 --- a/page-blocks/menu.php +++ b/page-blocks/menu.php @@ -1,12 +1,57 @@ - - -
- -
\ No newline at end of file + + \ No newline at end of file diff --git a/page-blocks/micro-content.php b/page-blocks/micro-content.php new file mode 100644 index 0000000..0d98b55 --- /dev/null +++ b/page-blocks/micro-content.php @@ -0,0 +1,6 @@ +
+

+ This website cannot correctly render on a screen this narrow, + Please resize your window or visit on a larger device. +

+
\ No newline at end of file diff --git a/page-blocks/template.php b/page-blocks/template.php deleted file mode 100644 index 56491c7..0000000 --- a/page-blocks/template.php +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Page Title - - - - - - -

Page Title

-
- -
- - - - - \ No newline at end of file -- 2.34.1 From 66c6f50fbb63b258e1d359762a23d5c1e1640b75 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 20:47:00 +0100 Subject: [PATCH 02/21] Fix incorrect var name --- page-blocks/head-img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 643c0dc..57d0c9f 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -2,6 +2,6 @@
-

+

\ No newline at end of file -- 2.34.1 From e649227df3b60dcd70d9ab0e5d2499670f8d6eb2 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 20:52:20 +0100 Subject: [PATCH 03/21] Include face if homepage --- page-blocks/head-img.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 57d0c9f..754858a 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,7 +1,9 @@
- - + +

\ No newline at end of file -- 2.34.1 From b6ba2c67b8e21c709bf67bd29d92df7b0e074ff1 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 20:52:54 +0100 Subject: [PATCH 04/21] Fix if statement --- page-blocks/head-img.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 754858a..44da2db 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,7 +1,7 @@
- -

-- 2.34.1 From ffd7d1d6b034814ce7e9b4453bd636128905bc34 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 20:53:33 +0100 Subject: [PATCH 05/21] Fix if statement --- page-blocks/head-img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 44da2db..266a666 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,7 +1,7 @@
-

-- 2.34.1 From 17ad2f25397ec3ee2be43a620b7059aefd96d22a Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 20:57:04 +0100 Subject: [PATCH 06/21] Further if statement fix? --- page-blocks/head-img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 266a666..20fd8b1 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,7 +1,7 @@
-

-- 2.34.1 From 2ffaa254825b26cbea57237113e249dd297a656e Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 20:59:56 +0100 Subject: [PATCH 07/21] Further fix? --- page-blocks/head-img.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 20fd8b1..16958ff 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,7 +1,9 @@
-

-- 2.34.1 From 53807d6843c87d39e8961b444d378415cf7daae7 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 21:05:25 +0100 Subject: [PATCH 08/21] Try to enable titlecase --- page-blocks/head-img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 16958ff..7a5e70b 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -6,6 +6,6 @@ global $page_title; if (strcmp($page_title, 'home') == 0){ include "./php/head-img-face.php"; } ?> -

+

\ No newline at end of file -- 2.34.1 From 9722c3eb495341f34362df5ea0397f41b43aba7e Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 21:09:16 +0100 Subject: [PATCH 09/21] Attempt --- page-blocks/head-img.php | 4 ++-- page-blocks/head.php | 2 +- style/new_style.css | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 7a5e70b..e1f9f7c 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,4 +1,4 @@ -
+
-

+

\ No newline at end of file diff --git a/page-blocks/head.php b/page-blocks/head.php index e1e487b..7aadda0 100644 --- a/page-blocks/head.php +++ b/page-blocks/head.php @@ -4,5 +4,5 @@ - <?php echo $page_title ?> + <?php echo ucwords($page_title); ?> \ No newline at end of file diff --git a/style/new_style.css b/style/new_style.css index ef852de..6a2f4b5 100644 --- a/style/new_style.css +++ b/style/new_style.css @@ -59,14 +59,14 @@ body { position: sticky; top: -145px; } -#header_index{background-color: #a04911} /* Try using image-set() here to offer different formats */ -@media(min-width: 50px){#header_index{background-image:url("/images/headers/index/300.webp")}} -@media(min-width: 301px){#header_index{background-image:url("/images/headers/index/500.webp")}} -@media(min-width: 501px){#header_index{background-image:url("/images/headers/index/800.webp")}} -@media(min-width: 801px){#header_index{background-image:url("/images/headers/index/1024.webp")}} -@media(min-width:1025px){#header_index{background-image:url("/images/headers/index/1920.webp")}} -@media(min-width:1921px){#header_index{background-image:url("/images/headers/index/2800.webp")}} -@media(min-width:2801px){#header_index{background-image:url("/images/headers/index/4096.webp")}} +#home{background-color: #a04911} /* Try using image-set() here to offer different formats */ +@media(min-width: 50px){#home{background-image:url("/images/headers/index/300.webp")}} +@media(min-width: 301px){#home{background-image:url("/images/headers/index/500.webp")}} +@media(min-width: 501px){#home{background-image:url("/images/headers/index/800.webp")}} +@media(min-width: 801px){#home{background-image:url("/images/headers/index/1024.webp")}} +@media(min-width:1025px){#home{background-image:url("/images/headers/index/1920.webp")}} +@media(min-width:1921px){#home{background-image:url("/images/headers/index/2800.webp")}} +@media(min-width:2801px){#home{background-image:url("/images/headers/index/4096.webp")}} #header_face { display: flex; position: absolute; -- 2.34.1 From 738946133c685c4e2548bced18d9153487859caa Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 21:10:09 +0100 Subject: [PATCH 10/21] Remove comment --- page-blocks/head.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/head.php b/page-blocks/head.php index 7aadda0..7dd8395 100644 --- a/page-blocks/head.php +++ b/page-blocks/head.php @@ -4,5 +4,5 @@ - <?php echo ucwords($page_title); ?> + <?php echo ucwords($page_title); ?> \ No newline at end of file -- 2.34.1 From d2a2a42fd565b13e0b80caa6ce32009f2dbf6ad7 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 21:12:06 +0100 Subject: [PATCH 11/21] Attempt face image fix --- page-blocks/head-img.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index e1f9f7c..9694d8e 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,10 +1,9 @@
-

-- 2.34.1 From d4992014f82cbb0d7cc4073fed85159d7165b06b Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 21:14:22 +0100 Subject: [PATCH 12/21] Add comment to fix error --- page-blocks/head-img.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 9694d8e..235f3db 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -1,10 +1,9 @@
+ include "./page-blocks/head-img-face.php"; +} ?>

\ No newline at end of file -- 2.34.1 From 109ec874ef6fd9f116b8e4918c804cc6a003fb3a Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sat, 29 Oct 2022 21:22:07 +0100 Subject: [PATCH 13/21] Try another fix! --- page-blocks/head-img-face.php | 2 ++ page-blocks/head-img.php | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/page-blocks/head-img-face.php b/page-blocks/head-img-face.php index 2899b57..599c052 100644 --- a/page-blocks/head-img-face.php +++ b/page-blocks/head-img-face.php @@ -1,3 +1,5 @@ + THIS FILE IS NOT CURRENTLY USED AND SHOULD BE DELETED AFTER TESTING + Face image diff --git a/page-blocks/head-img.php b/page-blocks/head-img.php index 235f3db..f6ba43f 100644 --- a/page-blocks/head-img.php +++ b/page-blocks/head-img.php @@ -2,8 +2,11 @@
+ echo ''; + echo ''; + echo 'Face image'; + echo ''; +} ?>

\ No newline at end of file -- 2.34.1 From 5e60eab632bbc9fb9e6fdafc33696311d774e9cc Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 19:27:14 +0000 Subject: [PATCH 14/21] Move all pages over to new template --- contact.php | 58 +++--------- email-safety.php | 93 +++++++++---------- index.php | 50 +++------- js/navbar.js | 8 -- keys.php | 42 +++++---- new_index.php | 21 ----- page-blocks/head-img-face.php | 6 -- projects.php | 32 +++---- style/fonts.css | 53 ----------- style/styles.css | 168 ---------------------------------- 10 files changed, 115 insertions(+), 416 deletions(-) delete mode 100644 new_index.php delete mode 100644 page-blocks/head-img-face.php delete mode 100644 style/fonts.css delete mode 100644 style/styles.css diff --git a/contact.php b/contact.php index a4e4c99..715ab0f 100644 --- a/contact.php +++ b/contact.php @@ -1,48 +1,20 @@ + + + - - - - Contact - - + - - - -

Contact

-
- Add me to your contacts -

Find me elsewhere

- - -
- - - + + + +
+

+ I will build a contact form here. For the moment: +
+ Add me to your contacts +

+
+ \ No newline at end of file diff --git a/email-safety.php b/email-safety.php index 9091371..b861307 100644 --- a/email-safety.php +++ b/email-safety.php @@ -1,65 +1,60 @@ + + + - - - - Email Safety - - + - - - -

Email Safety

-
+ + + +

You are probably here beacuse you clicked a link in an email that I sent you. I was going to link to a quick guide to email safety but all I could find were specific guides aimed at children or the elderly. In the end I decided to throw a rough guide together. +

+ +

Phishing

+

+ Phishing is a technique used to try and get personal information from you. It could be styled to look like it is from a service that you use or a person that you know. Be on the lookout for: +

+
+
Spelling or grammatical errors
+
You will usually see spelling or grammatical errors, some people hypothesise that this is to weed out people that are savvy to the scam before they proceed
+
Urgent calls to action
+
Scam artists will use urgent language to invoke an emotive response, this can prevent you evaluating whether the email is genuine before you act.
+
Unusual sender addresses
+
Scam artists will usually send emails from an unusual looking address such as 'security-banking.xyz' or 'banking.something.xyz'. Elements of the address may even include the name of a trusted business or person.
+
+ +

+ Even after checking for all of the above, it could be the case that the scam artist is sending an email from a real, trusted address. This is possible by hacking or spoofing. It is important that your email account is kept secure with a strong password - this helps to prevent your email address being used by scam artists.

-

Phishing

-

- Phishing is a technique used to try and get personal information from you. It could be styled to look like it is from a service that you use or a person that you know. Be on the lookout for: -

-
-
Spelling or grammatical errors
-
You will usually see spelling or grammatical errors, some people hypothesise that this is to weed out people that are savvy to the scam before they proceed
-
Urgent calls to action
-
Scam artists will use urgent language to invoke an emotive response, this can prevent you evaluating whether the email is genuine before you act.
-
Unusual sender addresses
-
Scam artists will usually send emails from an unusual looking address such as 'security-banking.xyz' or 'banking.something.xyz'. Elements of the address may even include the name of a trusted business or person.
-
- -

- Even after checking for all of the above, it could be the case that the scam artist is sending an email from a real, trusted address. This is possible by hacking or spoofing. It is important that your email account is kept secure with a strong password - this helps to prevent your email address being used by scam artists. -

- -

Tampering

-

+

Tampering

+

Generally, email is an insecure means of communication. It is possible for an email to be viewed or tampered with whilst it is being transmitted. -

-

+

+

Because of this, it is important that you review links and attachments before opening them. Web browsers are improving on the security front and often alert you if you try to open a link to a scam website or that tries to download a file but you should still hover over the link which can reveal the actual destination. Attachments should be scanned for viruses or threats before you open them. -

+

-

Signing & Encryption

-

+

Signing & Encryption

+

There are technologies to digitally sign and/or encrypt email messages, both PGP and S/MIME are available. -

-

+

+

As secure instant messaging becomes more widespread email signing and encryption is becoming less common with people leaning towards services such as WhatsApp, Signal and Telegram for secure communication. -

-

+

+

S/MIME is more widely supported but does mean that you have to buy a certificate, cheaper certificates do not provide proof of the person sending the email, however your email client can use the certificate to check whether the email has been tampered with. More expensive certificates are available that you can use to prove your identity - these are the type of certificated used to digitally sign documents such as PDF files. -

-

- PGP is not as widely supported and is more complicated for the end user, however there is no cost as you generate certificates yourself. It is then up to the sender to validate your identity, you can read more about PGP on my PGP page. -

-

+

+

+ PGP is not as widely supported and is more complicated for the end user, however there is no cost as you generate certificates yourself. It is then up to the sender to validate your identity, you can get my public keys here. +

+

Both S/MIME and PGP also support encryption which involves sharing your certificates public key with others, an email can only be encrypted with that public key. It is also possible to encrypt an email with a password. I won't go on further as email encryption is a bit out of scope here. -

-
- - - +

+
+ \ No newline at end of file diff --git a/index.php b/index.php index 207e27d..2975518 100644 --- a/index.php +++ b/index.php @@ -1,41 +1,21 @@ - - + + - - - Fred Boniface - - + - - - -

Hello

-
-

- I'm Fred Boniface - a year old Rail - Professional with many interests outside of work and while I do have - many opinions about the state of the rail industry at present, this - website aims to be about my personal life and interests, rather than my - work. -

- -

- I am married to Jade and we have two children, Lucy & Ava-Rose - both - in school. I will get around to adding some images to this page - I - promise. -

- -

- To keep this homepage simple and easy to digest, I won't waffle on - about too much here, but there is more to read about each topic on - the relevant page. -

-
- - - + + + +
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ut eros leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Cras tempus, leo sit amet placerat sollicitudin, magna massa vehicula nisi, sed malesuada odio velit iaculis est. Cras egestas nec lectus ac ultrices. Interdum et malesuada fames ac ante ipsum primis in faucibus. Suspendisse cursus odio et massa finibus consequat non sed dolor. Suspendisse eu leo ut nunc tincidunt lacinia. Sed faucibus eu enim sit amet commodo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Quisque commodo laoreet odio, ac sollicitudin odio.

+

Sed volutpat, dolor quis dignissim varius, risus urna tincidunt nulla, non bibendum urna ante eget enim. Pellentesque sit amet neque lobortis, auctor nulla sagittis, bibendum nisl. Proin fermentum tristique dolor, in vehicula mi efficitur et. Fusce ac justo nulla. In eget odio felis. Suspendisse et tellus tincidunt, consequat mi eu, gravida neque. In elementum lacus ut convallis ornare. Mauris elementum lorem felis, et tincidunt massa consectetur in. Suspendisse ut augue blandit, efficitur augue nec, pellentesque odio. Nulla aliquet arcu vitae vehicula ultricies.

+

Ispum

+

Sed eleifend massa sed sagittis malesuada. Phasellus velit urna, congue sit amet felis dictum, congue ornare tortor. Donec consequat lectus sit amet iaculis ornare. Pellentesque luctus, orci a sagittis efficitur, dolor justo convallis dolor, vitae aliquam dolor eros a nunc. Sed suscipit volutpat est ac ultrices. Cras tempus tellus est, eu tristique est gravida eget. Nulla turpis odio, aliquam id vehicula non, dignissim egestas orci. Suspendisse pulvinar enim eu tortor tincidunt, vel luctus purus pellentesque. Curabitur efficitur mollis est, at imperdiet dui auctor a. Ut malesuada lacus ac nulla tempor sollicitudin. Pellentesque enim elit, eleifend eget ligula sit amet, sagittis efficitur elit. Donec blandit tellus ut vestibulum iaculis. Fusce vel ipsum non felis bibendum porttitor a ut dui. Donec ornare augue augue, a elementum justo ornare quis. Praesent ante tellus, blandit in ultricies id, bibendum sit amet mi. Suspendisse tristique ornare erat.

+

Praesent malesuada sit amet libero eu volutpat. Duis lacinia turpis sit amet malesuada bibendum. Pellentesque ut velit at turpis placerat consequat id sed augue. Cras eleifend augue sem, sed hendrerit nibh feugiat eu. Nam cursus lectus fermentum quam feugiat porttitor. Sed bibendum a enim ut commodo. Maecenas lacinia dolor ante, vel bibendum nulla venenatis aliquam. Aenean ultricies felis eros, quis cursus arcu dictum vitae.

+

Ut magna urna, pretium tincidunt congue id, sodales sed lacus. Suspendisse potenti. Aenean nec quam ultrices, dignissim velit sit amet, cursus nisl. Duis nec risus a nisl porta fringilla. Phasellus vel fermentum justo, a malesuada ex. Nullam eu metus quis arcu sodales vestibulum. Maecenas efficitur gravida risus vitae pretium. Donec non nulla sodales, consectetur est ut, tristique nisl. Phasellus sed dui sed erat efficitur cursus. Vestibulum eget est purus. Aliquam mi ante, hendrerit ac ornare ac, imperdiet et diam. Nunc fermentum nunc faucibus massa finibus mattis.

+
+ \ No newline at end of file diff --git a/js/navbar.js b/js/navbar.js index fc4a01e..de4cebd 100644 --- a/js/navbar.js +++ b/js/navbar.js @@ -1,11 +1,3 @@ -function inflateSidebar() { - document.getElementById("sidebar").style.width = "150px"; -} - -function collapseSidebar() { - document.getElementById("sidebar").style.width = "0px"; -} - function sidebarOpen() { document.getElementById("sidebar").style.width = "50%"; document.getElementById("sidebar_open_short").style.display = "none"; diff --git a/keys.php b/keys.php index 118e564..d4f117f 100644 --- a/keys.php +++ b/keys.php @@ -1,23 +1,33 @@ + + + - - - - GPG/PGP - - + - - - -

Keys

-
+ + + +
+

+ I'll publish my public keys here, primarily so I have easy access to them + myself. You can use them to check my identity when I send signed emails, etc. +

+

SSH

- Download SSH Public Key + My current public SSH key has no expiry date. +
+ Download Public SSH key

-
- - - +

GPG

+

+ My GPG Key is currently unavailable +

+

S/MIME

+

+ I do not currently hold a valid S/MIME Certificate +

+
+ \ No newline at end of file diff --git a/new_index.php b/new_index.php deleted file mode 100644 index 2975518..0000000 --- a/new_index.php +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - -
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ut eros leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Cras tempus, leo sit amet placerat sollicitudin, magna massa vehicula nisi, sed malesuada odio velit iaculis est. Cras egestas nec lectus ac ultrices. Interdum et malesuada fames ac ante ipsum primis in faucibus. Suspendisse cursus odio et massa finibus consequat non sed dolor. Suspendisse eu leo ut nunc tincidunt lacinia. Sed faucibus eu enim sit amet commodo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Quisque commodo laoreet odio, ac sollicitudin odio.

-

Sed volutpat, dolor quis dignissim varius, risus urna tincidunt nulla, non bibendum urna ante eget enim. Pellentesque sit amet neque lobortis, auctor nulla sagittis, bibendum nisl. Proin fermentum tristique dolor, in vehicula mi efficitur et. Fusce ac justo nulla. In eget odio felis. Suspendisse et tellus tincidunt, consequat mi eu, gravida neque. In elementum lacus ut convallis ornare. Mauris elementum lorem felis, et tincidunt massa consectetur in. Suspendisse ut augue blandit, efficitur augue nec, pellentesque odio. Nulla aliquet arcu vitae vehicula ultricies.

-

Ispum

-

Sed eleifend massa sed sagittis malesuada. Phasellus velit urna, congue sit amet felis dictum, congue ornare tortor. Donec consequat lectus sit amet iaculis ornare. Pellentesque luctus, orci a sagittis efficitur, dolor justo convallis dolor, vitae aliquam dolor eros a nunc. Sed suscipit volutpat est ac ultrices. Cras tempus tellus est, eu tristique est gravida eget. Nulla turpis odio, aliquam id vehicula non, dignissim egestas orci. Suspendisse pulvinar enim eu tortor tincidunt, vel luctus purus pellentesque. Curabitur efficitur mollis est, at imperdiet dui auctor a. Ut malesuada lacus ac nulla tempor sollicitudin. Pellentesque enim elit, eleifend eget ligula sit amet, sagittis efficitur elit. Donec blandit tellus ut vestibulum iaculis. Fusce vel ipsum non felis bibendum porttitor a ut dui. Donec ornare augue augue, a elementum justo ornare quis. Praesent ante tellus, blandit in ultricies id, bibendum sit amet mi. Suspendisse tristique ornare erat.

-

Praesent malesuada sit amet libero eu volutpat. Duis lacinia turpis sit amet malesuada bibendum. Pellentesque ut velit at turpis placerat consequat id sed augue. Cras eleifend augue sem, sed hendrerit nibh feugiat eu. Nam cursus lectus fermentum quam feugiat porttitor. Sed bibendum a enim ut commodo. Maecenas lacinia dolor ante, vel bibendum nulla venenatis aliquam. Aenean ultricies felis eros, quis cursus arcu dictum vitae.

-

Ut magna urna, pretium tincidunt congue id, sodales sed lacus. Suspendisse potenti. Aenean nec quam ultrices, dignissim velit sit amet, cursus nisl. Duis nec risus a nisl porta fringilla. Phasellus vel fermentum justo, a malesuada ex. Nullam eu metus quis arcu sodales vestibulum. Maecenas efficitur gravida risus vitae pretium. Donec non nulla sodales, consectetur est ut, tristique nisl. Phasellus sed dui sed erat efficitur cursus. Vestibulum eget est purus. Aliquam mi ante, hendrerit ac ornare ac, imperdiet et diam. Nunc fermentum nunc faucibus massa finibus mattis.

-
- - - \ No newline at end of file diff --git a/page-blocks/head-img-face.php b/page-blocks/head-img-face.php deleted file mode 100644 index 599c052..0000000 --- a/page-blocks/head-img-face.php +++ /dev/null @@ -1,6 +0,0 @@ - THIS FILE IS NOT CURRENTLY USED AND SHOULD BE DELETED AFTER TESTING - - - - Face image - \ No newline at end of file diff --git a/projects.php b/projects.php index 4784f69..769a9b0 100644 --- a/projects.php +++ b/projects.php @@ -1,22 +1,20 @@ + + + - - - - Projects - - + - - - -

Projects

-
-

Sorry, there's nothing here yet

-

In the meantime check out my Gitea or Social Links

-
- - - + + + +
+

+ I haven't written any content here yet. +
+ In the meantime, visit my Gitea Server. +

+
+ \ No newline at end of file diff --git a/style/fonts.css b/style/fonts.css deleted file mode 100644 index a067cdc..0000000 --- a/style/fonts.css +++ /dev/null @@ -1,53 +0,0 @@ -@font-face { - font-family: 'silkscreenregular'; - src: url('/style/fonts/silkscreen/silkscreen-regular.woff2') format('woff2'), - url('/style/fonts/silkscreen/silkscreen-regular.woff') format('woff'), - url('/style/fonts/silkscreen/silkscreen-regular.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'concertone'; - src: url('/style/fonts/concertone/concertone-regular.woff2') format('woff2'), - url('/style/fonts/concertone/concertone-regular.woff') format('woff'), - url('/style/fonts/concertone/concertone-regular.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'indieflower'; - src: url('/style/fonts/indieflower/indieflower.woff2') format('woff2'), - url('/style/fonts/indieflower/indieflower.woff') format('woff'), - url('/style/fonts/indieflower/indieflower.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'oxygen'; - src: url('/style/fonts/oxygen/oxygen-regular.woff2') format('woff2'), - url('/style/fonts/oxygen/oxygen-regular.woff') format('woff'), - url('/style/fonts/oxygen/oxygen-regular.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'oxygen'; - src: url('/style/fonts/oxygen/oxygen-bold.woff2') format('woff2'), - url('/style/fonts/oxygen/oxygen-bold.woff') format('woff'), - url('/style/fonts/oxygen/oxygen-bold.ttf') format('truetype'); - font-weight: 700; - font-style: normal; -} - -@font-face { - font-family: 'oxygen'; - src: url('/style/fonts/oxygen/oxygen-light.woff2') format('woff2'), - url('/style/fonts/oxygen/oxygen-light.woff') format('woff'), - url('/style/fonts/oxygen/oxygen-light.ttf') format('truetype'); - font-weight: 300; - font-style: normal; -} \ No newline at end of file diff --git a/style/styles.css b/style/styles.css deleted file mode 100644 index 5477532..0000000 --- a/style/styles.css +++ /dev/null @@ -1,168 +0,0 @@ -html { - height: 100%; -} - -body { - min-height: 100%; - background-color: #444444; -} - -.page-title { - text-align: center; - font-family: oxygen, sans-serif; - font-weight: 700; - color: #eeeeee; - padding-top: 65px; - padding-bottom: 10px; - width: 95%; - overflow: hidden; - margin: auto; - margin-bottom: 20px; -} - -.error-title { - font-family: silkscreenregular, 'Courier New', Courier, monospace; -} - -.title-image img { - max-width: 30%; - padding-top: 30px; - padding-bottom: 30px; - margin-left: 35%; - margin-right: 35%; -} - -.page-main-content { - text-align: center; - font-family: oxygen, sans-serif; - font-weight: 300; - color: #f0f0f0f0; - width: 95%; - overflow: hidden; - margin: auto; -} - -.page-main-content h2 { - padding-top: 45px; -} - -.social-links img { - max-width: 58px; - padding: 10px; -} - -a.download-link { - text-decoration: none; - color: #242121; - background-color: #d1caca; - padding: 10px; - border-radius: 10px; - text-align: center; - margin: 7px; -} - - -footer { - background-color: rgb(61, 61, 61); - color: #eeeeee; - font-family: monospace; - text-align: center; - width: 100%; - position: fixed; - bottom: 0; - left: 0; -} - -/* The sidebar menu */ -.sidebar { - height: 100%; - width: 0; /* Hidden by default */ - position: fixed; - padding-top: 90px; - z-index: 1; - top: 0; - right: 0; - background-color: #111; - overflow-x: hidden; - overflow-y: hidden; - transition: 0.7s; /* 0.5 second transition effect to slide in the sidebar */ -} - -/* The sidebar links */ -.sidebar a { - padding: 8px 8px 8px 8px; - margin-left: 20px; - margin-top: 10px; - font-family: oxygen, sans-serif; - font-weight: 300; - text-decoration: none; - text-align: right; - font-size: 25px; - color: #bcbcbc; - display: block; - transition: 0.7s; -} - -/* When you mouse over the navigation links, change their color */ -.sidebar a:hover { - color: #f1f1f1; -} - -/* Position and style the close button (top right corner) */ -.sidebar .close { - position: absolute; - top: -10px; - right: 20px; - font-size: 36px; - margin-left: 50px; -} - -/* Position the div containing the open button */ -.inflate { - position: absolute; - top: 10px; - right: 10px; -} - -/* The button used to open the sidebar */ -.open { - font-size: 20px; - cursor: pointer; - background-color: rgba(0, 0, 0, 0); - color: white; - padding: 10px 15px; - border: none; -} - -.open:hover { - background-color: #444; -} - -/* Screens Wider than 600px */ -@media screen and (min-width: 600px) { - /*Hide sidebar open/close buttons*/ - .inflate {display: none;} - .sidebar .close {display: none;} - - /*Change Menu Dimensions*/ - .sidebar { - width: 100%; - height: 14px; - padding-top: 5px; - padding-bottom: 40px; - padding-left: 50px; - } - - /* Float links */ - .sidebar a { - float: left; - margin-top: 2px; - } - - /*Provice space for top menu*/ - .page-title {padding-top: 90px} - - /*Increase social link image size*/ - .social-links img {max-width: 75px;} - -} \ No newline at end of file -- 2.34.1 From 8018865fefc83ade17135ce758b42d78c210dd87 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 19:32:17 +0000 Subject: [PATCH 15/21] Add default bg colours for header --- style/new_style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/style/new_style.css b/style/new_style.css index 6a2f4b5..69b5278 100644 --- a/style/new_style.css +++ b/style/new_style.css @@ -67,6 +67,10 @@ body { @media(min-width:1025px){#home{background-image:url("/images/headers/index/1920.webp")}} @media(min-width:1921px){#home{background-image:url("/images/headers/index/2800.webp")}} @media(min-width:2801px){#home{background-image:url("/images/headers/index/4096.webp")}} +#contact{background-color: blue} +#keys{background-color: blue} +#projects{background-color: blue} +#email-safety{background-color: blue} #header_face { display: flex; position: absolute; -- 2.34.1 From 19d8a7ef8b7bae7600811461407ad46662154212 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 19:35:28 +0000 Subject: [PATCH 16/21] Adjust .content style - p text-align and a color --- style/new_style.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/style/new_style.css b/style/new_style.css index 69b5278..f84c6ea 100644 --- a/style/new_style.css +++ b/style/new_style.css @@ -5,6 +5,7 @@ --overlay-color: #2f4f4fb8; --main-text-color: azure; --link-color: cyan; + --link-visited-color: rgb(189, 0, 189); } /* FONTS */ @font-face { @@ -198,10 +199,20 @@ body { margin: auto; margin-top: 20px; margin-bottom: 40px; + text-align: center; color: var(--main-text-color); font-family: oxygen, sans-serif; font-weight: normal; } +.content a { + color: var(--link-color) +} +.content a:visited { + color: var(--link-color) +} +.content a:hover { + color: var(--link-visited-color) +} /* FOOTER */ footer { position: relative; -- 2.34.1 From 59cb62af56cc0cd9a356bafebea201d413daa237 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 19:40:18 +0000 Subject: [PATCH 17/21] Final adjustments to new style --- about.php | 18 ++++++++++++++++++ index.php | 12 ++++++------ page-blocks/TEMPLATE.php | 24 ++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 about.php create mode 100644 page-blocks/TEMPLATE.php diff --git a/about.php b/about.php new file mode 100644 index 0000000..b54dd02 --- /dev/null +++ b/about.php @@ -0,0 +1,18 @@ + + + + + + + + + + +
+

+ Sorry, I've not written anything for here yet. +

+
+ + + \ No newline at end of file diff --git a/index.php b/index.php index 2975518..c315118 100644 --- a/index.php +++ b/index.php @@ -9,12 +9,12 @@
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ut eros leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Cras tempus, leo sit amet placerat sollicitudin, magna massa vehicula nisi, sed malesuada odio velit iaculis est. Cras egestas nec lectus ac ultrices. Interdum et malesuada fames ac ante ipsum primis in faucibus. Suspendisse cursus odio et massa finibus consequat non sed dolor. Suspendisse eu leo ut nunc tincidunt lacinia. Sed faucibus eu enim sit amet commodo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Quisque commodo laoreet odio, ac sollicitudin odio.

-

Sed volutpat, dolor quis dignissim varius, risus urna tincidunt nulla, non bibendum urna ante eget enim. Pellentesque sit amet neque lobortis, auctor nulla sagittis, bibendum nisl. Proin fermentum tristique dolor, in vehicula mi efficitur et. Fusce ac justo nulla. In eget odio felis. Suspendisse et tellus tincidunt, consequat mi eu, gravida neque. In elementum lacus ut convallis ornare. Mauris elementum lorem felis, et tincidunt massa consectetur in. Suspendisse ut augue blandit, efficitur augue nec, pellentesque odio. Nulla aliquet arcu vitae vehicula ultricies.

-

Ispum

-

Sed eleifend massa sed sagittis malesuada. Phasellus velit urna, congue sit amet felis dictum, congue ornare tortor. Donec consequat lectus sit amet iaculis ornare. Pellentesque luctus, orci a sagittis efficitur, dolor justo convallis dolor, vitae aliquam dolor eros a nunc. Sed suscipit volutpat est ac ultrices. Cras tempus tellus est, eu tristique est gravida eget. Nulla turpis odio, aliquam id vehicula non, dignissim egestas orci. Suspendisse pulvinar enim eu tortor tincidunt, vel luctus purus pellentesque. Curabitur efficitur mollis est, at imperdiet dui auctor a. Ut malesuada lacus ac nulla tempor sollicitudin. Pellentesque enim elit, eleifend eget ligula sit amet, sagittis efficitur elit. Donec blandit tellus ut vestibulum iaculis. Fusce vel ipsum non felis bibendum porttitor a ut dui. Donec ornare augue augue, a elementum justo ornare quis. Praesent ante tellus, blandit in ultricies id, bibendum sit amet mi. Suspendisse tristique ornare erat.

-

Praesent malesuada sit amet libero eu volutpat. Duis lacinia turpis sit amet malesuada bibendum. Pellentesque ut velit at turpis placerat consequat id sed augue. Cras eleifend augue sem, sed hendrerit nibh feugiat eu. Nam cursus lectus fermentum quam feugiat porttitor. Sed bibendum a enim ut commodo. Maecenas lacinia dolor ante, vel bibendum nulla venenatis aliquam. Aenean ultricies felis eros, quis cursus arcu dictum vitae.

-

Ut magna urna, pretium tincidunt congue id, sodales sed lacus. Suspendisse potenti. Aenean nec quam ultrices, dignissim velit sit amet, cursus nisl. Duis nec risus a nisl porta fringilla. Phasellus vel fermentum justo, a malesuada ex. Nullam eu metus quis arcu sodales vestibulum. Maecenas efficitur gravida risus vitae pretium. Donec non nulla sodales, consectetur est ut, tristique nisl. Phasellus sed dui sed erat efficitur cursus. Vestibulum eget est purus. Aliquam mi ante, hendrerit ac ornare ac, imperdiet et diam. Nunc fermentum nunc faucibus massa finibus mattis.

+

+ Hello, I'm Fred. I do lots of little projects so read more about them here. +

+

+ I will eventually write money_format +

diff --git a/page-blocks/TEMPLATE.php b/page-blocks/TEMPLATE.php new file mode 100644 index 0000000..8dab7bc --- /dev/null +++ b/page-blocks/TEMPLATE.php @@ -0,0 +1,24 @@ + + + + + + + + + + +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ut eros leo. +

+

Ispum

+

+ Sed eleifend massa sed sagittis malesuada. Phasellus velit urna, congue sit + amet felis dictum, congue ornare tortor. Donec consequat lectus sit amet + iaculis ornare. Pellentesque luctus, orci a sagittis efficitur, dolor justo. +

+
+ + + \ No newline at end of file -- 2.34.1 From 9a2fc11626952aa7aa022d6550621b5afe258d45 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 19:57:54 +0000 Subject: [PATCH 18/21] Update page content, correct about title --- about.php | 2 +- index.php | 7 +++++-- style/new_style.css | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/about.php b/about.php index b54dd02..011ae0d 100644 --- a/about.php +++ b/about.php @@ -1,5 +1,5 @@ - + diff --git a/index.php b/index.php index c315118..30fb811 100644 --- a/index.php +++ b/index.php @@ -10,10 +10,13 @@

- Hello, I'm Fred. I do lots of little projects so read more about them here. + Hello, I'm Fred, a rail professional + and Local RMT Rep. I don't intend for this to be about + work though, I do lots of hobbies on the side and you can + read about them here.

- I will eventually write money_format + I will eventually write more here and probably throw in some photos.

diff --git a/style/new_style.css b/style/new_style.css index f84c6ea..6947298 100644 --- a/style/new_style.css +++ b/style/new_style.css @@ -72,6 +72,7 @@ body { #keys{background-color: blue} #projects{background-color: blue} #email-safety{background-color: blue} +#about{background-color: blue} #header_face { display: flex; position: absolute; -- 2.34.1 From d063444a8b325792234faf4ff1e2b03b940a9a90 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 20:00:39 +0000 Subject: [PATCH 19/21] Fix getAge function call --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 30fb811..c83084a 100644 --- a/index.php +++ b/index.php @@ -10,7 +10,7 @@

- Hello, I'm Fred, a rail professional + Hello, I'm Fred, a rail professional and Local RMT Rep. I don't intend for this to be about work though, I do lots of hobbies on the side and you can read about them here. -- 2.34.1 From a3f80aab6bd8a3465743ecd86f5ac1c56aeebf1c Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 20:01:29 +0000 Subject: [PATCH 20/21] Fix age echo --- index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index c83084a..9e3d9fe 100644 --- a/index.php +++ b/index.php @@ -10,10 +10,10 @@

- Hello, I'm Fred, a rail professional - and Local RMT Rep. I don't intend for this to be about - work though, I do lots of hobbies on the side and you can - read about them here. + Hello, I'm Fred, a year old + rail professional and Local RMT Rep. I don't intend for + this to be about work though, I do lots of hobbies on the + side and you can read about them here.

I will eventually write more here and probably throw in some photos. -- 2.34.1 From 3af11cac67e447155a357bf5917e1e50ded8b2d0 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Sun, 30 Oct 2022 20:02:45 +0000 Subject: [PATCH 21/21] Add note about social links in contact.php --- contact.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contact.php b/contact.php index 715ab0f..02ca24c 100644 --- a/contact.php +++ b/contact.php @@ -13,6 +13,8 @@ I will build a contact form here. For the moment:
Add me to your contacts +
+ or check out my social links in the menu.

-- 2.34.1