#140

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<Blob> ('/preview/thumbnail',
+				     { params: { url }, responseType: 'blob' })
     const imageURL = URL.createObjectURL (data)
     setThumbnailPreview (imageURL)
     setThumbnailFile (new File ([data],

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<Tag[]> (`/tags/nico/${ id }`, formData,
+				    { headers: { 'Content-Type': 'multipart/form-data' } })
 	setNicoTags (nicoTags => {
 	  nicoTags.find (t => t.id === id)!.linkedTags = data
 	  return [...nicoTags]

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<User> (
+	  `/users/${ user.id }`, formData,
+	  { headers: { 'Content-Type': 'multipart/form-data' } })
       setUser (user => ({ ...user, ...data }))
       toast ({ title: '設定を更新しました．' })
     }

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<WikiPageDiff> (`/wiki/${ id }/diff`, { params: { from, to } }))
     }) ()
   }, [])
 

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<WikiPage> (`/wiki/${ id }`)
       setTitle (data.title)
       setBody (data.body)
       setLoading (false)

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<WikiPageChange[]> ('/wiki/changes', { params: id ? { id } : { } }))
     }) ()
   }, [location.search])