cleanup packages

packages/desktop/package.json

@@ -94,10 +94,7 @@
     "style-loader": "^3.0.0",
     "tailwindcss": "^3.0.23",
     "ts-loader": "^9.2.2",
-    "typescript": "~4.5.4",
-    "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.9.0"
+    "typescript": "~4.5.4"
   },
   "dependencies": {
     "@getstation/electron-google-oauth2": "^2.1.0",
@@ -118,7 +115,6 @@
     "react-query": "^3.34.16",
     "react-use": "^17.3.2",
     "recoil": "^0.6.1",
-    "sass": "^1.51.0",
     "simple-peer": "^9.11.1",
     "socket.io-client": "^4.4.1",
     "use-immer": "^0.7.0"

packages/desktop/src/providers/AuthProvider.tsx

@@ -1,9 +1,10 @@
-import React, { useContext, useState, useEffect, useCallback } from 'react';
-import { User } from '@nirvana/core/models/user.model';
-import { useAsyncFn } from 'react-use';
 import NirvanaApi, { getUserDetails } from '../api/NirvanaApi';
-import toast from 'react-hot-toast';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
+
 import { STORE_ITEMS } from '../electron/constants';
+import { User } from '@nirvana/core/models/user.model';
+import toast from 'react-hot-toast';
+import { useAsyncFn } from 'react-use';
 
 interface IAuthProvider {
   user?: User;
@@ -38,7 +39,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     if (jwtToken) {
       console.warn(jwtToken);
 
-      // ?should this be set here? what's a better way of
+      // ?should this be set here? what's a better way of having jwt token encapsulated in api async functions
       NirvanaApi._jwtToken = jwtToken;
 
       fetchUser()

packages/desktop/src/tree/protected/terminal/compose/NewChannelForm.tsx

@@ -1,12 +1,13 @@
-import React, { useState, useCallback, useRef, useEffect } from 'react';
-import { FiPlusSquare, FiUsers, FiX, FiXSquare } from 'react-icons/fi';
-import { useAsyncFn, useDebounce, useKeyPressEvent } from 'react-use';
-import { createLine, userSearch } from '../../../../api/NirvanaApi';
-import toast from 'react-hot-toast';
 import { Avatar, Divider, Skeleton, Spin } from 'antd';
-import { User } from '@nirvana/core/models/user.model';
+import { FiPlusSquare, FiUsers, FiX, FiXSquare } from 'react-icons/fi';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { createLine, userSearch } from '../../../../api/NirvanaApi';
+import { useAsyncFn, useDebounce, useKeyPressEvent } from 'react-use';
+
 import CreateLineRequest from '@nirvana/core/requests/createLine.request';
+import { User } from '@nirvana/core/models/user.model';
 import { maxChannelUserCount } from '../rules';
+import toast from 'react-hot-toast';
 
 export default function NewChannelForm({ handleClose }: { handleClose: () => void }) {
   const [peopleSearchQuery, setPeopleSearchQuery] = useState<string>('');
@@ -181,7 +182,7 @@ export default function NewChannelForm({ handleClose }: { handleClose: () => voi
           <span className="text-gray-500 ">{`Selected`}</span>
 
           <span className="text-gray-400">
-            {selectedUsers.length}/${maxChannelUserCount - 1}
+            {`${selectedUsers.length}/${maxChannelUserCount - 1}`}
           </span>
         </span>
 

packages/desktop/src/tree/protected/terminal/line/LineRow.tsx

@@ -1,14 +1,14 @@
-import MasterLineData from '@nirvana/core/models/masterLineData.model';
-import React, { useMemo, useCallback } from 'react';
-
 import { Avatar, Tooltip } from 'antd';
 import { FiSun, FiX } from 'react-icons/fi';
-import useAuth from '../../../../providers/AuthProvider';
+import React, { useCallback, useMemo } from 'react';
+
 import LineIcon from '../../../../components/lineIcon';
-import moment from 'moment';
-import { useKeyPressEvent } from 'react-use';
-import useElectron from '../../../../providers/ElectronProvider';
+import MasterLineData from '@nirvana/core/models/masterLineData.model';
 import { maxToggleTunedChannelCount } from '../rules';
+import moment from 'moment';
+import useAuth from '../../../../providers/AuthProvider';
+import useElectron from '../../../../providers/ElectronProvider';
+import { useKeyPressEvent } from 'react-use';
 
 export default React.memo(function LineRow({
   index,
@@ -125,8 +125,8 @@ export default React.memo(function LineRow({
 
       {/* channel name */}
       <span
-        className={`text-md max-w-[180px] truncate text-gray-300 ${
-          line.currentUserMember.lastVisitDate ? 'font-semibold text-gray-800' : ''
+        className={`text-md max-w-[180px] truncate  ${
+          line.currentUserMember.lastVisitDate ? 'font-semibold text-gray-800' : ' text-gray-300'
         }`}
       >
         {line.lineDetails.name || line.otherUserObjects[0].givenName}

packages/desktop/src/tree/protected/terminal/rules.ts

@@ -1,3 +1,3 @@
-export const maxChannelUserCount = 5;
+export const maxChannelUserCount = 8;
 
 export const maxToggleTunedChannelCount = 3;