diff --git a/package.json b/package.json index 6fdc03a0..d48fd6ca 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "unidiscuss", "version": "0.0.1", "scripts": { - "dev": "nvm use 11.0.0 && sapper dev", + "dev": "sapper dev", "build": "sapper build --legacy", "export": "sapper export --legacy", "start": "node __sapper__/build" @@ -44,4 +44,4 @@ "tailwindcss": "^2.1.2", "typescript": "^4.1.3" } -} +} \ No newline at end of file diff --git a/src/components/Apps/components/LiveChat/index.svelte b/src/components/Apps/components/LiveChat/index.svelte new file mode 100644 index 00000000..eefe86d5 --- /dev/null +++ b/src/components/Apps/components/LiveChat/index.svelte @@ -0,0 +1,12 @@ + + + +
+ +
+
diff --git a/src/components/Apps/components/LiveQandA/index.svelte b/src/components/Apps/components/LiveQandA/index.svelte deleted file mode 100644 index e69de29b..00000000 diff --git a/src/components/Apps/components/Notes/index.svelte b/src/components/Apps/components/Notes/index.svelte new file mode 100644 index 00000000..d93be7c0 --- /dev/null +++ b/src/components/Apps/components/Notes/index.svelte @@ -0,0 +1,12 @@ + + + +
+ +
+
diff --git a/src/components/Apps/components/Poll/index.svelte b/src/components/Apps/components/Poll/index.svelte new file mode 100644 index 00000000..16b521c8 --- /dev/null +++ b/src/components/Apps/components/Poll/index.svelte @@ -0,0 +1,12 @@ + + + +
+ +
+
diff --git a/src/components/Apps/components/QandA/index.svelte b/src/components/Apps/components/QandA/index.svelte new file mode 100644 index 00000000..ffb00271 --- /dev/null +++ b/src/components/Apps/components/QandA/index.svelte @@ -0,0 +1,12 @@ + + + +
+ +
+
diff --git a/src/components/Apps/constants.js b/src/components/Apps/constants.js new file mode 100644 index 00000000..972cc101 --- /dev/null +++ b/src/components/Apps/constants.js @@ -0,0 +1,8 @@ +export default { + APPS: { + QANDA: 'QANDA', + NOTES: 'NOTES', + LIVE_CHAT: 'LIVE_CHAT', + POLL: 'POLL', + }, +}; diff --git a/src/components/Apps/index.svelte b/src/components/Apps/index.svelte index f4343ec1..87edfbcf 100644 --- a/src/components/Apps/index.svelte +++ b/src/components/Apps/index.svelte @@ -1,12 +1,103 @@ - -
+
+
+ + + + + + + + + + + + + + + +
+ + {#if !!selectedApp} +
+ {#if selectedApp === APPS_CONSTANTS.APPS.QANDA} + + {:else if selectedApp === APPS_CONSTANTS.APPS.LIVE_CHAT} + + {:else if selectedApp === APPS_CONSTANTS.APPS.POLL} + + {:else if selectedApp === APPS_CONSTANTS.APPS.NOTES} + + {/if} +
+ {/if} +
diff --git a/src/components/Buttons/Close/index.svelte b/src/components/Buttons/Close/index.svelte new file mode 100644 index 00000000..11311f9b --- /dev/null +++ b/src/components/Buttons/Close/index.svelte @@ -0,0 +1,10 @@ + + + + + diff --git a/src/components/Buttons/Delete/index.svelte b/src/components/Buttons/Delete/index.svelte new file mode 100644 index 00000000..5271221d --- /dev/null +++ b/src/components/Buttons/Delete/index.svelte @@ -0,0 +1,10 @@ + + + + + diff --git a/src/components/IconButton/index.svelte b/src/components/IconButton/index.svelte index ede325de..f6def98f 100644 --- a/src/components/IconButton/index.svelte +++ b/src/components/IconButton/index.svelte @@ -1,6 +1,49 @@ - - + + + + \ No newline at end of file diff --git a/src/components/LeftNav/index.svelte b/src/components/LeftNav/index.svelte index 1da622a2..283751ba 100644 --- a/src/components/LeftNav/index.svelte +++ b/src/components/LeftNav/index.svelte @@ -3,7 +3,7 @@ import SendAlt32 from "carbon-icons-svelte/lib/SendAlt32"; import Catalog32 from "carbon-icons-svelte/lib/Catalog32"; import UserAvatar32 from "carbon-icons-svelte/lib/UserAvatar32"; - import Calendar32 from "carbon-icons-svelte/lib/Calendar32"; + // import Calendar32 from "carbon-icons-svelte/lib/Calendar32"; export let segment; let navClass = ""; @@ -47,14 +47,6 @@ flex-direction: column; } - :global(svg.carbon-icon) { - margin-right: 10px; - } - - [aria-current] :global(svg.carbon-icon) { - fill: var(--main-primary-color); - } - [aria-current] { color: var(--main-primary-color); } diff --git a/src/components/PageNav/index.svelte b/src/components/PageNav/index.svelte index eb3a5ac1..82ec9de7 100644 --- a/src/components/PageNav/index.svelte +++ b/src/components/PageNav/index.svelte @@ -1,6 +1,7 @@ -
- {#if !!title} -

{title}

- {/if} - {#if Array.isArray(navItems) && navItems.length} -
- {#each navItems as item} - - {item.label} - - {/each} - {#if addButtonHref} - - {/if} -
- {/if} - -
- + +
+ {#if !!title} +

{title}

+ {/if} + {#if Array.isArray(navItems) && navItems.length} +
+ {#each navItems as item} + + {item.label} + + {/each} + {#if addButtonHref} + + {/if} +
+ {/if} + +
diff --git a/src/components/QuestionnaireBuilder/index.svelte b/src/components/QuestionnaireBuilder/index.svelte new file mode 100644 index 00000000..a8beed51 --- /dev/null +++ b/src/components/QuestionnaireBuilder/index.svelte @@ -0,0 +1 @@ +
diff --git a/src/components/Tailwindcss.svelte b/src/components/Tailwindcss.svelte index 90e6e23e..559488a3 100644 --- a/src/components/Tailwindcss.svelte +++ b/src/components/Tailwindcss.svelte @@ -31,4 +31,9 @@ code { white-space: pre-wrap; } + + [aria-current] :global(svg.carbon-icon), + button.active :global(svg.carbon-icon) { + fill: var(--main-primary-color); + } diff --git a/src/components/ToolTip/index.svelte b/src/components/ToolTip/index.svelte new file mode 100644 index 00000000..d1c93b6a --- /dev/null +++ b/src/components/ToolTip/index.svelte @@ -0,0 +1,44 @@ + + + + +{#if !!title} +
+ {title} + +
+{:else} + +{/if} diff --git a/src/routes/courses/[...id].svelte b/src/routes/courses/[...id].svelte index e9e949c3..130ec429 100644 --- a/src/routes/courses/[...id].svelte +++ b/src/routes/courses/[...id].svelte @@ -15,6 +15,7 @@ import Scoreboard from "../../components/Course/components/Scoreboard.svelte"; import TimeTable from "../../components/Course/components/TimeTable.svelte"; import CourseNav from "../../components/Course/components/CourseNav.svelte"; + import Apps from "../../components/Apps/index.svelte"; // export let slug; export let courseNavItem; @@ -28,29 +29,6 @@ $: mode = $page.query.mode; - - ReactJS - - -
- -
- {#if !courseNavItem} - - {:else if courseNavItem === "score"} - - {:else if courseNavItem === "timetable"} - - {:else if courseNavItem === "hometasks"} - - {:else if courseNavItem === "lecture"} - - {:else if courseNavItem === "people"} - - {/if} -
-
- + + + ReactJS + + +
+ +
+ {#if !courseNavItem} + + {:else if courseNavItem === 'score'} + + {:else if courseNavItem === 'timetable'} + + {:else if courseNavItem === 'hometasks'} + + {:else if courseNavItem === 'lecture'} + + {:else if courseNavItem === 'people'} + + {/if} +
+ + +