Skip to content

Prevent overflow on mobile /gameboard view #1211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2024
Merged

Prevent overflow on mobile /gameboard view #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/app/components/pages/Gameboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {GameboardDTO, GameboardItem, IsaacWildcard} from "../../../IsaacApiTypes
import {TitleAndBreadcrumb} from "../elements/TitleAndBreadcrumb";
import {
AUDIENCE_DISPLAY_FIELDS,
below,
determineAudienceViews,
filterAudienceViewsByProperties,
generateQuestionTitle,
Expand All @@ -26,6 +27,7 @@ import {
TAG_ID,
TAG_LEVEL,
tags,
useDeviceSize,
useUserViewingContext
} from "../../services";
import {Redirect} from "react-router";
Expand Down Expand Up @@ -78,6 +80,7 @@ const GameboardItemComponent = ({gameboard, question}: {gameboard: GameboardDTO,

const questionViewingContexts = filterAudienceViewsByProperties(determineAudienceViews(question.audience, question.creationContext), AUDIENCE_DISPLAY_FIELDS);
const userViewingContext = useUserViewingContext();
const deviceSize = useDeviceSize();
const currentUser = useAppSelector((state: AppState) => state?.user?.loggedIn && state.user || null);
const uniqueStage = questionViewingContexts.find(context => context.stage === userViewingContext.stage);
return <ListGroupItem key={question.id} className={itemClasses}>
Expand All @@ -87,11 +90,11 @@ const GameboardItemComponent = ({gameboard, question}: {gameboard: GameboardDTO,
<svg className={iconClasses}><use href={iconHref} xlinkHref={iconHref}/></svg>,
<div className={"inner-progress-icon"}>
<img src={iconHref} alt="" /><br/>
<span className={"icon-title"}>{message}</span>
<span className={"icon-title d-none d-sm-block"}>{message}</span>
</div>
)}
</span>
<div className={classNames("flex-fill", {"d-flex py-3 pe-3": isAda, "d-md-flex": isPhy})}>
<div className={classNames("flex-fill", {"d-flex py-3 pe-3 flex-column flex-md-row": isAda, "d-md-flex": isPhy})}>
{/* TODO CP shouldn't the subject colour here depend on the contents/tags of the gameboard? */}
<div className={"flex-grow-1 " + (itemSubject?.id ?? (isPhy ? "physics" : ""))}>
<Markup encoding={"latex"} className={classNames( "question-link-title", {"text-secondary": isPhy})}>
Expand All @@ -105,8 +108,7 @@ const GameboardItemComponent = ({gameboard, question}: {gameboard: GameboardDTO,
{questionTags.map(tag => (<span className="hierarchy-tag" key={tag.id}>{tag.title}</span>))}
</div>}
</div>

{question.audience && <StageAndDifficultySummaryIcons audienceViews={
{question.audience && <StageAndDifficultySummaryIcons stack={isAda && below['sm'](deviceSize)} audienceViews={
isPhy && !isTutorOrAbove(currentUser) && uniqueStage ? [uniqueStage] : questionViewingContexts
} />}
</div>
Expand Down Expand Up @@ -201,13 +203,13 @@ export const Gameboard = withRouter(({ location }) => {
<TitleAndBreadcrumb currentPageTitle={gameboard && gameboard.title || `Filter Generated ${siteSpecific("Gameboard", "Quiz")}`}/>
<GameboardViewer gameboard={gameboard} className="mt-4 mt-lg-5" />
{user && isTutorOrAbove(user)
? <Row className="col-8 offset-2">
<Col className="mt-4">
? <Row>
<Col xs={{size: 10, offset: 1}} sm={{size: 8, offset: 2}} md={{size: 6, offset: 0}} lg={{size: 4, offset: 2}} xl={{size: 3, offset: 2}} className="mt-4">
<Button tag={Link} to={`${PATHS.ADD_GAMEBOARD}/${gameboardId}`} color="primary" outline block>
{siteSpecific("Set as Assignment", "Set as assignment")}
</Button>
</Col>
<Col className="mt-4">
<Col xs={{size: 10, offset: 1}} sm={{size: 8, offset: 2}} md={{size: 6, offset: 0}} lg={4} xl={{size: 3, offset: 2}} className="mt-4">
<Button tag={Link} to={{pathname: PATHS.GAMEBOARD_BUILDER, search: `?base=${gameboardId}`}} color="primary" block outline>
{siteSpecific("Duplicate and Edit", "Duplicate and edit")}
</Button>
Expand Down
6 changes: 5 additions & 1 deletion src/scss/cs/boards.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,15 @@
}

.question-progress-icon {
min-width: 86px !important;
min-width: 58px !important;
display: block;
padding: 14px 0 !important;
position: relative;
align-content: center;
@include media-breakpoint-up(sm) {
min-width: 86px !important;
}

.inner-progress-icon {
@extend .text-center;
@extend .px-2;
Expand Down