From 69b2b9765f4b03ef756b2f01a38585dfeab1f5f3 Mon Sep 17 00:00:00 2001 From: sorenpeter Date: Tue, 31 Oct 2023 20:00:48 +0100 Subject: [PATCH] profile view works now with ?url=... --- index.php | 4 +- libs/simple.css | 689 ++++++++++++++++++++++ partials/base.php | 5 +- partials/header.php | 2 +- partials/{profile.php => profile_old.php} | 23 +- style.css | 11 +- views/home.php | 23 +- views/profile.php | 122 ++++ 8 files changed, 850 insertions(+), 29 deletions(-) create mode 100644 libs/simple.css rename partials/{profile.php => profile_old.php} (59%) create mode 100644 views/profile.php diff --git a/index.php b/index.php index 48858dc..2ac6c63 100644 --- a/index.php +++ b/index.php @@ -12,7 +12,6 @@ $viewDir = '/views/'; // Define your routes using regular expressions - // TODO: re-add auto detection of files in /views as routes $routes = [ '/' => 'home.php', @@ -22,7 +21,8 @@ $routes = [ '/refresh' => 'load_twt_files.php', '/login' => 'login.php', '/logout' => 'logout.php', - '/profile/([a-zA-Z0-9_-]+)' => 'profile.php', + '/profile' => 'profile.php', + //'/profile/([a-zA-Z0-9_-]+)' => 'profile.php', '/conv/([a-zA-Z0-9]{7})' => 'conv.php', // matches only twtHash of exactly 7 alphanumeric characters '/post/([a-zA-Z0-9]{7})' => 'post.php', // matches only twtHash of exactly 7 alphanumeric characters ]; diff --git a/libs/simple.css b/libs/simple.css new file mode 100644 index 0000000..4f663b0 --- /dev/null +++ b/libs/simple.css @@ -0,0 +1,689 @@ +/* Global variables. */ +:root, +::backdrop { + /* Set sans-serif & mono fonts */ + --sans-font: -apple-system, BlinkMacSystemFont, "Avenir Next", Avenir, + "Nimbus Sans L", Roboto, "Noto Sans", "Segoe UI", Arial, Helvetica, + "Helvetica Neue", sans-serif; + --mono-font: Consolas, Menlo, Monaco, "Andale Mono", "Ubuntu Mono", monospace; + --standard-border-radius: 5px; + + /* Default (light) theme */ + --bg: #fff; + --accent-bg: #f5f7ff; + --text: #212121; + --text-light: #585858; + --border: #898EA4; + --accent: #0d47a1; + --code: #d81b60; + --preformatted: #444; + --marked: #ffdd33; + --disabled: #efefef; +} + +/* Dark theme */ +@media (prefers-color-scheme: dark) { + :root, + ::backdrop { + color-scheme: dark; + --bg: #212121; + --accent-bg: #2b2b2b; + --text: #dcdcdc; + --text-light: #ababab; + --accent: #ffb300; + --code: #f06292; + --preformatted: #ccc; + --disabled: #111; + } + /* Add a bit of transparency so light media isn't so glaring in dark mode */ + img, + video { + opacity: 0.8; + } +} + +/* Reset box-sizing */ +*, *::before, *::after { + box-sizing: border-box; +} + +/* Reset default appearance */ +textarea, +select, +input, +progress { + appearance: none; + -webkit-appearance: none; + -moz-appearance: none; +} + +html { + /* Set the font globally */ + font-family: var(--sans-font); + scroll-behavior: smooth; +} + +/* Make the body a nice central block */ +body { + color: var(--text); + background-color: var(--bg); + font-size: 1.15rem; + line-height: 1.5; + display: grid; + grid-template-columns: 1fr min(45rem, 90%) 1fr; + margin: 0; +} +body > * { + grid-column: 2; +} + +/* Make the header bg full width, but the content inline with body */ +body > header { + background-color: var(--accent-bg); + border-bottom: 1px solid var(--border); + text-align: center; + padding: 0 0.5rem 2rem 0.5rem; + grid-column: 1 / -1; +} + +body > header > *:only-child { + margin-block-start: 2rem; +} + +body > header h1 { + max-width: 1200px; + margin: 1rem auto; +} + +body > header p { + max-width: 40rem; + margin: 1rem auto; +} + +/* Add a little padding to ensure spacing is correct between content and header > nav */ +main { + padding-top: 1.5rem; +} + +body > footer { + margin-top: 4rem; + padding: 2rem 1rem 1.5rem 1rem; + color: var(--text-light); + font-size: 0.9rem; + text-align: center; + border-top: 1px solid var(--border); +} + +/* Format headers */ +h1 { + font-size: 3rem; +} + +h2 { + font-size: 2.6rem; + margin-top: 3rem; +} + +h3 { + font-size: 2rem; + margin-top: 3rem; +} + +h4 { + font-size: 1.44rem; +} + +h5 { + font-size: 1.15rem; +} + +h6 { + font-size: 0.96rem; +} + +p { + margin: 1.5rem 0; +} + +/* Prevent long strings from overflowing container */ +p, h1, h2, h3, h4, h5, h6 { + overflow-wrap: break-word; +} + +/* Fix line height when title wraps */ +h1, +h2, +h3 { + line-height: 1.1; +} + +/* Reduce header size on mobile */ +@media only screen and (max-width: 720px) { + h1 { + font-size: 2.5rem; + } + + h2 { + font-size: 2.1rem; + } + + h3 { + font-size: 1.75rem; + } + + h4 { + font-size: 1.25rem; + } +} + +/* Format links & buttons */ +a, +a:visited { + color: var(--accent); +} + +a:hover { + text-decoration: none; +} + +button, +.button, +a.button, /* extra specificity to override a */ +input[type="submit"], +input[type="reset"], +input[type="button"], +label[type="button"] { + border: 1px solid var(--accent); + background-color: var(--accent); + color: var(--bg); + padding: 0.5rem 0.9rem; + text-decoration: none; + line-height: normal; +} + +.button[aria-disabled="true"], +input:disabled, +textarea:disabled, +select:disabled, +button[disabled] { + cursor: not-allowed; + background-color: var(--disabled); + border-color: var(--disabled); + color: var(--text-light); +} + +input[type="range"] { + padding: 0; +} + +/* Set the cursor to '?' on an abbreviation and style the abbreviation to show that there is more information underneath */ +abbr[title] { + cursor: help; + text-decoration-line: underline; + text-decoration-style: dotted; +} + +button:enabled:hover, +.button:not([aria-disabled="true"]):hover, +input[type="submit"]:enabled:hover, +input[type="reset"]:enabled:hover, +input[type="button"]:enabled:hover, +label[type="button"]:hover { + filter: brightness(1.4); + cursor: pointer; +} + +.button:focus-visible, +button:focus-visible:where(:enabled), +input:enabled:focus-visible:where( + [type="submit"], + [type="reset"], + [type="button"] +) { + outline: 2px solid var(--accent); + outline-offset: 1px; +} + +/* Format navigation */ +header > nav { + font-size: 1rem; + line-height: 2; + padding: 1rem 0 0 0; +} + +/* Use flexbox to allow items to wrap, as needed */ +header > nav ul, +header > nav ol { + align-content: space-around; + align-items: center; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + list-style-type: none; + margin: 0; + padding: 0; +} + +/* List items are inline elements, make them behave more like blocks */ +header > nav ul li, +header > nav ol li { + display: inline-block; +} + +header > nav a, +header > nav a:visited { + margin: 0 0.5rem 1rem 0.5rem; + border: 1px solid var(--border); + border-radius: var(--standard-border-radius); + color: var(--text); + display: inline-block; + padding: 0.1rem 1rem; + text-decoration: none; +} + +header > nav a:hover, +header > nav a.current, +header > nav a[aria-current="page"] { + border-color: var(--accent); + color: var(--accent); + cursor: pointer; +} + +/* Reduce nav side on mobile */ +@media only screen and (max-width: 720px) { + header > nav a { + border: none; + padding: 0; + text-decoration: underline; + line-height: 1; + } +} + +/* Consolidate box styling */ +aside, details, pre, progress { + background-color: var(--accent-bg); + border: 1px solid var(--border); + border-radius: var(--standard-border-radius); + margin-bottom: 1rem; +} + +aside { + font-size: 1rem; + width: 30%; + padding: 0 15px; + margin-inline-start: 15px; + float: right; +} +*[dir="rtl"] aside { + float: left; +} + +/* Make aside full-width on mobile */ +@media only screen and (max-width: 720px) { + aside { + width: 100%; + float: none; + margin-inline-start: 0; + } +} + +article, fieldset, dialog { + border: 1px solid var(--border); + padding: 1rem; + border-radius: var(--standard-border-radius); + margin-bottom: 1rem; +} + +article h2:first-child, +section h2:first-child { + margin-top: 1rem; +} + +section { + border-top: 1px solid var(--border); + border-bottom: 1px solid var(--border); + padding: 2rem 1rem; + margin: 3rem 0; +} + +/* Don't double separators when chaining sections */ +section + section, +section:first-child { + border-top: 0; + padding-top: 0; +} + +section:last-child { + border-bottom: 0; + padding-bottom: 0; +} + +details { + padding: 0.7rem 1rem; +} + +summary { + cursor: pointer; + font-weight: bold; + padding: 0.7rem 1rem; + margin: -0.7rem -1rem; + word-break: break-all; +} + +details[open] > summary + * { + margin-top: 0; +} + +details[open] > summary { + margin-bottom: 0.5rem; +} + +details[open] > :last-child { + margin-bottom: 0; +} + +/* Format tables */ +table { + border-collapse: collapse; + margin: 1.5rem 0; +} + +td, +th { + border: 1px solid var(--border); + text-align: start; + padding: 0.5rem; +} + +th { + background-color: var(--accent-bg); + font-weight: bold; +} + +tr:nth-child(even) { + /* Set every other cell slightly darker. Improves readability. */ + background-color: var(--accent-bg); +} + +table caption { + font-weight: bold; + margin-bottom: 0.5rem; +} + +/* Format forms */ +textarea, +select, +input, +button, +.button { + font-size: inherit; + font-family: inherit; + padding: 0.5rem; + margin-bottom: 0.5rem; + border-radius: var(--standard-border-radius); + box-shadow: none; + max-width: 100%; + display: inline-block; +} +textarea, +select, +input { + color: var(--text); + background-color: var(--bg); + border: 1px solid var(--border); +} +label { + display: block; +} +textarea:not([cols]) { + width: 100%; +} + +/* Add arrow to drop-down */ +select:not([multiple]) { + background-image: linear-gradient(45deg, transparent 49%, var(--text) 51%), + linear-gradient(135deg, var(--text) 51%, transparent 49%); + background-position: calc(100% - 15px), calc(100% - 10px); + background-size: 5px 5px, 5px 5px; + background-repeat: no-repeat; + padding-inline-end: 25px; +} +*[dir="rtl"] select:not([multiple]) { + background-position: 10px, 15px; +} + +/* checkbox and radio button style */ +input[type="checkbox"], +input[type="radio"] { + vertical-align: middle; + position: relative; + width: min-content; +} + +input[type="checkbox"] + label, +input[type="radio"] + label { + display: inline-block; +} + +input[type="radio"] { + border-radius: 100%; +} + +input[type="checkbox"]:checked, +input[type="radio"]:checked { + background-color: var(--accent); +} + +input[type="checkbox"]:checked::after { + /* Creates a rectangle with colored right and bottom borders which is rotated to look like a check mark */ + content: " "; + width: 0.18em; + height: 0.32em; + border-radius: 0; + position: absolute; + top: 0.05em; + left: 0.17em; + background-color: transparent; + border-right: solid var(--bg) 0.08em; + border-bottom: solid var(--bg) 0.08em; + font-size: 1.8em; + transform: rotate(45deg); +} +input[type="radio"]:checked::after { + /* creates a colored circle for the checked radio button */ + content: " "; + width: 0.25em; + height: 0.25em; + border-radius: 100%; + position: absolute; + top: 0.125em; + background-color: var(--bg); + left: 0.125em; + font-size: 32px; +} + +/* Makes input fields wider on smaller screens */ +@media only screen and (max-width: 720px) { + textarea, + select, + input { + width: 100%; + } +} + +/* Set a height for color input */ +input[type="color"] { + height: 2.5rem; + padding: 0.2rem; +} + +/* do not show border around file selector button */ +input[type="file"] { + border: 0; +} + +/* Misc body elements */ +hr { + border: none; + height: 1px; + background: var(--border); + margin: 1rem auto; +} + +mark { + padding: 2px 5px; + border-radius: var(--standard-border-radius); + background-color: var(--marked); + color: black; +} + +mark a { + color: #0d47a1; +} + +img, +video { + max-width: 100%; + height: auto; + border-radius: var(--standard-border-radius); +} + +figure { + margin: 0; + display: block; + overflow-x: auto; +} + +figcaption { + text-align: center; + font-size: 0.9rem; + color: var(--text-light); + margin-bottom: 1rem; +} + +blockquote { + margin-inline-start: 2rem; + margin-inline-end: 0; + margin-block: 2rem; + padding: 0.4rem 0.8rem; + border-inline-start: 0.35rem solid var(--accent); + color: var(--text-light); + font-style: italic; +} + +cite { + font-size: 0.9rem; + color: var(--text-light); + font-style: normal; +} + +dt { + color: var(--text-light); +} + +/* Use mono font for code elements */ +code, +pre, +pre span, +kbd, +samp { + font-family: var(--mono-font); + color: var(--code); +} + +kbd { + color: var(--preformatted); + border: 1px solid var(--preformatted); + border-bottom: 3px solid var(--preformatted); + border-radius: var(--standard-border-radius); + padding: 0.1rem 0.4rem; +} + +pre { + padding: 1rem 1.4rem; + max-width: 100%; + overflow: auto; + color: var(--preformatted); +} + +/* Fix embedded code within pre */ +pre code { + color: var(--preformatted); + background: none; + margin: 0; + padding: 0; +} + +/* Progress bars */ +/* Declarations are repeated because you */ +/* cannot combine vendor-specific selectors */ +progress { + width: 100%; +} + +progress:indeterminate { + background-color: var(--accent-bg); +} + +progress::-webkit-progress-bar { + border-radius: var(--standard-border-radius); + background-color: var(--accent-bg); +} + +progress::-webkit-progress-value { + border-radius: var(--standard-border-radius); + background-color: var(--accent); +} + +progress::-moz-progress-bar { + border-radius: var(--standard-border-radius); + background-color: var(--accent); + transition-property: width; + transition-duration: 0.3s; +} + +progress:indeterminate::-moz-progress-bar { + background-color: var(--accent-bg); +} + +dialog { + max-width: 40rem; + margin: auto; +} + +dialog::backdrop { + background-color: var(--bg); + opacity: 0.8; +} + +@media only screen and (max-width: 720px) { + dialog { + max-width: 100%; + margin: auto 1em; + } +} + +/* Superscript & Subscript */ +/* Prevent scripts from affecting line-height. */ +sup, sub { + vertical-align: baseline; + position: relative; +} + +sup { + top: -0.4em; +} + +sub { + top: 0.3em; +} + +/* Classes for notices */ +.notice { + background: var(--accent-bg); + border: 2px solid var(--border); + border-radius: 5px; + padding: 1.5rem; + margin: 2rem 0; +} diff --git a/partials/base.php b/partials/base.php index 2a34dfd..a0ba705 100644 --- a/partials/base.php +++ b/partials/base.php @@ -78,6 +78,9 @@ $fileContent = mb_convert_encoding($fileContent, 'UTF-8'); $fileLines = explode("\n", $fileContent); $twtFollowingList = []; + +// Show twts only for URL in query request, else show user timeline + if (!empty($_GET['twts'])) { // Show twts for some user $twtsURL = $_GET['twts']; if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) { @@ -117,6 +120,7 @@ foreach ($parsedTwtxtFiles as $currentTwtFile) { } } +// Show individual posts if (!empty($_GET['hash'])) { $hash = $_GET['hash']; $twts = array_filter($twts, function($twt) use ($hash) { @@ -124,7 +128,6 @@ if (!empty($_GET['hash'])) { }); } - krsort($twts, SORT_NUMERIC); if (!empty($_GET['hash'])) { diff --git a/partials/header.php b/partials/header.php index 2ec30f8..1fcff5e 100644 --- a/partials/header.php +++ b/partials/header.php @@ -2,7 +2,7 @@ - + <?= $title ?> diff --git a/partials/profile.php b/partials/profile_old.php similarity index 59% rename from partials/profile.php rename to partials/profile_old.php index b8a4448..cdb36ea 100644 --- a/partials/profile.php +++ b/partials/profile_old.php @@ -4,6 +4,7 @@ if (!empty($_GET['twts'])) { $url = $twtsURL; } + $profile = getTwtsFromTwtxtString($url); ?> @@ -22,12 +23,12 @@ $profile = getTwtsFromTwtxtString($url);

description ?>

- Posts | + - Following | + twtxt.txt | How to follow @@ -36,18 +37,4 @@ $profile = getTwtsFromTwtxtString($url); - - - \ No newline at end of file + \ No newline at end of file diff --git a/style.css b/style.css index 4171140..7c8b1d9 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,4 @@ -/* Simple CSS overwrites */ +/* === SimpleCSS overwrites === */ ::backdrop, :root { --sans-font: -apple-system,BlinkMacSystemFont,"Avenir Next",Avenir,"Nimbus Sans L",Roboto,"Noto Sans","Segoe UI",Arial,Helvetica,"Helvetica Neue",sans-serif; @@ -17,15 +17,22 @@ } body > header { + display: flex; + justify-content: space-between; padding-bottom: 0; } +body > header p { +/* max-width: 40rem;*/ + margin: 1rem; +} + header > nav a { /* border: none;*/ } -/* Timeline Style */ +/* === Timeline Style === */ .right { float: right; diff --git a/views/home.php b/views/home.php index 1e45aa2..3c452df 100644 --- a/views/home.php +++ b/views/home.php @@ -7,8 +7,10 @@ include 'partials/header.php'; ?> -mainURL] = $parsedTwtxtFile; include 'partials/profile.php'; } -} ?> +} +*/ +?> +} + +/* +else { + $url = "Location: /?twts=".$config['public_txt_url']; + //header($url); +} +*/ + +?> diff --git a/views/profile.php b/views/profile.php new file mode 100644 index 0000000..6eeaa8e --- /dev/null +++ b/views/profile.php @@ -0,0 +1,122 @@ + + + +"; + $twtsURL = $_GET['url']; + echo "after GET(url): ".$twtsURL."
"; + + if (filter_var($twtsurl, FILTER_VALIDATE_URL) === FALSE) { + die('Not a valid URL'); + } + + $parsedTwtxtFile = getTwtsFromTwtxtString($twtsURL); + if (!is_null($parsedTwtxtFile)) { + $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; + } + +} else { // Show timeline for the URL + $twtsURL = $config['public_txt_url']; + //$twtsURL = "http://darch.dk/twtxt.txt"; + + if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) { + die('Not a valid URL'); + } + + $parsedTwtxtFile = getTwtsFromTwtxtString($twtsURL); + if (!is_null($parsedTwtxtFile)) { + $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; + } +} + +$twts = []; + +# Combine all the followers twts +foreach ($parsedTwtxtFiles as $currentTwtFile) { + if (!is_null($currentTwtFile)) { + $twts += $currentTwtFile->twts; + } +} + +krsort($twts, SORT_NUMERIC); + + +/* Profile header + +if (empty($_GET['url'])) { // Show twts for some user + $twtsURL = $config['txt_file_path']; + + if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) { + die('Not a valid URL'); + } + + $parsedTwtxtFile = getTwtsFromTwtxtString($twtsURL); + if (!is_null($parsedTwtxtFile)) { + $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; + } +} +*/ + +echo $twtsURL; + +$profile = getTwtsFromTwtxtString($twtsURL); + + +?> + +
+ + + + + +
+ + nick ?>@mainURL, PHP_URL_HOST); ?> + + +

description ?>

+ + + + + + twtxt.txt | + How to follow + + + + +
+ +
+ + + + + + + + +