Skip to content

Commit

Permalink
(FE) Add Workspace Invitation (#87)
Browse files Browse the repository at this point in the history
* Add create invitation url

* Add join workspace
  • Loading branch information
devleejb authored Jan 23, 2024
1 parent 49b4f7a commit 692bdfc
Show file tree
Hide file tree
Showing 9 changed files with 385 additions and 11 deletions.
4 changes: 2 additions & 2 deletions backend/src/workspaces/workspaces.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CreateInvitationTokenResponse } from "./types/create-inviation-token-re
import { WorkspaceRoleConstants } from "src/utils/constants/auth-role";
import slugify from "slugify";
import { generateRandomKey } from "src/utils/functions/random-string";
import moment from "moment";
import * as moment from "moment";

@Injectable()
export class WorkspacesService {
Expand Down Expand Up @@ -174,7 +174,7 @@ export class WorkspacesService {
},
});

if (!userWorkspace) {
if (userWorkspace) {
return userWorkspace.workspace;
}

Expand Down
224 changes: 217 additions & 7 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@uiw/codemirror-themes": "^4.21.21",
"@uiw/react-markdown-preview": "^5.0.7",
"axios": "^1.6.5",
"clipboardy": "^4.0.0",
"codemirror": "^6.0.1",
"codemirror-markdown-commands": "^0.0.3",
"codemirror-markdown-slug": "^0.0.3",
Expand Down
Loading

0 comments on commit 692bdfc

Please sign in to comment.