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
1 change: 0 additions & 1 deletion .github/workflows/build_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: build and push
on:
push:
branches:
- "feature/**"
- main
tags:
- "**"
Expand Down
Binary file added src/assets/onboarding/acl.png
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 src/assets/onboarding/activity.png
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 src/assets/onboarding/posture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/contexts/AnalyticsProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ declare global {
}
}

export type HubspotFormField = {
objectTypeId?: string;
name: string;
value: string;
};

const AnalyticsContext = React.createContext(
{} as {
initialized: boolean;
Expand Down
6 changes: 6 additions & 0 deletions src/interfaces/Account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,10 @@ export interface Account {
network_range?: string;
lazy_connection_enabled: boolean;
};
onboarding?: AccountOnboarding;
}

export interface AccountOnboarding {
onboarding_flow_pending: boolean;
signup_form_pending: boolean;
}
1 change: 1 addition & 0 deletions src/interfaces/Peer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface Peer {
login_expiration_enabled: boolean;
inactivity_expiration_enabled: boolean;
approval_required: boolean;
disapproval_reason?: string;
city_name: string;
country_code: string;
connection_ip: string;
Expand Down
3 changes: 3 additions & 0 deletions src/layouts/DashboardLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useOidcUser } from "@axa-fr/react-oidc";
import Button from "@components/Button";
import { UserAvatar } from "@components/ui/UserAvatar";
import { cn } from "@utils/helpers";
import { isNetBirdHosted } from "@utils/netbird";
import { useIsSm, useIsXs } from "@utils/responsive";
import { AnimatePresence, motion } from "framer-motion";
import { XIcon } from "lucide-react";
Expand All @@ -20,6 +21,7 @@ import GroupsProvider from "@/contexts/GroupsProvider";
import { usePermissions } from "@/contexts/PermissionsProvider";
import UsersProvider from "@/contexts/UsersProvider";
import Navigation from "@/layouts/Navigation";
import { OnboardingProvider } from "@/modules/onboarding/OnboardingProvider";
import Header, { headerHeight } from "./Header";

export default function DashboardLayout({
Expand All @@ -33,6 +35,7 @@ export default function DashboardLayout({
<AnnouncementProvider>
<GroupsProvider>
<CountryProvider>
{!isNetBirdHosted() && <OnboardingProvider />}
<DashboardPageContent>{children}</DashboardPageContent>
</CountryProvider>
</GroupsProvider>
Expand Down
Loading