Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
156 changes: 153 additions & 3 deletions frontend/package-lock.json

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

3 changes: 3 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@
"@hey-api/openapi-ts": "^0.99.0",
"@supabase/supabase-js": "^2.110.8",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-table": "^8.21.3",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"date-fns": "^4.4.0",
"lucide-react": "^1.8.0",
"radix-ui": "^1.4.3",
"react": "^19.2.4",
"react-circle-flags": "^0.0.29",
"react-day-picker": "^10.0.1",
"react-dom": "^19.2.4",
"react-router-dom": "7.18.2",
"shadcn": "^4.2.0",
Expand Down
Binary file added frontend/public/Images/auth/SignupSideImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 45 additions & 4 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,31 @@ import { useAuth } from '@/context/AuthContext';
import SessionPage from './pages/Session';
import LoginPage from './pages/Login_page';
import Home from './pages/Home';
import CreateCommittee from './pages/CreateCommittee';
import UserDash from './pages/UserDashboard';
import Pricing from './pages/Info Pages/Pricing';
import OurTeam from './pages/Info Pages/OurTeam';
import ContactUs from './pages/Info Pages/Contact-us';
import SignupPage from './pages/Signup';
import UserDash from './pages/UserDashboard';
import DashHome from './components/userDashboard/dash-home.tsx';
import CreateCommittee from './pages/CreateCommittee';
import BasicInfo from './components/userDashboard/conferenceMenus/about/conference-basic-info.tsx';


import ConferenceOverview from './components/userDashboard/conferenceMenus/conference-overview';
import Enrollment from './components/userDashboard/conferenceMenus/participants/enrollment';
import ParticipantListAllocation from './components/userDashboard/conferenceMenus/participants/list-allocation';
import PresenceCertificates from './components/userDashboard/conferenceMenus/participants/presence-certificates';
import ConferenceSchedule from './components/userDashboard/conferenceMenus/about/conference-schedule';
import TeamStructure from './components/userDashboard/conferenceMenus/team/team-structure';
import TeamAllocate from './components/userDashboard/conferenceMenus/team/team-alocate';
import CommitteeManagement from './components/userDashboard/conferenceMenus/committee-managemant';
import ConferenceDocs from './components/userDashboard/conferenceMenus/about/conference-docs';
import ManagePermsRoles from './components/userDashboard/conferenceMenus/team/manage-perms-roles.tsx';
import CommitteeSessions from './components/userDashboard/committeeMenus/committee-sessions.tsx';
import CommitteeDocs from './components/userDashboard/committeeMenus/committee-docs.tsx';
import CommitteeInfo from './components/userDashboard/committeeMenus/committee-info.tsx';



function RequireAuth({ children }: { children: ReactNode }) {
const { loading, token } = useAuth();
Expand All @@ -28,10 +50,29 @@ function App() {
element={<RequireAuth><SessionPage /></RequireAuth>}
/>
<Route path="/pricing" element={<Pricing />} />
<Route path="/committees/:committeeId/session" element={<SessionPage />} />
<Route path="/our-team" element={<OurTeam />} />
<Route path="/contact-us" element={<ContactUs />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/signup" element={<SignupPage />} />
<Route path="/dashboard" element={<UserDash />}>
<Route index element={<DashHome />} />
<Route path="conference/overview" element={<ConferenceOverview />} />
<Route path="conference/about/basic-info" element={<BasicInfo />} />
<Route path="conference/about/schedule" element={<ConferenceSchedule />} />
<Route path="conference/about/docs" element={<ConferenceDocs />} />
<Route path="conference/committees" element={<CommitteeManagement />} />
<Route path="conference/team/onboarding" element={<TeamAllocate />} />
<Route path="conference/team/structure" element={<TeamStructure />} />
<Route path="conference/team/manage-perms-roles" element={<ManagePermsRoles />} />
<Route path="conference/participants/enrollment" element={<Enrollment />} />
<Route path="conference/participants/list-allocation" element={<ParticipantListAllocation />} />
<Route path="conference/participants/presence-certificates" element={<PresenceCertificates />} />
<Route path="committees/sessions" element={<CommitteeSessions />} />
<Route path="committees/docs" element={<CommitteeDocs />} />
<Route path="committees/info" element={<CommitteeInfo />} />
</Route>
<Route path="/create-committee" element={<CreateCommittee />} />
<Route path="/dashboard" element={<UserDash />} />
<Route path="/committees/:committeeId/session" element={<SessionPage />} />
</Routes>

</BrowserRouter>
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/auth/login-form.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from "react"
import { useNavigate } from "react-router-dom"

Check warning on line 2 in frontend/src/components/auth/login-form.tsx

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

'react-router-dom' imported multiple times.

See more on https://sonarcloud.io/project/issues?id=uspcodelab_webmun&issues=AZ_EfCAQBY93WqASZ1pu&open=AZ_EfCAQBY93WqASZ1pu&pullRequest=88
import { cn } from "@/lib/utils"
import { Button } from "@/components/ui/button"
import {
Expand All @@ -10,6 +10,7 @@
FieldSeparator,
} from "@/components/ui/field"
import { Input } from "@/components/ui/input"
import { Link } from "react-router-dom"
import { supabase } from "@/lib/supabaseClient"

export function LoginForm({
Expand Down Expand Up @@ -114,9 +115,9 @@
</Button>
<FieldDescription className="text-center mt-2">
Don&apos;t have an account?{" "}
<a href="#" className="underline underline-offset-4">
<Link to="/signup" className="underline underline-offset-4">
Sign up
</a>
</Link>
</FieldDescription>
</Field>
</FieldGroup>
Expand Down
Loading
Loading