Skip to content

Commit c54088f

Browse files
debugger22debugger22
committed
Fix merge conflicts
2 parents 1e5a250 + 708e4df commit c54088f

File tree

14 files changed

+2232
-148
lines changed

14 files changed

+2232
-148
lines changed

‎.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,9 @@ jspm_packages
3939
# Optional for people who uses JetBrains products
4040
*.idea
4141

42-
dump.rdb
42+
*/target/
43+
44+
.env
45+
46+
Dockerfile
47+
docker-compose.yml

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 Sudhanshu Mishra
3+
Copyright (c) 2016 - 2023 Sudhanshu Mishra
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎app/index.html

Lines changed: 26 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,51 @@
33
<html>
44
<head>
55
<meta charset="utf-8" />
6-
<meta name="title" content="Project Audio for GitHub">
6+
<meta name="title" content="GitHub Audio">
77
<meta name="description" content="Listen to music generated by events happening across GitHub">
8-
<meta name="keywords" content="github, github music, github events, github visualization, listen, recent changes, sound, music, visualization">
9-
<meta name='summary' content='Events on GitHub, such as pushing commits, creating pull requests, creating issues, etc. are captured and converted to music notes based on the size of the data.'>
108

11-
<meta name="og:title" content="Project Audio for GitHub">
9+
<meta name="og:title" content="GitHub Audio">
1210
<meta name="og:url" content="https://github.audio">
13-
<meta name="og:image" content="https://github.audio/static/public/images/electric-guitar.png">
11+
<meta name="og:image" content="https://github.audio/public/images/electric-guitar.png">
1412
<meta name="og:description" content="Listen to music generated by events happening across GitHub">
1513

1614
<meta name="twitter:card" content="summary" />
1715
<meta name="twitter:site" content="https://github.audio" />
18-
<meta name="twitter:title" content="Project Audio for GitHub" />
16+
<meta name="twitter:title" content="GitHub Audio" />
1917
<meta name="twitter:description" content="Listen to music generated by events happening across GitHub" />
20-
<meta name="twitter:image" content="https://github.audio/static/public/images/electric-guitar.png" />
18+
<meta name="twitter:image" content="https://github.audio/public/images/electric-guitar.png" />
2119
<meta name="viewport" content="width=device-width, initial-scale=1">
2220

2321
<meta http-equiv='Expires' content='0'>
2422
<meta http-equiv='Pragma' content='no-cache'>
2523
<meta http-equiv='Cache-Control' content='no-cache'>
2624
<meta http-equiv='imagetoolbar' content='no'>
2725

28-
<title>Project Audio for GitHub</title>
29-
<link rel="mask-icon" href="/static/public/images/electric-guitar.svg" color="orange">
30-
<link rel="shortcut icon" type="image/png" href="/static/public/images/favicon.png"/>
26+
<title>GitHub Audio</title>
27+
<link rel="mask-icon" href="/public/images/electric-guitar.svg" color="orange">
28+
<link rel="shortcut icon" type="image/png" href="/public/images/favicon.png"/>
3129
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/odometer.js/0.4.7/themes/odometer-theme-default.min.css" />
3230
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.min.css" />
33-
<link rel="stylesheet" href="/static/public/css/main.css"/>
31+
<link rel="stylesheet" href="/public/css/main.css"/>
3432
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
3533
<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
3634
<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
37-
<script src="//cdnjs.cloudflare.com/ajax/libs/howler/2.0.0/howler.min.js"></script>
38-
<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.8/socket.io.min.js"></script>
35+
<script src="//cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.min.js"></script>
3936
<script src="//cdnjs.cloudflare.com/ajax/libs/odometer.js/0.4.7/odometer.min.js"></script>
4037
<script src="//cdnjs.cloudflare.com/ajax/libs/d3/4.2.6/d3.min.js"></script>
4138
<script src="//cdnjs.cloudflare.com/ajax/libs/seedrandom/2.4.2/seedrandom.min.js"></script>
42-
<script src="/static/public/js/main.js"></script>
39+
<script src="/public/js/main.js"></script>
4340
</head>
4441
<body>
45-
<div id="fb-root"></div>
46-
<script>(function(d, s, id) {
47-
var js, fjs = d.getElementsByTagName(s)[0];
48-
if (d.getElementById(id)) return;
49-
js = d.createElement(s); js.id = id;
50-
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.7&appId=718063574909410";
51-
fjs.parentNode.insertBefore(js, fjs);
52-
}(document, 'script', 'facebook-jssdk'));</script>
53-
42+
<div class="click-to-play" id="clickToPlay">
43+
<img
44+
class="play-button"
45+
src="/public/images/play-button.svg"
46+
alt="Click to play"
47+
onmouseover="playButtonHover(this);"
48+
onmouseout="playButtonUnhover(this);"
49+
onclick="playButtonClick(this);"/>
50+
</div>
5451
<header>
5552
<h1 class="header-text">
5653
Project Audio for GitHub&nbsp;
@@ -70,36 +67,25 @@ <h2 class="online-users-text"><span class="odometer online-users-count"></span>
7067
</div>
7168
<div id="config-area">
7269
<div id="org-repo-filter-div">
73-
Enter your organization's or repository's names to filter events&nbsp; <input type="text" id="org-repo-filter-name" /><br/><br/>
74-
You can also download it for <a href="/static/public/bin/GitHub-Audio-v1.0-macOS-x64.zip" target="_blank">macOS</a> and <a href="/static/public/bin/GitHub-Audio-v1.0-linux-x64.zip" target="_blank">Linux</a>.
70+
Enter your organization's or repository's names to filter events&nbsp; <input type="text" id="org-repo-filter-name" />
7571
</div>
7672
<div class="site-description">
77-
<h4>About</h4>
78-
<br/>
79-
<p>This website tracks events happening across GitHub and converts them to music notes based on certain parameters.</p><br/>
80-
<p>
81-
There are three types of sounds(bell, string pluck and string swell) based on four types of events(PushEvent, PullRequestEvent, IssuesEvent and IssueCommentEvent).
82-
Bells represent PushEvents, string plucks represent IssuesEvents and IssueCommentEvents whereas string swells represent PullRequestEvents.
83-
</p>
73+
<p>Track events happening across GitHub and convert them to music notes.</p><br/>
8474
</div>
8575
</div>
8676

8777
<footer>
8878
<div class="footer-left-text-block">
89-
<span>Disclaimer: this project is not in any way affiliated with GitHub.</span><br/>
90-
this project is open source, you can view it on <a href="https://github.com/debugger22/github-audio" target="_blank">GitHub</a><br/>
91-
developed by <a href="https://github.com/debugger22" target="_blank">@debugger22</a><br/><br/>
79+
<span>This project is not in any way affiliated with GitHub.</span><br/>
80+
This project is open source, you can view it on <a href="https://github.com/debugger22/github-audio" target="_blank">GitHub</a><br/>
81+
Developed by <a href="https://github.com/debugger22" target="_blank">@debugger22</a><br/><br/>
9282
<div id="coinwidget-bitcoin-37XgcaBrHibCMHzvZeZcj5mX5kYn8LUnui"></div><br/>
9383
ProTip: It's actually kind of nice to leave on the background<br/><br/>
9484
</div>
95-
<div class="footer-right-text-block">
96-
inspired by <a href="http://hatnote.com" target="_blank">hatnote</a><br/>
97-
<div>icons made by <a href="http://www.flaticon.com/authors/freepik" target="_blank" title="Freepik">Freepik</a></div>
98-
</div>
9985
<div class="social-buttons">
10086
<a class="twitter-follow-button" data-show-count="false" data-show-screen-name="false" data-size="small" href="https://twitter.com/GithubAudio">Follow</a><br/>
10187
<a href="https://twitter.com/share" class="twitter-share-button" data-show-count="false" data-text="Listen to music generated by events happening across GitHub. #github #music">Tweet</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script><br/>
102-
<div class="fb-share-button" data-href="https://github.audio" data-layout="button" data-size="small" data-mobile-iframe="true"><a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fgithub.audio%2F&amp;src=sdkpreparse">Share</a></div>
88+
<!-- <div class="fb-share-button" data-href="https://github.audio" data-layout="button" data-size="small" data-mobile-iframe="true"><a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fgithub.audio%2F&amp;src=sdkpreparse">Share</a></div> -->
10389
</div>
10490
</footer>
10591

@@ -112,26 +98,5 @@ <h4>About</h4>
11298
ga('create', 'UA-84999786-1', 'auto');
11399
ga('send', 'pageview');
114100
</script>
115-
<script src="//blockr.io/js_external/coinwidget/coin.js"></script>
116-
<script>
117-
CoinWidgetCom.go({
118-
wallet_address: '37XgcaBrHibCMHzvZeZcj5mX5kYn8LUnui',
119-
currency: 'bitcoin',
120-
counter: 'count',
121-
lbl_button: 'Donate',
122-
lbl_count: 'donations',
123-
lbl_amount: 'BTC',
124-
lbl_address: 'Use address below to donate. Thanks!',
125-
qrcode: true,
126-
alignment: 'bl',
127-
decimals: 8,
128-
size: "small",
129-
color: "dark",
130-
countdownFrom: "0",
131-
element: "#coinwidget-bitcoin-37XgcaBrHibCMHzvZeZcj5mX5kYn8LUnui",
132-
onShow: function(){},
133-
onHide: function(){}
134-
});
135-
</script>
136101
</body>
137102
</html>

‎app/public/css/main.css

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400|Josefin+Sans';
1+
@import url('https://fonts.googleapis.com/css2?family=Inter&display=swap');
22

33
html, body, div, span, applet, object, iframe,
44
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -51,19 +51,39 @@ a{
5151

5252
html,body{
5353
background-color: #0288D1;
54-
font-family: 'Source Sans Pro', sans-serif;
54+
font-family: 'Inter', sans-serif;
5555
font-weight: 400;
5656
font-size: 16px;
5757
overflow-x: hidden;
5858
visibility: hidden;
5959
}
6060

61+
.click-to-play{
62+
position: fixed;
63+
top: 0;
64+
left: 0;
65+
background-color: rgba(0, 0, 0, 0.7);
66+
z-index: 1;
67+
width: 100%;
68+
height: 100%;
69+
text-align: center;
70+
}
71+
72+
.play-button{
73+
width: 30rem;
74+
margin-top: 20rem;
75+
}
76+
77+
.play-button:hover{
78+
cursor: pointer;
79+
}
80+
6181
header{
6282
position: relative;;
6383
width: 100%;
6484
height: 35px;
6585
color: #fff;
66-
font-family: 'Source Sans Pro', sans-serif;
86+
font-family: 'Inter', sans-serif;
6787
padding-left: 20px;
6888
padding-top: 20px;
6989
padding-bottom: 20px;
@@ -117,7 +137,21 @@ circle {
117137
}
118138

119139
.label {
120-
font: 1.0em 'Source Sans Pro', sans-serif;
140+
font: 1em 'Inter', sans-serif;
141+
text-shadow:1px 1px 0 rgb(28, 39, 51),
142+
-1px -1px 0 rgb(28, 39, 51),
143+
1px -1px 0 rgb(28, 39, 51),
144+
-1px 1px 0 rgb(28, 39, 51),
145+
0px 1px 0 rgb(28, 39, 51),
146+
1px 0px 0 rgb(28, 39, 51),
147+
0px -1px 0 rgb(28, 39, 51),
148+
-1px 0px 0 rgb(28, 39, 51);
149+
color:#777777;
150+
151+
}
152+
153+
.article-label{
154+
font: 1em 'Inter', sans-serif;
121155
text-shadow:1px 1px 0 rgb(28, 39, 51),
122156
-1px -1px 0 rgb(28, 39, 51),
123157
1px -1px 0 rgb(28, 39, 51),
@@ -141,19 +175,19 @@ circle {
141175
}
142176

143177
.online-users-text{
144-
font-family: 'Source Sans Pro', sans-serif;
178+
font-family: 'Inter', sans-serif;
145179
font-size: 1em;
146180
color: #E0E0E0;
147181
}
148182

149183
#config-area{
150184
width: 100%;
151185
background: #FFFFFF;
152-
min-height: 300px;
186+
min-height: 100px;
153187
padding: 40px;
154188
color: #555555;
155-
font-family: 'Josefin Sans', sans-serif;
156-
font-weight: 300;
189+
font-family: 'Inter', sans-serif;
190+
font-weight: 400;
157191
}
158192

159193
#org-repo-filter-div{
@@ -163,14 +197,15 @@ circle {
163197
}
164198

165199
#org-repo-filter-name{
166-
width: 20%;
200+
width: 20rem;
167201
color: gray;
168202
padding: 5px;
169203
padding-left: 10px;
170-
border: none;
171-
background: #F1F1F1;
172-
font-family: 'Josefin Sans', sans-serif;
204+
border: #555555;
205+
background: #9EC5AB;
206+
font-family: 'Inter', sans-serif;
173207
font-size: 1em;
208+
border-radius: 5px;
174209
}
175210

176211
.site-description{
@@ -185,8 +220,8 @@ footer{
185220
width: 100%;
186221
height: 200px;
187222
padding: 20px;
188-
background-color: #242729;
189-
color: #9FA6AD;
223+
background-color: #104F55;
224+
color: #AAAAAA;
190225
margin-top: -5px;
191226
position: relative;
192227
font-size: 0.9em;
@@ -211,6 +246,11 @@ footer{
211246
z-index: 2;
212247
}
213248

249+
.org-repo-filter-input{
250+
border: #555555;
251+
background-color: #555555;
252+
}
253+
214254

215255
@media only screen and (max-device-width: 480px) {
216256

@@ -247,8 +287,4 @@ footer{
247287
text-align: left;
248288
}
249289

250-
.social-buttons{
251-
252-
}
253-
254290
}

‎app/public/images/play-button-hover.svg

Lines changed: 23 additions & 0 deletions
Loading

‎app/public/images/play-button.svg

Lines changed: 23 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)