Skip to content

Commit

Permalink
Give the site a fresh new look!
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephenswat
stephenswat committed Jun 7, 2019
1 parent a5f283d commit 8b1d8ad
Show file tree
Hide file tree
Showing 18 changed files with 363 additions and 245 deletions.
19 changes: 15 additions & 4 deletions abyssal_modules/templates/abyssal_modules/appraisal.html
View file
Expand Up @@ -5,11 +5,22 @@
{% block title %}Module Appraisal{% endblock %}

{% block content %}
<div class="jumbotron">
<h1>Module Appraisal</h1>
<div class="container-fluid d-flex flex-column ng-scope">
<div class="row align-items-center bg-primary check-contrast py-5">
<div class="col-xl-9 container-alt text-light toggles-ignore mx-auto">
<h1 class="display-3 mb-0">
<span data-ng-bind="selected.palette.name" class="ng-binding">Module Appraisal</span>
</h1>
<p class="lead mb-3"><span data-ng-bind="selected.palette.desc" class="ng-binding">
This page can be used to get a very rough estimate of the price of
abyssal modules. We'll use fancy machine learning algorithms in an
attempt to give you a fair appraisal of your module.</p>
</div>
</div>
</div>

<p>This page can be used to get a very rough estimate of the price of
abyssal modules. The process is somewhat awkward since there is no "copy
<div class="container my-5">
<p>The process is somewhat awkward since there is no "copy
external URL" option for modules like there is for killmails. To get an
appraisal, please follow these steps:</p>

Expand Down
29 changes: 20 additions & 9 deletions abyssal_modules/templates/abyssal_modules/asset_list.html
View file
Expand Up @@ -16,16 +16,27 @@
{% endfor %}
</style>

{% include "abyssal_modules/module_tabs.html" with active_page="asset_list" %}

<div class="jumbotron jumbotron-tabs">
<h1>{{ module_type.name }}</h1>
<div class="container-fluid d-flex flex-column ng-scope">
<div class="row align-items-center bg-primary check-contrast py-5">
<div class="col-xl-9 container-alt text-light toggles-ignore mx-auto">
<h1 class="display-3 mb-0">
<span data-ng-bind="selected.palette.name" class="ng-binding">{{ module_type.name }}</span>
</h1>

<p class="lead mb-3"><span data-ng-bind="selected.palette.desc" class="ng-binding">
This page displays abyssal modules in your hangar. To
have the service scrape your asset list, add characters using the "Add
character" button in the top right and make sure you check the asset
reading scope.</p>
</div>
</div>
</div>

<p class="text-muted">This page displays abyssal modules in your hangar. To
have the service scrape your asset list, add characters using the "Add
character" button in the top right and make sure you check the asset
reading scope.</p>
<div class="container">
{% include "abyssal_modules/module_tabs.html" with active_page="asset_list" %}
</div>

<div class="container my-5">
<form>
<div class="row">
{% for at in attributes %}
Expand All @@ -35,7 +46,7 @@ <h1>{{ module_type.name }}</h1>
</form>
</div>

<div class="jumbotron">
<div class="container my-5">
<table class="table module-table dt-responsive" id="module-table">
<thead>
<tr>
Expand Down
14 changes: 10 additions & 4 deletions abyssal_modules/templates/abyssal_modules/creator.html
View file
Expand Up @@ -4,11 +4,17 @@
{% block title %}{{ object.name }}{% endblock %}

{% block content %}
<div class="jumbotron">
<h1>{{ object.name }}</h1>

<h4>Creations</h4>
<div class="container-fluid d-flex flex-column ng-scope">
<div class="row align-items-center bg-primary check-contrast py-5">
<div class="col-xl-9 container-alt text-light toggles-ignore mx-auto">
<h1 class="display-3 mb-0">
<span data-ng-bind="selected.palette.name" class="ng-binding">{{ object.name }}</span>
</h1>
</div>
</div>
</div>

<div class="container my-5">
<table class="table module-table dt-responsive" id="module-table" width="100%">
<thead>
<tr>
Expand Down
189 changes: 54 additions & 135 deletions abyssal_modules/templates/abyssal_modules/home.html
View file
Expand Up @@ -8,10 +8,21 @@
{% block title %}Homepage{% endblock %}

{% block content %}
<div class="jumbotron">
<h1>Module Types</h1>

<div class="container">
<div class="container-fluid d-flex flex-column ng-scope">
<div class="row align-items-center bg-primary check-contrast py-5">
<div class="col-xl-9 col-lg-11 container-alt text-light toggles-ignore mx-auto py-5">
<div class="py-2 text-center text-lg-left">
<h1 class="display-3 mb-0">
<span data-ng-bind="selected.palette.name" class="ng-binding">mutaplasmid.space</span>
</h1>
<p class="lead mb-3"><span data-ng-bind="selected.palette.desc" class="ng-binding">A DIY starter theme.</span> <strong>Easily</strong> customize this, and other free Bootstrap 4 themes for your downloading pleasure.</p>
</div>
</div>
</div>
</div>

<div class="container d-flex flex-column ng-scope pt-5">
{% get_abyssal_type_list as type_list %}
{% for r, l in type_list %}
<div class="row">
Expand All @@ -27,141 +38,49 @@ <h1>Module Types</h1>
{% endfor %}
</div>

</div>

<div class="row my-4">
<div class="col-sm-6">
<div class="card flex-row">
<div class="card-header border-0 parner-logo">
<img src="{% static 'img/partners/mogul.png' %}" class="partner-logo">
</div>
<div class="card-block p-3">
<h4 class="card-title"><a href="https://beta.mogulfinancial.space/">EVE Mogul</a></h4>
<p class="card-text">If you play the New Eden markets, EVE Mogul is the service for you. Their great tools allow you to track and optimize your market activities.</p>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="card flex-row">
<div class="card-header border-0 parner-logo">
<img src="{% static 'img/partners/pyfa.png' %}" class="partner-logo">
</div>
<div class="card-block p-3">
<h4 class="card-title"><a href="https://github.com/pyfa-org/Pyfa">Pyfa</a></h4>
<p class="card-text">Pyfa is the best tool available for simulating fits and it can import abyssal modules directly from this website!</p>
</div>
</div>
</div>
</div>
<div class="row my-4">
<div class="col-sm-6">
<div class="card flex-row">
<div class="card-header border-0 parner-logo">
<img src="{% static 'img/partners/discord.png' %}" class="partner-logo">
</div>
<div class="card-block p-3">
<h4 class="card-title"><a href="http://discord.gg/sFrvsGg">Abyssal Trading Discord</a></h4>
<p class="card-text">Chat about, appraise, buy and sell abyssal modules on Discord. Also has an in-game channel: <i>Abyssal Trading</i>.</p>
<div class="container-fluid d-flex flex-column ng-scope">
<div class="row align-items-center check-contrast">
<div class="col-xl-9 col-lg-11 container-alt toggles-ignore mx-auto pt-5">
<div class="row py-2">
<div class="row my-4">
<div class="col-sm-4">
<div class="card flex-row">
<div class="card-header border-0 parner-logo">
<img src="{% static 'img/partners/mogul.png' %}" class="partner-logo">
</div>
<div class="card-block p-3">
<h4 class="card-title"><a href="https://beta.mogulfinancial.space/">EVE Mogul</a></h4>
<p class="card-text">If you play the New Eden markets, EVE Mogul is the service for you. Their great tools allow you to track and optimize your market activities.</p>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="card flex-row">
<div class="card-header border-0 parner-logo">
<img src="{% static 'img/partners/pyfa.png' %}" class="partner-logo">
</div>
<div class="card-block p-3">
<h4 class="card-title"><a href="https://github.com/pyfa-org/Pyfa">Pyfa</a></h4>
<p class="card-text">Pyfa is the best tool available for simulating fits and it can import abyssal modules directly from this website!</p>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="card flex-row">
<div class="card-header border-0 parner-logo">
<img src="{% static 'img/partners/discord.png' %}" class="partner-logo">
</div>
<div class="card-block p-3">
<h4 class="card-title"><a href="http://discord.gg/sFrvsGg">Abyssal Trading Discord</a></h4>
<p class="card-text">Chat about, appraise, buy and sell abyssal modules on Discord. Also has an in-game channel: <i>Abyssal Trading</i>.</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="jumbotron">
<h2>Latest Abyssal Modules</h2>

<table class="table module-table dt-responsive" id="module-table" width="100%">
<thead>
<tr>
<th>Icon</th>
<th>Module</th>
<th>Attributes</th>
<th>Price</th>
<th width="1px">Open</th>
</tr>
</thead>
</table>
</div>
{% endblock %}

{% block trailing_js %}
<script>
{% if not request.user.is_authenticated %}
var logged_in = false;
{% else %}
var logged_in = true;
{% endif %}

function icon_format(mid, tid) {
return `<a href="/module/${mid}/"><img src="https://image.eveonline.com/Type/${tid}_32.png"></a>`
}

function link_format(type_id, type_name) {
return `<a href="/type/${type_id}/">${type_name}</a>`
}

$(document).ready(function () {
{% if not request.user.is_authenticated %}
$('.btn-open-contract-esi').prop('disabled', true);
{% endif %}

$('#module-table').DataTable({
"processing": true,
"ajax": {
url: "{% url 'abyssal_api:lastest_modules' %}",
dataSrc: ''
},
"columns": [
{
'name': 'id',
'orderable': false,
'data': null,
'render': function (data, type, row, meta) {
return icon_format(data.id, data.type_id);
}
},
{
'name': 'module',
'data': null,
'render': function (data, type, row, meta) {
return link_format(data.type_id, data.type_name);
}
},
{
'name': 'attributes',
'data': 'attributes',
'render': function (data, type, row, meta) {
return attribute_format(data);
}
},
{
'name': 'price',
'data': 'contract',
'type': 'num',
'render': {
'display': function (data, type, row, meta) {
return price_format(data);
},
'_': 'price.total',
}
},
{
'name': 'open',
'orderable': false,
'render': {
'_': function (data, type, row, meta) {
return open_format(row, logged_in);
}
}
},
],
"order": [],
"deferRender": true,
"initComplete": function(settings, json) {
initializeEsiButtons();
}
});

});
</script>
{% endblock %}
45 changes: 27 additions & 18 deletions abyssal_modules/templates/abyssal_modules/list.html
View file
Expand Up @@ -16,11 +16,21 @@
{% endfor %}
</style>

{% include "abyssal_modules/module_tabs.html" with active_page="contract_sell" %}
<div class="container-fluid d-flex flex-column ng-scope">
<div class="row align-items-center bg-primary check-contrast py-5">
<div class="col-xl-9 container-alt text-light toggles-ignore mx-auto">
<h1 class="display-3 mb-0">
<span data-ng-bind="selected.palette.name" class="ng-binding">{{ module_type.name }}</span>
</h1>
</div>
</div>
</div>

<div class="jumbotron jumbotron-tabs">
<h1>{{ module_type.name }}</h1>
<div class="container">
{% include "abyssal_modules/module_tabs.html" with active_page="contract_sell" %}
</div>

<div class="container my-5">
<form>
<div class="row">
<div class="form-group col-12 col-md-6">
Expand All @@ -47,7 +57,6 @@ <h1>{{ module_type.name }}</h1>
{% include "abyssal_modules/attribute_slider.html" with at=at %}
{% endfor %}
</div>
<br>
<div class="row">
<div class="col-3">
<input type="checkbox" name="filter-show-auctions" class="update-filter" checked> Show auctions
Expand All @@ -63,21 +72,21 @@ <h1>{{ module_type.name }}</h1>
</div>
</div>
</form>
</div>

<div class="jumbotron">
<table class="table module-table dt-responsive" id="module-table">
<thead>
<tr>
<th width="1px">Icon</th>
{% for at in attributes %}
<th><img src="{% static at.icon_path %}" title="{{ at.name }}"></th>
{% endfor %}
<th>Price</th>
<th width="0px">Actions</th>
</tr>
</thead>
</table>
<div class="mt-5">
<table class="table module-table dt-responsive" id="module-table">
<thead>
<tr>
<th width="1px">Icon</th>
{% for at in attributes %}
<th><img src="{% static at.icon_path %}" title="{{ at.name }}"></th>
{% endfor %}
<th>Price</th>
<th width="0px">Actions</th>
</tr>
</thead>
</table>
</div>
</div>
{% endblock %}

Expand Down
14 changes: 12 additions & 2 deletions abyssal_modules/templates/abyssal_modules/module.html
View file
Expand Up @@ -13,8 +13,18 @@
{% endblock %}

{% block content %}
<div class="jumbotron">
<h1>{{ object.creator.name }}'s Modified {{ object.type.name }}</h1>
<div class="container-fluid d-flex flex-column ng-scope">
<div class="row align-items-center bg-primary check-contrast py-5">
<div class="col-xl-9 container-alt text-light toggles-ignore mx-auto">
<h1 class="display-3 mb-0">
<span data-ng-bind="selected.palette.name" class="ng-binding">{{ object.creator.name }}'s Modified {{ object.type.name }}</span>
</h1>
</div>
</div>
</div>

<div class="container my-5">
<h1></h1>


<div class="row">
Expand Down

0 comments on commit 8b1d8ad

Please sign in to comment.