feature/SC-3505/nexboard

deploy/env.sh

@@ -9,6 +9,7 @@ envs=(
     "SERVER_API_URL"
     "EDITOR_SOCKET_URL"
     "HOMEWORK_URI"
+    "ETHERPAD_URL"
 )
 
 # ------------------------------------

src/config.js

@@ -11,7 +11,11 @@ const config = {
 	EDITOR_API_URL: window.EDITOR_API_URL || process.env.EDITOR_API_URL || "http://localhost:4001",
 	SERVER_API_URL: window.SERVER_API_URL || process.env.SERVER_API_URL || "http://localhost:3030",
 	EDITOR_SOCKET_URL: window.EDITOR_SOCKET_URL || process.env.EDITOR_SOCKET_URL || "ws://localhost:4001",
+	ETHERPAD_URL: window.ETHERPAD_URL || process.env.ETHERPAD_URL || "https://etherpad.schul-cloud.org/p/",
+
 	HOMEWORK_URI: window.HOMEWORK_URI || process.env.HOMEWORK_URI || "/homework",
+	NEXBOARD_BOARDS_URI: window.NEXBOARD_BOARD_URI || process.env.NEXBOARD_BOARD_URI || '/nexboard/boards',
+	NEXBOARD_PROJECTS_URI: window.NEXBOARD_PROJECTS_URI || process.env.NEXBOARD_PROJECTS_URI || '/nexboard/projects',
 
 	breakpoints: {
 		tablet: 750,

src/plugins/etherpad/Etherpad.jsx

@@ -1,29 +1,20 @@
-import React, { useState, useEffect, useContext } from "react"
+import React, { useEffect } from "react"
 import shortid from "shortid"
 
-import LessonContext from "~/Contexts/Lesson.context"
+import config from "~/config"
 
-import Input from "~/components/Input"
-import Flex from "~/components/Flex"
-
-import { createBoard } from "./utils"
-
-const Etherpad = ({ focused, state }) => {
+const Etherpad = ({ state }) => {
 	useEffect(() => {
 		if (state._id.value) return
 		state._id.set(shortid.generate())
 	}, [])
 
-	const { store, dispatch } = useContext(LessonContext)
+	const url = config.ETHERPAD_URL;
 
-	let etherpadFrame
 	if (state._id.get()) {
 		return (
 			<iframe
-				src={`https://etherpad.schul-cloud.org/p/${
-					// TODO maybe make this variable?
-					state._id.value
-				}`}
+				src={url+state._id.value}
 				style={{
 					width: "100%",
 					height: 800,

src/plugins/index.js

@@ -37,8 +37,12 @@ import { createImagePlugin } from "@edtr-io/plugin-image"
 
 
 // import nexboardPlugin from "./nexboard"
-import etherpadPlugin, {SizedEtherpadIcon} from "./etherpad"
+import etherpadPlugin, { SizedEtherpadIcon } from "./etherpad"
 import etherpadPluginPreview from "./etherpad/Preview"
+
+import nexboardPlugin, { SizedNextboardIcon } from "./nexboard"
+import nexboardPluginPreview from "./nexboard/Preview"
+
 import homework, {SizedHomeworkIcon} from "./homework"
 
 
@@ -303,17 +307,27 @@ addPlugin({
 addPlugin({
 	name: 'etherpad',
 	title: 'Etherpad',
-	icon: SizedEtherpadIcon,
 	description: 'Real time collaboration',
+	icon: SizedEtherpadIcon,
 	plugin: etherpadPlugin,
 	preview: etherpadPluginPreview
 })
 
+
+addPlugin({
+	name: "nxboard",
+	title: "Nexboard",
+	description: "Benutze das digitale Nexboard, um all deine Ideen festzuhalten!",
+	icon: SizedNextboardIcon,
+	plugin: nexboardPlugin,
+	preview: nexboardPluginPreview
+})
+
 addPlugin({
 	name: 'homework',
 	title: 'Aufgabe',
-	icon: SizedHomeworkIcon,
 	description: "Binde eine Aufgabe aus dem Kurs ein.",
+	icon: SizedHomeworkIcon,
 	plugin: homework,
 	preview: homeworkPreview,
 })

src/plugins/nexboard/Nexboard.jsx

@@ -1,66 +1,82 @@
 import React, { useState, useEffect, useContext } from "react"
 import LessonContext from "~/Contexts/Lesson.context"
-import UserContext from "~/Contexts/User"
+
 import { createBoard, getBoard } from "./utils"
 import Action from "~/components/Action"
 import Flex from "~/components/Flex"
 import Loader from "~/components/Loader"
 
 const Nexboard = ({ focused, state }) => {
-    const [loading, setLoading] = useState(true)
-    const [board, setBoard] = useState({})
-    const { store } = useContext(LessonContext)
-    const { store: user } = useContext(UserContext)
-    async function bootstrap() {
-        try {
-            let board
-            if (state._id.value) {
-                board = await getBoard(state._id.value)
-            } else {
-                board = await createBoard(
-                    store.lesson._id,
-                    `${store.lesson.title} Nexboard`,
-                )
-            }
-            state._id.set(board._id)
-            setBoard(board)
-        } catch (err) {}
+	const [loading, setLoading] = useState(true)
+	const [error, setError] = useState(null)
+	const [board, setBoard] = useState({})
+	const { store } = useContext(LessonContext)
+
+	async function bootstrap() {
+		try {
+			let board
+			const id = state.id.get();
+			if (id && id !== '<empty string>') {
+				board = await getBoard(id)
+			} else {
+				const { _id: lessonId, attachments, title } = store.lesson;
+				board = await createBoard(lessonId.toString(),{ 
+					title:`${title} Nexboard`, // TODO: should set by user
+					attachments, 
+					description: ''
+				})
+				state.id.set(board.id.toString())
+			}	
+			setBoard(board)
+		} catch (err) {
+			console.warn(err);
+			setError(err);
+		}
 
-        setLoading(false)
-    }
+		setLoading(false)
+	}
 
-    useEffect(() => {
-        bootstrap()
-    }, [])
+	useEffect(() => {
+		bootstrap()
+	}, [])
 
-    if (loading) {
-        return (
-            <Flex justifyCenter>
-                <Loader />
-            </Flex>
-        )
-    } else {
-        return (
-            <Flex column alignEnd>
-                <iframe
-                    src={`${board.publicLink}?username=${user.displayName}`}
-                    style={{
-                        width: "100%",
-                        height: "600px",
-                        resize: "vertical",
-                        overflow: "auto",
-                        border: "none",
-                    }}
-                />
-                <Action
-                    a
-                    to={`${board.publicLink}?username=${user.displayName}`}
-                    target="_blank">
+	if (error) {
+		return (
+			<div>
+				<p>Can not render nexboard!</p>
+				{JSON.stringify(error.message)}
+			</div>
+		)
+	} else if (loading) {
+		return (
+			<Flex justifyCenter>
+				<Loader />
+			</Flex>
+		)
+	} else {
+		const displayName = (store.user || {}).displayName || 'user';
+		// TODO: Username is not pass at he moment 
+		return (
+			<Flex column alignEnd>
+				<iframe
+					src={`${board.publicLink}?username=${displayName}`}
+					style={{
+						width: "100%",
+						height: "600px",
+						resize: "vertical",
+						overflow: "auto",
+						border: "none",
+					}}
+				/>
+				<Action
+					a
+					to={`${board.publicLink}?username=${displayName}`}
+					target="_blank">
                     in neuem Tab öffnen
-                </Action>
-            </Flex>
-        )
-    }
+				</Action>
+			</Flex>
+		)
+	}
 }
 
 export default Nexboard

src/plugins/nexboard/index.jsx

@@ -3,21 +3,19 @@ import { object, string } from "@edtr-io/plugin"
 
 import Nexboard from "./Nexboard"
 
-import NextboadIcon from "./assets/logo.png"
+import NextboadIconSVG from "./assets/logo.svg"
 
 export const nexboardState = object({
 	id: string(),
 })
 
+export const  SizedNextboardIcon = () => (
+	<NextboadIconSVG width="100%" />
+)
+
 export const generatePlugin = (Component) => ({
 	Component,
 	state: nexboardState,
-	icon: () => (
-		<NextboadIcon width="100%" />
-	),
-	title: "Nexboard",
-	description:
-        "Benutze das digitale Nexboard, um all deine Ideen festzuhalten!",
 })
 
 const nexboardPlugin = generatePlugin(Nexboard)

src/plugins/nexboard/utils.js

@@ -1,32 +1,32 @@
-import { serverApi } from "~/utils/api"
+import { editorApi, serverApi } from "~/utils/api"
+import { NEXBOARD_BOARDS_URI, NEXBOARD_PROJECTS_URI } from "~/config"
+// TODO: do not use sockets for creating attachments
+// TODO: config is not set
+console.log('####', NEXBOARD_BOARDS_URI, NEXBOARD_PROJECTS_URI);
 
-export const createBoard = async (lessonId, title) => {
-    let nexboardAttachment = await serverApi.get(
-        `/editor/attachments?key=nexboard&lesson=${lessonId}`,
-    )
+const TYPE = 'nexboard-projectId';
+export const createBoard = async (lessonId, { title, attachments = [], description }) => {
+	let attach = attachments.find(a => a.type === TYPE)
+	if (!attach) {
+		const project = await serverApi.post(NEXBOARD_PROJECTS_URI || '/nexboard/projects', {
+			title,
+		})
+		attach = await editorApi.post("attachments", {
+			type: TYPE,
+			value: project.id.toString(),
+			target: lessonId,
+			targetModel: 'lesson'
+		})
+	}
 
-    if (!nexboardAttachment.length) {
-        const nexboardProject = await serverApi.post(`/nexboard/projects`, {
-            // title,
-        })
-
-        nexboardAttachment = await serverApi.post("/editor/attachments", {
-            key: "nexboard",
-            value: nexboardProject._id,
-            lesson: lessonId,
-        })
-    } else {
-        nexboardAttachment = nexboardAttachment[0]
-    }
-
-    const board = await serverApi.post(`/nexboard/boards`, {
-        title,
-        projectId: nexboardAttachment.value,
-        // description,
-    })
-    return board
+	const board = await serverApi.post(NEXBOARD_BOARDS_URI || '/nexboard/boards', {
+		title,
+		projectId: attach.value.toString(),
+		description,
+	})
+	return board
 }
 
 export const getBoard = id => {
-    return serverApi.get(`/nexboard/boards/${id}`)
+	return serverApi.get(`${NEXBOARD_BOARDS_URI || '/nexboard/boards'}/${id.toString()}`)
 }