Skip to content

Commit 093faae

Browse files
authored
Merge pull request #166 from DataScience-GT/feature/member-site
Feature: feature/member-site to dev
2 parents cb5a374 + 8779e0c commit 093faae

File tree

16 files changed

+90
-27
lines changed

16 files changed

+90
-27
lines changed

packages/api/src/middleware/procedures.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const isAdmin = protectedProcedure.use(async ({ ctx, next }) => {
1313
let admin = ctx.cache.get<typeof admins.$inferSelect>(cacheKey);
1414

1515
if (!admin) {
16-
admin = await ctx.db!.query.admins.findFirst({
16+
admin = await ctx.db!.query.admins.findFirst({ // try catch for ctx.db
1717
where: and(
1818
eq(admins.userId, ctx.userId!),
1919
eq(admins.isActive, true)

packages/api/src/routers/hello.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ export const helloRouter = createTRPCRouter({
77
sayHelloAuth,
88
greet,
99
});
10+
11+

sites/mainweb/.cache/tsbuildinfo.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

sites/mainweb/app/(portal)/submit/page.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,10 @@ function SubmitPortalContent() {
409409

410410
export default function SubmitPortalPage() {
411411
return (
412-
<Suspense fallback={<LoadingScreen message="Initializing Workspace..." />}>
413-
<SubmitPortalContent />
414-
</Suspense>
412+
<>
413+
<Suspense fallback={<LoadingScreen message="Initializing Workspace..." />}>
414+
<SubmitPortalContent />
415+
</Suspense>
416+
</>
415417
);
416418
}

sites/mainweb/app/team/page.tsx

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,52 @@ const Team = () => {
6060
</p>
6161
</div>
6262

63+
{/* IDEaS Lab Banner */}
64+
<div className="max-w-7xl mx-auto px-6 lg:px-12 mb-12">
65+
<a
66+
href="https://ideas.gatech.edu"
67+
target="_blank"
68+
rel="noopener noreferrer"
69+
id="ideas-card"
70+
className="group relative flex flex-col sm:flex-row items-center gap-6 w-full rounded-2xl border border-white/10 bg-[#0a0a0a] p-8 overflow-hidden transition-all duration-500 hover:border-[#B3A369]/40 hover:shadow-[0_0_40px_rgba(179,163,105,0.12)] no-underline"
71+
>
72+
{/* Background glow */}
73+
<div className="absolute inset-0 bg-gradient-to-br from-[#003057]/20 via-transparent to-[#B3A369]/10 opacity-0 group-hover:opacity-100 transition-opacity duration-500 pointer-events-none" />
74+
{/* GT Navy + Gold corner accent */}
75+
<div className="absolute top-0 right-0 w-32 h-32 bg-gradient-to-bl from-[#B3A369]/10 to-transparent rounded-bl-full pointer-events-none" />
76+
77+
{/* Icon */}
78+
<div className="relative flex-shrink-0 w-20 h-20 rounded-xl border border-[#B3A369]/30 bg-[#050505] flex items-center justify-center shadow-2xl">
79+
<svg viewBox="0 0 48 48" fill="none" className="w-10 h-10" aria-hidden="true">
80+
<path d="M24 4L6 14v12c0 9.94 7.74 19.24 18 21.6C34.26 45.24 42 35.94 42 26V14L24 4z" fill="#003057" stroke="#B3A369" strokeWidth="2" />
81+
<text x="24" y="30" textAnchor="middle" fontSize="13" fontWeight="bold" fill="#B3A369" fontFamily="monospace">IDEaS</text>
82+
</svg>
83+
</div>
84+
85+
{/* Text */}
86+
<div className="flex flex-col gap-2 flex-1 text-center sm:text-left">
87+
<div className="inline-flex items-center justify-center sm:justify-start gap-2">
88+
<span className="px-3 py-1 rounded-full bg-[#B3A369]/10 border border-[#B3A369]/25 text-[#B3A369] text-[10px] font-mono uppercase tracking-[0.2em]">
89+
Supervising Lab
90+
</span>
91+
</div>
92+
<h2 className="text-white text-xl font-bold tracking-tight">
93+
Institute for Data Engineering and Science
94+
</h2>
95+
<p className="text-sm text-gray-400 leading-relaxed max-w-2xl">
96+
IDEaS is the Georgia Tech research institute that oversees and supports DS@GT. It connects government, industry, and academia to advance foundational data science research, and provides the resources and faculty expertise that power our club&rsquo;s mission.
97+
</p>
98+
</div>
99+
100+
{/* Arrow */}
101+
<div className="flex-shrink-0 opacity-0 group-hover:opacity-100 transition-all duration-300 translate-x-2 group-hover:translate-x-0">
102+
<svg viewBox="0 0 24 24" fill="none" stroke="#B3A369" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="w-5 h-5">
103+
<path d="M5 12h14M13 6l6 6-6 6" />
104+
</svg>
105+
</div>
106+
</a>
107+
</div>
108+
63109
{/* Team Grid Section */}
64110
<Section id="teams" className="px-6 lg:px-12">
65111
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 max-w-7xl mx-auto">

sites/mainweb/components/Background/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import React from "react";
44

5-
interface BackgroundProps extends React.HTMLAttributes<HTMLDivElement> {}
5+
interface BackgroundProps {
6+
[key: string]: any;
7+
}
68

79
export default function Background(props: BackgroundProps) {
810
return (

sites/mainweb/components/Card.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import { ReactNode } from "react";
2-
31
interface CardProps {
4-
children: ReactNode;
2+
children: any;
53
className?: string;
64
}
75

sites/mainweb/components/Section/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { ReactNode, HTMLAttributes } from "react";
22

3-
interface SectionProps extends HTMLAttributes<HTMLDivElement> {
4-
children: ReactNode;
3+
interface SectionProps {
4+
children: any;
55
makefull?: boolean;
6+
[key: string]: any;
67
}
78

89
export default function Section({ children, makefull = false, ...rest }: SectionProps) {

sites/mainweb/components/SmallHero/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { ReactNode, HTMLAttributes } from "react";
22

3-
interface SmallHeroProps extends HTMLAttributes<HTMLDivElement> {
3+
interface SmallHeroProps {
44
title: string;
55
desc?: string;
66
description?: string;
7-
children?: ReactNode;
7+
children?: any;
8+
[key: string]: any;
89
}
910

1011
export default function SmallHero({

sites/mainweb/components/TeamCard/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import { ReactNode, HTMLAttributes } from "react";
44
import Image, { StaticImageData } from "next/image";
55

6-
interface TeamCardProps extends HTMLAttributes<HTMLDivElement> {
6+
interface TeamCardProps {
77
img: string | StaticImageData;
88
name: string;
99
title: string;
1010
zoom?: boolean;
11-
children?: ReactNode;
11+
children?: any;
12+
[key: string]: any;
1213
}
1314

1415
export default function TeamCard({

0 commit comments

Comments
 (0)