From bd966f576b16c093f76268f08734497b36e81e2b Mon Sep 17 00:00:00 2001
From: Tyler Perkins <tperki17@kent.edu>
Date: Thu, 22 Dec 2022 20:08:33 -0500
Subject: [PATCH 1/3] Refactor git and resume

---
 src/common/git.php                   | 70 ++++++++++++++++------------
 src/common/header.php                |  2 +-
 src/index.php                        |  3 +-
 src/{resume.php => resume/index.php} |  6 ++-
 4 files changed, 46 insertions(+), 35 deletions(-)
 rename src/{resume.php => resume/index.php} (76%)

diff --git a/src/common/git.php b/src/common/git.php
index ca31a3a..898e2d1 100644
--- a/src/common/git.php
+++ b/src/common/git.php
@@ -1,52 +1,60 @@
 <?php
-function getResumeReleases() {
-    $curl = curl_init();
-    curl_setopt($curl, CURLOPT_URL, "https://git.clortox.com/api/v1/repos/tyler/Resume/releases?per_page=1&access_token=" . getenv("GITEA_TOKEN"));
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 
-    $result = curl_exec($curl);
-    if(!$result){
-        header('HTTP/1.1 500 Internal Server Error');
-        die();
+class Gitea {
+    private $giteaToken;
+
+    public function __construct(String $token) {
+        $this->giteaToken = $token;
     }
 
-    curl_close($curl);
+    public function getResumeReleases() : String {
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, "https://git.clortox.com/api/v1/repos/tyler/Resume/releases?per_page=1&access_token=" . $this->giteaToken);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 
-    return $result;
+        $result = curl_exec($curl);
+        if(!$result){
+            header('HTTP/1.1 500 Internal Server Error');
+            die();
+        }
 
-}
+        curl_close($curl);
 
-function getRecentProjects() {
-    $curl = curl_init();
-    curl_setopt($curl, CURLOPT_URL, "https://git.clortox.com/api/v1/user/repos?page=1&limit=100&access_token=" . getenv("GITEA_TOKEN"));
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        return $result;
 
-    $result = curl_exec($curl);
-    if(!$result){
-        header('HTTP/1.1 500 Internal Server Error');
-        die();
     }
 
-    curl_close($curl);
-    //now we need to parse out the results into a nice array containing the
-    //most recent items
+    public function getRecentProjects() : array {
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, "https://git.clortox.com/api/v1/user/repos?page=1&limit=100&access_token=" . $this->giteaToken);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 
-    $parsed = json_decode($result, true);
+        $result = curl_exec($curl);
+        if(!$result){
+            header('HTTP/1.1 500 Internal Server Error');
+            die();
+        }
 
-    $ret = array();
+        curl_close($curl);
+        //now we need to parse out the results into a nice array containing the
+        //most recent items
+
+        $parsed = json_decode($result, true);
+
+        $ret = array();
+
+        foreach($parsed as $item){
+            array_push($ret, $item);
+        }
+
+        usort($ret, "datecmp");
+        return $ret;
 
-    foreach($parsed as $item){
-        array_push($ret, $item);
     }
 
-    usort($ret, "datecmp");
-    return $ret;
-
 }
 
 function datecmp($lhs, $rhs) {
     return $lhs["updated_at"] < $rhs["updated_at"];
 }
-
-
 ?>
diff --git a/src/common/header.php b/src/common/header.php
index 27974dd..9c667a5 100644
--- a/src/common/header.php
+++ b/src/common/header.php
@@ -2,7 +2,7 @@
     <link rel="stylesheet" href="/common/header.css">
     <nav class="navbar sticky">
         <a href="/">Home</a>
-        <a href="/resume.php">Resume</a>
+        <a href="/resume">Resume</a>
         <a href="https://git.clortox.com">Git</a>
         <a href="/utilities/">Utilities</a>
         <a href="https://wiki.clortox.com">Wiki</a>
diff --git a/src/index.php b/src/index.php
index d53ab00..de94e65 100644
--- a/src/index.php
+++ b/src/index.php
@@ -32,7 +32,8 @@
                 <h3>Projects</h3>
                 <div>
                 <?php
-                    $result = getRecentProjects();
+                    $giteaClient = new Gitea(getenv("GITEA_TOKEN"));
+                    $result = $giteaClient->getRecentProjects();
                     array_splice($result, 6, -1);
                     foreach($result as $item){
                         if($item["private"])
diff --git a/src/resume.php b/src/resume/index.php
similarity index 76%
rename from src/resume.php
rename to src/resume/index.php
index d74cc35..2d6da5c 100644
--- a/src/resume.php
+++ b/src/resume/index.php
@@ -1,8 +1,10 @@
 <?php
 
-include 'common/git.php';
+include '../common/git.php';
 
-$parsed = json_decode(getResumeReleases(), true);
+$giteaClient = new Gitea(getenv('GITEA_TOKEN'));
+
+$parsed = json_decode($giteaClient->getResumeReleases(), true);
 
 $url = $parsed[0]["assets"][0]["browser_download_url"];
 if(!$url){

From b621ced611df4c5869aa9f6d4bfc145d5ab0c273 Mon Sep 17 00:00:00 2001
From: Tyler Perkins <tperki17@kent.edu>
Date: Fri, 23 Dec 2022 15:58:54 -0500
Subject: [PATCH 2/3] Add article DAO

---
 sql/0-initdatabase.sql | 28 +++++++++++++++++++++++++++
 src/common/article.php | 44 ++++++++++++++++++++++++++++++++++++++++++
 src/index.css          | 22 ++++++++++++++++++---
 src/index.php          | 23 ++++++++++++++++++++--
 4 files changed, 112 insertions(+), 5 deletions(-)
 create mode 100644 sql/0-initdatabase.sql
 create mode 100644 src/common/article.php

diff --git a/sql/0-initdatabase.sql b/sql/0-initdatabase.sql
new file mode 100644
index 0000000..78c97e3
--- /dev/null
+++ b/sql/0-initdatabase.sql
@@ -0,0 +1,28 @@
+-- 22-12-22
+-- Init the database
+
+START TRANSACTION;
+
+CREATE DATABASE [IF NOT EXISTS] site;
+USE site;
+
+CREATE TABLE post(
+    ID INT AUTO_INCREMENT PRIMARY KEY,
+    author VARCHAR(32) NOT NULL,
+    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    title VARCHAR(64) NOT NULL,
+);
+
+CREATE TABLE tag(
+    ID INT AUTO_INCREMENT PRIMARY KEY,
+    title VARCHAR(32)
+);
+
+CREATE TABLE post_tag(
+    tag_id INT NOT NULL,
+    post_id INT NOT NULL,
+    FOREIGN KEY (tag_id) REFERENCES tag(ID) ON DELETE CASCADE,
+    FOREIGN KEY (post_id) REFERENCES post(ID) ON DELETE CASCADE
+);
+
+COMMIT;
diff --git a/src/common/article.php b/src/common/article.php
new file mode 100644
index 0000000..91dff2d
--- /dev/null
+++ b/src/common/article.php
@@ -0,0 +1,44 @@
+<?php
+class Article {
+    private $client;
+
+    // Factory constructors
+    public static function makeNewClient() : Article {
+        $host = getenv("MYSQL_HOST");
+        $db   = getenv("MYSQL_DB");
+        $user = getenv("MYSQL_USER");
+        $pass = getenv("MYSQL_PASS");
+
+        $host = "127.0.0.1";
+        $db   = "site";
+        $user = "root";
+        $pass = "password";
+        return new Article($host, $db, $user, $pass);
+    }
+
+    public static function makeNewClientWithSpecs(String $host,
+            String $db, String $user, String $pass) : Article {
+        return new Article($host, $db, $user, $pass);
+    }
+
+    private function __construct(String $host, String $db, String $user, String $pass){
+        $this->client = mysqli_connect($host, $user, $pass, $db);
+    }
+
+    function getAllPosts() {
+        $result = mysqli_query($this->client, 'SELECT * FROM post');
+        return mysqli_fetch_all($result);
+    }
+
+    function getMostRecentPosts($limit){
+        $result = mysqli_query($this->client, 'SELECT * FROM post ORDER BY created DESC LIMIT ' . $limit);
+        return mysqli_fetch_all($result);
+    }
+
+    function getPostData($postId) {
+        $result = mysqli_query($this->client, 'SELECT * FROM post WHERE ID = ' . $postId);
+        return mysqli_fetch_all($result);
+    }
+
+}
+?>
diff --git a/src/index.css b/src/index.css
index e712b35..3a90120 100644
--- a/src/index.css
+++ b/src/index.css
@@ -31,7 +31,7 @@
     text-decoration: none;
 }
 
-.git-clickable-div {
+.list-clickable-div {
     display: block;
     width: calc(100% - 10px - 3px);
     height: auto;
@@ -42,16 +42,31 @@
     background-color: rgba(0,0,0,0.4);
     margin: 5px;
 }
-.git-clickable-div p {
+
+.list-clickable-div p {
     margin: 15px 5px;
 }
 
-.git-clickable-div:hover {
+.list-clickable-div:hover {
     text-decoration: underline 0.15em rgba(255,255,255,1);
     background-color: rgba(0,0,0,0.85);
 
 }
 
+.clickable-header {
+    display: block;
+    text-decoration-color: rgba(255,255,255,0) !important;
+}
+
+.clickable-header h3 {
+    text-decoration: underline 0.15em rgba(255,255,255,0) !important;
+    transition: 300ms;
+}
+
+.clickable-header h3:hover {
+    text-decoration: underline 0.15em rgba(255,255,255,1);
+}
+
 .single-column {
     grid-template-columns: 1fr !important;
 }
@@ -84,6 +99,7 @@
 .index-column {
     display: grid;
     grid-template-rows: 10em 1fr;
+    width: calc(100% - 3em);
 
 }
 
diff --git a/src/index.php b/src/index.php
index de94e65..421f050 100644
--- a/src/index.php
+++ b/src/index.php
@@ -3,6 +3,7 @@
 <head>
     <?php include 'common/include.php' ?>
     <?php include 'common/git.php' ?>
+    <?php include 'common/article.php' ?>
 
     <title>Tyler Perkins - Home</title>
     <link rel="stylesheet" href="index.css">
@@ -45,7 +46,7 @@
                         $description = $item["description"];
 
                         //build out the html
-                        echo '<a class="git-clickable-div" href="' . $url . '">';
+                        echo '<a class="list-clickable-div" href="' . $url . '">';
                         echo '<p>' . $name . ' - ' . $description . '</p>';
                         echo '</a>';
                     }
@@ -54,7 +55,25 @@
             </div>
             <div class="index-column">
                 <h3>Articles</h3>
-                <p>To be implemented</p>
+                <div>
+                <?php
+                    $articleClient = Article::makeNewClient();
+                    $posts = $articleClient->getMostRecentPosts(5);
+
+                    foreach($posts as $post){
+                        if($post == null)
+                            continue;
+
+                        $id     = $post[0];
+                        $author = $post[1];
+                        $title  = $post[3];
+
+                        echo '<a class="list-clickable-div" href="/posts/?id=' . $id . '">';
+                        echo '<p>(' . $author . ') ' . $title . '</p>';
+                        echo '</a>';
+                    }
+                ?>
+                </div>
             </div>
         </div>
     </div>

From 61e0fba181e910c73c9fe889d976a37e51f7c7a6 Mon Sep 17 00:00:00 2001
From: Tyler Perkins <tperki17@kent.edu>
Date: Fri, 23 Dec 2022 16:13:35 -0500
Subject: [PATCH 3/3] Make DOA query functions public

---
 src/common/article.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/article.php b/src/common/article.php
index 91dff2d..fe6cee0 100644
--- a/src/common/article.php
+++ b/src/common/article.php
@@ -25,17 +25,17 @@ class Article {
         $this->client = mysqli_connect($host, $user, $pass, $db);
     }
 
-    function getAllPosts() {
+    public function getAllPosts() {
         $result = mysqli_query($this->client, 'SELECT * FROM post');
         return mysqli_fetch_all($result);
     }
 
-    function getMostRecentPosts($limit){
+    public function getMostRecentPosts($limit){
         $result = mysqli_query($this->client, 'SELECT * FROM post ORDER BY created DESC LIMIT ' . $limit);
         return mysqli_fetch_all($result);
     }
 
-    function getPostData($postId) {
+    public function getPostData($postId) {
         $result = mysqli_query($this->client, 'SELECT * FROM post WHERE ID = ' . $postId);
         return mysqli_fetch_all($result);
     }