Skip to content

Commit e0cbd3b

Browse files
Merge pull request #90 from The-Infinitys/dev
Dev
2 parents 8f6e51f + dee4825 commit e0cbd3b

File tree

22 files changed

+803
-163
lines changed

22 files changed

+803
-163
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
"framer-motion": "^12.18.1",
1515
"gray-matter": "^4.0.3",
1616
"highlight.js": "^11.11.1",
17-
"i18next": "^25.2.1",
17+
"i18next": "^25.3.2",
1818
"i18next-browser-languagedetector": "^8.2.0",
1919
"i18next-http-backend": "^3.0.2",
2020
"install": "^0.13.0",
2121
"lighthouse": "^12.6.1",
2222
"negotiator": "^1.0.0",
2323
"next": "15.3.4",
24-
"next-intl": "^4.1.0",
24+
"next-intl": "^4.3.4",
2525
"next-sitemap": "^4.2.3",
2626
"npm": "^11.4.2",
27-
"prettier": "^3.5.3",
27+
"prettier": "^3.6.2",
2828
"puppeteer": "^24.11.1",
2929
"react": "^19.1.0",
3030
"react-dom": "^19.1.0",

src/app/[article_year]/[month]/[aid]/page.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,20 +277,20 @@ html {
277277
}
278278

279279
.other-articles {
280-
position: relative; /* かぶり防止 */
281-
z-index: 1; /* 他要素より下に */
280+
position: relative; /* かぶり防止 */
281+
z-index: 1; /* 他要素より下に */
282282
align-items: center;
283283
justify-content: center;
284284
margin-top: 40px;
285-
margin-bottom: 40px; /* 下にも余白を追加 */
286-
top: auto; /* top指定を解除 */
287-
width: 100%; /* 幅を100%に */
285+
margin-bottom: 40px; /* 下にも余白を追加 */
286+
top: auto; /* top指定を解除 */
287+
width: 100%; /* 幅を100%に */
288288
margin-left: 275px;
289289
background-color: transparent;
290-
padding: 16px 0; /* 上下に余白 */
291-
box-sizing: border-box; /* パディングを含める */
290+
padding: 16px 0; /* 上下に余白 */
291+
box-sizing: border-box; /* パディングを含める */
292292
}
293-
.other-articles>h2 {
293+
.other-articles > h2 {
294294
font-size: 1.5rem;
295295
margin-bottom: 16px;
296296
color: var(--foreground);
@@ -335,7 +335,7 @@ html {
335335
margin-bottom: 4em;
336336
/* 記事の上部に配置 */
337337
}
338-
338+
339339
.article-detail {
340340
position: relative;
341341
margin: 1rem;

src/app/[article_year]/[month]/[aid]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export async function generateMetadata({
4848
const og_image_url = `${slug}/${article?.thumbnail?.split("/").slice(-1)[0]}`;
4949
const metadata: Metadata = {
5050
metadataBase: new URL(
51-
process.env.BASE_URL || "https://the-infinitys.f5.si"
51+
process.env.BASE_URL || "https://the-infinitys.f5.si",
5252
),
5353
title: fullTitle, // ページのタイトルを設定
5454
description: description, // ページのディスクリプションを設定

src/app/article/article.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ section.articles {
88
align-items: center;
99
}
1010

11-
.article-link{
11+
.article-link {
1212
background-color: color-mix(in srgb, transparent 50%, var(--primary));
1313
box-sizing: border-box;
1414
text-decoration: none;

src/app/globals.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:root {
44
--background: #ffffff;
55
--foreground: #171717;
6-
--primary: color-mix(in srgb, var(--foreground), var(--background) 80%);
6+
--primary: color-mix(in srgb, var(--foreground), var(--background) 80%);
77
--link-color: #0000ff;
88
--body-color-value: 0deg;
99
--secondary: color-mix(in srgb, var(--foreground), var(--background) 50%);

src/app/layout/header.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ const menus_list = [
3434
target: "_self",
3535
label: "Games",
3636
},
37+
{
38+
name: "Tools",
39+
link: "/tool",
40+
target: "_self",
41+
label: "Tools",
42+
},
3743
];
3844

3945
export default function Header() {
@@ -52,9 +58,7 @@ export default function Header() {
5258
// Added padding, flex layout for alignment
5359
<header className="p-4 py-6 flex justify-between items-center relative">
5460
{/* Title */}
55-
<div
56-
className="flex items-center justify-start"
57-
>
61+
<div className="flex items-center justify-start">
5862
<h1
5963
className={`${chakraPetch.className} italic font-semibold text-4xl`} // text-4xlに変更
6064
>

src/app/loading.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// src/app/loading.tsx
2-
import styles from './loading.module.css';
2+
import styles from "./loading.module.css";
33

44
export default function Loading() {
55
return (
66
<div className={styles.loadingContainer}>
77
<div className={styles.spinner}></div>
88
</div>
99
);
10-
}
10+
}

src/app/music/[music_id]/components/player.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export function Player({ music, musicList }: PlayerProps) {
4646
const [timePosition, setTimePosition] = useState(0);
4747
const [playbackRate, setPlaybackRate] = useState(1);
4848
const [source, setSource] = useState<MediaElementAudioSourceNode | null>(
49-
null
49+
null,
5050
);
5151
const [analyserNode, setAnalyserNode] = useState<AnalyserNode | null>(null);
5252
const [isCircular, setIsCircular] = useState(false);
@@ -97,7 +97,7 @@ export function Player({ music, musicList }: PlayerProps) {
9797
if (!audioRef.current) return;
9898
audioCtxRef.current = new AudioContext();
9999
const elementSource = audioCtxRef.current.createMediaElementSource(
100-
audioRef.current
100+
audioRef.current,
101101
);
102102
const analyser = audioCtxRef.current.createAnalyser();
103103
analyser.fftSize = 2 ** 8;
@@ -221,7 +221,7 @@ export function Player({ music, musicList }: PlayerProps) {
221221
innerRadius,
222222
-barWidthCirc / 2,
223223
barHeight,
224-
barWidthCirc
224+
barWidthCirc,
225225
);
226226
canvasCtx.restore();
227227
}
@@ -235,7 +235,7 @@ export function Player({ music, musicList }: PlayerProps) {
235235
0,
236236
canvas.height,
237237
0,
238-
0
238+
0,
239239
);
240240
gradient.addColorStop(0, `hsla(${hue}, 100%, 50%, 0.4)`);
241241
gradient.addColorStop(1, `hsla(${hue}, 100%, 50%, 0.2)`);
@@ -245,7 +245,7 @@ export function Player({ music, musicList }: PlayerProps) {
245245
x,
246246
canvas.height - barHeight,
247247
barWidth - 1,
248-
barHeight
248+
barHeight,
249249
);
250250
x += barWidth;
251251
}
@@ -304,15 +304,15 @@ export function Player({ music, musicList }: PlayerProps) {
304304
if (!audioRef.current) return;
305305
audioRef.current.currentTime = Math.min(
306306
audioRef.current.currentTime + 10,
307-
duration
307+
duration,
308308
);
309309
};
310310

311311
const handleSkipBackward = () => {
312312
if (!audioRef.current) return;
313313
audioRef.current.currentTime = Math.max(
314314
audioRef.current.currentTime - 5,
315-
0
315+
0,
316316
);
317317
};
318318

@@ -370,7 +370,7 @@ export function Player({ music, musicList }: PlayerProps) {
370370

371371
const handleEqChange = (
372372
index: number,
373-
e: React.ChangeEvent<HTMLInputElement>
373+
e: React.ChangeEvent<HTMLInputElement>,
374374
) => {
375375
const newGains = [...eqGains];
376376
newGains[index] = parseFloat(e.target.value);

src/app/music/music.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ export function getMusicList(): Music[] {
3434
// 音楽ファイルとジャケット画像を探す
3535
const musicFile = files.find(
3636
(file) =>
37-
file.endsWith(".mp3") || file.endsWith(".m4a") || file.endsWith(".wav")
37+
file.endsWith(".mp3") || file.endsWith(".m4a") || file.endsWith(".wav"),
3838
);
3939
const jacketFile = files.find(
40-
(file) => file.startsWith("jacket.") || file.startsWith("cover.")
40+
(file) => file.startsWith("jacket.") || file.startsWith("cover."),
4141
);
4242

4343
// music.jsonを読み込む
@@ -70,10 +70,7 @@ export function getMusicList(): Music[] {
7070

7171
export function MusicCard({ music }: { music: Music }) {
7272
return (
73-
<a
74-
href={`/music/${music.id}`}
75-
className={styles["music-card"]}
76-
>
73+
<a href={`/music/${music.id}`} className={styles["music-card"]}>
7774
{music.jacketUrl && (
7875
<Image
7976
src={music.jacketUrl}

0 commit comments

Comments
 (0)