
Merge branch 'front-end' of http://210.180.118.83/yjryu/ajin_business_log into front-end
@4ab43ec71809513ec02c7c71de52c3e13ce13973
+++ client/resources/css/gird.css
... | ... | @@ -0,0 +1,333 @@ |
1 | +@charset "utf-8"; | |
2 | + | |
3 | +.container { | |
4 | + width: 100%; | |
5 | + padding-right: 15px; | |
6 | + padding-left: 15px; | |
7 | + margin-right: auto; | |
8 | + margin-left: auto; | |
9 | +} | |
10 | + | |
11 | +@media (min-width: 576px) { | |
12 | + .container { | |
13 | + max-width: 540px; | |
14 | + } | |
15 | +} | |
16 | + | |
17 | +@media (min-width: 768px) { | |
18 | + .container { | |
19 | + max-width: 720px; | |
20 | + } | |
21 | +} | |
22 | + | |
23 | +@media (min-width: 992px) { | |
24 | + .container { | |
25 | + max-width: 960px; | |
26 | + } | |
27 | +} | |
28 | + | |
29 | +@media (min-width: 1200px) { | |
30 | + .container { | |
31 | + max-width: 1140px; | |
32 | + } | |
33 | +} | |
34 | + | |
35 | + | |
36 | +.flex { | |
37 | + display: flex; | |
38 | + flex-wrap: wrap; | |
39 | +} | |
40 | + | |
41 | +.flex-column { | |
42 | + display: flex; | |
43 | + flex-direction: column; | |
44 | +} | |
45 | + | |
46 | +.no-gutters { | |
47 | + margin-right: 0; | |
48 | + margin-left: 0; | |
49 | +} | |
50 | + | |
51 | + | |
52 | +.no-gutters>.col, | |
53 | +.no-gutters>[class*="col-"] { | |
54 | + padding-right: 0; | |
55 | + padding-left: 0; | |
56 | +} | |
57 | + | |
58 | +.col-1, | |
59 | +.col-2, | |
60 | +.col-3, | |
61 | +.col-4, | |
62 | +.col-5, | |
63 | +.col-6, | |
64 | +.col-7, | |
65 | +.col-8, | |
66 | +.col-9, | |
67 | +.col-10, | |
68 | +.col-11, | |
69 | +.col-12, | |
70 | +.col, | |
71 | +.col-auto, | |
72 | +.col-sm-1, | |
73 | +.col-sm-2, | |
74 | +.col-sm-3, | |
75 | +.col-sm-4, | |
76 | +.col-sm-5, | |
77 | +.col-sm-6, | |
78 | +.col-sm-7, | |
79 | +.col-sm-8, | |
80 | +.col-sm-9, | |
81 | +.col-sm-10, | |
82 | +.col-sm-11, | |
83 | +.col-sm-12, | |
84 | +.col-sm, | |
85 | +.col-sm-auto, | |
86 | +.col-md-1, | |
87 | +.col-md-2, | |
88 | +.col-md-3, | |
89 | +.col-md-4, | |
90 | +.col-md-5, | |
91 | +.col-md-6, | |
92 | +.col-md-7, | |
93 | +.col-md-8, | |
94 | +.col-md-9, | |
95 | +.col-md-10, | |
96 | +.col-md-11, | |
97 | +.col-md-12, | |
98 | +.col-md, | |
99 | +.col-md-auto, | |
100 | +.col-lg-1, | |
101 | +.col-lg-2, | |
102 | +.col-lg-3, | |
103 | +.col-lg-4, | |
104 | +.col-lg-5, | |
105 | +.col-lg-6, | |
106 | +.col-lg-7, | |
107 | +.col-lg-8, | |
108 | +.col-lg-9, | |
109 | +.col-lg-10, | |
110 | +.col-lg-11, | |
111 | +.col-lg-12, | |
112 | +.col-lg, | |
113 | +.col-lg-auto, | |
114 | +.col-xl-1, | |
115 | +.col-xl-2, | |
116 | +.col-xl-3, | |
117 | +.col-xl-4, | |
118 | +.col-xl-5, | |
119 | +.col-xl-6, | |
120 | +.col-xl-7, | |
121 | +.col-xl-8, | |
122 | +.col-xl-9, | |
123 | +.col-xl-10, | |
124 | +.col-xl-11, | |
125 | +.col-xl-12, | |
126 | +.col-xl, | |
127 | +.col-xl-auto { | |
128 | + position: relative; | |
129 | + width: 100%; | |
130 | + min-height: 1px; | |
131 | + padding-right: 10px; | |
132 | + padding-left: 10px; | |
133 | +} | |
134 | + | |
135 | + | |
136 | +.col { | |
137 | + -ms-flex-preferred-size: 0; | |
138 | + flex-basis: 0; | |
139 | + -ms-flex-positive: 1; | |
140 | + flex-grow: 1; | |
141 | + max-width: 100%; | |
142 | +} | |
143 | + | |
144 | +.col-auto { | |
145 | + -ms-flex: 0 0 auto; | |
146 | + flex: 0 0 auto; | |
147 | + width: auto; | |
148 | + max-width: none; | |
149 | +} | |
150 | + | |
151 | +.col-1 { | |
152 | + -ms-flex: 0 0 8.333333%; | |
153 | + flex: 0 0 8.333333%; | |
154 | + max-width: 8.333333%; | |
155 | +} | |
156 | + | |
157 | +.col-2 { | |
158 | + -ms-flex: 0 0 16.666667%; | |
159 | + flex: 0 0 16.666667%; | |
160 | + max-width: 16.666667%; | |
161 | +} | |
162 | + | |
163 | +.col-3 { | |
164 | + -ms-flex: 0 0 25%; | |
165 | + flex: 0 0 25%; | |
166 | + max-width: 25%; | |
167 | +} | |
168 | + | |
169 | +.col-4 { | |
170 | + -ms-flex: 0 0 33.333333%; | |
171 | + flex: 0 0 33.333333%; | |
172 | + max-width: 33.333333%; | |
173 | +} | |
174 | + | |
175 | +.col-5 { | |
176 | + -ms-flex: 0 0 41.666667%; | |
177 | + flex: 0 0 41.666667%; | |
178 | + max-width: 41.666667%; | |
179 | +} | |
180 | + | |
181 | +.col-6 { | |
182 | + -ms-flex: 0 0 50%; | |
183 | + flex: 0 0 50%; | |
184 | + max-width: 50%; | |
185 | +} | |
186 | + | |
187 | +.col-7 { | |
188 | + -ms-flex: 0 0 58.333333%; | |
189 | + flex: 0 0 58.333333%; | |
190 | + max-width: 58.333333%; | |
191 | +} | |
192 | + | |
193 | +.col-8 { | |
194 | + -ms-flex: 0 0 66.666667%; | |
195 | + flex: 0 0 66.666667%; | |
196 | + max-width: 66.666667%; | |
197 | +} | |
198 | + | |
199 | +.col-9 { | |
200 | + -ms-flex: 0 0 75%; | |
201 | + flex: 0 0 75%; | |
202 | + max-width: 75%; | |
203 | +} | |
204 | + | |
205 | +.col-10 { | |
206 | + -ms-flex: 0 0 83.333333%; | |
207 | + flex: 0 0 83.333333%; | |
208 | + max-width: 83.333333%; | |
209 | +} | |
210 | + | |
211 | +.col-11 { | |
212 | + -ms-flex: 0 0 91.666667%; | |
213 | + flex: 0 0 91.666667%; | |
214 | + max-width: 91.666667%; | |
215 | +} | |
216 | + | |
217 | +.col-12 { | |
218 | + -ms-flex: 0 0 100%; | |
219 | + flex: 0 0 100%; | |
220 | + max-width: 100%; | |
221 | +} | |
222 | + | |
223 | + | |
224 | + | |
225 | +.justify-start { | |
226 | + justify-content: flex-start; | |
227 | +} | |
228 | + | |
229 | +.justify-center { | |
230 | + justify-content: center; | |
231 | +} | |
232 | + | |
233 | +.justify-end { | |
234 | + justify-content: flex-end; | |
235 | +} | |
236 | + | |
237 | +.justify-between { | |
238 | + justify-content: space-between; | |
239 | +} | |
240 | + | |
241 | +.justify-around { | |
242 | + justify-content: space-around; | |
243 | +} | |
244 | + | |
245 | +.align-start { | |
246 | + align-items: flex-start; | |
247 | +} | |
248 | + | |
249 | + | |
250 | +.align-center { | |
251 | + align-items: center; | |
252 | +} | |
253 | + | |
254 | +.align-end { | |
255 | + align-items: flex-end; | |
256 | +} | |
257 | + | |
258 | +.flex-auto { | |
259 | + flex: 0 0 auto; | |
260 | +} | |
261 | + | |
262 | +.flex1 { | |
263 | + flex: 1; | |
264 | +} | |
265 | + | |
266 | +.flex2 { | |
267 | + flex: 2; | |
268 | +} | |
269 | + | |
270 | +.flex3 { | |
271 | + flex: 3; | |
272 | +} | |
273 | + | |
274 | +.flex4 { | |
275 | + flex: 4; | |
276 | +} | |
277 | + | |
278 | +.flex5 { | |
279 | + flex: 5; | |
280 | +} | |
281 | + | |
282 | +.flex6 { | |
283 | + flex: 6; | |
284 | +} | |
285 | + | |
286 | +.flex7 { | |
287 | + flex: 7; | |
288 | +} | |
289 | + | |
290 | +.flex8 { | |
291 | + flex: 8; | |
292 | +} | |
293 | + | |
294 | + | |
295 | +.gap1 { | |
296 | + gap: 1%; | |
297 | +} | |
298 | + | |
299 | +.gap2 { | |
300 | + gap: 2%; | |
301 | +} | |
302 | + | |
303 | +.gap3 { | |
304 | + gap: 3%; | |
305 | +} | |
306 | + | |
307 | +.gap4 { | |
308 | + gap: 4%; | |
309 | +} | |
310 | + | |
311 | +.gap5 { | |
312 | + gap: 5%; | |
313 | +} | |
314 | + | |
315 | +.gap6 { | |
316 | + gap: 6%; | |
317 | +} | |
318 | + | |
319 | +.gap7 { | |
320 | + gap: 7%; | |
321 | +} | |
322 | + | |
323 | +.gap8 { | |
324 | + gap: 8%; | |
325 | +} | |
326 | + | |
327 | +.gap9 { | |
328 | + gap: 9%; | |
329 | +} | |
330 | + | |
331 | +.gap10 { | |
332 | + gap: 10%; | |
333 | +}(No newline at end of file) |
--- client/views/component/test/TestCompoent.jsx
... | ... | @@ -1,24 +0,0 @@ |
1 | -import React from 'react'; | |
2 | - | |
3 | -import styled from 'styled-components'; | |
4 | - | |
5 | -const TestStyle = styled.span` | |
6 | - font-size: 1.2rem; | |
7 | - padding: 0.2rem 0.3rem; | |
8 | - margin-right: 0.1rem; | |
9 | - &:last-child { | |
10 | - margin-right: 0rem; | |
11 | - } | |
12 | -`; | |
13 | - | |
14 | -function TestCompoent () { | |
15 | - return ( | |
16 | - <> | |
17 | - <TestStyle> | |
18 | - <div className="test">TestCompoent 입니다.</div> | |
19 | - </TestStyle> | |
20 | - </> | |
21 | - ) | |
22 | -} | |
23 | - | |
24 | -export default TestCompoent;(No newline at end of file) |
--- package-lock.json
+++ package-lock.json
... | ... | @@ -16,9 +16,8 @@ |
16 | 16 |
"file-loader": "^6.2.0", |
17 | 17 |
"fs": "0.0.1-security", |
18 | 18 |
"history": "5.3.0", |
19 |
- "lodash": "^4.17.21", |
|
20 |
- "mysql": "2.18.1", |
|
21 |
- "oracledb": "5.5.0", |
|
19 |
+ "mysql": "^2.18.1", |
|
20 |
+ "oracledb": "^5.5.0", |
|
22 | 21 |
"pg": "8.8.0", |
23 | 22 |
"react": "18.2.0", |
24 | 23 |
"react-dom": "18.2.0", |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?