Merge pull request #139 from tmshv/upd/maintenance-004

maintenance 4
This commit is contained in:
tmshv authored and GitHub committed 2023-02-09 16:25:37 +05:00
commit e796e2fe84
16 files changed
+1145 -610

No files matched your search

-9
View File
@@ -1,9 +0,0 @@
module.exports = {
trailingSlash: false,
images: {
domains: [
'hudozkacdn.tmshv.com',
'images.weserv.nl',
],
}
}
+15
View File
@@ -0,0 +1,15 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
trailingSlash: false,
images: {
domains: [
"hudozkacdn.tmshv.com",
"images.weserv.nl",
],
},
/* config options here */
}
export default nextConfig
+1101 -557
View File
File diff suppressed because it is too large. Load diff
+6 -7
View File
@@ -24,8 +24,8 @@
"date-fns": "^2.29.0", "date-fns": "^2.29.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"markdown-it": "^13.0.1", "markdown-it": "^13.0.1",
"next": "^12.3.0", "next": "^13.1.0",
"next-seo": "^5.5.0", "next-seo": "^5.15.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-icons": "^4.2.0", "react-icons": "^4.2.0",
@@ -39,13 +39,12 @@
"@types/classnames": "^2.2.10", "@types/classnames": "^2.2.10",
"@types/lodash": "^4.14.149", "@types/lodash": "^4.14.149",
"@types/markdown-it": "^12.2.3", "@types/markdown-it": "^12.2.3",
"@types/node": "^12.12.34", "@types/node": "^18.13.0",
"@types/react": "^18.0.18", "@types/react": "^18.0.18",
"@types/sharp": "^0.29.2", "@types/sharp": "^0.29.2",
"eslint": "^8.25.0", "eslint": "^8.33.0",
"eslint-config-next": "^12.3.0", "eslint-config-next": "^13.1.0",
"feed": "^4.1.0", "feed": "^4.1.0",
"should": "^8.2.2", "typescript": "^4.9.0"
"typescript": "^4.8.2"
} }
} }
+6 -8
View File
@@ -20,15 +20,13 @@ export type CardProps = {
export const Card: React.FC<CardProps> = props => ( export const Card: React.FC<CardProps> = props => (
<div className={cx(s.card, layoutClass[props.layout])} style={props.style}> <div className={cx(s.card, layoutClass[props.layout])} style={props.style}>
<Link href={props.href}> <Link href={props.href}>
<a> <div className={s.image}>
<div className={s.image}> {props.cover}
{props.cover} </div>
</div>
<div className={s.body}> <div className={s.body}>
{props.children} {props.children}
</div> </div>
</a>
</Link> </Link>
</div> </div>
) )
+1 -1
View File
@@ -15,7 +15,7 @@ export const Contacts: React.FC = props => {
{contacts.map((x, i) => ( {contacts.map((x, i) => (
<p key={i} className={s.link}> <p key={i} className={s.link}>
<Link href={x.value}> <Link href={x.value}>
<a >{x.title}</a> {x.title}
</Link> </Link>
</p> </p>
))} ))}
+3 -5
View File
@@ -50,16 +50,14 @@ export const FileCard: React.FC<FileCardProps> = props => {
/> />
)} )}
<Link href={props.url}> <Link href={props.url}>
<a>{props.title}</a> {props.title}
</Link> </Link>
</Box> </Box>
</div> </div>
<div className={s.info}> <div className={s.info}>
<Link href={props.file_url}> <Link href={props.file_url} target="_blank" rel="noreferrer">
<a target="_blank" rel="noreferrer"> {format} ({fileSize})
{format} ({fileSize})
</a>
</Link> </Link>
</div> </div>
</div> </div>
+4 -8
View File
@@ -12,20 +12,16 @@ export const File: React.FC<FileProps> = props => (
<div className={s.file} style={props.style}> <div className={s.file} style={props.style}>
{!props.cover?.src ? null : ( {!props.cover?.src ? null : (
<div className={s.image}> <div className={s.image}>
<Link href={props.file.src} > <Link href={props.file.src} target="_blank" rel="noreferrer" className="invisible">
<a target="_blank" rel="noreferrer" className="invisible"> <img src={props.cover.src} alt={props.name} />
<img src={props.cover.src} alt={props.name} />
</a>
</Link> </Link>
</div> </div>
)} )}
<div className={s.info}> <div className={s.info}>
<span>{props.name}</span> <span>{props.name}</span>
<Link href={props.file.src} > <Link href={props.file.src} target={"_blank"} rel={"noreferrer"}>
<a target="_blank" rel="noreferrer"> {ext(props.file.type)} ({size(props.file.size)})
{ext(props.file.type)} ({size(props.file.size)})
</a>
</Link> </Link>
</div> </div>
</div> </div>
+1 -1
View File
@@ -1,6 +1,6 @@
import s from "./logo.module.css" import s from "./logo.module.css"
import Image from "next/future/image" import Image from "next/image"
import image from "src/assets/hudozka-logo.png" import image from "src/assets/hudozka-logo.png"
export type HudozkaLogoProps = { export type HudozkaLogoProps = {
+1 -1
View File
@@ -9,7 +9,7 @@ export type ActiveLinkProps = {
export const ActiveLink: React.FC<ActiveLinkProps> = props => props.href export const ActiveLink: React.FC<ActiveLinkProps> = props => props.href
? ( ? (
<Link href={props.href}> <Link href={props.href}>
<a>{props.children}</a> {props.children}
</Link> </Link>
) : ( ) : (
<span style={props.activeStyle}>{props.children}</span> <span style={props.activeStyle}>{props.children}</span>
@@ -17,9 +17,7 @@ export const DesktopNavigation: React.FC<DesktopNavigationProps> = ({ style }) =
return ( return (
<Box wrap gap={"var(--size-s)"} style={style}> <Box wrap gap={"var(--size-s)"} style={style}>
<Link href="/"> <Link href="/">
<a> <HudozkaLogo dark={dark} />
<HudozkaLogo dark={dark} />
</a>
</Link> </Link>
<Menu <Menu
@@ -48,9 +48,7 @@ export const MobileNavigation: React.FC<MobileNavigationProps> = ({ style }) =>
<Box wrap gap={"var(--size-s)"} style={style}> <Box wrap gap={"var(--size-s)"} style={style}>
<Link href="/"> <Link href="/">
<a> <HudozkaLogo dark={dark} />
<HudozkaLogo dark={dark} />
</a>
</Link> </Link>
<HudozkaTitle compact /> <HudozkaTitle compact />
<Spacer /> <Spacer />
+1 -1
View File
@@ -11,7 +11,7 @@ export const NotFound: React.FC = () => (
<div> <div>
<Link href={"/"}> <Link href={"/"}>
<a>На главную</a> На главную
</Link> </Link>
</div> </div>
</section> </section>
+1 -1
View File
@@ -45,7 +45,7 @@ export const PageGrid: React.FC<PageGridProps> = props => {
layout={"fill"} layout={"fill"}
objectFit={"cover"} objectFit={"cover"}
src={item.cover.src} src={item.cover.src}
alt={item.cover.alt} alt={item.cover.alt ?? ""}
placeholder={item.cover.blur ? "blur" : "empty"} placeholder={item.cover.blur ? "blur" : "empty"}
blurDataURL={item.cover.blur} blurDataURL={item.cover.blur}
/> />
+2 -4
View File
@@ -39,10 +39,8 @@ export const Button: React.FC<ButtonProps> = ({ size = "default", theme = "defau
if (props.href) { if (props.href) {
return ( return (
<Link href={props.href}> <Link href={props.href} className={className} style={props.style}>
<a className={className} style={props.style}> {props.children}
{props.children}
</a>
</Link> </Link>
) )
} }
+1 -1
View File
@@ -38,7 +38,7 @@ export const Picture: React.FC<PictureProps> = memo(({
<Image <Image
className={s.img} className={s.img}
src={src} src={src}
alt={alt} alt={alt ?? ""}
width={width} width={width}
height={height} height={height}
layout={"responsive"} layout={"responsive"}