Merge branch 'main' of https://github.com/TheBozzz34/ScoreConnect

TheBozzz34 · Mar 14, 2024 · 81115cc · 81115cc
2 parents 445b22c + b8b24ba
commit 81115cc
Show file tree

Hide file tree

Showing 31 changed files with 2,598 additions and 849 deletions.
diff --git a/.github/workflows/cr.yml b/.github/workflows/cr.yml
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,25 @@ yarn-error.log*
 /playwright-report/
 /playwright/.cache/
 
-/.npm-only-allow
+/.npm-only-allow
+# next-video
+videos/*
+!videos/*.json
+!videos/*.js
+!videos/*.ts
+public/_next-video
+
+# next-video
+videos/*
+!videos/*.json
+!videos/*.js
+!videos/*.ts
+public/_next-video
+
+# next-video
+videos/*
+!videos/*.json
+!videos/*.js
+!videos/*.ts
+public/_next-video
+ScoreConnectIAMUser_accessKeys.csv
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # ScoreConnect 
 
 
+Git might be kinda fucked at the moment ngl, I have no idea what the current commit is so the prod ver. might be kinda behind.
+
 ![uptime](https://status.necrozma.xyz/api/v1/endpoints/_scoreconnect/uptimes/24h/badge.svg) [![Code Style](https://github.com/TheBozzz34/ScoreConnect/actions/workflows/check.yml/badge.svg)](https://github.com/TheBozzz34/ScoreConnect/actions/workflows/check.yml) [![Next.js Bundle Analysis](https://github.com/TheBozzz34/ScoreConnect/actions/workflows/nextjs_bundle_analysis.yml/badge.svg)](https://github.com/TheBozzz34/ScoreConnect/actions/workflows/nextjs_bundle_analysis.yml) [![CodeQL](https://github.com/TheBozzz34/ScoreConnect/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/TheBozzz34/ScoreConnect/actions/workflows/github-code-scanning/codeql)
 
 - [Production site](https://sc.necrozma.xyz)

diff --git a/app/api/video/route.ts b/app/api/video/route.ts
@@ -0,0 +1,2 @@
+// app/api/video/route.js
+export { GET } from 'next-video/request-handler';
diff --git a/components/Footer/Footer.tsx b/components/Footer/Footer.tsx
@@ -8,7 +8,7 @@ const Footer = () => {
 
   if (isMobile) {
     return (
-      <footer className="fixed bottom-0 z-[100] m-4 glass shadow">
+      <footer className="glass fixed bottom-0 z-[100] m-4 shadow">
         <div className="mx-auto w-full max-w-screen-xl p-4 md:flex md:items-center md:justify-between">
           <ul className="flex flex-wrap items-center text-sm font-medium sm:mt-0">
             <li>

diff --git a/components/Me/me.tsx b/components/Me/me.tsx
@@ -6,48 +6,50 @@ export default function Me() {
   return (
     <>
       <div
-        className={`mt-4 w-[80%] max-w-md rounded-lg border-2 border-[#dcd8c0] bg-[#454138] p-4 text-[#dcd8c0] shadow ${
-          useIsMobile() ? "mx-auto" : "mr-5"
-        }`}
+        className={`mt-4 w-[80%] max-w-md rounded-lg bg-gray-500/20 backdrop-blur-sm p-4 text-white shadow ${useIsMobile() ? "mx-auto" : "mr-5"
+          }`}
       >
-        <h3 className="border-b-2 border-[#dcd8c0] text-2xl font-bold">About Me</h3>
+        <h3 className="border-b-2 border-white text-2xl font-bold">About Me</h3>
 
         <Image
           src="/yorha-no-2-type-b-1.png"
           width={150}
           height={150}
-          className="mx-auto mt-4 rounded-full border-2 border-[#dcd8c0]"
+          className="mx-auto mt-4 rounded-full border-2"
           alt="Me"
         />
 
-        <p className="mt-2">
-          Hi! I&apos;m <span className="font-bold">Necrozma</span>, a student from the United States. I&apos;m a
-          full-stack developer, and I&apos;m currently working on <span className="font-bold">ScoreConnect</span>, a
-          digital scoreboard control software.
-        </p>
-        <p className="mt-2">
-          This website is a work in progress, and I&apos;m still working on it. I&apos;m also working on a few other
-          projects, which you can find on my{" "}
-          <a href="https://github.com/thebozzz34" className="underline">
-            GitHub
-          </a>
-          .
-        </p>
-        <p className="mt-2">
-          You can find me on{" "}
-          <a href="https://twitter.com/sadan9921" className="underline">
-            Twitter
-          </a>
-          ,{" "}
-          <a href="https://instagram.com/k._eturah" className="underline">
-            Instagram
-          </a>
-          , and{" "}
-          <a href="https://necrozma.xyz" className="underline">
-            more
-          </a>
-          .
-        </p>
+        <div className="bg-gray-500/40 p-2 rounded mt-4">
+
+          <p className="mt-2 ">
+            Hi! I&apos;m <span className="font-bold">Necrozma</span>, a student from the United States. I&apos;m a
+            full-stack developer, and I&apos;m currently working on <span className="font-bold">ScoreConnect</span>, a
+            digital scoreboard control software.
+          </p>
+          <p className="mt-2">
+            This website is a work in progress, and I&apos;m still working on it. I&apos;m also working on a few other
+            projects, which you can find on my{" "}
+            <a href="https://github.com/thebozzz34" className="underline">
+              GitHub
+            </a>
+            .
+          </p>
+          <p className="mt-2">
+            You can find me on{" "}
+            <a href="https://twitter.com/sadan9921" className="underline">
+              Twitter
+            </a>
+            ,{" "}
+            <a href="https://instagram.com/k._eturah" className="underline">
+              Instagram
+            </a>
+            , and{" "}
+            <a href="https://necrozma.xyz" className="underline">
+              more
+            </a>
+            .
+          </p>
+        </div>
       </div>
     </>
   )

diff --git a/components/Navbar/nav-bar.component.tsx b/components/Navbar/nav-bar.component.tsx
@@ -52,121 +52,120 @@ export const Navbar = () => {
 
   return (
     <>
-    <div className="mx-4 text-transparent select-none">
-      <span>Spacer fix, do not remove</span>
-    </div>
-    <div className="mx-4">
-      <NextUINavbar className="rounded-lg bg-transparent border-white border-2 text-white">
-        <NavbarContent className="flex basis-1/5">
-          <NavbarBrand className="flex items-center justify-start">
-            <NextLink className="flex items-center justify-start gap-1" href="/">
-              <Logo />
-              <p className="font-bold text-inherit">ScoreConnect Web</p>
-            </NextLink>
-          </NavbarBrand>
+      <div className="mx-4 select-none text-transparent">
+        <span>Spacer fix, do not remove</span>
+      </div>
+      <div className="mx-4">
+        <NextUINavbar className="rounded-lg border-2 border-white bg-transparent text-white">
+          <NavbarContent className="flex basis-1/5">
+            <NavbarBrand className="flex items-center justify-start">
+              <NextLink className="flex items-center justify-start gap-1" href="/">
+                <Logo />
+                <p className="font-bold text-inherit">ScoreConnect Web</p>
+              </NextLink>
+            </NavbarBrand>
 
-          {!loggedIn && (
-            <div className="ml-2 hidden justify-start gap-4">
-              {siteConfig.navItems.map((item) => (
-                <NavbarItem key={item.href}>
-                  <NextLink
-                    className={clsx(
-                      linkStyles({ color: "foreground" }),
-                      "data-[active=true]:font-medium data-[active=true]:text-white"
-                    )}
-                    color="foreground"
-                    href={item.href}
+            {!loggedIn && (
+              <div className="ml-2 hidden justify-start gap-4">
+                {siteConfig.navItems.map((item) => (
+                  <NavbarItem key={item.href}>
+                    <NextLink
+                      className={clsx(
+                        linkStyles({ color: "foreground" }),
+                        "data-[active=true]:font-medium data-[active=true]:text-white"
+                      )}
+                      color="foreground"
+                      href={item.href}
+                    >
+                      {item.label}
+                    </NextLink>
+                  </NavbarItem>
+                ))}
+              </div>
+            )}
+          </NavbarContent>
+
+          <NavbarContent className="hidden basis-1/5 sm:flex sm:basis-full" justify="end">
+            <NavbarItem className="hidden gap-2 sm:flex">
+              <Link isExternal href={siteConfig.links.twitter}>
+                <TwitterIcon className="text-white" />
+              </Link>
+              <Link isExternal href={siteConfig.links.discord}>
+                <DiscordIcon className="text-white" />
+              </Link>
+              <Link isExternal href={siteConfig.links.github}>
+                <GithubIcon className="text-white" />
+              </Link>
+            </NavbarItem>
+            <NavbarItem className="hidden md:flex">
+              {loggedIn ? (
+                <div>
+                  <Button
+                    as={Link}
+                    className="bg-white text-sm font-normal text-black"
+                    href="/profile"
+                    startContent={<UserIcon className="text-red-600" />}
+                    variant="flat"
                   >
-                    {item.label}
-                  </NextLink>
-                </NavbarItem>
-              ))}
-            </div>
-          )}
-        </NavbarContent>
+                    View Account
+                  </Button>
 
-        <NavbarContent className="hidden basis-1/5 sm:flex sm:basis-full" justify="end">
-          <NavbarItem className="hidden gap-2 sm:flex">
-            <Link isExternal href={siteConfig.links.twitter}>
-              <TwitterIcon className="text-white" />
-            </Link>
-            <Link isExternal href={siteConfig.links.discord}>
-              <DiscordIcon className="text-white" />
-            </Link>
-            <Link isExternal href={siteConfig.links.github}>
-              <GithubIcon className="text-white" />
-            </Link>
-          </NavbarItem>
-          <NavbarItem className="hidden md:flex">
-            {loggedIn ? (
-              <div>
+                  {pathname === "/app" ? (
+                    <></>
+                  ) : (
+                    <Button
+                      as={Link}
+                      className="ml-1 bg-green-600 text-sm font-normal text-white"
+                      href="/app"
+                      startContent={<UserIcon className="text-red-600" />}
+                      variant="flat"
+                    >
+                      Open App
+                      <FaExternalLinkAlt />
+                    </Button>
+                  )}
+                </div>
+              ) : (
                 <Button
                   as={Link}
                   className="bg-white text-sm font-normal text-black"
-                  href="/account"
+                  href="/login"
                   startContent={<UserIcon className="text-red-600" />}
                   variant="flat"
                 >
-                  View Account
+                  Login
                 </Button>
+              )}
+            </NavbarItem>
+          </NavbarContent>
 
-                {pathname === "/app" ? (
-                  <></>
-                ) : (
-                  <Button
-                    as={Link}
-                    className="ml-1 bg-green-600 text-sm font-normal text-white"
-                    href="/app"
-                    startContent={<UserIcon className="text-red-600" />}
-                    variant="flat"
-                  >
-                    Open App
-                    <FaExternalLinkAlt />
-                  </Button>
-                )}
-              </div>
-            ) : (
-              <Button
-                as={Link}
-                className="bg-white text-sm font-normal text-black"
-                href="/login"
-                startContent={<UserIcon className="text-red-600" />}
-                variant="flat"
-              >
-                Login
-              </Button>
-            )}
-          </NavbarItem>
-        </NavbarContent>
-
-        <NavbarContent className="basis-1 pl-4 sm:hidden" justify="end">
-          <Link isExternal href={siteConfig.links.github}>
-            <GithubIcon className="text-white" />
-          </Link>
+          <NavbarContent className="basis-1 pl-4 sm:hidden" justify="end">
+            <Link isExternal href={siteConfig.links.github}>
+              <GithubIcon className="text-white" />
+            </Link>
 
-          <NavbarMenuToggle />
-        </NavbarContent>
+            <NavbarMenuToggle />
+          </NavbarContent>
 
-        <NavbarMenu>
-          <div className="mx-4 mt-2 flex flex-col gap-2">
-            {siteConfig.navMenuItems.map((item, index) => (
-              <NavbarMenuItem key={`${item}-${index}`}>
-                <Link
-                  color={
-                    index === 2 ? "primary" : index === siteConfig.navMenuItems.length - 1 ? "danger" : "foreground"
-                  }
-                  href="#"
-                  size="lg"
-                >
-                  {item.label}
-                </Link>
-              </NavbarMenuItem>
-            ))}
-          </div>
-        </NavbarMenu>
-      </NextUINavbar>
-    </div>
+          <NavbarMenu>
+            <div className="mx-4 mt-2 flex flex-col gap-2">
+              {siteConfig.navMenuItems.map((item, index) => (
+                <NavbarMenuItem key={`${item}-${index}`}>
+                  <Link
+                    color={
+                      index === 2 ? "primary" : index === siteConfig.navMenuItems.length - 1 ? "danger" : "foreground"
+                    }
+                    href="#"
+                    size="lg"
+                  >
+                    {item.label}
+                  </Link>
+                </NavbarMenuItem>
+              ))}
+            </div>
+          </NavbarMenu>
+        </NextUINavbar>
+      </div>
     </>
-
   )
 }
diff --git a/components/Video/Video.tsx b/components/Video/Video.tsx
@@ -0,0 +1,18 @@
+'use client';
+
+import MuxPlayer from '@mux/mux-player-react';
+
+type Params = {
+    playbackId: string;
+  };
+
+
+export default function Page({ params: { playbackId } }: { params: Params }) {
+    return (
+        <MuxPlayer
+          playbackId={playbackId}
+          poster="https://image.mux.com/{playbackId}/thumbnail.jpg?width=1920"
+          style={{ width: '100%', height: '100%' }}
+        />
+      );
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// app/api/video/route.js
		export { GET } from 'next-video/request-handler';