yash
/
recipes-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add error loading page

This commit is contained in:
yyasha 2023-11-15 11:09:34 +03:00
parent d55c968ec3
commit d760dbf46c
11 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile Normal file
View File

@ -0,0 +1,2 @@
run:
npm run dev -- --host

8
src/lib/ErrorLoading.svelte Normal file
View File

@ -0,0 +1,8 @@
<div class="w-full flex justify-center">
<div class="w-2/3 flex flex-col items-center justify-center font-bold text-lg" style="background-color: rgba(200, 0, 0, 0.1); height: 50vh">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-16 h-16 text-red-600">
<path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
</svg>
<h1>Ошибка при загрузке</h1>
</div>
</div>

9
src/lib/LoadingScreen.svelte Normal file
View File

@ -0,0 +1,9 @@
<div class="text-center flex items-center justify-center h-screen">
<div role="status">
<svg aria-hidden="true" class="inline w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-200 fill-blue-600" viewBox="0 0 100 101" fill="none">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
</svg>
<span class="sr-only">Loading...</span>
</div>
</div>

16
src/routes/+layout.svelte
View File

@ -1,15 +1,17 @@
<script> <script>
import "../app.css"; import "/src/app.css";
import Header from "./Header.svelte"; import Header from "./Header.svelte";
import Footer from "./Footer.svelte"; import Footer from "./Footer.svelte";
import ErrorLoading from '/src/lib/ErrorLoading.svelte';
import { page } from '$app/stores';
</script> </script>
<Header/> <Header/>
<slot /> {#if $page.status == 200}
<slot />
{:else}
<ErrorLoading/>
{/if}
<Footer/> <Footer/>
<style>
</style>

18
src/routes/+page.svelte
View File

@ -2,6 +2,8 @@
// import { onMount } from "svelte"; // import { onMount } from "svelte";
import axios from 'axios'; import axios from 'axios';
import InfiniteLoading from '/src/lib/InfiniteLoading.svelte'; import InfiniteLoading from '/src/lib/InfiniteLoading.svelte';
import LoadingScreen from "/src/lib/LoadingScreen.svelte";
import ErrorLoading from '/src/lib/ErrorLoading.svelte';
let serverurl = 'http://192.168.0.105:3000'; let serverurl = 'http://192.168.0.105:3000';
let last_page = 1; let last_page = 1;
@ -37,16 +39,8 @@
<div class="mx-auto max-w-2xl px-4 py-16 sm:px-6 sm:py-24 lg:max-w-7xl lg:px-8"> <div class="mx-auto max-w-2xl px-4 py-16 sm:px-6 sm:py-24 lg:max-w-7xl lg:px-8">
<h2 class="sr-only">Рецепты</h2> <h2 class="sr-only">Рецепты</h2>
{#await recipes_p} {#await recipes_p}
<div class="text-center flex items-center justify-center h-screen"> <LoadingScreen/>
<div role="status"> {:then}
<svg aria-hidden="true" class="inline w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-200 fill-blue-600" viewBox="0 0 100 101" fill="none">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
</svg>
<span class="sr-only">Loading...</span>
</div>
</div>
{:then data}
<div class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8"> <div class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8">
{#each recipes_list as recipe} {#each recipes_list as recipe}
<a href="/recipe/{recipe.id}" class="group transition duration-300 hover:scale-110"> <a href="/recipe/{recipe.id}" class="group transition duration-300 hover:scale-110">
@ -59,8 +53,8 @@
{/each} {/each}
</div> </div>
<InfiniteLoading on:infinite={infiniteHandler} /> <InfiniteLoading on:infinite={infiniteHandler} />
{:catch error} {:catch}
Ошибка {error} <ErrorLoading/>
{/await} {/await}
</div> </div>
</div> </div>

3
src/routes/Header.svelte
View File

@ -67,6 +67,7 @@
<!-- todo: <!-- todo:
донат донат
поиск поиск
красивая ошибка при загрузке кеширование
метрики (prometheus, graphana)
настроить robots.txt настроить robots.txt
--> -->

46
src/routes/categories/[category]/+page.svelte
View File

@ -2,6 +2,8 @@
import { page } from '$app/stores'; import { page } from '$app/stores';
import axios from 'axios'; import axios from 'axios';
import InfiniteLoading from '/src/lib/InfiniteLoading.svelte'; import InfiniteLoading from '/src/lib/InfiniteLoading.svelte';
import LoadingScreen from "/src/lib/LoadingScreen.svelte";
import ErrorLoading from '/src/lib/ErrorLoading.svelte';
let serverurl = 'http://192.168.0.105:3000'; let serverurl = 'http://192.168.0.105:3000';
@ -39,30 +41,26 @@
<div class="mx-auto max-w-2xl px-4 py-16 sm:px-6 lg:max-w-7xl lg:px-8"> <div class="mx-auto max-w-2xl px-4 py-16 sm:px-6 lg:max-w-7xl lg:px-8">
<h2 class="sr-only">Категории</h2> <h2 class="sr-only">Категории</h2>
{#await recipes} {#await recipes}
<div class="text-center flex items-center justify-center h-screen"> <LoadingScreen/>
<div role="status"> {:then}
<svg aria-hidden="true" class="inline w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-200 fill-blue-600" viewBox="0 0 100 101" fill="none"> {#if (recipes_list === null)}
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/> <ErrorLoading/>
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/> {:else}
</svg> <div class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8">
<span class="sr-only">Loading...</span> {#each recipes_list as recipe}
</div> <a href="/recipe/{recipe.id}" class="group transition duration-300 hover:scale-110">
</div> <div class="aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-lg bg-gray-200 xl:aspect-h-8 xl:aspect-w-7">
{:then data} <img src="{serverurl}/recipe_image?filename={recipe.img}" alt="{recipe.title}" class="h-full w-full object-cover object-center transition duration-700 group-hover:opacity-90">
<div class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8"> </div>
{#each recipes_list as recipe (recipe.id)} <h3 class="mt-3 text-base text-gray-700">{recipe.ctime} / {recipe.cal}</h3>
<a href="/recipe/{recipe.id}" class="group transition duration-300 hover:scale-110"> <p class="mt-0 text-lg font-medium text-gray-900">{recipe.title}</p>
<div class="aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-lg bg-gray-200 xl:aspect-h-8 xl:aspect-w-7"> </a>
<img src="{serverurl}/recipe_image?filename={recipe.img}" alt="{recipe.title}" class="h-full w-full object-cover object-center transition duration-700 group-hover:opacity-90"> {/each}
</div> </div>
<h3 class="mt-3 text-base text-gray-700">{recipe.ctime} / {recipe.cal}</h3> <InfiniteLoading on:infinite={infiniteHandler} />
<p class="mt-0 text-lg font-medium text-gray-900">{recipe.title}</p> {/if}
</a> {:catch}
{/each} <ErrorLoading/>
</div>
<InfiniteLoading on:infinite={infiniteHandler} />
{:catch error}
Ошибка {error}
{/await} {/await}
</div> </div>
</div> </div>

16
src/routes/recipe/[recipeid]/+page.svelte
View File

@ -1,6 +1,8 @@
<script> <script>
import { page } from '$app/stores'; import { page } from '$app/stores';
import axios from 'axios'; import axios from 'axios';
import LoadingScreen from "/src/lib/LoadingScreen.svelte";
import ErrorLoading from '/src/lib/ErrorLoading.svelte';
// create request // create request
let serverurl = 'http://192.168.0.105:3000'; let serverurl = 'http://192.168.0.105:3000';
@ -17,15 +19,7 @@
<div class="mx-auto max-w-2xl px-4 py-8 sm:px-6 sm:py-12 lg:max-w-7xl lg:px-8"> <div class="mx-auto max-w-2xl px-4 py-8 sm:px-6 sm:py-12 lg:max-w-7xl lg:px-8">
<!-- await --> <!-- await -->
{#await recipe_p} {#await recipe_p}
<div class="text-center flex items-center justify-center h-screen"> <LoadingScreen/>
<div role="status">
<svg aria-hidden="true" class="inline w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-200 fill-blue-600" viewBox="0 0 100 101" fill="none">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
</svg>
<span class="sr-only">Loading...</span>
</div>
</div>
{:then data} {:then data}
<div> <div>
<!-- time / cals / protions --> <!-- time / cals / protions -->
@ -107,7 +101,9 @@
</ul> </ul>
</div> </div>
{/if} {/if}
</div> </div>
{:catch}
<ErrorLoading/>
{/await} {/await}
</div> </div>

BIN
static/favicon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
static/logo2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 81 KiB

BIN
static/logo3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 56 KiB