Skip to content

Commit

Permalink
minior update on open startup page
Browse files Browse the repository at this point in the history
  • Loading branch information
@Codehagen
Codehagen committed Jul 6, 2024
1 parent 987851b commit cdded54
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 137 deletions.
40 changes: 20 additions & 20 deletions apps/www/src/app/(dashboard)/dashboard/settings/page.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { redirect } from "next/navigation";
import { getMetricsForUser } from "@/actions/Dingify/get-metrics-user";
import { redirect } from "next/navigation"
import { getMetricsForUser } from "@/actions/Dingify/get-metrics-user"

import {
Card,
Expand All @@ -8,33 +8,33 @@ import {
CardFooter,
CardHeader,
CardTitle,
} from "@dingify/ui/components/card";
} from "@dingify/ui/components/card"

import { authOptions } from "@/lib/auth";
import { getCurrentUser } from "@/lib/session";
import { DashboardHeader } from "@/components/dashboard/header";
import { DashboardShell } from "@/components/dashboard/shell";
import { LanguageForm2 } from "@/components/forms/language-form2";
import { UserNameForm } from "@/components/forms/user-name-form";
import { authOptions } from "@/lib/auth"
import { getCurrentUser } from "@/lib/session"
import { DashboardHeader } from "@/components/dashboard/header"
import { DashboardShell } from "@/components/dashboard/shell"
import { LanguageForm2 } from "@/components/forms/language-form2"
import { UserNameForm } from "@/components/forms/user-name-form"

export const metadata = {
title: "Dingify Settings - Customize Your Experience",
title: "Propdock innstillinger",
description:
"Adjust your Dingify account settings for a personalized real-time monitoring experience. Manage language preferences, account details, and more.",
};
}

export default async function SettingsPage() {
const user = await getCurrentUser();
const user = await getCurrentUser()

if (!user) {
redirect(authOptions.pages?.signIn || "/login");
redirect(authOptions.pages?.signIn || "/login")
}

const metrics = await getMetricsForUser();
const metrics = await getMetricsForUser()

const formatNumber = (number) => {
return new Intl.NumberFormat("en-US").format(number);
};
return new Intl.NumberFormat("en-US").format(number)
}

return (
<DashboardShell>
Expand Down Expand Up @@ -87,7 +87,7 @@ export default async function SettingsPage() {
<UserNameForm user={{ id: user.id, name: user.name || "" }} />
</div>
</DashboardShell>
);
)
}

function FolderIcon(props) {
Expand All @@ -106,7 +106,7 @@ function FolderIcon(props) {
>
<path d="M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z" />
</svg>
);
)
}

function LayersIcon(props) {
Expand All @@ -127,7 +127,7 @@ function LayersIcon(props) {
<path d="m22 17.65-9.17 4.16a2 2 0 0 1-1.66 0L2 17.65" />
<path d="m22 12.65-9.17 4.16a2 2 0 0 1-1.66 0L2 12.65" />
</svg>
);
)
}

function UsersIcon(props) {
Expand All @@ -149,5 +149,5 @@ function UsersIcon(props) {
<path d="M22 21v-2a4 4 0 0 0-3-3.87" />
<path d="M16 3.13a4 4 0 0 1 0 7.75" />
</svg>
);
)
}
33 changes: 15 additions & 18 deletions apps/www/src/app/(marketing)/open/page.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
import { Suspense } from "react";
import { Suspense } from "react"

import { getCurrentUser } from "@/lib/session";
import { fetchGithubData } from "@/lib/utils";
import OpenCardSection from "@/components/open-page/OpenCardsSection";
import OpenMiddleSection from "@/components/open-page/OpenMiddleSection";
import { OpenSalaryTable } from "@/components/open-page/OpenSalaryTable";
import OpenStartupSection from "@/components/open-page/OpenStartupSection";
import { OpenTableTeam } from "@/components/open-page/OpenTableTeam";
import OpenUsersDiagram from "@/components/open-page/OpenUsersDiagram";
import OpenUsersFunding from "@/components/open-page/OpenUsersFunding";
import OpenUsersText from "@/components/open-page/OpenUsersText";
import { getCurrentUser } from "@/lib/session"
import { fetchGithubData } from "@/lib/utils"
import OpenCardSection from "@/components/open-page/OpenCardsSection"
import OpenMiddleSection from "@/components/open-page/OpenMiddleSection"
import { OpenSalaryTable } from "@/components/open-page/OpenSalaryTable"
import OpenStartupSection from "@/components/open-page/OpenStartupSection"
import { OpenTableTeam } from "@/components/open-page/OpenTableTeam"
import OpenUsersDiagram from "@/components/open-page/OpenUsersDiagram"
import OpenUsersFunding from "@/components/open-page/OpenUsersFunding"
import OpenUsersText from "@/components/open-page/OpenUsersText"

export const metadata = {
title: "Propdock Open - Alt åpent for alle",
description:
"Vi viser alt for vi har ingenting å skjule - Våre finanser, metrics og læring, alt i offentligheten.",
};
}

export default async function PricingPage() {
const user = await getCurrentUser();
// const subscriptionPlan = await api.auth.mySubscription.query();
const Githubstats = await fetchGithubData();
// const x = await api.customer.getAllCustomers.query();
// console.log(x);
const user = await getCurrentUser()
const Githubstats = await fetchGithubData()

return (
<div className="flex w-full flex-col gap-16 py-8 md:py-8">
Expand All @@ -35,5 +32,5 @@ export default async function PricingPage() {
<OpenUsersDiagram />
<OpenUsersFunding />
</div>
);
)
}
32 changes: 9 additions & 23 deletions apps/www/src/app/(marketing)/page.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
import Link from "next/link";
import Balancer from "react-wrap-balancer";

import { buttonVariants } from "@dingify/ui/components/button";

import { siteConfig } from "@/config/site";
import { cn, nFormatter } from "@/lib/utils";
import Particles from "@/components/ui/particles";
import { SphereMask } from "@/components/ui/sphere-mask";
import { GetStartedButton } from "@/components/buttons/GetStartedButton";
import { BeamSection } from "@/components/dashboard/beam-section";
import { BusinessLine } from "@/components/dashboard/businessline";
import CallToActionComponent from "@/components/dashboard/calltoaction";
import Featuressection from "@/components/dashboard/feautressection";
import HeroSection from "@/components/dashboard/herosection";
import HeroSection2 from "@/components/dashboard/herosection2";
import BottomSectionLanding from "@/components/landing/bottom-section-landing";
import CallToActionSection from "@/components/landing/cta-section";
import EventsSectionLanding from "@/components/landing/events-section-landing";
import HeroSectionNew2 from "@/components/landing/hero-section";
import { IntegrationsSectionLanding } from "@/components/landing/Integrations-section-landing";
import { Icons } from "@/components/shared/icons";
import Particles from "@/components/ui/particles"
import { SphereMask } from "@/components/ui/sphere-mask"
import { BeamSection } from "@/components/dashboard/beam-section"
import BottomSectionLanding from "@/components/landing/bottom-section-landing"
import CallToActionSection from "@/components/landing/cta-section"
import EventsSectionLanding from "@/components/landing/events-section-landing"
import HeroSectionNew2 from "@/components/landing/hero-section"
import { IntegrationsSectionLanding } from "@/components/landing/Integrations-section-landing"

export default async function IndexPage() {
return (
Expand All @@ -42,5 +28,5 @@ export default async function IndexPage() {
color={"#ffffff"}
/>
</>
);
)
}
29 changes: 8 additions & 21 deletions apps/www/src/components/landing/bottom-section-landing.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,23 @@
"use client";
"use client"

import { useRef } from "react";
import { ArrowRightIcon } from "@radix-ui/react-icons";
import { useInView } from "framer-motion";
import { FileInputIcon } from "lucide-react";
import { useRef } from "react"
import { useInView } from "framer-motion"

import { Button } from "@dingify/ui/components/button";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
} from "@dingify/ui/components/command";

import { GetStartedButton } from "../buttons/GetStartedButton";
import { BentoCard } from "../ui/bento-grid";
import { GetStartedButton } from "../buttons/GetStartedButton"

export default function BottomSectionLanding() {
const ref = useRef(null);
const inView = useInView(ref, { once: true, margin: "-100px" });
const ref = useRef(null)
const inView = useInView(ref, { once: true, margin: "-100px" })

return (
<section className="relative mx-auto -mt-20 mb-20 max-w-[80rem] px-6 text-center md:px-8">
<h2 className="translate-y-[-1rem] animate-fade-in text-balance bg-gradient-to-br from-black from-30% to-black/40 bg-clip-text py-6 text-5xl font-medium leading-none tracking-tighter text-transparent opacity-0 [--animation-delay:200ms] dark:from-white dark:to-white/40 sm:text-6xl md:text-7xl lg:text-8xl">
Built for developers
Prøv Propdock
<br className="hidden md:block" /> Available today.
</h2>
<div className="mt-10 space-x-4">
<GetStartedButton />
</div>
</section>
);
)
}
66 changes: 34 additions & 32 deletions apps/www/src/components/open-page/OpenTableTeam.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
"use client";
"use client"

import * as React from "react";
import {
import type {
ColumnDef,
ColumnFiltersState,
SortingState,
VisibilityState,
} from "@tanstack/react-table"
import * as React from "react"
import {
flexRender,
getCoreRowModel,
getFilteredRowModel,
getPaginationRowModel,
getSortedRowModel,
SortingState,
useReactTable,
VisibilityState,
} from "@tanstack/react-table";
import { ArrowUpDown, ChevronDown, MoreHorizontal } from "lucide-react";
} from "@tanstack/react-table"
import { ArrowUpDown, ChevronDown, MoreHorizontal } from "lucide-react"

import { Button } from "@dingify/ui/components/button";
import { Checkbox } from "@dingify/ui/components/checkbox";
import { Button } from "@dingify/ui/components/button"
import { Checkbox } from "@dingify/ui/components/checkbox"
import {
DropdownMenu,
DropdownMenuCheckboxItem,
Expand All @@ -25,16 +27,16 @@ import {
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@dingify/ui/components/dropdown-menu";
import { Input } from "@dingify/ui/components/input";
} from "@dingify/ui/components/dropdown-menu"
import { Input } from "@dingify/ui/components/input"
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@dingify/ui/components/table";
} from "@dingify/ui/components/table"

const data: TeamMember[] = [
{
Expand All @@ -43,7 +45,7 @@ const data: TeamMember[] = [
role: "Founder, CEO",
salary: "0 kr",
engagement: "Full-Time",
location: "Fauske, Norge",
location: "Bodø, Norge",
joinDate: "10 Juni 2024",
},
{
Expand All @@ -52,20 +54,20 @@ const data: TeamMember[] = [
role: "CTO",
salary: "0 kr",
engagement: "Full-Time",
location: "Bodø, Norge",
location: "Fauske, Norge",
joinDate: "20 Juni 2024",
},
];
]

export type TeamMember = {
id: string;
name: string;
role: string;
salary: string;
engagement: string;
location: string;
joinDate: string;
};
export interface TeamMember {
id: string
name: string
role: string
salary: string
engagement: string
location: string
joinDate: string
}

export const columns: ColumnDef<TeamMember>[] = [
{
Expand Down Expand Up @@ -98,16 +100,16 @@ export const columns: ColumnDef<TeamMember>[] = [
header: "Join Date",
cell: ({ row }) => <div>{row.getValue("joinDate")}</div>,
},
];
]

export function OpenTableTeam() {
const [sorting, setSorting] = React.useState<SortingState>([]);
const [sorting, setSorting] = React.useState<SortingState>([])
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
[],
);
)
const [columnVisibility, setColumnVisibility] =
React.useState<VisibilityState>({});
const [rowSelection, setRowSelection] = React.useState({});
React.useState<VisibilityState>({})
const [rowSelection, setRowSelection] = React.useState({})

const table = useReactTable({
data,
Expand All @@ -126,7 +128,7 @@ export function OpenTableTeam() {
columnVisibility,
rowSelection,
},
});
})

return (
<section className="container mx-auto px-4 sm:px-6 lg:px-8">
Expand All @@ -149,7 +151,7 @@ export function OpenTableTeam() {
header.getContext(),
)}
</TableHead>
);
)
})}
</TableRow>
))}
Expand Down Expand Up @@ -186,5 +188,5 @@ export function OpenTableTeam() {
</div>
</div>
</section>
);
)
}
Loading

0 comments on commit cdded54

Please sign in to comment.