diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..824a804 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/site-posts"] + path = src/site-posts + url = git@git.clortox.com:Infrastructure/site-posts.git diff --git a/src/common/article.php b/src/common/article.php index fe6cee0..f50a952 100644 --- a/src/common/article.php +++ b/src/common/article.php @@ -37,7 +37,7 @@ class Article { public function getPostData($postId) { $result = mysqli_query($this->client, 'SELECT * FROM post WHERE ID = ' . $postId); - return mysqli_fetch_all($result); + return mysqli_fetch_all($result)[0]; } } diff --git a/src/common/common.css b/src/common/common.css index 8a8494e..78a9ca8 100644 --- a/src/common/common.css +++ b/src/common/common.css @@ -14,7 +14,7 @@ h1, h2, h3, h4 { color: white; } -p, a, li, tr, td, span, noscript { +p, a, li, tr, td, span, noscript, figcaption { font-family: 'Lekton', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; @@ -50,6 +50,61 @@ button:hover { margin-top: 25px; } +.list-clickable-div { + display: block; + width: calc(100% - 10px - 3px); + height: auto; + text-decoration: underline 0.15em rgba(255,255,255,0); + transition: 300ms; + border: dashed; + border-radius: 5px; + background-color: rgba(0,0,0,0.4); + margin: 5px; +} + +.list-clickable-div p { + margin: 15px 5px; +} + +.list-clickable-div:hover { + text-decoration: underline 0.15em rgba(255,255,255,1); + background-color: rgba(0,0,0,0.85); + +} + +.dashed-bottom { + border-bottom: 5px dashed white; + +} + +.dashed-border { + border: 5px dashed white; +} + +.soft-background { + background: rgba(11,11,12, 0.3); + border-radius: 15px; + padding: 10px; +} + +figure { + border: 5px dashed white; + padding: 5px; +} + +figure img { + max-height: 40vh; + margin-left: auto; + margin-right: auto; + display: block; +} + +figcaption { + text-align: center; + margin-top: 0.5em; + +} + textarea { max-height: 20em; diff --git a/src/index.css b/src/index.css index 3a90120..d770d9d 100644 --- a/src/index.css +++ b/src/index.css @@ -75,12 +75,6 @@ margin-top: -20px; } -.soft-background { - background: rgba(11,11,12, 0.3); - border-radius: 15px; - padding: 10px; -} - .index-item { display: grid; align-content: center; diff --git a/src/index.php b/src/index.php index 421f050..bdb48fb 100644 --- a/src/index.php +++ b/src/index.php @@ -11,7 +11,7 @@ -
+

Hi, I'm Tyler

diff --git a/src/posts/catalog.css b/src/posts/catalog.css new file mode 100644 index 0000000..bcb3abc --- /dev/null +++ b/src/posts/catalog.css @@ -0,0 +1,29 @@ +.catalog-div { + min-height: 30vh; + padding-top: 35px; + margin: 15px; + padding-left: 20px; + padding-right: 20px; +} + +.link-float { + display: inline-block; + padding-left: 10px; + padding-right: 10px; + +} + +.inline-title { + display: inline-block; +} + +.inline-date { + float: right; + display: inline; +} + +.article-list { + min-height: 80%; + padding: 5px; + +} diff --git a/src/posts/catalog.php b/src/posts/catalog.php new file mode 100644 index 0000000..738155e --- /dev/null +++ b/src/posts/catalog.php @@ -0,0 +1,45 @@ + + + + + + + Tyler Perkins - Home + + + + + getAllPosts(); + + ?> +
+

Post catalog

+
+ '; + echo '

(' . $author . ') ' . $title . '

'; + echo '

' . $creation->format('M j, Y') . '

'; + echo ''; + } + ?> +
+
+ + + + diff --git a/src/posts/index.css b/src/posts/index.css new file mode 100644 index 0000000..3a86408 --- /dev/null +++ b/src/posts/index.css @@ -0,0 +1,23 @@ +.post-wrapper { + min-height: 60vh; + margin: 15px; +} + +.title-head { + min-height: 10vh; + margin-bottom: 35px; + + padding-top: 2.75em; + padding-left: 20px; + padding-right: 10px; + padding-bottom: 0.3em; + border-radius: 0px; +} + +.article-title { + margin: 5px; +} + +.article-author { + margin: 5px; +} diff --git a/src/posts/index.php b/src/posts/index.php new file mode 100644 index 0000000..05e4ef2 --- /dev/null +++ b/src/posts/index.php @@ -0,0 +1,47 @@ + + + + + + + Tyler Perkins - Home + + + + + getPostData($reqId); + + if($post == null) { + header('Location: /posts/catalog.php'); + die(); + } + + + $title = $post[3]; + $author = $post[1]; + ?> + +
+

+

Written by

+
+ +
+ +
+ + + + diff --git a/src/site-posts b/src/site-posts new file mode 160000 index 0000000..b9bfe5d --- /dev/null +++ b/src/site-posts @@ -0,0 +1 @@ +Subproject commit b9bfe5dd2e189c28a51f00c5f9facc9415bba911