Exploding files: Part 2 (AdminPage) #179

theredwillow · 2025-01-24T00:20:31Z

The AdminPage was a considerable 1072 lines long, making this PR lofty enough with just one file explosion. I have gotten it down to just 146 lines now.

There is some considerable prop drilling for the time being. These series of PR's will help illuminate what contexts we need for issue #168 in a future PR.

joshzcold · 2025-01-24T05:51:50Z

!test

theredwillow · 2025-01-24T08:31:40Z

@joshzcold Could you clarify what !test means? I'd like to make sure I address it properly.

joshzcold · 2025-01-24T14:03:22Z

@theredwillow oh sorry. That kicks off e2e tests in GitHub actions (only my account can do it currently)

We still are working on making them actually report back to the PR properly

https://github.com/joshzcold/Friendly-Feud/actions/runs/12946026168/job/36109725655

theredwillow · 2025-01-24T15:14:28Z

That's what I figured, but I didn't want to make an assumption and have a hanging PR if I was wrong.

You'd think that GitHub's UI would indicate whether something is a pipeline trigger.

joshzcold · 2025-01-24T15:17:14Z

This is great stuff! Something I always wanted to do the admin

I will just need some time to launch it and test out stuff that maybe the e2e didn't test (which your branch passed)

src/components/Admin/RoomSettings.jsx

joshzcold

@theredwillow can you resolve the conflict with master?

After that e2e tests still pass then we can merge.

karlromets

otherwise all good

Tests have also considerably changed in master, so make sure tests pass after resolving conflicts with AdminPage.jsx

karlromets · 2025-02-03T19:36:05Z

src/components/Admin/GameDisplay/TeamControls.jsx

+          send({ action: "data", data: game });
+          send({
+            action: "mistake",
+            data: game.teams[team].mistake,


This is not something you messed up, just noticed this. Is my assumption correct?

Suggested change

data: game.teams[team].mistake,

data: game.teams[team].mistakes,

…files

theredwillow · 2025-02-11T23:05:55Z

I have been in a huge move and finally got my desk set-up, so I needed to refresh my memory of how to get into this whole WSL/docker stuff. Then I needed to figure out the merge conflicts... which would have been nearly impossible with the traditional git diff checker, so I went through AdminPage's history and made the changes from these commits (the changes since Karl merged master into it)...

However, now I'm having trouble getting it to run make dev because of this issue which I don't understand.

joshzcold · 2025-02-12T00:13:58Z

Hmm looks unrelated to your code changes.

I'll see if I can reproduce it locally.

The automatic e2e tests says the branch is looking good so we probably can merge before figuring out why you can't pull the nodejs alpine image.

Update: works on my machine, so its probably a temporary issue in the alpine repos and trying again will probably work for you.

joshzcold

Currently answering final round questions is off by an index.

src/components/Admin/GameDisplay/FinalRoundButtonControls.jsx

joshzcold · 2025-02-12T01:07:33Z

I think you should merge in the current e2e folder into your upstream so that you have the new tests that might catch an issue like I posted above.

theredwillow · 2025-02-12T17:52:27Z

I think you should merge in the current e2e folder into your upstream so that you have the new tests that might catch an issue like I posted above.

Is this on a different branch? Are these files untracked? If I'm following upstream, why would those be missed?

joshzcold · 2025-02-12T17:55:23Z

Maybe the problem was local. I need to check my clone of your fork was up to date.

theredwillow · 2025-02-12T18:11:54Z

My previous problem went away, but now I have this.

StackOverflow says to run npm cache clear --force, but I don't know how this is ran in all of this docker stuff.

I tried adding it to the front of dev-down in the Makefile, but it's not working.

theredwillow@DESKTOP-TGSPDI3:~/Destiny-Family-Feud$ sudo make dev-down
/bin/bash: line 1: npm: command not found
WARN[0000] Warning: No resource found to remove for project "famf".

joshzcold · 2025-02-12T19:32:07Z

Yeah, my bad. I was on master of your fork and not your branch.

Testing your branch now

joshzcold

Great job 👍
Tried everything out and I am happy with the results.

joshzcold

Sorry last second.
Found an error while trying logo upload

joshzcold · 2025-02-12T19:41:22Z

src/components/Admin/TitleLogoUpload.jsx

+        <label htmlFor="logoUpload">
+          <FileUp className="cursor-pointer text-secondary-900 hover:text-secondary-500" size={38} />
+        </label>
+        <input


Just found an error on title logo upload

Im not sure I understand the error since AfterUpload looks the same as BeforeUpload in the way it does it render method

I want to help, but I'm still stuck with the aforementioned Docker npm bug. I can't even access it to debug it anymore.

but I don't know how this is ran in all of this docker stuff.

Just add it as a command, similar to how npm install is included.

For example:

Also purely guessing from the errors and the context:

1st error seems to be related to TLS and bad MAC record (network issue?)

2nd error seems to be again, related to a network issue — SSL cipher error

you recently moved (network changes?)

So very well could be something to do with the new network you are on...

Other suggestions for this error I saw:

simply restarting — WiFi on/off

npm cache verify

Try these both outside of Docker and within the Docker build to see if they make a difference.

joshzcold · 2025-03-08T04:37:33Z

src/components/Admin/TitleLogoUpload.jsx

+import { useTranslation } from "react-i18next";
+import { Buffer } from "buffer";
+import { FileUp } from "lucide-react";
+import { Image } from "next/image";


@theredwillow the fix to the react render error is

Suggested change

import { Image } from "next/image";

import Image from "next/image";

There is a some detail in the Image component that requires it to be an import of "default export"
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import

Don't understand all of it, but this fixes the LogoUpload.

If you make this fix I can test everything out and we can move on 👍

refactor(AdminPage): Exploded file into manageable component files

d1a8592

theredwillow marked this pull request as ready for review January 24, 2025 04:11

theredwillow commented Jan 24, 2025

View reviewed changes

src/components/Admin/RoomSettings.jsx Outdated Show resolved Hide resolved

Added missing i18n

8599f9a

joshzcold requested a review from karlromets February 2, 2025 20:57

joshzcold requested changes Feb 2, 2025

View reviewed changes

karlromets requested changes Feb 3, 2025

View reviewed changes

theredwillow added 2 commits February 11, 2025 14:56

Merge remote-tracking branch 'upstream/master' into issue-70-explode-…

11d77a0

…files

Added missing Image import

30a4723

joshzcold requested changes Feb 12, 2025

View reviewed changes

joshzcold reviewed Feb 12, 2025

View reviewed changes

src/components/Admin/GameDisplay/FinalRoundButtonControls.jsx Show resolved Hide resolved

joshzcold approved these changes Feb 12, 2025

View reviewed changes

joshzcold requested changes Feb 12, 2025

View reviewed changes

joshzcold reviewed Mar 8, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Exploding files: Part 2 (AdminPage) #179

Exploding files: Part 2 (AdminPage) #179

theredwillow commented Jan 24, 2025

joshzcold commented Jan 24, 2025

theredwillow commented Jan 24, 2025

joshzcold commented Jan 24, 2025 •

edited

Loading

theredwillow commented Jan 24, 2025

joshzcold commented Jan 24, 2025

joshzcold left a comment •

edited

Loading

karlromets left a comment •

edited

Loading

karlromets Feb 3, 2025

theredwillow commented Feb 11, 2025

joshzcold commented Feb 12, 2025 •

edited

Loading

joshzcold left a comment •

edited

Loading

joshzcold commented Feb 12, 2025

theredwillow commented Feb 12, 2025

joshzcold commented Feb 12, 2025

theredwillow commented Feb 12, 2025

joshzcold commented Feb 12, 2025

joshzcold left a comment

joshzcold left a comment

joshzcold Feb 12, 2025

joshzcold Feb 12, 2025

theredwillow Feb 13, 2025

karlromets Feb 13, 2025

joshzcold Mar 8, 2025

	data: game.teams[team].mistake,
	data: game.teams[team].mistakes,

	import { Image } from "next/image";
	import Image from "next/image";

Exploding files: Part 2 (AdminPage) #179

Are you sure you want to change the base?

Exploding files: Part 2 (AdminPage) #179

Conversation

theredwillow commented Jan 24, 2025

joshzcold commented Jan 24, 2025

theredwillow commented Jan 24, 2025

joshzcold commented Jan 24, 2025 • edited Loading

theredwillow commented Jan 24, 2025

joshzcold commented Jan 24, 2025

joshzcold left a comment • edited Loading

Choose a reason for hiding this comment

karlromets left a comment • edited Loading

Choose a reason for hiding this comment

karlromets Feb 3, 2025

Choose a reason for hiding this comment

theredwillow commented Feb 11, 2025

joshzcold commented Feb 12, 2025 • edited Loading

joshzcold left a comment • edited Loading

Choose a reason for hiding this comment

joshzcold commented Feb 12, 2025

theredwillow commented Feb 12, 2025

joshzcold commented Feb 12, 2025

theredwillow commented Feb 12, 2025

joshzcold commented Feb 12, 2025

joshzcold left a comment

Choose a reason for hiding this comment

joshzcold left a comment

Choose a reason for hiding this comment

joshzcold Feb 12, 2025

Choose a reason for hiding this comment

joshzcold Feb 12, 2025

Choose a reason for hiding this comment

theredwillow Feb 13, 2025

Choose a reason for hiding this comment

karlromets Feb 13, 2025

Choose a reason for hiding this comment

joshzcold Mar 8, 2025

Choose a reason for hiding this comment

joshzcold commented Jan 24, 2025 •

edited

Loading

joshzcold left a comment •

edited

Loading

karlromets left a comment •

edited

Loading

joshzcold commented Feb 12, 2025 •

edited

Loading

joshzcold left a comment •

edited

Loading