diff --git a/src/App.scss b/src/App.scss index 254ee0d..9d42a01 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,5 +1,7 @@ @import "./constants/size.scss"; @import "./views/Home/Page1/index.scss"; +@import "./views/Home/Page2/index.scss"; + .App { direction: rtl; diff --git a/src/assets/images/woody-background.svg b/src/assets/images/woody-background.svg new file mode 100644 index 0000000..4563ebf --- /dev/null +++ b/src/assets/images/woody-background.svg @@ -0,0 +1,8 @@ + diff --git a/src/utils/scroll.js b/src/utils/scroll.js index f6ba647..4aa40f8 100644 --- a/src/utils/scroll.js +++ b/src/utils/scroll.js @@ -3,16 +3,16 @@ class scroll { const height = Number(window.innerHeight); const scrollY = Number(window.scrollY); if (index === 1) { - if (scrollY === 0) { - return 0; - } - if(scrollY > 0 && scrollY < height) { - return -scrollY; - } - if(scrollY === height){ - // return '-1' + height; - alert('kir'); - } + return 0; + // if (scrollY === 0) { + // return 0; + // } + // if(scrollY > 0 && scrollY < 2 * height) { + // return -scrollY; + // } + // if(scrollY === 2 * height){ + // return -height; + // } }else if (index === 2) { if (scrollY === 0) { @@ -29,10 +29,10 @@ class scroll { if (scrollY <= height) { return height; } - if (scrollY > height && scrollY < 2 * height) { + if (scrollY > height && scrollY < 3 * height) { return 2 * height - scrollY; } - if(scrollY === 3 * height){ + if(scrollY === 4 * height){ return -height; } }else diff --git a/src/views/Home/Page1/Book/index.js b/src/views/Home/Page1/Book/index.js index 770b40c..f41dd70 100644 --- a/src/views/Home/Page1/Book/index.js +++ b/src/views/Home/Page1/Book/index.js @@ -5,7 +5,7 @@ import { Link } from "react-router-dom"; export default function Book({ book }) { return ( - + diff --git a/src/views/Home/Page1/index.js b/src/views/Home/Page1/index.js index d80d370..53341f3 100644 --- a/src/views/Home/Page1/index.js +++ b/src/views/Home/Page1/index.js @@ -63,7 +63,6 @@ export default function Page1({ list, page }) { className="absolute transform left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />