Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
lalinsky committed Jun 28, 2015
1 parent 1911c68 commit 3c108d8
Show file tree
Hide file tree
Showing 11 changed files with 622 additions and 348 deletions.
26 changes: 23 additions & 3 deletions acoustid/web/pages/index.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
Title: Welcome to AcoustID!

AcoustID is an open source project that aims to create a
AcoustID is an open source project that provides free audio
file identification service to many open source applications.
It that consists of a large crowd-sourced database of audio
fingerprints, many of which are linked to the [MusicBrainz][] metadata
database using their [unique identifiers][MBID], and an open source
service for managing and searching in the fingerprint database.

### Ok, how can I use it?

If you have an unknown music file, one of the applications using
AcoustID will very likely be able to tell you what song is it,
who wrote it, and a lot more. In case AcoustID doesn't recognize
the song yet, you can submit it to the database, so that the next
person trying to identify the same song will have more luck.

If you are an appliation developer, please have a look at our
developers page.

open source project that aims to create a
free database of audio fingerprints with mapping to the [MusicBrainz][5]
metadata database and provide a [web service][6] for audio file
identification using this database.

### I'm a developer, how can I integrate this into my application?

The content of the database is all submitted by users. You can contribute
by downloading our [submission tool][4] and letting it to analyze your
music collection. It will submit fingerprints along with some metadata
Expand All @@ -19,6 +39,6 @@ itself.
[2]: /server
[3]: /chromaprint
[4]: /fingerprinter
[5]: http://musicbrainz.org/
[6]: /webservice

[MusicBrainz]: //musicbrainz.org/
[MBID]: //musicbrainz.org/doc/MusicBrainz_Identifier
18 changes: 9 additions & 9 deletions acoustid/web/pages/webservice.md

Large diffs are not rendered by default.

Binary file added acoustid/web/static/acoustid-logo-wo-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 98 additions & 0 deletions acoustid/web/static/acoustid.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
html {
position: relative;
min-height: 100%;
}

body {
font-family: 'DejaVu Sans', 'Verdana', sans;
margin-bottom: 80px;
}

.menu {
font-size: 130%;
line-height: 1.7;
text-align: center;
}

.menu h1 {
margin-bottom: 30px;
}

.content {
margin-bottom: 1em;
}

.content p,
.content td,
.content th,
.content li {
line-height: 1.7;
}

.login-block {
display: inline-block;
width: 100px;
height: 60px;
border: solid 2px #eee;
}

.login-block:hover,
.login-block.active {
border-color: #8e99aa;
}

.login-block span {
display: none;
}

.login-google {
background: url(/static/login/google.png) 50% 50% no-repeat;
}

.login-yahoo {
background: url(/static/login/yahoo.png) 50% 50% no-repeat;
}

.login-musicbrainz {
background: url(/static/login/musicbrainz.png) 50% 50% no-repeat;
}

.login-openid {
background: url(/static/login/openid.png) 50% 50% no-repeat;
}

.chart {
height: 250px;
}

.indented {
padding-left: 2em !important;
}

.narrow {
width: 10em;
}

.footer {
position: absolute;
bottom: 0;
width: 100%;
height: 80px;
font-size: 90%;
color: #999;
text-align: center;
background-color: #f9f9f9;
border-top: 1px solid #e5e5e5;
}

.footer p {
margin: 10px 0;
}

.footer p:first-child {
margin-top: 15px;
}

.footer p:last-child {
margin-bottom: 15px;
}
477 changes: 320 additions & 157 deletions acoustid/web/static/highcharts.js

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions acoustid/web/static/jquery-1.10.0.min.js

This file was deleted.

55 changes: 55 additions & 0 deletions acoustid/web/static/stats.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
$(document).ready(function() {

Highcharts.theme = {
colors: ['#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE',
'#DB843D', '#92A8CD', '#A47D7C', '#B5CA92']
};

Highcharts.setOptions(Highcharts.theme);

$('#chart1').highcharts({
chart: {
type: 'line'
},
title: { text: '' },
xAxis: {
type: 'datetime',
dateTimeLabelFormats: {
month: '%e. %b',
year: '%b'
}
},
yAxis: {
title: { text: '' }
},
plotOptions: {
line: {
lineWidth: 2
}
},
series: chart1_series
});
$('#chart2').highcharts({
chart: {
type: 'line'
},
title: { text: '' },
xAxis: {
type: 'datetime',
dateTimeLabelFormats: {
month: '%e. %b',
year: '%b'
}
},
yAxis: {
title: { text: '' }
},
plotOptions: {
line: {
lineWidth: 2
}
},
series: chart2_series
});
});

3 changes: 1 addition & 2 deletions acoustid/web/static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,7 @@ pre {
padding: 0.5em;
border: solid 2px #C5C5C5;
overflow: auto;
line-height: 1.3;
}
line-height: 1.3;text-right}

table.listing {
margin-top: 0;
Expand Down
82 changes: 46 additions & 36 deletions acoustid/web/templates/_base.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" dir="ltr">
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>{% if title %}{{ title }} | {% endif %}AcoustID</title>
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}" />
<script type="text/javascript" src="{{ url_for('static', filename='jquery-1.10.0.min.js') }}"></script>
<script type="text/javascript">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% if title %}{{ title }} | {% endif %}AcoustID</title>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="{{ url_for('static', filename='acoustid.css') }}" />
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
<!--<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-18981078-1']);
Expand All @@ -18,9 +21,9 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</script> -->
</head>
<body style="margin-top:0;">
<body>
{# <div style="text-align: center; width:100%; font-weight: bold; font-size:130%; color:red;">The AcoustID website is currently in read-only mode for maintenance.</div> #}
{# <div style="text-align: left; width:100%; font-size: 14px; background-color: #ffefd7; padding:10px; font-weight: bold;">

Expand All @@ -41,36 +44,43 @@

</div> #}

</div>
<div id="container">
<div id="container-inner">
<h1><a href="{{ url_for('general.index') }}" title="AcoustID"><span>AcoustID</span></a></h1>
<ul id="menu">
<li><a href="{{ url_for('user.api_key') }}"><strong>Get API Key</strong></a></li>
{% if account_id %}
<li><a href="{{ url_for('apps.applications') }}">Applications</a></li>
<li><a href="{{ url_for('user.logout') }}">Log out</a></li>
{% endif %}
<li><a href="{{ url_for('stats.stats') }}">Statistics</a></li>
<li><a href="{{ url_for('general.docs') }}">Documentation</a></li>
<li><a href="{{ url_for('general.donate') }}">Donate</a></li>
<li><a href="https://oxygene.sk/category/acoustid/">Blog</a></li>
<li><a href="https://groups.google.com/forum/#!forum/acoustid">Mailing List</a></li>
</ul>
<div id="content">
{% block content %}{% endblock %}
<div class="container">
<div class="row">
<div class="col-sm-3 menu">
<h1><a href="{{ url_for('general.index') }}" title="AcoustID"><img src="{{ url_for('static', filename='acoustid-logo-wo-bg.png') }}" width="180" alt="AcoustID"></a></h1>
<ul class="list-unstyled">
<li><a href="{{ url_for('user.api_key') }}"><strong>Get API Key</strong></a></li>
{% if account_id %}
<li><a href="{{ url_for('apps.applications') }}">Applications</a></li>
<li><a href="{{ url_for('user.logout') }}">Log out</a></li>
{% endif %}
<li><a href="{{ url_for('general.docs') }}">Documentation</a></li>
<li><a href="{{ url_for('stats.stats') }}">Statistics</a></li>
<li><a href="{{ url_for('general.donate') }}">Donate</a></li>
<li><a href="{{ url_for('general.contact') }}">Contact</a></li>
</ul>
</div>
<div class="col-sm-9 content">
{% block content %}{% endblock %}
</div>
</div>
</div>
<p id="footer">
Created by <a href="https://oxygene.sk/">Lukáš Lalinský</a> |
<a href="http://status.acoustid.org">Status</a> |
<a href="{{ url_for('general.license') }}">License</a> |
<a href="{{ url_for('general.donate') }}">Donate</a> |
<a href="{{ url_for('general.contact') }}">Contact</a> |
<a href="https://twitter.com/acoustid">Twitter</a> |
<a href="https://www.facebook.com/acoustid">Facebook</a>
</p>
<footer class="footer">
<div class="container">
<p class="text-muted">Software created and hosted by <a href="https://oxygene.sk/">Lukáš Lalinský</a>, data crowd-sourced by <a href="{{ url_for('stats.stats') }}">thousands of contributors</a>.</p>
<p class="text-muted">
<a href="{{ url_for('general.contact') }}">Contact</a> |
<a href="https://groups.google.com/forum/#!forum/acoustid">Mailing List</a> |
<a href="https://oxygene.sk/category/acoustid/">Blog</a> |
<a href="https://twitter.com/acoustid">Twitter</a> |
<a href="https://www.facebook.com/acoustid">Facebook</a> |
<a href="http://status.acoustid.org">API Status</a>
</p>
</div>
</footer>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
{% block extra_js %}{% endblock %}
</body>
</html>

57 changes: 30 additions & 27 deletions acoustid/web/templates/login.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
{% extends "_base.html" %}
{% block content %}

<h2>Log In</h2>

{% if errors %}
<p class="errors">{% for error in errors %}{{ error }}<br />{% endfor %}</p>
{% endif %}

<p><small>Please log in with an account from one of these providers:</small></p>

<form action="{{ url_for('.login') }}" method="POST">

<p>
<a class="login-block login-musicbrainz" href="#"><span>Log in with MusicBrainz</span></a>
<a class="login-block login-google" href="#"><span>Log in with Google</span></a>
<a class="login-block login-yahoo" href="#"><span>Log in with Yahoo!</span></a>
<a class="login-block login-openid" href="#"><span>Log in with OpenID</span></a>
</p>

<p class="openid-form" style="display:none">
<input name="openid_identifier" type="text" class="openid" /> <input type="submit" value="Log in" />
</p>

<input type="hidden" name="return_url" value="{{ return_url }}" />
<input type="hidden" name="login" value="openid" />

</form>

{% endblock %}

{% block extra_js %}

<script type="text/javascript">
$(document).ready(function () {
$('.login-musicbrainz').click(function () {
Expand Down Expand Up @@ -33,31 +63,4 @@
});
</script>

<h2>Log In</h2>

{% if errors %}
<p class="errors">{% for error in errors %}{{ error }}<br />{% endfor %}</p>
{% endif %}

<p><small>Please log in with an account from one of these providers:</small></p>

<form action="{{ url_for('.login') }}" method="POST">

<p>
<a class="login-block login-musicbrainz" href="#"><span>Log in with MusicBrainz</span></a>
<a class="login-block login-google" href="#"><span>Log in with Google</span></a>
<a class="login-block login-yahoo" href="#"><span>Log in with Yahoo!</span></a>
<a class="login-block login-openid" href="#"><span>Log in with OpenID</span></a>
</p>

<p class="openid-form" style="display:none">
<input name="openid_identifier" type="text" class="openid" /> <input type="submit" value="Log in" />
</p>

<input type="hidden" name="return_url" value="{{ return_url }}" />
<input type="hidden" name="login" value="openid" />

</form>

{% endblock %}

Loading

0 comments on commit 3c108d8

Please sign in to comment.