Skip to content

Commit

Permalink
Merge pull request #61 from UTDNebula/develop
Browse files Browse the repository at this point in the history
Update prod
  • Loading branch information
TyHil authored Aug 24, 2024
2 parents b991295 + 7f8b144 commit d28a51d
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 19 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
},
"dependencies": {
"@headlessui/react": "^1.7.17",
"@vercel/analytics": "^1.3.1",
"calendar-link": "^2.6.0",
"clsx": "^2.0.0",
"google-auth-library": "^9.5.0",
Expand Down
33 changes: 28 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified public/governance/flh220002.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions src/data/period-dictionary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ export const periodToLeadershipMap = new Map<string, GoverancePeriod>([
Officers: {
President: 'flh220002',
'Vice President': 'tgh210002',
'Executive Director': '',
'Executive Director': 'jjp210000',
Secretary: 'hxn200016',
Treasurer: 'txr220020',
},
'Division Heads': {
'Head of Design': '',
'Head of Engineering': 'ksi230000',
'Head of Product': '',
'Head of Marketing': 'jaz220003',
},
'Project Leads': {
Expand Down
2 changes: 2 additions & 0 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import localFont from 'next/font/local';
import { Inter } from 'next/font/google';
import '@/styles/globals.css';
import type { AppProps } from 'next/app';
import { Analytics } from '@vercel/analytics/react';

const inter = Inter({ subsets: ['latin'] });
const kallisto = localFont({
Expand Down Expand Up @@ -80,6 +81,7 @@ export default function App({ Component, pageProps }: AppProps) {
`}
</style>
<Component {...pageProps} />
<Analytics />
</>
);
}
2 changes: 1 addition & 1 deletion src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const Header = () => {
Greetings from the stars
</h3>
<h1 className="text-6xl font-bold font-kallisto [text-shadow:_0_0_16px_rgb(0_0_0_/_0.4)]">
We are Nebula Labs <br /> We build <b>Products</b> and <b>Talents</b>
We are Nebula Labs <br /> We build <b>Products</b> and <b>People</b>
</h1>
</div>
</div>
Expand Down
12 changes: 1 addition & 11 deletions src/pages/resources/calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ const Calendar = () => {

if (state === 'loading') {
result = (
<div className="flex flex-col gap-4 w-full max-w-[40ch] animate-pulse">
<div className="flex flex-col gap-4 w-full max-w-[40ch] animate-pulse -z-10">
<h3 className="text-transparent w-fit text-4xl font-semibold bg-gray-200 rounded-full">
January
</h3>
Expand All @@ -242,20 +242,11 @@ const Calendar = () => {
<p>7:00 - 9:00 PM</p>
<p>AD 2.232</p>
</div>
<h3 className="text-transparent w-fit text-4xl font-semibold bg-gray-200 rounded-full">
January
</h3>
<h2 className="text-transparent w-fit text-3xl font-medium bg-gray-200 rounded-full">
19 Monday
</h2>
<div className="text-transparent w-full p-4 bg-gray-200 rounded-lg">
<p className="text-2xl">After Hours</p>
<p>7:00 - 9:00 PM</p>
<p>AD 2.232</p>
</div>
<h3 className="text-transparent w-fit text-4xl font-semibold bg-gray-200 rounded-full">
January
</h3>
<h2 className="text-transparent w-fit text-3xl font-medium bg-gray-200 rounded-full">
19 Monday
</h2>
Expand All @@ -266,7 +257,6 @@ const Calendar = () => {
</div>
</div>
);
//<h2 className="text-5xl font-bold pb-4 text-center">Loading...</h2>;
} else if (state === 'done') {
result = <div className="flex flex-col gap-4 w-full max-w-[40ch]">{...labelsAndEvents}</div>;
}
Expand Down

0 comments on commit d28a51d

Please sign in to comment.