コミットを比較
1 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
 みてるぞ
|
f0065af00a |
@@ -2,8 +2,8 @@ class TagsController < ApplicationController
|
||||
def index
|
||||
post_id = params[:post]
|
||||
|
||||
name = params[:name].presence
|
||||
category = params[:category].presence
|
||||
name = params[:name].to_s.strip.presence
|
||||
category = params[:category].to_s.strip.presence
|
||||
post_count_between = (params[:post_count_gte].presence || -1).to_i,
|
||||
(params[:post_count_lte].presence || -1).to_i
|
||||
post_count_between[0] = nil if post_count_between[0] < 0
|
||||
@@ -36,7 +36,9 @@ class TagsController < ApplicationController
|
||||
.includes(:tag_name, tag_name: :wiki_page)
|
||||
q = q.where(posts: { id: post_id }) if post_id.present?
|
||||
|
||||
q = q.where('tag_names.name LIKE ?', "%#{ name }%") if name
|
||||
if name
|
||||
q = q.where('tag_names.name LIKE ?', "%#{ ActiveRecord::Base.sanitize_sql_like(name) }%")
|
||||
end
|
||||
q = q.where(category: category) if category
|
||||
q = q.where('tags.post_count >= ?', post_count_between[0]) if post_count_between[0]
|
||||
q = q.where('tags.post_count <= ?', post_count_between[1]) if post_count_between[1]
|
||||
@@ -77,7 +79,7 @@ class TagsController < ApplicationController
|
||||
|
||||
alias_rows =
|
||||
TagName
|
||||
.where('name LIKE ?', "#{ q }%")
|
||||
.where('name LIKE ?', "#{ ActiveRecord::Base.sanitize_sql_like(q) }%")
|
||||
.where.not(canonical_id: nil)
|
||||
.pluck(:canonical_id, :name)
|
||||
|
||||
@@ -97,7 +99,8 @@ class TagsController < ApplicationController
|
||||
base
|
||||
.where(((with_nico ? '(tags.category = ? AND tag_names.name LIKE ?) OR ' : '') +
|
||||
'tag_names.name LIKE ?'),
|
||||
*(with_nico ? ['nico', "nico:#{ q }%"] : []), "#{ q }%")
|
||||
*(with_nico ? ['nico', "nico:#{ ActiveRecord::Base.sanitise_sql_like(q) }%"] : []),
|
||||
"#{ ActiveRecord::Base.sanitise_sql_like(q) }%")
|
||||
|
||||
tags =
|
||||
if canonical_ids.present?
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
require 'digest'
|
||||
|
||||
|
||||
class WikiAssetsController < ApplicationController
|
||||
def index
|
||||
page_id = params[:wiki_page_id].to_i
|
||||
page = WikiPage.find_by(id: page_id)
|
||||
return head :not_found unless page
|
||||
|
||||
render json: page.assets
|
||||
end
|
||||
|
||||
def create
|
||||
return head :unauthorized unless current_user
|
||||
return head :forbidden unless current_user.gte_member?
|
||||
|
||||
wiki_page_id = params[:wiki_page_id].to_i
|
||||
page = WikiPage.find_by(id: wiki_page_id)
|
||||
return head :not_found unless page
|
||||
|
||||
file = params[:file]
|
||||
return head :bad_request if file.blank?
|
||||
|
||||
page.with_lock do
|
||||
no = page.next_asset_no
|
||||
alt_text = params[:alt_text].presence
|
||||
sha256 = Digest::SHA256.file(file.tempfile.path).digest
|
||||
|
||||
asset = WikiAsset.new(wiki_page_id:, no:, alt_text:, sha256:, created_by_user: current_user)
|
||||
asset.file.attach(file)
|
||||
asset.save!
|
||||
|
||||
page.update!(next_asset_no: no + 1)
|
||||
end
|
||||
|
||||
render json: asset.as_json(methods: [:url])
|
||||
end
|
||||
end
|
||||
@@ -96,7 +96,7 @@ class WikiPagesController < ApplicationController
|
||||
message = params[:message].presence
|
||||
Wiki::Commit.content!(page:, body:, created_user: current_user, message:)
|
||||
|
||||
render json: WikiPageRepr.base(page).merge(body:), status: :created
|
||||
render json: WikiPageRepr.base(page), status: :created
|
||||
else
|
||||
render json: { errors: page.errors.full_messages },
|
||||
status: :unprocessable_entity
|
||||
@@ -107,7 +107,7 @@ class WikiPagesController < ApplicationController
|
||||
return head :unauthorized unless current_user
|
||||
return head :forbidden unless current_user.gte_member?
|
||||
|
||||
title = params[:title].to_s.strip
|
||||
title = params[:title]&.strip
|
||||
body = params[:body].to_s
|
||||
|
||||
return head :unprocessable_entity if title.blank? || body.blank?
|
||||
@@ -126,7 +126,7 @@ class WikiPagesController < ApplicationController
|
||||
message:,
|
||||
base_revision_id:)
|
||||
|
||||
render json: WikiPageRepr.base(page).merge(body:)
|
||||
head :ok
|
||||
end
|
||||
|
||||
def search
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
class WikiAsset < ApplicationRecord
|
||||
self.primary_key = :wiki_page_id, :no
|
||||
|
||||
belongs_to :wiki_page
|
||||
belongs_to :created_by_user, class_name: 'User'
|
||||
|
||||
has_one_attached :file
|
||||
|
||||
validates :file, presence: true
|
||||
|
||||
def url
|
||||
Rails.application.routes.url_helpers.rails_blob_url(file, only_path: true)
|
||||
end
|
||||
end
|
||||
@@ -15,8 +15,6 @@ class WikiPage < ApplicationRecord
|
||||
foreign_key: :redirect_page_id,
|
||||
dependent: :nullify
|
||||
|
||||
has_many :assets, class_name: 'WikiAsset', dependent: :destroy
|
||||
|
||||
belongs_to :tag_name
|
||||
validates :tag_name, presence: true
|
||||
|
||||
|
||||
@@ -41,8 +41,6 @@ Rails.application.routes.draw do
|
||||
get :exists
|
||||
get :diff
|
||||
end
|
||||
|
||||
resources :assets, controller: :wiki_assets, only: [:index, :create]
|
||||
end
|
||||
|
||||
resources :posts, only: [:index, :show, :create, :update] do
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
class CreateWikiAssets < ActiveRecord::Migration[8.0]
|
||||
def change
|
||||
create_table :wiki_assets, primary_key: [:wiki_page_id, :no] do |t|
|
||||
t.references :wiki_page, null: false, foreign_key: true, index: false
|
||||
t.integer :no, null: false
|
||||
t.string :alt_text
|
||||
t.column :sha256, 'binary(32)', null: false
|
||||
t.references :created_by_user, null: false, foreign_key: { to_table: :users }
|
||||
t.timestamps
|
||||
end
|
||||
|
||||
add_index :wiki_assets, [:wiki_page_id, :sha256], unique: true
|
||||
|
||||
add_column :wiki_pages, :next_asset_no, :integer, null: false, default: 1
|
||||
end
|
||||
end
|
||||
生成ファイル
+1
-16
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_03_23_192300) do
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_03_17_015000) do
|
||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.string "name", null: false
|
||||
t.string "record_type", null: false
|
||||
@@ -239,18 +239,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_03_23_192300) do
|
||||
t.datetime "updated_at", null: false
|
||||
end
|
||||
|
||||
create_table "wiki_assets", primary_key: ["wiki_page_id", "no"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.bigint "wiki_page_id", null: false
|
||||
t.integer "no", null: false
|
||||
t.string "alt_text"
|
||||
t.binary "sha256", limit: 32, null: false
|
||||
t.bigint "created_by_user_id", null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
|
||||
t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
|
||||
end
|
||||
|
||||
create_table "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.string "sha256", limit: 64, null: false
|
||||
t.text "body", null: false
|
||||
@@ -266,7 +254,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_03_23_192300) do
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.datetime "discarded_at"
|
||||
t.integer "next_asset_no", default: 1, null: false
|
||||
t.index ["created_user_id"], name: "index_wiki_pages_on_created_user_id"
|
||||
t.index ["discarded_at"], name: "index_wiki_pages_on_discarded_at"
|
||||
t.index ["tag_name_id"], name: "index_wiki_pages_on_tag_name_id", unique: true
|
||||
@@ -333,8 +320,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_03_23_192300) do
|
||||
add_foreign_key "user_ips", "users"
|
||||
add_foreign_key "user_post_views", "posts"
|
||||
add_foreign_key "user_post_views", "users"
|
||||
add_foreign_key "wiki_assets", "users", column: "created_by_user_id"
|
||||
add_foreign_key "wiki_assets", "wiki_pages"
|
||||
add_foreign_key "wiki_pages", "tag_names"
|
||||
add_foreign_key "wiki_pages", "users", column: "created_user_id"
|
||||
add_foreign_key "wiki_pages", "users", column: "updated_user_id"
|
||||
|
||||
@@ -1,10 +1,48 @@
|
||||
import WikiMarkdown from '@/components/WikiMarkdown'
|
||||
import { useQuery } from '@tanstack/react-query'
|
||||
import { useMemo } from 'react'
|
||||
import ReactMarkdown from 'react-markdown'
|
||||
import remarkGFM from 'remark-gfm'
|
||||
|
||||
import PrefetchLink from '@/components/PrefetchLink'
|
||||
import SectionTitle from '@/components/common/SectionTitle'
|
||||
import SubsectionTitle from '@/components/common/SubsectionTitle'
|
||||
import { wikiKeys } from '@/lib/queryKeys'
|
||||
import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
|
||||
import { fetchWikiPages } from '@/lib/wiki'
|
||||
|
||||
import type { FC } from 'react'
|
||||
import type { Components } from 'react-markdown'
|
||||
|
||||
type Props = { title: string
|
||||
body?: string }
|
||||
|
||||
const mdComponents = { h1: ({ children }) => <SectionTitle>{children}</SectionTitle>,
|
||||
h2: ({ children }) => <SubsectionTitle>{children}</SubsectionTitle>,
|
||||
ol: ({ children }) => <ol className="list-decimal pl-6">{children}</ol>,
|
||||
ul: ({ children }) => <ul className="list-disc pl-6">{children}</ul>,
|
||||
a: (({ href, children }) => (
|
||||
['/', '.'].some (e => href?.startsWith (e))
|
||||
? <PrefetchLink to={href!}>{children}</PrefetchLink>
|
||||
: (
|
||||
<a href={href}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer">
|
||||
{children}
|
||||
</a>))) } as const satisfies Components
|
||||
|
||||
export default (({ title, body }: Props) =>
|
||||
<WikiMarkdown title={title} body={body ?? ''}/>) satisfies FC<Props>
|
||||
|
||||
export default (({ title, body }: Props) => {
|
||||
const { data } = useQuery ({
|
||||
enabled: Boolean (body),
|
||||
queryKey: wikiKeys.index ({ }),
|
||||
queryFn: () => fetchWikiPages ({ }) })
|
||||
const pageNames = (data ?? []).map (page => page.title).sort ((a, b) => b.length - a.length)
|
||||
|
||||
const remarkPlugins = useMemo (
|
||||
() => [() => remarkWikiAutoLink (pageNames), remarkGFM], [pageNames])
|
||||
|
||||
return (
|
||||
<ReactMarkdown components={mdComponents} remarkPlugins={remarkPlugins}>
|
||||
{body || `このページは存在しません。[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`}
|
||||
</ReactMarkdown>)
|
||||
}) satisfies FC<Props>
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
import { useEffect, useState } from 'react'
|
||||
import MdEditor from 'react-markdown-editor-lite'
|
||||
|
||||
import WikiMarkdown from '@/components/WikiMarkdown'
|
||||
import Label from '@/components/common/Label'
|
||||
import { apiPost } from '@/lib/api'
|
||||
|
||||
import type { FC } from 'react'
|
||||
|
||||
import type { WikiAsset } from '@/types'
|
||||
|
||||
type Props = {
|
||||
title: string
|
||||
body: string
|
||||
onSubmit: (title: string, body: string) => void
|
||||
id?: number | null }
|
||||
|
||||
|
||||
export default (({ title: initTitle, body: initBody, onSubmit, id }: Props) => {
|
||||
const forEdit = id != null
|
||||
|
||||
const [title, setTitle] = useState<string> (initTitle)
|
||||
const [body, setBody] = useState<string> (initBody)
|
||||
|
||||
useEffect (() => {
|
||||
setTitle (initTitle)
|
||||
setBody (initBody)
|
||||
}, [initTitle, initBody])
|
||||
|
||||
const handleImageUpload = async (file: File) => {
|
||||
if (!(forEdit))
|
||||
throw new Error ('画像は Wiki 作成前に追加することができません．')
|
||||
|
||||
const formData = new FormData
|
||||
formData.append ('file', file)
|
||||
|
||||
const asset = await apiPost<WikiAsset> (
|
||||
`/wiki/${ id }/assets`,
|
||||
formData,
|
||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||
|
||||
return `{{img:${ asset.no }}}`
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* タイトル */}
|
||||
{/* TODO: タグ補完 */}
|
||||
<div>
|
||||
<Label>タイトル</Label>
|
||||
<input
|
||||
type="text"
|
||||
value={title}
|
||||
onChange={e => setTitle (e.target.value)}
|
||||
className="w-full border p-2 rounded"/>
|
||||
</div>
|
||||
|
||||
{/* 本文 */}
|
||||
<div>
|
||||
<Label>本文</Label>
|
||||
<MdEditor
|
||||
value={body}
|
||||
style={{ height: '500px' }}
|
||||
renderHTML={text => <WikiMarkdown body={text} preview/>}
|
||||
onChange={({ text }) => setBody (text)}
|
||||
onImageUpload={handleImageUpload}/>
|
||||
</div>
|
||||
|
||||
{/* 送信 */}
|
||||
<button
|
||||
onClick={() => onSubmit (title, body)}
|
||||
className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
|
||||
{forEdit ? '編輯' : '追加'}
|
||||
</button>
|
||||
</>)
|
||||
}) satisfies FC<Props>
|
||||
@@ -1,77 +0,0 @@
|
||||
import { useQuery } from '@tanstack/react-query'
|
||||
import { useMemo } from 'react'
|
||||
import ReactMarkdown from 'react-markdown'
|
||||
import remarkGFM from 'remark-gfm'
|
||||
|
||||
import PrefetchLink from '@/components/PrefetchLink'
|
||||
import SectionTitle from '@/components/common/SectionTitle'
|
||||
import SubsectionTitle from '@/components/common/SubsectionTitle'
|
||||
import { wikiKeys } from '@/lib/queryKeys'
|
||||
import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
|
||||
import { fetchWikiPages } from '@/lib/wiki'
|
||||
|
||||
import type { FC } from 'react'
|
||||
import type { Components } from 'react-markdown'
|
||||
|
||||
type Props = {
|
||||
title?: string
|
||||
body: string
|
||||
preview?: boolean }
|
||||
|
||||
|
||||
const makeComponents = (preview = false) => (
|
||||
{ h1: ({ children }) => <SectionTitle>{children}</SectionTitle>,
|
||||
h2: ({ children }) => <SubsectionTitle>{children}</SubsectionTitle>,
|
||||
ol: ({ children }) => <ol className="list-decimal pl-6">{children}</ol>,
|
||||
ul: ({ children }) => <ul className="list-disc pl-6">{children}</ul>,
|
||||
a: ({ href, children }) => {
|
||||
if (!(href))
|
||||
return <>{children}</>
|
||||
|
||||
if (!(preview) && ['/', '.'].some (e => href.startsWith (e)))
|
||||
return <PrefetchLink to={href}>{children}</PrefetchLink>
|
||||
|
||||
const ext = /^(?:https?:)?\/\//.test (href)
|
||||
|
||||
return (
|
||||
<a href={href}
|
||||
target={ext ? '_blank' : undefined}
|
||||
rel={ext ? 'noopener noreferrer' : undefined}>
|
||||
{children}
|
||||
</a>)
|
||||
},
|
||||
img: (({ src, alt }) => (
|
||||
<img src={src ?? ''}
|
||||
alt={alt ?? ''}
|
||||
className="max-w-full h-auto rounded"/>)),
|
||||
} as const satisfies Components)
|
||||
|
||||
|
||||
export default (({ title, body, preview = false }: Props) => {
|
||||
const { data } = useQuery ({
|
||||
queryKey: wikiKeys.index ({ }),
|
||||
queryFn: () => fetchWikiPages ({ }) })
|
||||
|
||||
const pageNames = useMemo (
|
||||
() => (data ?? []).map ((page) => page.title).sort ((a, b) => b.length - a.length),
|
||||
[data])
|
||||
|
||||
const remarkPlugins = useMemo (
|
||||
() => [() => remarkWikiAutoLink (pageNames), remarkGFM],
|
||||
[pageNames])
|
||||
|
||||
const components = useMemo (
|
||||
() => makeComponents (preview),
|
||||
[preview])
|
||||
|
||||
return (
|
||||
<ReactMarkdown
|
||||
components={components}
|
||||
remarkPlugins={remarkPlugins}>
|
||||
{body
|
||||
|| (title
|
||||
? ('このページは存在しません。'
|
||||
+`[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`)
|
||||
: '')}
|
||||
</ReactMarkdown>)
|
||||
}) satisfies FC<Props>
|
||||
@@ -1,9 +1,10 @@
|
||||
import { useQueryClient } from '@tanstack/react-query'
|
||||
import MarkdownIt from 'markdown-it'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { Helmet } from 'react-helmet-async'
|
||||
import MdEditor from 'react-markdown-editor-lite'
|
||||
import { useParams, useNavigate } from 'react-router-dom'
|
||||
|
||||
import WikiEditForm from '@/components/WikiEditForm'
|
||||
import MainArea from '@/components/layout/MainArea'
|
||||
import { toast } from '@/components/ui/use-toast'
|
||||
import { SITE_TITLE } from '@/config'
|
||||
@@ -17,6 +18,8 @@ import type { FC } from 'react'
|
||||
|
||||
import type { User, WikiPage } from '@/types'
|
||||
|
||||
const mdParser = new MarkdownIt
|
||||
|
||||
type Props = { user: User | null }
|
||||
|
||||
|
||||
@@ -34,7 +37,7 @@ export default (({ user }: Props) => {
|
||||
const [loading, setLoading] = useState (true)
|
||||
const [title, setTitle] = useState ('')
|
||||
|
||||
const handleSubmit = async (title: string, body: string) => {
|
||||
const handleSubmit = async () => {
|
||||
const formData = new FormData ()
|
||||
formData.append ('title', title)
|
||||
formData.append ('body', body)
|
||||
@@ -43,6 +46,8 @@ export default (({ user }: Props) => {
|
||||
{
|
||||
await apiPut (`/wiki/${ id }`, formData,
|
||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||
qc.setQueryData (wikiKeys.show (title, { }),
|
||||
(prev: WikiPage) => ({ ...prev, title, body }))
|
||||
qc.invalidateQueries ({ queryKey: wikiKeys.root })
|
||||
toast ({ title: '投稿成功!' })
|
||||
navigate (`/wiki/${ title }`)
|
||||
@@ -72,11 +77,32 @@ export default (({ user }: Props) => {
|
||||
<h1 className="text-2xl font-bold mb-2">Wiki ページを編輯</h1>
|
||||
|
||||
{loading ? 'Loading...' : (
|
||||
<WikiEditForm
|
||||
title={title}
|
||||
body={body}
|
||||
onSubmit={handleSubmit}
|
||||
id={Number (id)}/>)}
|
||||
<>
|
||||
{/* タイトル */}
|
||||
{/* TODO: タグ補完 */}
|
||||
<div>
|
||||
<label className="block font-semibold mb-1">タイトル</label>
|
||||
<input type="text"
|
||||
value={title}
|
||||
onChange={e => setTitle (e.target.value)}
|
||||
className="w-full border p-2 rounded"/>
|
||||
</div>
|
||||
|
||||
{/* 本文 */}
|
||||
<div>
|
||||
<label className="block font-semibold mb-1">本文</label>
|
||||
<MdEditor value={body}
|
||||
style={{ height: '500px' }}
|
||||
renderHTML={text => mdParser.render (text)}
|
||||
onChange={({ text }) => setBody (text)}/>
|
||||
</div>
|
||||
|
||||
{/* 送信 */}
|
||||
<button onClick={handleSubmit}
|
||||
className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
|
||||
編輯
|
||||
</button>
|
||||
</>)}
|
||||
</div>
|
||||
</MainArea>)
|
||||
}) satisfies FC<Props>
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
import { useQueryClient } from '@tanstack/react-query'
|
||||
import MarkdownIt from 'markdown-it'
|
||||
import { useState } from 'react'
|
||||
import { Helmet } from 'react-helmet-async'
|
||||
import MdEditor from 'react-markdown-editor-lite'
|
||||
import { useLocation, useNavigate } from 'react-router-dom'
|
||||
|
||||
import WikiEditForm from '@/components/WikiEditForm'
|
||||
import MainArea from '@/components/layout/MainArea'
|
||||
import { toast } from '@/components/ui/use-toast'
|
||||
import { SITE_TITLE } from '@/config'
|
||||
import { apiPost } from '@/lib/api'
|
||||
import { wikiKeys } from '@/lib/queryKeys'
|
||||
import Forbidden from '@/pages/Forbidden'
|
||||
|
||||
import 'react-markdown-editor-lite/lib/index.css'
|
||||
|
||||
import type { User, WikiPage } from '@/types'
|
||||
|
||||
const mdParser = new MarkdownIt
|
||||
|
||||
type Props = { user: User | null }
|
||||
|
||||
|
||||
@@ -24,12 +26,13 @@ export default ({ user }: Props) => {
|
||||
const location = useLocation ()
|
||||
const navigate = useNavigate ()
|
||||
|
||||
const qc = useQueryClient ()
|
||||
|
||||
const query = new URLSearchParams (location.search)
|
||||
const titleQuery = query.get ('title') ?? ''
|
||||
|
||||
const handleSubmit = async (title: string, body: string) => {
|
||||
const [title, setTitle] = useState (titleQuery)
|
||||
const [body, setBody] = useState ('')
|
||||
|
||||
const handleSubmit = async () => {
|
||||
const formData = new FormData
|
||||
formData.append ('title', title)
|
||||
formData.append ('body', body)
|
||||
@@ -37,8 +40,7 @@ export default ({ user }: Props) => {
|
||||
try
|
||||
{
|
||||
const data = await apiPost<WikiPage> ('/wiki', formData,
|
||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||
qc.invalidateQueries ({ queryKey: wikiKeys.root })
|
||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||
toast ({ title: '投稿成功!' })
|
||||
navigate (`/wiki/${ data.title }`)
|
||||
}
|
||||
@@ -56,10 +58,30 @@ export default ({ user }: Props) => {
|
||||
<div className="max-w-xl mx-auto p-4 space-y-4">
|
||||
<h1 className="text-2xl font-bold mb-2">新規 Wiki ページ</h1>
|
||||
|
||||
<WikiEditForm
|
||||
title={titleQuery}
|
||||
body=""
|
||||
onSubmit={handleSubmit}/>
|
||||
{/* タイトル */}
|
||||
{/* TODO: タグ補完 */}
|
||||
<div>
|
||||
<label className="block font-semibold mb-1">タイトル</label>
|
||||
<input type="text"
|
||||
value={title}
|
||||
onChange={e => setTitle (e.target.value)}
|
||||
className="w-full border p-2 rounded"/>
|
||||
</div>
|
||||
|
||||
{/* 本文 */}
|
||||
<div>
|
||||
<label className="block font-semibold mb-1">本文</label>
|
||||
<MdEditor value={body}
|
||||
style={{ height: '500px' }}
|
||||
renderHTML={text => mdParser.render (text)}
|
||||
onChange={({ text }) => setBody (text)}/>
|
||||
</div>
|
||||
|
||||
{/* 送信 */}
|
||||
<button onClick={handleSubmit}
|
||||
className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
|
||||
追加
|
||||
</button>
|
||||
</div>
|
||||
</MainArea>)
|
||||
}
|
||||
|
||||
@@ -149,11 +149,6 @@ export type User = {
|
||||
|
||||
export type ViewFlagBehavior = typeof ViewFlagBehavior[keyof typeof ViewFlagBehavior]
|
||||
|
||||
export type WikiAsset = {
|
||||
wikiPageId: number
|
||||
no: number
|
||||
url: string }
|
||||
|
||||
export type WikiPage = {
|
||||
id: number
|
||||
title: string
|
||||
|
||||
新しい課題から参照
ユーザをブロックする