Component list ordering

JSTOR-Labs · Jul 25, 2021 · 2deb7ed · 2deb7ed
1 parent 82f3850
commit 2deb7ed
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -1579,36 +1579,38 @@ <h1>Update Juncture site</h1>
       let ref = contentSource.acct === 'jstor-labs' && contentSource.repo === 'juncture' ? junctureVersionHash : contentSource.ref
 
       if (window.location.hostname === 'localhost' || window.location.hostname.indexOf('gitpod') > 0) {
+
         componentsList = [...componentsList, ...await listComponents(
         `${contentSource.baseUrl}${contentSource.isGhpSite ? contentSource.basePath : ''}`, 'custom/components')]
         componentsList = [...componentsList, ...await listComponents(
         `${contentSource.baseUrl}${contentSource.isGhpSite ? contentSource.basePath : ''}`, 'components')]
-      }
-
-      if (contentSource.repo !== 'juncture' || contentSource.acct !== 'jstor-labs') {
-        componentsList = [...componentsList, ...await listComponents(
-          `https://api.github.com/repos/${contentSource.acct}/${contentSource.repo}/git/trees/${ref}`,
-          'custom/components',
-          `https://raw.githubusercontent.com/${contentSource.acct}/${contentSource.repo}/${ref}`)]
-        componentsList = [...componentsList, ...await listComponents(
-          `https://api.github.com/repos/${contentSource.acct}/${contentSource.repo}/git/trees/${ref}`,
-          'components',
-          `https://raw.githubusercontent.com/${contentSource.acct}/${contentSource.repo}/${ref}`)]
-      }
+
+      } else {
+
+        if (contentSource.repo !== 'juncture' || contentSource.acct !== 'jstor-labs') {
+          componentsList = [...componentsList, ...await listComponents(
+            `https://api.github.com/repos/${contentSource.acct}/${contentSource.repo}/git/trees/${ref}`,
+            'custom/components',
+            `https://raw.githubusercontent.com/${contentSource.acct}/${contentSource.repo}/${ref}`)]
+          componentsList = [...componentsList, ...await listComponents(
+            `https://api.github.com/repos/${contentSource.acct}/${contentSource.repo}/git/trees/${ref}`,
+            'components',
+            `https://raw.githubusercontent.com/${contentSource.acct}/${contentSource.repo}/${ref}`)]
+        }
 
-      if (window.location.hostname !== 'localhost' && window.location.hostname.indexOf('gitpod') < 0) {
         componentsList = [...componentsList, ...await listComponents(
           `${contentSource.baseUrl}${contentSource.isGhpSite ? contentSource.basePath : ''}`, 'custom/components')]
         componentsList = [...componentsList, ...await listComponents(
           `${contentSource.baseUrl}${contentSource.isGhpSite ? contentSource.basePath : ''}`, 'components')]
+
       }
 
       componentsList = [...componentsList, ...await listComponents(
         `https://api.github.com/repos/jstor-labs/juncture/git/trees/${junctureVersionHash}`,
         'components',
         `https://raw.githubusercontent.com/jstor-labs/juncture/${junctureVersionHash}`)]
 
-        return componentsList
+      return componentsList
     }
 
     function parseUrl(href) {