Properly indent all templates
This commit is contained in:
parent
4bd2bb2f1a
commit
ef22f9165e
|
@ -20,4 +20,5 @@ repos:
|
||||||
- repo: https://github.com/thibaudcolas/curlylint
|
- repo: https://github.com/thibaudcolas/curlylint
|
||||||
rev: v0.13.1
|
rev: v0.13.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: curlylint
|
- id: curlylint
|
||||||
|
files: \.(html|sls)$
|
|
@ -1,8 +1,7 @@
|
||||||
{% load static %}
|
{% load static %}
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html lang="en-GB">
|
||||||
|
<head>
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">s
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">s
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
@ -10,51 +9,46 @@
|
||||||
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
|
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
|
||||||
<link rel="stylesheet" href="{% static 'style.css' %}" />
|
<link rel="stylesheet" href="{% static 'style.css' %}" />
|
||||||
<script src="https://js.stripe.com/v3/"></script>
|
<script src="https://js.stripe.com/v3/"></script>
|
||||||
|
</head>
|
||||||
</head>
|
<body>
|
||||||
|
|
||||||
<body>
|
|
||||||
<section class="hero is-primary is-fullheight">
|
<section class="hero is-primary is-fullheight">
|
||||||
|
<div class="hero-head">
|
||||||
<div class="hero-head">
|
<nav class="navbar navbar-default navbar-static-top">
|
||||||
<nav class="navbar navbar-default navbar-static-top">
|
<div class="container">
|
||||||
<div class="container">
|
<div class="navbar-header">
|
||||||
<div class="navbar-header">
|
<a class="navbar-brand" href="{% url 'home' %}">Pathogen</a>
|
||||||
<a class="navbar-brand" href="{% url 'home' %}">Pathogen</a>
|
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||||
|
<span class="sr-only">Toggle navigation</span>
|
||||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
<span class="icon-bar"></span>
|
||||||
<span class="sr-only">Toggle navigation</span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
</button>
|
||||||
<sapn class="icon-bar"></sapn>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<ul class="nav navbar-nav navbar-right collapse navbar-collapse">
|
|
||||||
{% if user.is_authenticated %}
|
|
||||||
<li><a href="{% url 'profile' %}">Profile</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{% if user.plan == "drilldown" and user.paid %}
|
|
||||||
<li><a href="{% url 'drilldown' %}">Drilldown</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{% if not user.is_authenticated %}
|
|
||||||
<li><a href="{% url 'login' %}">Login</a></li>
|
|
||||||
<li><a href="{% url 'signup' %}">Sign Up</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{% if user.is_authenticated %}
|
|
||||||
<li><a href="{% url 'logout' %}">Logout</a></li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="hero-body">
|
|
||||||
<div class="container has-text-centered">
|
|
||||||
{% block content %}
|
|
||||||
{% endblock %}
|
|
||||||
</div>
|
</div>
|
||||||
|
<ul class="nav navbar-nav navbar-right collapse navbar-collapse">
|
||||||
|
{% if user.is_authenticated %}
|
||||||
|
<li><a href="{% url 'profile' %}">Profile</a></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if user.plan == "drilldown" and user.paid %}
|
||||||
|
<li><a href="{% url 'drilldown' %}">Drilldown</a></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if not user.is_authenticated %}
|
||||||
|
<li><a href="{% url 'login' %}">Login</a></li>
|
||||||
|
<li><a href="{% url 'signup' %}">Sign Up</a></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if user.is_authenticated %}
|
||||||
|
<li><a href="{% url 'logout' %}">Logout</a></li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
<div class="hero-body">
|
||||||
|
<div class="container has-text-centered">
|
||||||
|
{% block content %}
|
||||||
|
{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -1,60 +1,51 @@
|
||||||
<head>
|
<head>
|
||||||
<script src="https://js.stripe.com/v3/"></script>
|
<script src="https://js.stripe.com/v3/"></script>
|
||||||
</head>
|
</head>
|
||||||
<div class="product-container">
|
<div class="product-container">
|
||||||
<a href="order?product=drilldown">
|
<a href="order?product=drilldown">
|
||||||
<div class="product">
|
<div class="product">
|
||||||
<img
|
<img src="{{ url_for('static', filename='weekly.jpg') }}" alt="Data image"/>
|
||||||
src="{{ url_for('static', filename='weekly.jpg') }}"
|
<div class="description">
|
||||||
alt="Data image"
|
<h3>Drilldown</h3>
|
||||||
/>
|
<h5>200.00</h5>
|
||||||
<div class="description">
|
|
||||||
<h3>Drilldown</h3>
|
|
||||||
<h5>200.00</h5>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</a>
|
|
||||||
|
|
||||||
<a href="order?product=sentiment">
|
|
||||||
<div class="product">
|
|
||||||
<img
|
|
||||||
src="{{ url_for('static', filename='weekly.jpg') }}"
|
|
||||||
alt="Data image"
|
|
||||||
/>
|
|
||||||
<div class="description">
|
|
||||||
<h3>Sentiment</h3>
|
|
||||||
<h5>45.00</h5>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</a>
|
||||||
|
<a href="order?product=sentiment">
|
||||||
|
<div class="product">
|
||||||
|
<img src="{{ url_for('static', filename='weekly.jpg') }}" alt="Data image"/>
|
||||||
|
<div class="description">
|
||||||
|
<h3>Sentiment</h3>
|
||||||
|
<h5>45.00</h5>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
// Create an instance of the Stripe object with your publishable API key
|
// Create an instance of the Stripe object with your publishable API key
|
||||||
var stripe = Stripe("pk_test_51HbqYzAKLUD9ELc0KSyiQ9YohsfiUCeBpAfpflAIg2Uu2RFecx3sfWYXzM1xDtI5XlQihqHMnaPKd45JzDuqXdGP00pYWvRvRe");
|
var stripe = Stripe("pk_test_51HbqYzAKLUD9ELc0KSyiQ9YohsfiUCeBpAfpflAIg2Uu2RFecx3sfWYXzM1xDtI5XlQihqHMnaPKd45JzDuqXdGP00pYWvRvRe");
|
||||||
var setupButton = document.getElementById('setup-button');
|
var setupButton = document.getElementById('setup-button');
|
||||||
setupButton.addEventListener("click", function () {
|
setupButton.addEventListener("click", function () {
|
||||||
fetch("/setup-bacs", {
|
fetch("/setup-bacs", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
|
})
|
||||||
|
.then(function (response) {
|
||||||
|
return response.json();
|
||||||
})
|
})
|
||||||
.then(function (response) {
|
.then(function (session) {
|
||||||
return response.json();
|
return stripe.redirectToCheckout({ sessionId: session.id });
|
||||||
})
|
})
|
||||||
.then(function (session) {
|
.then(function (result) {
|
||||||
return stripe.redirectToCheckout({ sessionId: session.id });
|
// If redirectToCheckout fails due to a browser or network
|
||||||
})
|
// error, you should display the localized error message to your
|
||||||
.then(function (result) {
|
// customer using error.message.
|
||||||
// If redirectToCheckout fails due to a browser or network
|
if (result.error) {
|
||||||
// error, you should display the localized error message to your
|
alert(result.error.message);
|
||||||
// customer using error.message.
|
}
|
||||||
if (result.error) {
|
})
|
||||||
alert(result.error.message);
|
.catch(function (error) {
|
||||||
}
|
console.error("Error:", error);
|
||||||
})
|
});
|
||||||
.catch(function (error) {
|
});
|
||||||
console.error("Error:", error);
|
</script>
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
|
@ -1,18 +1,14 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1 class="title">
|
<h1 class="title">Access denied</h1>
|
||||||
Access denied
|
<h2 class="subtitle">Sorry, you do not have the necessary permissions to view this page.</h2>
|
||||||
</h1>
|
<div class="col">
|
||||||
<h2 class="subtitle">
|
|
||||||
Sorry, you do not have the necessary permissions to view this page.
|
|
||||||
</h2>
|
|
||||||
<div class="col">
|
|
||||||
{% if user.subscription_active %}
|
{% if user.subscription_active %}
|
||||||
{% include 'checkout.html' %}
|
{% include 'checkout.html' %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<h2> Please setup a payment mandate in the profile page to view products </h2>
|
<h2> Please setup a payment mandate in the profile page to view products </h2>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,18 +1,12 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1 class="title">
|
<h1 class="title">Pathogen Products Panel</h1>
|
||||||
Pathogen Products Panel
|
<h2 class="subtitle">Billing and subscription management</h2>
|
||||||
</h1>
|
<div class="col">
|
||||||
<h2 class="subtitle">
|
|
||||||
Billing and subscription management
|
|
||||||
</h2>
|
|
||||||
<div class="col">
|
|
||||||
{% if user.subscription_active %}
|
{% if user.subscription_active %}
|
||||||
{% include 'checkout.html' %}
|
{% include 'checkout.html' %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<h2> Please setup a payment mandate in the profile page to view products </h2>
|
<h2> Please setup a payment mandate in the profile page to view products </h2>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,42 +1,37 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1 class="title">
|
<h1 class="title">Welcome, {{ user.first_name }}!</h1>
|
||||||
Welcome, {{ user.first_name }}!
|
<div class="container">
|
||||||
</h1>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="profile-info">
|
<div class="profile-info">
|
||||||
<p>Plan: {{ user.plan }}</p>
|
<p>Plan: {{ user.plan }}</p>
|
||||||
<p>Stripe ID: {{ user.stripeID }}</p>
|
<p>Stripe ID: {{ user.stripeID }}</p>
|
||||||
<p>Setup intent: {{ user.seti }}</p>
|
<p>Setup intent: {{ user.seti }}</p>
|
||||||
<p>Mandate active: {{ user.mandateActive }}</p>
|
<p>Mandate active: {{ user.mandateActive }}</p>
|
||||||
<p>Subscription ID: {{ user.subscriptionID }}</p>
|
<p>Subscription ID: {{ user.subscriptionID }}</p>
|
||||||
<p>Last payment: {{ user.lastPayment }}</p>
|
<p>Last payment: {{ user.lastPayment }}</p>
|
||||||
<p>Creation date: {{ user.creationDate }}</p>
|
<p>Creation date: {{ user.creationDate }}</p>
|
||||||
<p>Paid: {{ user.paid }}</p>
|
<p>Paid: {{ user.paid }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="update-info">
|
<div class="update-info">
|
||||||
{% if user.seti %}
|
{% if user.seti %}
|
||||||
{% if user.plan == None %}
|
{% if user.plan == None %}
|
||||||
{% include 'checkout.html' %}
|
{% include 'checkout.html' %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<form>
|
<form>
|
||||||
<button id="button" formaction="/portal">Customer portal</button>
|
<button id="button" formaction="/portal">Customer portal</button>
|
||||||
</form>
|
</form>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<button id="setup-button">Setup payment mandate</button>
|
<button id="setup-button">Setup payment mandate</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
// Create an instance of the Stripe object with your publishable API key
|
// Create an instance of the Stripe object with your publishable API key
|
||||||
var stripe = Stripe("pk_test_51HbqYzAKLUD9ELc0KSyiQ9YohsfiUCeBpAfpflAIg2Uu2RFecx3sfWYXzM1xDtI5XlQihqHMnaPKd45JzDuqXdGP00pYWvRvRe");
|
var stripe = Stripe("pk_test_51HbqYzAKLUD9ELc0KSyiQ9YohsfiUCeBpAfpflAIg2Uu2RFecx3sfWYXzM1xDtI5XlQihqHMnaPKd45JzDuqXdGP00pYWvRvRe");
|
||||||
var setupButton = document.getElementById('setup-button');
|
var setupButton = document.getElementById('setup-button');
|
||||||
|
|
|
@ -1,31 +1,31 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row vertical-offset-100">
|
<div class="row vertical-offset-100">
|
||||||
<div class="col-md-4 col-md-offset-4">
|
<div class="col-md-4 col-md-offset-4">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">Please sign in</h3>
|
<h3 class="panel-title">Please sign in</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<img class="logo" src="{% static 'logo.svg' %}">
|
<img class="logo" src="{% static 'logo.svg' %}">
|
||||||
<form method="POST">
|
<form method="POST">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form|crispy }}
|
{{ form|crispy }}
|
||||||
|
|
||||||
<input class="btn btn-lg btn-dark btn-block" type="submit" value="Login">
|
<input class="btn btn-lg btn-dark btn-block" type="submit" value="Login">
|
||||||
<div class="register">
|
<div class="register">
|
||||||
<p>Don't have an account? <a href="{% url 'signup' %}">Register here</a></p>
|
<p>Don't have an account? <a href="{% url 'signup' %}">Register here</a></p>
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -3,25 +3,25 @@
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row vertical-offset-100">
|
<div class="row vertical-offset-100">
|
||||||
<div class="col-md-4 col-md-offset-4">
|
<div class="col-md-4 col-md-offset-4">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">Sign up</h3>
|
<h3 class="panel-title">Sign up</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<img class="logo" src="{% static 'logo.svg' %}">
|
<img class="logo" src="{% static 'logo.svg' %}">
|
||||||
<form method="POST">
|
<form method="POST">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form|crispy }}
|
{{ form|crispy }}
|
||||||
<input class="btn btn-lg btn-dark btn-block" type="submit" value="Sign up">
|
<input class="btn btn-lg btn-dark btn-block" type="submit" value="Sign up">
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<head>
|
<head>
|
||||||
<title>Thanks for your order!</title>
|
<title>Thanks for your order!</title>
|
||||||
<link rel="stylesheet" href="style.css">
|
<link rel="stylesheet" href="style.css">
|
||||||
</head>
|
</head>
|
||||||
<section>
|
<section>
|
||||||
<p>We appreciate your business!</p>
|
<p>We appreciate your business!</p>
|
||||||
<p>Download details will be available <a href="{{ url_for('main.profile') }} ">in your profile</a> shortly.</p>
|
<p>Download details will be available <a href="{{ url_for('main.profile') }} ">in your profile</a> shortly.</p>
|
||||||
|
|
|
@ -1,34 +1,29 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1 class="title">
|
<h1 class="title">Welcome to search, {{ name }}!</h1>
|
||||||
Welcome to search, {{ name }}!
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="profile-info">
|
<div class="profile-info">
|
||||||
<p>PROFILE INFO</p>
|
<p>PROFILE INFO</p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="update-info">
|
<div class="update-info">
|
||||||
{% if user.seti %}
|
{% if user.seti %}
|
||||||
{% if user.plan == None %}
|
{% if user.plan == None %}
|
||||||
{% include 'checkout.html' %}
|
{% include 'checkout.html' %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<form>
|
<form>
|
||||||
<button id="button" formaction="/portal">Customer portal</button>
|
<button id="button" formaction="/portal">Customer portal</button>
|
||||||
</form>
|
</form>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<button id="setup-button">Setup payment mandate</button>
|
<button id="setup-button">Setup payment mandate</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue