05/06 Phase 2: fixed issues
This commit is contained in:
@@ -0,0 +1,17 @@
|
||||
{% extends "layouts/base.html" %}
|
||||
{% block title %}Account Suspended{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="d-flex justify-content-center align-items-center" style="min-height: 80vh;">
|
||||
<div class="text-center">
|
||||
<i class="bi bi-lock-fill display-1 text-danger"></i>
|
||||
<h3 class="mt-3">Account Suspended</h3>
|
||||
<p class="text-muted">
|
||||
Your account has been suspended. Please contact support to resolve any outstanding issues.
|
||||
</p>
|
||||
<a href="{{ url_for('tenant_auth.logout') }}" class="btn btn-outline-secondary mt-2">
|
||||
Sign Out
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -1,32 +1,52 @@
|
||||
{% extends "tenant/base.html" %}
|
||||
{% extends "layouts/base.html" %}
|
||||
{% block title %}Sign In{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-4">
|
||||
<div class="card shadow-sm mt-5">
|
||||
<div class="card-body p-4">
|
||||
<h4 class="card-title mb-4 text-center">Salon Login</h4>
|
||||
{% if error %}
|
||||
<div class="alert alert-danger">{{ error }}</div>
|
||||
{% endif %}
|
||||
<form method="POST" action="{{ url_for('tenant_auth.login') }}">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Email</label>
|
||||
<input type="email" name="email" class="form-control" required autofocus>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Password</label>
|
||||
<input type="password" name="password" class="form-control" required>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary w-100">Sign In</button>
|
||||
</form>
|
||||
<hr>
|
||||
<div class="text-center small">
|
||||
<a href="{{ url_for('tenant_auth.password_reset_request') }}">Forgot password?</a>
|
||||
|
|
||||
<a href="{{ url_for('staff_auth.staff_login') }}">Staff login</a>
|
||||
<div class="d-flex justify-content-center align-items-center" style="min-height: 100vh;">
|
||||
<div class="card shadow" style="width: 420px;">
|
||||
<div class="card-body p-4">
|
||||
<div class="text-center mb-4">
|
||||
<i class="bi bi-scissors fs-1 text-primary"></i>
|
||||
<h4 class="mt-2 fw-bold">Salon POS</h4>
|
||||
<p class="text-muted small">Sign in to your account</p>
|
||||
</div>
|
||||
|
||||
{% if error %}
|
||||
<div class="alert alert-danger py-2">{{ error }}</div>
|
||||
{% endif %}
|
||||
|
||||
<form method="POST" action="{{ url_for('tenant_auth.login') }}" novalidate>
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="email" class="form-label">Email address</label>
|
||||
<input type="email" class="form-control" id="email" name="email"
|
||||
autocomplete="username" required autofocus>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="password" class="form-label">Password</label>
|
||||
<input type="password" class="form-control" id="password" name="password"
|
||||
autocomplete="current-password" required>
|
||||
</div>
|
||||
|
||||
<div class="d-grid mt-4">
|
||||
<button type="submit" class="btn btn-primary">Sign In</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<hr class="my-3">
|
||||
|
||||
<div class="text-center">
|
||||
<a href="{{ url_for('staff_auth.staff_login') }}" class="btn btn-outline-secondary btn-sm w-100 mb-2">
|
||||
<i class="bi bi-person-badge me-1"></i>Staff Login (PIN)
|
||||
</a>
|
||||
<a href="{{ url_for('tenant_auth.password_reset_request') }}" class="text-muted small d-block mt-2">
|
||||
Forgot password?
|
||||
</a>
|
||||
<a href="{{ url_for('tenant_auth.demo_login') }}" class="text-muted small d-block mt-1">
|
||||
View demo account
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,28 +1,33 @@
|
||||
{% extends "tenant/base.html" %}
|
||||
{% extends "layouts/base.html" %}
|
||||
{% block title %}Set New Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-4">
|
||||
<div class="card shadow-sm mt-5">
|
||||
<div class="card-body p-4">
|
||||
<h5 class="card-title mb-3">Set New Password</h5>
|
||||
{% if error %}
|
||||
<div class="alert alert-danger">{{ error }}</div>
|
||||
{% endif %}
|
||||
<form method="POST">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">New Password</label>
|
||||
<input type="password" name="password" class="form-control" required minlength="10">
|
||||
<div class="form-text">Min 10 chars, must include uppercase, lowercase, and a digit.</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Confirm Password</label>
|
||||
<input type="password" name="confirm_password" class="form-control" required>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary w-100">Update Password</button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="d-flex justify-content-center align-items-center" style="min-height: 100vh;">
|
||||
<div class="card shadow" style="width: 420px;">
|
||||
<div class="card-body p-4">
|
||||
<h5 class="fw-bold mb-3">Set New Password</h5>
|
||||
|
||||
{% if error %}
|
||||
<div class="alert alert-danger py-2">{{ error }}</div>
|
||||
{% endif %}
|
||||
|
||||
<form method="POST" novalidate>
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<div class="mb-3">
|
||||
<label for="password" class="form-label">New password</label>
|
||||
<input type="password" class="form-control" id="password" name="password"
|
||||
autocomplete="new-password" required autofocus>
|
||||
<div class="form-text">Min 10 characters. Uppercase, lowercase, and a digit required.</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="confirm_password" class="form-label">Confirm password</label>
|
||||
<input type="password" class="form-control" id="confirm_password"
|
||||
name="confirm_password" autocomplete="new-password" required>
|
||||
</div>
|
||||
<div class="d-grid">
|
||||
<button type="submit" class="btn btn-primary">Update Password</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{% extends "tenant/base.html" %}
|
||||
{% extends "layouts/base.html" %}
|
||||
{% block title %}Reset Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-4">
|
||||
<div class="card shadow-sm mt-5">
|
||||
<div class="card-body p-4">
|
||||
<h5 class="card-title mb-3">Reset Password</h5>
|
||||
{% if message %}
|
||||
<div class="alert alert-info">{{ message }}</div>
|
||||
{% else %}
|
||||
<form method="POST">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Email address</label>
|
||||
<input type="email" name="email" class="form-control" required autofocus>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary w-100">Send Reset Link</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
<div class="text-center mt-3 small">
|
||||
<a href="{{ url_for('tenant_auth.login') }}">Back to login</a>
|
||||
<div class="d-flex justify-content-center align-items-center" style="min-height: 100vh;">
|
||||
<div class="card shadow" style="width: 420px;">
|
||||
<div class="card-body p-4">
|
||||
<h5 class="fw-bold mb-3">Reset Password</h5>
|
||||
<p class="text-muted small">Enter your email address and we'll send a reset link.</p>
|
||||
|
||||
<form method="POST" novalidate>
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<div class="mb-3">
|
||||
<label for="email" class="form-label">Email address</label>
|
||||
<input type="email" class="form-control" id="email" name="email" required autofocus>
|
||||
</div>
|
||||
<div class="d-grid">
|
||||
<button type="submit" class="btn btn-primary">Send Reset Link</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="text-center mt-3">
|
||||
<a href="{{ url_for('tenant_auth.login') }}" class="text-muted small">Back to login</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{% extends "layouts/base.html" %}
|
||||
{% block title %}Feature Unavailable{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="d-flex justify-content-center align-items-center" style="min-height: 70vh;">
|
||||
<div class="text-center">
|
||||
<i class="bi bi-lock-fill display-1 text-warning"></i>
|
||||
<h3 class="mt-3">Feature Not Available on Your Plan</h3>
|
||||
<p class="text-muted">
|
||||
The <strong>{{ feature }}</strong> feature is not included in your current subscription plan.
|
||||
Please contact your account administrator to upgrade.
|
||||
</p>
|
||||
<a href="{{ url_for('dashboard.index') }}" class="btn btn-primary mt-2">
|
||||
Back to Dashboard
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,189 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>{% block title %}Salon POS{% endblock %}</title>
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/tenant.css') }}">
|
||||
</head>
|
||||
<body class="bg-light">
|
||||
|
||||
{% if current_user.is_authenticated %}
|
||||
<!-- Top navbar -->
|
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand fw-bold" href="{{ url_for('dashboard.index') }}">
|
||||
<i class="bi bi-scissors me-2"></i>
|
||||
{% if g.tenant is defined and g.tenant %}{{ g.tenant.name }}{% else %}Salon POS{% endif %}
|
||||
</a>
|
||||
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarMain">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarMain">
|
||||
<!-- Location switcher (tenant_admin and tenant_manager only) -->
|
||||
{% if current_user.role in ('tenant_admin', 'tenant_manager') %}
|
||||
<div class="navbar-nav me-3">
|
||||
<div class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle text-white" href="#" role="button" data-bs-toggle="dropdown">
|
||||
<i class="bi bi-geo-alt me-1"></i>
|
||||
{% if g.location is defined and g.location %}{{ g.location.name }}{% else %}Select Location{% endif %}
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
{% if locations is defined %}
|
||||
{% for loc in locations %}
|
||||
<li>
|
||||
<a class="dropdown-item {% if g.location and g.location.id == loc.id %}active{% endif %}"
|
||||
href="{{ url_for('locations.switch', location_id=loc.id) }}">
|
||||
{{ loc.name }}
|
||||
{% if loc.is_primary %}<span class="badge bg-secondary ms-1">Primary</span>{% endif %}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Demo badge -->
|
||||
{% if g.tenant is defined and g.tenant and g.tenant.is_demo %}
|
||||
<span class="badge bg-warning text-dark me-3">Demo Mode — Read Only</span>
|
||||
{% endif %}
|
||||
|
||||
<div class="navbar-nav ms-auto">
|
||||
<span class="navbar-text text-white me-3">
|
||||
<i class="bi bi-person-circle me-1"></i>{{ current_user.name if current_user.name is defined else current_user.email }}
|
||||
</span>
|
||||
{% if current_user.role == 'tenant_staff' %}
|
||||
<a class="nav-link text-warning" href="{{ url_for('staff_auth.staff_logout') }}">
|
||||
<i class="bi bi-box-arrow-right"></i> Logout
|
||||
</a>
|
||||
{% else %}
|
||||
<a class="nav-link text-warning" href="{{ url_for('tenant_auth.logout') }}">
|
||||
<i class="bi bi-box-arrow-right"></i> Logout
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<!-- Sidebar (hidden for tenant_staff) -->
|
||||
{% if current_user.role != 'tenant_staff' %}
|
||||
<nav class="col-md-2 d-none d-md-block bg-white border-end sidebar pt-3">
|
||||
<ul class="nav flex-column">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'dashboard' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('dashboard.index') }}">
|
||||
<i class="bi bi-speedometer2 me-2"></i>Dashboard
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'appointments' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('appointments.index') }}">
|
||||
<i class="bi bi-calendar3 me-2"></i>Appointments
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'pos' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('pos.checkout') }}">
|
||||
<i class="bi bi-cash-register me-2"></i>POS / Checkout
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'customers' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('customers.index') }}">
|
||||
<i class="bi bi-people me-2"></i>Customers
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'staff' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('staff.index') }}">
|
||||
<i class="bi bi-person-badge me-2"></i>Staff
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'services' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('services.index') }}">
|
||||
<i class="bi bi-card-list me-2"></i>Services & Products
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'inventory' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('inventory.index') }}">
|
||||
<i class="bi bi-box-seam me-2"></i>Inventory
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'gift_cards' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('gift_cards.index') }}">
|
||||
<i class="bi bi-gift me-2"></i>Gift Cards
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'reconciliation' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('reconciliation.index') }}">
|
||||
<i class="bi bi-calculator me-2"></i>Reconciliation
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'reports' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('reports.index') }}">
|
||||
<i class="bi bi-bar-chart-line me-2"></i>Reports
|
||||
</a>
|
||||
</li>
|
||||
{% if current_user.role == 'tenant_admin' %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'marketing' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('marketing.index') }}">
|
||||
<i class="bi bi-megaphone me-2"></i>Marketing
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'locations' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('locations.index') }}">
|
||||
<i class="bi bi-geo-alt me-2"></i>Locations
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if request.endpoint and 'settings' in request.endpoint %}active fw-bold{% endif %}"
|
||||
href="{{ url_for('settings.index') }}">
|
||||
<i class="bi bi-gear me-2"></i>Settings
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</nav>
|
||||
{% endif %}
|
||||
|
||||
<!-- Main content -->
|
||||
<main class="{% if current_user.role != 'tenant_staff' %}col-md-10{% else %}col-12{% endif %} ms-sm-auto px-4 py-3">
|
||||
{% endif %}
|
||||
|
||||
{% with messages = get_flashed_messages(with_categories=true) %}
|
||||
{% for category, message in messages %}
|
||||
<div class="alert alert-{{ 'danger' if category == 'error' else category }} alert-dismissible fade show" role="alert">
|
||||
{{ message }}
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endwith %}
|
||||
|
||||
{% block content %}{% endblock %}
|
||||
|
||||
{% if current_user.is_authenticated %}
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||
{% block scripts %}{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,51 @@
|
||||
{% extends "layouts/base.html" %}
|
||||
{% block title %}Staff Login{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="d-flex justify-content-center align-items-center" style="min-height: 100vh;">
|
||||
<div class="card shadow" style="width: 380px;">
|
||||
<div class="card-body p-4">
|
||||
<div class="text-center mb-4">
|
||||
<i class="bi bi-person-badge fs-1 text-primary"></i>
|
||||
<h4 class="mt-2 fw-bold">Staff Login</h4>
|
||||
<p class="text-muted small">Enter your phone number and PIN</p>
|
||||
</div>
|
||||
|
||||
{% if error %}
|
||||
<div class="alert alert-danger py-2">{{ error }}</div>
|
||||
{% endif %}
|
||||
|
||||
<form method="POST" action="{{ url_for('staff_auth.staff_login') }}" novalidate>
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="phone" class="form-label">Phone number</label>
|
||||
<input type="tel" class="form-control form-control-lg" id="phone" name="phone"
|
||||
autocomplete="tel" placeholder="e.g. 555-123-4567" required autofocus>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="passcode" class="form-label">PIN</label>
|
||||
<input type="password" class="form-control form-control-lg text-center"
|
||||
id="passcode" name="passcode"
|
||||
inputmode="numeric" pattern="[0-9]*"
|
||||
minlength="4" maxlength="6"
|
||||
autocomplete="one-time-code"
|
||||
placeholder="••••" required>
|
||||
<div class="form-text text-center">4–6 digit PIN</div>
|
||||
</div>
|
||||
|
||||
<div class="d-grid mt-4">
|
||||
<button type="submit" class="btn btn-primary btn-lg">Sign In</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="text-center mt-4">
|
||||
<a href="{{ url_for('tenant_auth.login') }}" class="text-muted small">
|
||||
Manager / Owner login
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user