Skip to content

Commit

Permalink
Resolve dependency issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Thaddeus McCleary committed Jun 29, 2022
1 parent ca12a94 commit f5d0f9c
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Seatsmart Icon](https://seatsmart.tech/img/logo.b38f8b88.svg)
![Seatsmart Icon](https://seatsmart.thaddeus.education/img/logo.b38f8b88.svg)

# Seatsmart
Seatsmart offers a convenient way to to manage classrooms by encouraging learners to make positive contributions during a lesson.
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Seatsmart",
"productName": "Seatsmart",
"version": "2.0.1",
"version": "2.0.2",
"author": "Thaddeus McCleary",
"description": "a classroom participation tracking application",
"scripts": {
Expand Down Expand Up @@ -42,7 +42,7 @@
"vue-template-compiler": "^2.5.17"
},
"resolutions": {
"vue-cli-plugin-electron-builder/electron-builder": "22.10.4"
"vue-cli-plugin-electron-builder/electron-builder": "23.0.3"
},
"postcss": {
"plugins": {
Expand Down
54 changes: 27 additions & 27 deletions src/components/ActivityAdapter.vue
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<div class="container">
<NoteForm
v-if="addNotes"
:students="genuineParticipants"
<NoteForm
v-if="addNotes"
:students="genuineParticipants"
type="multiple modal"
v-on:trigger-modal-close="$emit('trigger-modal-close')"
/>
Expand All @@ -12,15 +12,15 @@
</section>
<section :class="[activity.activityType.split(' ').join('-'), activityStage == 'started' ? 'activity-body-narrow':'activity-body-wide', activityStage == 'ended' ? 'activity-body-narrow':'activity-body-wide']">
<section id="activityBanner">

</section>
<section class="activity-display">
<section class="button-container" v-if="allowAnonymous && activityStage == 'configuring'">
<h3>Launch</h3>
<div>
<select name="launch" v-model="launchChoice">
<option
v-for="(launchOption, index) in launchOptions"
<option
v-for="(launchOption, index) in launchOptions"
:value="launchOption"
:key="`option${index}`"
>
Expand All @@ -29,13 +29,13 @@
</select>
</div>
<div class="actions-wrapper">
<button
class="action-button cancel-button"
<button
class="action-button cancel-button"
@click="$emit('trigger-modal-close')"
>
cancel
</button>
<button
<button
class="action-button launch-button"
@click="launchActivity"
>
Expand All @@ -46,24 +46,24 @@
<section class="button-container" v-if="activityStage == 'launched'">
<h3 v-if="roomID !== ''">Scan to Connect</h3>
<h3 v-else>Connecting...</h3>
<div v-if="roomID !== ''" class="qr-area" @click="copyToClipboard(`https://activities.seatsmart.tech/code/${roomID}`)">
<qriously
<div v-if="roomID !== ''" class="qr-area" @click="copyToClipboard(`https://seatsmart-activities.thaddeus.education/code/${roomID}`)">
<qriously
id="qr"
:value="`https://activities.seatsmart.tech/code/${roomID}`"
:size="200"
:value="`https://seatsmart-activities.thaddeus.education/code/${roomID}`"
:size="200"
/>
</div>
<div v-else id="loading">

</div>
<div class="actions-wrapper">
<button
class="action-button cancel-button"
<button
class="action-button cancel-button"
@click="cancelActivity"
>
cancel
</button>
<button
<button
class="action-button launch-button"
@click="startActivity"
:disabled="connectedUsers.length == 0"
Expand Down Expand Up @@ -128,7 +128,7 @@
</div>
<section id="waitingForResponses" v-if="responses.length == 0"></section>
<div class="actions-wrapper">
<button
<button
class="action-button cancel-button"
@click="endActivity"
:disabled="ending"
Expand Down Expand Up @@ -188,21 +188,21 @@
</vc-donut>
</div>
<div class="actions-wrapper" v-if="allowAnonymous">
<button
<button
class="action-button cancel-button"
@click="$emit('trigger-modal-close')"
>
close
</button>
</div>
<div class="actions-wrapper" v-else>
<button
<button
class="action-button cancel-button"
@click="$emit('trigger-modal-close')"
>
close without notes
</button>
<button
<button
class="action-button launch-button"
@click="beginAddNotes"
v-if="responses.length > 0"
Expand All @@ -222,8 +222,8 @@
</div>
</section>
<div v-if="activity.options.hasOwnProperty('timeLimit')">
<Countdown
id="countdown"
<Countdown
id="countdown"
v-if="activity.options.timeLimit.enabled && activityStage == 'started'"
:countdownRunning="countdownStarted"
:timeLimit="timeLimitInSeconds"
Expand Down Expand Up @@ -361,7 +361,7 @@ export default {
}
sections.push(obj)
spectrumIndex++
}
Expand Down Expand Up @@ -535,7 +535,7 @@ export default {
let student = this.students[i].id
assignmentDictionary[student] = assignmentIndex
if (assignmentIndex < assignments.length - 1) {
assignmentIndex++
} else {
Expand Down Expand Up @@ -823,7 +823,7 @@ export default {
},
incomingResponseData(encryptedData) {
let decrypted = this.decrypt(encryptedData)
this.addResponse(decrypted)
},
incomingResponses(encryptedArray) {
Expand Down Expand Up @@ -890,7 +890,7 @@ export default {
height: 100%;
display: grid;
grid-template-rows: 15% 85%;
grid-template-areas:
grid-template-areas:
"header"
"body";
background: rgba(255,255,255,1);
Expand Down
22 changes: 11 additions & 11 deletions src/components/Help.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
<template slot="Student Cards">
<p class="center">{{ caption }}</p>
<div class="demo-area">
<NameCard
class="demo-card"
type="demo"
<NameCard
class="demo-card"
type="demo"
v-on:show-caption="showCaption"
/>
</div>
Expand Down Expand Up @@ -125,7 +125,7 @@
<img src="@/assets/star-deselect.svg" alt="deselect students icon">
<h5>Deselect All Students</h5>
<p>
Get rid of all of the stars in one click! That sounds a little depressing, but
Get rid of all of the stars in one click! That sounds a little depressing, but
it really is convenient sometimes.
</p>
</li>
Expand Down Expand Up @@ -208,9 +208,9 @@
<template slot="Student Cards">
<p class="center">{{ caption }}</p>
<div class="demo-area">
<NameCard
class="demo-card"
type="demo"
<NameCard
class="demo-card"
type="demo"
v-on:show-caption="showCaption"
/>
</div>
Expand Down Expand Up @@ -288,7 +288,7 @@
<img src="@/assets/star-deselect.svg" alt="deselect students icon">
<h5>Deselect All Students</h5>
<p>
Get rid of all of the stars in one click! That sounds a little depressing, but
Get rid of all of the stars in one click! That sounds a little depressing, but
it really is convenient sometimes.
</p>
</li>
Expand All @@ -301,7 +301,7 @@
Remote
</h4>
<p>
Seatsmart Remote is an optional feature that allows you to take advantage of basic functions without being tied to a computer. Actions currently supported include selecting a random student, adding a new note about a student/students, and controlling Activities (see next section). This feature requires Internet access on both the computer and the mobile device.
Seatsmart Remote is an optional feature that allows you to take advantage of basic functions without being tied to a computer. Actions currently supported include selecting a random student, adding a new note about a student/students, and controlling Activities (see next section). This feature requires Internet access on both the computer and the mobile device.
</p>
<p>
Realtime communication occurs over a secure server with data encrypted in transport (the server cannot decode the information). The server does not store this information anywhere. <strong>The QR code used to connect your remote device should be kept hidden from students</strong>. You can begin and end a remote connection by clicking <img class="embedded-icon" src="@/assets/remote.svg" alt="remote icon"> at the top right corner of the chart. This icon will turn yellow when the connection is active and red when it is attempting to restore a connection.
Expand All @@ -315,7 +315,7 @@
Activities
</h4>
<p>
Like Remote, Seatsmart Activites is an optional feature that requires access to the Internet. Further, it requires that students have access to Internet-connected devices (smartphones). Activites are meant to engage students while providing you simple, in-class assessment tools.
Like Remote, Seatsmart Activites is an optional feature that requires access to the Internet. Further, it requires that students have access to Internet-connected devices (smartphones). Activites are meant to engage students while providing you simple, in-class assessment tools.
</p>
<p>
The activities you launch through Seatsmart should not make students feel like they are taking a quiz. Ideally, the process will be somewhat gamified and encourage willing participation. Since students will be using their own devices to connect, it is important to communicate the short duration and specific purpose of your activities. Be sure to state beforehand whether or not you would expect students to switch to other applications during or after your activity.
Expand Down Expand Up @@ -357,7 +357,7 @@ export default {
this.caption = caption
},
openWebPage(page) {
shell.openExternal('https://seatsmart.tech/')
shell.openExternal('https://seatsmart.thaddeus.education/')
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/components/RemoteConfigPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<section id="panelContainer">
<section class="panel" v-if="remoteConnected && !remoteClientConnected">
<h3 class="panel-header">
Remote |
Remote |
<span>Scan to Connect</span>
</h3>
<section>
<qriously
<qriously
id="qr"
:value="`https://remote.seatsmart.tech/code/${roomID}`"
:size="200"
:value="`https://seatsmart-remote.thaddeus.education/code/${roomID}`"
:size="200"
/>
</section>
</section>
Expand Down Expand Up @@ -88,7 +88,7 @@ export default {
height: 100%;
display: grid;
grid-template-rows: 20% 80%;
grid-template-areas:
grid-template-areas:
"panelHeader"
"panelBody";
}
Expand Down
16 changes: 8 additions & 8 deletions src/components/RemoteStatusPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
<section id="panelContainer">
<section class="panel">
<section class="panel-header" v-if="remoteConnected">
<img src="@/assets/remoteconnect.svg" class="illustration">
<img src="@/assets/remoteconnect.svg" class="illustration">
<h3>
Remote Connected
</h3>
</section>
<section class="panel-header" v-else>
<img src="@/assets/remotedisconnect.svg" class="illustration">
<img src="@/assets/remotedisconnect.svg" class="illustration">
<h3>
Reconnecting...
</h3>
</section>
<section class="panel-body">
<section class="left-panel">
<qriously
<section class="left-panel">
<qriously
v-if="showQR"
id="qr"
:value="`https://remote.seatsmart.tech/code/${roomID}`"
:size="100"
:value="`https://seatsmart-remote.thaddeus.education/code/${roomID}`"
:size="100"
/>
<div id="qrGhost" v-else>

</div>
<button class="qr-toggle" v-if="showQR" @click="showQR = false">hide QR</button>
<button class="qr-toggle" v-else @click="showQR = true">show QR</button>
Expand Down Expand Up @@ -79,7 +79,7 @@ export default {
height: 100%;
display: grid;
grid-template-rows: 20% 80%;
grid-template-areas:
grid-template-areas:
"panelHeader"
"panelBody";
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Settings.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,9 @@ export default {
},
openHomePage(section) {
if (section == 'main') {
shell.openExternal('https://seatsmart.tech/')
shell.openExternal('https://seatsmart.thaddeus.education/')
} else {
shell.openExternal('https://seatsmart.tech/#releaseNotes')
shell.openExternal('https://seatsmart.thaddeus.education/#releaseNotes')
}
},
openEmail() {
Expand Down
Loading

0 comments on commit f5d0f9c

Please sign in to comment.