This commit is contained in:
Sergey Yarkov 2023-03-12 22:18:37 +03:00
parent 5ab2e94394
commit b8c9607874
No known key found for this signature in database
GPG Key ID: E91CE1FABC619B6F
23 changed files with 10698 additions and 9546 deletions

4
.env.example Normal file
View File

@ -0,0 +1,4 @@
PUBLIC_DIRECTUS_URL=http://localhost:8055
DIRECTUS_EMAIL=admin@example.com
DIRECTUS_PASSWORD=d1r3ctu5
DIRECTUS_STATIC_TOKEN=

63
docker-compose.dev.yml Normal file
View File

@ -0,0 +1,63 @@
version: '3.8'
services:
web:
restart: 'always'
build:
context: .
target: development
container_name: web
volumes:
- './:/app'
network_mode: host
depends_on:
- directus
environment:
- DIRECTUS_URL=http://localhost:8055
- DIRECTUS_EMAIL=admin@example.com
- DIRECTUS_PASSWORD=d1r3ctu5
- DIRECTUS_STATIC_TOKEN=
database:
image: postgres:15-alpine
container_name: database
environment:
POSTGRES_USER: directus
POSTGRES_PASSWORD: directus
POSTGRES_DB: directus
volumes:
- db-data:/var/lib/postgresql/data
ports:
- 5432:5432
networks:
- directus
directus:
image: directus/directus:latest
ports:
- '8055:8055'
volumes:
- uploads:/directus/uploads
depends_on:
- database
networks:
- directus
environment:
KEY: '255d861b-5ea1-5996-9aa3-922530ec40b1'
SECRET: '6116487b-cda1-52c2-b5b5-c8022c45e263'
MAX_PAYLOAD_SIZE: '100mb'
DB_CLIENT: 'pg'
DB_HOST: 'database'
DB_PORT: '5432'
DB_DATABASE: 'directus'
DB_USER: 'directus'
DB_PASSWORD: 'directus'
ADMIN_EMAIL: 'admin@example.com'
ADMIN_PASSWORD: 'd1r3ctu5'
volumes:
db-data:
uploads:
networks:
directus:

8
lib/api.ts Normal file
View File

@ -0,0 +1,8 @@
import { client as directus } from './directus';
export async function getLatestArticles() {
const data = await directus
.items('articles')
.readByQuery({ limit: -1, filter: { status: 'published' }, sort: ['-date_created'] });
return data;
}

41
lib/directus-collections.d.ts vendored Normal file
View File

@ -0,0 +1,41 @@
import type { ID } from '@directus/sdk';
export type AboutUsCollection = {
id: ID;
heading?: string;
body?: string;
};
export type ContactsCollection = {
id: ID;
heading?: string;
body?: string;
contacts: any[];
};
export type ArticleCollection = {
id: ID;
status: string;
title: string;
slug: 'published' | 'draft' | 'archieved';
description?: string;
cover?: string;
body?: string;
user_created: string;
date_created: string;
date_updated: string;
};
export type SettingsCollection = {
id: ID;
site_icon?: string;
site_title: string;
site_description?: string;
};
export type DirectusCollections = {
about_us: AboutUsCollection;
contacts: ContactsCollection;
articles: ArticleCollection;
settings: SettingsCollection;
};

34
lib/directus.ts Normal file
View File

@ -0,0 +1,34 @@
import { Directus } from '@directus/sdk';
import type { DirectusCollections } from './directus-collections';
let isAuthenticated = false;
const directus = new Directus<DirectusCollections>(import.meta.env.DIRECTUS_URL);
export function getAssetURL(id: string) {
return `${import.meta.env.DIRECTUS_URL}/assets/${id}`;
}
async function getClient() {
try {
if (import.meta.env.DIRECTUS_EMAIL && import.meta.env.DIRECTUS_PASSWORD) {
if (!isAuthenticated) {
await directus.auth.login({
email: import.meta.env.DIRECTUS_EMAIL,
password: import.meta.env.DIRECTUS_PASSWORD,
});
isAuthenticated = true;
}
} else if (import.meta.env.DIRECTUS_STATIC_TOKEN) {
await directus.auth.static(import.meta.env.DIRECTUS_STATIC_TOKEN);
}
return directus;
} catch (error) {
isAuthenticated = false;
throw new Error(`${error}`);
}
}
const client = await getClient();
export { client };

View File

@ -1,12 +1,10 @@
client_max_body_size 10M;
server_tokens off;
server {
listen 80;
listen [::]:80;
server_name localhost;
server_tokens off;
location / {
root /usr/share/nginx/html;
@ -31,18 +29,24 @@ server {
listen 80;
listen [::]:80;
client_max_body_size 100M;
server_name cms.localhost;
server_tokens off;
location / {
proxy_pass http://directus:8055;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_cache_bypass $http_upgrade;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_connect_timeout 30s;
proxy_read_timeout 86400s;
proxy_send_timeout 30s;
proxy_http_version 1.1;
add_header X-Cache $upstream_cache_status;
}
}

1142
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -10,8 +10,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/tailwind": "^3.0.1",
"astro": "^2.0.16",
"@astrojs/tailwind": "^3.1.0",
"@directus/sdk": "^10.3.1",
"astro": "^2.1.2",
"astro-icon": "^0.8.0",
"tailwindcss": "^3.2.7"
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

View File

@ -1,9 +1,12 @@
---
import { client as directus } from '@lib/directus';
export interface Props {
title?: string;
noindex?: boolean;
}
const siteSettings = await directus.singleton('settings').read();
const { title = 'Blog', noindex = false } = Astro.props as Props;
---
@ -13,6 +16,6 @@ const { title = 'Blog', noindex = false } = Astro.props as Props;
<meta name='viewport' content='width=device-width' />
<meta name='generator' content={Astro.generator} />
{noindex && <meta name='robots' content='noindex' />}
<title>{title}</title>
<title>{`${title} | ${siteSettings?.site_title}`}</title>
<slot />
</head>

View File

@ -1,8 +1,11 @@
---
import { client as directus } from '@lib/directus';
const siteSettings = await directus.singleton('settings').read();
const year = new Date().getFullYear();
---
<footer>
<hr />
<small>Web Blog &copy; {year}</small>
<small>{siteSettings?.site_title} &copy; {year}</small>
</footer>

View File

@ -1,5 +1,8 @@
---
import { Icon } from 'astro-icon';
import { client as directus } from '@lib/directus';
const siteSettings = await directus.singleton('settings').read();
const links = [
{ href: '/', name: 'Home' },
@ -11,9 +14,9 @@ const links = [
<header>
<div>
<div class='flex justify-between items-center'>
<h1>Web Blog</h1>
<h1>{siteSettings?.site_title}</h1>
<span>
<Icon name='blog' width='52' height='52' />
<Icon name={siteSettings?.site_icon || 'mdi:rss-feed'} width='52' height='52' />
</span>
</div>
<nav class='mt-2'>
@ -37,7 +40,6 @@ const links = [
</div>
<hr />
<p class='italic text-gray-700'>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Itaque debitis nemo nulla praesentium!
Qui praesentium quos alias neque, optio beatae.
{siteSettings?.site_description}
</p>
</header>

View File

@ -1,21 +0,0 @@
---
title: 'My First Post'
tags: ['javascript', 'web-development']
description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra.'
pubDate: 'Feb 28 2023'
image: '/media/placeholder-social.jpg'
---
# Heading 1
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet.
## Heading 2
Morbi tristique senectus et netus. Id semper risus in hendrerit gravida rutrum quisque non tellus. Habitasse platea dictumst quisque sagittis purus sit amet. Tellus molestie nunc non blandit massa. Cursus vitae congue mauris rhoncus. Accumsan tortor posuere ac ut. Fringilla urna porttitor rhoncus dolor. Elit ullamcorper dignissim cras tincidunt lobortis. In cursus turpis massa tincidunt dui ut ornare lectus. Integer feugiat scelerisque varius morbi enim nunc. Bibendum neque egestas congue quisque egestas diam. Cras ornare arcu dui vivamus arcu felis bibendum. Dignissim suspendisse in est ante in nibh mauris. Sed tempus urna et pharetra pharetra massa massa ultricies mi.
Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam sit amet nisl suscipit. Lacus viverra vitae congue eu consequat ac felis donec. Egestas integer eget aliquet nibh praesent tristique magna sit amet. Eget magna fermentum iaculis eu non diam. In vitae turpis massa sed elementum. Tristique et egestas quis ipsum suspendisse ultrices. Eget lorem dolor sed viverra ipsum. Vel turpis nunc eget lorem dolor sed viverra. Posuere ac ut consequat semper viverra nam. Laoreet suspendisse interdum consectetur libero id faucibus. Diam phasellus vestibulum lorem sed risus ultricies tristique. Rhoncus dolor purus non enim praesent elementum facilisis. Ultrices tincidunt arcu non sodales neque. Tempus egestas sed sed risus pretium quam vulputate. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus ornare. Fringilla urna porttitor rhoncus dolor purus non. Amet dictum sit amet justo donec enim.
Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi.
Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna.

View File

@ -1,24 +0,0 @@
import { z, defineCollection } from 'astro:content';
const blogCollection = defineCollection({
schema: z.object({
title: z.string(),
description: z.string(),
tags: z.array(z.string()),
image: z.string().optional(),
draft: z.boolean().optional(),
pubDate: z
.string()
.or(z.date())
.transform((val) => new Date(val)),
updDate: z
.string()
.or(z.date())
.transform((val) => new Date(val))
.optional(),
}),
});
export const collections = {
blog: blogCollection,
};

11
src/env.d.ts vendored
View File

@ -1,2 +1,13 @@
/// <reference path="../.astro/types.d.ts" />
/// <reference types="astro/client" />
interface ImportMetaEnv {
readonly DIRECTUS_URL: string;
readonly DIRECTUS_EMAIL?: string;
readonly DIRECTUS_PASSWORD?: string;
readonly DIRECTUS_STATIC_TOKEN?: string;
}
interface ImportMeta {
readonly env: ImportMetaEnv;
}

View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><path fill="currentColor" d="M192 32c0 17.7 14.3 32 32 32c123.7 0 224 100.3 224 224c0 17.7 14.3 32 32 32s32-14.3 32-32C512 128.9 383.1 0 224 0c-17.7 0-32 14.3-32 32zm0 96c0 17.7 14.3 32 32 32c70.7 0 128 57.3 128 128c0 17.7 14.3 32 32 32s32-14.3 32-32c0-106-86-192-192-192c-17.7 0-32 14.3-32 32zm-96 16c0-26.5-21.5-48-48-48S0 117.5 0 144v224c0 79.5 64.5 144 144 144s144-64.5 144-144s-64.5-144-144-144h-16v96h16c26.5 0 48 21.5 48 48s-21.5 48-48 48s-48-21.5-48-48V144z"/></svg>

Before

Width:  |  Height:  |  Size: 561 B

View File

@ -1,8 +1,8 @@
---
import '../styles/global.css';
import BaseHead from '../components/BaseHead.astro';
import Header from '../components/Header.astro';
import Footer from '../components/Footer.astro';
import '@styles/global.css';
import BaseHead from '@components/BaseHead.astro';
import Header from '@components/Header.astro';
import Footer from '@components/Footer.astro';
export interface Props {
title?: string;

View File

@ -1,5 +1,5 @@
---
import PageLayout from '../layouts/PageLayout.astro';
import PageLayout from '@layouts/PageLayout.astro';
---
<PageLayout noindex>

View File

@ -1,7 +1,13 @@
---
import PageLayout from '../layouts/PageLayout.astro';
import PageLayout from '@layouts/PageLayout.astro';
import { client as directus } from '@lib/directus';
const data = await directus.singleton('about_us').read();
---
<PageLayout title={'About'}>
<div>...</div>
<PageLayout title={data?.heading || 'About'}>
<div>
<h1>{data?.heading}</h1>
<div set:html={data?.body} />
</div>
</PageLayout>

View File

@ -1,28 +1,30 @@
---
import { CollectionEntry, getCollection } from 'astro:content';
import PageLayout from '../../layouts/PageLayout.astro';
import type { DefaultItem } from '@directus/sdk';
import type { ArticleCollection } from '@lib/directus-collections';
import { getLatestArticles } from '@lib/api';
import { getAssetURL } from '@lib/directus';
import PageLayout from '@layouts/PageLayout.astro';
export async function getStaticPaths() {
const posts = await getCollection('blog');
return posts.map((post) => ({ params: { slug: post.slug }, props: { post } }));
const articles = await getLatestArticles();
return articles.data?.map((article) => ({ params: { slug: article.slug }, props: { article } }));
}
const { post } = Astro.props as { post: CollectionEntry<'blog'> };
const { title, description, image, pubDate } = post.data;
const { Content } = await post.render();
const { article } = Astro.props as { article: DefaultItem<ArticleCollection> };
const { title, description, cover, body, date_created } = article;
---
<PageLayout title={title}>
<div class='flex justify-between flex-wrap gap-3 items-center'>
<h1>{title}</h1>
<span class='italic'>
Published: <time datetime={pubDate.toISOString()}>{pubDate.toLocaleDateString()}</time>
Published: <time datetime={new Date(date_created).toISOString()}
>{new Date(date_created).toLocaleDateString()}</time
>
</span>
</div>
<hr />
<p>{description}</p>
{image && <img class='my-5' src={image} alt={title} />}
<div>
<Content />
</div>
{cover && <img class='my-5' src={getAssetURL(cover)} alt={title} />}
<div set:html={body} />
</PageLayout>

View File

@ -1,7 +1,35 @@
---
import PageLayout from '../layouts/PageLayout.astro';
import PageLayout from '@layouts/PageLayout.astro';
import { client as directus } from '@lib/directus';
import { Icon } from 'astro-icon';
const data = await directus.singleton('contacts').read();
---
<PageLayout title={'Contact'}>
<div>...</div>
<PageLayout title={data?.heading || 'Contacts'}>
<div>
<h1>{data?.heading}</h1>
<div set:html={data?.body} />
<hr />
{
data?.contacts && (
<ul class='flex'>
{data.contacts.map((c) => (
<li class='flex items-center mr-5 italic text-sm mb-1.5'>
<span class='mr-1.5'>
<Icon name={c?.icon} height={16} width={16} />
</span>
{c?.href_prefix ? (
<a class='underline' href={`${c.href_prefix}:${c.data}`}>
{c.data}
</a>
) : (
c.data
)}
</li>
))}
</ul>
)
}
</div>
</PageLayout>

View File

@ -1,30 +1,31 @@
---
import { getCollection } from 'astro:content';
import PageLayout from '../layouts/PageLayout.astro';
import { getLatestArticles } from '@lib/api';
import { getAssetURL } from '@lib/directus';
import PageLayout from '@layouts/PageLayout.astro';
const posts = await getCollection('blog', (e) => !e.data.draft);
const articles = await getLatestArticles();
---
<PageLayout title={'Welcome to my blog'}>
<PageLayout title={'Main'}>
<section>
{
posts.map((p) => (
articles.data?.map((a) => (
<article class='border-b'>
<a href={`/blog/${p.slug}/`}>
<a href={`/blog/${a.slug}/`}>
<div class='lg:flex lg:items-center'>
<div class='py-2'>
<h2>{p.data.title}</h2>
<p>{p.data.description}</p>
<time class='italic text-sm' datetime={p.data.pubDate.toISOString()}>
Published: {p.data.pubDate.toLocaleDateString()}
<h2>{a.title}</h2>
<p>{a.description}</p>
<time class='italic text-sm' datetime={new Date(a.date_created).toISOString()}>
Published: {new Date(a.date_created).toLocaleDateString()}
</time>
</div>
{p.data.image && (
{a.cover && (
<div class='lg:ml-5 flex justify-center border-t py-5 lg:py-0 lg:border-none'>
<img
class='w-full md:max-w-[500px] lg:max-w-[700px]'
src={p.data.image}
alt={p.data.title}
src={getAssetURL(a.cover)}
alt={a.title}
/>
</div>
)}

View File

@ -1,6 +1,13 @@
{
"extends": "astro/tsconfigs/strict",
"compilerOptions": {
"strictNullChecks": true
"strictNullChecks": true,
"baseUrl": ".",
"paths": {
"@components/*": ["./src/components/*"],
"@lib/*": ["./lib/*"],
"@layouts/*": ["./src/layouts/*"],
"@styles/*": ["./src/styles/*"]
}
}
}