From 474851c82cc9c9c93f80d9a41569e95272da2997 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Thu, 2 Jun 2022 08:26:33 -0500 Subject: Normally these would go inside a file named `tailwind.css` to be compiled into `index.css` included in `index.html`. I had trouble trying to set that up (no docs for this) so this solution I found works fine. --- src/App.svelte | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/App.svelte') diff --git a/src/App.svelte b/src/App.svelte index 4fbef54..260e037 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -2,4 +2,10 @@ import Editor from "./components/Editor.svelte"; + + -- cgit v1.2.3 From 7a556a2981d4c0f78a9c8fe9836c00df9e396604 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Fri, 3 Jun 2022 07:08:53 -0500 Subject: Add Sidebar component and @tailwind --- src/App.svelte | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src/App.svelte') diff --git a/src/App.svelte b/src/App.svelte index 260e037..2b497ee 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,11 +1,24 @@ + + + + - + @layer base { + html { + font-family: sans-serif, Proxima Nova; + } + } + + * { + background-color: #EEEEEE; + } + -- cgit v1.2.3 From 642b291fea3d8fc9c4458720ec44bc0096c62d4e Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Fri, 3 Jun 2022 11:24:29 -0500 Subject: Remove default gray background, now using daisyui themes --- src/App.svelte | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/App.svelte') diff --git a/src/App.svelte b/src/App.svelte index 2b497ee..b0ec65c 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -17,8 +17,4 @@ font-family: sans-serif, Proxima Nova; } } - - * { - background-color: #EEEEEE; - } -- cgit v1.2.3 From 87646af4d4451ea6e318f85a17f10354ff39e507 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Fri, 3 Jun 2022 13:39:01 -0500 Subject: Only load Sidebar, Sidebar loads others --- src/App.svelte | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/App.svelte') diff --git a/src/App.svelte b/src/App.svelte index b0ec65c..1242e0d 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,11 +1,9 @@ - diff --git a/src/components/AssignLabs.svelte b/src/components/AssignLabs.svelte index ce68dca..2655853 100644 --- a/src/components/AssignLabs.svelte +++ b/src/components/AssignLabs.svelte @@ -88,9 +88,18 @@ } $: clicked = 0; + + $: columns = [ + { header: "Peer Teachers", body: [...peerTeachers] }, + { header: "Labs", body: [...compatibleLabs] }, + { + header: selectedPeerTeacher?.name ?? "PT's Labs", + body: [...assignedLabs], + }, + ]; -
+ + +
+ +
+ +
+ Peer Teachers +
+ +
Body
+
+ + + + + +
-- cgit v1.2.3 From fe45c328fbd83a0659b16598ad91d7d5d2361b02 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Sun, 5 Jun 2022 16:37:02 -0500 Subject: Remove custom css, use inline --- src/App.svelte | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/App.svelte') diff --git a/src/App.svelte b/src/App.svelte index 4664e1e..b775e86 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -18,29 +18,5 @@ /* Custom Styles */ @layer utilities { - .assign-box { - /* w-1/3 bg-green-500 flex flex-col border-solid hover:border-4 border-2 border-slate-400 */ - width: 33.33%; - display: flex; - flex-direction: column; - border-width: 4px; - border: solid; - border-color: rgb(148 163 184); - } - .assign-box:hover { - border-width: 6px; - border-color: black; - } - - .assign-box-header { - font-size: 1.5rem; - font-family: sans; - border: solid; - text-align: center; - height: 10%; - overflow: hidden; - } - - } -- cgit v1.2.3 From f8915cfa1f70d837fe89f0af61fb36ed9bcf52f8 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Sun, 5 Jun 2022 21:06:09 -0500 Subject: WiP --- src/App.svelte | 23 +++ src/components/AssignLabs.svelte | 238 ---------------------------- src/components/AssignLabs/AssignLabs.svelte | 232 +++++++++++++++++++++++++++ src/components/AssignLabs/Lab.svelte | 8 + src/components/AssignLabs/PT.svelte | 9 ++ src/components/Sidebar.svelte | 2 +- src/models/PeerTeacher.ts | 2 +- 7 files changed, 274 insertions(+), 240 deletions(-) delete mode 100644 src/components/AssignLabs.svelte create mode 100644 src/components/AssignLabs/AssignLabs.svelte create mode 100644 src/components/AssignLabs/Lab.svelte create mode 100644 src/components/AssignLabs/PT.svelte (limited to 'src/App.svelte') diff --git a/src/App.svelte b/src/App.svelte index b775e86..5b453a1 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -18,5 +18,28 @@ /* Custom Styles */ @layer utilities { + .assign-box { + /* w-1/3 bg-green-500 flex flex-col border-solid hover:border-4 border-2 border-slate-400 */ + flex: none; + flex-direction: column; + width: 33.33%; + display: flex; + border-width: 4px; + border: solid; + border-color: rgb(148 163 184); + } + .assign-box:hover { + /* border-width: 6px; */ + border-color: black; + } + + .assign-box-header { + font-size: 1.5rem; + font-family: sans; + border-bottom: solid; + text-align: center; + height: 10%; + overflow: hidden; + } } diff --git a/src/components/AssignLabs.svelte b/src/components/AssignLabs.svelte deleted file mode 100644 index 2655853..0000000 --- a/src/components/AssignLabs.svelte +++ /dev/null @@ -1,238 +0,0 @@ - - - - -
- -
- -
- Peer Teachers -
- -
Body
-
- - - - - - -
- - diff --git a/src/components/AssignLabs/AssignLabs.svelte b/src/components/AssignLabs/AssignLabs.svelte new file mode 100644 index 0000000..9331b81 --- /dev/null +++ b/src/components/AssignLabs/AssignLabs.svelte @@ -0,0 +1,232 @@ + + + + +
+ + +
+ +
+ Peer Teacher +
+
+ +
+ + diff --git a/src/components/AssignLabs/Lab.svelte b/src/components/AssignLabs/Lab.svelte new file mode 100644 index 0000000..94e1d69 --- /dev/null +++ b/src/components/AssignLabs/Lab.svelte @@ -0,0 +1,8 @@ + + +
+ {datum.course} +
\ No newline at end of file diff --git a/src/components/AssignLabs/PT.svelte b/src/components/AssignLabs/PT.svelte new file mode 100644 index 0000000..0976fe4 --- /dev/null +++ b/src/components/AssignLabs/PT.svelte @@ -0,0 +1,9 @@ + + +
+ {datum.firstname} +
diff --git a/src/components/Sidebar.svelte b/src/components/Sidebar.svelte index 35fc90b..53982bb 100644 --- a/src/components/Sidebar.svelte +++ b/src/components/Sidebar.svelte @@ -1,6 +1,6 @@