Skip to content

Commit c10592d

Browse files
committed
minor cleanup
1 parent 1fbf8bc commit c10592d

File tree

12 files changed

+32
-31
lines changed

12 files changed

+32
-31
lines changed
+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
import ActiveLink from './ActiveLink';
2-
1+
export { default } from './ActiveLink';
32
export * from './ActiveLink';
4-
5-
export default ActiveLink;
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
import Notifications from './Notifications';
2-
1+
export { default } from './Notifications';
32
export * from './Notifications';
4-
5-
export default Notifications;

src/layouts/AdminLayout/AdminLayout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
44

55
import UserProfileDropdown from 'src/modules/user/components/UserProfileDropdown';
66

7-
import Sidebar from './Sidebar';
7+
import Sidebar from './components/Sidebar';
88

99
import type { AuthChildProps } from 'src/modules/auth/components/Auth';
1010
import type { GetLayoutFn } from 'src/pages/_app';

src/layouts/AdminLayout/Sidebar.tsx renamed to src/layouts/AdminLayout/components/Sidebar/Sidebar.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
} from 'src/common/routes';
1414
import UserAvatar from 'src/modules/user/components/UserAvatar';
1515

16-
import NavigationItem from './components/NavigationItem';
16+
import NavigationItem from '../NavigationItem';
1717

1818
import type { Session } from 'src/modules/session/types';
1919

@@ -126,6 +126,7 @@ const Sidebar = ({
126126
<UserAvatar
127127
image={session.user.image}
128128
name={session.user.name}
129+
nameClassName="max-w-48"
129130
/>
130131
)}
131132
</span>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from './Sidebar';
+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
import Auth from './Auth';
2-
1+
export { default } from './Auth';
32
export * from './Auth';
4-
5-
export default Auth;

src/modules/user/components/UserAvatar/UserAvatar.tsx

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1+
import classnames from 'classnames';
12
import Image from 'next/image';
23
import React from 'react';
34

45
export interface AvatarProps {
56
image?: string | null;
67
name?: string | null;
8+
nameClassName?: string;
79
size?: [number, number];
810
}
911

10-
const Avatar = ({ image, name, size }: AvatarProps): React.ReactElement => (
12+
const Avatar = ({
13+
image,
14+
name,
15+
nameClassName,
16+
size,
17+
}: AvatarProps): React.ReactElement => (
1118
<span className="flex items-center justify-between min-w-0 space-x-3">
1219
{image ? (
1320
<Image
@@ -31,7 +38,12 @@ const Avatar = ({ image, name, size }: AvatarProps): React.ReactElement => (
3138
)}
3239
{name && (
3340
<span className="flex flex-col flex-1 min-w-0">
34-
<span className="text-sm font-medium text-gray-900 truncate">
41+
<span
42+
className={classnames(
43+
'text-sm font-medium text-gray-900 truncate',
44+
nameClassName
45+
)}
46+
>
3547
{name}
3648
</span>
3749
</span>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
import UserAvatar from './UserAvatar';
2-
1+
export { default } from './UserAvatar';
32
export * from './UserAvatar';
4-
5-
export default UserAvatar;
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
import UserProfileDropdown from './UserProfileDropdown';
2-
3-
export default UserProfileDropdown;
1+
export { default } from './UserProfileDropdown';
2+
export * from './UserProfileDropdown';
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
import UserAdminForm from './UserAdminForm';
2-
1+
export { default } from './UserAdminForm';
32
export * from './UserAdminForm';
4-
5-
export default UserAdminForm;
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
import UserGeneralSettingsForm from './UserGeneralSettingsForm';
2-
3-
export default UserGeneralSettingsForm;
1+
export { default } from './UserGeneralSettingsForm';
2+
export * from './UserGeneralSettingsForm';

tailwind.config.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ module.exports = {
55
plugins: [require('@tailwindcss/forms')],
66
purge: ['./src/**/*.{js,ts,jsx,tsx}'],
77
theme: {
8-
extend: {},
8+
extend: {
9+
maxWidth: {
10+
48: '12rem',
11+
},
12+
},
913
},
1014
variants: {
1115
extend: {},

0 commit comments

Comments
 (0)