fix favicon.ico and remove ArticlesList history change
All checks were successful
/ image_build (push) Successful in 4m45s
All checks were successful
/ image_build (push) Successful in 4m45s
This commit is contained in:
56
k8s.yaml
56
k8s.yaml
@@ -1,56 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata: &metadata
|
|
||||||
name: blog
|
|
||||||
labels: &label
|
|
||||||
app: blog
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels: *label
|
|
||||||
template:
|
|
||||||
metadata: *metadata
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: nginx
|
|
||||||
image: gitea.tymur999.com/tymur999/blog:latest
|
|
||||||
ports:
|
|
||||||
- containerPort: 8000
|
|
||||||
name: http
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: blog
|
|
||||||
labels: &labels
|
|
||||||
app: blog
|
|
||||||
spec:
|
|
||||||
selector: *labels
|
|
||||||
ports:
|
|
||||||
- port: 8000
|
|
||||||
protocol: TCP
|
|
||||||
targetPort: http
|
|
||||||
name: http
|
|
||||||
---
|
|
||||||
apiVersion: networking.k8s.io/v1
|
|
||||||
kind: Ingress
|
|
||||||
metadata:
|
|
||||||
name: blog
|
|
||||||
labels:
|
|
||||||
app: blog
|
|
||||||
spec:
|
|
||||||
ingressClassName: traefik
|
|
||||||
tls:
|
|
||||||
- hosts:
|
|
||||||
- tymur999.com
|
|
||||||
rules:
|
|
||||||
- host: tymur999.com
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: Prefix
|
|
||||||
backend:
|
|
||||||
service:
|
|
||||||
name: blog
|
|
||||||
port:
|
|
||||||
name: http
|
|
||||||
@@ -21,7 +21,6 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "NODE_ENV=development webpack serve -c webpack.config.ts",
|
"dev": "NODE_ENV=development webpack serve -c webpack.config.ts",
|
||||||
"build": "NODE_ENV=production webpack -c webpack.config.ts",
|
"build": "NODE_ENV=production webpack -c webpack.config.ts",
|
||||||
"deploy": "gh-pages -d build",
|
|
||||||
"serve": "serve -s build"
|
"serve": "serve -s build"
|
||||||
},
|
},
|
||||||
"browserslist": {
|
"browserslist": {
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<link rel="icon" href="/favicon.ico" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<meta name="theme-color" content="#000000" />
|
<meta name="theme-color" content="#000000" />
|
||||||
<meta
|
<meta
|
||||||
|
|||||||
@@ -8,38 +8,12 @@ import {Html, OrbitControls} from "@react-three/drei";
|
|||||||
import {Sun} from "../index/Canvas";
|
import {Sun} from "../index/Canvas";
|
||||||
import {Skybox} from "../index/Skybox";
|
import {Skybox} from "../index/Skybox";
|
||||||
import {Bloom, EffectComposer, Vignette} from "@react-three/postprocessing";
|
import {Bloom, EffectComposer, Vignette} from "@react-three/postprocessing";
|
||||||
import {useEffect, useState} from "react";
|
import {useState} from "react";
|
||||||
import {Reader} from "./Reader";
|
import {Reader} from "./Reader";
|
||||||
import {useRouter} from "../router/RouterContext";
|
|
||||||
import {Path} from "../router/router";
|
|
||||||
|
|
||||||
const ARTICLE_QUERY = "a";
|
|
||||||
const main = AnimateFade();
|
const main = AnimateFade();
|
||||||
export default function ArticlesList() {
|
export default function ArticlesList() {
|
||||||
const [article, setArticle] = useState<Article | null>(null);
|
const [article, setArticle] = useState<Article | null>(null);
|
||||||
const router = useRouter();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const params = new URLSearchParams(location.search);
|
|
||||||
if(params.has(ARTICLE_QUERY)) {
|
|
||||||
const id = Number.parseInt(params.get(ARTICLE_QUERY)!);
|
|
||||||
setArticle(ARTICLES[id] ?? null);
|
|
||||||
}
|
|
||||||
}, [setArticle]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if(!article) {
|
|
||||||
// query param
|
|
||||||
const params = new URLSearchParams(location.search);
|
|
||||||
if(params.has(ARTICLE_QUERY)) {
|
|
||||||
router.replacePage(location.pathname as Path);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const id = ARTICLES.indexOf(article);
|
|
||||||
router.replacePage(`${location.pathname}?${ARTICLE_QUERY}=${id}` as Path);
|
|
||||||
}
|
|
||||||
}, [article]);
|
|
||||||
|
|
||||||
|
|
||||||
return <motion.main animate={main.animate} initial={main.initial} className="art-ctr">
|
return <motion.main animate={main.animate} initial={main.initial} className="art-ctr">
|
||||||
<Canvas camera={{position: [0,0,20]}}>
|
<Canvas camera={{position: [0,0,20]}}>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"routes": [
|
|
||||||
{
|
|
||||||
"route": "/about",
|
|
||||||
"rewrite": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"route": "/articles",
|
|
||||||
"rewrite": "/"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -139,6 +139,7 @@ const config: webpack.Configuration = {
|
|||||||
plugins: [
|
plugins: [
|
||||||
new HtmlWebpackPlugin({
|
new HtmlWebpackPlugin({
|
||||||
template: path.resolve(import.meta.dirname, "public/index.html"),
|
template: path.resolve(import.meta.dirname, "public/index.html"),
|
||||||
|
favicon: "./src/img/favicon.ico",
|
||||||
inject: true,
|
inject: true,
|
||||||
}),
|
}),
|
||||||
new webpack.DefinePlugin({
|
new webpack.DefinePlugin({
|
||||||
|
|||||||
Reference in New Issue
Block a user