diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index ea841a8e..6593c4fb 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -34,7 +34,7 @@ jobs: export NVM_DIR="$HOME/.nvm" source "$NVM_DIR/nvm.sh" cd ~/docker/var-monorepo/packages/database - pnpm exec prisma migrate deploy + pnpm run deploy - name: Build and start containers uses: appleboy/ssh-action@v1 with: diff --git a/apps/dispatch/app/_helpers/liveKitEventHandler.ts b/apps/dispatch/app/_helpers/liveKitEventHandler.ts index 83374ce6..43004d2a 100644 --- a/apps/dispatch/app/_helpers/liveKitEventHandler.ts +++ b/apps/dispatch/app/_helpers/liveKitEventHandler.ts @@ -23,7 +23,6 @@ export const handleTrackSubscribed = ( track.on("unmuted", () => { useAudioStore.getState().addSpeakingParticipant(participant); - console.log(useAudioStore.getState().settings.radioVolume); element.volume = useAudioStore.getState().settings.radioVolume; }); track.on("unmuted", () => { diff --git a/apps/hub/app/(app)/_components/Footer.tsx b/apps/hub/app/(app)/_components/Footer.tsx new file mode 100644 index 00000000..72c56ff6 --- /dev/null +++ b/apps/hub/app/(app)/_components/Footer.tsx @@ -0,0 +1,75 @@ +import Image from "next/image"; +import { DiscordLogoIcon, InstagramLogoIcon, ReaderIcon } from "@radix-ui/react-icons"; +import YoutubeSvg from "./youtube_wider.svg"; +import FacebookSvg from "./facebook.svg"; + +export const Footer = () => { + return ( + + ); +}; diff --git a/apps/hub/app/(app)/resources/_components/facebook.svg b/apps/hub/app/(app)/_components/facebook.svg similarity index 100% rename from apps/hub/app/(app)/resources/_components/facebook.svg rename to apps/hub/app/(app)/_components/facebook.svg diff --git a/apps/hub/app/(app)/resources/_components/youtube_wider.svg b/apps/hub/app/(app)/_components/youtube_wider.svg similarity index 100% rename from apps/hub/app/(app)/resources/_components/youtube_wider.svg rename to apps/hub/app/(app)/_components/youtube_wider.svg diff --git a/apps/hub/app/(app)/layout.tsx b/apps/hub/app/(app)/layout.tsx index 3cdd6e92..0383adc7 100644 --- a/apps/hub/app/(app)/layout.tsx +++ b/apps/hub/app/(app)/layout.tsx @@ -1,14 +1,12 @@ import type { Metadata } from "next"; -import { DiscordLogoIcon, InstagramLogoIcon, ReaderIcon } from "@radix-ui/react-icons"; import { HorizontalNav, VerticalNav } from "../_components/Nav"; import { redirect } from "next/navigation"; import { getServerSession } from "../api/auth/[...nextauth]/auth"; import { EmailVerification } from "_components/EmailVerification"; import { FirstPath } from "./_components/FirstPath"; import { Penalty } from "_components/Penalty"; -import YoutubeSvg from "./resources/_components/youtube_wider.svg"; -import FacebookSvg from "./resources/_components/facebook.svg"; -import Image from "next/image"; + +import { Footer } from "(app)/_components/Footer"; export const metadata: Metadata = { title: "VAR: Hub", @@ -56,73 +54,7 @@ export default async function RootLayout({ - {/* Footer */} - + diff --git a/apps/hub/app/(app)/resources/_components/Discord-logo.png b/apps/hub/app/(app)/resources/_components/Discord-logo.png new file mode 100644 index 00000000..9d389268 Binary files /dev/null and b/apps/hub/app/(app)/resources/_components/Discord-logo.png differ diff --git a/apps/hub/app/(app)/resources/page.tsx b/apps/hub/app/(app)/resources/page.tsx index 7f4ac309..f96d25c8 100644 --- a/apps/hub/app/(app)/resources/page.tsx +++ b/apps/hub/app/(app)/resources/page.tsx @@ -1,10 +1,20 @@ import ResourceCard from "(app)/resources/_components/Card"; import { Download } from "lucide-react"; import Desktop from "./_components/desktop-client.png"; +import Discord from "./_components/Discord-logo.png"; +import { DiscordLogoIcon } from "@radix-ui/react-icons"; export default function () { return ( -