atridad/pollo
1
0
Fork 0
Code Activity Actions

Merge pull request #47 from atridadl/dev

Browse source 
2.2.1
🚧 Fixed styling
🚧 Cleaned up page components to align with the Atash template
This commit is contained in:
Atridad Lahiji 2023-08-29 18:47:12 -06:00 • committed by GitHub
commit 8b097dea7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "sprintpadawan",
"version": "2.2.0",
"version": "2.2.1",
"description": "Plan. Sprint. Repeat.",
"private": true,
"scripts": {

0
src/app/_components/Navbar.tsx → src/app/_components/Header.tsx
View file

1
src/app/_components/RoomList.tsx
View file

@ -98,7 +98,6 @@ const RoomList = () => {
{roomsFromDb && roomsFromDb.length > 0 && (
<div className="overflow-x-auto">
<table className="table text-center">
{/* head */}
<thead>
<tr className="border-white">
<th>Room Name</th>

17
src/app/dashboard/page.tsx
View file

@ -1,8 +1,5 @@
"use client";
import type { NextPage } from "next";
import Head from "next/head";
import RoomList from "~/app/_components/RoomList";
import Link from "next/link";
@ -14,17 +11,11 @@ import { isAdmin, isVIP } from "~/utils/helpers";
export const dynamic = "force-dynamic";
const Home: NextPage = () => {
const Home = () => {
return (
<>
<Head>
<title>Sprint Padawan</title>
<meta name="description" content="Plan. Sprint. Repeat." />
</Head>
<div className="flex flex-col text-center items-center justify-center px-4 py-16 gap-4">
<HomePageBody />
</div>
</>
<div className="flex flex-col text-center items-center justify-center px-4 py-16 gap-4">
<HomePageBody />
</div>
);
};

6
src/app/layout.tsx
View file

@ -1,6 +1,6 @@
import { ClerkProvider } from "@clerk/nextjs";
import Footer from "~/app/_components/Footer";
import Navbar from "~/app/_components/Navbar";
import Header from "~/app/_components/Header";
import "~/styles/globals.css";
import Provider from "./_trpc/Provider";
@ -17,8 +17,8 @@ export default function RootLayout({
return (
<ClerkProvider>
<html lang="en" className="h-[100%] w-[100%] fixed overflow-y-auto">
<body className="block h-[100%]">
<Navbar title="Sprint Padawan" />
<body className="h-[100%] w-[100%] fixed overflow-y-auto">
<Header title="Sprint Padawan" />
<div className="flex flex-row items-center justify-center min-h-[calc(100%-114px)]">
<Provider>{children}</Provider>
</div>

17
src/app/page.tsx
View file

@ -1,19 +1,10 @@
import { type NextPage } from "next";
import Head from "next/head";
export const dynamic = "force-static";
const Home: NextPage = () => {
const Home = () => {
return (
<>
<Head>
<title>Sprint Padawan</title>
<meta name="description" content="Plan. Sprint. Repeat." />
</Head>
<div className="flex flex-col text-center items-center justify-center px-4 py-16 gap-4">
<HomePageBody />
</div>
</>
<div className="flex flex-col text-center items-center justify-center px-4 py-16 gap-4">
<HomePageBody />
</div>
);
};

29
src/app/room/[id]/page.tsx
View file

@ -1,7 +1,5 @@
"use client";
import { type NextPage } from "next";
import Head from "next/head";
import Image from "next/image";
import { useEffect, useState } from "react";
import { EventTypes } from "~/utils/types";
@ -30,25 +28,18 @@ import { trpc } from "~/app/_trpc/client";
export const dynamic = "force-dynamic";
const Room: NextPage = () => {
const Room = () => {
const { isSignedIn } = useUser();
return (
<>
<Head>
<title>Sprint Padawan</title>
<meta name="description" content="Plan. Sprint. Repeat." />
<meta http-equiv="Cache-control" content="no-cache" />
</Head>
<div className="flex flex-col items-center justify-center text-center gap-2">
{!isSignedIn ? (
<div className="flex items-center justify-center">
<span className="loading loading-dots loading-lg"></span>
</div>
) : (
<RoomBody />
)}
</div>
</>
<div className="flex flex-col items-center justify-center text-center gap-2">
{!isSignedIn ? (
<div className="flex items-center justify-center">
<span className="loading loading-dots loading-lg"></span>
</div>
) : (
<RoomBody />
)}
</div>
);
};