From b84ae55103b5fbb381fad2b7ad3e6fb6918f685b Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Wed, 24 Jun 2020 17:40:08 +0000
Subject: [PATCH 1/6] Updated Docusaurus config to ignore Javadocs CSS

---
 website2/website/siteConfig.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website2/website/siteConfig.js b/website2/website/siteConfig.js
index e8fa9c9da3c..54ca12bc82b 100644
--- a/website2/website/siteConfig.js
+++ b/website2/website/siteConfig.js
@@ -107,6 +107,11 @@ const siteConfig = {
     theme: 'default',
   },
 
+  separateCss: [
+      `${baseUrl}public/api/java/stylesheet.css`,
+      `${baseUrl}static/api/stylesheet.css`,
+  ],
+
   // Add custom scripts here that would be placed in <script> tags.
   scripts: [
     'https://buttons.github.io/buttons.js',

From b02d5fff741ae64357f8a92c0b631b548858e178 Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Wed, 24 Jun 2020 20:06:51 +0000
Subject: [PATCH 2/6] Refactored and updated gitignore rules

---
 .gitignore          | 7 +------
 website2/.gitignore | 6 +++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index d33c02d3a77..bf19afe1f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,12 +130,7 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 
 # generated for the website
-website/node_modules/
-website/public/
-
-website2/website/public
-website2/website/static/api
-website2/website/venv/
+generated-site/
 
 # Visual Studio Code
 .vscode
diff --git a/website2/.gitignore b/website2/.gitignore
index 5395ea795d6..e3ff46e3bd4 100755
--- a/website2/.gitignore
+++ b/website2/.gitignore
@@ -1,12 +1,16 @@
 .DS_Store
 
-node_modules
+website/node_modules
 
 lib/core/metadata.js
 lib/core/MetadataBlog.js
 
+website/public/
+website/static/api/
+website/venv/
 website/translated_docs
 website/build/
 website/yarn.lock
 website/node_modules
 website/i18n/*
+website/scripts/bazelrc

From 028d8ad13f8b81565bc69765ead1074cd7d69259 Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Wed, 24 Jun 2020 20:10:44 +0000
Subject: [PATCH 3/6] Added more CSS ignore rules

---
 website2/website/siteConfig.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/website2/website/siteConfig.js b/website2/website/siteConfig.js
index 54ca12bc82b..39fcf2d5090 100644
--- a/website2/website/siteConfig.js
+++ b/website2/website/siteConfig.js
@@ -107,9 +107,16 @@ const siteConfig = {
     theme: 'default',
   },
 
+  // Ignores CSS files found in the static folder.
+  // Any CSS files not listed here will be added to the Docusaurus main.css
   separateCss: [
-      `${baseUrl}public/api/java/stylesheet.css`,
+      `${baseUrl}static/css/custom.css`,
       `${baseUrl}static/api/stylesheet.css`,
+      `${baseUrl}static/api/java/jquery/jquery-ui.css`,
+      `${baseUrl}static/api/java/jquery/jquery-ui.min.css`,
+      `${baseUrl}static/api/java/jquery/jquery-ui.structure.min.css`,
+      `${baseUrl}static/api/java/jquery/jquery-ui.structure.css`,
+      `${baseUrl}static/api/java/stylesheet.css`,
   ],
 
   // Add custom scripts here that would be placed in <script> tags.

From 84cecf5fa4821f696385109f520c6e32105ec1db Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Wed, 24 Jun 2020 20:11:13 +0000
Subject: [PATCH 4/6] Website build script cleanup

---
 website2/website/Makefile              | 10 +++++++---
 website2/website/scripts/build-site.sh | 10 +---------
 website2/website/scripts/javadocs.sh   | 16 +---------------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/website2/website/Makefile b/website2/website/Makefile
index 7c259917a68..38ddc9540ca 100644
--- a/website2/website/Makefile
+++ b/website2/website/Makefile
@@ -1,3 +1,5 @@
+.PHONY : start javadocs python-docs buildsite publish clean
+
 start:
 	yarn start
 
@@ -7,10 +9,12 @@ javadocs:
 python-docs:
 	@scripts/python-doc-gen.sh 0.0.0
 
-buildsite:
-	@scripts/javadocs.sh
-	@scripts/python-doc-gen.sh 0.0.0
+buildsite: javadocs python-docs
 	@scripts/build-site.sh
 
 publish:
 	@scripts/publish_site.sh
+
+clean:
+	rm -rf static/api/*
+	rm -rf build/*
\ No newline at end of file
diff --git a/website2/website/scripts/build-site.sh b/website2/website/scripts/build-site.sh
index 2647259bb86..126dcb07c06 100755
--- a/website2/website/scripts/build-site.sh
+++ b/website2/website/scripts/build-site.sh
@@ -28,14 +28,6 @@ npm run-script build
 
 node ./scripts/replace.js
 
-rm -rf ${ROOT_DIR}/generated-site/content
-mkdir -p ${ROOT_DIR}/generated-site/content/api/java
-mkdir -p ${ROOT_DIR}/generated-site/content/api/python
+rm -rf ${ROOT_DIR}/generated-site/content/*
 ## copy generated site
 cp -R build/incubator-heron/* ${ROOT_DIR}/generated-site/content
-## copy java docs
-cp -R ${ROOT_DIR}/website2/website/public/api/java/* ${ROOT_DIR}/generated-site/content/api/java/
-## copy pydocs
-cp -R ${ROOT_DIR}/website2/website/static/api/python/* ${ROOT_DIR}/generated-site/content/api/python/
-## remove bazelrc for dockerfile
-rm ${ROOT_DIR}/website2/website/scripts/bazelrc
\ No newline at end of file
diff --git a/website2/website/scripts/javadocs.sh b/website2/website/scripts/javadocs.sh
index cbd9c4190ea..8cd99f25ced 100755
--- a/website2/website/scripts/javadocs.sh
+++ b/website2/website/scripts/javadocs.sh
@@ -21,10 +21,7 @@ JAVADOC=javadoc
 FLAGS="-quiet -Xdoclint:none"
 
 HERON_ROOT_DIR=$(git rev-parse --show-toplevel)
-# for display on GitHub website
-JAVADOC_OUTPUT_DIR=$HERON_ROOT_DIR/website2/website/public/api/java
-# for display on local Hugo server
-JAVADOC_OUTPUT_LOCAL_DIR=$HERON_ROOT_DIR/website2/website/static/api
+JAVADOC_OUTPUT_DIR=$HERON_ROOT_DIR/website2/website/static/api/java
 GEN_PROTO_DIR=$HERON_ROOT_DIR/bazel-bin/heron/proto/_javac
 
 # The path of the customized landing page for the Javadocs
@@ -66,16 +63,5 @@ $JAVADOC $FLAGS \
   -overview $OVERVIEW_HTML_FILE \
   -d $JAVADOC_OUTPUT_DIR $GEN_FILES $HERON_SRC_FILES $BACKTYPE_SRC_FILES $APACHE_SRC_FILES || true
 
-# Generated Java API doc needs to be copied to $JAVADOC_OUTPUT_LOCAL_DIR
-# for the following two reasons:
-# 1. When one is developing website locally, They should
-#    be able to click into API doc link and view API doc to
-#    check if the correct API link is given.
-# 2. ``wget`` needs to verify if links to Java API doc are valid when we are
-#    serving the website locally. This means that Hugo should be able to display
-#    Java API doc properly.
-
-cp -r $JAVADOC_OUTPUT_DIR $JAVADOC_OUTPUT_LOCAL_DIR
 echo "Javadocs generated at $JAVADOC_OUTPUT_DIR"
-echo "Javadocs copied to: $JAVADOC_OUTPUT_LOCAL_DIR"
 exit 0

From 6f38f33e3fdaf10388cb8f5a784cdd360458f0d1 Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Wed, 24 Jun 2020 20:20:20 +0000
Subject: [PATCH 5/6] More cleanup

After script cleanup, this file is no longer generated
---
 website2/website/siteConfig.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website2/website/siteConfig.js b/website2/website/siteConfig.js
index 39fcf2d5090..c5b92785fdc 100644
--- a/website2/website/siteConfig.js
+++ b/website2/website/siteConfig.js
@@ -111,7 +111,6 @@ const siteConfig = {
   // Any CSS files not listed here will be added to the Docusaurus main.css
   separateCss: [
       `${baseUrl}static/css/custom.css`,
-      `${baseUrl}static/api/stylesheet.css`,
       `${baseUrl}static/api/java/jquery/jquery-ui.css`,
       `${baseUrl}static/api/java/jquery/jquery-ui.min.css`,
       `${baseUrl}static/api/java/jquery/jquery-ui.structure.min.css`,

From 5e1399953361b487e8dfee23fdd42a2894d45d25 Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Wed, 24 Jun 2020 22:46:08 +0000
Subject: [PATCH 6/6] bug fix

---
 website2/website/scripts/build-site.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/website2/website/scripts/build-site.sh b/website2/website/scripts/build-site.sh
index 126dcb07c06..3c43b28178b 100755
--- a/website2/website/scripts/build-site.sh
+++ b/website2/website/scripts/build-site.sh
@@ -28,6 +28,7 @@ npm run-script build
 
 node ./scripts/replace.js
 
-rm -rf ${ROOT_DIR}/generated-site/content/*
 ## copy generated site
+rm -rf ${ROOT_DIR}/generated-site/content/*
+mkdir -p ${ROOT_DIR}/generated-site/content/
 cp -R build/incubator-heron/* ${ROOT_DIR}/generated-site/content