Skip to content
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

fix: remove duplicate routes #71

Merged
merged 2 commits into from
Jan 11, 2024
Merged

fix: remove duplicate routes #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68cba34
fix: remove duplicate routes
as1729 Jan 11, 2024
154e20e
Merge branch 'main' into as/fix-org-id-page-load
as1729 Jan 11, 2024
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
23 changes: 0 additions & 23 deletions web/src/Routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,6 @@ const Routes = () => {
<Route path="/organizations/{id:Int}" page={OrganizationOrganizationPage} name="organization" />
<Route path="/organizations" page={OrganizationOrganizationsPage} name="organizations" />
</PrivateSet>
{/* Uploads */}
<Route path="/" page={UploadUploadsPage} name="uploads" />
<Route path="/uploads/new" page={UploadNewUploadPage} name="newUpload" />
<Route path="/uploads/{id:Int}/edit" page={UploadEditUploadPage} name="editUpload" />
<Route path="/uploads/{id:Int}" page={UploadUploadPage} name="upload" />
<Route path="/upload-template/{id:Int}" page={UploadTemplatePage} name="uploadTemplate" />
{/* Agencies */}
<Route path="/agencies/{id:Int}/edit" page={AgencyEditAgencyPage} name="editAgency" />
<Route path="/agencies/{id:Int}" page={AgencyAgencyPage} name="agency" />
<Route path="/agencies/new" page={AgencyNewAgencyPage} name="newAgency" />
<Route path="/agencies" page={AgencyAgenciesPage} name="agencies" />
{/* Users */}
<Route path="/users/new" page={UserNewUserPage} name="newUser" />
<Route path="/users/{id:Int}/edit" page={UserEditUserPage} name="editUser" />
<Route path="/users/{id:Int}" page={UserUserPage} name="user" />
<Route path="/users" page={UserUsersPage} name="users" />
{/* Reporting Periods */}
<Route path="/reporting-periods" page={ReportingPeriodsPage} name="reportingPeriods" />
{/* Organizations */}
<Route path="/organizations/new" page={OrganizationNewOrganizationPage} name="newOrganization" />
<Route path="/organizations/{id:Int}/edit" page={OrganizationEditOrganizationPage} name="editOrganization" />
<Route path="/organizations/{id:Int}" page={OrganizationOrganizationPage} name="organization" />
<Route path="/organizations" page={OrganizationOrganizationsPage} name="organizations" />
<Route path="/login" page={LoginPage} name="login" />
<Route notfound page={NotFoundPage} />
</Router>
Expand Down
3 changes: 3 additions & 0 deletions web/src/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,21 @@ const client = {
login: () => ({
id: 1,
email: '[email protected]',
organizationId: 1,
roles: [],
}),
signup: () => ({
id: 1,
email: '[email protected]',
organizationId: 1,
roles: [],
}),
logout: () => {},
getToken: () => 'super-secret-short-lived-token',
getUserMetadata: () => ({
id: 1,
email: '[email protected]',
organizationId: 1,
roles: [],
}),
}
Expand Down
Loading