diff options
| -rw-r--r-- | src/client/documents/DocumentTypes.ts | 1 | ||||
| -rw-r--r-- | src/client/documents/Documents.ts | 3 | ||||
| -rw-r--r-- | src/client/util/CurrentUserUtils.ts | 2 | ||||
| -rw-r--r-- | src/client/util/GroupManager.tsx | 47 | ||||
| -rw-r--r-- | src/client/util/SettingsManager.scss | 1 | ||||
| -rw-r--r-- | src/server/ApiManagers/UserManager.ts | 11 |
6 files changed, 60 insertions, 5 deletions
diff --git a/src/client/documents/DocumentTypes.ts b/src/client/documents/DocumentTypes.ts index 5697a5bc0..7578b7df0 100644 --- a/src/client/documents/DocumentTypes.ts +++ b/src/client/documents/DocumentTypes.ts @@ -32,6 +32,7 @@ export enum DocumentType { YOUTUBE = "youtube", // youtube directory (view of you tube search results) DOCHOLDER = "docholder", // nested document (view of a document) COMPARISON = "comparison", // before/after view with slider (view of 2 images) + GROUP = "group", // group of users LINKDB = "linkdb", // database of links ??? why do we have this SCRIPTDB = "scriptdb", // database of scripts diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index 980c52dd0..d3710e858 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -315,6 +315,9 @@ export namespace Docs { layout: { view: EmptyBox, dataField: defaultDataKey }, options: { childDropAction: "alias", title: "Global Group Database" } }], + [DocumentType.GROUP, { + layout: { view: EmptyBox, dataField: defaultDataKey } + }] ]); // All document prototypes are initialized with at least these values diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts index 423b1fb90..84e69eebe 100644 --- a/src/client/util/CurrentUserUtils.ts +++ b/src/client/util/CurrentUserUtils.ts @@ -766,7 +766,7 @@ export class CurrentUserUtils { await this.setupSidebarButtons(doc); // the pop-out left sidebar of tools/panels doc.globalLinkDatabase = Docs.Prototypes.MainLinkDocument(); doc.globalScriptDatabase = Docs.Prototypes.MainScriptDocument(); - // doc.globalGroupDatabse = Docs.Prototypes.MainGroupDocument(); + doc.globalGroupDatabase = Docs.Prototypes.MainGroupDocument(); // setup reactions to change the highlights on the undo/redo buttons -- would be better to encode this in the undo/redo buttons, but the undo/redo stacks are not wired up that way yet doc["dockedBtn-undo"] && reaction(() => UndoManager.undoStack.slice(), () => Doc.GetProto(doc["dockedBtn-undo"] as Doc).opacity = UndoManager.CanUndo() ? 1 : 0.4, { fireImmediately: true }); diff --git a/src/client/util/GroupManager.tsx b/src/client/util/GroupManager.tsx index 65ea97e6c..c4798e6a9 100644 --- a/src/client/util/GroupManager.tsx +++ b/src/client/util/GroupManager.tsx @@ -3,6 +3,13 @@ import { observable, action } from "mobx"; import { SelectionManager } from "./SelectionManager"; import MainViewModal from "../views/MainViewModal"; import { observer } from "mobx-react"; +import { Doc, DocListCast } from "../../fields/Doc"; +import { List } from "../../fields/List"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import * as fa from '@fortawesome/free-solid-svg-icons'; +import { library } from "@fortawesome/fontawesome-svg-core"; + +library.add(fa.faWindowClose); @observer export default class GroupManager extends React.Component<{}> { @@ -17,22 +24,54 @@ export default class GroupManager extends React.Component<{}> { GroupManager.Instance = this; } - public open = action(() => { + open = action(() => { SelectionManager.DeselectAll(); this.isOpen = true; }); - public close = action(() => { + close = action(() => { this.isOpen = false; }); + get GroupManagerDoc(): Doc | undefined { + return Doc.UserDoc().globalGroupDatabase as Doc; + } + + getAllGroups(): Doc[] { + const groupDoc = GroupManager.Instance.GroupManagerDoc; + return groupDoc ? DocListCast(groupDoc.data) : []; + } + + addGroup(groupDoc: Doc): boolean { + const groupList = GroupManager.Instance.getAllGroups(); + groupList.push(groupDoc); + if (GroupManager.Instance.GroupManagerDoc) { + GroupManager.Instance.GroupManagerDoc.data = new List<Doc>(groupList); + return true; + } + return false; + } + + deleteGroup(groupDoc: Doc): boolean { + const groupList = GroupManager.Instance.getAllGroups(); + const index = groupList.indexOf(groupDoc); + if (index !== -1) { + groupList.splice(index, 1); + if (GroupManager.Instance.GroupManagerDoc) { + GroupManager.Instance.GroupManagerDoc.data = new List<Doc>(groupList); + return true; + } + } + return false; + } + private get groupInterface() { return ( <div className="settings-interface"> <div className="settings-heading"> - <h1>settings</h1> + <h1>Groups</h1> <div className={"close-button"} onClick={this.close}> - OI + <FontAwesomeIcon icon={fa.faWindowClose} size={"lg"} /> </div> </div> <div className="settings-body"> diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss index 6513cb223..fa2609ca2 100644 --- a/src/client/util/SettingsManager.scss +++ b/src/client/util/SettingsManager.scss @@ -41,6 +41,7 @@ position: absolute; right: 1em; top: 1em; + cursor: pointer; } .settings-heading { diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts index 0d1d8f218..5e7bb6855 100644 --- a/src/server/ApiManagers/UserManager.ts +++ b/src/server/ApiManagers/UserManager.ts @@ -27,6 +27,17 @@ export default class UserManager extends ApiManager { register({ method: Method.GET, + subscription: "/getGroups", + secureHandler: async ({ res }) => { + console.log(Database.Instance.getCollectionNames()); + const cursor = await Database.Instance.query({}, { name: 1, owner: 1, members: 1 }, "groups"); + const results = await cursor.toArray(); + res.send(results.map(group => ({ name: group.name, owner: group.owner, members: group.members }))); + } + }); + + register({ + method: Method.GET, subscription: "/getUserDocumentId", secureHandler: ({ res, user }) => res.send(user.userDocumentId) }); |