Skip to content

Commit 6138134

Browse files
emac129emac129
committed
Merge remote-tracking branch 'origin/tash2-branch'
2 parents c1316d6 + df7eac2 commit 6138134

6 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
5+
<link rel="icon" type="image/png" href="/SSTRUK-logo.png" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>devs-sesa-beginner-hackathon-2026</title>
7+
<title>SSTRUK</title>
88
</head>
99
<body>
1010
<div id="root"></div>

‎src/App.tsx‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Preferences from './pages/Preferences';
44
import Home from './pages/home/Home';
55
import Explore from './pages/Explore';
66
import Chat from './pages/Chat';
7-
import { Rocket } from 'lucide-react';
87

98
function App() {
109
const location = useLocation();
@@ -13,18 +12,14 @@ function App() {
1312

1413
return (
1514
<div className="app-container">
16-
<nav className="navbar">
17-
<Link to="/" className="navbar-brand">
18-
<Rocket className="inline-block mr-2" size={24} style={{ verticalAlign: 'text-bottom', color: 'var(--color-secondary)' }} />
19-
SSTRUK
20-
</Link>
21-
{!hideExploreLink && (
22-
<div style={{ display: 'flex', gap: '16px' }}>
23-
<Link to="/explore" className="btn-outline" style={{ padding: '6px 16px', fontSize: '0.9rem' }}>Explore</Link>
24-
</div>
25-
)}
26-
</nav>
27-
15+
{!isHomePage && (
16+
<div style={{ position: 'absolute', top: '24px', left: '32px', zIndex: 100 }}>
17+
<Link to="/" style={{ display: 'inline-block' }}>
18+
<img src={`${import.meta.env.BASE_URL}SSTRUK-logo.png?v=5`} alt="SSTRUK Logo" style={{ height: '80px', objectFit: 'contain' }} />
19+
</Link>
20+
</div>
21+
)}
22+
2823
<main className="main-content">
2924
<Routes>
3025
<Route path="/" element={<Home />} />

‎src/components/OrbitSystem.tsx‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,14 @@ export default function OrbitSystem() {
6969
}
7070
`}</style>
7171

72-
<div style={{ position: 'relative', width: '100%', maxWidth: '800px', height: '600px', display: 'flex', alignItems: 'center', justifyContent: 'center', overflow: 'hidden' }}>
72+
<div style={{ position: 'relative', width: '100%', flex: 1, display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
7373

7474
{/* User Center */}
7575
<div style={{
76-
width: '80px',
77-
height: '80px',
76+
width: '12vmin',
77+
height: '12vmin',
78+
minWidth: '60px',
79+
minHeight: '60px',
7880
borderRadius: '50%',
7981
background: 'linear-gradient(135deg, var(--color-primary), var(--color-secondary))',
8082
boxShadow: '0 0 30px var(--color-secondary)',
@@ -83,24 +85,24 @@ export default function OrbitSystem() {
8385
justifyContent: 'center',
8486
fontWeight: 'bold',
8587
zIndex: 10,
86-
fontSize: '1.2rem',
88+
fontSize: 'clamp(1rem, 2.5vmin, 1.5rem)',
8789
color: 'white'
8890
}}>
8991
{preferences.name.substring(0, 2).toUpperCase() || 'YOU'}
9092
</div>
9193

9294
{/* Orbit Rings and Aliens */}
9395
{visibleAliens.map((alien, i) => {
94-
// Calculate radius based on distance (min 80px, max 280px)
96+
// Calculate radius based on distance
9597
const radiusRatio = preferences.maxDistanceAU > 0 ? alien.distanceAU / preferences.maxDistanceAU : 1;
96-
const radius = 80 + (radiusRatio * 200);
97-
const duration = 15 + (radius / 10); // Slower orbit for further objects
98+
const radius = 12 + (radiusRatio * 25); // Responsive radius using vmin
99+
const duration = 15 + radius / 2; // Slower orbit for further objects
98100
const startAngle = (i * (360 / visibleAliens.length));
99101

100102
return (
101103
<div key={alien.id}>
102104
{/* Ring */}
103-
<div className="orbit-ring" style={{ width: `${radius * 2}px`, height: `${radius * 2}px` }} />
105+
<div className="orbit-ring" style={{ width: `${radius * 2}vmin`, height: `${radius * 2}vmin` }} />
104106

105107
{/* Profile */}
106108
<div
@@ -109,9 +111,9 @@ export default function OrbitSystem() {
109111
style={{
110112
backgroundImage: `url(${alien.profilePic})`,
111113
// @ts-ignore
112-
'--radius': `${radius}px`,
114+
'--radius': `${radius}vmin`,
113115
'--duration': `${duration}s`,
114-
animationDelay: `-${startAngle}s` // Stagger start positions
116+
animationDelay: `-${startAngle}s`
115117
}}
116118
title={`${alien.name} (${alien.distanceAU} AU)`}
117119
>

‎src/index.css‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ body {
2121
radial-gradient(circle at 85% 30%, rgba(217, 3, 104, 0.25), transparent 25%);
2222
background-attachment: fixed;
2323
color: var(--color-white);
24-
min-height: 100vh;
25-
overflow-x: hidden;
24+
height: 100vh;
25+
overflow: hidden;
2626
}
2727

2828
h1, h2, h3, h4, h5, h6 {
@@ -160,6 +160,9 @@ select option {
160160
flex: 1;
161161
display: flex;
162162
flex-direction: column;
163+
justify-content: center;
164+
align-items: center;
165+
width: 100%;
163166
}
164167

165168
@keyframes spin {

‎src/pages/Explore.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ export default function Explore() {
1717
if (!preferences) return null;
1818

1919
return (
20-
<div style={{ flex: 1, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', padding: '20px' }}>
20+
<div style={{ flex: 1, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', padding: '20px', width: '100%', boxSizing: 'border-box' }}>
2121
<h2 style={{ color: 'var(--color-primary)', textShadow: '0 0 10px rgba(130, 2, 99, 0.5)' }}>Exploring Sector...</h2>
22-
<p style={{ marginBottom: '40px' }}>Scanning for matches within {preferences.maxDistanceAU} AU</p>
22+
<p style={{ marginBottom: '10px' }}>Scanning for matches within {preferences.maxDistanceAU} AU</p>
2323

2424
<OrbitSystem />
2525
</div>

‎src/pages/Signup.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ export default function Signup() {
112112
}
113113

114114
return (
115-
<div style={{ maxWidth: '500px', margin: '40px auto', padding: '0 20px' }}>
116-
<div className="glass-panel" style={{ padding: '32px' }}>
115+
<div style={{ width: '100%', maxWidth: '600px', padding: '20px', boxSizing: 'border-box' }}>
116+
<div className="glass-panel" style={{ padding: '40px' }}>
117117
<h1 style={{ textAlign: 'center', marginBottom: '24px', color: 'var(--color-secondary)' }}>Welcome to SSTRUK</h1>
118118
<p style={{ textAlign: 'center', marginBottom: '32px', color: 'rgba(234, 222, 218, 0.8)', fontWeight: 'bold', fontSize: '1.1rem' }}>
119119
Enter your details

0 commit comments

Comments
 (0)