Skip to content

Commit

Permalink
[#40] merge: change svg files
Browse files Browse the repository at this point in the history 
[#37] style: Change to camel & add axios
  • Loading branch information
@rosieyeon
rosieyeon authored Feb 3, 2022
2 parents c98ed50 + 7a12590 commit c2c1d25
Show file tree
Hide file tree
Showing 11 changed files with 234 additions and 47 deletions.
2 changes: 1 addition & 1 deletion public/icons/_moon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/icons/_paper-plane-darkmode.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/icons/_paper-plane.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions public/icons/_sun.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/icons/notice.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
175 changes: 160 additions & 15 deletions src/components/navbar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ function Navbar() {
})
.then((res) => {
const USER = res.data.user;
// console.log(USER);
setProfileImg(USER.userImg);
setNickname(USER.userNickname);
setEmail(USER.userEmail);
Expand All @@ -87,7 +88,7 @@ function Navbar() {
<div>
<div className="navbar">
<div className="navbar-menus">
<Link className="menu" to={"/home"}>
<Link className="menu" to={"/home/tab=todays"}>
홈
</Link>
<Link className="menu" to={"/meetingrooms"}>
Expand All @@ -102,33 +103,177 @@ function Navbar() {
</div>
<div className="navbar-profile">
{!isDark && (
<img
<svg
className="dark-light"
src="icons/_sun.svg"
alt=""
onClick={darkOnOff}
></img>
width="16"
height="16"
viewBox="0 0 13 13"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<g clipPath="url(#clip0_753_4048)">
<path
d="M6.50002 9.20835C7.99579 9.20835 9.20835 7.99579 9.20835 6.50002C9.20835 5.00425 7.99579 3.79169 6.50002 3.79169C5.00425 3.79169 3.79169 5.00425 3.79169 6.50002C3.79169 7.99579 5.00425 9.20835 6.50002 9.20835Z"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M6.5 0.541687V1.62502"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M6.5 11.375V12.4583"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M2.28583 2.28583L3.05499 3.05499"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M9.94501 9.94501L10.7142 10.7142"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M0.541687 6.5H1.62502"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M11.375 6.5H12.4583"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M2.28583 10.7142L3.05499 9.94501"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M9.94501 3.05499L10.7142 2.28583"
stroke="#ededed"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</g>
<defs>
<clipPath id="clip0_753_4048">
<rect width="13" height="13" fill="white" />
</clipPath>
</defs>
</svg>

// <img
// className="dark-light"
// src="icons/_sun.svg"
// alt=""
// onClick={darkOnOff}
// ></img>
)}
{isDark && (
<img
<svg
className="dark-light"
src="icons/_moon.svg"
alt=""
onClick={darkOnOff}
></img>
width="16"
height="16"
viewBox="0 0 13 13"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M5.6875 0.8125C3.65625 0.8125 1.21875 2.84375 1.21875 6.09375C1.21875 9.34375 3.65625 11.7812 6.90625 11.7812C10.1562 11.7812 12.1875 9.34375 12.1875 7.3125C7.71875 10.1562 2.84375 5.28125 5.6875 0.8125Z"
stroke="#ededed"
strokeWidth="1.2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>

// <img
// className="dark-light"
// src="icons/_moon.svg"
// alt=""
// onClick={darkOnOff}
// ></img>
)}
<img
<svg
className="navbar-profile-alarm"
width="20"
height="20"
viewBox="0 0 20 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M12.5 14.1667H7.49998M12.5 14.1667H16.6666L15.4958 12.9958C15.3386 12.8386 15.2139 12.6519 15.1288 12.4464C15.0437 12.2409 14.9999 12.0207 15 11.7983V9.16667C15.0001 8.13245 14.6796 7.12362 14.0827 6.27907C13.4857 5.43453 12.6416 4.7958 11.6666 4.45083V4.16667C11.6666 3.72464 11.491 3.30072 11.1785 2.98816C10.8659 2.67559 10.442 2.5 9.99998 2.5C9.55795 2.5 9.13403 2.67559 8.82147 2.98816C8.50891 3.30072 8.33331 3.72464 8.33331 4.16667V4.45083C6.39165 5.1375 4.99998 6.99 4.99998 9.16667V11.7992C4.99998 12.2475 4.82165 12.6783 4.50415 12.9958L3.33331 14.1667H7.49998H12.5ZM12.5 14.1667V15C12.5 15.663 12.2366 16.2989 11.7677 16.7678C11.2989 17.2366 10.663 17.5 9.99998 17.5C9.33694 17.5 8.70105 17.2366 8.23221 16.7678C7.76337 16.2989 7.49998 15.663 7.49998 15V14.1667H12.5Z"
stroke="#CCCCCC"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>

{/* <img
className="navbar-profile-alarm"
src="icons/notice.svg"
alt=""
></img>
></img> */}
{profileImg === null && (
<img
<svg
className="navbar-profile-img"
src="icons/_default-user.svg"
alt=""
onClick={onClickDropdown}
></img>
width="40"
height="40"
viewBox="0 0 40 40"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<g clipPath="url(#clip0_233_15455)">
<path
d="M0 20C0 8.95431 8.95431 0 20 0C31.0457 0 40 8.95431 40 20C40 31.0457 31.0457 40 20 40C8.95431 40 0 31.0457 0 20Z"
fill="#f4f4f4"
/>
<path
d="M40 34.9906V40.0023H0V35.009C2.32658 31.8997 5.34651 29.3762 8.81965 27.6391C12.2928 25.9019 16.1233 24.9991 20.0067 25.0023C28.18 25.0023 35.44 28.9256 40 34.9906ZM26.67 15.0006C26.67 16.7688 25.9676 18.4645 24.7174 19.7147C23.4671 20.9649 21.7714 21.6673 20.0033 21.6673C18.2352 21.6673 16.5395 20.9649 15.2893 19.7147C14.039 18.4645 13.3367 16.7688 13.3367 15.0006C13.3367 13.2325 14.039 11.5368 15.2893 10.2866C16.5395 9.03636 18.2352 8.33398 20.0033 8.33398C21.7714 8.33398 23.4671 9.03636 24.7174 10.2866C25.9676 11.5368 26.67 13.2325 26.67 15.0006Z"
fill="#c0c0c0"
/>
</g>
<defs>
<clipPath id="clip0_233_15455">
<path
d="M0 20C0 8.95431 8.95431 0 20 0C31.0457 0 40 8.95431 40 20C40 31.0457 31.0457 40 20 40C8.95431 40 0 31.0457 0 20Z"
fill="white"
/>
</clipPath>
</defs>
</svg>
// <img
// className="navbar-profile-img"
// src="icons/_default-user.svg"
// alt=""
// onClick={onClickDropdown}
// ></img>
)}
{profileImg !== null && (
<img
Expand Down
26 changes: 13 additions & 13 deletions src/components/navbarHome.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ function NavbarHome() {
<path
d="M0.583328 2.18748C0.583328 2.18748 1.77083 0.833313 4.54166 0.833313C7.31249 0.833313 8.49999 2.18748 8.49999 2.18748V11.6666C8.49999 11.6666 7.31249 10.9896 4.54166 10.9896C1.77083 10.9896 0.583328 11.6666 0.583328 11.6666V2.18748Z"
stroke="#0C0C0C"
stroke-linecap="round"
stroke-linejoin="round"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M8.5 2.18748C8.5 2.18748 9.6875 0.833313 12.4583 0.833313C15.2292 0.833313 16.4167 2.18748 16.4167 2.18748V11.6666C16.4167 11.6666 15.2292 10.9896 12.4583 10.9896C9.6875 10.9896 8.5 11.6666 8.5 11.6666V2.18748Z"
stroke="#0C0C0C"
stroke-linecap="round"
stroke-linejoin="round"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
<span>Today's</span>
Expand All @@ -42,15 +42,15 @@ function NavbarHome() {
<path
d="M6.99992 14.6666C3.50212 14.6666 0.666586 11.6819 0.666586 7.99998C0.666586 4.31808 3.50212 1.33331 6.99992 1.33331C10.4977 1.33331 13.3333 4.31808 13.3333 7.99998C13.3333 11.6819 10.4977 14.6666 6.99992 14.6666Z"
stroke="#0C0C0C"
stroke-linecap="round"
stroke-linejoin="round"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M8.66663 5.86665C8.24232 5.52258 7.7129 5.33434 7.16663 5.33331C5.78596 5.33331 4.66663 6.52665 4.66663 7.99998C4.66663 9.47331 5.78596 10.6666 7.16663 10.6666C7.72929 10.6666 8.24863 10.468 8.66663 10.1333"
stroke="#0C0C0C"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M6.66663 1.33331C9.55529 1.33331 15.3333 1.99998 15.3333 7.99998C15.3333 14 9.55529 14.6666 6.66663 14.6666"
Expand All @@ -71,14 +71,14 @@ function NavbarHome() {
<path
d="M4.8125 13.25H7.5625H4.8125ZM1.375 5.01665C1.375 3.84085 1.88203 2.71322 2.78455 1.88181C3.68707 1.05039 4.91115 0.583313 6.1875 0.583313C7.46385 0.583313 8.68793 1.05039 9.59045 1.88181C10.493 2.71322 11 3.84085 11 5.01665C11.0005 5.73046 10.813 6.43373 10.4538 7.06621C10.0946 7.69869 9.57432 8.24152 8.9375 8.64818L8.56488 10.2733C8.51554 10.5729 8.35129 10.8462 8.10192 11.0437C7.85255 11.2413 7.53458 11.3499 7.20569 11.35H5.16931C4.84043 11.3499 4.52245 11.2413 4.27308 11.0437C4.02371 10.8462 3.85946 10.5729 3.81013 10.2733L3.4375 8.65515C2.80047 8.24704 2.28014 7.70294 1.92098 7.06934C1.56182 6.43573 1.37449 5.73144 1.375 5.01665V5.01665Z"
stroke="#0C0C0C"
stroke-linecap="round"
stroke-linejoin="round"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M3.125 8.5H9.25"
stroke="#0C0C0C"
stroke-linecap="round"
stroke-linejoin="round"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
<span>Statistics</span>
Expand Down
Loading

0 comments on commit c2c1d25

Please sign in to comment.