From 65d0dbb9b3388e03c312c1dd456feeef740289e0 Mon Sep 17 00:00:00 2001
From: Furkan Sahin <furkan-dev@proton.me>
Date: Tue, 13 Apr 2021 12:49:14 -0500
Subject: Start styling and add initial dark mode support

---
 src/components/EditorLists.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/components/EditorLists.vue')

diff --git a/src/components/EditorLists.vue b/src/components/EditorLists.vue
index ae0aa22..26e0ecc 100644
--- a/src/components/EditorLists.vue
+++ b/src/components/EditorLists.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="editor">
+  <div id="editor-lists">
     <div class="column">
       <list :items="peerTeachers" @selection-changed="handlePtClick" #default="pt">
         {{ pt.item.name }} <button @click.stop="deletePeerTeacher(pt.item.id)">X</button>
@@ -84,9 +84,10 @@ export default defineComponent({
 </script>
 
 <style>
-#editor {
+#editor-lists {
   display: flex;
   max-height: inherit;
+  min-height: 0;
 }
 
 .column {
-- 
cgit v1.2.3


From 6df6cbbb47d8b932a790ed9ef68dc8fac42ce0f4 Mon Sep 17 00:00:00 2001
From: Furkan Sahin <furkan-dev@proton.me>
Date: Tue, 13 Apr 2021 15:24:03 -0500
Subject: Style editor lists

---
 src/components/EditorLists.vue | 67 ++++++++++++++++++++++++++++++++++++------
 src/components/List.vue        | 23 ++-------------
 src/models/EventInfo.ts        |  2 +-
 3 files changed, 62 insertions(+), 30 deletions(-)

(limited to 'src/components/EditorLists.vue')

diff --git a/src/components/EditorLists.vue b/src/components/EditorLists.vue
index 26e0ecc..e70445d 100644
--- a/src/components/EditorLists.vue
+++ b/src/components/EditorLists.vue
@@ -1,19 +1,28 @@
 <template>
   <div id="editor-lists">
     <div class="column">
-      <list :items="peerTeachers" @selection-changed="handlePtClick" #default="pt">
-        {{ pt.item.name }} <button @click.stop="deletePeerTeacher(pt.item.id)">X</button>
-      </list>
+      <h3>Peer Teachers</h3>
+      <List :items="peerTeachers" @selection-changed="handlePtClick" #default="pt">
+        <span class="list-item">
+          {{ pt.item.name }} <button @click.stop="deletePeerTeacher(pt.item.id)">x</button>
+        </span>
+      </List>
     </div>
     <div class="column">
-      <list :items="compatibleLabs" #default="lab">
-        {{ lab.item.fullInfo }} <button @click.stop="assignLab(lab.item.id)">+</button>
-      </list>
+      <h3>Labs</h3>
+      <List :items="compatibleLabs" #default="lab">
+        <span class="list-item">
+          {{ lab.item.fullInfo }} <button @click.stop="assignLab(lab.item.id)">+</button>
+        </span>
+      </List>
     </div>
     <div class="column">
-      <list :items="selectedPeerTeacherAssignments" #default="lab">
-        {{ lab.item.fullInfo }} <button @click.stop="unassignLab(lab.item.id)">X</button>
-      </list>
+      <h3>Assignments</h3>
+      <List :items="selectedPeerTeacherAssignments" #default="lab">
+        <span class="list-item">
+          {{ lab.item.fullInfo }} <button @click.stop="unassignLab(lab.item.id)">x</button>
+        </span>
+      </List>
     </div>
   </div>
 </template>
@@ -90,8 +99,48 @@ export default defineComponent({
   min-height: 0;
 }
 
+h3 {
+  color: white;
+  margin: 0;
+}
+
 .column {
   flex: 1;
   overflow: auto;
 }
+
+.list-item {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  margin: 0.5em;
+  padding: 0.5em;
+}
+
+.list-item:hover {
+  background-color: #c0c0c0;
+}
+
+.list-item > button {
+  background-color: #500000;
+  border: none;
+  color: white;
+  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+  font-size: 1em;
+}
+
+@media (prefers-color-scheme: dark) {
+  .list-item {
+    background-color: #303030;
+    color: white;
+  }
+
+  .list-item:hover {
+    background-color: #707070;
+  }
+
+  .list-item > button {
+    background-color: #81302b;
+  }
+}
 </style>
diff --git a/src/components/List.vue b/src/components/List.vue
index 843370e..f1ef690 100644
--- a/src/components/List.vue
+++ b/src/components/List.vue
@@ -3,8 +3,7 @@
     <li
       v-for="item in items"
       :key="item.id"
-      @click="$emit('selectionChanged', item)"
-      class="list-item">
+      @click="$emit('selectionChanged', item)">
       <slot :item="item">{{ item }}</slot>
     </li>
   </ul>
@@ -25,23 +24,7 @@ export default {
 <style scoped>
 .list {
   list-style-type: none;
-}
-
-.list-item {
-  border-radius: 5px;
-  margin: 5px 0;
-  padding: 0.15em;
-  text-align: center;
-}
-
-.list-item:hover {
-  background-color: rgb(182, 182, 182);
-}
-
-@media (prefers-color-scheme: dark) {
-  .list-item {
-    background-color: #303030;
-    color: white;
-  }
+  margin: 0;
+  padding: 0;
 }
 </style>
diff --git a/src/models/EventInfo.ts b/src/models/EventInfo.ts
index 4493162..962ec70 100644
--- a/src/models/EventInfo.ts
+++ b/src/models/EventInfo.ts
@@ -39,7 +39,7 @@ export default class EventInfo {
 
   get info() {
     if (this.days === '') {
-      return 'ONLINE';
+      return 'WEB';
     }
     return `${this.days} ${EventInfo.timeToStr(this.start)}-${EventInfo.timeToStr(this.end)}`;
   }
-- 
cgit v1.2.3


From fdc7b50f828e76b1ccfb12cd8f4cf5d88b2a9654 Mon Sep 17 00:00:00 2001
From: Furkan Sahin <furkan-dev@proton.me>
Date: Tue, 13 Apr 2021 15:30:44 -0500
Subject: Small light mode tweak

---
 src/components/ActionBar.vue   | 6 +++---
 src/components/EditorLists.vue | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/components/EditorLists.vue')

diff --git a/src/components/ActionBar.vue b/src/components/ActionBar.vue
index 279a885..e50c791 100644
--- a/src/components/ActionBar.vue
+++ b/src/components/ActionBar.vue
@@ -1,12 +1,12 @@
 <template>
   <div id="action-bar">
-    <FileUpload
-      :accept="'application/json'"
-      @fileChanged="handleLabChange">Import Lab Schedule</FileUpload>
     <FileUpload
       :accept="'text/plain'"
       :multiple="true"
       @fileChanged="handlePtChange">Upload PT Schedule</FileUpload>
+    <FileUpload
+      :accept="'application/json'"
+      @fileChanged="handleLabChange">Import Lab Schedule</FileUpload>
       <UIButton @click="save">Export</UIButton>
   </div>
 </template>
diff --git a/src/components/EditorLists.vue b/src/components/EditorLists.vue
index e70445d..e802237 100644
--- a/src/components/EditorLists.vue
+++ b/src/components/EditorLists.vue
@@ -111,6 +111,7 @@ h3 {
 
 .list-item {
   align-items: center;
+  background-color: #f0f0f0;
   display: flex;
   justify-content: space-between;
   margin: 0.5em;
-- 
cgit v1.2.3


From 432c3d66d7d795ae913c9ee50470ad3a42ccbd58 Mon Sep 17 00:00:00 2001
From: Furkan Sahin <furkan-dev@proton.me>
Date: Tue, 13 Apr 2021 21:17:35 -0500
Subject: Add headers to columns

---
 src/App.vue                    |  1 +
 src/components/EditorLists.vue | 14 ++++++++------
 src/components/FileUpload.vue  |  1 -
 src/components/UIButton.vue    |  1 -
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/components/EditorLists.vue')

diff --git a/src/App.vue b/src/App.vue
index 481fa7d..5a1f608 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,7 @@
 <style>
 *, *:before, *:after {
   box-sizing: inherit;
+  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
 }
 
 html {
diff --git a/src/components/EditorLists.vue b/src/components/EditorLists.vue
index e802237..60c965c 100644
--- a/src/components/EditorLists.vue
+++ b/src/components/EditorLists.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="editor-lists">
     <div class="column">
-      <h3>Peer Teachers</h3>
+      <h3 class="column-header">Peer Teachers</h3>
       <List :items="peerTeachers" @selection-changed="handlePtClick" #default="pt">
         <span class="list-item">
           {{ pt.item.name }} <button @click.stop="deletePeerTeacher(pt.item.id)">x</button>
@@ -9,7 +9,7 @@
       </List>
     </div>
     <div class="column">
-      <h3>Labs</h3>
+      <h3 class="column-header">Labs</h3>
       <List :items="compatibleLabs" #default="lab">
         <span class="list-item">
           {{ lab.item.fullInfo }} <button @click.stop="assignLab(lab.item.id)">+</button>
@@ -17,7 +17,7 @@
       </List>
     </div>
     <div class="column">
-      <h3>Assignments</h3>
+      <h3 class="column-header">{{ this.selectedPeerTeacher.name }}</h3>
       <List :items="selectedPeerTeacherAssignments" #default="lab">
         <span class="list-item">
           {{ lab.item.fullInfo }} <button @click.stop="unassignLab(lab.item.id)">x</button>
@@ -99,8 +99,7 @@ export default defineComponent({
   min-height: 0;
 }
 
-h3 {
-  color: white;
+.column-header {
   margin: 0;
 }
 
@@ -126,11 +125,14 @@ h3 {
   background-color: #500000;
   border: none;
   color: white;
-  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
   font-size: 1em;
 }
 
 @media (prefers-color-scheme: dark) {
+  .column-header {
+    color: white;
+  }
+
   .list-item {
     background-color: #303030;
     color: white;
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index a70e18d..9318d63 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -29,7 +29,6 @@ export default {
 .file-upload-lbl {
   background-color: #500000;
   color: white;
-  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
   padding: 0.5em;
   text-align: center;
 }
diff --git a/src/components/UIButton.vue b/src/components/UIButton.vue
index 59f4686..57b155b 100644
--- a/src/components/UIButton.vue
+++ b/src/components/UIButton.vue
@@ -15,7 +15,6 @@ export default defineComponent({
   background-color: #500000;
   border: none;
   color: white;
-  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
   font-size: 1em;
   padding: 0.5em;
 }
-- 
cgit v1.2.3