Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sumukh
Sumukh committed Sep 21, 2024
1 parent cb98a4f commit 65c75fa
Show file tree
Hide file tree
Showing 8 changed files with 1,382 additions and 1,476 deletions.
8 changes: 4 additions & 4 deletions appname/assets.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from flask_assets import Bundle

common_css = Bundle(
'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css',
'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css',
'css/vendor/helper.css',
'css/main.css',
'css/overrides.css',
Expand All @@ -11,7 +11,7 @@

common_js = Bundle(
'https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js',
'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js',
'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js',
Bundle(
'js/main.js',
filters='jsmin'
Expand All @@ -33,14 +33,14 @@

tabler_css = Bundle(
'https://cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css',
'https://cdn.jsdelivr.net/npm/@tabler/[email protected]beta17/dist/css/tabler-vendors.min.css',
'https://cdn.jsdelivr.net/npm/@tabler/[email protected]beta21/dist/css/tabler-vendors.min.css',
'css/overrides.css',
filters='cssmin',
output='public/css/tabler.css'
)

tabler_js = Bundle(
'https://cdn.jsdelivr.net/npm/@tabler/[email protected]beta17/dist/js/tabler.min.js',
'https://cdn.jsdelivr.net/npm/@tabler/[email protected]beta21/dist/js/tabler.min.js',
output='public/js/tabler.js'
)

Expand Down
2,703 changes: 1,258 additions & 1,445 deletions appname/templates/dashboard/home.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion appname/templates/dashboard/team.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1 class="page-title">
<td class="text-center">
{% if member.user != current_user %}
<form role="form" action="{{ url_for('dashboard_team.remove_member', team_id=team.id, invite_id=member.id) }}" method="post">
{{ simple_form.hidden_tag() }}
{{ simple_form().hidden_tag() }}

<button type="submit" class="btn btn-secondary btn-sm">Remove</button>
</form>
Expand Down
26 changes: 25 additions & 1 deletion appname/templates/settings/account.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,31 @@
{% block title %}appname account settings{% endblock %}

{% block body %}

<div class="page-header d-print-none text-white">
<div class="container-xl">
<div class="row g-2 align-items-center">
<div class="col">
<!-- Page pre-title -->
<div class="page-pretitle">
Account
</div>
<h2 class="page-title">
Your settings
</h2>
</div>
<!-- Page title actions -->
<div class="col-auto ms-auto d-print-none">
<div class="btn-list">
<span class="d-none d-sm-inline">
<a href="#" class="btn btn-dark">
Get Help
</a>
</span>
</div>
</div>
</div>
</div>
</div>
<div class="my-3 my-md-5">
<div class="container">
<div class="row">
Expand Down
40 changes: 19 additions & 21 deletions appname/templates/tabler/_footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
<footer class="footer">
<div class="container">
<div class="row align-items-center flex-row-reverse">
<div class="col-auto ml-lg-auto">
<div class="row align-items-center">
<div class="col-auto">
<ul class="list-inline list-inline-dots mb-0">
<li class="list-inline-item">
<a href="/">Home</a>
</li>
<li class="list-inline-item">
<a href="{{ url_for('user_settings.legal_compliance' )}}">Privacy</a>
</li>
</ul>
</div>
</div>
</div>
<div class="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
Copyright © 2019

<footer class="footer footer-transparent d-print-none">
<div class="container-xl">
<div class="row text-center align-items-center flex-row-reverse">

<div class="col-lg-auto ms-lg-auto">
<ul class="list-inline list-inline-dots mb-0">
<li class="list-inline-item"><a href="{{ url_for('user_settings.legal_compliance' )}}" target="_blank" class="link-secondary" rel="noopener">Privacy</a></li>
</ul>
</div>
<div class="col-12 col-lg-auto mt-3 mt-lg-0">
<ul class="list-inline list-inline-dots mb-0">
<li class="list-inline-item">
Copyright © 2024

<a href="{{ url_for('main.home' )}}">appname</a>. Powered by
<a href="https://github.com/sumukh/ignite" target="_blank">Ignite</a>
<!-- You must purchase a license of Ignite to remove the above disclaimer -->
</div>
</li>
</ul>
</div>
</div>
</div>
</footer>
</footer>
71 changes: 71 additions & 0 deletions appname/templates/tabler/_navbar_overlap.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<header class="navbar navbar-expand-md navbar-overlap d-print-none" data-bs-theme="dark">
<div class="container-xl">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu" aria-controls="navbar-menu" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
<a href="{{ url_for('main.home') }}">
<img src="{{ url_for('static', filename='public/ignite/ignite-logo-cutout.svg') }}" class="navbar-brand-image" style="max-height: 40px" alt="ignite logo">

</a>
</div>
<div class="navbar-nav flex-row order-md-last">
<div class="d-none d-md-flex">
<!-- Add theme toggle buttons here if needed -->
</div>
<div class="nav-item dropdown">
<a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" aria-label="Open user menu">
<!-- <span class="avatar avatar-sm" style="background-image: url(./static/avatars/000m.jpg)"></span> -->
<div class="d-none d-xl-block ps-2">
<div>{{ current_user.email }}</div>
{% if team %}
<div class="mt-1 small text-secondary">{{ team.name }}</div>
{% endif %}
</div>
</a>
<div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow" data-bs-theme="light">
<a href="{{ url_for('user_settings.index') }}" class="dropdown-item">Settings</a>
<a href="{{ url_for('auth.logout') }}" class="dropdown-item">Logout</a>
</div>
</div>
</div>
<div class="collapse navbar-collapse" id="navbar-menu">
<div class="d-flex flex-column flex-md-row flex-fill align-items-stretch align-items-md-center">
<ul class="navbar-nav">
{% if current_user.is_authenticated %}
<li class="nav-item {{ 'active' if request.blueprint == 'dashboard_home' }}">
<a class="nav-link" href="{{ url_for('dashboard_home.index') }}">
<span class="nav-link-title">Home</span>
</a>
</li>
{% if team %}
<li class="nav-item {{ 'active' if request.blueprint == 'dashboard_team' }}">
<a class="nav-link" href="{{ url_for('dashboard_team.index', team_id=team.id) }}">
<span class="nav-link-title">Your Team</span>
</a>
</li>
<li class="nav-item {{ 'active' if request.blueprint == 'dashboard_files' }}">
<a class="nav-link" href="{{ url_for('dashboard_files.index', team_id=team.id) }}">
<span class="nav-link-title">Shared Files</span>
</a>
</li>
{% endif %}
<li class="nav-item {{ 'active' if request.endpoint.startswith('user_settings') }}">
<a class="nav-link" href="{{ url_for('user_settings.index') }}">
<span class="nav-link-title">User Settings</span>
</a>
</li>
{% else %}
<li class="nav-item {{ 'active' if request.endpoint == 'main.home' }}">
<a class="nav-link" href="{{ url_for('main.home') }}">
<span class="nav-link-title">Home</span>
</a>
</li>
{% endif %}
</ul>
</div>
</div>
</div>
</header>

{{ render_flashes() }}
Empty file added appname/templates/tabler/_overlap_header.html
View file
Empty file.
8 changes: 4 additions & 4 deletions appname/templates/tabler/dashboard_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/tabler-icons.min.css">
<link rel="shortcut icon" type="image/png" href="{{ url_for('static', filename='public/ignite/ignite-icon.png') }}">
<link rel="icon" type="image/png" href="{{ url_for('static', filename='public/ignite/ignite-icon.png') }}">

Expand All @@ -38,14 +39,13 @@

<body>
<div class="page">
<div class="page-main">
{% include 'tabler/_header.html' with context %}
{% include 'tabler/_navbar.html' with context %}
{% include 'tabler/_navbar_overlap.html' with context %}

<div class="page-wrapper">
{% block body %}
{% endblock %}

</div>

{% include 'tabler/_footer.html' with context %}
</div>
</body>
Expand Down

0 comments on commit 65c75fa

Please sign in to comment.