Skip to content

Commit

Permalink
Merge pull request #264 from tukcomCD2024/Frontend#263
Browse files Browse the repository at this point in the history
Frontend/디자인 수정
  • Loading branch information
SINHJ1 authored Aug 27, 2024
2 parents 4ad3f73 + 7ca33bc commit 7a02845
Show file tree
Hide file tree
Showing 26 changed files with 31 additions and 1,671 deletions.
42 changes: 25 additions & 17 deletions frontend/src/Component/Auth/AuthPage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { useEffect } from "react";
import styled from "styled-components";
import veryBigEye from "../../image/veryBigEye.gif";
import book1 from "../../image/book1.gif";
import book from "../../image/book.gif";
import { useNavigate } from "react-router-dom";

function AuthPage() {
Expand All @@ -14,8 +13,10 @@ function AuthPage() {
return (
<FlexContainer>
<ImageWrapper>
<BigEyeImage src={veryBigEye} alt="Very Big Eye" />
<BookImage src={book1} alt="Book" />
<BookImage src={book} alt="Book" />
<CommentWrapper>
<p>Let's Share with me!!</p>
</CommentWrapper>
</ImageWrapper>
<AuthBox>
<ToMain>
Expand All @@ -34,16 +35,24 @@ const FlexContainer = styled.div`
display: flex;
align-items: stretch;
height: 100vh;
background-color: #f5f5f5;
// background-color: #FFFFE0;
`;

const ImageWrapper = styled.div`
flex: 3;
display: flex;
justify-content: center;
align-items: center;
background-color: #ddd;
position: relative; /* 이를 relative로 설정 */
background-color: #FFFFE0;
position: relative;
`;

const CommentWrapper = styled.div`
width: 50%;
margin-top: 30%;
font-size: 25px;
font-weight: 600;
color: #FF8C00;
`;

const AuthBox = styled.div`
Expand All @@ -65,7 +74,6 @@ const ToMain = styled.div`

const LoginBtn = styled.button`
width: 100%;
background-color: #0064ff;
color: #ffffff;
border: 1px solid #000000;
Expand Down Expand Up @@ -101,10 +109,10 @@ const SignupBtn = styled.button`
const BigEyeImage = styled.img`
width: 300px;
height: auto;
position: absolute; /* 이 이미지를 absolute로 설정 */
left: 50%; /* 중앙 정렬을 위해 */
top: 48%; /* 중앙 정렬을 위해 */
transform: translate(-50%, -50%); /* 정확히 중앙에 위치하도록 조정 */
position: absolute;
left: 50%;
top: 48%;
transform: translate(-50%, -50%);
@media screen and (max-width: 768px) {
flex-direction: column;
Expand All @@ -114,12 +122,12 @@ const BigEyeImage = styled.img`
`;

const BookImage = styled.img`
width: 600px;
width: 53%;
height: auto;
position: absolute; /* 이 이미지도 absolute로 설정 */
left: 50%; /* 중앙 정렬을 위해 */
top: 40%; /* 중앙 정렬을 위해 */
transform: translate(-50%, -50%); /* 정확히 중앙에 위치하도록 조정 */
position: absolute;
left: 50%;
top: 40%;
transform: translate(-50%, -50%) rotate(20deg);
@media screen and (max-width: 768px) {
display: none;
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/Component/Note/NotePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import styled, { keyframes, css } from "styled-components";
import OrganizationInfoModal from "./organizationInfo/organizationInfo";
import OrganizationContainer from "../Organization/Organization_Web";
import ImagetoBackend from "../Utils/imageToBackend";
import noneImage from "../../image/NoneImage2.png";
import defaultImage from "../../image/defaultNote2.png";
import noneImage from "../../image/NoneImage.png";
import defaultImage from "../../image/defaultNote.png";
import backgroundImage from "../../image/organizationBackgroundImage.png";
import AddNoteIcon from "../../image/addNote.svg";
import toastr from "toastr";
Expand Down Expand Up @@ -177,7 +177,7 @@ function NotePage() {
return {
id: note.id,
name: note.title,
image: note.noteImageUrl,
image: note.noteImageUrl == "http~" ? defaultImage : note.noteImageUrl,
organizationId: id,
pageId: pageData[0].pageId,
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/Component/Page/Page.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { isWeb, checkLocalStorage } from "./utils/initMobileWebView"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faLeftLong, faRightLong, faSquarePlus, faTrashCan, faList, faGear } from "@fortawesome/free-solid-svg-icons";
import { cursorColors } from "../Utils/cursorColor"
import defaultNoteImage from "../../image/defaultNote2.png";
import defaultNoteImage from "../../image/defaultNote.png";
import LoadingScreen from "../Utils/LoadingScreen";

function Page() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ img.ProseMirror-separator {
}
#editor,
.editor {
background-image: url('/src/image/note_paper\(8\).svg');
background-image: url('/src/image/note_paper.svg');
background-size: 83% 260%;
background-repeat: no-repeat;
background-position: 16vw -7vw;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faTrashCan } from "@fortawesome/free-solid-svg-icons";
import toastr from "toastr";
import "toastr/build/toastr.css";
import defaultNoteImage from "../../../../image/defaultNote2.png";
import defaultNoteImage from "../../../../image/defaultNote.png";

const NoteSettingModal = ({
modalOpen,
Expand Down
Binary file modified frontend/src/image/NoneImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/src/image/NoneImage2.png
Binary file not shown.
Binary file added frontend/src/image/book.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/src/image/book1.gif
Binary file not shown.
Binary file modified frontend/src/image/defaultNote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/src/image/defaultNote2.png
Binary file not shown.
Binary file removed frontend/src/image/down.gif
Binary file not shown.
Binary file removed frontend/src/image/dragon.png
Binary file not shown.
Binary file removed frontend/src/image/note_paper(1).png
Binary file not shown.
Binary file removed frontend/src/image/note_paper(2).png
Binary file not shown.
Loading

0 comments on commit 7a02845

Please sign in to comment.