Merge WordCloudWidth changes
continuous-integration/drone/push Build is passing Details

This commit is contained in:
e26chiu 2022-12-04 19:51:20 -05:00
parent 451845f87d
commit 2f18dcc738
1 changed files with 7 additions and 6 deletions

View File

@ -43,6 +43,7 @@ import {
pieChartProps, pieChartProps,
barGraphMargin, barGraphMargin,
barGraphWidth, barGraphWidth,
wordCloudWidth,
} from "utils/defaultProps"; } from "utils/defaultProps";
import { useWindowDimensions } from "utils/getWindowDimensions"; import { useWindowDimensions } from "utils/getWindowDimensions";
import { useIsMobile } from "utils/isMobile"; import { useIsMobile } from "utils/isMobile";
@ -156,7 +157,7 @@ export default function Academics() {
> >
<WordCloud <WordCloud
data={A8} data={A8}
width={isMobile ? pageWidth / 1.5 : 800} width={wordCloudWidth(isMobile, pageWidth)}
height={DefaultProp.graphHeight} height={DefaultProp.graphHeight}
wordPadding={7} wordPadding={7}
desktopMaxFontSize={75} desktopMaxFontSize={75}
@ -171,7 +172,7 @@ export default function Academics() {
> >
<WordCloud <WordCloud
data={A9} data={A9}
width={isMobile ? pageWidth / 1.5 : 800} width={wordCloudWidth(isMobile, pageWidth)}
height={DefaultProp.graphHeight} height={DefaultProp.graphHeight}
wordPadding={12} wordPadding={12}
desktopMaxFontSize={80} desktopMaxFontSize={80}
@ -186,7 +187,7 @@ export default function Academics() {
> >
<WordCloud <WordCloud
data={A10} data={A10}
width={isMobile ? pageWidth / 1.5 : 800} width={wordCloudWidth(isMobile, pageWidth)}
height={DefaultProp.graphHeight} height={DefaultProp.graphHeight}
wordPadding={12} wordPadding={12}
desktopMaxFontSize={84} desktopMaxFontSize={84}
@ -200,7 +201,7 @@ export default function Academics() {
> >
<WordCloud <WordCloud
data={A11} data={A11}
width={isMobile ? pageWidth / 1.5 : 800} width={wordCloudWidth(isMobile, pageWidth)}
height={DefaultProp.graphHeight} height={DefaultProp.graphHeight}
wordPadding={20} wordPadding={20}
desktopMaxFontSize={80} desktopMaxFontSize={80}
@ -225,7 +226,7 @@ export default function Academics() {
> >
<WordCloud <WordCloud
data={A14} data={A14}
width={isMobile ? pageWidth / 1.5 : 800} width={wordCloudWidth(isMobile, pageWidth)}
height={DefaultProp.graphHeight} height={DefaultProp.graphHeight}
wordPadding={7} wordPadding={7}
desktopMaxFontSize={75} desktopMaxFontSize={75}
@ -312,7 +313,7 @@ export default function Academics() {
<WordCloud <WordCloud
// TODO: Tweak WordCloud values // TODO: Tweak WordCloud values
data={A18i} data={A18i}
width={isMobile ? pageWidth / 1.5 : 800} width={wordCloudWidth(isMobile, pageWidth)}
height={DefaultProp.graphHeight} height={DefaultProp.graphHeight}
wordPadding={7} wordPadding={7}
desktopMaxFontSize={42} desktopMaxFontSize={42}