Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Form UI 수정, Index Bar 생성, Config file Drag&Drop 생성 #16

Merged
merged 6 commits into from
Aug 3, 2023
Merged

Form UI 수정, Index Bar 생성, Config file Drag&Drop 생성 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1d2945
[feat/#15] :art: Style: Change Color and Box Shadow
noooey Aug 2, 2023
2b1fe9b
[feat/#15] :art: Style: Remove Unused import
noooey Aug 3, 2023
7fdf6c9
[feat/#15] :sparkles: Add: Drag and Dorp for Config file
noooey Aug 3, 2023
c940198
[feat/#15] :art: Style: Change Form UI
noooey Aug 3, 2023
5f33526
[feat/#15] :sparkles: Add: Index Bar
noooey Aug 3, 2023
10fcb23
[feat/#15] :art: Style: Change Check Icon Color
noooey Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import NavBar from './components/NavBar';
import Footer from './components/Footer';
import Home from './pages/Home';
import Auth from './pages/Auth';
import Auth2 from './pages/Auth2';
import Migration from './pages/Migration';
import Completed from './pages/Completed';
import NotFound from './pages/NotFound';
Expand All @@ -20,7 +19,6 @@ function App() {
<Routes>
<Route path="/" element={<Home />}></Route>
<Route path="/auth" element={<Auth />}></Route>
<Route path="/auth2" element={<Auth2 />}></Route>
<Route path="/migration" element={<Migration />}></Route>
<Route path="/completed" element={<Completed />}></Route>
{/* 상단에 위치하는 라우트들의 규칙을 모두 확인, 일치하는 라우트가 없는경우 처리 */}
Expand Down
17 changes: 7 additions & 10 deletions src/components/AuthForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// AuthForm.tsx

import React, { ChangeEvent, useState } from 'react';
import { FiCheckCircle, FiHelpCircle } from 'react-icons/fi';
import Vr from './Vr';
import { useDropzone } from 'react-dropzone';

interface Props {
Expand Down Expand Up @@ -54,7 +51,7 @@ const AuthForm: React.FC<Props> = ({ label, name, value, type, onInputChange, in
const renderInput = () => {
if (type === 'file') {
return (
<div {...getRootProps()} style={{ flex: '2', height: '80%', paddingLeft: '1vw', paddingRight: '1vw', border: '1.2px dashed #dddddd', color: '#9d9d9d', borderRadius: '5px', alignItems: 'center', display: 'flex', fontSize: '0.8rem' }}>
<div {...getRootProps()} style={{ flex: '2', height: '80%', paddingLeft: '1vw', paddingRight: '1vw', border: '1.2px dashed #dddddd', color: '#9d9d9d', borderRadius: '5px', alignItems: 'center', display: 'flex', fontSize: '0.8rem', width: '100%' }}>
<input {...getInputProps()} />
{inputValue instanceof File ? (
<div style={{justifyContent: 'center', display: 'flex', width: '100%'}}>Selected file: {inputValue.name}</div>
Expand All @@ -71,21 +68,21 @@ const AuthForm: React.FC<Props> = ({ label, name, value, type, onInputChange, in
type="text"
value={typeof inputValue === 'string' ? inputValue : ''}
onChange={handleInputChange}
style={{ flex: '2', height: '80%', paddingLeft: '1vw', paddingRight: '1vw', border:'1px solid #dddddd', borderRadius: '0.5rem'}}
style={{ flex: '2', height: '80%', paddingLeft: '1vw', paddingRight: '1vw', border:'1px solid #dddddd', borderRadius: '0.5rem', width: '100%'}}
/>
);
};

return (
<div style={{ display: 'flex', height: '7vh', alignItems: 'center', justifyContent: 'center', width: '100%', padding: '1vh 4vw', color: '#4b4b4b' }}>
<label style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', flex: '1' }}>
<span style={{ marginRight: '0.5rem', fontSize: '1rem' }}>{label}</span>
<div style={{ marginRight: 'auto', height: '100%', alignItems: 'center', marginBlockEnd: '0.15rem'}}>
<div style={{ display: 'flex', height: '15vh', width: '100%', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', padding: '1vh 4vw', color: '#4b4b4b' }}>
<label style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', flex: '1', width: '100%', marginLeft: '1vw', }}>
<span style={{ marginRight: '0.5rem', paddingBlock: '1vh', fontSize: '1rem' }}>{label}</span>
<div style={{ display: 'flex', marginRight: 'auto', height: '100%', alignItems: 'center'}}>
<FiHelpCircle onClick={handleInfoClick} color="#9d9d9d" style={{ cursor: 'pointer' }} />
{inputValue !== '' && <FiCheckCircle color="green" style={{ marginLeft: '0.5rem'}} />}
</div>
</label>
<Vr style={{height: '50%', margin: '0 1rem 0 1rem'}}/>
{/* <Vr style={{height: '50%', margin: '0 1rem 0 1rem'}}/> */}
{renderInput()}
<br />
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/components/NextButton.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.next-button {
background: #dddddd;
border: 2px solid #dddddd;
box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.25);
background: #fafafa;
border: 2px solid #fafafa;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.25);
border-radius: 30px 30px 30px 30px;
color: white;
color: #9d9d9d;
font-style: bold;
width: 100%;
height: 100%;
Expand Down
Loading