From b364a7bede74e3790aed333d0fc2b7726739a8d2 Mon Sep 17 00:00:00 2001 From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com> Date: Mon, 5 Jun 2023 16:56:28 -0600 Subject: [PATCH] Get outta here prose! --- package.json | 1 - src/components/Footer.tsx | 3 ++- src/components/Navbar.tsx | 2 +- src/components/RoomList.tsx | 5 ++--- src/pages/_app.tsx | 1 - src/pages/admin/index.tsx | 5 ++--- src/pages/dashboard/index.tsx | 4 ++-- src/pages/index.tsx | 14 +++++++++++++- src/pages/profile/index.tsx | 3 +-- src/pages/room/[id].tsx | 9 ++++----- tailwind.config.js | 2 +- 11 files changed, 28 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index f979ddc..dca52ad 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "@ably-labs/react-hooks": "^2.1.1", "@next-auth/prisma-adapter": "^1.0.7", "@prisma/client": "4.15.0", - "@tailwindcss/typography": "^0.5.9", "@tanstack/react-query": "^4.29.12", "@trpc/client": "10.29.1", "@trpc/next": "10.29.1", diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index da01f72..6a7ba99 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -7,7 +7,8 @@ const Footer: React.FC = () => {

Made with{" "} - by{" "} + {" "} + by{" "} = ({ title }) => { /> {title} - {env.NEXT_PUBLIC_APP_ENV === "development" && " >> DEV"} + {env.NEXT_PUBLIC_APP_ENV === "development" && " >> Staging"}

diff --git a/src/components/RoomList.tsx b/src/components/RoomList.tsx index 6856ef5..5f0e80e 100644 --- a/src/components/RoomList.tsx +++ b/src/components/RoomList.tsx @@ -5,7 +5,6 @@ import { api } from "~/utils/api"; import { IoEnterOutline, IoTrashBinOutline } from "react-icons/io5"; import { configureAbly, useChannel } from "@ably-labs/react-hooks"; import { env } from "~/env.mjs"; -import Loading from "./Loading"; import { useState } from "react"; const RoomList: React.FC = () => { @@ -50,7 +49,7 @@ const RoomList: React.FC = () => { }; return ( -
+
{/* Modal for Adding Rooms */}
@@ -106,7 +105,7 @@ const RoomList: React.FC = () => { {roomsFromDb?.map((room) => { return ( - + {room.roomName} diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index c50632f..3901282 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -8,7 +8,6 @@ import "~/styles/globals.css"; import Navbar from "~/components/Navbar"; import { useRouter } from "next/router"; import { useEffect, useState } from "react"; -import Loading from "~/components/Loading"; import Footer from "~/components/Footer"; const MyApp: AppType<{ session: Session | null }> = ({ diff --git a/src/pages/admin/index.tsx b/src/pages/admin/index.tsx index 2635ee3..7d794d9 100644 --- a/src/pages/admin/index.tsx +++ b/src/pages/admin/index.tsx @@ -4,7 +4,6 @@ import { type GetServerSideProps } from "next"; import { getServerAuthSession } from "../../server/auth"; import { api } from "~/utils/api"; -import Loading from "~/components/Loading"; import { IoTrashBinOutline } from "react-icons/io5"; import { AiOutlineClear } from "react-icons/ai"; import { FaShieldAlt } from "react-icons/fa"; @@ -46,7 +45,7 @@ const Admin: NextPage = () => {
-
+
@@ -123,7 +122,7 @@ const AdminBody: React.FC = () => { return ( <> -

Admin Panel

+

Admin Panel

diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index 823607f..8f0b0e3 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -35,7 +35,7 @@ const Home: NextPage = () => { Sprint Padawan -
+
@@ -56,7 +56,7 @@ const HomePageBody: React.FC = () => { return ( <> -

+

Hi, {sessionData?.user.name}!{" "} {sessionData?.user.role === "ADMIN" && ( diff --git a/src/pages/index.tsx b/src/pages/index.tsx index ad8f85e..e185ea4 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -8,7 +8,7 @@ const Home: NextPage = () => { Sprint Padawan -
+
@@ -42,6 +42,18 @@ const HomePageBody: React.FC = () => { .

+ +
+
+

Features:

+
    +
  • 🚀 Real-time votes!
  • +
  • 🚀 Granual control of room name and vote scale!
  • +
  • 🚀 CSV Reports for every room!
  • +
  • 🚀 100% free and open-source... forever!
  • +
+
+
); }; diff --git a/src/pages/profile/index.tsx b/src/pages/profile/index.tsx index efd3249..6ea729f 100644 --- a/src/pages/profile/index.tsx +++ b/src/pages/profile/index.tsx @@ -8,7 +8,6 @@ import { api } from "~/utils/api"; import { signIn, useSession } from "next-auth/react"; import { useRouter } from "next/router"; import { useEffect, useState } from "react"; -import Loading from "~/components/Loading"; import { FaGithub, FaGoogle } from "react-icons/fa"; export const getServerSideProps: GetServerSideProps = async (ctx) => { @@ -38,7 +37,7 @@ const Profile: NextPage = () => {
-
+
diff --git a/src/pages/room/[id].tsx b/src/pages/room/[id].tsx index 43ca4ce..c081df7 100644 --- a/src/pages/room/[id].tsx +++ b/src/pages/room/[id].tsx @@ -23,7 +23,6 @@ import { import { configureAbly, useChannel, usePresence } from "@ably-labs/react-hooks"; import type { PresenceItem } from "~/utils/types"; import { env } from "~/env.mjs"; -import Loading from "~/components/Loading"; import { FaShieldAlt } from "react-icons/fa"; import { RiVipCrownFill } from "react-icons/ri"; import Link from "next/link"; @@ -485,15 +484,15 @@ const RoomBody: React.FC = () => { // Room does not exist } else { return ( - -

4️⃣0️⃣4️⃣

-

+ +

4️⃣0️⃣4️⃣

+

Oops! This room does not appear to exist, or may have been deleted! 😢

Back to Home diff --git a/tailwind.config.js b/tailwind.config.js index 2758788..90c2a1b 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -10,7 +10,7 @@ module.exports = { theme: { extend: {}, }, - plugins: [require("@tailwindcss/typography"), require("daisyui")], + plugins: [require("daisyui")], daisyui: { themes: [ {