diff --git a/src/App.tsx b/src/App.tsx index 2859b18..a76fab7 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -10,7 +10,7 @@ const App = (): JSX.Element => { return (
-
{appRoutes}
+
{appRoutes}
); }; diff --git a/src/assets/images/arrow.svg b/src/assets/images/arrow.svg new file mode 100644 index 0000000..411752c --- /dev/null +++ b/src/assets/images/arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/stylesheets/application.scss b/src/assets/stylesheets/application.scss index 20d428b..8fdae55 100644 --- a/src/assets/stylesheets/application.scss +++ b/src/assets/stylesheets/application.scss @@ -35,9 +35,6 @@ body { } .survey-swiper { - width: 820px; - height: 100%; - .swiper-pagination-bullet { width: 0.5rem; @@ -48,4 +45,20 @@ body { .swiper-pagination-bullet-active { opacity: 1; } + + &.swiper-pagination { + bottom: 2rem !important; + } +} + +.arrow-button { + width: 56px; + height: 56px; + + border-radius: 9999px; + + background-color: #fff; + background-image: url('../images/arrow.svg'); + background-repeat: no-repeat; + background-position: center; } diff --git a/src/components/Survey/index.tsx b/src/components/Survey/index.tsx index b88f4bf..0b4e44c 100644 --- a/src/components/Survey/index.tsx +++ b/src/components/Survey/index.tsx @@ -7,9 +7,17 @@ type SurveyProps = { function Survey({ title, description, coverImageUrl }: SurveyProps) { return (
- cover -

{title}

-

{description}

+ cover +
+
+

{title}

+

{description}

+
+
+ {/* TODO: Convert to Link for Survey Detail page */} + +
+
); } diff --git a/src/components/SurveyList/index.tsx b/src/components/SurveyList/index.tsx index c2db806..d264c03 100644 --- a/src/components/SurveyList/index.tsx +++ b/src/components/SurveyList/index.tsx @@ -1,8 +1,6 @@ import { Pagination } from 'swiper'; import { Swiper, SwiperSlide } from 'swiper/react'; -// Styles -// import 'swiper/swiper.min.css'; import 'swiper/swiper-bundle.min.css'; import SurveyComponent from 'components/Survey'; @@ -12,21 +10,27 @@ type SurveyListProps = { surveys: Survey[] }; function SurveyList({ surveys }: SurveyListProps) { return ( - - {surveys.map((survey) => { - return ( - - - - ); - })} - + <> + + {surveys.map((survey) => { + return ( + <> + + + + + ); + })} + +
+ ); } diff --git a/src/screens/Home/index.test.tsx b/src/screens/Home/index.test.tsx index 436904d..bc4c505 100644 --- a/src/screens/Home/index.test.tsx +++ b/src/screens/Home/index.test.tsx @@ -6,9 +6,9 @@ describe('HomeScreen', () => { test('renders learn react link', () => { render(); - const mainHeadingElement = screen.getByTestId('app-main-heading'); + const surveyLoadingElement = screen.getByTestId('loading-surveys'); - expect(mainHeadingElement).toBeInTheDocument(); - expect(mainHeadingElement).toHaveTextContent('Home Screen'); + expect(surveyLoadingElement).toBeInTheDocument(); + expect(surveyLoadingElement).toHaveTextContent('Loading Surveys'); }); }); diff --git a/src/screens/Home/index.tsx b/src/screens/Home/index.tsx index 4654366..486abde 100644 --- a/src/screens/Home/index.tsx +++ b/src/screens/Home/index.tsx @@ -36,7 +36,7 @@ const HomeScreen = (): JSX.Element => { }, []); if (!loaded) { - return

Loading Surveys

; + return

Loading Surveys

; } return ( @@ -46,9 +46,9 @@ const HomeScreen = (): JSX.Element => {

Today

-
+
-
+ ); };