Skip to content

Landing page done with some other bug fixes #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nathnael45 merged 1 commit into from
May 1, 2026
Merged

Landing page done with some other bug fixes #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added frontend/public/activity.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/contributors.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/dashboard.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/front.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/funds.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
377 changes: 197 additions & 180 deletions frontend/src/app/landing/page.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useRouter } from "next/navigation";
const Home = () => {
const router = useRouter();
useEffect(() => {
router.replace("/login");
router.replace("/landing");
}, [router]);
return null;
};
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/app/profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ const ProfilePage = () => {
<div className="grid grid-cols-2 gap-4">
<ProfileField label="First Name" value={user?.firstName ?? ""} />
<ProfileField label="Last Name" value={user?.lastName ?? ""} />
<ProfileField label="Date of Birth" value="Not set" />
<ProfileField label="Phone Number" value="Not set" />
</div>
</div>
</div>
Expand Down
39 changes: 5 additions & 34 deletions frontend/src/app/settings/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ type CurrentUser = {
};

export default function SettingsPage() {
const [activeTab, setActiveTab] = useState<'funds' | 'account'>('account');
const [user, setUser] = useState<CurrentUser | null>(null);
const [editing, setEditing] = useState(false);
const [formData, setFormData] = useState({ firstName: '', lastName: '', email: '', phoneNumber: '' });
const [formData, setFormData] = useState({ firstName: '', lastName: '', email: '' });
const [saving, setSaving] = useState(false);
const [saveError, setSaveError] = useState<string | null>(null);
const [saveSuccess, setSaveSuccess] = useState(false);
Expand All @@ -49,7 +48,7 @@ export default function SettingsPage() {
if (!res.ok) { console.error('Failed to fetch user in settings', res.status); return; }
const data = await res.json();
setUser(data.user);
setFormData({ firstName: data.user.firstName ?? '', lastName: data.user.lastName ?? '', email: data.user.email ?? '', phoneNumber: '' });
setFormData({ firstName: data.user.firstName ?? '', lastName: data.user.lastName ?? '', email: data.user.email ?? '' });
} catch (err) {
console.error('Error loading user in settings', err);
}
Expand Down Expand Up @@ -85,7 +84,7 @@ export default function SettingsPage() {
};

const handleCancel = () => {
if (user) setFormData({ firstName: user.firstName, lastName: user.lastName, email: user.email, phoneNumber: '' });
if (user) setFormData({ firstName: user.firstName, lastName: user.lastName, email: user.email });
setSaveError(null);
setSaveSuccess(false);
setEditing(false);
Expand All @@ -96,28 +95,9 @@ export default function SettingsPage() {
<main className="max-w-4xl mx-auto px-4 py-8">
<h1 className="text-2xl font-bold mb-6">Settings</h1>

{/* Tabs */}
<div className="flex space-x-8 border-b">
<button
onClick={() => setActiveTab('funds')}
className={`pb-2 ${activeTab === 'funds' ? 'border-b-2 border-black font-medium' : 'text-gray-500'}`}
>
Fund Settings
</button>
<button
onClick={() => setActiveTab('account')}
className={`pb-2 ${activeTab === 'account' ? 'border-b-2 border-black font-medium' : 'text-gray-500'}`}
>
Account Settings
</button>
</div>

{/* Content */}
<div className="mt-8">
{activeTab === 'funds' ? (
<p className="text-gray-500">Fund Settings will go here.</p>
) : (
<div className="space-y-10">
<div className="space-y-10">

{/* Your Profile */}
<section>
Expand Down Expand Up @@ -182,14 +162,6 @@ export default function SettingsPage() {
<p className="text-sm font-medium">{user?.email ?? '—'}</p>
)}
</div>
<div>
<label className="block text-xs text-gray-500 mb-1">Phone Number</label>
{editing ? (
<input name="phoneNumber" type="tel" value={formData.phoneNumber} onChange={handleChange} placeholder="+1 888-888-7777" className="border border-gray-300 rounded px-3 py-2 text-sm w-full" />
) : (
<p className="text-sm font-medium">{formData.phoneNumber || '—'}</p>
)}
</div>
</div>
</section>

Expand Down Expand Up @@ -221,8 +193,7 @@ export default function SettingsPage() {
</button>
</section>

</div>
)}
</div>
</div>
</main>
</DashboardTemplate>
Expand Down