Merge branch 'release/1.3.5'

docs/taking-attendance.md

@@ -6,7 +6,7 @@ We recommend creating a single assignment in Canvas for your weekly attendance q
 
 During each class session, when you're ready to ask the attendance question, encourage your students to visit the course Canvas website and then follow the link for the attendance assignment. As the instructor, you can do the same thing - you'll automatically be taken to the instructor view. Click the play button next to the question you'd like to ask, and then click the open button. It will appear automatically for your students. Once they've had a chance to respond, click the close button. You can click the "view results" button at any time to see responses as they come in.
 
-Participation data syncs to the Canvas gradebook approximately every 10 minutes. As an example of how grading works, if you have 15 participation questions over the course of a semester, and a student responds to 13 of them, ChimeIn will let Canvas know that the student received 86% credit (13/15). Canvas will then convert that into a point value based on whatever you entered for the assignment. If you've got questions, please [contact us](mailto:[email protected]) and we'll help get you setup.
+Participation data syncs to the Canvas gradebook approximately 3 hours after the last response is received. As an example of how grading works, if you have 15 participation questions over the course of a semester, and a student responds to 13 of them, ChimeIn will let Canvas know that the student received 86% credit (13/15). Canvas will then convert that into a point value based on whatever you entered for the assignment. If you've got questions, please [contact us](mailto:[email protected]) and we'll help get you setup.
 
 ::: tip Limitations of taking attendance with ChimeIn
 Keep in mind, there's nothing technically preventing a student from responding to these prompts when not in the classroom. They won't know what time you'll be asking the question, and the question will only be available for a short time, so it's pretty inconvenient, but not technically impossible.  

resources/assets/js/components/Card.vue

@@ -69,6 +69,7 @@ export default {
   flex: 1;
   font-size: 1rem;
   margin: 1rem 0;
+  min-width: 0;
 
   h1,
   h2,
@@ -77,7 +78,18 @@ export default {
   h5 {
     margin: 0;
     font-size: 1.5rem;
-    line-height: 1;
+    line-height: 1.1;
+  }
+
+  @media (max-width: 25rem) {
+    h1,
+    h2,
+    h3,
+    h4,
+    h5 {
+      font-size: 1rem;
+      line-height: 1.2;
+    }
   }
 }
 

resources/assets/js/components/DetailsItem.vue

@@ -20,19 +20,21 @@ export default {
   margin: 0.5rem 0;
   display: flex;
   align-items: baseline;
+  gap: 0.5rem;
+  line-height: 1.2;
 }
 .details-item-label {
-  width: 5rem;
   font-weight: normal;
   text-transform: uppercase;
   color: #aaa;
   font-size: 0.7rem;
-  margin-right: 1rem;
 }
 .details-item-value {
   font-size: 0.9rem;
   color: #777;
   user-select: all;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 </style>
 

resources/assets/js/views/ChimePage/ChimePage.vue

@@ -254,7 +254,6 @@ export default {
 }
 .chime__name {
   font-size: 2rem;
-  line-height: 1;
   margin: 0;
   margin-right: 0.5rem;
 }

resources/assets/js/views/ChimePage/NewFolder.vue

@@ -1,30 +1,29 @@
 <template>
   <div class="new-folder">
-    <label for="createFolder" class="text-right visually-hidden col-form-label"
-      >Add Folder</label
+    <label for="createFolder" class="visually-hidden">Add Folder</label>
+    <input
+      id="createFolder"
+      v-model="folder_name"
+      type="text"
+      class="form-control new-folder__input"
+      name="createFolder"
+      placeholder="Folder Name"
+      @keyup.enter="new_folder"
+    />
+    <button
+      data-cy="create-folder-button"
+      type="button"
+      class="
+        new-folder__button
+        btn btn-outline-primary
+        align-items-center
+        d-flex
+      "
+      @click="new_folder"
     >
-    <div class="row">
-      <div class="col-8 col-6-md">
-        <input
-          id="createFolder"
-          v-model="folder_name"
-          type="text"
-          class="form-control new-folder__input"
-          name="createFolder"
-          placeholder="Folder Name"
-          @keyup.enter="new_folder"
-        />
-      </div>
-      <button
-        data-cy="create-folder-button"
-        type="button"
-        class="btn btn-outline-primary align-items-center d-flex"
-        @click="new_folder"
-      >
-        <i class="material-icons">add</i>
-        Add Folder
-      </button>
-    </div>
+      <i class="material-icons">add</i>
+      Add Folder
+    </button>
     <div
       v-if="chime.lti_grade_mode == 'multiple_grades'"
       class="alert alert-warning mt-2"
@@ -40,9 +39,14 @@
     </div>
   </div>
 </template>
-<style>
+<style scoped>
 .new-folder {
-  max-width: 40rem;
+  max-width: 30rem;
+  display: flex;
+  gap: 0.5rem;
+}
+.new-folder__button {
+  flex-shrink: 0;
 }
 </style>
 

resources/assets/js/views/HomePage/ChimeCard.vue

@@ -11,7 +11,7 @@
       </header>
     </router-link>
 
-    <div v-if="canCurrentUserEdit">
+    <div v-if="canCurrentUserEdit" class="chime-card__join-details">
       <div v-if="isCanvasChime">
         <DetailsItem>
           <template #label>Join</template>

resources/assets/js/views/ParticipantPage/ParticipantPage.vue

@@ -120,6 +120,7 @@ export default {
       responses: [],
       error: null,
       timeout: null,
+      loadTime: null,
     };
   },
   computed: {
@@ -156,7 +157,7 @@ export default {
   },
   mounted: function () {
     this.loadChime();
-
+    this.loadTime = new Date();
     Echo.join("session-status." + this.chimeId)
       .listen("StartSession", (m) => {
         console.log("debug", "message:", m);
@@ -182,6 +183,19 @@ export default {
     window.Echo.connector.socket.on("reconnect", () => {
       console.log("reconnecting and reloading");
       if (this.timeout) clearTimeout(this.timeout);
+
+      const hoursSinceLoad = (new Date() - this.loadTime) / 1000 / 60 / 60;
+      if (hoursSinceLoad >= 8) {
+        Echo.leave("session-status." + this.chimeId);
+        window.Echo.connector.socket.off("reconnect");
+        this.error = "Your session has expired.  Please refresh the page.";
+        this.sessions = [];
+        this.$announcer.set(
+          "Your session has expired. Please refresh the page."
+        );
+        return;
+      }
+
       this.timeout = setTimeout(() => {
         this.loadChime();
       }, 500);

yarn.lock

@@ -4741,9 +4741,9 @@ flatted@^3.1.0:
   integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0:
-  version "1.14.5"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"
-  integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 font-awesome@^4.7.0:
   version "4.7.0"