Fix routing, still need to fix intial loads only returning portion of page

This commit is contained in:
Peter Stockings
2023-01-24 21:02:40 +11:00
parent bbf67f5768
commit 1ba186b608
3 changed files with 51 additions and 34 deletions

View File

@@ -13,37 +13,6 @@
<body> <body>
<div class="h-full w-full bg-gray-50 relative overflow-y-auto container mx-auto"> <div class="h-full w-full bg-gray-50 relative overflow-y-auto container mx-auto">
<div class="text-sm breadcrumbs">
<nav class="flex" aria-label="Breadcrumb">
<ol class="inline-flex items-center space-x-1 md:space-x-3">
<li class="inline-flex items-center">
<a href="/"
class="inline-flex items-center text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white">
<svg aria-hidden="true" class="w-4 h-4 mr-2" fill="currentColor" viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg">
<path
d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z">
</path>
</svg>
Devices
</a>
</li>
<li aria-current="page">
<div class="flex items-center">
<svg aria-hidden="true" class="w-6 h-6 text-gray-400" fill="currentColor"
viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
clip-rule="evenodd"></path>
</svg>
<span class="ml-1 text-sm font-medium text-gray-500 md:ml-2 dark:text-gray-400">Assault
Bike</span>
</div>
</li>
</ol>
</nav>
</div>
<main> <main>
<div class="px-4 pt-8" id="container"> <div class="px-4 pt-8" id="container">
<div hx-get="{{ url_for('devices') }}" hx-trigger="load"> <div hx-get="{{ url_for('devices') }}" hx-trigger="load">
@@ -63,10 +32,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</main> </main>
</div> </div>
</body> </body>

View File

@@ -1,3 +1,22 @@
<div class="text-sm breadcrumbs">
<nav class="flex" aria-label="Breadcrumb">
<ol class="inline-flex items-center space-x-1 md:space-x-3">
<li class="inline-flex items-center">
<a hx-get="{{ url_for('devices') }}" hx-target="#container" class="inline-flex items-center text-sm font-medium text-gray-700 hover:text-blue-600
dark:text-gray-400 dark:hover:text-white">
<svg aria-hidden="true" class="w-4 h-4 mr-2" fill="currentColor" viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg">
<path
d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z">
</path>
</svg>
Devices
</a>
</li>
</ol>
</nav>
</div>
<div class="flex justify-center"> <div class="flex justify-center">
<div class="relative overflow-x-auto"> <div class="relative overflow-x-auto">
<table class="lg:w-1/4 sm:w-full text-sm text-left text-gray-500 dark:text-gray-400"> <table class="lg:w-1/4 sm:w-full text-sm text-left text-gray-500 dark:text-gray-400">
@@ -14,7 +33,7 @@
<tbody> <tbody>
{% for d in devices %} {% for d in devices %}
<tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 cursor-pointer" <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 cursor-pointer"
hx-get="{{ url_for('overview', device_id=d['id']) }}" hx-target="#container"> hx-get="{{ url_for('overview', device_id=d['id']) }}" hx-push-url="true" hx-target="#container">
<th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"> <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
{{d['name']}} {{d['name']}}
</th> </th>

View File

@@ -1,3 +1,34 @@
<div class="text-sm breadcrumbs">
<nav class="flex" aria-label="Breadcrumb">
<ol class="inline-flex items-center space-x-1 md:space-x-3">
<li class="inline-flex items-center">
<a hx-get="{{ url_for('devices') }}" hx-push-url="true" hx-target="#container"
class="inline-flex items-center text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white">
<svg aria-hidden="true" class="w-4 h-4 mr-2" fill="currentColor" viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg">
<path
d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z">
</path>
</svg>
Devices
</a>
</li>
<li aria-current="page">
<div class="flex items-center">
<svg aria-hidden="true" class="w-6 h-6 text-gray-400" fill="currentColor"
viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
clip-rule="evenodd"></path>
</svg>
<span class="ml-1 text-sm font-medium text-gray-500 md:ml-2 dark:text-gray-400">Assault
Bike</span>
</div>
</li>
</ol>
</nav>
</div>
<h1 <h1
class="mb-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white text-center"> class="mb-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white text-center">
{{last_cadence}} rpm</h1> {{last_cadence}} rpm</h1>