From 371913f6cd8056152954f1b411de99a6b4da5f97 Mon Sep 17 00:00:00 2001
From: Sora Kanosue <sorakanosue@berkeley.edu>
Date: Thu, 30 Sep 2021 08:48:11 -0700
Subject: [PATCH 1/4] Switch html anchors to button components

---
 huxley/www/js/components/AdvisorPaperView.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/huxley/www/js/components/AdvisorPaperView.js b/huxley/www/js/components/AdvisorPaperView.js
index a67f96a04..65010a911 100644
--- a/huxley/www/js/components/AdvisorPaperView.js
+++ b/huxley/www/js/components/AdvisorPaperView.js
@@ -246,6 +246,14 @@ class AdvisorPaperView extends React.Component {
         var fileName = names ? names[names.length - 1] : null;
         var gradedFileName = fileName ? "graded_" + fileName : null;
         var downloadPaper = paper ? (
+          <Button
+            color="green"
+            size="small"
+            href={originalHrefData}
+            
+          >
+            &#10515;
+          </Button>
           <a
             className={cx({
               button: true,

From c47e31a8f64db27b2d3b9dff4d5d5639dc573bd5 Mon Sep 17 00:00:00 2001
From: Sora Kanosue <sorakanosue@berkeley.edu>
Date: Tue, 5 Oct 2021 17:21:31 -0700
Subject: [PATCH 2/4] Modified an HTML anchor in AdvisorPaperView

---
 .gitignore                                   |  4 ++-
 huxley/www/js/components/AdvisorPaperView.js | 26 ++++----------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20c890729..b465cf107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,6 @@ test_position_paper.doc
 env/
 .vscode/
 
-huxley/service.json
\ No newline at end of file
+huxley/service.json
+
+huxley-venv/
\ No newline at end of file
diff --git a/huxley/www/js/components/AdvisorPaperView.js b/huxley/www/js/components/AdvisorPaperView.js
index 65010a911..e06cdaf9f 100644
--- a/huxley/www/js/components/AdvisorPaperView.js
+++ b/huxley/www/js/components/AdvisorPaperView.js
@@ -250,37 +250,21 @@ class AdvisorPaperView extends React.Component {
             color="green"
             size="small"
             href={originalHrefData}
-            
-          >
-            &#10515;
-          </Button>
-          <a
-            className={cx({
-              button: true,
-              "button-small": true,
-              "button-green": true,
-              "rounded-small": true,
-            })}
-            href={originalHrefData}
             download={fileName}
           >
             &#10515;
-          </a>
+          </Button>
         ) : null;
         var gradedPaper =
           paper && graded ? (
-            <a
-              className={cx({
-                button: true,
-                "button-small": true,
-                "button-blpaperue": true,
-                "rounded-small": true,
-              })}
+            <Button
+              color="green"
+              size="small"
               href={gradedHrefData}
               download={gradedFileName}
             >
               &#10515;
-            </a>
+            </Button>
           ) : null;
 
         var category1 = null;

From 947c4b5364308e3dd4cb85c36b9cdafa238cca2b Mon Sep 17 00:00:00 2001
From: Sora Kanosue <sorakanosue@berkeley.edu>
Date: Tue, 5 Oct 2021 17:43:40 -0700
Subject: [PATCH 3/4] Switch HTML anchors to Buttons in PaperSubmissionTable
 and PaperGradeTable

---
 huxley/www/js/components/PaperGradeTable.js   | 30 +++++++------------
 .../www/js/components/PaperSubmissionTable.js | 24 +++++----------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/huxley/www/js/components/PaperGradeTable.js b/huxley/www/js/components/PaperGradeTable.js
index b784b6002..a2c339a5f 100644
--- a/huxley/www/js/components/PaperGradeTable.js
+++ b/huxley/www/js/components/PaperGradeTable.js
@@ -40,36 +40,28 @@ class PaperGradeTable extends React.Component {
       var fileName = fileNames[fileNames.length - 1];
       var gradedName = gradedHrefData ? "graded_" + fileName : null;
       var downloadGraded = gradedHrefData ? (
-        <a
-          className={cx({
-            button: true,
-            "button-large": true,
-            "button-green": true,
-            "rounded-small": true,
-          })}
+        <Button
+          color="green"
+          size="large"
           href={gradedHrefData}
-          download={gradedName}
+          download={gradedFileName}
         >
           Download Graded
-        </a>
+        </Button>
       ) : null;
       buttons = (
         <div>
           <Button color="red" onClick={this._handleUnset}>
             Go Back
           </Button>
-          <a
-            className={cx({
-              button: true,
-              "button-large": true,
-              "button-green": true,
-              "rounded-small": true,
-            })}
-            href={hrefData}
-            download={fileName}
+          <Button
+            color="green"
+            size="large"
+            href={gradedHrefData}
+            download={gradedFileName}
           >
             Download Original
-          </a>
+          </Button>
           {downloadGraded}
           <Button
             color="blue"
diff --git a/huxley/www/js/components/PaperSubmissionTable.js b/huxley/www/js/components/PaperSubmissionTable.js
index 993b8d238..005b744dc 100644
--- a/huxley/www/js/components/PaperSubmissionTable.js
+++ b/huxley/www/js/components/PaperSubmissionTable.js
@@ -30,33 +30,25 @@ class PaperSubmissionTable extends React.Component {
       var fileNames = paper.file.split("/");
       var fileName = fileNames[fileNames.length - 1];
       var gradedButton = paper.graded ? (
-        <a
-          className={cx({
-            button: true,
-            "button-large": true,
-            "button-blue": true,
-            "rounded-small": true,
-          })}
+        <Button
+          size="large"
+          color="blue"  
           href={gradedHrefData}
           download={"graded_" + fileName}
         >
           Download Graded Paper
-        </a>
+        </Button>
       ) : null;
       buttons = (
         <div>
-          <a
-            className={cx({
-              button: true,
-              "button-large": true,
-              "button-green": true,
-              "rounded-small": true,
-            })}
+          <Button
+            size="large"
+            color="green"  
             href={hrefData}
             download={fileName}
           >
             Download Paper
-          </a>
+          </Button>
           {gradedButton}
         </div>
       );

From fd433872b81d77f2fa54697bbcc6d6851f41bb46 Mon Sep 17 00:00:00 2001
From: Sora Kanosue <sorakanosue@berkeley.edu>
Date: Wed, 5 Jan 2022 11:46:22 +0100
Subject: [PATCH 4/4] Added missing import to AdvisorPaperView and fixed
 filenames in PaperGradeTable

---
 huxley/www/js/components/AdvisorPaperView.js | 1 +
 huxley/www/js/components/PaperGradeTable.js  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/huxley/www/js/components/AdvisorPaperView.js b/huxley/www/js/components/AdvisorPaperView.js
index e06cdaf9f..0fece48cd 100644
--- a/huxley/www/js/components/AdvisorPaperView.js
+++ b/huxley/www/js/components/AdvisorPaperView.js
@@ -10,6 +10,7 @@ import React from "react";
 
 var { _accessSafe } = require("utils/_accessSafe");
 var { AssignmentStore } = require("stores/AssignmentStore");
+var { Button } = require("components/core/Button");
 var { CommitteeStore } = require("stores/CommitteeStore");
 var { CountryStore } = require("stores/CountryStore");
 var { CurrentUserStore } = require("stores/CurrentUserStore");
diff --git a/huxley/www/js/components/PaperGradeTable.js b/huxley/www/js/components/PaperGradeTable.js
index a2c339a5f..35fb3b0c0 100644
--- a/huxley/www/js/components/PaperGradeTable.js
+++ b/huxley/www/js/components/PaperGradeTable.js
@@ -44,7 +44,7 @@ class PaperGradeTable extends React.Component {
           color="green"
           size="large"
           href={gradedHrefData}
-          download={gradedFileName}
+          download={gradedName}
         >
           Download Graded
         </Button>
@@ -58,7 +58,7 @@ class PaperGradeTable extends React.Component {
             color="green"
             size="large"
             href={gradedHrefData}
-            download={gradedFileName}
+            download={fileName}
           >
             Download Original
           </Button>