From 3135f86014423a85ab628474173dfa26035c50e3 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Thu, 23 Jun 2022 02:29:38 -0500
Subject: [PATCH] aaa

---
 public/index.html          |  2 +-
 src/pages/DownloadPage.tsx | 24 ++++++++++++++++++------
 src/util/Jenkins.ts        |  7 ++++---
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/public/index.html b/public/index.html
index 5f0f39c5..617d4372 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000"/>
     <meta
             name="description"
-            content="The official website for the minecraft server software, Scissors, which aims to patch creative mode exploits"
+            content="The official website for the Minecraft server software, Scissors, which aims to patch creative mode exploits"
     />
 <!--    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png"/>-->
     <!--
diff --git a/src/pages/DownloadPage.tsx b/src/pages/DownloadPage.tsx
index 5ff3b88c..6f6905a9 100644
--- a/src/pages/DownloadPage.tsx
+++ b/src/pages/DownloadPage.tsx
@@ -4,10 +4,12 @@ import { Build, getBuilds, getJobs, Job } from "../util/Jenkins";
 
 import "../css/DownloadPage.css"
 import { Button } from "react-bootstrap";
+import { Alert } from "react-bootstrap";
+import { Container } from "react-bootstrap";
 
 const DownloadPage = () => {
-    const [ jobs, setJobs ] = useState(new Map<Job, Build[]>())
-    const [ version, setVersion ] = useState("")
+    const [jobs, setJobs] = useState(new Map<Job, Build[]>())
+    const [ version, setVersion ] = useState("1.19")
     useEffect(() => {
         doJobs().then(value => {
         })
@@ -38,11 +40,21 @@ const DownloadPage = () => {
     }
 
     return (
-        <Fragment>
+        <Container fluid className="p-4">
+            <Alert variant="secondary">
+                <Alert.Heading>Scissors Downloads</Alert.Heading>
+                <p>
+                    You may download builds of Scissors from here. Select the version you would like below. If the downloads page is not working, please use our <a href="https://ci.scissors.gg/job/Scissors">CI Server</a> instead.
+                </p>
+                <hr />
+                <p className="mb-0">
+                    P.S. If you know React, PLEASE help us make this look better. Our code is <a href="https://github.com/AtlasMediaGroup/Scissors-Website/tree/master">here</a>.
+                </p>
+            </Alert>
             <ul className={"versions"}>
                 {Array.from(jobs.keys()).map(value => {
-                    return <li className={version == value.name ? "selected" : "selectable"}
-                               onClick={onClick}>{value.name}</li>
+                    return <li className={version === value.name ? "selected" : "selectable"}
+                        onClick={onClick}>{value.name}</li>
                 })}
             </ul>
             <ul className={"builds"}>
@@ -58,7 +70,7 @@ const DownloadPage = () => {
                     </li>
                 })}
             </ul>
-        </Fragment>
+        </Container >
     );
 }
 
diff --git a/src/util/Jenkins.ts b/src/util/Jenkins.ts
index f42cfd3b..7c0b2cff 100644
--- a/src/util/Jenkins.ts
+++ b/src/util/Jenkins.ts
@@ -20,9 +20,10 @@ export type BuildChange = {
     comment: string,
     id: string,
 }
+
 export function getJobs(): Promise<Job[]> {
     let jobs: Job[] = []
-    let request = axios.get(`${JENKINS_URL}/${ARTIFACT_NAME}/api/json`)
+    let request = axios.get(`${JENKINS_URL}/${ARTIFACT_NAME}/api/json?pretty=true`)
 
     return new Promise((resolve, reject) => {
         request.then(value => {
@@ -34,14 +35,14 @@ export function getJobs(): Promise<Job[]> {
 
 export function getBuilds(version: string): Promise<Build[]> {
     let builds: Build[] = []
-    let request = axios.get(`${JENKINS_URL}/${ARTIFACT_NAME}/job/${version}/api/json`)
+    let request = axios.get(`${JENKINS_URL}/${ARTIFACT_NAME}/job/${version}/api/json?pretty=true`)
 
     return new Promise((resolve, reject) => {
         request.then(value => {
             builds = value.data.builds as Build[]
             let count = 0;
             for (let build of builds) {
-                axios.get(`${JENKINS_URL}/${ARTIFACT_NAME}/job/${version}/${build.number}/api/json`).then(value1 => {
+                axios.get(`${JENKINS_URL}/${ARTIFACT_NAME}/job/${version}/${build.number}/api/json?pretty=true`).then(value1 => {
                     build.timestamp = value1.data.timestamp
                     let changeSet: any[] = value1.data.changeSets
                     if (changeSet.length > 0) {