mirror of
https://github.com/linsa-io/linsa.git
synced 2026-01-11 20:00:23 +01:00
fix: conflict
This commit is contained in:
@@ -8,14 +8,14 @@
|
||||
// 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: 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 { PersonalPageLists } from './personal-page'
|
||||
import { PersonalLinkLists } from './personal-link'
|
||||
import { ListOfTopics } from './master/topic'
|
||||
import { ListOfTasks } from './tasks'
|
||||
import { JournalEntryLists } from './journal'
|
||||
import { CoMap, co, Account, Profile } from "jazz-tools"
|
||||
import { PersonalPageLists } from "./personal-page"
|
||||
import { PersonalLinkLists } from "./personal-link"
|
||||
import { ListOfTopics } from "./master/topic"
|
||||
import { ListOfTasks } from "./tasks"
|
||||
import { JournalEntryLists } from "./journal"
|
||||
|
||||
declare module 'jazz-tools' {
|
||||
declare module "jazz-tools" {
|
||||
interface Profile {
|
||||
avatarUrl?: string
|
||||
}
|
||||
@@ -46,10 +46,7 @@ export class LaAccount extends Account {
|
||||
profile = co.ref(Profile)
|
||||
root = co.ref(UserRoot)
|
||||
|
||||
migrate(
|
||||
this: LaAccount,
|
||||
creationProps?: { name: string; avatarUrl?: string }
|
||||
) {
|
||||
migrate(this: LaAccount, creationProps?: { name: string; avatarUrl?: string }) {
|
||||
// since we dont have a custom AuthProvider yet.
|
||||
// and still using the DemoAuth. the creationProps will only accept name.
|
||||
// so just do default profile create provided by jazz-tools
|
||||
@@ -60,12 +57,12 @@ export class LaAccount extends Account {
|
||||
{
|
||||
name: creationProps.name,
|
||||
username: creationProps.name,
|
||||
avatar: creationProps.avatarUrl || '',
|
||||
website: '',
|
||||
bio: '',
|
||||
avatar: creationProps.avatarUrl || "",
|
||||
website: "",
|
||||
bio: "",
|
||||
is_public: false,
|
||||
|
||||
connectedFolderPath: '',
|
||||
connectedFolderPath: "",
|
||||
|
||||
personalLinks: PersonalLinkLists.create([], { owner: this }),
|
||||
personalPages: PersonalPageLists.create([], { owner: this }),
|
||||
@@ -83,6 +80,6 @@ export class LaAccount extends Account {
|
||||
}
|
||||
}
|
||||
|
||||
export * from './master/topic'
|
||||
export * from './personal-link'
|
||||
export * from './personal-page'
|
||||
export * from "./master/topic"
|
||||
export * from "./personal-link"
|
||||
export * from "./personal-page"
|
||||
|
||||
Reference in New Issue
Block a user