miteruzo/btrc-hub
1
0
Fork 0
Code Issues 69 Pull Requests 1 Releases Wiki Activity

#60

Browse Source
This commit is contained in:
みてるぞ
2025-07-09 06:54:19 +09:00
parent 57f3cf83ae
commit 9be4bb1532
7 changed files with 200 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/controllers/posts_controller.rb
+35 -12
View File
@@ -53,19 +53,30 @@ class PostsController < ApplicationController
# POST /posts
def create
return head :unauthorized unless current_user
return head :forbidden unless ['admin', 'member'].include?(current_user.role)
return head :forbidden unless current_user.member?
# TODO: URL が正規のものがチェック，不正ならエラー
# TODO: title、URL は必須にする．
# TODO: サイトに応じて thumbnail_base 設定
title = params[:title]
post = Post.new(title:, url: params[:url], thumbnail_base: '', uploaded_user: current_user)
post.thumbnail.attach(params[:thumbnail])
url = params[:url]
thumbnail = params[:thumbnail]
tag_names = params[:tags].to_s.split(' ')
if tag_names.size < 20 && tag_names.none?('タグ希望')
tag_names << 'タグ希望'
end
post = Post.new(title:, url:, thumbnail_base: '', uploaded_user: current_user)
post.thumbnail.attach(thumbnail)
if post.save
post.resized_thumbnail!
if params[:tags].present?
tag_ids = JSON.parse(params[:tags])
post.tags = Tag.where(id: tag_ids)
end
render json: post, status: :created
# TODO: 接頭辞に応じて category 変へる
post.tags = tag_names.map { |name| Tag.find_or_initialize_by(name:) { |tag|
tag.category = 'general'
} }
render json: post.as_json(include: { tags: { only: [:id, :name, :category] } }),
status: :created
else
render json: { errors: post.errors.full_messages }, status: :unprocessable_entity
end
@@ -88,11 +99,23 @@ class PostsController < ApplicationController
# PATCH/PUT /posts/1
def update
return head :unauthorized unless current_user
return head :forbidden unless ['admin', 'member'].include?(current_user.role)
return head :forbidden unless current_user.member?
post = Post.find(params[:id])
tag_ids = JSON.parse(params[:tags])
if post.update(title: params[:title], tags: Tag.where(id: tag_ids))
title = params[:title]
tag_names = params[:tags].to_s.split(' ')
if tag_names.size < 20 && tag_names.none?('タグ希望')
tag_names << 'タグ希望'
end
post = Post.find(params[:id].to_i)
tags = post.tags.where(category: 'nico').to_a
tag_names.each do |name|
# TODO: 接頭辞に応じて category 変へる
tags << Tag.find_or_initialize_by(name:) { |tag|
tag.category = 'general'
}
end
if post.update(title:, tags:)
render({ json: (post
.as_json(include: { tags: { only: [:id, :name, :category] } })),
status: :created })
backend/app/models/post.rb
+2
View File
@@ -14,6 +14,8 @@ class Post < ApplicationRecord
Rails.application.routes.url_helpers.rails_blob_url(
thumbnail, only_path: false) :
nil })
rescue
super(options).merge(thumbnail: nil)
end
def resized_thumbnail!
frontend/src/components/PostEditForm.tsx
+14 -31
View File
@@ -1,7 +1,9 @@
import React, { useEffect, useState } from 'react'
import axios from 'axios'
import { API_BASE_URL } from '@/config'
import React, { useEffect, useState } from 'react'
import TextArea from '@/components/common/TextArea'
import { Button } from '@/components/ui/button'
import { API_BASE_URL } from '@/config'
import type { Post, Tag } from '@/types'
@@ -11,29 +13,20 @@ type Props = { post: Post
export default ({ post, onSave }: Props) => {
const [title, setTitle] = useState (post.title)
const [tags, setTags] = useState<Tag[]> ([])
const [tagIds, setTagIds] = useState<number[]> (post.tags.map (t => t.id))
const [tags, setTags] = useState<string> (post.tags
.filter (t => t.category !== 'nico')
.map (t => t.name)
.join (' '))
const handleSubmit = () => {
void (axios.put (`${ API_BASE_URL }/posts/${ post.id }`,
{ title,
tags: JSON.stringify (tagIds) },
const handleSubmit = async () => {
const { data } = await axios.put (`${ API_BASE_URL }/posts/${ post.id }`, { title, tags },
{ headers: { 'Content-Type': 'multipart/form-data',
'X-Transfer-Code': localStorage.getItem ('user_code') || '' } } )
.then (res => {
const newPost: Post = res.data
onSave ({ ...post,
title: newPost.title,
tags: newPost.tags } as Post)
}))
title: data.title,
tags: data.tags } as Post)
}
useEffect (() => {
void (axios.get ('/api/tags')
.then (res => setTags (res.data))
.catch (() => toast ({ title: 'タグ一覧の取得失敗' })))
}, [])
return (
<div className="max-w-xl pt-2 space-y-4">
{/* タイトル */}
@@ -50,18 +43,8 @@ export default ({ post, onSave }: Props) => {
{/* タグ */}
<div>
<label className="block font-semibold">タグ</label>
<select multiple
value={tagIds.map (String)}
onChange={e => {
const values = Array.from (e.target.selectedOptions).map (o => Number (o.value))
setTagIds (values)
}}
className="w-full p-2 border rounded h-32">
{tags.map ((tag: Tag) => (
<option key={tag.id} value={tag.id}>
{tag.name}
</option>))}
</select>
<TextArea value={tags}
onChange={ev => setTags (ev.target.value)} />
</div>
{/* 送信 */}
frontend/src/components/TopNav.tsx
+7 -6
View File
@@ -117,7 +117,7 @@ const TopNav: React.FC = ({ user, setUser }: Props) => {
if (!(wikiId))
return
void ((async () => {
void (async () => {
try
{
const { data: pageData } = await axios.get (`${ API_BASE_URL }/wiki/${ wikiId }`)
@@ -132,14 +132,14 @@ const TopNav: React.FC = ({ user, setUser }: Props) => {
{
setPostCount (0)
}
}) ())
}) ()
}, [wikiId])
return (
<>
<nav className="bg-gray-800 text-white px-3 flex justify-between items-center w-full min-h-[48px]">
<div className="flex items-center gap-2 h-full">
<Link to="/posts" className="mx-4 text-xl font-bold text-orange-500">ぼざクリ タグ広場</Link>
<Link to="/" className="mx-4 text-xl font-bold text-orange-500">ぼざクリ タグ広場</Link>
<MyLink to="/posts" title="広場" />
<MyLink to="/tags" title="タグ" />
<MyLink to="/wiki/ヘルプ:ホーム" base="/wiki" title="Wiki" />
@@ -179,9 +179,10 @@ const TopNav: React.FC = ({ user, setUser }: Props) => {
onFocus={() => setSuggestionsVsbl (true)}
onBlur={() => setSuggestionsVsbl (false)}
onKeyDown={handleKeyDown} /> */}
<Link to="/tags" className={subClass}>タグ</Link>
<Link to="/tags/aliases" className={subClass}>別名タグ</Link>
<Link to="/tags/implications" className={subClass}>上位タグ</Link>
{/* <Link to="/tags" className={subClass}>タグ</Link> */}
{/* <Link to="/tags/aliases" className={subClass}>別名タグ</Link>
<Link to="/tags/implications" className={subClass}>上位タグ</Link> */}
<Link to="/tags/nico" className={subClass}>ニコニコ連携</Link>
<Link to="/wiki/ヘルプ:タグのつけ方" className={subClass}>タグのつけ方</Link>
<Link to="/wiki/ヘルプ:タグ" className={subClass}>ヘルプ</Link>
</div>)
frontend/src/components/common/TextArea.tsx
+10
View File
@@ -0,0 +1,10 @@
import React from 'react'
type Props = { value?: string
onChange?: (event: React.ChangeEvent<HTMLTextAreaElement>) => void }
export default ({ value, onChange }: Props) => (
<textarea className="rounded border w-full p-2 h-32"
value={value}
onChange={onChange} />)
frontend/src/pages/posts/PostDetailPage.tsx
+1 -1
View File
@@ -99,7 +99,7 @@ export default ({ user }: Props) => {
{post.viewed ? '閲覧済' : '未閲覧'}
</Button>
<TabGroup>
{(['admin', 'member'].some (r => r === user.role) && editing) && (
{(['admin', 'member'].some (r => r === user?.role) && editing) && (
<Tab name="編輯">
<PostEditForm post={post}
onSave={newPost => {
frontend/src/pages/posts/PostNewPage.tsx
+16 -36
View File
@@ -7,6 +7,7 @@ import NicoViewer from '@/components/NicoViewer'
import Form from '@/components/common/Form'
import Label from '@/components/common/Label'
import PageTitle from '@/components/common/PageTitle'
import TextArea from '@/components/common/TextArea'
import MainArea from '@/components/layout/MainArea'
import { Button } from '@/components/ui/button'
import { toast } from '@/components/ui/use-toast'
@@ -31,15 +32,15 @@ export default () => {
const [thumbnailPreview, setThumbnailPreview] = useState<string> ('')
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
const [thumbnailLoading, setThumbnailLoading] = useState (false)
const [tags, setTags] = useState<Tag[]> ([])
const [tagIds, setTagIds] = useState<number[]> ([])
const [tags, setTags] = useState ('')
const previousURLRef = useRef ('')
const handleSubmit = () => {
const handleSubmit = async () => {
const formData = new FormData ()
formData.append ('title', title)
formData.append ('url', url)
formData.append ('tags', JSON.stringify (tagIds))
formData.append ('tags', tags)
formData.append ('thumbnail', thumbnailFile)
void (axios.post (`${ API_BASE_URL }/posts`, formData, { headers: {
@@ -53,12 +54,6 @@ export default () => {
description: '入力を確認してください。' })))
}
useEffect (() => {
void (axios.get ('/api/tags')
.then (res => setTags (res.data))
.catch (() => toast ({ title: 'タグ一覧の取得失敗' })))
}, [])
useEffect (() => {
if (titleAutoFlg && url)
fetchTitle ()
@@ -80,38 +75,32 @@ export default () => {
previousURLRef.current = url
}
const fetchTitle = () => {
const fetchTitle = async () => {
setTitle ('')
setTitleLoading (true)
void (axios.get (`${ API_BASE_URL }/preview/title`, {
const { data } = await axios.get (`${ API_BASE_URL }/preview/title`, {
params: { url },
headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') || '' } })
.then (res => {
setTitle (res.data.title || '')
setTitle (data.title || '')
setTitleLoading (false)
})
.finally (() => setTitleLoading (false)))
}
const fetchThumbnail = () => {
const fetchThumbnail = async () => {
setThumbnailPreview ('')
setThumbnailFile (null)
setThumbnailLoading (true)
if (thumbnailPreview)
URL.revokeObjectURL (thumbnailPreview)
void (axios.get (`${ API_BASE_URL }/preview/thumbnail`, {
const { data } = await axios.get (`${ API_BASE_URL }/preview/thumbnail`, {
params: { url },
headers: { 'X-Transfer-Code': localStorage.getItem ('user_code') || '' },
responseType: 'blob' })
.then (res => {
const imageURL = URL.createObjectURL (res.data)
const imageURL = URL.createObjectURL (data)
setThumbnailPreview (imageURL)
setThumbnailFile (new File ([res.data],
setThumbnailFile (new File ([data],
'thumbnail.png',
{ type: res.data.type || 'image/png' }))
{ type: data.type || 'image/png' }))
setThumbnailLoading (false)
})
.finally (() => setThumbnailLoading (false)))
}
return (
@@ -182,20 +171,11 @@ export default () => {
</div>
{/* タグ */}
{/* TextArea で自由形式にする */}
<div>
<Label>タグ</Label>
<select multiple
value={tagIds.map (String)}
onChange={e => {
const values = Array.from (e.target.selectedOptions).map (o => Number (o.value))
setTagIds (values)
}}
className="w-full p-2 border rounded h-32">
{tags.map ((tag: Tag) => (
<option key={tag.id} value={tag.id}>
{tag.name}
</option>))}
</select>
<TextArea value={tags}
onChange={ev => setTags (ev.target.value)} />
</div>
{/* 送信 */}