diff --git a/frontend/svalyn-studio-app/src/activity/ActivityTimelineItem.tsx b/frontend/svalyn-studio-app/src/activity/ActivityTimelineItem.tsx index de6b1a5..1181525 100644 --- a/frontend/svalyn-studio-app/src/activity/ActivityTimelineItem.tsx +++ b/frontend/svalyn-studio-app/src/activity/ActivityTimelineItem.tsx @@ -31,9 +31,9 @@ import TimelineSeparator from '@mui/lab/TimelineSeparator'; import Avatar from '@mui/material/Avatar'; import Box from '@mui/material/Box'; import Link from '@mui/material/Link'; -import { useTheme } from '@mui/material/styles'; import Tooltip from '@mui/material/Tooltip'; import Typography from '@mui/material/Typography'; +import { useTheme } from '@mui/material/styles'; import { Link as RouterLink } from 'react-router-dom'; import { formatTime } from '../utils/formatTime'; import { ActivityTimelineItemProps } from './ActivityTimelineItem.types'; @@ -123,7 +123,7 @@ export const ActivityTimelineItem = ({ date, kind, createdBy, title, description { } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> } /> diff --git a/frontend/svalyn-studio-app/src/navbars/Navbar.tsx b/frontend/svalyn-studio-app/src/navbars/Navbar.tsx index 77d270e..9563ba5 100644 --- a/frontend/svalyn-studio-app/src/navbars/Navbar.tsx +++ b/frontend/svalyn-studio-app/src/navbars/Navbar.tsx @@ -186,7 +186,7 @@ export const Navbar = ({ children }: NavbarProps) => { diff --git a/frontend/svalyn-studio-app/src/views/changeproposal/ChangeProposalRouter.tsx b/frontend/svalyn-studio-app/src/views/changeproposal/ChangeProposalRouter.tsx new file mode 100644 index 0000000..74ea30b --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/changeproposal/ChangeProposalRouter.tsx @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { ChangeProposalView } from './ChangeProposalView'; + +export const ChangeProposalRouter = () => { + return ( + <> + + } /> + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/changeproposal/overview/ChangeProposalStatus.tsx b/frontend/svalyn-studio-app/src/views/changeproposal/overview/ChangeProposalStatus.tsx index b2bb73c..8b1ee18 100644 --- a/frontend/svalyn-studio-app/src/views/changeproposal/overview/ChangeProposalStatus.tsx +++ b/frontend/svalyn-studio-app/src/views/changeproposal/overview/ChangeProposalStatus.tsx @@ -326,13 +326,13 @@ const ChangeProposalReviews = ({ changeProposal }: ChangeProposalReviewsProps) = - + {review.createdBy.username} approved these changes @@ -360,13 +360,13 @@ const ChangeProposalReviews = ({ changeProposal }: ChangeProposalReviewsProps) = - + {review.createdBy.username} requested updates diff --git a/frontend/svalyn-studio-app/src/views/domains/DomainRouter.tsx b/frontend/svalyn-studio-app/src/views/domains/DomainRouter.tsx new file mode 100644 index 0000000..a7e01e9 --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/domains/DomainRouter.tsx @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { DomainView } from '../domain/DomainView'; +import { DomainsView } from './DomainsView'; + +export const DomainRouter = () => { + return ( + <> + + } /> + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/error/ErrorRouter.tsx b/frontend/svalyn-studio-app/src/views/error/ErrorRouter.tsx new file mode 100644 index 0000000..b825c74 --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/error/ErrorRouter.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { ErrorView } from './ErrorView'; + +export const ErrorRouter = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/help/HelpRouter.tsx b/frontend/svalyn-studio-app/src/views/help/HelpRouter.tsx new file mode 100644 index 0000000..6863b4e --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/help/HelpRouter.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { HelpView } from './HelpView'; + +export const HelpRouter = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/invitations/InvitationRouter.tsx b/frontend/svalyn-studio-app/src/views/invitations/InvitationRouter.tsx new file mode 100644 index 0000000..065aa0f --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/invitations/InvitationRouter.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { InvitationsView } from './InvitationsView'; + +export const InvitationRouter = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/login/LoginRouter.tsx b/frontend/svalyn-studio-app/src/views/login/LoginRouter.tsx new file mode 100644 index 0000000..6f3e853 --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/login/LoginRouter.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { LoginView } from './LoginView'; + +export const LoginRouter = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/new-organization/NewRouter.tsx b/frontend/svalyn-studio-app/src/views/new-organization/NewRouter.tsx new file mode 100644 index 0000000..8fe0096 --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/new-organization/NewRouter.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { NewOrganizationView } from './NewOrganizationView'; + +export const NewRouter = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/notifications/NotificationRouter.tsx b/frontend/svalyn-studio-app/src/views/notifications/NotificationRouter.tsx new file mode 100644 index 0000000..31e085b --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/notifications/NotificationRouter.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { NotificationsView } from './NotificationsView'; + +export const NotificationRouter = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/oauth2redirect/OAuth2Router.tsx b/frontend/svalyn-studio-app/src/views/oauth2redirect/OAuth2Router.tsx new file mode 100644 index 0000000..23f3475 --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/oauth2redirect/OAuth2Router.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { OAuth2RedirectView } from './OAuth2RedirectView'; + +export const OAuth2Router = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/organization/OrganizationRouter.tsx b/frontend/svalyn-studio-app/src/views/organization/OrganizationRouter.tsx new file mode 100644 index 0000000..87fc25b --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/organization/OrganizationRouter.tsx @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { OrganizationView } from './OrganizationView'; + +export const OrganizationRouter = () => { + return ( + <> + + } /> + } /> + } /> + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/profile/ProfileRouter.tsx b/frontend/svalyn-studio-app/src/views/profile/ProfileRouter.tsx new file mode 100644 index 0000000..44f39cd --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/profile/ProfileRouter.tsx @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { ProfileView } from './ProfileView'; + +export const ProfileRouter = () => { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/project/ProjectRouter.tsx b/frontend/svalyn-studio-app/src/views/project/ProjectRouter.tsx new file mode 100644 index 0000000..2734eda --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/project/ProjectRouter.tsx @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { NewChangeProposalView } from '../new-changeproposal/NewChangeProposalView'; +import { ResourceView } from '../resource/ResourceView'; +import { WorkspaceView } from '../workspace/WorkspaceView'; +import { ProjectView } from './ProjectView'; + +export const ProjectRouter = () => { + return ( + <> + + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/project/home/ProjectBranchCard.tsx b/frontend/svalyn-studio-app/src/views/project/home/ProjectBranchCard.tsx index 4938e95..45371c9 100644 --- a/frontend/svalyn-studio-app/src/views/project/home/ProjectBranchCard.tsx +++ b/frontend/svalyn-studio-app/src/views/project/home/ProjectBranchCard.tsx @@ -55,13 +55,13 @@ export const ProjectBranchCard = ({ projectIdentifier, branch }: ProjectBranchCa - + {branch.change.lastModifiedBy.username} { + return ( + <> + + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/views/settings/SettingsRouter.tsx b/frontend/svalyn-studio-app/src/views/settings/SettingsRouter.tsx new file mode 100644 index 0000000..f38c7cb --- /dev/null +++ b/frontend/svalyn-studio-app/src/views/settings/SettingsRouter.tsx @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2023 Stéphane Bégaudeau. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import { Outlet, Route, Routes } from 'react-router-dom'; +import { SettingsView } from './SettingsView'; + +export const SettingsRouter = () => { + return ( + <> + + } /> + } /> + + + + + ); +}; diff --git a/frontend/svalyn-studio-app/src/widgets/CreatedOn.tsx b/frontend/svalyn-studio-app/src/widgets/CreatedOn.tsx index b51a9c9..e8648d8 100644 --- a/frontend/svalyn-studio-app/src/widgets/CreatedOn.tsx +++ b/frontend/svalyn-studio-app/src/widgets/CreatedOn.tsx @@ -32,13 +32,13 @@ export const CreatedOn = ({ profile, date }: CreatedOnProps) => { - + {profile.username} created this {formatTime(date)} diff --git a/frontend/svalyn-studio-app/src/widgets/LastModifiedOn.tsx b/frontend/svalyn-studio-app/src/widgets/LastModifiedOn.tsx index 43f6dec..11da78c 100644 --- a/frontend/svalyn-studio-app/src/widgets/LastModifiedOn.tsx +++ b/frontend/svalyn-studio-app/src/widgets/LastModifiedOn.tsx @@ -32,13 +32,13 @@ export const LastModifiedOn = ({ profile, date }: LastModifiedOnProps) => { - + {profile.username} modified this {formatTime(date)}