Skip to content
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

Jump to bottom

Fix finish drawing screen have 3 buttons: go to form, story, gallery #72

Merged
merged 3 commits into from
Oct 21, 2021
Merged

Fix finish drawing screen have 3 buttons: go to form, story, gallery #72

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b921a37
fix: have button for view story, gallery and go to form on hub and co…
nicolauscg Oct 21, 2021
3e1e85e
fix: change goto story button wording
nicolauscg Oct 21, 2021
c9d41e4
Merge branch 'master' into fix/finish-drawing-screen
daystram Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion fableous-fe/src/containers/ControllerCanvasPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,22 @@ export default function ControllerCanvasPage() {
variant="contained"
color="secondary"
component={Link}
endIcon={<Icon fontSize="small">photo</Icon>}
to={`/gallery/${sessionInfo?.classroomId}/${sessionInfo?.sessionId}`}
className="mb-2"
>
View completed story
</Button>
</Grid>
<Grid item xs={12}>
<Button
variant="contained"
color="secondary"
component={Link}
endIcon={<Icon fontSize="small">book</Icon>}
to={`/gallery/${sessionInfo?.classroomId}`}
>
View story in gallery
View classroom gallery
</Button>
</Grid>
</>
Expand Down
60 changes: 54 additions & 6 deletions fableous-fe/src/containers/HubCanvasPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import useAxios from "axios-hooks";
import { Formik, FormikHelpers } from "formik";
import { useSnackbar } from "notistack";
import { useRef, useEffect, useState, useCallback } from "react";
import { useHistory, useParams } from "react-router-dom";
import { Link, useHistory, useParams } from "react-router-dom";
import * as yup from "yup";
import { restAPI, wsAPI } from "../api";
import { APIResponse, Manifest, Session, Story } from "../data";
Expand Down Expand Up @@ -43,6 +43,7 @@ enum HubState {
SessionForm = "SESSION_FORM",
WaitingRoom = "WAITING_ROOM",
DrawingSession = "DRAWING_SESSION",
StoryFinished = "STORY_FINISHED",
}

export default function HubCanvasPage() {
Expand All @@ -51,7 +52,9 @@ export default function HubCanvasPage() {
const { enqueueSnackbar } = useSnackbar();
const [hubState, setHubState] = useState<HubState>(HubState.SessionForm);
const [wsConn, setNewWsConn, clearWsConn] = useWsConn();
const [classroomToken, setClassroomToken] = useState("");
const [sessionInfo, setSessionInfo] = useState<
pb.WSControlMessageData | undefined
>();
const [joinedControllers, setJoinedControllers] = useState<
{
[key in StudentRole]?: string;
Expand Down Expand Up @@ -185,7 +188,7 @@ export default function HubCanvasPage() {
done,
} = msg.control as pb.WSControlMessageData;
if (classroomTokenFromWs) {
setClassroomToken(classroomTokenFromWs);
setSessionInfo(msg.control as pb.WSControlMessageData);
}
if (help) {
enqueueSnackbar(`${ROLE_ICON[msg.role].text} needs a hand!`, {
Expand Down Expand Up @@ -410,6 +413,7 @@ export default function HubCanvasPage() {
// redirect back if session already initialised
useEffect(() => {
executeGetOngoingSession().then(() => {
// executeGetOngoingSession will return 404 if there are no ongoing session
history.push("/");
});
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down Expand Up @@ -447,7 +451,7 @@ export default function HubCanvasPage() {
if (hubState === HubState.SessionForm) {
setCurrentPageIdx(0);
setStory(undefined);
setClassroomToken("");
setSessionInfo(undefined);
setJoinedControllers({});
setFocusLayer(undefined);
setHelpControllers(INIT_FLAG);
Expand All @@ -459,7 +463,7 @@ export default function HubCanvasPage() {
useEffect(() => {
if (currentPageIdx && story && currentPageIdx > story.pages) {
enqueueSnackbar("Story completed!", { variant: "success" });
setHubState(HubState.SessionForm);
setHubState(HubState.StoryFinished);
achievementReset();
}
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down Expand Up @@ -487,6 +491,7 @@ export default function HubCanvasPage() {
[HubState.SessionForm]: "New Story",
[HubState.WaitingRoom]: "Lobby",
[HubState.DrawingSession]: "",
[HubState.StoryFinished]: "Finished!",
}[hubState]
}
</Typography>
Expand Down Expand Up @@ -722,7 +727,10 @@ export default function HubCanvasPage() {
</Grid>
</Grid>
<Grid item xs={12} className="flex mt-2">
<Chip color="primary" label={classroomToken} />
<Chip
color="primary"
label={sessionInfo?.classroomToken || ""}
/>
<div className="flex flex-grow" />
<Button
color="secondary"
Expand All @@ -739,6 +747,46 @@ export default function HubCanvasPage() {
</Card>
</Grid>
)}
{hubState === HubState.StoryFinished && (
<>
<Grid item xs={12}>
<Button
variant="contained"
color="primary"
endIcon={<Icon fontSize="small">brush</Icon>}
className="mb-2"
onClick={() => {
setHubState(HubState.SessionForm);
}}
>
Create another session
</Button>
</Grid>
<Grid item xs={12}>
<Button
variant="contained"
color="secondary"
component={Link}
endIcon={<Icon fontSize="small">photo</Icon>}
to={`/gallery/${sessionInfo?.classroomId}/${sessionInfo?.sessionId}`}
className="mb-2"
>
View completed story
</Button>
</Grid>
<Grid item xs={12}>
<Button
variant="contained"
color="secondary"
component={Link}
endIcon={<Icon fontSize="small">book</Icon>}
to={`/gallery/${sessionInfo?.classroomId}`}
>
View classroom gallery
</Button>
</Grid>
</>
)}
</div>
<div
className={`flex flex-col w-full ${
Expand Down