Auto stash before merge of "dev" and "origin/dev"
This commit is contained in:
parent
5be1561373
commit
5a043c0570
@ -1,10 +1,7 @@
|
||||
import Hero from '@/components/Hero'
|
||||
import Archive from '@/components/community/Archive'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function CommunityArchivePage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Archive />
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
import Faq from '@/components/community/Faq'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function CommunityFaqPage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Faq />
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
import Notice from '@/components/community/Notice'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function CommunityNoticePage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Notice />
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
import Hero from '@/components/Hero'
|
||||
import InitSettingsModal from '@/components/InitSettingsModal'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function InitSettingsModalPage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Hero title="Basic Settings" />
|
||||
|
||||
@ -2,8 +2,6 @@ import Intro from '@/components/Intro'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function IntroPage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="container mx-auto p-4 m-4 border">
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
import Hero from '@/components/Hero'
|
||||
import Plan from '@/components/management/Plan'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function ManagementPlanPage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Hero title="도면관리" />
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
import Hero from '@/components/Hero'
|
||||
import Company from '@/components/master/Company'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function MasterCompanyPage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Hero title="회사정보 조회" />
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
import Hero from '@/components/Hero'
|
||||
import Price from '@/components/master/Price'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function MasterPricePage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Hero title="가격 마스터 조회" />
|
||||
|
||||
@ -1,14 +1,6 @@
|
||||
import Playground from '@/components/Playground'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function PlaygroundPage() {
|
||||
// const { session } = await checkSession()
|
||||
|
||||
// if (!session.isLoggedIn) {
|
||||
// redirect('/login')
|
||||
// }
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Playground />
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
import Hero from '@/components/Hero'
|
||||
import Roof from '@/components/Roof'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function RoofPage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Hero title="Drawing on canvas 2D Roof" />
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
import Hero from '@/components/Hero'
|
||||
import Settings from '@/components/Settings'
|
||||
import { initCheck } from '@/util/session-util'
|
||||
|
||||
export default async function SettingsPage() {
|
||||
await initCheck()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Hero title="Canvas Setting" />
|
||||
|
||||
@ -1,43 +1,43 @@
|
||||
'use server'
|
||||
|
||||
import { PrismaClient } from '@prisma/client'
|
||||
// import { PrismaClient } from '@prisma/client'
|
||||
import fs from 'fs/promises'
|
||||
|
||||
const prisma = new PrismaClient()
|
||||
// const prisma = new PrismaClient()
|
||||
const imagePath = 'public/canvasState'
|
||||
|
||||
export const getTests = () => {
|
||||
return prisma.test.findMany()
|
||||
}
|
||||
// export const getTests = () => {
|
||||
// return prisma.test.findMany()
|
||||
// }
|
||||
|
||||
export const insertTest = async (param) => {
|
||||
return prisma.test.create({
|
||||
data: {
|
||||
content: param,
|
||||
},
|
||||
})
|
||||
}
|
||||
// export const insertTest = async (param) => {
|
||||
// return prisma.test.create({
|
||||
// data: {
|
||||
// content: param,
|
||||
// },
|
||||
// })
|
||||
// }
|
||||
|
||||
export const getCanvasStateAll = () => {
|
||||
return prisma.canvas.findMany()
|
||||
}
|
||||
// export const getCanvasStateAll = () => {
|
||||
// return prisma.canvas.findMany()
|
||||
// }
|
||||
|
||||
export const getCanvasState = () => {
|
||||
return prisma.canvas.findFirst({
|
||||
where: {
|
||||
loginId: 'test',
|
||||
},
|
||||
orderBy: {
|
||||
id: 'desc',
|
||||
},
|
||||
})
|
||||
}
|
||||
// export const getCanvasState = () => {
|
||||
// return prisma.canvas.findFirst({
|
||||
// where: {
|
||||
// loginId: 'test',
|
||||
// },
|
||||
// orderBy: {
|
||||
// id: 'desc',
|
||||
// },
|
||||
// })
|
||||
// }
|
||||
|
||||
export const insertCanvasState = (param) => {
|
||||
return prisma.canvas.create({
|
||||
data: param,
|
||||
})
|
||||
}
|
||||
// export const insertCanvasState = (param) => {
|
||||
// return prisma.canvas.create({
|
||||
// data: param,
|
||||
// })
|
||||
// }
|
||||
|
||||
export const writeImage = async (title, data) => {
|
||||
// 해당 경로에 Directory 가 없다면 생성
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user