diff --git a/src/components/AdvisersSection/AdvisersSection.module.scss b/src/components/AdvisersSection/AdvisersSection.module.scss
index 940d36a..17d1509 100644
--- a/src/components/AdvisersSection/AdvisersSection.module.scss
+++ b/src/components/AdvisersSection/AdvisersSection.module.scss
@@ -1,4 +1,12 @@
.sectionContent {
overflow-x: scroll;
- width: calc(100% + 16px);
+ width: calc(100% + 32px);
+ padding: 16px;
+ padding-right: 0;
+ margin: -16px;
+ margin-right: 0;
+}
+
+.grid {
+ padding-right: 16px;
}
\ No newline at end of file
diff --git a/src/components/AdvisersSection/AdvisersSection.tsx b/src/components/AdvisersSection/AdvisersSection.tsx
index 9659f94..321778c 100644
--- a/src/components/AdvisersSection/AdvisersSection.tsx
+++ b/src/components/AdvisersSection/AdvisersSection.tsx
@@ -19,7 +19,7 @@ const advisers = [
export default function AdvisersSection() {
return (
-
+
{advisers.map((adviser, index) => (
))}
diff --git a/src/components/CompatibilitySection/CompatibilitySection.module.scss b/src/components/CompatibilitySection/CompatibilitySection.module.scss
index 940d36a..15f758e 100644
--- a/src/components/CompatibilitySection/CompatibilitySection.module.scss
+++ b/src/components/CompatibilitySection/CompatibilitySection.module.scss
@@ -1,4 +1,10 @@
.sectionContent {
overflow-x: scroll;
- width: calc(100% + 16px);
+ width: calc(100% + 32px);
+ padding: 16px;
+ margin: -16px;
+}
+
+.grid {
+ padding-right: 16px;
}
\ No newline at end of file
diff --git a/src/components/CompatibilitySection/CompatibilitySection.tsx b/src/components/CompatibilitySection/CompatibilitySection.tsx
index ff5cbb4..64b57fa 100644
--- a/src/components/CompatibilitySection/CompatibilitySection.tsx
+++ b/src/components/CompatibilitySection/CompatibilitySection.tsx
@@ -19,7 +19,7 @@ const compatibilities = [
export default function CompatibilitySection() {
return (
-
+
{compatibilities.map((compatibility, index) => (
))}
diff --git a/src/components/Horoscope/Horoscope.module.scss b/src/components/Horoscope/Horoscope.module.scss
index 59128c0..8b1dc2a 100644
--- a/src/components/Horoscope/Horoscope.module.scss
+++ b/src/components/Horoscope/Horoscope.module.scss
@@ -24,8 +24,13 @@
flex-direction: column;
padding-inline: 8px;
gap: 20px;
+ transition: height 2s ease;
}
-.seeAll {
- text-align: right;
+.seeAllButton {
+ padding: 0 !important;
+ background: none !important;
+ border-radius: 0 !important;
+ width: fit-content !important;
+ margin-left: auto;
}
\ No newline at end of file
diff --git a/src/components/Horoscope/Horoscope.tsx b/src/components/Horoscope/Horoscope.tsx
index b485f44..6353501 100644
--- a/src/components/Horoscope/Horoscope.tsx
+++ b/src/components/Horoscope/Horoscope.tsx
@@ -1,10 +1,11 @@
"use client";
-import { useState } from "react";
+import { useMemo, useState } from "react";
import TabBar, { Tab } from "../ui/TabBar/TabBar";
import Text from "../ui/Typography/Typography";
import styles from "./Horoscope.module.scss";
import Card from "../ui/Card/Card";
+import Button from "../ui/Button/Button";
type Period = "today" | "week" | "month" | "year";
@@ -16,7 +17,7 @@ const TABS: Tab[] = [
];
const HOROSCOPE_TEXT = {
- today: "Today, Cancer men should trust their intuition — it will guide them through a tricky moment. A pleasant surprise from a loved one is likely. Spend the evening in comfort and calm.",
+ today: "Today, Cancer men should trust their intuition — it will guide them through a tricky moment. A pleasant surprise from a loved one is likely. Spend the evening in comfort and calm. Today, Cancer men should trust their intuition — it will guide them through a tricky moment. A pleasant surprise from a loved one is likely. Spend the evening in comfort and calm.",
week: "Weekly horoscope text...",
month: "Monthly horoscope text...",
year: "Yearly horoscope text...",
@@ -24,6 +25,16 @@ const HOROSCOPE_TEXT = {
export default function Horoscope() {
const [active, setActive] = useState("today");
+ const [isCollapsed, setIscollapsed] = useState(true)
+
+ const enableCollapse = useMemo(() => {
+ return HOROSCOPE_TEXT[active]?.split(" ")?.length > 30
+ }, [active])
+
+ const text = useMemo(() => {
+ if (!isCollapsed || !enableCollapse) return HOROSCOPE_TEXT[active];
+ return HOROSCOPE_TEXT[active]?.split(" ").slice(0, 31).join(" ") + " ..."
+ }, [isCollapsed, active, enableCollapse])
return (
@@ -33,11 +44,13 @@ export default function Horoscope() {
— Your Horoscope today —
- {HOROSCOPE_TEXT[active]}
-
-
- See All
+ {text}
+ {enableCollapse && }
);
diff --git a/src/components/MeditationSection/MeditationSection.module.scss b/src/components/MeditationSection/MeditationSection.module.scss
index 940d36a..15f758e 100644
--- a/src/components/MeditationSection/MeditationSection.module.scss
+++ b/src/components/MeditationSection/MeditationSection.module.scss
@@ -1,4 +1,10 @@
.sectionContent {
overflow-x: scroll;
- width: calc(100% + 16px);
+ width: calc(100% + 32px);
+ padding: 16px;
+ margin: -16px;
+}
+
+.grid {
+ padding-right: 16px;
}
\ No newline at end of file
diff --git a/src/components/MeditationSection/MeditationSection.tsx b/src/components/MeditationSection/MeditationSection.tsx
index c30fafc..82a32ef 100644
--- a/src/components/MeditationSection/MeditationSection.tsx
+++ b/src/components/MeditationSection/MeditationSection.tsx
@@ -14,7 +14,7 @@ const meditations = [
export default function MeditationSection() {
return (
-
+
{meditations.map((meditation, index) => (
))}
diff --git a/src/components/NavigationBar/NavigationBar.tsx b/src/components/NavigationBar/NavigationBar.tsx
index 2dd3905..0790483 100644
--- a/src/components/NavigationBar/NavigationBar.tsx
+++ b/src/components/NavigationBar/NavigationBar.tsx
@@ -1,10 +1,17 @@
import Logo from "../Logo/Logo"
import Icon, { IconName } from "../ui/Icon/Icon"
import styles from "./NavigationBar.module.scss"
+import clsx from "clsx";
-export default function NavigationBar() {
+interface NavigationBarProps {
+ className?: string;
+}
+
+export default function NavigationBar({
+ className
+}: NavigationBarProps) {
return (
-