From 3e12dfe6bfe3411f5d255d55fa26e461d139f9a6 Mon Sep 17 00:00:00 2001
From: Sebastian Gutierrez <sebastiangutierrezcorrea@gmail.com>
Date: Thu, 24 Oct 2019 16:14:30 -0500
Subject: [PATCH] Add new navbar to all pages

---
 public/FriendsGraph.html   | 33 ++++++++++----------------
 public/GraphGenerator.html | 34 +++++++++++----------------
 public/OrgRepoGraph.html   | 40 +++++++++++++------------------
 public/TimeLineGraph.html  | 48 +++++++++++++++++---------------------
 public/about.html          | 38 ++++++++++++------------------
 5 files changed, 77 insertions(+), 116 deletions(-)
diff --git a/public/FriendsGraph.html b/public/FriendsGraph.html
index 40b3eca..3aac9c7 100644
--- a/public/FriendsGraph.html
+++ b/public/FriendsGraph.html
@@ -23,34 +23,25 @@
 
 </head>
 <body>
-    <div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
-        <div id="header-title">
-            <a href="./index.html">
-                <img id="logo" src="./logo.svg" />
-            </a>
-        </div>
-        <div id="navigation">
-            <ul class="nav">
+    <nav class="navbar navbar-dark bg-dark navbar-expand-md">
+        <a class="navbar-brand" href="/"><img src="img/githubgraph-logo.svg" alt=""></a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-menu" aria-controls="main-menu" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div id="main-menu" class="collapse navbar-collapse">
+            <ul class="navbar-nav flex-fill justify-content-end">
                 <li class="nav-item">
-                    <a href="./GraphGenerator.html">
-                        Generate graphs
-                    </a>
+                    <a class="nav-link" href="./GraphGenerator.html">Generate graphs</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="https://github.com/jrtechs/github-graphs">
-                        View on GitHub
-                    </a>
+                    <a class="nav-link" href="https://github.com/jrtechs/github-graphs/">View on GitHub</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="./about.html">
-                        About
-                    </a>
+                    <a class="nav-link" href="./about.html">About</a>
                 </li>
             </ul>
         </div>
-    </div>
+    </nav>
     <div class="main container">
 
         <div class="row">
@@ -79,4 +70,4 @@
     }
 </script>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/public/GraphGenerator.html b/public/GraphGenerator.html
index 76806ee..56086ab 100644
--- a/public/GraphGenerator.html
+++ b/public/GraphGenerator.html
@@ -15,34 +15,26 @@
     </script>
 </head>
 <body>
-    <div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
-        <div id="header-title">
-            <a href="./index.html">
-                <img id="logo" src="./logo.svg" />
-            </a>
-        </div>
-        <div id="navigation">
-            <ul class="nav">
+    <nav class="navbar navbar-dark bg-dark navbar-expand-md">
+        <a class="navbar-brand" href="/"><img src="img/githubgraph-logo.svg" alt=""></a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-menu" aria-controls="main-menu" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div id="main-menu" class="collapse navbar-collapse">
+            <ul class="navbar-nav flex-fill justify-content-end">
                 <li class="nav-item">
-                    <a href="./GraphGenerator.html">
-                        Generate graphs
-                    </a>
+                    <a class="nav-link" href="./GraphGenerator.html">Generate graphs</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="https://github.com/jrtechs/github-graphs">
-                        View on GitHub
-                    </a>
+                    <a class="nav-link" href="https://github.com/jrtechs/github-graphs/">View on GitHub</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="./about.html">
-                        About
-                    </a>
+                    <a class="nav-link" href="./about.html">About</a>
                 </li>
             </ul>
         </div>
-    </div>
+    </nav>
+
     <div class="main container">
         <div id="user-graphs">
             <div id="search-bar">
@@ -181,4 +173,4 @@
             window.location.href = "./OrgRepoGraph.html?name=" + uname;
     }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/public/OrgRepoGraph.html b/public/OrgRepoGraph.html
index 3ae5354..5ffe776 100644
--- a/public/OrgRepoGraph.html
+++ b/public/OrgRepoGraph.html
@@ -31,34 +31,26 @@
 
 </head>
 <body>
-    <div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
-        <div id="header-title">
-            <a href="./index.html">
-                <img id="logo" src="./logo.svg" />
-            </a>
-        </div>
-        <div id="navigation">
-            <ul class="nav">
+    <nav class="navbar navbar-dark bg-dark navbar-expand-md">
+        <a class="navbar-brand" href="/"><img src="img/githubgraph-logo.svg" alt=""></a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-menu" aria-controls="main-menu" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div id="main-menu" class="collapse navbar-collapse">
+            <ul class="navbar-nav flex-fill justify-content-end">
                 <li class="nav-item">
-                    <a href="./GraphGenerator.html">
-                        Generate graphs
-                    </a>
+                    <a class="nav-link" href="./GraphGenerator.html">Generate graphs</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="https://github.com/jrtechs/github-graphs">
-                        View on GitHub
-                    </a>
+                    <a class="nav-link" href="https://github.com/jrtechs/github-graphs/">View on GitHub</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="./about.html">
-                        About
-                    </a>
+                    <a class="nav-link" href="./about.html">About</a>
                 </li>
             </ul>
         </div>
-    </div>
+    </nav>
+
     <div class="main containerCustom">
 
         <div class="row containerCustom">
@@ -91,7 +83,7 @@
         </div>
 
         <script>
-        
+
             function createGraphs(orgname) {
                 options.width = $("#myGraph").width() + "px";
                 options.height = "700px";
@@ -100,15 +92,15 @@
                 createOrgTable(orgname, 'repositoryTable');
                 createOrgInfo(orgname, 'organizationInfo')
             }
-        
+
             if(findGetParameter("name") !== null)
             {
                 createGraphs(findGetParameter("name"))
             }
-            
+
         </script>
     </div>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/public/TimeLineGraph.html b/public/TimeLineGraph.html
index 622ee28..c477f8f 100644
--- a/public/TimeLineGraph.html
+++ b/public/TimeLineGraph.html
@@ -79,32 +79,26 @@
     </style>
 </head>
 <body>
-<div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
-    <div id="header-title">
-        <a href="./index.html">
-            <img id="logo" class="text-center" src="./logo.svg" />
-        </a>
-    </div>
-    <ul id="navigation" class="nav justify-content-end">
-        <li class="nav-item">
-            <a href="./GraphGenerator.html">
-                Generate graphs
-            </a>
-        </li>
-        <div class="nav-sep"></div>
-        <li class="nav-item">
-            <a href="https://github.com/jrtechs/github-graphs">
-                View on GitHub
-            </a>
-        </li>
-        <div class="nav-sep"></div>
-        <li class="nav-item">
-            <a href="./about.html">
-                About
-            </a>
-        </li>
-    </ul>
-</div>
+    <nav class="navbar navbar-dark bg-dark navbar-expand-md">
+        <a class="navbar-brand" href="/"><img src="img/githubgraph-logo.svg" alt=""></a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-menu" aria-controls="main-menu" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div id="main-menu" class="collapse navbar-collapse">
+            <ul class="navbar-nav flex-fill justify-content-end">
+                <li class="nav-item">
+                    <a class="nav-link" href="./GraphGenerator.html">Generate graphs</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="https://github.com/jrtechs/github-graphs/">View on GitHub</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="./about.html">About</a>
+                </li>
+            </ul>
+        </div>
+    </nav>
+
 <div class="containerCustom">
 
     <div class="row align-center" id="searchBarTop">
@@ -152,4 +146,4 @@
     }
 </script>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/public/about.html b/public/about.html
index 43eaf3f..d196574 100644
--- a/public/about.html
+++ b/public/about.html
@@ -11,34 +11,26 @@
     <link rel="stylesheet" href="./about.css" />
 </head>
 <body>
-    <div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
-        <div id="header-title">
-            <a href="./index.html">
-                <img id="logo" src="./logo.svg" />
-            </a>
-        </div>
-        <div id="navigation">
-            <ul class="nav">
+    <nav class="navbar navbar-dark bg-dark navbar-expand-md">
+        <a class="navbar-brand" href="/"><img src="img/githubgraph-logo.svg" alt=""></a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-menu" aria-controls="main-menu" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div id="main-menu" class="collapse navbar-collapse">
+            <ul class="navbar-nav flex-fill justify-content-end">
                 <li class="nav-item">
-                    <a href="./GraphGenerator.html">
-                        Generate graphs
-                    </a>
+                    <a class="nav-link" href="./GraphGenerator.html">Generate graphs</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="https://github.com/jrtechs/github-graphs">
-                        View on GitHub
-                    </a>
+                    <a class="nav-link" href="https://github.com/jrtechs/github-graphs/">View on GitHub</a>
                 </li>
-                <div class="nav-sep"></div>
                 <li class="nav-item">
-                    <a href="./about.html">
-                        About
-                    </a>
+                    <a class="nav-link" href="./about.html">About</a>
                 </li>
             </ul>
         </div>
-    </div>
+    </nav>
+
     <div>
         <div id="content" class="container">
             <div id="content-title">
@@ -46,8 +38,8 @@
             </div>
             <div id="content-body" class="container">
                 <p style="padding: 10px;">
-                    This is an interactive website which allows you to make various graphs of information from 
-                    the GitHub network. Currently the site generates three types of graphs-- the most popular and entertaining 
+                    This is an interactive website which allows you to make various graphs of information from
+                    the GitHub network. Currently the site generates three types of graphs-- the most popular and entertaining
                     of which is the friends graph. The friends graph helps you visualize clusters of friends/collaborators on GitHub.
                     This can be used to spot clusters within organizations and schools.
                 </p>
@@ -158,4 +150,4 @@
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
