diff --git a/client/public/img/imagine26/deepfakeGenerations/image0.png b/client/public/img/imagine26/deepfakeGenerations/image0.png index 962c6e076..52102a723 100644 Binary files a/client/public/img/imagine26/deepfakeGenerations/image0.png and b/client/public/img/imagine26/deepfakeGenerations/image0.png differ diff --git a/client/public/videos/imagine26/0control.mp4 b/client/public/videos/imagine26/0control.mp4 new file mode 100644 index 000000000..426c58dff Binary files /dev/null and b/client/public/videos/imagine26/0control.mp4 differ diff --git a/client/public/videos/imagine26/0experiential.mp4 b/client/public/videos/imagine26/0experiential.mp4 new file mode 100644 index 000000000..d5d19cf3b Binary files /dev/null and b/client/public/videos/imagine26/0experiential.mp4 differ diff --git a/client/public/videos/imagine26/0expression.mp4 b/client/public/videos/imagine26/0expression.mp4 new file mode 100644 index 000000000..258cb1796 Binary files /dev/null and b/client/public/videos/imagine26/0expression.mp4 differ diff --git a/client/public/videos/imagine26/0playingGalaga.mp4 b/client/public/videos/imagine26/0playingGalaga.mp4 new file mode 100644 index 000000000..4b3ac6edc Binary files /dev/null and b/client/public/videos/imagine26/0playingGalaga.mp4 differ diff --git a/client/src/components/imagine26/components/Chat.js b/client/src/components/imagine26/components/Chat.js index 3d5ce6371..24f88a1c1 100644 --- a/client/src/components/imagine26/components/Chat.js +++ b/client/src/components/imagine26/components/Chat.js @@ -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 ( diff --git a/client/src/components/imagine26/components/Frame.js b/client/src/components/imagine26/components/Frame.js index f2a2a4ca3..5dd9eddb1 100644 --- a/client/src/components/imagine26/components/Frame.js +++ b/client/src/components/imagine26/components/Frame.js @@ -33,7 +33,7 @@ export const Frame = (content, nextOnClick, prevOnClick) => {
{content}
-
+
{prev} {next}
diff --git a/client/src/components/imagine26/pages/ChatRoom.js b/client/src/components/imagine26/pages/ChatRoom.js index 516e40f1a..825e1e8ed 100644 --- a/client/src/components/imagine26/pages/ChatRoom.js +++ b/client/src/components/imagine26/pages/ChatRoom.js @@ -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 ( <> diff --git a/client/src/components/imagine26/pages/Game.js b/client/src/components/imagine26/pages/Game.js index 0f84066b2..1641c187a 100644 --- a/client/src/components/imagine26/pages/Game.js +++ b/client/src/components/imagine26/pages/Game.js @@ -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 ( diff --git a/client/src/components/imagine26/pages/ReadingSection.js b/client/src/components/imagine26/pages/ReadingSection.js index 3781e1473..4f00487ae 100644 --- a/client/src/components/imagine26/pages/ReadingSection.js +++ b/client/src/components/imagine26/pages/ReadingSection.js @@ -7,14 +7,20 @@ const ReadingSection = () => { return ( <>
-
+ {/*
-
+
*/} {Frame(
+
+

Deepfake 101

+
+
+
+

What is a deepfake? A deepfake is diff --git a/client/src/constants/imagine26/Videos.js b/client/src/constants/imagine26/Videos.js index a9f77c095..bcf1f2428 100644 --- a/client/src/constants/imagine26/Videos.js +++ b/client/src/constants/imagine26/Videos.js @@ -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)