Skip to content

Commit ca58d7a

Browse files
authored
Merge pull request #21 from DataScience-GT/refactor/routes
not even routes im crying
2 parents 861d6f9 + 628774b commit ca58d7a

File tree

7 files changed

+152
-148
lines changed

7 files changed

+152
-148
lines changed

sites/mainweb/.firebase/hosting.b3V0.cache

Lines changed: 119 additions & 118 deletions
Large diffs are not rendered by default.

sites/mainweb/app/page.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import dynamic from "next/dynamic";
2121
import { ClassData, MajorData } from "@/assets/Data/demographics";
2222

2323
import slide1 from "@/assets/images/slides/slide1.jpg";
24-
import slide2 from "@/assets/images/slides/slide2.jpg";
24+
import squad from "@/assets/images/2025/squad.jpg";
2525
import slide6 from "@/assets/images/slides/slide6.jpg";
2626
import slide7 from "@/assets/images/slides/slide7.jpg";
2727
import slide8 from "@/assets/images/slides/slide8.jpg";
@@ -107,9 +107,8 @@ const Home = () => {
107107
</div>
108108
<div className="md:w-1/2 w-full group" role="figure" aria-labelledby="about-image-caption">
109109
<div className="relative overflow-hidden rounded-2xl shadow-lg transition-transform duration-500 hover:scale-[1.02]">
110-
<div className="absolute inset-0 bg-gradient-to-tr from-blue-600/20 to-cyan-600/20 opacity-0 group-hover:opacity-100 transition-opacity duration-500 z-10" />
111110
<Image
112-
src={slide2}
111+
src={squad}
113112
alt="The DSGT Executive Team in a group photo"
114113
id="about-image-caption"
115114
className="w-full h-96 object-cover"
2.41 MB
Loading

sites/mainweb/components/Hero/index.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ const Hero = ({ screen_width }: HeroProps) => {
4848
Data Science<br />@ Georgia Tech
4949
</h1>
5050

51-
<div className="w-32 h-[2px] border-b-2 border-[#e5e6db] mb-8 relative">
52-
<span className="absolute -left-1 -top-1 w-3 h-3 border-2 rounded-full border-[#e5e6db]"></span>
53-
<span className="absolute -right-1 -top-1 w-3 h-3 border-2 rounded-full border-[#e5e6db]"></span>
54-
</div>
55-
5651
<Mini>The largest student-run data science organization at Georgia Tech.</Mini>
5752
</div>
5853

sites/mainweb/firebase.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"hosting": {
3-
"public": "out",
4-
"ignore": [
5-
"firebase.json",
6-
"**/.*",
7-
"**/node_modules/**"
8-
]
3+
"public": "out"
94
}
10-
}
5+
}

sites/mainweb/next.config.mjs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
// next.config.mjs OR next.config.js (if type: module is in package.json)
12
/** @type {import('next').NextConfig} */
23
const nextConfig = {
34
output: 'export',
4-
5+
trailingSlash: true,
56
images: {
67
unoptimized: true,
78
},
89
};
910

10-
export default nextConfig;
11+
export default nextConfig; // Change from module.exports

sites/mainweb/start.sh

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,33 @@
11
#!/bin/bash
2-
3-
# A simple script to build a project using pnpm turbo
4-
# and then start the development server.
5-
6-
# Exit immediately if a command exits with a non-zero status
72
set -e
83

94
echo "Starting project build with pnpm turbo build..."
10-
# 1. Execute the build command
115
pnpm turbo build
126

13-
echo "Build complete. Starting development server with pnpm run dev..."
14-
# 2. Execute the development server command
15-
# This command is expected to run indefinitely (until manually stopped)
16-
pnpm run dev
7+
echo "Build complete."
8+
9+
read -p "Do you want to deploy to Firebase Hosting now? (y/N): " DEPLOY_ANSWER
10+
11+
if [[ "$DEPLOY_ANSWER" =~ ^[Yy]$ ]]; then
12+
echo "Deploying to Firebase Hosting..."
1713

18-
# The script will only reach this point if the 'pnpm run dev' command
19-
# exits for some reason (e.g., if it's not a continuous process)
20-
echo "Development server process has ended."
14+
if ! command -v firebase &> /dev/null; then
15+
echo "Firebase CLI not found. Installing..."
16+
pnpm add -g firebase-tools
17+
fi
18+
19+
if ! firebase login:list | grep -q "Logged in"; then
20+
echo "Logging into Firebase..."
21+
firebase login
22+
fi
23+
24+
firebase deploy --only hosting --project dsgt-website
25+
echo "Deployment complete!"
26+
else
27+
echo "Skipping Firebase deploy."
28+
fi
29+
30+
echo "Starting development server with pnpm run dev..."
31+
pnpm run dev
32+
n
33+
echo "Development server process has ended."

0 commit comments

Comments
 (0)