260807_01_ENH: tailwind 기반으로 수정중
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -28,4 +28,6 @@ dist-ssr
|
|||||||
pnpm-lock.yaml
|
pnpm-lock.yaml
|
||||||
package-lock.json
|
package-lock.json
|
||||||
yarn.lock
|
yarn.lock
|
||||||
tsconfig.node.tsbuildinfo
|
tsconfig.node.tsbuildinfo
|
||||||
|
|
||||||
|
build/*
|
||||||
10
package.json
10
package.json
@@ -3,17 +3,21 @@
|
|||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@radix-ui/react-slot": "^1.2.4",
|
||||||
"@testing-library/jest-dom": "5.16.1",
|
"@testing-library/jest-dom": "5.16.1",
|
||||||
"@testing-library/react": "12.1.2",
|
"@testing-library/react": "12.1.2",
|
||||||
"@testing-library/user-event": "13.5.0",
|
"@testing-library/user-event": "13.5.0",
|
||||||
"axios": "0.27.2",
|
"axios": "0.27.2",
|
||||||
"chart.js": "3.9.1",
|
"chart.js": "3.9.1",
|
||||||
"chartjs-plugin-zoom": "1.2.1",
|
"chartjs-plugin-zoom": "1.2.1",
|
||||||
|
"class-variance-authority": "^0.7.1",
|
||||||
|
"clsx": "^2.1.1",
|
||||||
"cors": "2.8.5",
|
"cors": "2.8.5",
|
||||||
"echarts": "5.4.0",
|
"echarts": "5.4.0",
|
||||||
"echarts-for-react": "3.0.2",
|
"echarts-for-react": "3.0.2",
|
||||||
"express": "4.18.1",
|
"express": "4.18.1",
|
||||||
"immutability-helper": "3.1.1",
|
"immutability-helper": "3.1.1",
|
||||||
|
"lucide-react": "^1.16.0",
|
||||||
"mssql": "7.3.5",
|
"mssql": "7.3.5",
|
||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
"react-beautiful-dnd": "13.1.0",
|
"react-beautiful-dnd": "13.1.0",
|
||||||
@@ -36,6 +40,7 @@
|
|||||||
"semantic-ui-css": "2.5.0",
|
"semantic-ui-css": "2.5.0",
|
||||||
"semantic-ui-react": "2.1.5",
|
"semantic-ui-react": "2.1.5",
|
||||||
"slick-carousel": "1.8.1",
|
"slick-carousel": "1.8.1",
|
||||||
|
"tailwind-merge": "^3.6.0",
|
||||||
"web-vitals": "2.1.4"
|
"web-vitals": "2.1.4"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -63,6 +68,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"ajv": "8.18.0"
|
"ajv": "8.18.0",
|
||||||
|
"autoprefixer": "^10.4.27",
|
||||||
|
"postcss": "^8.5.8",
|
||||||
|
"tailwindcss": "^3.4.19"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
6
postcss.config.js
Normal file
6
postcss.config.js
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
module.exports = {
|
||||||
|
plugins: {
|
||||||
|
tailwindcss: {},
|
||||||
|
autoprefixer: {},
|
||||||
|
},
|
||||||
|
};
|
||||||
51
src/components/ui/button.js
Normal file
51
src/components/ui/button.js
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { Slot } from "@radix-ui/react-slot";
|
||||||
|
import { cva } from "class-variance-authority";
|
||||||
|
|
||||||
|
import { cn } from "../../lib/utils";
|
||||||
|
|
||||||
|
const buttonVariants = cva(
|
||||||
|
"kart-ui inline-flex w-auto min-w-0 m-0 shrink-0 items-center justify-center gap-2 whitespace-nowrap border border-transparent text-center font-bold leading-none outline-none transition-colors focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
|
||||||
|
{
|
||||||
|
variants: {
|
||||||
|
variant: {
|
||||||
|
default: "rounded-pill bg-primary text-primary-foreground hover:bg-primary/90",
|
||||||
|
secondary: "rounded-pill bg-secondary text-muted-foreground hover:bg-secondary/80",
|
||||||
|
outline: "rounded-pill border-border bg-white text-primary hover:bg-muted",
|
||||||
|
ghost: "bg-transparent text-foreground hover:bg-muted",
|
||||||
|
square: "rounded bg-primary text-primary-foreground hover:bg-primary/90",
|
||||||
|
soft: "rounded bg-muted text-muted-foreground hover:bg-border",
|
||||||
|
destructive: "rounded bg-destructive text-destructive-foreground hover:bg-destructive/90",
|
||||||
|
icon: "rounded border-border bg-white text-muted-foreground hover:bg-muted",
|
||||||
|
},
|
||||||
|
size: {
|
||||||
|
default: "h-7 px-4 text-sm",
|
||||||
|
sm: "h-7 px-3 text-xs",
|
||||||
|
md: "h-9 px-4 text-sm",
|
||||||
|
lg: "h-[50px] px-5 text-base",
|
||||||
|
icon: "h-9 w-9 p-0",
|
||||||
|
legacy: "h-7 w-[113px] px-3 text-sm",
|
||||||
|
wide: "h-[50px] w-[156px] px-5 text-base",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
defaultVariants: {
|
||||||
|
variant: "default",
|
||||||
|
size: "default",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
const Button = React.forwardRef(({ className, variant, size, asChild = false, ...props }, ref) => {
|
||||||
|
const Comp = asChild ? Slot : "button";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Comp
|
||||||
|
className={cn(buttonVariants({ variant, size, className }))}
|
||||||
|
ref={ref}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
Button.displayName = "Button";
|
||||||
|
|
||||||
|
export { Button, buttonVariants };
|
||||||
1
src/components/ui/index.js
Normal file
1
src/components/ui/index.js
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { Button, buttonVariants } from "./button";
|
||||||
6
src/lib/utils.js
Normal file
6
src/lib/utils.js
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { clsx } from "clsx";
|
||||||
|
import { twMerge } from "tailwind-merge";
|
||||||
|
|
||||||
|
export function cn(...inputs) {
|
||||||
|
return twMerge(clsx(inputs));
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
70
src/resources/css/global.css
Normal file
70
src/resources/css/global.css
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
@tailwind base;
|
||||||
|
@tailwind components;
|
||||||
|
@tailwind utilities;
|
||||||
|
|
||||||
|
@layer base {
|
||||||
|
:root {
|
||||||
|
--background: 0 0% 96%;
|
||||||
|
--foreground: 0 0% 10%;
|
||||||
|
--card: 0 0% 100%;
|
||||||
|
--card-foreground: 0 0% 10%;
|
||||||
|
--popover: 0 0% 100%;
|
||||||
|
--popover-foreground: 0 0% 10%;
|
||||||
|
--primary: 162 72% 40%;
|
||||||
|
--primary-foreground: 0 0% 100%;
|
||||||
|
--secondary: 0 0% 96%;
|
||||||
|
--secondary-foreground: 0 0% 40%;
|
||||||
|
--muted: 0 0% 96%;
|
||||||
|
--muted-foreground: 0 0% 62%;
|
||||||
|
--accent: 80 60% 81%;
|
||||||
|
--accent-foreground: 0 0% 10%;
|
||||||
|
--destructive: 8 100% 63%;
|
||||||
|
--destructive-foreground: 0 0% 100%;
|
||||||
|
--border: 0 0% 88%;
|
||||||
|
--input: 0 0% 88%;
|
||||||
|
--ring: 162 72% 40%;
|
||||||
|
--radius: 4px;
|
||||||
|
--radius-card: 15px;
|
||||||
|
--radius-pill: 52px;
|
||||||
|
--header-height: 64px;
|
||||||
|
--titlebar-height: 80px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@layer components {
|
||||||
|
.kart-ui,
|
||||||
|
.kart-ui * {
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
button.kart-ui {
|
||||||
|
width: auto;
|
||||||
|
min-width: 0;
|
||||||
|
height: auto;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
background: transparent;
|
||||||
|
color: inherit;
|
||||||
|
font: inherit;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
a.kart-ui {
|
||||||
|
display: inline-flex;
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
input.kart-ui,
|
||||||
|
select.kart-ui,
|
||||||
|
textarea.kart-ui {
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
|
border: 0;
|
||||||
|
background: transparent;
|
||||||
|
color: inherit;
|
||||||
|
font: inherit;
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -155,7 +155,7 @@ button {
|
|||||||
background: #fff url(../images/ic_bookmark_14.png) no-repeat left 16px center/11px 14px;
|
background: #fff url(../images/ic_bookmark_14.png) no-repeat left 16px center/11px 14px;
|
||||||
padding-left: 21px;
|
padding-left: 21px;
|
||||||
}
|
}
|
||||||
.rt03 .statistic_wrap .round_btn {
|
.page-tabulation .statistic_wrap .round_btn {
|
||||||
color: #17BBB0;
|
color: #17BBB0;
|
||||||
background: #fff url(../images/ic_plus.png) no-repeat left 20px center/12px;
|
background: #fff url(../images/ic_plus.png) no-repeat left 20px center/12px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,6 @@
|
|||||||
@charset "utf-8";
|
@charset "utf-8";
|
||||||
@import url(reset.css);
|
@import url(reset.css);
|
||||||
@import url("https://cdn.jsdelivr.net/npm/semantic-ui/dist/semantic.min.css");
|
@import url("~semantic-ui-css/semantic.min.css");
|
||||||
@import url(custom.css);
|
@import url(custom.css);
|
||||||
@import url(media.css);
|
@import url(media.css);
|
||||||
|
@import url(global.css);
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ const Main = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section id="main" className="main">
|
<section id="main" className="page-overview">
|
||||||
{specialEffect}
|
{specialEffect}
|
||||||
<div className="wrap">
|
<div className="wrap">
|
||||||
<div className="chart_wrap">
|
<div className="chart_wrap">
|
||||||
|
|||||||
@@ -371,7 +371,7 @@ const Derived = (props) => {
|
|||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
{saveMutation.isLoading?<QueryLoading/>:null}
|
{saveMutation.isLoading?<QueryLoading/>:null}
|
||||||
<section id="main" className="rt02 rt05" style={isMobile?{display:'flex',justifyContent:'center',alignItems:'center',height:'80vh'}:{}}>
|
<section id="main" className="page-report page-derived" style={isMobile?{display:'flex',justifyContent:'center',alignItems:'center',height:'80vh'}:{}}>
|
||||||
{isMobile?
|
{isMobile?
|
||||||
<Icon src="icon_pc"/>
|
<Icon src="icon_pc"/>
|
||||||
:
|
:
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ const Exim = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{dataMutation.isLoading || guideMutation.isLoading || dataFormMutation.isLoading || questionFormMutation.isLoading || titleMutation.isLoading || importLoading?<QueryLoading/>:null}
|
{dataMutation.isLoading || guideMutation.isLoading || dataFormMutation.isLoading || questionFormMutation.isLoading || titleMutation.isLoading || importLoading?<QueryLoading/>:null}
|
||||||
<section id="main" className="rt02 rt06" style={isMobile?{display:'flex',justifyContent:'center',alignItems:'center',height:'80vh'}:{}}>
|
<section id="main" className="page-report page-exim" style={isMobile?{display:'flex',justifyContent:'center',alignItems:'center',height:'80vh'}:{}}>
|
||||||
{isMobile?
|
{isMobile?
|
||||||
<Icon src="icon_pc"/>
|
<Icon src="icon_pc"/>
|
||||||
:
|
:
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ const Crosstab = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<section id="main" className="rt02 rt04 dropped drop_table mob dropped_word">
|
<section id="main" className="page-report page-crosstab page-tabbed-report dropped drop_table mob dropped_word">
|
||||||
<div className="tab_container">
|
<div className="tab_container">
|
||||||
<BookmarkList page={'crosstab'} isMobile={isMobile} setSelectedBookMark={setSelectedBookMark} isViewBookMark={isViewBookMark} selectedBookMark={selectedBookMark}/>
|
<BookmarkList page={'crosstab'} isMobile={isMobile} setSelectedBookMark={setSelectedBookMark} isViewBookMark={isViewBookMark} selectedBookMark={selectedBookMark}/>
|
||||||
{isMobile===false?
|
{isMobile===false?
|
||||||
@@ -491,4 +491,4 @@ const Crosstab = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Crosstab;
|
export default Crosstab;
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ const Current = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{dayFetching || typeFetching || loiFetching || screenFetching?<QueryLoading/>:null}
|
{dayFetching || typeFetching || loiFetching || screenFetching?<QueryLoading/>:null}
|
||||||
<section id="main" className="rt01" onMouseUp={(e)=>{setDataDate()}} >
|
<section id="main" className="page-current" onMouseUp={(e)=>{setDataDate()}} >
|
||||||
<div className="wrap">
|
<div className="wrap">
|
||||||
<div className="chart_wrap">
|
<div className="chart_wrap">
|
||||||
<div className="chart_flex_box">
|
<div className="chart_flex_box">
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ const Quota = () => {
|
|||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
{setExportMutation.isLoading || exportMutation.isLoading?<QueryLoading/>:null}
|
{setExportMutation.isLoading || exportMutation.isLoading?<QueryLoading/>:null}
|
||||||
<section id="main" className="rt02">
|
<section id="main" className="page-report page-quota">
|
||||||
<div className="wrap">
|
<div className="wrap">
|
||||||
<div className="data_wrap">
|
<div className="data_wrap">
|
||||||
<LeftToggleBox leftToggle={leftToggle} setLeftToggle={setLeftToggle}/>
|
<LeftToggleBox leftToggle={leftToggle} setLeftToggle={setLeftToggle}/>
|
||||||
@@ -216,4 +216,4 @@ const Quota = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Quota;
|
export default Quota;
|
||||||
|
|||||||
@@ -343,7 +343,7 @@ const Tabulation = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<section id="main" className="rt02 rt03 rt04 dropped drop_table dropped_word" style={isMobile?{display:'flex',justifyContent:'center',alignItems:'center',height:'80vh'}:{}}>
|
<section id="main" className="page-report page-tabulation page-tabbed-report dropped drop_table dropped_word" style={isMobile?{display:'flex',justifyContent:'center',alignItems:'center',height:'80vh'}:{}}>
|
||||||
{
|
{
|
||||||
isMobile?
|
isMobile?
|
||||||
<Icon src="icon_pc"/>
|
<Icon src="icon_pc"/>
|
||||||
|
|||||||
59
tailwind.config.js
Normal file
59
tailwind.config.js
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
/** @type {import('tailwindcss').Config} */
|
||||||
|
module.exports = {
|
||||||
|
darkMode: ["class"],
|
||||||
|
content: ["./public/index.html", "./src/**/*.{js,jsx,ts,tsx}"],
|
||||||
|
corePlugins: {
|
||||||
|
preflight: false,
|
||||||
|
container: false,
|
||||||
|
},
|
||||||
|
theme: {
|
||||||
|
extend: {
|
||||||
|
colors: {
|
||||||
|
border: "hsl(var(--border))",
|
||||||
|
input: "hsl(var(--input))",
|
||||||
|
ring: "hsl(var(--ring))",
|
||||||
|
background: "hsl(var(--background))",
|
||||||
|
foreground: "hsl(var(--foreground))",
|
||||||
|
primary: {
|
||||||
|
DEFAULT: "hsl(var(--primary))",
|
||||||
|
foreground: "hsl(var(--primary-foreground))",
|
||||||
|
},
|
||||||
|
secondary: {
|
||||||
|
DEFAULT: "hsl(var(--secondary))",
|
||||||
|
foreground: "hsl(var(--secondary-foreground))",
|
||||||
|
},
|
||||||
|
destructive: {
|
||||||
|
DEFAULT: "hsl(var(--destructive))",
|
||||||
|
foreground: "hsl(var(--destructive-foreground))",
|
||||||
|
},
|
||||||
|
muted: {
|
||||||
|
DEFAULT: "hsl(var(--muted))",
|
||||||
|
foreground: "hsl(var(--muted-foreground))",
|
||||||
|
},
|
||||||
|
accent: {
|
||||||
|
DEFAULT: "hsl(var(--accent))",
|
||||||
|
foreground: "hsl(var(--accent-foreground))",
|
||||||
|
},
|
||||||
|
popover: {
|
||||||
|
DEFAULT: "hsl(var(--popover))",
|
||||||
|
foreground: "hsl(var(--popover-foreground))",
|
||||||
|
},
|
||||||
|
card: {
|
||||||
|
DEFAULT: "hsl(var(--card))",
|
||||||
|
foreground: "hsl(var(--card-foreground))",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
borderRadius: {
|
||||||
|
lg: "var(--radius)",
|
||||||
|
md: "calc(var(--radius) - 2px)",
|
||||||
|
sm: "calc(var(--radius) - 4px)",
|
||||||
|
pill: "var(--radius-pill)",
|
||||||
|
card: "var(--radius-card)",
|
||||||
|
},
|
||||||
|
fontFamily: {
|
||||||
|
sans: ["Noto Sans", "Montserrat", "sans-serif"],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
plugins: [],
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user