@canmingir/link 1.1.7 → 1.2.0

package/src/components/file-thumbnail/download-button.jsx

@@ -3,8 +3,6 @@ import Iconify from "../Iconify";
 import { bgBlur } from "../../theme/css";
 import { useTheme } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 export default function DownloadButton({ onDownload }) {
   const theme = useTheme();
 

package/src/components/file-thumbnail/file-thumbnail.jsx

@@ -5,8 +5,6 @@ import Tooltip from "@mui/material/Tooltip";
 
 import { fileData, fileFormat, fileThumb } from "./utils";
 
-// ----------------------------------------------------------------------
-
 export default function FileThumbnail({
   file,
   tooltip,

package/src/components/image/image.jsx

@@ -6,8 +6,6 @@ import { getRatio } from "./utils";
 
 import { alpha, useTheme } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 const Image = forwardRef(
   (
     {

package/src/components/label/label.jsx

@@ -4,8 +4,6 @@ import { StyledLabel } from "./styles";
 import { forwardRef } from "react";
 import { useTheme } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 const Label = forwardRef(
   (
     {

package/src/components/loading-screen/loading-screen.jsx

@@ -2,8 +2,6 @@ import Box from "@mui/material/Box";
 import LinearProgress from "@mui/material/LinearProgress";
 import React from "react";
 
-// ----------------------------------------------------------------------
-
 export default function LoadingScreen({ sx, ...other }) {
   return (
     <Box

package/src/components/loading-screen/splash-screen.jsx

@@ -6,8 +6,6 @@ import { m } from "framer-motion";
 
 import { useEffect, useState } from "react";
 
-// ----------------------------------------------------------------------
-
 export default function SplashScreen({ sx, ...other }) {
   const [mounted, setMounted] = useState(false);
 

package/src/components/logo/logo.jsx

@@ -1,16 +1,15 @@
-import React, { useEffect, useState } from "react";
-
 import Box from "@mui/material/Box";
 import Link from "@mui/material/Link";
 import { RouterLink } from "../../routes/components";
 import config from "../../config/config";
 
-// ----------------------------------------------------------------------
-const Logo = ({ disabledLink = false, sx, maxSize= 99 }) => {
+import React, { useEffect, useState } from "react";
+
+const Logo = ({ disabledLink = false, sx, maxSize = 99 }) => {
   const { icon } = config().template.login;
-  const [dimensions, setDimensions] = useState({ 
-    width: maxSize, 
-    height: maxSize 
+  const [dimensions, setDimensions] = useState({
+    width: maxSize,
+    height: maxSize,
   });
 
   useEffect(() => {
@@ -18,16 +17,16 @@ const Logo = ({ disabledLink = false, sx, maxSize= 99 }) => {
       const img = new Image();
       img.onload = () => {
         const { naturalWidth, naturalHeight } = img;
-        
+
         if (naturalWidth > maxSize || naturalHeight > maxSize) {
           setDimensions({
             width: 40,
-            height: 40
+            height: 40,
           });
         } else {
           setDimensions({
             width: naturalWidth,
-            height: naturalHeight
+            height: naturalHeight,
           });
         }
       };
@@ -35,16 +34,15 @@ const Logo = ({ disabledLink = false, sx, maxSize= 99 }) => {
     }
   }, [icon, maxSize]);
 
-
   const logo = (
     <Box
       component="img"
       src={icon}
-      sx={{ 
-        width: dimensions.width, 
-        height: dimensions.height, 
-        cursor: "pointer", 
-        ...sx 
+      sx={{
+        width: dimensions.width,
+        height: dimensions.height,
+        cursor: "pointer",
+        ...sx,
       }}
     />
   );
@@ -60,4 +58,4 @@ const Logo = ({ disabledLink = false, sx, maxSize= 99 }) => {
   );
 };
 
-export default Logo;
+export default Logo;

package/src/components/nav-section/horizontal/nav-item.jsx

@@ -7,7 +7,6 @@ import { RouterLink } from "../../../routes/components";
 import Tooltip from "@mui/material/Tooltip";
 import { forwardRef } from "react";
 import { styled } from "@mui/material/styles";
-// ----------------------------------------------------------------------
 
 const NavItem = forwardRef(
   (
@@ -79,7 +78,6 @@ const NavItem = forwardRef(
       </StyledNavItem>
     );
 
-    // Hidden item by role
     if (roles && !roles.includes(`${currentRole}`)) {
       return null;
     }
@@ -122,8 +120,6 @@ const NavItem = forwardRef(
 
 export default NavItem;
 
-// ----------------------------------------------------------------------
-
 const StyledNavItem = styled(ListItemButton, {
   shouldForwardProp: (prop) => prop !== "active",
 })(({ active, open, depth, theme }) => {
@@ -161,7 +157,6 @@ const StyledNavItem = styled(ListItemButton, {
   };
 
   return {
-    // Root item
     ...(!subItem && {
       ...baseStyles.item,
       minHeight: 32,
@@ -194,7 +189,6 @@ const StyledNavItem = styled(ListItemButton, {
       }),
     }),
 
-    // Sub item
     ...(subItem && {
       ...baseStyles.item,
       minHeight: 34,

package/src/components/nav-section/horizontal/nav-list.jsx

@@ -7,8 +7,6 @@ import { usePathname } from "../../../routes/hooks";
 
 import { useCallback, useEffect, useRef, useState } from "react";
 
-// ----------------------------------------------------------------------
-
 export default function NavList({ data, depth, slotProps }) {
   const navRef = useRef(null);
 
@@ -41,7 +39,6 @@ export default function NavList({ data, depth, slotProps }) {
         open={openMenu}
         onMouseEnter={handleOpenMenu}
         onMouseLeave={handleCloseMenu}
-        //
         title={data.title}
         path={data.path}
         icon={data.icon}
@@ -49,12 +46,10 @@ export default function NavList({ data, depth, slotProps }) {
         roles={data.roles}
         caption={data.caption}
         disabled={data.disabled}
-        //
         depth={depth}
         hasChild={!!data.children}
         externalLink={data.path?.includes("http")}
         currentRole={slotProps?.currentRole}
-        //
         active={active}
         className={active ? "active" : ""}
         sx={depth === 1 ? slotProps?.rootItem : slotProps?.subItem}
@@ -102,8 +97,6 @@ export default function NavList({ data, depth, slotProps }) {
   );
 }
 
-// ----------------------------------------------------------------------
-
 function NavSubList({ data, depth, slotProps }) {
   return (
     <Stack spacing={0.5}>

package/src/components/nav-section/horizontal/nav-section-horizontal.jsx

@@ -3,8 +3,6 @@ import React from "react";
 import Stack from "@mui/material/Stack";
 import { memo } from "react";
 
-// ----------------------------------------------------------------------
-
 function NavSectionHorizontal({ data, slotProps, sx, ...other }) {
   return (
     <Stack
@@ -32,8 +30,6 @@ function NavSectionHorizontal({ data, slotProps, sx, ...other }) {
 
 export default memo(NavSectionHorizontal);
 
-// ----------------------------------------------------------------------
-
 function Group({ items, slotProps }) {
   return (
     <>

package/src/components/nav-section/mini/nav-item.jsx

@@ -9,8 +9,6 @@ import { forwardRef } from "react";
 
 import { alpha, styled } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 const NavItem = forwardRef(
   (
     {
@@ -77,7 +75,6 @@ const NavItem = forwardRef(
       </StyledNavItem>
     );
 
-    // Hidden item by role
     if (roles && !roles.includes(`${currentRole}`)) {
       return null;
     }
@@ -122,8 +119,6 @@ const NavItem = forwardRef(
 
 export default NavItem;
 
-// ----------------------------------------------------------------------
-
 const StyledNavItem = styled(ListItemButton, {
   shouldForwardProp: (prop) => prop !== "active",
 })(({ active, open, depth, theme }) => {
@@ -161,7 +156,6 @@ const StyledNavItem = styled(ListItemButton, {
   };
 
   return {
-    // Root item
     ...(!subItem && {
       ...baseStyles.item,
       fontSize: 10,
@@ -208,7 +202,6 @@ const StyledNavItem = styled(ListItemButton, {
       }),
     }),
 
-    // Sub item
     ...(subItem && {
       ...baseStyles.item,
       ...theme.typography.body2,

package/src/components/nav-section/mini/nav-list.jsx

@@ -7,8 +7,6 @@ import { usePathname } from "../../../routes/hooks";
 
 import { useCallback, useEffect, useRef, useState } from "react";
 
-// ----------------------------------------------------------------------
-
 export default function NavList({ data, depth, slotProps }) {
   const navRef = useRef(null);
 
@@ -42,7 +40,6 @@ export default function NavList({ data, depth, slotProps }) {
         open={openMenu}
         onMouseEnter={handleOpenMenu}
         onMouseLeave={handleCloseMenu}
-        //
         title={data.title}
         path={data.path}
         icon={data.icon}
@@ -50,12 +47,10 @@ export default function NavList({ data, depth, slotProps }) {
         roles={data.roles}
         caption={data.caption}
         disabled={data.disabled}
-        //
         depth={depth}
         hasChild={!!data.children}
         externalLink={data.path?.includes("http")}
         currentRole={slotProps?.currentRole}
-        //
         active={active}
         className={active ? "active" : ""}
         sx={depth === 1 ? slotProps?.rootItem : slotProps?.subItem}
@@ -96,8 +91,6 @@ export default function NavList({ data, depth, slotProps }) {
   );
 }
 
-// ----------------------------------------------------------------------
-
 function NavSubList({ data, depth, slotProps }) {
   return (
     <Stack spacing={0.5}>

package/src/components/nav-section/mini/nav-section-mini.jsx

@@ -3,8 +3,6 @@ import React from "react";
 import Stack from "@mui/material/Stack";
 import { memo } from "react";
 
-// ----------------------------------------------------------------------
-
 function NavSectionMini({ data, slotProps, ...other }) {
   return (
     <Stack
@@ -26,8 +24,6 @@ function NavSectionMini({ data, slotProps, ...other }) {
 
 export default memo(NavSectionMini);
 
-// ----------------------------------------------------------------------
-
 function Group({ items, slotProps }) {
   return (
     <>

package/src/components/nav-section/vertical/nav-item.jsx

@@ -9,8 +9,6 @@ import { forwardRef } from "react";
 
 import { alpha, styled } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 const NavItem = forwardRef(
   (
     {
@@ -109,7 +107,6 @@ const NavItem = forwardRef(
       </StyledNavItem>
     );
 
-    // Hidden item by role
     if (roles && !roles.includes(`${currentRole}`)) {
       return null;
     }
@@ -156,8 +153,6 @@ const NavItem = forwardRef(
 
 export default NavItem;
 
-// ----------------------------------------------------------------------
-
 const StyledNavItem = styled(ListItemButton, {
   shouldForwardProp: (prop) => prop !== "active",
 })(({ active, open, depth, theme }) => {
@@ -212,7 +207,6 @@ const StyledNavItem = styled(ListItemButton, {
   };
 
   return {
-    // Root item
     ...(!subItem && {
       ...baseStyles.item,
       minHeight: 44,
@@ -250,7 +244,6 @@ const StyledNavItem = styled(ListItemButton, {
       }),
     }),
 
-    // Sub item
     ...(subItem && {
       ...baseStyles.item,
       minHeight: 36,
@@ -294,7 +287,6 @@ const StyledNavItem = styled(ListItemButton, {
       }),
     }),
 
-    // Deep sub item
     ...(deepSubItem && {
       paddingLeft: `${theme.spacing(Number(depth))} !important`,
     }),

package/src/components/nav-section/vertical/nav-list.jsx

@@ -6,8 +6,6 @@ import { usePathname } from "../../../routes/hooks";
 
 import { useCallback, useEffect, useState } from "react";
 
-// ----------------------------------------------------------------------
-
 export default function NavList({ data, depth }) {
   const pathname = usePathname();
   const active = useActiveLink(data.path, !!data.children);
@@ -33,7 +31,6 @@ export default function NavList({ data, depth }) {
       <NavItem
         open={openMenu}
         onClick={handleToggleMenu}
-        //
         title={data?.title}
         path={data?.path}
         icon={data?.icon}
@@ -42,11 +39,9 @@ export default function NavList({ data, depth }) {
         caption={data?.caption}
         disabled={data?.disabled}
         external={data?.external}
-        //
         depth={depth}
         hasChild={!!data?.children}
         externalLink={data?.path?.includes("http")}
-        //
         active={active}
         className={active ? "active" : ""}
       />
@@ -60,8 +55,6 @@ export default function NavList({ data, depth }) {
   );
 }
 
-// ----------------------------------------------------------------------
-
 function NavSubList({ data, depth }) {
   return (
     <>

package/src/components/nav-section/vertical/nav-section-vertical.jsx

@@ -6,8 +6,6 @@ import Stack from "@mui/material/Stack";
 
 import { memo, useCallback, useState } from "react";
 
-// ----------------------------------------------------------------------
-
 function NavSectionVertical({ data, slotProps, ...other }) {
   return (
     <>
@@ -27,8 +25,6 @@ function NavSectionVertical({ data, slotProps, ...other }) {
 
 export default memo(NavSectionVertical);
 
-// ----------------------------------------------------------------------
-
 function Group({ subheader, items, slotProps }) {
   const [open, setOpen] = useState(true);
 

package/src/components/scrollbar/scrollbar.jsx

@@ -4,8 +4,6 @@ import { forwardRef } from "react";
 
 import { StyledRootScrollbar, StyledScrollbar } from "./styles";
 
-// ----------------------------------------------------------------------
-
 const Scrollbar = forwardRef(({ children, sx, ...other }, ref) => {
   const userAgent =
     typeof navigator === "undefined" ? "SSR" : navigator.userAgent;

package/src/components/search-not-found/search-not-found.jsx

@@ -1,8 +1,6 @@
 import Paper from "@mui/material/Paper";
 import Typography from "@mui/material/Typography";
 
-// ----------------------------------------------------------------------
-
 export default function SearchNotFound({ query, sx, ...other }) {
   return query ? (
     <Paper

package/src/components/settings/context/settings-provider.jsx

@@ -5,8 +5,6 @@ import { useLocalStorage } from "../../../hooks/use-local-storage";
 
 import { useCallback, useMemo, useState } from "react";
 
-// ----------------------------------------------------------------------
-
 const STORAGE_KEY = "settings";
 
 export function SettingsProvider({ children, defaultSettings }) {
@@ -17,7 +15,6 @@ export function SettingsProvider({ children, defaultSettings }) {
 
   const [openDrawer, setOpenDrawer] = useState(false);
 
-  // Drawer
   const onToggleDrawer = useCallback(() => {
     setOpenDrawer((prev) => !prev);
   }, []);
@@ -32,11 +29,8 @@ export function SettingsProvider({ children, defaultSettings }) {
     () => ({
       ...state,
       onUpdate: update,
-      // Direction
-      // Reset
       canReset,
       onReset: reset,
-      // Drawer
       open: openDrawer,
       onToggle: onToggleDrawer,
       onClose: onCloseDrawer,

package/src/components/settings/drawer/base-option.jsx

@@ -4,8 +4,6 @@ import Stack from "@mui/material/Stack";
 import SvgColor from "../../svg-color";
 import { alpha } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 export default function BaseOptions({ icons, options, value, onChange }) {
   return (
     <Stack direction="row" spacing={2}>

package/src/components/settings/drawer/fullscreen-option.jsx

@@ -6,8 +6,6 @@ import { alpha } from "@mui/material/styles";
 
 import { useCallback, useState } from "react";
 
-// ----------------------------------------------------------------------
-
 export default function FullScreenOption() {
   const [fullscreen, setFullscreen] = useState(false);
 

package/src/components/settings/drawer/layout-options.jsx

@@ -5,8 +5,6 @@ import Stack from "@mui/material/Stack";
 
 import { alpha, useTheme } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 export default function LayoutOptions({ options, value, onChange }) {
   const theme = useTheme();
   const renderNav = (option, selected) => {

package/src/components/settings/drawer/presets-options.jsx

@@ -4,8 +4,6 @@ import React from "react";
 import { alpha } from "@mui/material/styles";
 import { presetOptions } from "../../../theme/options/presets";
 
-// ----------------------------------------------------------------------
-
 export default function PresetsOptions({ value, onChange }) {
   return (
     <Box

package/src/components/settings/drawer/settings-drawer.jsx

@@ -18,8 +18,6 @@ import { useTheme } from "@mui/material/styles";
 
 import Drawer, { drawerClasses } from "@mui/material/Drawer";
 
-// ----------------------------------------------------------------------
-
 export default function SettingsDrawer() {
   const theme = useTheme();
 

package/src/components/settings/drawer/stretch-options.jsx

@@ -5,8 +5,6 @@ import React from "react";
 import Stack from "@mui/material/Stack";
 import { alpha } from "@mui/material/styles";
 
-// ----------------------------------------------------------------------
-
 export default function StretchOptions({ value, onChange }) {
   return (
     <ButtonBase

package/src/components/svg-color/svg-color.jsx

@@ -2,8 +2,6 @@ import Box from "@mui/material/Box";
 import React from "react";
 import { forwardRef } from "react";
 
-// ----------------------------------------------------------------------
-
 const SvgColor = forwardRef(({ src, sx, ...other }, ref) => (
   <Box
     component="span"

package/src/config/schemas.js

@@ -28,6 +28,14 @@ export const ConfigSchema = Joi.object({
       response_type: Joi.string().required(),
       userUrl: Joi.string().uri().required(),
     }).optional(),
+    linkedin: Joi.object({
+      authUrl: Joi.string().uri().required(),
+      clientId: Joi.string().required(),
+      redirectUri: Joi.string().uri().required(),
+      scope: Joi.string().required(),
+      response_type: Joi.string().required(),
+      userUrl: Joi.string().uri().required(),
+    }).optional(),
   }).optional(),
 }).required();
 

package/src/http/user.js

@@ -13,7 +13,6 @@ const instance = axios.create({
 
 function getProjectName() {
   const { name } = config();
-
   if (name) {
     return name;
   }
@@ -28,43 +27,30 @@ instance.interceptors.request.use(async (request) => {
 });
 
 instance.getUserDetails = async () => {
-  const refreshToken = await storage.get(getProjectName(), "refreshToken");
-  const { google, github } = config().project;
-  //TODO: do it in a more elegant way
-  let userUrl;
-  let provider;
-  if (google) {
-    userUrl = google.userUrl;
-    provider = "google";
-  } else if (github) {
-    userUrl = github.userUrl;
-    provider = "github";
-  }
+  try {
+    const refreshToken = await storage.get(getProjectName(), "refreshToken");
+    if (!refreshToken) {
+      console.log("No refresh token found");
+      return null;
+    }
 
-  if (refreshToken) {
-    try {
-      const response = await axios.get(userUrl, {
-        headers: {
-          Authorization: `Bearer ${refreshToken}`,
-        },
-      });
-      if (provider === "github") {
-        return {
-          name: response.data.login,
-          avatarUrl: response.data.avatar_url,
-        };
-      } else if (provider === "google") {
-        return {
-          name: response.data.name,
-          avatarUrl: response.data.picture,
-        };
+    const response = await http.get("/oauth/user", {
+      headers: {
+        'X-Refresh-Token': refreshToken
       }
-    } catch (error) {
-      console.error("Failed to fetch user details:", error);
-      throw error;
+    });
+    
+    if (response.data && response.data.user) {
+      return response.data.user;
     }
+    
+    console.log("No user data received from server");
+    return null;
+    
+  } catch (error) {
+    console.error("Error fetching user details from server:", error);
+    return null;
   }
-  return null;
 };
 
 instance.getPermittedUsers = async () => {
@@ -89,4 +75,4 @@ instance.getPermittedUsers = async () => {
   return users;
 };
 
-export default instance;
+export default instance;

package/src/layouts/DashboardLayout/header.jsx

@@ -1,7 +1,9 @@
+import { HEADER, NAV } from "../config-layout";
+
 import AccountPopover from "../common/account-popover";
 import AppBar from "@mui/material/AppBar";
 import IconButton from "@mui/material/IconButton";
-import Iconify from "../../../minimal/src/components/iconify";
+import Iconify from "../../components/Iconify";
 import Logo from "../../components/logo";
 import NotificationsPopover from "../common/notifications-popover";
 import ProjectBar from "../common/ProjectBar";
@@ -16,10 +18,6 @@ import { useResponsive } from "../../hooks/use-responsive";
 import { useSettingsContext } from "../../components/settings";
 import { useTheme } from "@mui/material/styles";
 
-import { HEADER, NAV } from "../config-layout";
-
-// ----------------------------------------------------------------------
-
 export default function Header({ onOpenNav }) {
   const theme = useTheme();
   const settings = useSettingsContext();