Starting a rather large UI/UX overhaul :D

This commit is contained in:
Halfdan 2023-10-03 18:18:22 +02:00
parent 25445e59cf
commit 1ab7fd5c0c
5 changed files with 350 additions and 211 deletions

1
.gitignore vendored
View file

@ -7,3 +7,4 @@ db.sqlite3
*.mo
.env
venv/
.venv/

View file

@ -7,6 +7,8 @@
{% block content %}
<div class="view-list">
<h2>Membership settings</h2>
{% if not current_membership %}
<p>{% trans "You do not have an active membership!" %}</p>
@ -24,4 +26,38 @@
<p>{% trans "Period" %}: {{ current_period.lower|date:"SHORT_DATE_FORMAT" }} to {{ current_period.upper|date:"SHORT_DATE_FORMAT"|default:next_general_assembly }}</p>
<p>{% trans "Type" %}: {{ current_membership.membership_type }}</p>
{% endif %}
</div>
<div class="view-list">
<h2>Profile settings</h2>
<form>
<div>
<label for="username">
Username
</label>
<input id="username" type="text" value="{{user}}" />
</div>
<div>
<label for="first_name">
First name
</label>
<input id="first_name" type="text" value="{{user.first_name}}" />
</div>
<div>
<label for="last_name">
Last name
</label>
<input id="last_name" type="text" value="{{user.last_name}}" />
</div>
<button>Update Profile</button>
</form>
</div>
<div class="view-list">
<h2>Email settings</h2>
<button>Update Email</button>
</div>
{% endblock %}

View file

@ -0,0 +1,224 @@
/* Start reset */
*, *::before, *::after {
box-sizing: border-box;
}
* {
margin: 0;
}
body {
line-height: 1.5;
}
img, picture, video, canvas, svg {
display: block;
max-width: 100%;
}
input, button, textarea, select {
font: inherit;
}
p, h1, h2, h3, h4, h5, h6 {
overflow-wrap: break-word;
}
#root, #__next {
isolation: isolate;
}
/* End reset */
body {
margin : 0;
padding : 0;
background : #f0dcac;
font-family : sans-serif;
color : #232323;
}
header {
display : flex;
padding : 12px 24px;
background : #fff;
justify-content : space-between;
align-items : center;
}
header > h1 {
font-size : 1.44em;
}
header > div.logout {
padding : 6px;
}
header > div.logout a {
padding : 6px;
}
aside {
padding : 24px 24px;
background : #fff;
}
aside > div {
background : #efefef;
padding : 24px;
border-radius : 6px;
overflow : hidden;
}
aside > div > h2 {
font-size : 1.22em;
margin : 0 0 6px 0;
}
aside > div > figure {
width : 100px;
height : 100px;
border : 1px solid rgba(0,0,0,0.4);
float : left;
margin-right : 24px;
}
aside > div > dl {
overflow : hidden;
}
aside > div > dl > dt {
float : left;
clear : left;
margin : 0 24px 0 0;
width : 180px;
font-weight : bold;
}
nav {
display : block;
border-bottom : 1px solid rgba(0,0,0,0.2);
background : #fff;
padding : 0 12px;
}
nav ol {
margin : 0;
padding : 0;
list-style-type : none;
overflow : hidden;
}
nav ol li {
margin : 0;
padding : 0;
float : left;
}
nav > ol > li > a {
display : block;
padding : 6px 6px 3px 6px;
margin : 0 12px;
cursor : pointer;
border-bottom : 4px solid transparent;
text-decoration : none;
color : #121212;
}
nav ol li a:hover {
border-color : rgba(0,0,0,0.6);
}
nav ol li a.current {
font-weight : bold;
border-color : #4b3aba;
color : #4b3aba;
}
article {
padding : 24px;
}
article > div {
background : #efefef;
padding : 24px;
margin-bottom : 24px;
}
div.view-list > h2 {
margin : 0 0 24px 0;
}
div.services {
display : flex;
justify-content : space-between;
gap : 24px;
flex-wrap: wrap;
}
div.services > div {
background : #fff;
padding : 24px;
border-radius : 6px;
flex : 240px;
max-width : 420px;
display : flex;
flex-flow : column;
justify-content : space-between;
}
/*
div.services > div:hover {
transform : scale(1.02);
transition : all 0.2s;
}
*/
div.services > div > div.description {
margin-bottom : 24px;
}
div.services > div > a,
button {
color : #fff;
background : #4b3aba;
padding : 6px 12px;
border-radius : 3px;
opacity : 0.8;
cursor : pointer;
text-align : center;
border : 0;
}
div.services > div > a:hover,
button:hover {
opacity : 1.0;
}
form > div {
margin : 0 0 24px;
}
form > div >label {
display : block;
margin : 0 0 6px;
}
form > div > input[type="text"] {
border : 1px solid #343434;
border-radius : 3px;
padding : 6px 12px;
background : #fefefe;
width : 100%;
}
footer {
position : fixed;
bottom : 0;
left : 0;
right : 0;
background : #232323;
color : #efefef;
padding : 12px;
font-size : 0.78em;
opacity : 0.8;
}
span.time_remaining {
opacity : 0.6;
}

View file

@ -8,206 +8,44 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<title>{% block head_title %}{% endblock %} {{ site.name }}</title>
<link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet"
crossorigin="anonymous">
<link href="{% static "/css/bootstrap-icons.css" %}" rel="stylesheet"
crossorigin="anonymous">
<style>
body {
font-size: .875rem;
}
/*
* Sidebar
*/
.sidebar {
position: fixed;
top: 0;
bottom: 0;
left: 0;
z-index: 100; /* Behind the navbar */
padding: 48px 0 0; /* Height of navbar */
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
}
@media (max-width: 767.98px) {
.sidebar {
top: 5rem;
}
}
.sidebar-sticky {
position: relative;
top: 0;
height: calc(100vh - 48px);
padding-top: .5rem;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
}
.sidebar .nav-link {
font-weight: 500;
color: #333;
}
.sidebar .nav-link .feather {
margin-right: 4px;
color: #727272;
}
.sidebar .nav-link.active {
color: #007bff;
}
.sidebar .nav-link:hover .feather,
.sidebar .nav-link.active .feather {
color: inherit;
}
.sidebar-heading {
font-size: .75rem;
text-transform: uppercase;
}
/*
* Navbar
*/
.navbar-brand {
padding-top: .75rem;
padding-bottom: .75rem;
font-size: 1rem;
background-color: rgba(0, 0, 0, .25);
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
}
.navbar .navbar-toggler {
top: .25rem;
right: 1rem;
}
.navbar .form-control {
padding: .75rem 1rem;
border-width: 0;
border-radius: 0;
}
.form-control-dark {
color: #fff;
background-color: rgba(255, 255, 255, .1);
border-color: rgba(255, 255, 255, .1);
}
.form-control-dark:focus {
border-color: transparent;
box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
} </style>
<script src="{% static "js/bootstrap.bundle.min.js" %}"
crossorigin="anonymous"></script>
<link rel="stylesheet" href="{% static "/css/style.css" %}">
</head>
<body>
<header>
<h1> data.coop membersystem </h1>
<a href="/logout">Log out</a>
</header
<main>
<aside>
<div>
<figure></figure>
<h2>{{ user }}</h2>
<dl>
<dt>Membership</dt>
<dd>{% if current_membership %} Active {% endif %}</dd>
<header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
<a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="#">{{ site.name }}</a>
<button class="navbar-toggler position-absolute d-md-none collapsed" type="button"
data-bs-toggle="collapse" data-bs-target="#sidebarMenu"
aria-controls="sidebarMenu" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<ul class="navbar-nav px-3">
<li class="nav-item text-nowrap">
<a class="nav-link" href="{% url "account_logout" %}">
<i class="bi bi-person-circle"></i>
Sign out</a>
</li>
</ul>
</header>
<dt>Period</dt>
<dd>{% if current_membership %} Until {{ current_period.upper }} <span class="time_remaining">({{ current_period.upper|timeuntil }})</span>{% endif %}</dd>
<div class="container-fluid">
<div class="row">
<nav id="sidebarMenu"
class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
<div class="position-sticky pt-3">
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link {% active_path "index" "active" %}"
href="{% url "index" %}">
{% trans "Dashboard" %}
</a>
</li>
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>{% trans "Profile" %}</span>
</h6>
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link" href="#">
{% trans "Details" %}
</a>
</li>
<li class="nav-item">
<a class="nav-link {% active_path "account_email" "active" %}"
aria-current="page" href="{% url "account_email" %}">
{% trans "Emails" %}
</a>
</li>
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>{% trans "Membership" %}</span>
</h6>
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link {% active_path "membership-overview" "active" %}"
aria-current="page" href="{% url "membership-overview" %}">
{% trans "Overview" %}
</a>
</li>
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>{% trans "Services" %}</span>
</h6>
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link {% active_path "services-overview" "active" %}"
href="{% url "services-overview" %}">
{% trans "Overview" %}
</a>
</li>
</ul>
{% if perms.membership.administrate_memberships %}
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>{% trans "Admin" %}</span>
</h6>
<ul class="nav flex-column mb-2">
<li class="nav-item {% active_path "admin-members" "active" %}">
<a class="nav-link" href="{% url "admin-members" %}">
<span data-feather="file-text"></span>
{% trans "Members" %}
</a>
</li>
</ul>
{% endif %}
<dt>Membership type</dt>
<dd>Normal member</dd>
</dl>
</div>
</aside>
<nav>
<ol>
<li><a href="/">Dashboard</a></li>
<li><a href="/services" class="current">Services</a></li>
<li><a>Payment</a></li>
<li><a href="/membership">Settings</a></li>
</ol>
</nav>
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 p-4">
{% block content %}
{% endblock %}
<article>
{% block content %}{% endblock %}
</article>
</main>
</div>
</div>
<footer>
data.coop membersystem version 0.0.1
</footer>
</body>
</html>

View file

@ -1,10 +1,50 @@
{% extends "base.html" %}
{% block content %}
<p>
Services and signup to these will be
</p>
<p>
This is yet to be implemented.
</p>
<div class="view-list">
<h2>Services you subscribe to</h2>
<div class="services">
<div>
<div class="description">
<h3>Passit</h3>
<p>Passit is a service that blabla</p>
</div>
<a>Unsubscribe</a>
</div>
</div>
</div>
<div class="view-list">
<h2>Available services</h2>
<div class="services">
<div>
<div class="description">
<h3>Forgejo</h3>
<p>Forgejo is a service that blabla</p>
</div>
<a>Subscribe</a>
</div>
<div>
<div class="description">
<h3>Mastodon</h3>
<p>Mastodon is a service where you can write things to people around the world.</p>
</div>
<a>Subscribe</a>
</div>
<div>
<div class="description">
<h3>Matrix</h3>
<p>Matrix is a service that blabla</p>
</div>
<a>Subscribe</a>
</div>
<div>
<div class="description">
<h3>NextCloud</h3>
<p>NextCloud is a service that blabla</p>
</div>
<a>Subscribe</a>
</div>
</div>
</div>
{% endblock %}