From cdded541b89b3bb3892f95681ef706255004602f Mon Sep 17 00:00:00 2001 From: meglerhagen Date: Sat, 6 Jul 2024 20:24:46 +0200 Subject: [PATCH] minior update on open startup page --- .../(dashboard)/dashboard/settings/page.tsx | 40 +++++------ apps/www/src/app/(marketing)/open/page.tsx | 33 +++++----- apps/www/src/app/(marketing)/page.tsx | 32 +++------ .../landing/bottom-section-landing.tsx | 29 +++----- .../components/open-page/OpenTableTeam.tsx | 66 ++++++++++--------- apps/www/src/emails/welcome-email.tsx | 48 +++++++------- packages/ui/src/components/chart.tsx | 0 7 files changed, 111 insertions(+), 137 deletions(-) create mode 100644 packages/ui/src/components/chart.tsx diff --git a/apps/www/src/app/(dashboard)/dashboard/settings/page.tsx b/apps/www/src/app/(dashboard)/dashboard/settings/page.tsx index fdc6dbc..ee7e331 100644 --- a/apps/www/src/app/(dashboard)/dashboard/settings/page.tsx +++ b/apps/www/src/app/(dashboard)/dashboard/settings/page.tsx @@ -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, @@ -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 ( @@ -87,7 +87,7 @@ export default async function SettingsPage() { - ); + ) } function FolderIcon(props) { @@ -106,7 +106,7 @@ function FolderIcon(props) { > - ); + ) } function LayersIcon(props) { @@ -127,7 +127,7 @@ function LayersIcon(props) { - ); + ) } function UsersIcon(props) { @@ -149,5 +149,5 @@ function UsersIcon(props) { - ); + ) } diff --git a/apps/www/src/app/(marketing)/open/page.tsx b/apps/www/src/app/(marketing)/open/page.tsx index 9cbd901..9565b2f 100644 --- a/apps/www/src/app/(marketing)/open/page.tsx +++ b/apps/www/src/app/(marketing)/open/page.tsx @@ -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 (
@@ -35,5 +32,5 @@ export default async function PricingPage() {
- ); + ) } diff --git a/apps/www/src/app/(marketing)/page.tsx b/apps/www/src/app/(marketing)/page.tsx index cfcc2f4..298d1ef 100644 --- a/apps/www/src/app/(marketing)/page.tsx +++ b/apps/www/src/app/(marketing)/page.tsx @@ -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 ( @@ -42,5 +28,5 @@ export default async function IndexPage() { color={"#ffffff"} /> - ); + ) } diff --git a/apps/www/src/components/landing/bottom-section-landing.tsx b/apps/www/src/components/landing/bottom-section-landing.tsx index 3dddc92..78a467f 100644 --- a/apps/www/src/components/landing/bottom-section-landing.tsx +++ b/apps/www/src/components/landing/bottom-section-landing.tsx @@ -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 (

- Built for developers + Prøv Propdock
Available today.

- ); + ) } diff --git a/apps/www/src/components/open-page/OpenTableTeam.tsx b/apps/www/src/components/open-page/OpenTableTeam.tsx index 1c7cd35..edbab80 100644 --- a/apps/www/src/components/open-page/OpenTableTeam.tsx +++ b/apps/www/src/components/open-page/OpenTableTeam.tsx @@ -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, @@ -25,8 +27,8 @@ 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, @@ -34,7 +36,7 @@ import { TableHead, TableHeader, TableRow, -} from "@dingify/ui/components/table"; +} from "@dingify/ui/components/table" const data: TeamMember[] = [ { @@ -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", }, { @@ -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[] = [ { @@ -98,16 +100,16 @@ export const columns: ColumnDef[] = [ header: "Join Date", cell: ({ row }) =>
{row.getValue("joinDate")}
, }, -]; +] export function OpenTableTeam() { - const [sorting, setSorting] = React.useState([]); + const [sorting, setSorting] = React.useState([]) const [columnFilters, setColumnFilters] = React.useState( [], - ); + ) const [columnVisibility, setColumnVisibility] = - React.useState({}); - const [rowSelection, setRowSelection] = React.useState({}); + React.useState({}) + const [rowSelection, setRowSelection] = React.useState({}) const table = useReactTable({ data, @@ -126,7 +128,7 @@ export function OpenTableTeam() { columnVisibility, rowSelection, }, - }); + }) return (
@@ -149,7 +151,7 @@ export function OpenTableTeam() { header.getContext(), )} - ); + ) })} ))} @@ -186,5 +188,5 @@ export function OpenTableTeam() {
- ); + ) } diff --git a/apps/www/src/emails/welcome-email.tsx b/apps/www/src/emails/welcome-email.tsx index 019eaf1..2c3d521 100644 --- a/apps/www/src/emails/welcome-email.tsx +++ b/apps/www/src/emails/welcome-email.tsx @@ -12,72 +12,74 @@ import { Section, Tailwind, Text, -} from "@react-email/components"; +} from "@react-email/components" -import Footer from "./components/footer"; +import Footer from "./components/footer" export default function WelcomeEmail({ name = "John Doe", email = "welcome@propwrite.com", }: { - name: string | null; - email: string; + name: string | null + email: string }) { return ( - Welcome to Propwrite + Velkommen til Propdock
- Welcome to Propwrite + Velkommen til Propdock - Thank you for joining us{name && `, ${name}`}! + Takk for at du ønsker være med på laget {name && `, ${name}`}! - I'm Christer, the creator of Propwrite, your new AI assistant for - real estate listings. Excited to have you on board! + Jeg er Christer, personen som laget Propdock. Vi ønsker å gjøre + det enkelt for eiendomsbesittere å håndere sine verdier og + leietakere. I'm Christer, the creator of P, your new AI assistant + for Vi er glad for å ha deg med! - Here's what you can start doing: + Her er noen ting du kan starte med: - ◆ Generate your first{" "} + ◆ Legg til{" "} - AI-powered property listing + din første eiendom - ◆ Manage your{" "} + ◆ Importer inn{" "} - property portfolio + eksiterende bygg - ◆ Connect with us on{" "} + ◆ Bla gjennom vårt{" "} - Twitter + hjelpesenter - If you have any questions or feedback, feel free to reach out. - We're here to help! + Har du spørsmål eller feedback, er det bare å ta kontakt. Vi er + her for å hjelpe deg! - Christer from Propwrite + Christer fra Propdock