From 1e21941c7750a579ca318070eddf42d96f5c4798 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 28 May 2022 13:52:23 -0500 Subject: [PATCH] adding core and i think it worked? --- packages/core/package.json | 9 +++++++++ packages/core/src/index.ts | 3 +++ packages/core/src/models/user.model.ts | 15 +++++++++++++++ packages/desktop/package.json | 3 ++- packages/desktop/src/app.tsx | 3 +++ packages/desktop/src/components/Conversations.tsx | 3 ++- packages/desktop/src/firebase/firestore.ts | 15 +-------------- 7 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 packages/core/package.json create mode 100644 packages/core/src/index.ts create mode 100644 packages/core/src/models/user.model.ts diff --git a/packages/core/package.json b/packages/core/package.json new file mode 100644 index 0000000..c2b7707 --- /dev/null +++ b/packages/core/package.json @@ -0,0 +1,9 @@ +{ + "name": "@nirvana/core", + "version": "1.0.0", + "main": "index.js", + "license": "MIT", + "dependencies": { + "firebase": "^9.8.2" + } +} diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts new file mode 100644 index 0000000..76f132f --- /dev/null +++ b/packages/core/src/index.ts @@ -0,0 +1,3 @@ +export const connectCore = () => { + console.log('CONNECTED COREEEE'); +}; diff --git a/packages/core/src/models/user.model.ts b/packages/core/src/models/user.model.ts new file mode 100644 index 0000000..da58c6b --- /dev/null +++ b/packages/core/src/models/user.model.ts @@ -0,0 +1,15 @@ +import { Timestamp } from 'firebase/firestore'; + +export class User { + lastUpdatedDate?: Timestamp; + + constructor( + public uid: string, + public providerId: string, + public email: string, + public displayName?: string, + public photoUrl?: string, + public phoneNumber?: string, + public createdDate: Timestamp = Timestamp.now(), + ) {} +} diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 7e4cc68..0d94004 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -89,7 +89,8 @@ "node-loader": "^2.0.0", "style-loader": "^3.0.0", "ts-loader": "^9.2.2", - "typescript": "~4.5.4" + "typescript": "~4.5.4", + "@nirvana/core": "*" }, "dependencies": { "@emotion/react": "^11.9.0", diff --git a/packages/desktop/src/app.tsx b/packages/desktop/src/app.tsx index c590682..8369665 100644 --- a/packages/desktop/src/app.tsx +++ b/packages/desktop/src/app.tsx @@ -10,6 +10,9 @@ import { ElectronProvider } from './providers/ElectronProvider'; import { AuthProvider } from './providers/AuthProvider'; import ErrorParent from './providers/ErrorBoundary'; +import { connectCore } from '@nirvana/core/src/index'; + +connectCore(); const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); root.render( diff --git a/packages/desktop/src/components/Conversations.tsx b/packages/desktop/src/components/Conversations.tsx index 5f18c94..80924ea 100644 --- a/packages/desktop/src/components/Conversations.tsx +++ b/packages/desktop/src/components/Conversations.tsx @@ -21,7 +21,8 @@ import NirvanaAvatar from './NirvanaAvatar'; import { useDebounce, useKey } from 'react-use'; import { useSnackbar } from 'notistack'; import KeyboardShortcutLabel from './KeyboardShortcutLabel'; -import { searchUsers, User } from '../firebase/firestore'; +import { searchUsers } from '../firebase/firestore'; +import { User } from '@nirvana/core/src/models/user.model'; const Conversations = () => { const { enqueueSnackbar } = useSnackbar(); diff --git a/packages/desktop/src/firebase/firestore.ts b/packages/desktop/src/firebase/firestore.ts index b8e3250..9fa3120 100644 --- a/packages/desktop/src/firebase/firestore.ts +++ b/packages/desktop/src/firebase/firestore.ts @@ -20,6 +20,7 @@ import { import { User as FirebaseUser } from 'firebase/auth'; import { firestoreDb } from './connect'; +import { User } from '@nirvana/core/src/models/user.model'; /** * UTILS @@ -40,20 +41,6 @@ const db = { user: (userId: string) => docPoint(`users/${userId}`), }; -export class User { - lastUpdatedDate?: Timestamp; - - constructor( - public uid: string, - public providerId: string, - public email: string, - public displayName?: string, - public photoUrl?: string, - public phoneNumber?: string, - public createdDate: Timestamp = Timestamp.now(), - ) {} -} - // enum COLLECTION { // users = 'users', // }