Auto stash before merge of "dev" and "origin/dev"

This commit is contained in:
yoosangwook 2024-10-21 17:09:23 +09:00
parent 5be1561373
commit 5a043c0570
12 changed files with 30 additions and 67 deletions

View File

@ -1,10 +1,7 @@
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Archive from '@/components/community/Archive' import Archive from '@/components/community/Archive'
import { initCheck } from '@/util/session-util'
export default async function CommunityArchivePage() { export default async function CommunityArchivePage() {
await initCheck()
return ( return (
<> <>
<Archive /> <Archive />

View File

@ -1,9 +1,6 @@
import Faq from '@/components/community/Faq' import Faq from '@/components/community/Faq'
import { initCheck } from '@/util/session-util'
export default async function CommunityFaqPage() { export default async function CommunityFaqPage() {
await initCheck()
return ( return (
<> <>
<Faq /> <Faq />

View File

@ -1,9 +1,6 @@
import Notice from '@/components/community/Notice' import Notice from '@/components/community/Notice'
import { initCheck } from '@/util/session-util'
export default async function CommunityNoticePage() { export default async function CommunityNoticePage() {
await initCheck()
return ( return (
<> <>
<Notice /> <Notice />

View File

@ -1,10 +1,7 @@
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import InitSettingsModal from '@/components/InitSettingsModal' import InitSettingsModal from '@/components/InitSettingsModal'
import { initCheck } from '@/util/session-util'
export default async function InitSettingsModalPage() { export default async function InitSettingsModalPage() {
await initCheck()
return ( return (
<> <>
<Hero title="Basic Settings" /> <Hero title="Basic Settings" />

View File

@ -2,8 +2,6 @@ import Intro from '@/components/Intro'
import { initCheck } from '@/util/session-util' import { initCheck } from '@/util/session-util'
export default async function IntroPage() { export default async function IntroPage() {
await initCheck()
return ( return (
<> <>
<div className="container mx-auto p-4 m-4 border"> <div className="container mx-auto p-4 m-4 border">

View File

@ -1,10 +1,7 @@
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Plan from '@/components/management/Plan' import Plan from '@/components/management/Plan'
import { initCheck } from '@/util/session-util'
export default async function ManagementPlanPage() { export default async function ManagementPlanPage() {
await initCheck()
return ( return (
<> <>
<Hero title="도면관리" /> <Hero title="도면관리" />

View File

@ -1,10 +1,7 @@
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Company from '@/components/master/Company' import Company from '@/components/master/Company'
import { initCheck } from '@/util/session-util'
export default async function MasterCompanyPage() { export default async function MasterCompanyPage() {
await initCheck()
return ( return (
<> <>
<Hero title="회사정보 조회" /> <Hero title="회사정보 조회" />

View File

@ -1,10 +1,7 @@
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Price from '@/components/master/Price' import Price from '@/components/master/Price'
import { initCheck } from '@/util/session-util'
export default async function MasterPricePage() { export default async function MasterPricePage() {
await initCheck()
return ( return (
<> <>
<Hero title="가격 마스터 조회" /> <Hero title="가격 마스터 조회" />

View File

@ -1,14 +1,6 @@
import Playground from '@/components/Playground' import Playground from '@/components/Playground'
import { initCheck } from '@/util/session-util'
export default async function PlaygroundPage() { export default async function PlaygroundPage() {
// const { session } = await checkSession()
// if (!session.isLoggedIn) {
// redirect('/login')
// }
await initCheck()
return ( return (
<> <>
<Playground /> <Playground />

View File

@ -1,10 +1,7 @@
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Roof from '@/components/Roof' import Roof from '@/components/Roof'
import { initCheck } from '@/util/session-util'
export default async function RoofPage() { export default async function RoofPage() {
await initCheck()
return ( return (
<> <>
<Hero title="Drawing on canvas 2D Roof" /> <Hero title="Drawing on canvas 2D Roof" />

View File

@ -1,10 +1,7 @@
import Hero from '@/components/Hero' import Hero from '@/components/Hero'
import Settings from '@/components/Settings' import Settings from '@/components/Settings'
import { initCheck } from '@/util/session-util'
export default async function SettingsPage() { export default async function SettingsPage() {
await initCheck()
return ( return (
<> <>
<Hero title="Canvas Setting" /> <Hero title="Canvas Setting" />

View File

@ -1,43 +1,43 @@
'use server' 'use server'
import { PrismaClient } from '@prisma/client' // import { PrismaClient } from '@prisma/client'
import fs from 'fs/promises' import fs from 'fs/promises'
const prisma = new PrismaClient() // const prisma = new PrismaClient()
const imagePath = 'public/canvasState' const imagePath = 'public/canvasState'
export const getTests = () => { // export const getTests = () => {
return prisma.test.findMany() // return prisma.test.findMany()
} // }
export const insertTest = async (param) => { // export const insertTest = async (param) => {
return prisma.test.create({ // return prisma.test.create({
data: { // data: {
content: param, // content: param,
}, // },
}) // })
} // }
export const getCanvasStateAll = () => { // export const getCanvasStateAll = () => {
return prisma.canvas.findMany() // return prisma.canvas.findMany()
} // }
export const getCanvasState = () => { // export const getCanvasState = () => {
return prisma.canvas.findFirst({ // return prisma.canvas.findFirst({
where: { // where: {
loginId: 'test', // loginId: 'test',
}, // },
orderBy: { // orderBy: {
id: 'desc', // id: 'desc',
}, // },
}) // })
} // }
export const insertCanvasState = (param) => { // export const insertCanvasState = (param) => {
return prisma.canvas.create({ // return prisma.canvas.create({
data: param, // data: param,
}) // })
} // }
export const writeImage = async (title, data) => { export const writeImage = async (title, data) => {
// 해당 경로에 Directory 가 없다면 생성 // 해당 경로에 Directory 가 없다면 생성