fix: Build issues after upgrading packages

limanmys · Sep 12, 2023 · 5cead76 · 5cead76
1 parent 65baae5
commit 5cead76
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 37 deletions.
diff --git a/src/components/dashboard/extension-card.tsx b/src/components/dashboard/extension-card.tsx
@@ -7,21 +7,21 @@ import { Icons } from "../ui/icons"
 
 export default function ExtensionCard({ item }: { item: IMostUsedExtension }) {
   return (
-    <Card className="duration-100 ease-in hover:scale-[102%] active:scale-100 cursor-pointer relative">
+    <Card className="relative cursor-pointer duration-100 ease-in hover:scale-[102%] active:scale-100">
       <CardContent className="mt-6">
         <div className="flex">
           <div className="icon self-start rounded-md bg-secondary p-3 dark:bg-secondary/10">
             {item.extension.icon ? (
               <i
-                className={`fa-solid fa-${item.extension.icon} text-secondary-foreground/70 dark:text-white/70 fa-fw fa-lg`}
+                className={`fa-solid fa-${item.extension.icon} fa-fw fa-lg text-secondary-foreground/70 dark:text-white/70`}
               ></i>
             ) : (
               <ToyBrick className="h-6 w-6 text-secondary-foreground/70 dark:text-white/70" />
             )}
           </div>
         </div>
         <h5 className="mt-4 font-medium">{item.extension.display_name}</h5>
-        <span className="text-muted-foreground text-xs flex items-center gap-1 mt-2">
+        <span className="mt-2 flex items-center gap-1 text-xs text-muted-foreground">
           {item.server.os === "linux" ? (
             <Icons.linux className="h-4 w-4 text-secondary-foreground/70 dark:text-white/70" />
           ) : (

diff --git a/src/components/dashboard/favorite-servers.tsx b/src/components/dashboard/favorite-servers.tsx
@@ -50,7 +50,7 @@ export default function FavoriteServers() {
 
         {loading &&
           [...Array(6)].map((_, i) => (
-            <Skeleton key={i} className="w-full h-[146px]" />
+            <Skeleton key={i} className="h-[146px] w-full" />
           ))}
       </div>
 

diff --git a/src/components/dashboard/server-card.tsx b/src/components/dashboard/server-card.tsx
@@ -25,7 +25,7 @@ export default function ServerCard({ item }: { item: IServer }) {
       })
   }, [])
   return (
-    <Card className="duration-100 ease-in hover:scale-[102%] active:scale-100 cursor-pointer relative">
+    <Card className="relative cursor-pointer duration-100 ease-in hover:scale-[102%] active:scale-100">
       <CardContent className="mt-6">
         <div className="flex">
           <div className="icon self-start rounded-md bg-secondary p-3 dark:bg-secondary/10">
@@ -37,7 +37,7 @@ export default function ServerCard({ item }: { item: IServer }) {
           </div>
         </div>
         <h5 className="mt-4 font-medium">{item.name}</h5>
-        <span className="text-muted-foreground text-xs">{item.ip_address}</span>
+        <span className="text-xs text-muted-foreground">{item.ip_address}</span>
 
         <div className="absolute right-6 top-6 ">
           {loading && <Skeleton className="h-4 w-4 rounded-full" />}

diff --git a/src/components/navigation/sidebar.tsx b/src/components/navigation/sidebar.tsx
@@ -32,7 +32,7 @@ export function Sidebar({ className }: { className?: string }) {
   return (
     <div
       className={cn(
-        "fixed z-30 w-full shrink-0 overflow-y-auto bg-background md:sticky md:block print:hidden",
+        "fixed z-30 w-full shrink-0 overflow-y-auto bg-background print:hidden md:sticky md:block",
         sidebarCtx[SIDEBARCTX_STATES.collapsed] && "hidden border-r"
       )}
     >
@@ -106,16 +106,16 @@ export function Sidebar({ className }: { className?: string }) {
                                 <Button
                                   variant="ghost"
                                   size="sm"
-                                  className="mt-1 w-full justify-start mb-4"
+                                  className="mb-4 mt-1 w-full justify-start"
                                 >
                                   <Server className="mr-2 h-4 w-4" />
                                   Yeni sunucu ekle
                                 </Button>
                               </Link>
 
-                              <ArrowUp className="h-8 w-8 mx-auto animate-bounce block" />
+                              <ArrowUp className="mx-auto block h-8 w-8 animate-bounce" />
 
-                              <span className="text-sm font-medium p-3 block">
+                              <span className="block p-3 text-sm font-medium">
                                 Liman&apos;ı aktif şekilde kullanmaya başlamak
                                 için yukarıdan sunucu ekleyin.
                               </span>

diff --git a/src/components/profile/auth_log.tsx b/src/components/profile/auth_log.tsx
@@ -35,7 +35,7 @@ export default function AuthLog() {
         <TooltipProvider>
           <Tooltip>
             <TooltipTrigger>
-              <span className="text-blue-500 cursor-pointer">
+              <span className="cursor-pointer text-blue-500">
                 {row.original.user_agent.substring(0, 30) + "..."}
               </span>
             </TooltipTrigger>

diff --git a/src/components/settings/async-transfer-list.tsx b/src/components/settings/async-transfer-list.tsx
@@ -194,7 +194,11 @@ const AsyncTransferList = <T extends ITransferListItem>(
                       htmlFor={value.id}
                       className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
                     >
-                      {props.renderName ? value[props.renderName] : value.name}
+                      {
+                        (props.renderName
+                          ? value[props.renderName]
+                          : value.name) as any
+                      }
                     </Label>
                   </div>
                 )

diff --git a/src/components/settings/subscription-card.tsx b/src/components/settings/subscription-card.tsx
@@ -125,8 +125,8 @@ export default function SubscriptionCard({
                   onValueChange={(value) => setSelectedServer(value)}
                   defaultValue={selectedServer}
                 >
-                  <SelectTrigger className="w-[200px] h-18">
-                    <Server className="w-4 h-4 text-muted-foreground" />
+                  <SelectTrigger className="h-18 w-[200px]">
+                    <Server className="h-4 w-4 text-muted-foreground" />
                     <SelectValue placeholder="Sunucu seçiniz..." />
                   </SelectTrigger>
                   <SelectContent>
@@ -146,7 +146,7 @@ export default function SubscriptionCard({
             </>
           )}
           {serverLoading && (
-            <Skeleton className="w-[200px] h-18 rounded-full" />
+            <Skeleton className="h-18 w-[200px] rounded-full" />
           )}
           <DropdownMenu>
             <DropdownMenuTrigger disabled={!selectedServer} asChild>

diff --git a/src/components/ui/icons.tsx b/src/components/ui/icons.tsx
@@ -1,10 +1,10 @@
 import {
   Loader2,
+  LucideIcon,
   LucideProps,
   Moon,
   SunMedium,
   Twitter,
-  type Icon as LucideIcon,
 } from "lucide-react"
 
 export type Icon = LucideIcon

diff --git a/src/components/ui/notification.tsx b/src/components/ui/notification.tsx
@@ -14,7 +14,7 @@ const NotificationViewport = React.forwardRef<
   <ToastPrimitives.Viewport
     ref={ref}
     className={cn(
-      "fixed top-20 right-0 mb-4 z-[49] flex max-h-screen w-full flex-col-reverse p-4 sm:flex-col md:max-w-[420px]",
+      "fixed right-0 top-20 z-[49] mb-4 flex max-h-screen w-full flex-col-reverse p-4 sm:flex-col md:max-w-[420px]",
       className
     )}
     {...props}

diff --git a/src/components/ui/notificationcreator.tsx b/src/components/ui/notificationcreator.tsx
@@ -18,12 +18,12 @@ export function NotificationCreator() {
       {toasts.map(function (props: INotification) {
         return (
           <Notification key={props.notification_id}>
-            <div className="w-full gap-1 flex flex-col relative">
-              <h3 className="font-semibold text-[15px] tracking-tight">
+            <div className="relative flex w-full flex-col gap-1">
+              <h3 className="text-[15px] font-semibold tracking-tight">
                 {props.title}
               </h3>
 
-              <p className="text-sm text-slate-700 dark:text-slate-300 font-medium">
+              <p className="text-sm font-medium text-slate-700 dark:text-slate-300">
                 {props.content}
               </p>
 

diff --git a/src/components/ui/status-badge.tsx b/src/components/ui/status-badge.tsx
@@ -12,7 +12,7 @@ export default function StatusBadge({ status }: { status: Status }) {
 
   return (
     <div
-      className={cn("w-2 h-2 rounded-full inline-block mr-1", colors[status])}
+      className={cn("mr-1 inline-block h-2 w-2 rounded-full", colors[status])}
     ></div>
   )
 }
diff --git a/src/components/ui/transfer-list.tsx b/src/components/ui/transfer-list.tsx
@@ -186,9 +186,11 @@ const TransferList = <T extends ITransferListItem>(
                         htmlFor={value.id}
                         className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
                       >
-                        {props.renderName
-                          ? value[props.renderName]
-                          : value.name}
+                        {
+                          (props.renderName
+                            ? value[props.renderName]
+                            : value.name) as any
+                        }
                       </Label>
                     </div>
                   )

diff --git a/src/pages/notifications/index.tsx b/src/pages/notifications/index.tsx
@@ -24,7 +24,7 @@ export default function NotificationsPage() {
         title="Bildirimler"
         description="Geçmişe dönük okuduğunuz tüm bildirimleri bu sayfa aracılığı ile görüntüleyebilirsiniz."
       />
-      <div className="pt-2 p-8 ml-3">
+      <div className="ml-3 p-8 pt-2">
         <ol className="relative border-l">
           {notifications.map((notification) => (
             <NotificationItem
@@ -58,7 +58,7 @@ function NotificationItem({ notification }: { notification: INotification }) {
       className="mb-10 ml-6"
       id={`notification-${notification.notification_id}`}
     >
-      <span className="absolute flex items-center justify-center w-6 h-6 bg-blue-100 rounded-full -left-3 ring-4 ring-white dark:ring-gray-900 dark:bg-blue-900"></span>
+      <span className="absolute -left-3 flex h-6 w-6 items-center justify-center rounded-full bg-blue-100 ring-4 ring-white dark:bg-blue-900 dark:ring-gray-900"></span>
       <time className="text-sm font-normal leading-none text-muted-foreground">
         {new Date(notification.send_at).toLocaleDateString("tr-TR", {
           day: "2-digit",
@@ -68,13 +68,13 @@ function NotificationItem({ notification }: { notification: INotification }) {
           minute: "2-digit",
         })}
       </time>
-      <div className="items-end justify-between p-4 bg-background border rounded-lg shadow-sm sm:flex mt-4">
+      <div className="mt-4 items-end justify-between rounded-lg border bg-background p-4 shadow-sm sm:flex">
         <time className="mb-1 text-xs font-normal text-gray-400 sm:order-last sm:mb-0">
           <StatusBadge status={notification.level as Status} />{" "}
           {notification.send_at_humanized}
         </time>
         <div className="">
-          <h3 className="font-semibold tracking-tight mb-2">
+          <h3 className="mb-2 font-semibold tracking-tight">
             {notification.title}
           </h3>
 

diff --git a/src/pages/settings/access/keycloak.tsx b/src/pages/settings/access/keycloak.tsx
@@ -194,7 +194,7 @@ const AccessKeycloakPage: NextPageWithLayout = () => {
               name="active"
               render={({ field }) => (
                 <FormItem className="flex flex-row items-center justify-between rounded-lg border p-4 shadow-sm">
-                  <div className="space-y-0.5 space-x-3 flex">
+                  <div className="flex space-x-3 space-y-0.5">
                     <UserCheck2 className="h-6 w-6 text-muted-foreground" />
                     <div className="flex flex-col space-y-0.5">
                       <FormLabel>Entegrasyonu aktifleştir</FormLabel>

diff --git a/src/pages/settings/advanced/certificates/[id]/index.tsx b/src/pages/settings/advanced/certificates/[id]/index.tsx
@@ -48,7 +48,7 @@ export default function CertificateInformation() {
       <div className="p-8 pt-0">
         <div className="grid grid-cols-2 gap-6">
           <div className="space-y-2">
-            <h2 className="border-b w-full font-semibold text-lg mb-3">
+            <h2 className="mb-3 w-full border-b text-lg font-semibold">
               İstemci Detayları
             </h2>
             <Label>IP Adresi</Label>
@@ -60,7 +60,7 @@ export default function CertificateInformation() {
           </div>
 
           <div className="space-y-2">
-            <h2 className="border-b w-full font-semibold text-lg mb-3">
+            <h2 className="mb-3 w-full border-b text-lg font-semibold">
               Geçerlilik Süresi
             </h2>
             <Label>Başlangıç</Label>
@@ -73,7 +73,7 @@ export default function CertificateInformation() {
           </div>
 
           <div className="space-y-2">
-            <h2 className="border-b w-full font-semibold text-lg mb-3">
+            <h2 className="mb-3 w-full border-b text-lg font-semibold">
               Genel Detaylar
             </h2>
             <Label>İstemci</Label>

diff --git a/src/pages/settings/advanced/certificates/retrieve.tsx b/src/pages/settings/advanced/certificates/retrieve.tsx
@@ -83,7 +83,7 @@ export default function CertificateInformation() {
       <div className="p-8 pt-0">
         <div className="grid grid-cols-2 gap-6">
           <div className="space-y-2">
-            <h2 className="border-b w-full font-semibold text-lg mb-3">
+            <h2 className="mb-3 w-full border-b text-lg font-semibold">
               İstemci Detayları
             </h2>
             <Label>IP Adresi</Label>
@@ -92,7 +92,7 @@ export default function CertificateInformation() {
               onChange={(e) => setIpAddress(e.target.value)}
             />
             <Button onClick={fetchDetails} className="mb-10" disabled={loading}>
-              <DownloadCloudIcon className="h-4 w-4 mr-2" /> Sertifika
+              <DownloadCloudIcon className="mr-2 h-4 w-4" /> Sertifika
               Detaylarını Getir
             </Button>
           </div>
@@ -102,7 +102,7 @@ export default function CertificateInformation() {
           </div>
 
           <div className="space-y-2">
-            <h2 className="border-b w-full font-semibold text-lg mb-3">
+            <h2 className="mb-3 w-full border-b text-lg font-semibold">
               Geçerlilik Süresi
             </h2>
             <Label>Başlangıç</Label>
@@ -115,7 +115,7 @@ export default function CertificateInformation() {
           </div>
 
           <div className="space-y-2">
-            <h2 className="border-b w-full font-semibold text-lg mb-3">
+            <h2 className="mb-3 w-full border-b text-lg font-semibold">
               Genel Detaylar
             </h2>
             <Label>İstemci</Label>
@@ -136,7 +136,7 @@ export default function CertificateInformation() {
               className="mb-10"
               disabled={loading || !data || Object.keys(data).length == 0}
             >
-              <Save className="h-4 w-4 mr-2" /> Kaydet
+              <Save className="mr-2 h-4 w-4" /> Kaydet
             </Button>
           </div>