From eefdbfda5a8a8ab2a78eadd646ecc752bf494db1 Mon Sep 17 00:00:00 2001
From: Sean Morris <sean.smorris@berkeley.edu>
Date: Wed, 21 Jul 2021 11:43:15 -0700
Subject: [PATCH 01/10] Link generator handles non-git sources

The link generator creates gitpuller links for non-git
sources including archives from google drive, dropbox
and any publicly accessible web URL. In order to handle a non-
git source correctly in nbgitpuller, we added the provider
parameter to the URL string.

Other Changes:
- if git is the source, the branch parameter is always included on the
URL and defaults to 'main' if none is provided. This should then allow
users that have not upgraded their nbgitpuller version to still
work.
- All sources(git and non-git) can handle a path to a particular folder
or notebook. I had taken this ability away from non-git sources in
earlier versions.
---
 .circleci/config.yml     |  12 +++
 _static/link_gen/link.js | 179 +++++++++++++++++++++++++++++++--------
 link.html                |  98 ++++++++++++++++++---
 3 files changed, 243 insertions(+), 46 deletions(-)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..a9a91c66
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,12 @@
+version: 2.1
+jobs:
+  build:
+    docker:
+      - image: circleci/python:3.6
+    steps:
+      - run: echo "no operation build"
+
+workflows:
+  build:
+    jobs:
+      - build
\ No newline at end of file
diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index dd371c81..21d0b5cf 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -1,19 +1,25 @@
 // Pure function that generates an nbgitpuller URL
-function generateRegularUrl(hubUrl, urlPath, repoUrl, branch) {
+function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source) {
 
     // assume hubUrl is a valid URL
     var url = new URL(hubUrl);
 
     url.searchParams.set('repo', repoUrl);
-
+    
+    if(compressed) {
+      url.searchParams.set('provider', source);
+    }
+    
     if (urlPath) {
         url.searchParams.set('urlpath', urlPath);
     }
 
     if (branch) {
         url.searchParams.set('branch', branch);
+    } else if(source == "git"){
+        url.searchParams.set('branch', "main");
     }
-
+    
     if (!url.pathname.endsWith('/')) {
         url.pathname += '/'
     }
@@ -22,20 +28,26 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch) {
     return url.toString();
 }
 
-function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch) {
+function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source) {
     // assume hubUrl is a valid URL
     var url = new URL(hubUrl);
 
     var nextUrlParams = new URLSearchParams();
 
     nextUrlParams.append('repo', repoUrl);
-
+    
+    if(compressed) {
+      nextUrlParams.append('provider', source);
+    }
+    
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
 
     if (branch) {
         nextUrlParams.append('branch', branch);
+    } else if(source == "git"){
+        nextUrlParams.append('branch', "main");
     }
 
     var nextUrl = '/hub/user-redirect/git-pull?' + nextUrlParams.toString();
@@ -50,7 +62,7 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch) {
 }
 
 function generateBinderUrl(hubUrl, userName, repoName, branch, urlPath,
-    contentRepoUrl, contentRepoBranch) {
+    contentRepoUrl, contentRepoBranch, compressed, source) {
 
     var url = new URL(hubUrl);
 
@@ -58,12 +70,18 @@ function generateBinderUrl(hubUrl, userName, repoName, branch, urlPath,
 
     nextUrlParams.append('repo', contentRepoUrl);
 
+    if(compressed) {
+      nextUrlParams.append('provider', source);
+    }
+    
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
 
     if (contentRepoBranch) {
         nextUrlParams.append('branch', contentRepoBranch);
+    } else if(source == "git"){
+        nextUrlParams.append('branch', "main");
     }
 
     var nextUrl = 'git-pull?' + nextUrlParams.toString();
@@ -100,37 +118,46 @@ var apps = {
     }
 }
 
+function clearLinks(){
+    document.getElementById('default-link').value = "";
+    document.getElementById('binder-link').value = "";
+    document.getElementById('canvas-link').value = "";
+}
+
+
 function changeTab(div) {
     var hub = document.getElementById("hub");
     var hub_help_text = document.getElementById("hub-help-text");
-    var env_repo = document.getElementById("repo");
-    var env_repo_branch = document.getElementById("branch");
-    var env_repo_help_text = document.getElementById("env-repo-help-text");
-    var content_repo = document.getElementById("content-repo-group");
-    var content_branch = document.getElementById("content-branch-group");
+    var env_repo_group = document.getElementById("env-repo-group");
+    var env_repo = document.getElementById("env-repo");
+<<<<<<< HEAD
+=======
+    // var env_repo_branch = document.getElementById("env-branch");
+    // var env_repo_help_text = document.getElementById("env-repo-help-text");
+>>>>>>> b5b1e8e... JupyterHub link gen working
     var id = div.id;
-
+    var form = document.getElementById('linkgenerator');
+    
+    clearLinks();
     if (id.includes("binder")) {
         hub.placeholder = "https://mybinder.org";
         hub.value = "https://mybinder.org";
         hub_help_text.hidden = true;
         hub.labels[0].innerHTML = "BinderHub URL";
-        env_repo.labels[0].innerHTML = "Git Environment Repository URL";
-        env_repo_help_text.hidden = false;
-        env_repo_branch.required = true;
-        env_repo_branch.pattern = ".+";
-        content_repo.hidden = false;
-        content_branch.hidden = false;
+        
+        env_repo_group.style.display = '';
+        env_repo.disabled = false;
+
     } else {
         hub.placeholder = "https://hub.example.com";
+        hub.value = "";
         hub_help_text.hidden = false;
         hub.labels[0].innerHTML = "JupyterHub URL";
-        env_repo.labels[0].innerHTML = "Git Repository URL";
-        env_repo_help_text.hidden = true;
-        env_repo_branch.required = false;
-        content_repo.hidden = true;
-        content_branch.hidden = true;
+        
+        env_repo_group.style.display = 'none';
+        env_repo.disabled = true;
     }
+    displaySource();
 }
 
 /**
@@ -141,28 +168,60 @@ function changeTab(div) {
  * See https://github.com/git/git/blob/1c52ecf4ba0f4f7af72775695fee653f50737c71/builtin/clone.c#L276
  */
 function generateCloneDirectoryName(gitCloneUrl) {
+    if(gitCloneUrl.slice(-1) == "/")
+      gitCloneUrl = gitCloneUrl.slice(0,-1);
     var lastPart = gitCloneUrl.split('/').slice(-1)[0];
     return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
 }
 
+function handleSource(args){
+  source = args["source"];
+  branch = "";
+  compressed = true;
+  sourceUrl ="";
+  if(source == "git"){
+      sourceUrl = args["contentRepoUrl"];
+      branch = args["contentRepoBranch"];
+      compressed = false;
+  } else if(source == "googledrive"){
+      sourceUrl = args["driveUrl"];
+  } else if(source == "dropbox"){
+      sourceUrl =  args["dropUrl"];
+  } else if(source == "standard"){
+      sourceUrl =  args["webUrl"];
+  }
+  return {
+    "branch": branch,
+    "sourceUrl": sourceUrl,
+    "compressed": compressed
+  }
+}
+
 function displayLink() {
     var form = document.getElementById('linkgenerator');
-
+    
     form.classList.add('was-validated');
     if (form.checkValidity()) {
         var hubUrl = document.getElementById('hub').value;
-        var repoUrl = document.getElementById('repo').value;
-        var branch = document.getElementById('branch').value;
+        var driveUrl = document.getElementById('drive-url').value;
+        var dropUrl = document.getElementById('drop-url').value;
+        var webUrl = document.getElementById('standard-url').value;
+        var envRepoUrl = document.getElementById('env-repo').value;
+        var envGitBranch = document.getElementById('env-branch').value;
         var contentRepoUrl = document.getElementById('content-repo').value;
         var contentRepoBranch = document.getElementById('content-branch').value;
         var filePath = document.getElementById('filepath').value;
         var appName = form.querySelector('input[name="app"]:checked').value;
         var activeTab = document.querySelector(".nav-link.active").id;
-
+        var source = form.querySelector('input[name="source"]:checked').value;
+        
         if (appName === 'custom') {
             var urlPath = document.getElementById('urlpath').value;
         } else {
-            var repoName = generateCloneDirectoryName(repoUrl);
+            var repoName = generateCloneDirectoryName(contentRepoUrl);
+            if(source !== "git"){
+              repoName = ""
+            }
             var urlPath;
             if (activeTab === "tab-auth-binder") {
                 var contentRepoName = new URL(contentRepoUrl).pathname.split('/').pop().replace(/\.git$/, '');
@@ -171,26 +230,37 @@ function displayLink() {
                 urlPath = apps[appName].generateUrlPath(repoName + '/' + filePath);
             }
         }
-
+        args = {
+          "source": source,
+          "contentRepoUrl": contentRepoUrl,
+          "contentRepoBranch": contentRepoBranch,
+          "driveUrl": driveUrl,
+          "dropUrl": dropUrl,
+          "webUrl": webUrl
+        }
+        config = handleSource(args)
         if (activeTab === "tab-auth-default") {
             document.getElementById('default-link').value = generateRegularUrl(
-                hubUrl, urlPath, repoUrl, branch
+                hubUrl, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
             );
         } else if (activeTab === "tab-auth-canvas"){
             document.getElementById('canvas-link').value = generateCanvasUrl(
-                hubUrl, urlPath, repoUrl, branch
+                hubUrl, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
             );
         } else if (activeTab === "tab-auth-binder"){
             // FIXME: userName parsing using new URL(...) assumes a 
             // HTTP based repoUrl. Does it make sense to create a
             // BinderHub link for SSH URLs? Then let's fix this parsing.
-            var userName = new URL(repoUrl).pathname.split('/')[1];
+            var userName = new URL(envRepoUrl).pathname.split('/')[1];
             document.getElementById('binder-link').value = generateBinderUrl(
-                hubUrl, userName, repoName, branch, urlPath, contentRepoUrl, contentRepoBranch
+                hubUrl, userName, repoName, envGitBranch, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
             );
         }
+    } else {
+        clearLinks();
     }
 }
+
 function populateFromQueryString() {
     // preseed values if specified in the url
     var params = new URLSearchParams(window.location.search);
@@ -213,6 +283,33 @@ function populateFromQueryString() {
     }
 }
 
+function hideShowByClassName(cls, hideShow){
+  [].forEach.call(document.querySelectorAll(cls), function (el) {
+    el.style.display = hideShow;
+    setDisabled = (hideShow == 'none')
+    $(el).find("input").each(function(){
+        $(this).prop("disabled", setDisabled);
+    });
+  });
+}
+
+
+function displaySource(){
+    var form = document.getElementById('linkgenerator');
+    var source = form.querySelector('input[name="source"]:checked').value;
+    hideShowByClassName(".source", 'none');
+
+    if(source == 'git'){
+        hideShowByClassName(".source-git", '');
+    } else if(source == 'googledrive'){
+        hideShowByClassName(".source-googledrive", '');
+    } else if(source == 'dropbox'){
+        hideShowByClassName(".source-dropbox", '');
+    } else if(source =="standard"){
+        hideShowByClassName(".source-standard", '');
+    }
+}
+
 /**
  * Main loop of the program.
  *
@@ -225,6 +322,7 @@ function render() {
     var form = document.getElementById('linkgenerator');
     var appName = form.querySelector('input[name="app"]:checked').value;
 
+    
     if (appName == 'custom') {
         document.getElementById('urlpath').disabled = false;
         document.getElementById('filepath').disabled = true;
@@ -238,6 +336,7 @@ function render() {
             document.getElementById('filepath').disabled = false;
         }
     }
+
     displayLink();
 }
 
@@ -246,11 +345,21 @@ function render() {
  */
 function main() {
     // Hook up any changes in form elements to call render()
-    document.querySelectorAll('#linkgenerator input[type="radio"]').forEach(
+    document.querySelectorAll('#linkgenerator input[name="app"]').forEach(
         function (element) {
             element.addEventListener('change', render);
         }
     )
+    document.querySelectorAll('#linkgenerator input[name="source"]').forEach(
+        function (element) {
+            element.addEventListener('change', function(){
+                displaySource();
+                render();
+              }
+            );
+        }
+    )
+    
     document.querySelectorAll('#linkgenerator input[type="text"], #linkgenerator input[type="url"]').forEach(
         function (element) {
             element.addEventListener('input', render);
@@ -269,7 +378,9 @@ function main() {
       }
     }
 
+    
     // Do an initial render, to make sure our disabled / enabled properties are correctly set
+    displaySource();
     render();
 }
 
diff --git a/link.html b/link.html
index f42beccb..bb798434 100644
--- a/link.html
+++ b/link.html
@@ -221,16 +221,16 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </small>
           </div>
         </div>
-
-        <div class="form-group row">
-          <label for="repo" class="col-sm-2 col-form-label">Git Repository URL</label>
+        
+        <div class="form-group row source-env" id="env-repo-group" style="display:none">
+          <label for="env-repo" class="col-sm-2 col-form-label">Git Environment Repository URL</label>
           <div class="col-sm-6">
-            <input class="form-control" type="text" id="repo" placeholder="https://github.com/example/test"
+            <input class="form-control" type="text" id="env-repo" disabled placeholder="https://github.com/example/test"
               oninput="displayLink()" required pattern="((git|https?)://.+|git@.+:.+)">
             <div class="invalid-feedback">
               Must be a valid git URL
             </div>
-            <small class="form-text text-muted" id="env-repo-help-text" hidden="true">
+            <small class="form-text text-muted" id="env-repo-help-text" >
               The environment repository must have
               <a href="https://github.com/jupyterhub/nbgitpuller">nbgitpuller</a> installed.
             </small>
@@ -240,7 +240,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
               <div class="input-group-prepend">
                 <span class="input-group-text" id="branch-prepend-label">branch</span>
               </div>
-              <input name="branch" id="branch" type="text" aria-label="Branch Name" aria-describedby="branch-prepend-label">
+              <input name="branch" id="env-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="branch-prepend-label">
               <small id="default-repo-message" class="form-text text-muted">
                  If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
                  <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
@@ -249,26 +249,100 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-
-        <div class="form-group row" id="content-repo-group" hidden="true">
+        
+        <div class="form-group row" id="app-source">
+          <div class="col-sm-2 col-form-label">
+            <label for="app" class=>Notebook Source</label>
+            <small class="form-text text-muted">
+            </small>
+          </div>
+          <div class="col-sm-10">
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="source" id="source-git" value="git" checked>
+              <label class="form-check-label text-dark" for="source-git">
+                Git Repository(eg. github)
+              </label>
+            </div>
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="source" id="source-googledrive" value="googledrive">
+              <label class="form-check-label text-dark" for="source-googledrive">
+                Google Drive
+              </label>
+            </div>
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="source" id="source-dropbox" value="dropbox">
+              <label class="form-check-label text-dark" for="source-dropbox">
+                Dropbox
+              </label>
+            </div>
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="source" id="source-standard" value="standard">
+              <label class="form-check-label text-dark" for="source-standard">
+                Web(Public URL to archive)
+              </label>
+            </div>
+          </div>
+        </div>
+        
+        
+        
+        <div class="form-group row source source-git" id="content-repo-group">
           <label for="content-repo" class="col-sm-2 col-form-label">Git Content Repository URL</label>
           <div class="col-sm-6">
             <input class="form-control" type="text" id="content-repo" placeholder="https://github.com/example/test"
-              oninput="displayLink()" pattern="((git|https?)://.+|git@.+:.+)">
+              oninput="displayLink()" required pattern="((git|https?)://.+|git@.+:.+)">
             <div class="invalid-feedback">
               Must be a valid git URL
             </div>
           </div>
           <div class="col-sm-4">
-            <div class="input-group" id="content-branch-group" hidden="true">
+            <div class="input-group" id="content-branch-group" >
               <div class="input-group-prepend">
                 <span class="input-group-text" id="content-branch-prepend-label">branch</span>
               </div>
-              <input name="content-branch" id="content-branch" type="text" class="form-control" value="master" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
+              <input name="content-branch" id="content-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
+              <small id="default-content-message" class="form-text text-muted">
+                 If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
+                 <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
+                 new GitHub repositories</a>
+              </small>
             </div>
           </div>
          </div>
 
+        <div class="form-group row source source-googledrive">
+          <label for="drive-url" class="col-sm-2 col-form-label">Google Drive Shared Link</label>
+          <div class="col-sm-10">
+            <input class="form-control" type="text" id="drive-url" placeholder="https://drive.google.com/file/d/1p3m0h5UGWdLkVVP0S1HpG2yeDlU/view?usp=sharing"
+              oninput="displayLink()" required pattern="https?:\/\/drive.google.com.+">
+            <div class="invalid-feedback">
+              Must be a valid Google Drive URL
+            </div>
+          </div>
+        </div>
+        
+        <div class="form-group row source source-dropbox">
+          <label for="drop-url" class="col-sm-2 col-form-label">Dropbox Shared Link</label>
+          <div class="col-sm-10">
+            <input class="form-control"  type="text" id="drop-url" placeholder="https://www.dropbox.com/s/w0q4eirtuht/example.tgz?dl=0"
+              oninput="displayLink()" required pattern="https?:\/\/.+dropbox.com.+">
+            <div class="invalid-feedback">
+              Must be a valid Dropbox URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))
+            </div>
+          </div>
+        </div>
+        
+        <div class="form-group row source source-standard">
+          <label for="standard-url" class="col-sm-2 col-form-label">Public URL to archive</label>
+          <div class="col-sm-10">
+            <input class="form-control" type="text" id="standard-url" placeholder="https://example.com/materials-sp20-external.zip"
+              oninput="displayLink()" required pattern="https?://.+">
+            <div class="invalid-feedback">
+              Must be a valid public URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))
+            </div>
+          </div>
+        </div>
+        
         <div class="form-group row" id="filepath-container">
           <label for="filepath" class="col-sm-2 col-form-label">File to open</label>
           <div class="col-sm-10">
@@ -279,7 +353,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </small>
           </div>
         </div>
-
+        
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
             <label for="app" class=>Application to Open</label>

From 4616f6ba44f392fd0b279feeb244ef5d577e8ea7 Mon Sep 17 00:00:00 2001
From: Sean Morris <sean.smorris@berkeley.edu>
Date: Mon, 8 Nov 2021 13:16:09 -0800
Subject: [PATCH 02/10] Changed value for Web choice to generic_web

We renamed the nbgitpuller-standard-web downloader to
nbgitpuller-generic-web. This commit reflects this change in the
link generator.
---
 _static/link_gen/link.js |  8 ++++----
 link.html                | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index 3506e456..b7c54078 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -182,7 +182,7 @@ function handleSource(args){
       sourceUrl = args["driveUrl"];
   } else if(source == "dropbox"){
       sourceUrl =  args["dropUrl"];
-  } else if(source == "standard"){
+  } else if(source == "generic_web"){
       sourceUrl =  args["webUrl"];
   }
   return {
@@ -200,7 +200,7 @@ function displayLink() {
         var hubUrl = document.getElementById('hub').value;
         var driveUrl = document.getElementById('drive-url').value;
         var dropUrl = document.getElementById('drop-url').value;
-        var webUrl = document.getElementById('standard-url').value;
+        var webUrl = document.getElementById('generic-web-url').value;
         var envRepoUrl = document.getElementById('env-repo').value;
         var envGitBranch = document.getElementById('env-branch').value;
         var contentRepoUrl = document.getElementById('content-repo').value;
@@ -300,8 +300,8 @@ function displaySource(){
         hideShowByClassName(".source-googledrive", '');
     } else if(source == 'dropbox'){
         hideShowByClassName(".source-dropbox", '');
-    } else if(source =="standard"){
-        hideShowByClassName(".source-standard", '');
+    } else if(source =="generic_web"){
+        hideShowByClassName(".source-generic-web", '');
     }
 }
 
diff --git a/link.html b/link.html
index eb27b613..6d2cb24c 100644
--- a/link.html
+++ b/link.html
@@ -279,8 +279,8 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
               </label>
             </div>
             <div class="form-check">
-              <input class="form-check-input" type="radio" name="source" id="source-standard" value="standard">
-              <label class="form-check-label text-dark" for="source-standard">
+              <input class="form-check-input" type="radio" name="source" id="source-generic-web" value="generic_web">
+              <label class="form-check-label text-dark" for="source-generic-web">
                 Web(Public URL to archive)
               </label>
             </div>
@@ -335,10 +335,10 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
         </div>
         
-        <div class="form-group row source source-standard">
-          <label for="standard-url" class="col-sm-2 col-form-label">Public URL to archive</label>
+        <div class="form-group row source source-generic-web">
+          <label for="generic-web-url" class="col-sm-2 col-form-label">Public URL to archive</label>
           <div class="col-sm-10">
-            <input class="form-control" type="text" id="standard-url" placeholder="https://example.com/materials-sp20-external.zip"
+            <input class="form-control" type="text" id="generic-web-url" placeholder="https://example.com/materials-sp20-external.zip"
               oninput="displayLink()" required pattern="https?://.+">
             <div class="invalid-feedback">
               Must be a valid public URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))

From 8c99a9d92566f766b2b6c50b22e1c295bac9b0df Mon Sep 17 00:00:00 2001
From: Sean Morris <sean.smorris@berkeley.edu>
Date: Wed, 24 Nov 2021 12:59:30 -0800
Subject: [PATCH 03/10] Changed query parameter provider to content_provider

This syncs the changes made in nbgitpuller app
---
 _static/link_gen/link.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index b7c54078..1a53e97e 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -7,7 +7,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
     url.searchParams.set('repo', repoUrl);
     
     if(compressed) {
-      url.searchParams.set('provider', source);
+      url.searchParams.set('content_provider', source);
     }
     
     if (urlPath) {
@@ -37,7 +37,7 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source)
     nextUrlParams.append('repo', repoUrl);
     
     if(compressed) {
-      nextUrlParams.append('provider', source);
+      nextUrlParams.append('content_provider', source);
     }
     
     if (urlPath) {
@@ -71,7 +71,7 @@ function generateBinderUrl(hubUrl, userName, repoName, branch, urlPath,
     nextUrlParams.append('repo', contentRepoUrl);
 
     if(compressed) {
-      nextUrlParams.append('provider', source);
+      nextUrlParams.append('content_provider', source);
     }
     
     if (urlPath) {

From 381cf40a14e60149da377627fd0254209b87bf3f Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Fri, 26 Nov 2021 12:23:50 +0100
Subject: [PATCH 04/10] Fix indentation and remove all spaces on otherwise
 empty lines

Whenever an empty line is replaced with an empty line with spaces, it will make the `git diff` views in terminals and GitHub UI cluttered.

The indentation in .js files were inconsistent and this commit also fixes that.
---
 _static/link_gen/link.js | 86 +++++++++++++++++-----------------------
 link.html                | 15 ++-----
 2 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index 1a53e97e..1335cffc 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -5,11 +5,9 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
     var url = new URL(hubUrl);
 
     url.searchParams.set('repo', repoUrl);
-    
     if(compressed) {
       url.searchParams.set('content_provider', source);
     }
-    
     if (urlPath) {
         url.searchParams.set('urlpath', urlPath);
     }
@@ -19,7 +17,6 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
     } else if(source == "git"){
         url.searchParams.set('branch', "main");
     }
-    
     if (!url.pathname.endsWith('/')) {
         url.pathname += '/'
     }
@@ -35,11 +32,9 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source)
     var nextUrlParams = new URLSearchParams();
 
     nextUrlParams.append('repo', repoUrl);
-    
     if(compressed) {
-      nextUrlParams.append('content_provider', source);
+        nextUrlParams.append('content_provider', source);
     }
-    
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
@@ -71,9 +66,8 @@ function generateBinderUrl(hubUrl, userName, repoName, branch, urlPath,
     nextUrlParams.append('repo', contentRepoUrl);
 
     if(compressed) {
-      nextUrlParams.append('content_provider', source);
+        nextUrlParams.append('content_provider', source);
     }
-    
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
@@ -132,17 +126,14 @@ function changeTab(div) {
     var env_repo = document.getElementById("env-repo");
     var id = div.id;
     var form = document.getElementById('linkgenerator');
-    
     clearLinks();
     if (id.includes("binder")) {
         hub.placeholder = "https://mybinder.org";
         hub.value = "https://mybinder.org";
         hub_help_text.hidden = true;
         hub.labels[0].innerHTML = "BinderHub URL";
-        
         env_repo_group.style.display = '';
         env_repo.disabled = false;
-
     } else {
         hub.placeholder = "https://hub.example.com";
         hub.value = "";
@@ -164,37 +155,36 @@ function changeTab(div) {
  */
 function generateCloneDirectoryName(gitCloneUrl) {
     if(gitCloneUrl.slice(-1) == "/")
-      gitCloneUrl = gitCloneUrl.slice(0,-1);
+        gitCloneUrl = gitCloneUrl.slice(0,-1);
     var lastPart = gitCloneUrl.split('/').slice(-1)[0];
     return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
 }
 
 function handleSource(args){
-  source = args["source"];
-  branch = "";
-  compressed = true;
-  sourceUrl ="";
-  if(source == "git"){
-      sourceUrl = args["contentRepoUrl"];
-      branch = args["contentRepoBranch"];
-      compressed = false;
-  } else if(source == "googledrive"){
-      sourceUrl = args["driveUrl"];
-  } else if(source == "dropbox"){
-      sourceUrl =  args["dropUrl"];
-  } else if(source == "generic_web"){
-      sourceUrl =  args["webUrl"];
-  }
-  return {
-    "branch": branch,
-    "sourceUrl": sourceUrl,
-    "compressed": compressed
-  }
+    source = args["source"];
+    branch = "";
+    compressed = true;
+    sourceUrl ="";
+    if(source == "git"){
+        sourceUrl = args["contentRepoUrl"];
+        branch = args["contentRepoBranch"];
+        compressed = false;
+    } else if(source == "googledrive"){
+        sourceUrl = args["driveUrl"];
+    } else if(source == "dropbox"){
+        sourceUrl =  args["dropUrl"];
+    } else if(source == "generic_web"){
+        sourceUrl =  args["webUrl"];
+    }
+    return {
+        "branch": branch,
+        "sourceUrl": sourceUrl,
+        "compressed": compressed
+    }
 }
 
 function displayLink() {
     var form = document.getElementById('linkgenerator');
-    
     form.classList.add('was-validated');
     if (form.checkValidity()) {
         var hubUrl = document.getElementById('hub').value;
@@ -209,13 +199,12 @@ function displayLink() {
         var appName = form.querySelector('input[name="app"]:checked').value;
         var activeTab = document.querySelector(".nav-link.active").id;
         var source = form.querySelector('input[name="source"]:checked').value;
-        
         if (appName === 'custom') {
             var urlPath = document.getElementById('urlpath').value;
         } else {
             var repoName = generateCloneDirectoryName(contentRepoUrl);
             if(source !== "git"){
-              repoName = ""
+                repoName = ""
             }
             var urlPath;
             if (activeTab === "tab-auth-binder") {
@@ -226,12 +215,12 @@ function displayLink() {
             }
         }
         args = {
-          "source": source,
-          "contentRepoUrl": contentRepoUrl,
-          "contentRepoBranch": contentRepoBranch,
-          "driveUrl": driveUrl,
-          "dropUrl": dropUrl,
-          "webUrl": webUrl
+            "source": source,
+            "contentRepoUrl": contentRepoUrl,
+            "contentRepoBranch": contentRepoBranch,
+            "driveUrl": driveUrl,
+            "dropUrl": dropUrl,
+            "webUrl": webUrl
         }
         config = handleSource(args)
         if (activeTab === "tab-auth-default") {
@@ -279,13 +268,13 @@ function populateFromQueryString() {
 }
 
 function hideShowByClassName(cls, hideShow){
-  [].forEach.call(document.querySelectorAll(cls), function (el) {
-    el.style.display = hideShow;
-    setDisabled = (hideShow == 'none')
-    $(el).find("input").each(function(){
-        $(this).prop("disabled", setDisabled);
+    [].forEach.call(document.querySelectorAll(cls), function (el) {
+        el.style.display = hideShow;
+        setDisabled = (hideShow == 'none')
+        $(el).find("input").each(function(){
+            $(this).prop("disabled", setDisabled);
+        });
     });
-  });
 }
 
 
@@ -317,7 +306,6 @@ function render() {
     var form = document.getElementById('linkgenerator');
     var appName = form.querySelector('input[name="app"]:checked').value;
 
-    
     if (appName == 'custom') {
         document.getElementById('urlpath').disabled = false;
         document.getElementById('filepath').disabled = true;
@@ -354,7 +342,6 @@ function main() {
             );
         }
     )
-    
     document.querySelectorAll('#linkgenerator input[type="text"], #linkgenerator input[type="url"]').forEach(
         function (element) {
             element.addEventListener('input', render);
@@ -373,7 +360,6 @@ function main() {
       }
     }
 
-    
     // Do an initial render, to make sure our disabled / enabled properties are correctly set
     displaySource();
     render();
diff --git a/link.html b/link.html
index 6d2cb24c..cab81cf2 100644
--- a/link.html
+++ b/link.html
@@ -221,7 +221,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </small>
           </div>
         </div>
-        
         <div class="form-group row source-env" id="env-repo-group" style="display:none">
           <label for="env-repo" class="col-sm-2 col-form-label">Git Environment Repository URL</label>
           <div class="col-sm-6">
@@ -252,7 +251,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
         <div class="form-group row" id="app-source">
           <div class="col-sm-2 col-form-label">
             <label for="app" class=>Notebook Source</label>
@@ -286,9 +284,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
-        
-        
         <div class="form-group row source source-git" id="content-repo-group">
           <label for="content-repo" class="col-sm-2 col-form-label">Git Content Repository URL</label>
           <div class="col-sm-6">
@@ -305,9 +300,9 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
               </div>
               <input name="content-branch" id="content-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
               <small id="default-content-message" class="form-text text-muted">
-                 If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
-                 <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
-                 new GitHub repositories</a>
+                If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
+                <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
+                new GitHub repositories</a>
               </small>
             </div>
           </div>
@@ -323,7 +318,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
         <div class="form-group row source source-dropbox">
           <label for="drop-url" class="col-sm-2 col-form-label">Dropbox Shared Link</label>
           <div class="col-sm-10">
@@ -334,7 +328,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
         <div class="form-group row source source-generic-web">
           <label for="generic-web-url" class="col-sm-2 col-form-label">Public URL to archive</label>
           <div class="col-sm-10">
@@ -345,7 +338,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
         <div class="form-group row" id="filepath-container">
           <label for="filepath" class="col-sm-2 col-form-label">File to open</label>
           <div class="col-sm-10">
@@ -356,7 +348,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </small>
           </div>
         </div>
-        
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
             <label for="app" class=>Application to Open</label>

From 89f6b57810517a793acf5e9a5c3c13373cba2f39 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Fri, 26 Nov 2021 12:36:48 +0100
Subject: [PATCH 05/10] Fix additional formatting details

---
 _static/link_gen/link.js | 8 +++-----
 link.html                | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index 1335cffc..e94f0f06 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -6,7 +6,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
 
     url.searchParams.set('repo', repoUrl);
     if(compressed) {
-      url.searchParams.set('content_provider', source);
+        url.searchParams.set('content_provider', source);
     }
     if (urlPath) {
         url.searchParams.set('urlpath', urlPath);
@@ -17,6 +17,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
     } else if(source == "git"){
         url.searchParams.set('branch', "main");
     }
+
     if (!url.pathname.endsWith('/')) {
         url.pathname += '/'
     }
@@ -118,7 +119,6 @@ function clearLinks(){
     document.getElementById('canvas-link').value = "";
 }
 
-
 function changeTab(div) {
     var hub = document.getElementById("hub");
     var hub_help_text = document.getElementById("hub-help-text");
@@ -319,7 +319,6 @@ function render() {
             document.getElementById('filepath').disabled = false;
         }
     }
-
     displayLink();
 }
 
@@ -338,8 +337,7 @@ function main() {
             element.addEventListener('change', function(){
                 displaySource();
                 render();
-              }
-            );
+            });
         }
     )
     document.querySelectorAll('#linkgenerator input[type="text"], #linkgenerator input[type="url"]').forEach(
diff --git a/link.html b/link.html
index cab81cf2..78472a43 100644
--- a/link.html
+++ b/link.html
@@ -229,7 +229,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             <div class="invalid-feedback">
               Must be a valid git URL
             </div>
-            <small class="form-text text-muted" id="env-repo-help-text" >
+            <small class="form-text text-muted" id="env-repo-help-text">
               The environment repository must have
               <a href="https://github.com/jupyterhub/nbgitpuller">nbgitpuller</a> installed.
             </small>
@@ -294,15 +294,14 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
           <div class="col-sm-4">
-            <div class="input-group" id="content-branch-group" >
+            <div class="input-group" id="content-branch-group">
               <div class="input-group-prepend">
                 <span class="input-group-text" id="content-branch-prepend-label">branch</span>
               </div>
               <input name="content-branch" id="content-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
               <small id="default-content-message" class="form-text text-muted">
                 If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
-                <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
-                new GitHub repositories</a>
+                <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">new GitHub repositories</a>
               </small>
             </div>
           </div>
@@ -348,6 +347,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </small>
           </div>
         </div>
+
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
             <label for="app" class=>Application to Open</label>

From ead0dc7c3d6caf74ee53804c7ec3ffe3591bc41f Mon Sep 17 00:00:00 2001
From: Sean Morris <sean.smorris@berkeley.edu>
Date: Sat, 27 Nov 2021 12:22:39 -0800
Subject: [PATCH 06/10] Implemented changes from PR review

- Changed "source" to "content-provider" in both files
- In link.html, added detail to regEx for URL patterns
- removed circleci folder I thought was needed
- In generateBinderUrl, clarified the parameter names to reflect
envRepoX and contentRepoX and fixed the generatation of the URL
- In binder tab, the environment repo now includes the branch if not
specified
- added documentation
- cleaned up the generation of the URLPath
---
 .circleci/config.yml     |  12 ---
 _static/link_gen/link.js | 155 ++++++++++++++++++++++-----------------
 link.html                |  36 ++++-----
 3 files changed, 106 insertions(+), 97 deletions(-)
 delete mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index a9a91c66..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: 2.1
-jobs:
-  build:
-    docker:
-      - image: circleci/python:3.6
-    steps:
-      - run: echo "no operation build"
-
-workflows:
-  build:
-    jobs:
-      - build
\ No newline at end of file
diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index 1a53e97e..b334d9ba 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -1,5 +1,5 @@
 // Pure function that generates an nbgitpuller URL
-function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source) {
+function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, contentProvider) {
 
     // assume hubUrl is a valid URL
     var url = new URL(hubUrl);
@@ -7,7 +7,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
     url.searchParams.set('repo', repoUrl);
     
     if(compressed) {
-      url.searchParams.set('content_provider', source);
+      url.searchParams.set('content_provider', contentProvider);
     }
     
     if (urlPath) {
@@ -16,7 +16,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
 
     if (branch) {
         url.searchParams.set('branch', branch);
-    } else if(source == "git"){
+    } else if(contentProvider == "git"){
         url.searchParams.set('branch', "main");
     }
     
@@ -28,7 +28,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, source
     return url.toString();
 }
 
-function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source) {
+function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, contentProvider) {
     // assume hubUrl is a valid URL
     var url = new URL(hubUrl);
 
@@ -37,7 +37,7 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source)
     nextUrlParams.append('repo', repoUrl);
     
     if(compressed) {
-      nextUrlParams.append('content_provider', source);
+      nextUrlParams.append('content_provider', contentProvider);
     }
     
     if (urlPath) {
@@ -46,7 +46,7 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source)
 
     if (branch) {
         nextUrlParams.append('branch', branch);
-    } else if(source == "git"){
+    } else if(contentProvider == "git"){
         nextUrlParams.append('branch', "main");
     }
 
@@ -61,33 +61,36 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, source)
     return url.toString();
 }
 
-function generateBinderUrl(hubUrl, userName, repoName, branch, urlPath,
-    contentRepoUrl, contentRepoBranch, compressed, source) {
+function generateBinderUrl(hubUrl, userName, envRepoName, envGitBranch, urlPath,
+    contentGitRepoUrl, contentGitRepoBranch, compressed, contentProvider) {
 
     var url = new URL(hubUrl);
 
     var nextUrlParams = new URLSearchParams();
 
-    nextUrlParams.append('repo', contentRepoUrl);
+    nextUrlParams.append('repo', contentGitRepoUrl);
 
     if(compressed) {
-      nextUrlParams.append('content_provider', source);
+      nextUrlParams.append('content_provider', contentProvider);
     }
     
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
 
-    if (contentRepoBranch) {
-        nextUrlParams.append('branch', contentRepoBranch);
-    } else if(source == "git"){
+    if (contentGitRepoBranch) {
+        nextUrlParams.append('branch', contentGitRepoBranch);
+    } else if(contentProvider == "git"){
         nextUrlParams.append('branch', "main");
     }
 
+    if(envGitBranch == ""){
+        envGitBranch = "main"
+    }
     var nextUrl = 'git-pull?' + nextUrlParams.toString();
 
     var path = '/v2/gh/';
-    url.pathname = path.concat(userName, "/", repoName, "/", branch);
+    url.pathname = path.concat(userName, "/", envRepoName, "/", envGitBranch);
     url.searchParams.append('urlpath', nextUrl);
 
     return url.toString();
@@ -152,7 +155,7 @@ function changeTab(div) {
         env_repo_group.style.display = 'none';
         env_repo.disabled = true;
     }
-    displaySource();
+    displayContentProvider();
 }
 
 /**
@@ -161,6 +164,12 @@ function changeTab(div) {
  * nbgitpuller needs to redirect users to *inside* the directory it
  * just cloned. We copy the logic git itself uses to determine that.
  * See https://github.com/git/git/blob/1c52ecf4ba0f4f7af72775695fee653f50737c71/builtin/clone.c#L276
+ *
+ * The condition on the first line of this function ensures the user has not included a forward slash at the end of
+ * the URL. If they do, it is removed so that the rest of the function can split by forward slash and parse the name
+ * of directory from the URL.
+ *
+ * @param {string} gitCloneUrl This is the url to the git repo
  */
 function generateCloneDirectoryName(gitCloneUrl) {
     if(gitCloneUrl.slice(-1) == "/")
@@ -169,25 +178,38 @@ function generateCloneDirectoryName(gitCloneUrl) {
     return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
 }
 
-function handleSource(args){
-  source = args["source"];
+/**
+ * This takes the values from the UI for content providers and sets three values in a
+ * json object(contentProviderUrl, branch, and compressed) based on what contentProvider is selected in the UI.
+ *
+ * The args contains the contentProvider selected in the UI as well as whatever text(if any)
+ * is in each of the content provider URL(e.g. driveURL, dropURL) text boxes, as well as the contentGitBranch.
+ *
+ * The return value is a a json object containing the branch, which may be an empty string if git is not the content
+ * provider, the contentProviderURL, and a boolean key, compressed, that indicates if you our notebooks are in a
+ * compressed archive.
+ *
+ * @param {json} args - contains UI element values for content providers(url, git branch,
+ */
+function configureContentProviderAttrs(args){
+  contentProvider = args["contentProvider"];
   branch = "";
   compressed = true;
-  sourceUrl ="";
-  if(source == "git"){
-      sourceUrl = args["contentRepoUrl"];
-      branch = args["contentRepoBranch"];
+  contentProviderURL ="";
+  if(contentProvider == "git"){
+      contentProviderURL = args["contentGitRepoUrl"];
+      branch = args["contentGitRepoBranch"];
       compressed = false;
-  } else if(source == "googledrive"){
-      sourceUrl = args["driveUrl"];
-  } else if(source == "dropbox"){
-      sourceUrl =  args["dropUrl"];
-  } else if(source == "generic_web"){
-      sourceUrl =  args["webUrl"];
+  } else if(contentProvider == "googledrive"){
+      contentProviderURL = args["driveUrl"];
+  } else if(contentProvider == "dropbox"){
+      contentProviderURL =  args["dropUrl"];
+  } else if(contentProvider == "generic_web"){
+      contentProviderURL =  args["webUrl"];
   }
   return {
     "branch": branch,
-    "sourceUrl": sourceUrl,
+    "contentProviderURL": contentProviderURL,
     "compressed": compressed
   }
 }
@@ -201,54 +223,51 @@ function displayLink() {
         var driveUrl = document.getElementById('drive-url').value;
         var dropUrl = document.getElementById('drop-url').value;
         var webUrl = document.getElementById('generic-web-url').value;
-        var envRepoUrl = document.getElementById('env-repo').value;
+        var envGitRepoUrl = document.getElementById('env-repo').value;
         var envGitBranch = document.getElementById('env-branch').value;
-        var contentRepoUrl = document.getElementById('content-repo').value;
-        var contentRepoBranch = document.getElementById('content-branch').value;
+        var contentGitRepoUrl = document.getElementById('content-repo').value;
+        var contentGitRepoBranch = document.getElementById('content-branch').value;
         var filePath = document.getElementById('filepath').value;
         var appName = form.querySelector('input[name="app"]:checked').value;
         var activeTab = document.querySelector(".nav-link.active").id;
-        var source = form.querySelector('input[name="source"]:checked').value;
+        var contentProvider = form.querySelector('input[name="content-provider"]:checked').value;
         
         if (appName === 'custom') {
             var urlPath = document.getElementById('urlpath').value;
         } else {
-            var repoName = generateCloneDirectoryName(contentRepoUrl);
-            if(source !== "git"){
-              repoName = ""
-            }
-            var urlPath;
-            if (activeTab === "tab-auth-binder") {
-                var contentRepoName = new URL(contentRepoUrl).pathname.split('/').pop().replace(/\.git$/, '');
-                urlPath = apps[appName].generateUrlPath(contentRepoName + '/' + filePath);
-            } else {
-                urlPath = apps[appName].generateUrlPath(repoName + '/' + filePath);
+            var envGitRepoName = generateCloneDirectoryName(envGitRepoUrl);
+            var contentGitRepoName = generateCloneDirectoryName(contentGitRepoUrl);
+            var partialUrlPath = contentGitRepoName + '/' + filePath;
+            if(contentProvider !== "git"){
+                contentGitRepoName = "";
+                partialUrlPath = filePath;
             }
+            var urlPath = apps[appName].generateUrlPath(partialUrlPath);
         }
         args = {
-          "source": source,
-          "contentRepoUrl": contentRepoUrl,
-          "contentRepoBranch": contentRepoBranch,
+          "contentProvider": contentProvider,
+          "contentGitRepoUrl": contentGitRepoUrl,
+          "contentGitRepoBranch": contentGitRepoBranch,
           "driveUrl": driveUrl,
           "dropUrl": dropUrl,
           "webUrl": webUrl
         }
-        config = handleSource(args)
+        config = configureContentProviderAttrs(args)
         if (activeTab === "tab-auth-default") {
             document.getElementById('default-link').value = generateRegularUrl(
-                hubUrl, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
+                hubUrl, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
             );
         } else if (activeTab === "tab-auth-canvas"){
             document.getElementById('canvas-link').value = generateCanvasUrl(
-                hubUrl, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
+                hubUrl, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
             );
         } else if (activeTab === "tab-auth-binder"){
             // FIXME: userName parsing using new URL(...) assumes a 
             // HTTP based repoUrl. Does it make sense to create a
             // BinderHub link for SSH URLs? Then let's fix this parsing.
-            var userName = new URL(envRepoUrl).pathname.split('/')[1];
+            var userName = new URL(envGitRepoUrl).pathname.split('/')[1];
             document.getElementById('binder-link').value = generateBinderUrl(
-                hubUrl, userName, repoName, envGitBranch, urlPath, config["sourceUrl"], config["branch"], config["compressed"], source
+                hubUrl, userName, envGitRepoName, envGitBranch, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
             );
         }
     } else {
@@ -287,21 +306,23 @@ function hideShowByClassName(cls, hideShow){
     });
   });
 }
-
-
-function displaySource(){
+/**
+ * Depending on the content provider selected this hides and shows the appropriate divs
+ *
+ */
+function displayContentProvider(){
     var form = document.getElementById('linkgenerator');
-    var source = form.querySelector('input[name="source"]:checked').value;
-    hideShowByClassName(".source", 'none');
-
-    if(source == 'git'){
-        hideShowByClassName(".source-git", '');
-    } else if(source == 'googledrive'){
-        hideShowByClassName(".source-googledrive", '');
-    } else if(source == 'dropbox'){
-        hideShowByClassName(".source-dropbox", '');
-    } else if(source =="generic_web"){
-        hideShowByClassName(".source-generic-web", '');
+    var contentProvider = form.querySelector('input[name="content-provider"]:checked').value;
+    hideShowByClassName(".content-provider", 'none');
+
+    if(contentProvider == 'git'){
+        hideShowByClassName(".content-provider-git", '');
+    } else if(contentProvider == 'googledrive'){
+        hideShowByClassName(".content-provider-googledrive", '');
+    } else if(contentProvider == 'dropbox'){
+        hideShowByClassName(".content-provider-dropbox", '');
+    } else if(contentProvider =="generic_web"){
+        hideShowByClassName(".content-provider-generic-web", '');
     }
 }
 
@@ -345,10 +366,10 @@ function main() {
             element.addEventListener('change', render);
         }
     )
-    document.querySelectorAll('#linkgenerator input[name="source"]').forEach(
+    document.querySelectorAll('#linkgenerator input[name="content-provider"]').forEach(
         function (element) {
             element.addEventListener('change', function(){
-                displaySource();
+                displayContentProvider();
                 render();
               }
             );
@@ -375,7 +396,7 @@ function main() {
 
     
     // Do an initial render, to make sure our disabled / enabled properties are correctly set
-    displaySource();
+    displayContentProvider();
     render();
 }
 
diff --git a/link.html b/link.html
index 6d2cb24c..f765873e 100644
--- a/link.html
+++ b/link.html
@@ -222,7 +222,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
         </div>
         
-        <div class="form-group row source-env" id="env-repo-group" style="display:none">
+        <div class="form-group row content-provider-env" id="env-repo-group" style="display:none">
           <label for="env-repo" class="col-sm-2 col-form-label">Git Environment Repository URL</label>
           <div class="col-sm-6">
             <input class="form-control" type="text" id="env-repo" disabled placeholder="https://github.com/example/test"
@@ -253,34 +253,34 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
         </div>
         
-        <div class="form-group row" id="app-source">
+        <div class="form-group row" id="app-content-provider">
           <div class="col-sm-2 col-form-label">
-            <label for="app" class=>Notebook Source</label>
+            <label for="app-content-provider" class=>Notebook Content Provider</label>
             <small class="form-text text-muted">
             </small>
           </div>
           <div class="col-sm-10">
             <div class="form-check">
-              <input class="form-check-input" type="radio" name="source" id="source-git" value="git" checked>
-              <label class="form-check-label text-dark" for="source-git">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-git" value="git" checked>
+              <label class="form-check-label text-dark" for="content-provider-git">
                 Git Repository(eg. github)
               </label>
             </div>
             <div class="form-check">
-              <input class="form-check-input" type="radio" name="source" id="source-googledrive" value="googledrive">
-              <label class="form-check-label text-dark" for="source-googledrive">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-googledrive" value="googledrive">
+              <label class="form-check-label text-dark" for="content-provider-googledrive">
                 Google Drive
               </label>
             </div>
             <div class="form-check">
-              <input class="form-check-input" type="radio" name="source" id="source-dropbox" value="dropbox">
-              <label class="form-check-label text-dark" for="source-dropbox">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-dropbox" value="dropbox">
+              <label class="form-check-label text-dark" for="content-provider-dropbox">
                 Dropbox
               </label>
             </div>
             <div class="form-check">
-              <input class="form-check-input" type="radio" name="source" id="source-generic-web" value="generic_web">
-              <label class="form-check-label text-dark" for="source-generic-web">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-generic-web" value="generic_web">
+              <label class="form-check-label text-dark" for="content-provider-generic-web">
                 Web(Public URL to archive)
               </label>
             </div>
@@ -289,7 +289,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
         
         
         
-        <div class="form-group row source source-git" id="content-repo-group">
+        <div class="form-group row content-provider content-provider-git" id="content-repo-group">
           <label for="content-repo" class="col-sm-2 col-form-label">Git Content Repository URL</label>
           <div class="col-sm-6">
             <input class="form-control" type="text" id="content-repo" placeholder="https://github.com/example/test"
@@ -313,29 +313,29 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
          </div>
 
-        <div class="form-group row source source-googledrive">
+        <div class="form-group row content-provider content-provider-googledrive">
           <label for="drive-url" class="col-sm-2 col-form-label">Google Drive Shared Link</label>
           <div class="col-sm-10">
             <input class="form-control" type="text" id="drive-url" placeholder="https://drive.google.com/file/d/1p3m0h5UGWdLkVVP0S1HpG2yeDlU/view?usp=sharing"
-              oninput="displayLink()" required pattern="https?:\/\/drive.google.com.+">
+              oninput="displayLink()" required pattern="https?:\/\/drive.google.com\/file\/.+">
             <div class="invalid-feedback">
               Must be a valid Google Drive URL
             </div>
           </div>
         </div>
         
-        <div class="form-group row source source-dropbox">
+        <div class="form-group row content-provider content-provider-dropbox">
           <label for="drop-url" class="col-sm-2 col-form-label">Dropbox Shared Link</label>
           <div class="col-sm-10">
             <input class="form-control"  type="text" id="drop-url" placeholder="https://www.dropbox.com/s/w0q4eirtuht/example.tgz?dl=0"
-              oninput="displayLink()" required pattern="https?:\/\/.+dropbox.com.+">
+              oninput="displayLink()" required pattern="https?:\/\/.+dropbox.com\/.+">
             <div class="invalid-feedback">
               Must be a valid Dropbox URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))
             </div>
           </div>
         </div>
         
-        <div class="form-group row source source-generic-web">
+        <div class="form-group row content-provider content-provider-generic-web">
           <label for="generic-web-url" class="col-sm-2 col-form-label">Public URL to archive</label>
           <div class="col-sm-10">
             <input class="form-control" type="text" id="generic-web-url" placeholder="https://example.com/materials-sp20-external.zip"
@@ -359,7 +359,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
         
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
-            <label for="app" class=>Application to Open</label>
+            <label for="app-container" class=>Application to Open</label>
             <small class="form-text text-muted">
             </small>
           </div>

From dc30fe80301d834762a549ea96788ed3689beee2 Mon Sep 17 00:00:00 2001
From: sean-morris <sean.smorris@berkeley.edu>
Date: Sun, 28 Nov 2021 11:13:16 -0800
Subject: [PATCH 07/10] Apply suggestions from code review

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
---
 _static/link_gen/link.js | 24 ++++++++++++------------
 link.html                |  4 +---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index db6deae6..a84fde92 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -6,7 +6,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, conten
 
     url.searchParams.set('repo', repoUrl);
     if(compressed) {
-      url.searchParams.set('content_provider', contentProvider);
+        url.searchParams.set('content_provider', contentProvider);
     }
     if (urlPath) {
         url.searchParams.set('urlpath', urlPath);
@@ -34,7 +34,7 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, content
 
     nextUrlParams.append('repo', repoUrl);
     if(compressed) {
-      nextUrlParams.append('content_provider', contentProvider);
+        nextUrlParams.append('content_provider', contentProvider);
     }
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
@@ -67,7 +67,7 @@ function generateBinderUrl(hubUrl, userName, envRepoName, envGitBranch, urlPath,
     nextUrlParams.append('repo', contentGitRepoUrl);
 
     if(compressed) {
-      nextUrlParams.append('content_provider', contentProvider);
+        nextUrlParams.append('content_provider', contentProvider);
     }
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
@@ -199,9 +199,9 @@ function configureContentProviderAttrs(args){
       contentProviderURL =  args["webUrl"];
   }
   return {
-    "branch": branch,
-    "contentProviderURL": contentProviderURL,
-    "compressed": compressed
+      "branch": branch,
+      "contentProviderURL": contentProviderURL,
+      "compressed": compressed
   }
 }
 
@@ -235,12 +235,12 @@ function displayLink() {
             var urlPath = apps[appName].generateUrlPath(partialUrlPath);
         }
         args = {
-          "contentProvider": contentProvider,
-          "contentGitRepoUrl": contentGitRepoUrl,
-          "contentGitRepoBranch": contentGitRepoBranch,
-          "driveUrl": driveUrl,
-          "dropUrl": dropUrl,
-          "webUrl": webUrl
+            "contentProvider": contentProvider,
+            "contentGitRepoUrl": contentGitRepoUrl,
+            "contentGitRepoBranch": contentGitRepoBranch,
+            "driveUrl": driveUrl,
+            "dropUrl": dropUrl,
+            "webUrl": webUrl
         }
         config = configureContentProviderAttrs(args)
         if (activeTab === "tab-auth-default") {
diff --git a/link.html b/link.html
index 81c62884..2acb0ce8 100644
--- a/link.html
+++ b/link.html
@@ -357,9 +357,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
 
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
-            <label for="app-container" class=>Application to Open</label>
-            <small class="form-text text-muted">
-            </small>
+            <label>Application to Open</label>
           </div>
           <div class="col-sm-10">
             <div class="form-check">

From 84fdfc6d9c36c270bbf52e937ff5b8e65c621048 Mon Sep 17 00:00:00 2001
From: sean-morris <sean.smorris@berkeley.edu>
Date: Mon, 29 Nov 2021 15:12:05 -0800
Subject: [PATCH 08/10] Update link.html

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
---
 link.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/link.html b/link.html
index 2acb0ce8..e2734f59 100644
--- a/link.html
+++ b/link.html
@@ -255,9 +255,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
 
         <div class="form-group row" id="app-content-provider">
           <div class="col-sm-2 col-form-label">
-            <label for="app-content-provider" class=>Notebook Content Provider</label>
-            <small class="form-text text-muted">
-            </small>
+            <label>Notebook Content Provider</label>
           </div>
           <div class="col-sm-10">
             <div class="form-check">

From 2a85e7681fa1a14aefee402dbceebb72e5a0ad83 Mon Sep 17 00:00:00 2001
From: Sean Morris <sean.smorris@berkeley.edu>
Date: Mon, 29 Nov 2021 15:13:15 -0800
Subject: [PATCH 09/10] Cleaned up HTML errors

- removed duplicate data-X on nav bar button
- removed duplicate id on the source repo button and download button
---
 link.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/link.html b/link.html
index 2acb0ce8..c1c1aa18 100644
--- a/link.html
+++ b/link.html
@@ -101,9 +101,9 @@ <h3 id="searchlabel">Quick search</h3>
         <div class="col pl-md-4 topbar-main">
             
             <button id="navbar-toggler" class="navbar-toggler ml-0" type="button" data-toggle="collapse"
-                data-toggle="tooltip" data-placement="bottom" data-target=".site-navigation" aria-controls="navbar-menu"
-                aria-expanded="true" aria-label="Toggle navigation" aria-controls="site-navigation"
-                title="Toggle navigation" data-toggle="tooltip" data-placement="left">
+                data-placement="bottom" data-target=".site-navigation" aria-controls="navbar-menu"
+                aria-expanded="true" aria-label="Toggle navigation"
+                title="Toggle navigation" >
                 <i class="fas fa-bars"></i>
                 <i class="fas fa-arrow-left"></i>
                 <i class="fas fa-arrow-up"></i>
@@ -111,7 +111,7 @@ <h3 id="searchlabel">Quick search</h3>
             
             
 <div class="dropdown-buttons-trigger">
-    <button id="dropdown-buttons-trigger" class="btn btn-secondary topbarbtn" aria-label="Download this page"><i
+    <button id="download-dropdown-buttons-trigger" class="btn btn-secondary topbarbtn" aria-label="Download this page"><i
             class="fas fa-download"></i></button>
 
     <div class="dropdown-buttons">
@@ -130,7 +130,7 @@ <h3 id="searchlabel">Quick search</h3>
             <!-- Source interaction buttons -->
 
 <div class="dropdown-buttons-trigger">
-    <button id="dropdown-buttons-trigger" class="btn btn-secondary topbarbtn"
+    <button id="sourc-repo-dropdown-buttons-trigger" class="btn btn-secondary topbarbtn"
         aria-label="Connect with source repository"><i class="fab fa-github"></i></button>
     <div class="dropdown-buttons sourcebuttons">
         <a class="repository-button"
@@ -204,7 +204,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
               <input type="text" readonly class="form-control form-control" id="binder-link" name="auth-binder-link" placeholder="Generated Binder link appears here...">
             </div>
           </div>
-          </ul>
         </div>
 
         <div class="form-group row">

From 4aafa3fd461575ada12262df25f6c77fd2d3fb28 Mon Sep 17 00:00:00 2001
From: Sean Morris <sean.smorris@berkeley.edu>
Date: Mon, 29 Nov 2021 19:37:27 -0800
Subject: [PATCH 10/10] Query param content_provider now contentProvider

---
 _static/link_gen/link.js | 6 +++---
 link.html                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index a84fde92..fef4fa72 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -6,7 +6,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, conten
 
     url.searchParams.set('repo', repoUrl);
     if(compressed) {
-        url.searchParams.set('content_provider', contentProvider);
+        url.searchParams.set('contentProvider', contentProvider);
     }
     if (urlPath) {
         url.searchParams.set('urlpath', urlPath);
@@ -34,7 +34,7 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, content
 
     nextUrlParams.append('repo', repoUrl);
     if(compressed) {
-        nextUrlParams.append('content_provider', contentProvider);
+        nextUrlParams.append('contentProvider', contentProvider);
     }
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
@@ -67,7 +67,7 @@ function generateBinderUrl(hubUrl, userName, envRepoName, envGitBranch, urlPath,
     nextUrlParams.append('repo', contentGitRepoUrl);
 
     if(compressed) {
-        nextUrlParams.append('content_provider', contentProvider);
+        nextUrlParams.append('contentProvider', contentProvider);
     }
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
diff --git a/link.html b/link.html
index f742137b..62d76902 100644
--- a/link.html
+++ b/link.html
@@ -130,7 +130,7 @@ <h3 id="searchlabel">Quick search</h3>
             <!-- Source interaction buttons -->
 
 <div class="dropdown-buttons-trigger">
-    <button id="sourc-repo-dropdown-buttons-trigger" class="btn btn-secondary topbarbtn"
+    <button id="source-repo-dropdown-buttons-trigger" class="btn btn-secondary topbarbtn"
         aria-label="Connect with source repository"><i class="fab fa-github"></i></button>
     <div class="dropdown-buttons sourcebuttons">
         <a class="repository-button"