Skip to content

Commit 45c0980

Browse files
author
Bryce Murphy
committed
Merge branch 'master' of github.com:jrtechs/github-graphs
2 parents 65ed04d + e8de0ba commit 45c0980

10 files changed

Lines changed: 63 additions & 17 deletions

File tree

‎public/FriendsGraph.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<title>Friends - GitHub Graphs</title>
67
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
78
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
89
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">

‎public/GraphGenerator.html‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<title>Generate - GitHub Graphs</title>
67
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
78
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
89
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
@@ -123,27 +124,43 @@ <h1 class="m-title">Interactive Organization Chart</h1>
123124
<script>
124125
function fetchUserInput() {
125126
const inputedName = $("#txtUsername").val();
127+
128+
if(inputedName === "")
129+
{
130+
alert("Please enter a Github name in the text field.")
131+
}
132+
126133
return inputedName;
127134
}
128135

129-
function fetchOrgInput() {
136+
function fetchOrgInput()
137+
{
130138
const inputedOrg = $("#txtOrgname").val();
139+
if(inputedOrg === "")
140+
{
141+
alert("Please enter a Github organization name in the text field.")
142+
}
131143
return inputedOrg;
132144
}
133145

134-
function toFriends() {
146+
function toFriends()
147+
{
135148
var uname = fetchUserInput();
136-
window.location.href = "./FriendsGraph.html?name=" + uname;
149+
if(uname !== "")
150+
window.location.href = "./FriendsGraph.html?name=" + uname;
137151
}
138152

139-
function toTimeline() {
153+
function toTimeline()
154+
{
140155
var uname = fetchUserInput();
141-
window.location.href = "./TimeLineGraph.html?name=" + uname;
156+
if(uname !== "")
157+
window.location.href = "./TimeLineGraph.html?name=" + uname;
142158
}
143159

144160
function toOrgRepos() {
145-
var oname = fetchOrgInput();
146-
window.location.href = "./OrgRepoGraph.html?name=" + oname;
161+
var uname = fetchOrgInput();
162+
if(uname !== "")
163+
window.location.href = "./OrgRepoGraph.html?name=" + uname;
147164
}
148165

149166
</script>

‎public/OrgRepoGraph.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<!doctype html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<title>Organization - GitHub Graphs</title>
67
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
78
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
89
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">

‎public/TimeLineGraph.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<!doctype html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<title>Timeline - GitHub Graphs</title>
67
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
78
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
89
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">

‎public/about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6-
<title>GitHub Graphs</title>
6+
<title>About - GitHub Graphs</title>
77
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
88
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
99
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">

‎public/img/friends.png‎

1.05 MB
Loading

‎public/img/friends2.png‎

880 KB
Loading

‎public/img/repos.png‎

252 KB
Loading

‎public/index.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<title>Home - GitHub Graphs</title>
67
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
78
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
89
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
@@ -48,18 +49,18 @@
4849
<div id="mainCarousel" class="carousel slide" data-ride="carousel">
4950
<div class="carousel-inner">
5051
<div class="carousel-item active">
51-
<div class="text-center">
52-
<img src="./img/DolphinCroissant.png" />
52+
<div class="image-vert text-center">
53+
<img class="img-fluid carousel-img" src="./img/friends.png" />
5354
</div>
5455
</div>
5556
<div class="carousel-item">
56-
<div class="text-center">
57-
<img src="./img/DolphinCroissant.png" />
57+
<div class="image-vert text-center">
58+
<img class="img-fluid carousel-img" src="./img/repos.png" />
5859
</div>
5960
</div>
6061
<div class="carousel-item">
61-
<div class="text-center">
62-
<img src="./img/DolphinCroissant.png" />
62+
<div class="image-vert text-center">
63+
<img class="img-fluid carousel-img" src="./img/DolphinCroissant.png" />
6364
</div>
6465
</div>
6566
</div>
@@ -98,6 +99,7 @@ <h1 class="m-title" style="padding-top: 5px;">What can I do here?</h1>
9899
</div>
99100
<img class="side-img img-fluid col" src="./img/graphExample.png" />
100101
</div>
102+
<p>check</p>
101103
</div>
102104
</body>
103105
</html>

‎public/style.css‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,27 @@
4747

4848
#mainCarousel {
4949
height: 500px;
50-
background-color: black;
50+
background-color: #232323;
5151
}
5252

5353
.carousel-item {
5454
height: 500px;
55+
overflow: hidden;
56+
vertical-align: middle;
57+
}
58+
59+
.carousel-img {
60+
width: 100%;
61+
min-height: 300px;
62+
display: inline-block;
63+
top: 0%;
64+
left: 0%;
65+
position: absolute;
66+
}
67+
68+
.img-vert {
69+
display: inline-block;
70+
height: 100%;
5571
}
5672

5773
.error {
@@ -205,4 +221,12 @@ body {
205221
align-self: center;
206222
width: 80%;
207223
}
224+
225+
.carousel-img {
226+
width: 100%;
227+
min-height: 200px;
228+
display: inline-block;
229+
top: 10px;
230+
position: relative;
231+
}
208232
}

0 commit comments

Comments
 (0)