diff --git a/junction-ayy/src/App.css b/junction-ayy/src/App.css index d477471..f0c8dd1 100644 --- a/junction-ayy/src/App.css +++ b/junction-ayy/src/App.css @@ -55,10 +55,29 @@ ul { .card-small { height: 220px; + display: flex; + flex-direction: column; + text-align: center; } .card-large { height: 560px; + display: flex; + flex-direction: column; +} + +.card-small .card-header { + margin-bottom: 12px; +} +.card-small p { + margin-bottom: 6px; +} + +.card-content { + flex-grow: 1; +} +.card-footer { + text-align: center; } .game-main { diff --git a/junction-ayy/src/squares/AyyFeed.jsx b/junction-ayy/src/squares/AyyFeed.jsx index 6450448..375f30b 100644 --- a/junction-ayy/src/squares/AyyFeed.jsx +++ b/junction-ayy/src/squares/AyyFeed.jsx @@ -1,6 +1,6 @@ import React from "react"; import { StyledCard } from "../StyledCard"; -import circle_img from "../assets/news-circle.svg"; +import news_circle from "../assets/news-circle.svg"; const AYY_DATA = [ { @@ -30,25 +30,29 @@ const AYY_DATA = [ export function AyyFeed() { return ( -

AYY NEWS

- {AYY_DATA.map((article, key) => { - return ( -
-

{article.title}

-

{article.date}

-
- ); - })} - news circle image +
+

AYY NEWS

+
+ +
+ {AYY_DATA.map((article, key) => { + return ( +
+

{article.title}

+

{article.date}

+
+ ); + })} +
+ +
+ news circle image +
); } @@ -57,18 +61,19 @@ export function AyyFeedSummary() { const latestTitle = AYY_DATA[0].title; return ( - -
-

AYY NEWS

-

{latestTitle}

+ +
+

AYY NEWS

+
+
+

{latestTitle}

+
+
news circle image
diff --git a/junction-ayy/src/squares/Messages.jsx b/junction-ayy/src/squares/Messages.jsx index 2d2592e..cb0ce36 100644 --- a/junction-ayy/src/squares/Messages.jsx +++ b/junction-ayy/src/squares/Messages.jsx @@ -11,38 +11,52 @@ import messages from "../assets/messages-circle.svg"; export function Messages() { return ( -
+

Messages

- {MESSAGES.map((message, key) => { - const classN = message.important ? "message important" : "message"; - const whichIcon = message.important ? faExclamation : faEnvelope; - return ( -
-
-
- - {message.text} +
+ {MESSAGES.map((message, key) => { + const classN = message.important ? "message important" : "message"; + const whichIcon = message.important ? faExclamation : faEnvelope; + + return ( +
+
+
+ + {message.text} +
+

+ {"- "} + {message.from} +

-

- {"- "} - {message.from} -

-
- ); - })} - messages circle image + ); + })} +
+ +
+ messages circle image +
); } @@ -52,24 +66,20 @@ export function MessagesSummary() { const other = MESSAGES.length - important; return ( - -
-

Messages

-
-

- {important} important - messages -

-

- {other} other messags -

-
+ +
+

Messages

+
+
+

+ {important} important + messages +

+

+ {other} other messags +

+
+
messages circle image -

Energy consumption

-

- When compared to the weekly average values. -

-
+
+

Energy consumption

+
+
chart image
+ +
); } @@ -77,24 +78,21 @@ export function SustainabilitySummary() { return ( -
-

- Energy consumption (last week): -

-
-

- Electricity consumption: {electricityData.current_week} kWh -

-

Water consumption: {waterData.current_week} m^3

-
+
+

Energy consumption (last week):

+
+
+

Electricity consumption: {electricityData.current_week} kWh

+

+ Water consumption: {waterData.current_week} m3 +

+
+
energy circle image