Compare commits

..

No commits in common. "b6cf05b0af651a6711196b6e4979f195640c7eb7" and "9cdda96704e6e2203c671577a102ae21b9694756" have entirely different histories.

12 changed files with 23 additions and 32 deletions

View file

@ -12,7 +12,7 @@
</script> </script>
<nav <nav
class="flex shrink-0 flex-row gap-2 bg-slate-100 not-landscape:justify-around not-landscape:overflow-x-auto not-landscape:px-2 landscape:flex-col landscape:overflow-y-auto landscape:py-2" class="flex flex-row gap-2 bg-slate-100 not-landscape:justify-around not-landscape:px-2 landscape:flex-col landscape:py-2"
> >
{#each routes as route (route.href)} {#each routes as route (route.href)}
<a class="nav-button {isActive(route.href) ? 'active' : ''}" href={route.href}> <a class="nav-button {isActive(route.href) ? 'active' : ''}" href={route.href}>
@ -36,7 +36,7 @@
@import '$src/app.css'; @import '$src/app.css';
.nav-button { .nav-button {
@apply flex aspect-square shrink-0 flex-col items-center justify-center gap-0.5 p-2 text-slate-950 not-landscape:h-24 hover:bg-emerald-400 landscape:w-24; @apply flex aspect-square flex-col items-center justify-center gap-0.5 p-2 text-slate-950 not-landscape:h-24 hover:bg-emerald-400 landscape:w-24;
> .contour { > .contour {
@apply rounded-full px-1.5 py-0.5 text-center; @apply rounded-full px-1.5 py-0.5 text-center;

View file

@ -16,8 +16,7 @@ const icons: Record<string, string> = {
'hl.teasanctuary.ru': '/icons/half-life.svg', 'hl.teasanctuary.ru': '/icons/half-life.svg',
'git.teasanctuary.ru': 'devicon-plain:git', 'git.teasanctuary.ru': 'devicon-plain:git',
localhost: '/icons/tea-sanctuary-white.svg', localhost: '/icons/tea-sanctuary-white.svg',
email: 'material-symbols:alternate-email', email: 'material-symbols:alternate-email'
rss: 'material-symbols:rss-feed'
}; };
// Особые случаи, когда одним доменом второго уровня не ограничишься (например, randomtrash.itch.io) // Особые случаи, когда одним доменом второго уровня не ограничишься (например, randomtrash.itch.io)
@ -45,8 +44,6 @@ function getIconFromUrl(url: URL): string | undefined {
const href = url.href; const href = url.href;
if (href.startsWith('mailto:')) if (href.startsWith('mailto:'))
return 'email'; return 'email';
if (href.endsWith('/rss.xml'))
return 'rss';
const hostname = url.hostname; const hostname = url.hostname;
const secondLevel = hostname.match(/(([A-Za-z0-9\-])+\.([A-Za-z0-9\-])+)$/)?.at(0) ?? ''; const secondLevel = hostname.match(/(([A-Za-z0-9\-])+\.([A-Za-z0-9\-])+)$/)?.at(0) ?? '';

View file

@ -1,6 +1,5 @@
<script lang="ts"> <script lang="ts">
import '$src/app.css'; import '$src/app.css';
import { page } from '$app/state';
// import '../syntax-highlight.css'; // https://github.com/PrismJS/prism-themes // import '../syntax-highlight.css'; // https://github.com/PrismJS/prism-themes
import NavBar from '$lib/components/NavBar.svelte'; import NavBar from '$lib/components/NavBar.svelte';
@ -14,15 +13,11 @@
</script> </script>
<svelte:head> <svelte:head>
{#if page.data.title !== undefined} <meta property="og:title" content="Tea Sanctuary" />
<title>{page.data.title} &mdash; Tea Sanctuary</title>
<meta property="og:title" content="{page.data.title} — Tea Sanctuary" />
{:else}
<title>Tea Sanctuary</title>
<meta property="og:title" content="Tea Sanctuary" />
{/if}
<meta property="og:image" content="https://teasanctuary.ru/common/logo.png" /> <meta property="og:image" content="https://teasanctuary.ru/common/logo.png" />
<meta property="og:description" content="Делаем вещи как можем." /> <meta property="og:description" content="Делаем вещи как можем." />
<title>Tea Sanctuary</title>
</svelte:head> </svelte:head>
<div class="flex h-screen w-screen flex-row portrait:flex-col-reverse"> <div class="flex h-screen w-screen flex-row portrait:flex-col-reverse">

View file

@ -140,12 +140,7 @@
<section id="how-can-you-contact-us"> <section id="how-can-you-contact-us">
<h1>Как с вами связаться?</h1> <h1>Как с вами связаться?</h1>
<div class="text-justify"> <div class="text-justify">
Общие вопросы можно задавать в <SocialHyperlink href={PUBLIC_TS_DISCORD}>сообществе Tea Sanctuary</SocialHyperlink>. TODO: <SocialHyperlink href="/contact">контакты</SocialHyperlink>.
Там же можете написать личное сообщение администраторам.
</div>
<br />
<div class="text-justify">
Наши соцсети и почту для более важных обращений можно найти на странице <SocialHyperlink href="/contact">Контакты</SocialHyperlink>.
</div> </div>
</section> </section>
</div> </div>

View file

@ -1,3 +0,0 @@
export async function load() {
return { title: undefined };
}

View file

@ -2,6 +2,10 @@
import SocialButton from '$lib/components/SocialButton.svelte'; import SocialButton from '$lib/components/SocialButton.svelte';
</script> </script>
<svelte:head>
<title>Блог &mdash; Tea Sanctuary</title>
</svelte:head>
<section <section
class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background" class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background"
> >

View file

@ -2,6 +2,10 @@
import SocialButton from '$lib/components/SocialButton.svelte'; import SocialButton from '$lib/components/SocialButton.svelte';
</script> </script>
<svelte:head>
<title>Контакты &mdash; Tea Sanctuary</title>
</svelte:head>
<section <section
class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background" class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background"
> >

View file

@ -1,3 +0,0 @@
export async function load() {
return { title: "Контакты" };
}

View file

@ -2,6 +2,10 @@
import SocialButton from '$lib/components/SocialButton.svelte'; import SocialButton from '$lib/components/SocialButton.svelte';
</script> </script>
<svelte:head>
<title>Проекты &mdash; Tea Sanctuary</title>
</svelte:head>
<section <section
class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background" class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background"
> >

View file

@ -1,3 +0,0 @@
export async function load() {
return { title: "Проекты" };
}

View file

@ -2,6 +2,10 @@
import SocialButton from '$lib/components/SocialButton.svelte'; import SocialButton from '$lib/components/SocialButton.svelte';
</script> </script>
<svelte:head>
<title>Команда &mdash; Tea Sanctuary</title>
</svelte:head>
<section <section
class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background" class="flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4 hero-background"
> >

View file

@ -1,3 +0,0 @@
export async function load() {
return { title: "Команда" };
}