Compare commits
No commits in common. "master" and "feature/events" have entirely different histories.
master
...
feature/ev
13 changed files with 762 additions and 2802 deletions
|
|
@ -30,7 +30,7 @@ jobs:
|
|||
key: ${{ steps.tsru-npm.outputs.cache-primary-key }}
|
||||
|
||||
- name: Populate the .env file
|
||||
run: printf "PUBLIC_TS_DISCORD=%s\nPUBLIC_TS_TELEGRAM=%s\n" "${{ vars.PUBLIC_TS_DISCORD }}" "${{ vars.PUBLIC_TS_TELEGRAM }}" >> .env
|
||||
run: echo "PUBLIC_TS_DISCORD=${{ vars.PUBLIC_TS_DISCORD }}" >> .env
|
||||
|
||||
- name: Build frontend
|
||||
run: npm run build
|
||||
|
|
|
|||
3464
package-lock.json
generated
3464
package-lock.json
generated
File diff suppressed because it is too large
Load diff
45
package.json
45
package.json
|
|
@ -11,36 +11,35 @@
|
|||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@iconify/svelte": "^5.1.0",
|
||||
"@iconify/svelte": "^4.2.0",
|
||||
"@react2svelte/swipeable": "^0.1.4",
|
||||
"@svelte-put/dragscroll": "^4.0.0",
|
||||
"@sveltejs/adapter-auto": "^7.0.0",
|
||||
"@sveltejs/adapter-static": "^3.0.10",
|
||||
"@sveltejs/kit": "^2.49.0",
|
||||
"@tailwindcss/typography": "^0.5.19",
|
||||
"@tailwindcss/vite": "^4.1.17",
|
||||
"@types/node": "^24.10.1",
|
||||
"@vitejs/plugin-legacy": "^7.2.1",
|
||||
"autoprefixer": "^10.4.22",
|
||||
"eslint": "^9.39.1",
|
||||
"eslint-config-prettier": "^10.1.8",
|
||||
"eslint-plugin-svelte": "^3.13.0",
|
||||
"@sveltejs/adapter-auto": "^4.0.0",
|
||||
"@sveltejs/adapter-static": "^3.0.8",
|
||||
"@sveltejs/kit": "^2.17.3",
|
||||
"@tailwindcss/typography": "^0.5.16",
|
||||
"@tailwindcss/vite": "^4.0.9",
|
||||
"@types/node": "^22.13.5",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"eslint": "^9.21.0",
|
||||
"eslint-config-prettier": "^10.0.1",
|
||||
"eslint-plugin-svelte": "^3.0.0",
|
||||
"mdsvex": "^0.12.6",
|
||||
"mdsvex-relative-images": "^2.0.0",
|
||||
"postcss": "^8.5.6",
|
||||
"prettier": "^3.6.2",
|
||||
"prettier-plugin-svelte": "^3.4.0",
|
||||
"prettier-plugin-tailwindcss": "^0.7.1",
|
||||
"svelte": "^5.45.1",
|
||||
"svelte-check": "^4.3.4",
|
||||
"mdsvex-relative-images": "^1.0.3",
|
||||
"postcss": "^8.5.3",
|
||||
"prettier": "^3.5.2",
|
||||
"prettier-plugin-svelte": "^3.3.3",
|
||||
"prettier-plugin-tailwindcss": "^0.6.11",
|
||||
"svelte": "^5.20.4",
|
||||
"svelte-check": "^4.1.4",
|
||||
"svelte-disable-preload": "^0.0.3",
|
||||
"svelte-resize-observer-action": "^0.0.4",
|
||||
"svelte-sitemap": "^2.7.1",
|
||||
"sveltekit-autoimport": "^1.8.2",
|
||||
"svelte-sitemap": "^2.7.0",
|
||||
"sveltekit-autoimport": "^1.8.1",
|
||||
"tailwindcss": "^4.0.9",
|
||||
"tslib": "^2.8.1",
|
||||
"typescript": "^5.9.3",
|
||||
"vite": "^7.2.4"
|
||||
"typescript": "^5.7.3",
|
||||
"vite": "^6.2.0"
|
||||
},
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
import "@formatjs/intl-durationformat/polyfill";
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
bgStrong="bg-blue-500"
|
||||
bgBleak="bg-blue-50"
|
||||
icon="material-symbols:info"
|
||||
caption="Примечание"
|
||||
caption="Обратите внимание"
|
||||
>
|
||||
<slot />
|
||||
</IconBlock>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
import HoverIcon from '$lib/components/HoverIcon.svelte';
|
||||
import { page } from '$app/state';
|
||||
|
||||
let { routes }: { routes: App.Route[] } = $props();
|
||||
export let routes: App.Route[];
|
||||
|
||||
function isActive(route: string): boolean {
|
||||
if (route === '/') return page.url.pathname === route;
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
</script>
|
||||
|
||||
<nav
|
||||
class="flex shrink-0 flex-row gap-2 bg-slate-100 not-landscape:justify-around not-landscape:overflow-x-auto not-landscape:sm:px-2 landscape:flex-col landscape:overflow-y-auto landscape:sm:py-2"
|
||||
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"
|
||||
>
|
||||
{#each routes as route (route.href)}
|
||||
<a class="nav-button {isActive(route.href) ? 'active' : ''}" href={route.href}>
|
||||
|
|
@ -36,10 +36,10 @@
|
|||
@import '$src/app.css';
|
||||
|
||||
.nav-button {
|
||||
@apply flex aspect-square shrink-0 flex-col items-center justify-center gap-0.5 p-1 text-slate-950 not-landscape:h-20 hover:bg-emerald-400 sm:p-2 not-landscape:sm:h-24 landscape:w-20 landscape:sm:w-24;
|
||||
@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;
|
||||
|
||||
> .contour {
|
||||
@apply rounded-full px-1 py-0.5 text-center sm:px-1.5;
|
||||
@apply rounded-full px-1.5 py-0.5 text-center;
|
||||
}
|
||||
|
||||
&.active {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
import { shouldPolyfill } from '@formatjs/intl-durationformat/should-polyfill'
|
||||
if (shouldPolyfill()) {
|
||||
import('@formatjs/intl-durationformat/polyfill-force');
|
||||
}
|
||||
|
||||
export const dateFormatShort = new Intl.DateTimeFormat(undefined, {
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ const icons: Record<string, string> = {
|
|||
const specialResolvers: Record<string, (url: URL) => string> = {
|
||||
'teasanctuary.ru': (url) => {
|
||||
// Домены третьего уровня и выше
|
||||
const prefix = url.hostname.split('.').reverse();
|
||||
const prefix = url.hostname.split('.').toReversed();
|
||||
prefix.shift();
|
||||
prefix.shift();
|
||||
if (prefix[0] === "hl") {
|
||||
|
|
|
|||
|
|
@ -136,6 +136,6 @@
|
|||
text-slate-950 sm:px-4 sm:text-xl"
|
||||
>
|
||||
<section class="mx-auto flex max-w-5xl flex-col flex-nowrap">
|
||||
<data.content />
|
||||
<svelte:component this={data.content} />
|
||||
</section>
|
||||
</article>
|
||||
|
|
|
|||
|
|
@ -72,9 +72,9 @@
|
|||
</section>
|
||||
|
||||
<section
|
||||
class="flex shrink-0 flex-row flex-wrap items-center justify-center p-2 font-bold {isPublic
|
||||
class="flex shrink-0 flex-col flex-wrap items-center justify-center p-2 font-bold {isPublic
|
||||
? 'bg-amber-50 text-slate-950'
|
||||
: 'bg-red-500 text-slate-50'} sm:gap-x-5"
|
||||
: 'bg-red-500 text-slate-50'} sm:flex-row sm:gap-x-5"
|
||||
>
|
||||
<DateWidget dateString={data.blogPost.date} type="published" />
|
||||
{#if data.blogPost.dateChanged}
|
||||
|
|
@ -170,5 +170,5 @@
|
|||
text-slate-950
|
||||
sm:text-xl lg:p-8"
|
||||
>
|
||||
<data.content />
|
||||
<svelte:component this={data.content} />
|
||||
</article>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ function makeEventDescription(post: App.BlogPost): string {
|
|||
return '';
|
||||
|
||||
const dateToUtcString = (s: string) => new Date(s).toUTCString();
|
||||
return `<br><br>Событие проводится с ${dateToUtcString(post.dateEventFrom!)} по ${dateToUtcString(post.dateEventTo!)}.`;
|
||||
return `<br><br>Событие проводится с ${dateToUtcString(post.dateEventFrom!)} по ${dateToUtcString(post.dateEventFrom!)}.`;
|
||||
}
|
||||
|
||||
export async function GET({ setHeaders }) {
|
||||
|
|
|
|||
9
vite.config.js
Normal file
9
vite.config.js
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
import { sveltekit } from '@sveltejs/kit/vite';
|
||||
import tailwindcss from "@tailwindcss/vite";
|
||||
|
||||
export default {
|
||||
plugins: [
|
||||
sveltekit(),
|
||||
tailwindcss()
|
||||
]
|
||||
};
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
import { sveltekit } from '@sveltejs/kit/vite';
|
||||
import tailwindcss from "@tailwindcss/vite";
|
||||
import type { UserConfig } from 'vite';
|
||||
import legacy from '@vitejs/plugin-legacy';
|
||||
|
||||
export default {
|
||||
plugins: [
|
||||
sveltekit(),
|
||||
tailwindcss(),
|
||||
legacy({
|
||||
renderLegacyChunks: false
|
||||
})
|
||||
]
|
||||
} satisfies UserConfig;
|
||||
Loading…
Add table
Add a link
Reference in a new issue