From 57f28e4e5ee7c4e3ae931bd430ef770a13839f4b Mon Sep 17 00:00:00 2001 From: miteruzo Date: Wed, 4 Feb 2026 23:08:28 +0900 Subject: [PATCH] #140 --- frontend/src/App.tsx | 13 +++----- frontend/src/components/PostFormTagsArea.tsx | 7 ++-- frontend/src/components/TagDetailSidebar.tsx | 33 ++++--------------- frontend/src/components/TagLink.tsx | 20 ++++++----- frontend/src/components/TagSearch.tsx | 15 ++++----- frontend/src/components/TagSidebar.tsx | 9 +++-- frontend/src/components/WikiBody.tsx | 7 ++-- .../src/components/users/InheritDialogue.tsx | 10 +++--- .../src/components/users/UserCodeDialogue.tsx | 10 ++---- frontend/src/lib/api.ts | 5 +-- frontend/src/pages/posts/PostNewPage.tsx | 20 ++++------- frontend/src/pages/tags/NicoTagListPage.tsx | 17 ++++------ frontend/src/pages/users/SettingPage.tsx | 11 +++---- frontend/src/pages/wiki/WikiDiffPage.tsx | 8 ++--- frontend/src/pages/wiki/WikiEditPage.tsx | 12 +++---- frontend/src/pages/wiki/WikiHistoryPage.tsx | 9 ++--- 16 files changed, 74 insertions(+), 132 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 2ff7743..5d2e8a6 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,12 +1,11 @@ import axios from 'axios' -import toCamel from 'camelcase-keys' import { useEffect, useState } from 'react' import { BrowserRouter, Navigate, Route, Routes, useLocation } from 'react-router-dom' import RouteBlockerOverlay from '@/components/RouteBlockerOverlay' import TopNav from '@/components/TopNav' import { Toaster } from '@/components/ui/toaster' -import { API_BASE_URL } from '@/config' +import { apiPost } from '@/lib/api' import NicoTagListPage from '@/pages/tags/NicoTagListPage' import NotFound from '@/pages/NotFound' import PostDetailPage from '@/pages/posts/PostDetailPage' @@ -40,12 +39,11 @@ export default (() => { useEffect (() => { const createUser = async () => { - const res = await axios.post (`${ API_BASE_URL }/users`) - const data = res.data as { code: string; user: any } + const data = await apiPost<{ code: string; user: User }> ('/users') if (data.code) { localStorage.setItem ('user_code', data.code) - setUser (toCamel (data.user, { deep: true }) as User) + setUser (data.user) } } @@ -55,10 +53,9 @@ export default (() => { void (async () => { try { - const res = await axios.post (`${ API_BASE_URL }/users/verify`, { code }) - const data = res.data as { valid: boolean, user: any } + const data = await apiPost<{ valid: boolean; user: User }> ('/users/verify', { code }) if (data.valid) - setUser (toCamel (data.user, { deep: true })) + setUser (data.user) else await createUser () } diff --git a/frontend/src/components/PostFormTagsArea.tsx b/frontend/src/components/PostFormTagsArea.tsx index de97ada..b5fac1a 100644 --- a/frontend/src/components/PostFormTagsArea.tsx +++ b/frontend/src/components/PostFormTagsArea.tsx @@ -1,11 +1,9 @@ -import axios from 'axios' -import toCamel from 'camelcase-keys' import { useRef, useState } from 'react' import TagSearchBox from '@/components/TagSearchBox' import Label from '@/components/common/Label' import TextArea from '@/components/common/TextArea' -import { API_BASE_URL } from '@/config' +import { apiGet } from '@/lib/api' import type { FC, SyntheticEvent } from 'react' @@ -59,8 +57,7 @@ export default (({ tags, setTags }: Props) => { const recompute = async (pos: number, v: string = tags) => { const { start, end, token } = getTokenAt (v, pos) setBounds ({ start, end }) - const res = await axios.get (`${ API_BASE_URL }/tags/autocomplete`, { params: { q: token } }) - const data = toCamel (res.data as any, { deep: true }) as Tag[] + const data = await apiGet ('/tags/autocomplete', { params: { q: token } }) setSuggestions (data.filter (t => t.postCount > 0)) setSuggestionsVsbl (suggestions.length > 0) } diff --git a/frontend/src/components/TagDetailSidebar.tsx b/frontend/src/components/TagDetailSidebar.tsx index 9342460..64dbfe3 100644 --- a/frontend/src/components/TagDetailSidebar.tsx +++ b/frontend/src/components/TagDetailSidebar.tsx @@ -6,8 +6,6 @@ import { DndContext, useSensor, useSensors } from '@dnd-kit/core' import { restrictToWindowEdges } from '@dnd-kit/modifiers' -import axios from 'axios' -import toCamel from 'camelcase-keys' import { AnimatePresence, motion } from 'framer-motion' import { useEffect, useRef, useState } from 'react' @@ -19,8 +17,8 @@ import SectionTitle from '@/components/common/SectionTitle' import SubsectionTitle from '@/components/common/SubsectionTitle' import SidebarComponent from '@/components/layout/SidebarComponent' import { toast } from '@/components/ui/use-toast' -import { API_BASE_URL } from '@/config' import { CATEGORIES } from '@/consts' +import { apiDelete, apiGet, apiPatch, apiPost } from '@/lib/api' import type { DragEndEvent } from '@dnd-kit/core' import type { FC, MutableRefObject, ReactNode } from 'react' @@ -132,10 +130,7 @@ const changeCategory = async ( tagId: number, category: Category, ): Promise => { - await axios.patch ( - `${ API_BASE_URL }/tags/${ tagId }`, - { category }, - { headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) + await apiPatch (`/tags/${ tagId }`, { category }) } @@ -170,12 +165,7 @@ export default (({ post }: Props) => { if (!(post)) return - const res = await axios.get ( - `${ API_BASE_URL }/posts/${ post.id }`, - { headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) - const data = toCamel (res.data as any, { deep: true }) as Post - - setTags (buildTagByCategory (data)) + setTags (buildTagByCategory (await apiGet (`/posts/${ post.id }`))) } const onDragEnd = async (e: DragEndEvent) => { @@ -216,16 +206,9 @@ export default (({ post }: Props) => { return if (fromParentId != null) - { - await axios.delete ( - `${ API_BASE_URL }/tags/${ fromParentId }/children/${ childId }`, - { headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) - } + await apiDelete (`/tags/${ fromParentId }/children/${ childId }`) - await axios.post ( - `${ API_BASE_URL }/tags/${ parentId }/children/${ childId }`, - { }, - { headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) + await apiPost (`/tags/${ parentId }/children/${ childId }`, { }) await reloadTags () toast ({ @@ -245,11 +228,7 @@ export default (({ post }: Props) => { await changeCategory (childId, cat) if (fromParentId != null) - { - await axios.delete ( - `${ API_BASE_URL }/tags/${ fromParentId }/children/${ childId }`, - { headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) - } + await apiDelete (`/tags/${ fromParentId }/children/${ childId }`) const fromParent = fromParentId == null ? null : findTag (tags, fromParentId) diff --git a/frontend/src/components/TagLink.tsx b/frontend/src/components/TagLink.tsx index 1952d35..b3a926c 100644 --- a/frontend/src/components/TagLink.tsx +++ b/frontend/src/components/TagLink.tsx @@ -1,20 +1,20 @@ -import axios from 'axios' import { useEffect, useState } from 'react' import PrefetchLink from '@/components/PrefetchLink' -import { API_BASE_URL } from '@/config' import { LIGHT_COLOUR_SHADE, DARK_COLOUR_SHADE, TAG_COLOUR } from '@/consts' +import { apiGet } from '@/lib/api' import { cn } from '@/lib/utils' import type { ComponentProps, FC, HTMLAttributes } from 'react' import type { Tag } from '@/types' -type CommonProps = { tag: Tag - nestLevel?: number - withWiki?: boolean - withCount?: boolean - prefetch?: boolean } +type CommonProps = { + tag: Tag + nestLevel?: number + withWiki?: boolean + withCount?: boolean + prefetch?: boolean } type PropsWithLink = & CommonProps @@ -26,7 +26,9 @@ type PropsWithoutLink = & { linkFlg: false } & Partial> -type Props = PropsWithLink | PropsWithoutLink +type Props = + | PropsWithLink + | PropsWithoutLink export default (({ tag, @@ -49,7 +51,7 @@ export default (({ tag, try { - await axios.get (`${ API_BASE_URL }/wiki/title/${ encodeURIComponent (tagName) }/exists`) + await apiGet (`/wiki/title/${ encodeURIComponent (tagName) }/exists`) setHavingWiki (true) } catch diff --git a/frontend/src/components/TagSearch.tsx b/frontend/src/components/TagSearch.tsx index de1cde1..6e7a8bd 100644 --- a/frontend/src/components/TagSearch.tsx +++ b/frontend/src/components/TagSearch.tsx @@ -1,13 +1,11 @@ -import axios from 'axios' -import toCamel from 'camelcase-keys' -import React, { useEffect, useState } from 'react' +import { useEffect, useState } from 'react' import { useNavigate, useLocation } from 'react-router-dom' -import { API_BASE_URL } from '@/config' +import { apiGet } from '@/lib/api' import TagSearchBox from './TagSearchBox' -import type { FC } from 'react' +import type { ChangeEvent, FC, KeyboardEvent } from 'react' import type { Tag } from '@/types' @@ -21,7 +19,7 @@ export default (() => { const [suggestions, setSuggestions] = useState ([]) const [suggestionsVsbl, setSuggestionsVsbl] = useState (false) - const whenChanged = async (ev: React.ChangeEvent) => { + const whenChanged = async (ev: ChangeEvent) => { setSearch (ev.target.value) const q = ev.target.value.trim ().split (' ').at (-1) @@ -31,14 +29,13 @@ export default (() => { return } - const res = await axios.get (`${ API_BASE_URL }/tags/autocomplete`, { params: { q } }) - const data = toCamel (res.data, { deep: true }) as Tag[] + const data = await apiGet ('/tags/autocomplete', { params: { q } }) setSuggestions (data.filter (t => t.postCount > 0)) if (suggestions.length > 0) setSuggestionsVsbl (true) } - const handleKeyDown = (ev: React.KeyboardEvent) => { + const handleKeyDown = (ev: KeyboardEvent) => { switch (ev.key) { case 'ArrowDown': diff --git a/frontend/src/components/TagSidebar.tsx b/frontend/src/components/TagSidebar.tsx index 9959e47..ae06196 100644 --- a/frontend/src/components/TagSidebar.tsx +++ b/frontend/src/components/TagSidebar.tsx @@ -1,4 +1,3 @@ -import axios from 'axios' import { AnimatePresence, motion } from 'framer-motion' import { useEffect, useState } from 'react' import { useLocation, useNavigate } from 'react-router-dom' @@ -7,8 +6,8 @@ import TagLink from '@/components/TagLink' import TagSearch from '@/components/TagSearch' import SectionTitle from '@/components/common/SectionTitle' import SidebarComponent from '@/components/layout/SidebarComponent' -import { API_BASE_URL } from '@/config' import { CATEGORIES } from '@/consts' +import { apiGet } from '@/lib/api' import type { FC, MouseEvent } from 'react' @@ -77,10 +76,10 @@ export default (({ posts, onClick }: Props) => { void ((async () => { try { - const { data } = await axios.get (`${ API_BASE_URL }/posts/random`, - { params: { tags: tagsQuery.split (' ').filter (e => e !== '').join (' '), + const data = await apiGet ('/posts/random', + { params: { tags: tagsQuery.split (' ').filter (e => e !== '').join (' '), match: (anyFlg ? 'any' : 'all') } }) - navigate (`/posts/${ (data as Post).id }`) + navigate (`/posts/${ data.id }`) } catch { diff --git a/frontend/src/components/WikiBody.tsx b/frontend/src/components/WikiBody.tsx index 06b81a1..7851e5a 100644 --- a/frontend/src/components/WikiBody.tsx +++ b/frontend/src/components/WikiBody.tsx @@ -1,5 +1,3 @@ -import axios from 'axios' -import toCamel from 'camelcase-keys' import { useEffect, useMemo, useState } from 'react' import ReactMarkdown from 'react-markdown' import remarkGFM from 'remark-gfm' @@ -7,7 +5,7 @@ import remarkGFM from 'remark-gfm' import PrefetchLink from '@/components/PrefetchLink' import SectionTitle from '@/components/common/SectionTitle' import SubsectionTitle from '@/components/common/SubsectionTitle' -import { API_BASE_URL } from '@/config' +import { apiGet } from '@/lib/api' import remarkWikiAutoLink from '@/lib/remark-wiki-autolink' import type { FC } from 'react' @@ -43,8 +41,7 @@ export default (({ title, body }: Props) => { void (async () => { try { - const res = await axios.get (`${ API_BASE_URL }/wiki`) - const data: WikiPage[] = toCamel (res.data as any, { deep: true }) + const data = await apiGet ('/wiki') setPageNames (data.map (page => page.title).sort ((a, b) => b.length - a.length)) } catch diff --git a/frontend/src/components/users/InheritDialogue.tsx b/frontend/src/components/users/InheritDialogue.tsx index 49c1818..6bb8bb8 100644 --- a/frontend/src/components/users/InheritDialogue.tsx +++ b/frontend/src/components/users/InheritDialogue.tsx @@ -1,5 +1,3 @@ -import axios from 'axios' -import toCamel from 'camelcase-keys' import { useState } from 'react' import { Button } from '@/components/ui/button' @@ -8,7 +6,7 @@ import { Dialog, DialogTitle } from '@/components/ui/dialog' import { Input } from '@/components/ui/input' import { toast } from '@/components/ui/use-toast' -import { API_BASE_URL } from '@/config' +import { apiPost } from '@/lib/api' import type { User } from '@/types' @@ -26,12 +24,12 @@ export default ({ visible, onVisibleChange, setUser }: Props) => { try { - const res = await axios.post (`${ API_BASE_URL }/users/verify`, { code: inputCode }) - const data = res.data as { valid: boolean; user: any } + const data = await apiPost<{ valid: boolean; user: User }> ( + '/users/verify', { code: inputCode }) if (data.valid) { localStorage.setItem ('user_code', inputCode) - setUser (toCamel (data.user, { deep: true })) + setUser (data.user) toast ({ title: '引継ぎ成功!' }) onVisibleChange (false) } diff --git a/frontend/src/components/users/UserCodeDialogue.tsx b/frontend/src/components/users/UserCodeDialogue.tsx index 483b5ea..202b3ca 100644 --- a/frontend/src/components/users/UserCodeDialogue.tsx +++ b/frontend/src/components/users/UserCodeDialogue.tsx @@ -1,11 +1,9 @@ -import axios from 'axios' - import { Button } from '@/components/ui/button' import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog' import { toast } from '@/components/ui/use-toast' -import { API_BASE_URL } from '@/config' +import { apiPost } from '@/lib/api' import type { User } from '@/types' @@ -23,10 +21,8 @@ export default ({ visible, onVisibleChange, user, setUser }: Props) => { if (!(confirm ('引継ぎコードを再発行しますか?\n再発行するとほかのブラウザからはログアウトされます．'))) return - const res = await axios.post (`${ API_BASE_URL }/users/code/renew`, { }, { headers: { - 'Content-Type': 'multipart/form-data', - 'X-Transfer-Code': localStorage.getItem ('user_code') || '' } }) - const data = res.data as { code: string } + const data = await apiPost<{ code: string }> ('/users/code/renew', { }, + { headers: { 'Content-Type': 'multipart/form-data' } }) if (data.code) { localStorage.setItem ('user_code', data.code) diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 9695b0a..57990c9 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -4,8 +4,9 @@ import toCamel from 'camelcase-keys' import { API_BASE_URL } from '@/config' type Opt = { - params?: Record - headers?: Record } + params?: Record + headers?: Record + responseType?: 'blob' } const client = axios.create ({ baseURL: API_BASE_URL }) diff --git a/frontend/src/pages/posts/PostNewPage.tsx b/frontend/src/pages/posts/PostNewPage.tsx index f7ce25c..5a2f77b 100644 --- a/frontend/src/pages/posts/PostNewPage.tsx +++ b/frontend/src/pages/posts/PostNewPage.tsx @@ -1,4 +1,3 @@ -import axios from 'axios' import { useEffect, useState, useRef } from 'react' import { Helmet } from 'react-helmet-async' import { useNavigate } from 'react-router-dom' @@ -11,7 +10,8 @@ import PageTitle from '@/components/common/PageTitle' import MainArea from '@/components/layout/MainArea' import { Button } from '@/components/ui/button' import { toast } from '@/components/ui/use-toast' -import { API_BASE_URL, SITE_TITLE } from '@/config' +import { SITE_TITLE } from '@/config' +import { apiGet, apiPost } from '@/lib/api' import Forbidden from '@/pages/Forbidden' import type { FC } from 'react' @@ -55,9 +55,7 @@ export default (({ user }: Props) => { try { - await axios.post (`${ API_BASE_URL }/posts`, formData, { headers: { - 'Content-Type': 'multipart/form-data', - 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) + await apiPost ('/posts', formData, { headers: { 'Content-Type': 'multipart/form-data' } }) toast ({ title: '投稿成功!' }) navigate ('/posts') } @@ -91,10 +89,7 @@ export default (({ user }: Props) => { const fetchTitle = async () => { setTitle ('') setTitleLoading (true) - const res = await axios.get (`${ API_BASE_URL }/preview/title`, { - params: { url }, - headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') || '' } }) - const data = res.data as { title: string } + const data = await apiGet<{ title: string }> ('/preview/title', { params: { url } }) setTitle (data.title || '') setTitleLoading (false) } @@ -105,11 +100,8 @@ export default (({ user }: Props) => { setThumbnailLoading (true) if (thumbnailPreview) URL.revokeObjectURL (thumbnailPreview) - const res = await axios.get (`${ API_BASE_URL }/preview/thumbnail`, { - params: { url }, - headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') || '' }, - responseType: 'blob' }) - const data = res.data as Blob + const data = await apiGet ('/preview/thumbnail', + { params: { url }, responseType: 'blob' }) const imageURL = URL.createObjectURL (data) setThumbnailPreview (imageURL) setThumbnailFile (new File ([data], diff --git a/frontend/src/pages/tags/NicoTagListPage.tsx b/frontend/src/pages/tags/NicoTagListPage.tsx index c91a7c9..08e485b 100644 --- a/frontend/src/pages/tags/NicoTagListPage.tsx +++ b/frontend/src/pages/tags/NicoTagListPage.tsx @@ -1,5 +1,3 @@ -import axios from 'axios' -import toCamel from 'camelcase-keys' import { useEffect, useRef, useState } from 'react' import { Helmet } from 'react-helmet-async' @@ -8,7 +6,8 @@ import SectionTitle from '@/components/common/SectionTitle' import TextArea from '@/components/common/TextArea' import MainArea from '@/components/layout/MainArea' import { toast } from '@/components/ui/use-toast' -import { API_BASE_URL, SITE_TITLE } from '@/config' +import { SITE_TITLE } from '@/config' +import { apiGet, apiPut } from '@/lib/api' import type { NicoTag, Tag, User } from '@/types' @@ -29,10 +28,8 @@ export default ({ user }: Props) => { const loadMore = async (withCursor: boolean) => { setLoading (true) - const res = await axios.get (`${ API_BASE_URL }/tags/nico`, { - params: { ...(withCursor ? { cursor } : { }) } }) - const data = toCamel (res.data as any, { deep: true }) as { tags: NicoTag[] - nextCursor: string } + const data = await apiGet<{ tags: NicoTag[]; nextCursor: string }> ( + '/tags/nico', { params: withCursor ? { cursor } : { } }) setNicoTags (tags => [...(withCursor ? tags : []), ...data.tags]) setCursor (data.nextCursor) @@ -53,10 +50,8 @@ export default ({ user }: Props) => { const formData = new FormData formData.append ('tags', rawTags[id]) - const res = await axios.put (`${ API_BASE_URL }/tags/nico/${ id }`, formData, { headers: { - 'Content-Type': 'multipart/form-data', - 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) - const data = toCamel (res.data as any, { deep: true }) as Tag[] + const data = await apiPut (`/tags/nico/${ id }`, formData, + { headers: { 'Content-Type': 'multipart/form-data' } }) setNicoTags (nicoTags => { nicoTags.find (t => t.id === id)!.linkedTags = data return [...nicoTags] diff --git a/frontend/src/pages/users/SettingPage.tsx b/frontend/src/pages/users/SettingPage.tsx index d57682e..351f87c 100644 --- a/frontend/src/pages/users/SettingPage.tsx +++ b/frontend/src/pages/users/SettingPage.tsx @@ -1,4 +1,3 @@ -import axios from 'axios' import { useEffect, useState } from 'react' import { Helmet } from 'react-helmet-async' @@ -10,7 +9,8 @@ import InheritDialogue from '@/components/users/InheritDialogue' import UserCodeDialogue from '@/components/users/UserCodeDialogue' import { Button } from '@/components/ui/button' import { toast } from '@/components/ui/use-toast' -import { API_BASE_URL, SITE_TITLE } from '@/config' +import { SITE_TITLE } from '@/config' +import { apiPut } from '@/lib/api' import type { User } from '@/types' @@ -32,10 +32,9 @@ export default ({ user, setUser }: Props) => { try { - const res = await axios.put (`${ API_BASE_URL }/users/${ user.id }`, formData, { - headers: { 'Content-Type': 'multipart/form-data', - 'X-Transfer-Code': localStorage.getItem ('user_code') || '' } }) - const data = res.data as User + const data = await apiPut ( + `/users/${ user.id }`, formData, + { headers: { 'Content-Type': 'multipart/form-data' } }) setUser (user => ({ ...user, ...data })) toast ({ title: '設定を更新しました．' }) } diff --git a/frontend/src/pages/wiki/WikiDiffPage.tsx b/frontend/src/pages/wiki/WikiDiffPage.tsx index e99033b..e386fe6 100644 --- a/frontend/src/pages/wiki/WikiDiffPage.tsx +++ b/frontend/src/pages/wiki/WikiDiffPage.tsx @@ -1,12 +1,11 @@ -import axios from 'axios' -import toCamel from 'camelcase-keys' import { useEffect, useState } from 'react' import { Helmet } from 'react-helmet-async' import { useLocation, useParams } from 'react-router-dom' import PageTitle from '@/components/common/PageTitle' import MainArea from '@/components/layout/MainArea' -import { API_BASE_URL, SITE_TITLE } from '@/config' +import { SITE_TITLE } from '@/config' +import { apiGet } from '@/lib/api' import { cn } from '@/lib/utils' import type { WikiPageDiff } from '@/types' @@ -25,8 +24,7 @@ export default () => { useEffect (() => { void (async () => { - const res = await axios.get (`${ API_BASE_URL }/wiki/${ id }/diff`, { params: { from, to } }) - setDiff (toCamel (res.data as any, { deep: true }) as WikiPageDiff) + setDiff (await apiGet (`/wiki/${ id }/diff`, { params: { from, to } })) }) () }, []) diff --git a/frontend/src/pages/wiki/WikiEditPage.tsx b/frontend/src/pages/wiki/WikiEditPage.tsx index 2bda3be..30ce3b4 100644 --- a/frontend/src/pages/wiki/WikiEditPage.tsx +++ b/frontend/src/pages/wiki/WikiEditPage.tsx @@ -1,4 +1,3 @@ -import axios from 'axios' import MarkdownIt from 'markdown-it' import { useEffect, useState } from 'react' import { Helmet } from 'react-helmet-async' @@ -7,7 +6,8 @@ import { useParams, useNavigate } from 'react-router-dom' import MainArea from '@/components/layout/MainArea' import { toast } from '@/components/ui/use-toast' -import { API_BASE_URL, SITE_TITLE } from '@/config' +import { SITE_TITLE } from '@/config' +import { apiGet, apiPut } from '@/lib/api' import Forbidden from '@/pages/Forbidden' import 'react-markdown-editor-lite/lib/index.css' @@ -40,9 +40,8 @@ export default (({ user }: Props) => { try { - await axios.put (`${ API_BASE_URL }/wiki/${ id }`, formData, { headers: { - 'Content-Type': 'multipart/form-data', - 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) + await apiPut (`/wiki/${ id }`, formData, + { headers: { 'Content-Type': 'multipart/form-data' } }) toast ({ title: '投稿成功!' }) navigate (`/wiki/${ title }`) } @@ -55,8 +54,7 @@ export default (({ user }: Props) => { useEffect (() => { void (async () => { setLoading (true) - const res = await axios.get (`${ API_BASE_URL }/wiki/${ id }`) - const data = res.data as WikiPage + const data = await apiGet (`/wiki/${ id }`) setTitle (data.title) setBody (data.body) setLoading (false) diff --git a/frontend/src/pages/wiki/WikiHistoryPage.tsx b/frontend/src/pages/wiki/WikiHistoryPage.tsx index 5c77387..427217c 100644 --- a/frontend/src/pages/wiki/WikiHistoryPage.tsx +++ b/frontend/src/pages/wiki/WikiHistoryPage.tsx @@ -1,12 +1,11 @@ -import axios from 'axios' -import toCamel from 'camelcase-keys' import { useEffect, useState } from 'react' import { Helmet } from 'react-helmet-async' import { useLocation } from 'react-router-dom' import PrefetchLink from '@/components/PrefetchLink' import MainArea from '@/components/layout/MainArea' -import { API_BASE_URL, SITE_TITLE } from '@/config' +import { SITE_TITLE } from '@/config' +import { apiGet } from '@/lib/api' import type { WikiPageChange } from '@/types' @@ -20,9 +19,7 @@ export default () => { useEffect (() => { void (async () => { - const res = await axios.get (`${ API_BASE_URL }/wiki/changes`, - { params: { ...(id ? { id } : { }) } }) - setChanges (toCamel (res.data as any, { deep: true }) as WikiPageChange[]) + setChanges (await apiGet ('/wiki/changes', { params: id ? { id } : { } })) }) () }, [location.search])