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] 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){