diff --git a/src/GlobalStyle.jsx b/src/GlobalStyle.jsx
index 08c2a4d..259e05e 100644
--- a/src/GlobalStyle.jsx
+++ b/src/GlobalStyle.jsx
@@ -1,6 +1,88 @@
import { createGlobalStyle } from 'styled-components';
const GlobalStyle = createGlobalStyle`
+ /* http://meyerweb.com/eric/tools/css/reset/
+ v2.0 | 20110126
+ License: none (public domain)
+ */
+
+ * {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+
+ /* HTML5 display-role reset for older browsers */
+ article,
+ aside,
+ details,
+ figcaption,
+ figure,
+ footer,
+ header,
+ hgroup,
+ menu,
+ nav,
+ section {
+ display: block;
+ }
+
+ body {
+ line-height: 1;
+ }
+
+ ol,
+ ul {
+ list-style: none;
+ }
+
+ blockquote,
+ q {
+ quotes: none;
+ }
+
+ blockquote:before,
+ blockquote:after,
+ q:before,
+ q:after {
+ content: '';
+ content: none;
+ }
+
+ table {
+ border-collapse: collapse;
+ border-spacing: 0;
+ }
+
+ a {
+ text-decoration: none;
+ color: #000;
+ }
+
+ .txt-hide {
+ position: absolute;
+ overflow: hidden;
+ clip-path: inset(50%);
+ width: 1px;
+ height: 1px;
+ }
+
+ img {
+ vertical-align: top;
+ }
+
+ button {
+ background: none;
+ font: inherit;
+ color: inherit;
+ cursor: pointer;
+ }
+
.a11y-hidden {
clip: rect(1px, 1px, 1px, 1px);
clip-path: inset(50%);
@@ -116,89 +198,6 @@ const GlobalStyle = createGlobalStyle`
strong {
font-weight: bold;
}
-
- /* http://meyerweb.com/eric/tools/css/reset/
- v2.0 | 20110126
- License: none (public domain)
-*/
-
- * {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font: inherit;
- vertical-align: baseline;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- }
-
- /* HTML5 display-role reset for older browsers */
- article,
- aside,
- details,
- figcaption,
- figure,
- footer,
- header,
- hgroup,
- menu,
- nav,
- section {
- display: block;
- }
-
- body {
- line-height: 1;
- }
-
- ol,
- ul {
- list-style: none;
- }
-
- blockquote,
- q {
- quotes: none;
- }
-
- blockquote:before,
- blockquote:after,
- q:before,
- q:after {
- content: '';
- content: none;
- }
-
- table {
- border-collapse: collapse;
- border-spacing: 0;
- }
-
- a {
- text-decoration: none;
- color: #000;
- }
-
- .txt-hide {
- position: absolute;
- overflow: hidden;
- clip-path: inset(50%);
- width: 1px;
- height: 1px;
- }
-
- img {
- vertical-align: top;
- }
-
- button {
- background: none;
- font: inherit;
- color: inherit;
- cursor: pointer;
- }
-
`
export default GlobalStyle;
diff --git a/src/components/organisms/Header/Hamburger.jsx b/src/components/organisms/Header/Hamburger.jsx
index fcb4fe6..cdf9d73 100644
--- a/src/components/organisms/Header/Hamburger.jsx
+++ b/src/components/organisms/Header/Hamburger.jsx
@@ -1,16 +1,88 @@
import React from 'react'
+import styled from 'styled-components'
+
+const DivHamburger = styled.div`
+ #hamburger {
+ width: 40px;
+ height: 40px;
+ padding: 8px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ }
+
+ #hamburger div {
+ width: 100%;
+ height: 2px;
+ border-radius: 4px;
+ background-color: var(--icon);
+ transition: all 0.3s;
+ }
+ /* hover */
+ #hamburger:hover div:first-child{
+ transform: rotate(45deg);
+ }
+
+ #hamburger:hover div:nth-child(2){
+ transform: translate(-1em);
+ }
+
+ #hamburger:hover div:nth-child(3){
+ transform: rotate(-45deg);
+ }
+ /* active */
+ #hamburger:active div:first-child{
+ transform: translate(0.5em) rotate(45deg) ;
+ }
+
+ #hamburger:active div:nth-child(2){
+ transform: translate(-0.5em) ;
+ }
+
+ #hamburger:active div:nth-child(3){
+ transform: translate(0.5em) rotate(-45deg) ;
+ }
+
+ /* opened */
+ /* opened:hover */
+ #hamburger.opened:hover div:first-child{
+ transform: translate(-1em) rotate(-45deg) ;
+ }
+
+ #hamburger.opened:hover div:nth-child(2){
+ transform: translate(0) ;
+ }
+
+ #hamburger.opened:hover div:nth-child(3){
+ transform: translate(-1em) rotate(45deg) ;
+ }
+ /* opened:active */
+ #hamburger.opened:active div:first-child{
+ transform: translate(-1.5em) rotate(-45deg) ;
+ }
+
+ #hamburger.opened:active div:nth-child(2){
+ transform: translate(-0.5em) ;
+ }
+
+ #hamburger.opened:active div:nth-child(3){
+ transform: translate(-1.5em) rotate(45deg) ;
+ }
+`
export default function Hamburger({ isMenuOpen, handleMenu }) {
return (
-
+
당장복습헤_logo
- + diff --git a/src/components/organisms/Header/Header.style.jsx b/src/components/organisms/Header/Header.style.jsx index 3d0cfcc..4c10e0c 100644 --- a/src/components/organisms/Header/Header.style.jsx +++ b/src/components/organisms/Header/Header.style.jsx @@ -1,4 +1,6 @@ import styled from "styled-components"; +import logoSm from "../../../images/당장복습헤_logo 1.png"; +import logoXs from "../../../images/logo-xs.png"; export const Header = styled.header` position: sticky; @@ -6,7 +8,7 @@ export const Header = styled.header` width: 100%; border-bottom: 2px solid var(--bg); background-color: var(--bg-3, #263140); - z-index: 10; + z-index: 30; .container { width: 100%; @@ -31,75 +33,12 @@ export const Header = styled.header` align-items: center; } - #hamburger { - width: 40px; - height: 40px; - padding: 8px; - display: flex; - flex-direction: column; - justify-content: space-around; - } - - #hamburger div { - width: 100%; - height: 2px; - border-radius: 4px; - background-color: var(--icon); - transition: all 0.3s; - } - /* hover */ - #hamburger:hover div:first-child{ - transform: rotate(45deg); - } - - #hamburger:hover div:nth-child(2){ - transform: translate(-1em); - } - - #hamburger:hover div:nth-child(3){ - transform: rotate(-45deg); - } - /* active */ - #hamburger:active div:first-child{ - transform: translate(0.5em) rotate(45deg) ; - } - - #hamburger:active div:nth-child(2){ - transform: translate(-0.5em) ; - } - - #hamburger:active div:nth-child(3){ - transform: translate(0.5em) rotate(-45deg) ; - } - - /* opened */ - /* opened:hover */ - #hamburger.opened:hover div:first-child{ - transform: translate(-1em) rotate(-45deg) ; - } - - #hamburger.opened:hover div:nth-child(2){ - transform: translate(0) ; - } - - #hamburger.opened:hover div:nth-child(3){ - transform: translate(-1em) rotate(45deg) ; - } - /* opened:active */ - #hamburger.opened:active div:first-child{ - transform: translate(-1.5em) rotate(-45deg) ; - } - - #hamburger.opened:active div:nth-child(2){ - transform: translate(-0.5em) ; - } - - #hamburger.opened:active div:nth-child(3){ - transform: translate(-1.5em) rotate(45deg) ; - } - .logo-sm { - width: 135px + width: 135px; + height: 32px; + margin: 8px; + background: url(${logoSm}) no-repeat; + background-size: contain; } h1 { @@ -135,4 +74,21 @@ export const Header = styled.header` gap: 4px; } + @media (max-width: 475px) { + .logo-sm { + width: 32px; + padding: 4px; + box-sizing: border-box; + background: url(${logoXs}) no-repeat; + background-size: contain; + } + + .info { + gap: 4px; + } + + .text-logout { + display: none; + } + } ` \ No newline at end of file diff --git a/src/hooks/useCollection.jsx b/src/hooks/useCollection.jsx index 7461c28..d0a0574 100644 --- a/src/hooks/useCollection.jsx +++ b/src/hooks/useCollection.jsx @@ -16,9 +16,9 @@ function useCollection (transaction, myQuery) { // sever의 데이터르 ㄹ불 collection(appFireStore, transaction), where(...myQuery) ); - console.log('myQuery', myQuery); - console.log('q',q); - console.log('collection', collection(appFireStore, transaction)) + // console.log('myQuery', myQuery); + // console.log('q',q); + // console.log('collection', collection(appFireStore, transaction)) } const unsubscribe = onSnapshot( // 구독을 끊어주는 함수 반환 diff --git a/src/images/gif/as-is.gif b/src/images/gif/as-is.gif new file mode 100644 index 0000000..57dbf50 Binary files /dev/null and b/src/images/gif/as-is.gif differ diff --git a/src/images/gif/to-be.gif b/src/images/gif/to-be.gif new file mode 100644 index 0000000..842e8a0 Binary files /dev/null and b/src/images/gif/to-be.gif differ diff --git a/src/images/logo-xs.png b/src/images/logo-xs.png new file mode 100644 index 0000000..0832cd2 Binary files /dev/null and b/src/images/logo-xs.png differ diff --git a/src/pages/home/DiaryList.jsx b/src/pages/home/DiaryList.jsx index 159e078..741d2af 100644 --- a/src/pages/home/DiaryList.jsx +++ b/src/pages/home/DiaryList.jsx @@ -6,7 +6,7 @@ import * as H from "./Home.style.jsx" function DiaryList ({ diaries }) { const { deleteDocument } = useFirestore('diary'); - console.log('diaries', diaries); + // console.log('diaries', diaries); const oldDiaries = diaries.map((item) => { return ( diff --git a/src/pages/home/Home.jsx b/src/pages/home/Home.jsx index a07a2bb..94b9543 100644 --- a/src/pages/home/Home.jsx +++ b/src/pages/home/Home.jsx @@ -32,8 +32,8 @@ export default function Home({isMenuOpen, setIsMenuOpen}) {60% 를 더 기억할 수 있어요!
*/}