✨ Add user register mutation
🔥 Remove a bunch of legacy code
This commit is contained in:
1 parent
a47de48243
commit
b5c9094b64
34 files changed
+46
-7544
No files matched your search
+10
-38
@@ -22,31 +22,17 @@
|
||||
</button>
|
||||
<a class="navbar-brand" href="/">Biceps Bar System - BBS</a>
|
||||
</div>
|
||||
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="/"><i class="glyphicon glyphicon-home white"></i> Til fremtiden</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
{% if not user.is_authenticated %}
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="/"><i class="glyphicon glyphicon-home white"></i> Til fremtiden</a></li>
|
||||
{% if user.is_authenticated %}
|
||||
<li class="{% block active_inventory %}{% endblock %}"><a href="{% url 'inventory' %}"><i class="glyphicon glyphicon-briefcase"></i> Varebeholdning</a></li>
|
||||
<li class="{% block active_report %}{% endblock %}"><a href="{% url 'report' %}"><i class="glyphicon glyphicon-briefcase"></i> Rapport</a></li>
|
||||
<li><a href="/admin"><i class="glyphicon glyphicon-cog"></i> Administrasjon</a></li>
|
||||
<li><a href="{% url 'django.contrib.auth.views.logout' %}">Logg ut</a></li>
|
||||
{% else %}
|
||||
<li><a href="{% url 'django.contrib.auth.views.login' %}">Logg inn</a></li>
|
||||
{% else %}
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
{% if user.is_authenticated %}<li class="{% block active_profile %}{% endblock %}"><a href="{% url 'profile' %}"><i class="glyphicon glyphicon-user"></i> Profil</a></li>{% endif %}
|
||||
<li class="{% block active_create_user %}{% endblock %}"><a href="{% url 'create-user' %}"><i class="glyphicon glyphicon-plus"></i> Ny bruker</a></li>
|
||||
{% if user.is_superuser %}<li><a href="/admin"><i class="glyphicon glyphicon-cog"></i> Administrasjon</a></li>{% endif %}
|
||||
{% if user.is_superuser %}<li class="{% block active_inventory %}{% endblock %}"><a href="{% url 'inventory' %}"><i class="glyphicon glyphicon-briefcase"></i> Varebeholdning</a></li>{% endif %}
|
||||
{% if user.is_superuser %}<li class="{% block active_report %}{% endblock %}"><a href="{% url 'report' %}"><i class="glyphicon glyphicon-briefcase"></i> Rapport</a></li>{% endif %}
|
||||
<li class="divider"></li>
|
||||
<li><a href="{% url 'django.contrib.auth.views.logout' %}"><i class="glyphicon glyphicon-log-out"></i> Logg ut</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div><!-- /.navbar-collapse -->
|
||||
{% endif %}
|
||||
</ul>
|
||||
</nav>
|
||||
{% endblock %}
|
||||
</header>
|
||||
@@ -64,20 +50,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="{% static "dist/js/app.min.js" %}"></script>
|
||||
<script>
|
||||
if('serviceWorker' in navigator) {
|
||||
navigator.serviceWorker.register('/service-worker.js', { scope: '/' })
|
||||
.then(function(registration) {
|
||||
console.log("Service Worker Registered");
|
||||
});
|
||||
|
||||
navigator.serviceWorker.ready.then(function(registration) {
|
||||
console.log("Service Worker Ready");
|
||||
});
|
||||
}
|
||||
</script>
|
||||
{% block tailinc %}{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
@@ -6,13 +6,6 @@
|
||||
<div class="row">
|
||||
<div class="col-md-7">
|
||||
<h2>Varebeholdning</h2>
|
||||
<!-- TODO History view -->
|
||||
<!--<div class="text-right">
|
||||
<div class="btn-group">
|
||||
<a href="#list" class="btn btn-default"><i class="glyphicon glyphicon-list"></i> Liste</a>
|
||||
<a href="#stats" class="btn btn-default"><i class="glyphicon glyphicon-stats"></i> Historikk</a>
|
||||
</div>
|
||||
</div>-->
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
{{ form }}
|
||||
|
||||
<input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
|
||||
<a href="{% url 'inventory' %}" class="btn btn-default" />Tilbake</a>
|
||||
<a href="{% url 'inventory' %}" class="btn btn-default">Tilbake</a>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
<div id="modal-order-{{order.id}}" class="modal" style="display: none;">
|
||||
<div class="modal-header">
|
||||
<a href="#" class="close" data-dismiss="modal">×</a>
|
||||
<h3>Er du sikker?</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>
|
||||
Orderen til <strong>{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}</strong> fra {{ order.created }} vil bli <em>slettet</em>.</p>
|
||||
<p>
|
||||
Orderen inneholdt:
|
||||
<ul>
|
||||
{% for line in order.orderlines.all %}
|
||||
<li>
|
||||
<span class="bold">{{ line.amount}}</span>
|
||||
<a href="#" class="product" title="{{ line.unit_price}} per">{{ line.product }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
Totalt: {{ order.order_sum }},-
|
||||
</p>
|
||||
<p>
|
||||
<strong>{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}</strong> sin saldo vil bli kreditert {{ order.order_sum }} kr.
|
||||
</p>
|
||||
<p>Vil du fortsette?</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn" data-dismiss="modal">Nei</a>
|
||||
<a href="#" class="btn btn-danger"><i class="icon-trash icon-white"></i> Ja</a>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,18 +0,0 @@
|
||||
<div id="modal-trans-{{t.id}}" class="modal" style="display: none;">
|
||||
<div class="modal-header">
|
||||
<a href="#" class="close" data-dismiss="modal">×</a>
|
||||
<h3>Er du sikker?</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>
|
||||
Inskuddet til <strong>{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}</strong> på <strong>{{ t.amount }}</strong> fra {{ t.created }} vil bli <em>slettet</em>.</p>
|
||||
<p>
|
||||
<strong>{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}</strong> sin saldo vil debiteres med {{ t.amount }} kr.
|
||||
</p>
|
||||
<p>Vil du fortsette?</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn" data-dismiss="modal">Nei</a>
|
||||
<a href="#" class="btn btn-danger"><i class="icon-trash icon-white"></i> Ja</a>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,39 +0,0 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Lag ny bruker {% endblock %}
|
||||
|
||||
{% block active_create_user %}active{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% if perms.auth.can_add_user %}
|
||||
<section class="row">
|
||||
<div class="col-md-4">
|
||||
{% for message in messages %}
|
||||
<div {% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>{{ message }}<a class="close" data-dismiss="alert">×</a></div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</section>
|
||||
<section class="row">
|
||||
<div class="col-md-5">
|
||||
<h1>Legg til ny bruker</h1>
|
||||
{% if form.non_field_errors %}
|
||||
<p>{{ form.non_field_errors}}.</p>
|
||||
{% endif %}
|
||||
|
||||
<form method="post" role="form">
|
||||
{% csrf_token %}
|
||||
|
||||
<div class="form-group">
|
||||
<label for="id_first_name">{{ form.first_name.label }}</label>{{ form.first_name}}{{ form.first_name.errors }}
|
||||
<label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name}}{{ form.last_name.errors }}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="id_email">{{ form.email.label }}</label>{{ form.email}}{{ form.email.errors }}
|
||||
</div>
|
||||
<input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
|
||||
<a href="{% url 'home' %}" class="btn btn-default">Tilbake</a>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,9 +0,0 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Logg inn{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% include "registration/login_form.html" %}
|
||||
|
||||
{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
@@ -1,15 +0,0 @@
|
||||
<div class="form-login">
|
||||
{% if form.errors %}
|
||||
<p class="alert alert-danger">Brukernavn og passord stemmer ikke overens. Prøv igjen.</p>
|
||||
{% endif %}
|
||||
|
||||
<form method="post" action="{% url 'django.contrib.auth.views.login' %}" class="">
|
||||
{% csrf_token %}
|
||||
<label for="id_username">Brukernavn:</label>
|
||||
{{ form.username }}
|
||||
<label for="id_password">Passord: </label>
|
||||
{{ form.password }}<br/>
|
||||
<input type="submit" value="Logg inn" class="btn btn-primary btn-lg"/>
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
</form>
|
||||
</div>
|
||||
@@ -1,12 +0,0 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Logg inn{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<p class="alert alert-success">Du er logget ut.</p>
|
||||
<p>Vil du <a href="{% url 'home' %}">logge inn igjen?</a></p>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Reference in new issue
Block a user