Skip to content

Fixing bugs #1436

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

Open
csl5623 wants to merge 1 commit into
base: development/imagine26
Choose a base branch
from
Open

Fixing bugs #1436

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
Binary file modified client/public/img/imagine26/deepfakeGenerations/image0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/videos/imagine26/0control.mp4
View file
Open in desktop
Binary file not shown.
Binary file added client/public/videos/imagine26/0experiential.mp4
View file
Open in desktop
Binary file not shown.
Binary file added client/public/videos/imagine26/0expression.mp4
View file
Open in desktop
Binary file not shown.
Binary file added client/public/videos/imagine26/0playingGalaga.mp4
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion client/src/components/imagine26/components/Chat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const ChatComponent = (props) =>{
}
const groupMap = {
experiential:"That image is so crazy, did you really say that? How do you feel?",
expression: "THAT IS A FAKE IMAGE. What do you think about this?"
expression: "THAT IS A FAKE IMAGE. I NEVER SAID THAT !!"
}

return (
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/imagine26/components/Frame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const Frame = (content, nextOnClick, prevOnClick) => {
<div className="d-flex justify-content-center tw-py-6">
<div className="tw-h-auto">{content}</div>
</div>
<div className="tw-flex tw-justify-between tw-w-1/2 tw-absolute tw-bottom-10">
<div className="tw-flex tw-justify-between tw-w-1/2 tw-pb-10 tw-pt-4">
{prev}
{next}
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/imagine26/pages/ChatRoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const ChatRoom = () => {
console.log(group)
const contentSizing = "tw-flex tw-flex-col tw-items-center tw-justify-between tw-gap-5 tw-border tw-rounded-xl tw-w-[46vw] tw-h-[39vw] xxl:tw-h-[600px] xxl:tw-w-[800px] tw-pt-[2rem] tw-pb-10 tw-mx-auto";
const handleNavigation = ()=>{
navigate("/Imagine2026/PostSurvey")
navigate("/Imagine2026/ReadingSection")
}
return (
<>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/imagine26/pages/Game.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ const Game = () => {
useEffect(() => {
//for testing purposes we can change the teammate id to 1 since we have 1 video, when we have all videos we need to uncomment the code below
// const id = Math.floor(Math.random() * 4);
setTeammateId(1);
setTeammateId(0);
}, []);

return (
Expand Down
10 changes: 8 additions & 2 deletions client/src/components/imagine26/pages/ReadingSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,20 @@ const ReadingSection = () => {
return (
<>
<div className="tw-flex tw-flex-col tw-h-full tw-w-full">
<div className="tw-mb-6 tw-pt-2">
{/* <div className="tw-mb-6 tw-pt-2">
<ImagineHeader title="DeepFake 101" />
</div>
</div> */}

{Frame(
<div className="tw-flex tw-flex-col tw-h-full tw-w-full">
<div className="tw-flex-1 tw-overflow-y-auto tw-px-6 tw-pb-6">
<div className="tw-w-full tw-max-w-3xl tw-mx-auto tw-space-y-6">
<div className="tw-top-3 tw-w-[96%] tw-mb-[-5%]">
<h3 className={"tw-title tw-pb-3"}>Deepfake 101</h3>
<div className={"tw-flex tw-justify-center"}>
<hr className={"tw-w-3/5 tw-bg-labLightGray"} />
</div>
</div>
<section className="tw-bg-white tw-rounded-xl tw-p-6 tw-shadow-sm">
<p className="tw-body-text tw-leading-8">
<strong>What is a deepfake?</strong> A deepfake is
Expand Down
12 changes: 6 additions & 6 deletions client/src/constants/imagine26/Videos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
//use the imagin25 video instead

const videoPaths = {
0: "/videos/imagine26/video0.mp4",
0: "/videos/imagine26/0playingGalaga.mp4",
1: "../videos/imagine26/1playingGalaga.mp4",
2: "../videos/imagine26/video2.mp4",
3: "../videos/imagine26/video3.mp4",
2: "../videos/imagine26/2playingGalag.mp4",
3: "../videos/imagine26/3playingGalag.mp4",
};

//these are the videos shown when the user sees their score ( we need to add the videos for temmate 0,2,3)
const scorePagePaths = {
0: "/videos/imagine26/video0.mp4",
0: "/videos/imagine26/0control.mp4",
1: "../videos/imagine26/1control.mp4",
2: "../videos/imagine26/video2.mp4",
3: "../videos/imagine26/video3.mp4",
2: "../videos/imagine26/2control.mp4",
3: "../videos/imagine26/3control.mp4",
};

//these are the videos shown to the user during the exercise portion dependin on their group (we need to add the vidoes for 0,2,3)
Expand Down