starred/archived-linsa
1
0
Fork 0
mirror of https://github.com/linsa-io/linsa.git synced 2026-01-12 12:20:23 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
Aslam H
2024-09-28 19:54:22 +07:00
parent 63f244d9dd
commit 9393dd45a5
1 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/lib/schema/index.ts
+15 -18
View File
@@ -8,14 +8,14 @@
// open issue about it: https://github.com/gardencmp/jazz/issues/44 // open issue about it: https://github.com/gardencmp/jazz/issues/44
// TODO: figure out how to do default values, e.g. `GlobalLink.protocol` should have default value `https` so we don't have to supply it every time in code.. // TODO: figure out how to do default values, e.g. `GlobalLink.protocol` should have default value `https` so we don't have to supply it every time in code..
// TODO: can jazz support vector fields? e.g. `GlobalLinkAiSummary.vectorContent`, would be nice to store website content as vector for semantic search // TODO: can jazz support vector fields? e.g. `GlobalLinkAiSummary.vectorContent`, would be nice to store website content as vector for semantic search
import { CoMap, co, Account, Profile } from 'jazz-tools' import { CoMap, co, Account, Profile } from "jazz-tools"
import { PersonalPageLists } from './personal-page' import { PersonalPageLists } from "./personal-page"
import { PersonalLinkLists } from './personal-link' import { PersonalLinkLists } from "./personal-link"
import { ListOfTopics } from './master/topic' import { ListOfTopics } from "./master/topic"
import { ListOfTasks } from './tasks' import { ListOfTasks } from "./tasks"
import { JournalEntryLists } from './journal' import { JournalEntryLists } from "./journal"
declare module 'jazz-tools' { declare module "jazz-tools" {
interface Profile { interface Profile {
avatarUrl?: string avatarUrl?: string
} }
@@ -46,10 +46,7 @@ export class LaAccount extends Account {
profile = co.ref(Profile) profile = co.ref(Profile)
root = co.ref(UserRoot) root = co.ref(UserRoot)
migrate( migrate(this: LaAccount, creationProps?: { name: string; avatarUrl?: string }) {
this: LaAccount,
creationProps?: { name: string; avatarUrl?: string }
) {
// since we dont have a custom AuthProvider yet. // since we dont have a custom AuthProvider yet.
// and still using the DemoAuth. the creationProps will only accept name. // and still using the DemoAuth. the creationProps will only accept name.
// so just do default profile create provided by jazz-tools // so just do default profile create provided by jazz-tools
@@ -60,12 +57,12 @@ export class LaAccount extends Account {
{ {
name: creationProps.name, name: creationProps.name,
username: creationProps.name, username: creationProps.name,
avatar: creationProps.avatarUrl || '', avatar: creationProps.avatarUrl || "",
website: '', website: "",
bio: '', bio: "",
is_public: false, is_public: false,
connectedFolderPath: '', connectedFolderPath: "",
personalLinks: PersonalLinkLists.create([], { owner: this }), personalLinks: PersonalLinkLists.create([], { owner: this }),
personalPages: PersonalPageLists.create([], { owner: this }), personalPages: PersonalPageLists.create([], { owner: this }),
@@ -83,6 +80,6 @@ export class LaAccount extends Account {
} }
} }
export * from './master/topic' export * from "./master/topic"
export * from './personal-link' export * from "./personal-link"
export * from './personal-page' export * from "./personal-page"