Skip to content

Commit

Permalink
🌈 Design: 둜그인 / νšŒμ›κ°€μž… / 였λ₯˜ νŽ˜μ΄μ§€ 곡톡사항 λ§ˆν¬μ—… (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
SoRaang committed Nov 30, 2024
1 parent 7a7ce00 commit 7010a4e
Show file tree
Hide file tree
Showing 10 changed files with 295 additions and 48 deletions.
5 changes: 5 additions & 0 deletions router.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import ErrorPage from './src/pages/ErrorPage';
import LoginPage from './src/pages/LoginPage';
import RegisterPage from './src/pages/RegisterPage';
import ComponentMuseum from './src/pages/ComponentMuseum';
import FindAccountPage from './src/pages/FindAccountPage';

export const routesConfig = [
{
Expand Down Expand Up @@ -36,6 +37,10 @@ export const routesConfig = [
path: '/register',
element: <RegisterPage />,
},
{
path: '/find-account',
element: <FindAccountPage />,
},
{
path: '/*',
element: <ErrorPage />,
Expand Down
77 changes: 76 additions & 1 deletion src/assets/stylesheets/layouts/_commons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,27 @@
fill: currentColor;
}

/* 둜그인, νšŒμ›κ°€μž… 곡톡 λ ˆμ΄μ•„μ›ƒ μš”μ†Œ */
/* 둜그인, νšŒμ›κ°€μž…, 였λ₯˜ νŽ˜μ΄μ§€ λ“±μ˜ 곡톡 λ ˆμ΄μ•„μ›ƒ μš”μ†Œ */

#error-message-container {
display: flex;
flex-flow: column nowrap;
justify-content: center;
align-items: center;
gap: 1.2rem;
margin-block: auto;
text-align: center;

> h1 {
font-family: var(--ff-dingbat);
font-size: var(--fnt-title-xl);
}

> p {
font-family: var(--ff-dingbat);
font-size: var(--fnt-title-md);
}
}

.service-container-wrapper {
display: flex;
Expand All @@ -63,14 +83,69 @@
}

.service-container {
flex-shrink: 0;
border-radius: 0 0 var(--rad-xl) var(--rad-xl);
background-color: rgb(var(--clr-white));
box-shadow: 0 -2.4rem 4.8rem 0.8rem rgb(var(--clr-alert) / 0.25);
overflow: clip;
}

.service-logo-container {
display: flex;
justify-content: center;
align-items: center;
position: relative;
height: 12rem;
background-color: pink;
color: rgb(var(--clr-white));

> h1 {
font-family: var(--ff-dingbat);
font-size: var(--fnt-title-lg);
text-align: center;
}
}

#button-service-go-back {
position: absolute;
inset-block-start: 0.8rem;
inset-inline-start: 0.8rem;
padding: 0.6rem;
border-radius: var(--rad-full);
background-color: rgb(var(--clr-text) / 0.75);
mix-blend-mode: overlay;

&:hover {
background-color: rgb(var(--clr-text));
}
}

.service-controls {
display: flex;
justify-content: space-between;
align-items: center;
}

.button-service-control {
padding: 0.4rem 0.8rem;
border: 1px solid rgb(var(--clr-text) / 0.15);
border-radius: var(--rad-full);
background-color: rgb(var(--clr-white) / 0.5);
backdrop-filter: blur(0.4rem);
color: rgb(var(--clr-text) / 0.5);
font-size: var(--fnt-sm);
font-weight: 700;

&:hover {
border-color: rgb(var(--clr-alert) / 0.25);
background-color: rgb(var(--clr-alert) / 0.1);
color: rgb(var(--clr-alert) / 0.5);
}

&.drop-progress {
background-color: rgb(var(--clr-black));
color: rgb(vaR(--clr-text-on-tint));
}
}

.service-copyright {
Expand Down
8 changes: 8 additions & 0 deletions src/assets/stylesheets/layouts/_footers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,12 @@
font-weight: 200;
}

/* λ°˜μ‘ν˜• 쿼리 */

@container main-container (max-width: 640px) {
.footer-company-informations {
flex-flow: column nowrap;
}
}

/* _footers.scss */
14 changes: 9 additions & 5 deletions src/assets/stylesheets/pages/_registerPage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
justify-content: center;
align-items: flex-end;
gap: 0.2rem;
padding-block: 1.2rem;
padding-inline: 0.8rem;
}

Expand Down Expand Up @@ -59,15 +60,12 @@
transition: margin-inline-start 0.3s;

> div {
padding: 1.2rem 0.8rem;
width: 100%;
}
}

.register-state-controls {
display: flex;
justify-content: space-between;
align-items: center;
.register-state-container {
padding: 0.8rem;
}

#terms-of-service {
Expand Down Expand Up @@ -120,4 +118,10 @@
}
}

#check-terms-confirmed {
display: flex;
justify-content: center;
margin-block-start: 0.8rem;
}

/* _registerPage.scss */
92 changes: 86 additions & 6 deletions src/assets/stylesheets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,25 @@ a, a:visited {
fill: currentColor;
}

/* 둜그인, νšŒμ›κ°€μž… 곡톡 λ ˆμ΄μ•„μ›ƒ μš”μ†Œ */
/* 둜그인, νšŒμ›κ°€μž…, 였λ₯˜ νŽ˜μ΄μ§€ λ“±μ˜ 곡톡 λ ˆμ΄μ•„μ›ƒ μš”μ†Œ */
#error-message-container {
display: flex;
flex-flow: column nowrap;
justify-content: center;
align-items: center;
gap: 1.2rem;
margin-block: auto;
text-align: center;
}
#error-message-container > h1 {
font-family: var(--ff-dingbat);
font-size: var(--fnt-title-xl);
}
#error-message-container > p {
font-family: var(--ff-dingbat);
font-size: var(--fnt-title-md);
}

.service-container-wrapper {
display: flex;
flex-flow: column nowrap;
Expand All @@ -754,14 +772,66 @@ a, a:visited {
}

.service-container {
flex-shrink: 0;
border-radius: 0 0 var(--rad-xl) var(--rad-xl);
background-color: rgb(var(--clr-white));
box-shadow: 0 -2.4rem 4.8rem 0.8rem rgb(var(--clr-alert)/0.25);
overflow: clip;
}

.service-logo-container {
display: flex;
justify-content: center;
align-items: center;
position: relative;
height: 12rem;
background-color: pink;
color: rgb(var(--clr-white));
}
.service-logo-container > h1 {
font-family: var(--ff-dingbat);
font-size: var(--fnt-title-lg);
text-align: center;
}

#button-service-go-back {
position: absolute;
inset-block-start: 0.8rem;
inset-inline-start: 0.8rem;
padding: 0.6rem;
border-radius: var(--rad-full);
background-color: rgb(var(--clr-text)/0.75);
mix-blend-mode: overlay;
}
#button-service-go-back:hover {
background-color: rgb(var(--clr-text));
}

.service-controls {
display: flex;
justify-content: space-between;
align-items: center;
}

.button-service-control {
padding: 0.4rem 0.8rem;
border: 1px solid rgb(var(--clr-text)/0.15);
border-radius: var(--rad-full);
background-color: rgb(var(--clr-white)/0.5);
-webkit-backdrop-filter: blur(0.4rem);
backdrop-filter: blur(0.4rem);
color: rgb(var(--clr-text)/0.5);
font-size: var(--fnt-sm);
font-weight: 700;
}
.button-service-control:hover {
border-color: rgb(var(--clr-alert)/0.25);
background-color: rgb(var(--clr-alert)/0.1);
color: rgb(var(--clr-alert)/0.5);
}
.button-service-control.drop-progress {
background-color: rgb(var(--clr-black));
color: rgb(vaR(--clr-text-on-tint));
}

.service-copyright {
Expand Down Expand Up @@ -1058,6 +1128,12 @@ a, a:visited {
font-weight: 200;
}

/* λ°˜μ‘ν˜• 쿼리 */
@container main-container (max-width: 640px) {
.footer-company-informations {
flex-flow: column nowrap;
}
}
/* _footers.scss */
/* _mainPage.scss */
/* λ°˜μ‘ν˜• 쿼리 */
Expand All @@ -1079,6 +1155,7 @@ a, a:visited {
justify-content: center;
align-items: flex-end;
gap: 0.2rem;
padding-block: 1.2rem;
padding-inline: 0.8rem;
}

Expand Down Expand Up @@ -1116,14 +1193,11 @@ a, a:visited {
transition: margin-inline-start 0.3s;
}
#register-state-wrapper > div {
padding: 1.2rem 0.8rem;
width: 100%;
}

.register-state-controls {
display: flex;
justify-content: space-between;
align-items: center;
.register-state-container {
padding: 0.8rem;
}

#terms-of-service {
Expand Down Expand Up @@ -1163,6 +1237,12 @@ a, a:visited {
content: "(" counter(numbs) ") ";
}

#check-terms-confirmed {
display: flex;
justify-content: center;
margin-block-start: 0.8rem;
}

/* _registerPage.scss */
/* _loginPage.scss */
#form-login {
Expand Down
3 changes: 2 additions & 1 deletion src/components/layout/BaseLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import AreaInfoPanel from './AreaInfoPanel';
import Footer from './Footer';
import MainModal from '../MainModal';
import TotalSearch from './TotalSearch';
import SettingMallangs from '../common/SettingMallangs';

const BaseLayout = () => {
const [currentPanelID, setCurrentPanel] = useState(0);
Expand Down Expand Up @@ -50,7 +51,7 @@ const BaseLayout = () => {
onShow={setCurrentPanel}
>
<div style={{ padding: '.8rem' }}>
κ·Έλ ‡λ‹€... λ‚΄μš©μ„ 슬둯으둜 μ§‘μ–΄λ„£λŠ” 것이닀
<SettingMallangs />
</div>
</MainModal>
</>
Expand Down
15 changes: 5 additions & 10 deletions src/pages/ErrorPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,13 @@ const ErrorPage = ({
return (
<section id="full-page-wrapper">
<div className="service-container-wrapper">
<h1
style={{
fontFamily: 'var(--ff-dingbat)',
fontSize: 'var(--fnt-title-xl)',
}}
>
{errorCode} ♀ ♧ † Β£ Β’
</h1>
<div id="error-message-container">
<h1>Β’ {errorCode} ♧</h1>

<p>{errorMessage}</p>
<p>{errorMessage}</p>

<button onClick={() => navigate(-1)}>λŒμ•„κ°€κΈ°</button>
<button onClick={() => navigate(-1)}>λŒμ•„κ°€κΈ°</button>
</div>
</div>
</section>
);
Expand Down
11 changes: 11 additions & 0 deletions src/pages/FindAccountPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const FindAccountPage = () => {
return (
<section id="full-page-wrapper">
<div className="service-container-wrapper">
λ‚˜λŠ” μ΄κ³³μ—μ„œ λ‚˜μ˜ 계정을 λ˜μ°Ύμ„ κ²ƒμ΄μ˜€
</div>
</section>
);
};

export default FindAccountPage;
Loading

0 comments on commit 7010a4e

Please sign in to comment.