Skip to content

Enable teams, team settigns and user settings pages #1544

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
merged 1 commit into from
Sep 23, 2025
Merged

Enable teams, team settigns and user settings pages #1544

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
23 changes: 8 additions & 15 deletions apps/cyberstorm-remix/app/commonComponents/Navigation/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,8 @@ export function Navigation(props: {
{currentUser?.username ? (
<span className="navigation-header__profile-actions">
<NewButton
primitiveType="link"
href={`${domain}/package/create/`}
// TODO: Take these into use when the upload page is ready
// primitiveType="cyberstormLink"
// linkId="PackageUpload"
primitiveType="cyberstormLink"
linkId="PackageUpload"
csVariant="secondary"
csSize="small"
// csModifiers={["ghost", "only-icon"]}
Expand Down Expand Up @@ -384,10 +381,8 @@ export function DesktopUserDropdown(props: {
<NewDropDownDivider />
<NewDropDownItem asChild>
<NewLink
// primitiveType="cyberstormLink"
// linkId="Settings"
primitiveType="link"
href={`${domain}/settings/linked-accounts/`}
primitiveType="cyberstormLink"
linkId="Settings"
rootClasses="dropdown__item navigation-header__dropdown-item"
>
<NewIcon csMode="inline" noWrapper csVariant="tertiary">
Expand All @@ -398,10 +393,8 @@ export function DesktopUserDropdown(props: {
</NewDropDownItem>
<NewDropDownItem asChild>
<NewLink
// primitiveType="cyberstormLink"
// linkId="Teams"
primitiveType="link"
href={`${domain}/settings/teams/`}
primitiveType="cyberstormLink"
linkId="Teams"
rootClasses="dropdown__item navigation-header__dropdown-item"
>
<NewIcon csMode="inline" noWrapper csVariant="tertiary">
Expand Down Expand Up @@ -551,7 +544,7 @@ export function MobileUserPopoverContent(props: {
<NewAvatar src={avatar} username={user.username} csSize="small" />
<p className="mobile-navigation__user-details">{user.username}</p>
</div>
{/* <NewLink
<NewLink
primitiveType="cyberstormLink"
linkId="Settings"
csVariant="primary"
Expand All @@ -572,7 +565,7 @@ export function MobileUserPopoverContent(props: {
<FontAwesomeIcon icon={faUsers} />
</NewIcon>
Teams
</NewLink> */}
</NewLink>
<NewLink
primitiveType="link"
href={domain ? `${domain}/logout/` : "/logout"}
Expand Down
48 changes: 18 additions & 30 deletions apps/cyberstorm-remix/app/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,34 +54,22 @@ export default [
),
route("/package/create", "upload/upload.tsx"),

// TODO: DISABLED UNTIL WE'VE GOT THE ENDPOINTS FOR THESE
// route("/settings", "settings/user/Settings.tsx", [
// route("", "settings/user/Connections/Connections.tsx", {
// index: true,
// }),
// route("account", "settings/user/Account/Account.tsx"),
// ]),
// route("/teams", "settings/teams/Teams.tsx"),
// route("/teams/:namespaceId", "settings/teams/team/teamSettings.tsx", [
// route("", "settings/teams/team/tabs/Profile/Profile.tsx", {
// index: true,
// }),
// route("members", "settings/teams/team/tabs/Members/Members.tsx"),
// route(
// "service-accounts",
// "settings/teams/team/tabs/ServiceAccounts/ServiceAccounts.tsx"
// ),
// route("settings", "settings/teams/team/tabs/Settings/Settings.tsx"),
// ]),

// layout("./auth/layout.tsx", [
// route("login", "./auth/login.tsx"),
// route("register", "./auth/register.tsx"),
// ]),

// ...prefix("concerts", [
// index("./concerts/home.tsx"),
// route(":city", "./concerts/city.tsx"),
// route("trending", "./concerts/trending.tsx"),
// ]),
route("/settings", "settings/user/Settings.tsx", [
route("", "settings/user/Connections/Connections.tsx", {
index: true,
}),
route("account", "settings/user/Account/Account.tsx"),
]),
route("/teams", "settings/teams/Teams.tsx"),
route("/teams/:namespaceId", "settings/teams/team/teamSettings.tsx", [
route("", "settings/teams/team/tabs/Profile/Profile.tsx", {
index: true,
}),
route("members", "settings/teams/team/tabs/Members/Members.tsx"),
route(
"service-accounts",
"settings/teams/team/tabs/ServiceAccounts/ServiceAccounts.tsx"
),
route("settings", "settings/teams/team/tabs/Settings/Settings.tsx"),
]),
] satisfies RouteConfig;
Loading