Merge pull request #12 from andrewlalis/serve-frontend

Fixing frontend/backend again
This commit is contained in:
Andrew Lalis 2018-10-11 11:17:31 +01:00 committed by GitHub
commit 369a1748c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 3 deletions

View File

@ -99,5 +99,11 @@ $(function(){
((''+month).length<2 ? '0' : '') + month + '/' + ((''+month).length<2 ? '0' : '') + month + '/' +
d.getFullYear(); d.getFullYear();
$(".date").append(output); $(".date").append(output);
if ($('.landingpage').length > 0) {
$("body").addClass("box");
}else if ($('.results').length > 0) {
$("body").addClass("box3");
}else if ($('.entity').length > 0) {
$("body").addClass("box2");
}
}); });

View File

@ -33,11 +33,11 @@
</div> </div>
</nav> </nav>
<div id="content">
{% block content %} {% block content %}
{# Fill in this block in child pages to display content for the page. #} {# Fill in this block in child pages to display content for the page. #}
{% endblock %} {% endblock %}
</div>
{# Javascript dependencies #} {# Javascript dependencies #}
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>

View File

@ -8,6 +8,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container entity">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<h1 class="muted text-center">{{ entity.name }} {{ entity.average }}</h1> <h1 class="muted text-center">{{ entity.name }} {{ entity.average }}</h1>
@ -92,6 +93,7 @@
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}

View File

@ -6,6 +6,8 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="fullcontainer landingpage">
<div class="container vertical center horizontal center"> <div class="container vertical center horizontal center">
<h1>Find rated courses</h1> <h1>Find rated courses</h1>
<h3>The best course reviews by your fellow students!</h3> <h3>The best course reviews by your fellow students!</h3>
@ -20,4 +22,7 @@
</form> </form>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

View File

@ -5,6 +5,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="fullcontainer container bootstrap snippet results">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="ibox float-e-margins "> <div class="ibox float-e-margins ">
@ -42,4 +43,8 @@
{% endif %} {% endif %}
</div> </div>
</div>
</div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -100,4 +100,13 @@ $(function(){
d.getFullYear(); d.getFullYear();
$(".date").append(output); $(".date").append(output);
if ($('.fullcontainer .landingpage')[0]) {
alert("yihaa");
}else{
alert("noo");
}
if ($('.fullcontainer landingpage')[0]) {
alert("yihaa2");
}
}); });

View File

@ -100,4 +100,13 @@ $(function(){
d.getFullYear(); d.getFullYear();
$(".date").append(output); $(".date").append(output);
if ($('.fullcontainer .landingpage')[0]) {
alert("yihaa");
}else{
alert("noo");
}
if ($('.fullcontainer landingpage')[0]) {
alert("yihaa2");
}
}); });