Skip to content

Commit 534a6da

Browse files
Merge pull request #8 from BigSpaceships/dev
Dev
2 parents df2418a + 4d3dd4c commit 534a6da

4 files changed

Lines changed: 83 additions & 10 deletions

File tree

‎main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ func main() {
8282
apiMux.HandleFunc("DELETE /queue/{queue}", discussion.DeleteQueue)
8383
apiMux.HandleFunc("GET /queue/{queue}/path", discussion.GetQueuePath)
8484
apiMux.HandleFunc("GET /discussion", discussion.GetDiscussion)
85+
apiMux.HandleFunc("PUT /discussion/reset", discussion.ResetDiscussion)
8586
apiMux.HandleFunc("/joinws", ws_server.WebsocketConnect)
8687

8788
http.Handle("/api/", http.StripPrefix("/api", auth.Handler(apiMux)))

‎queue/queue.go‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,37 @@ func SetupDiscussion(wsServer *dq_websocket.WsServer) *Discussion {
6363
return &discussion
6464
}
6565

66+
func (discussion *Discussion) ResetDiscussion(w http.ResponseWriter, r *http.Request) {
67+
userInfo := auth.GetUserClaims(r)
68+
69+
if !userInfo.IsEboard {
70+
w.WriteHeader(http.StatusForbidden)
71+
return
72+
}
73+
74+
discussion.queueCount = 0
75+
discussion.queueMap = make(map[int]*Queue)
76+
77+
baseQueue := Queue{
78+
Id: discussion.queueCount,
79+
Points: make([]QueueEntry, 0),
80+
Clarifiers: make([]QueueEntry, 0),
81+
Children: make([]*Queue, 0),
82+
Topic: "Big long discussion",
83+
pointCount: 0,
84+
}
85+
86+
discussion.queueCount++
87+
discussion.Queue = &baseQueue
88+
discussion.queueMap[baseQueue.Id] = &baseQueue
89+
90+
discussion.wsServer.SendWSMessage(struct {
91+
Type string `json:"type"`
92+
}{
93+
Type: "refresh",
94+
})
95+
}
96+
6697
func (discussion *Discussion) NewQueue(w http.ResponseWriter, r *http.Request) {
6798
userInfo := auth.GetUserClaims(r)
6899

‎static/index.html‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,16 @@ <h2 class="m-0 fs-3 p-1">
111111
<input class="discussion-title" value="AGH" onchange="changeTopic(event)" />
112112
</h2>
113113
<div class="ms-auto d-flex flex-row align-items-center">
114-
<a href="#" id="remove-queue" onclick="closeActiveQueue()">
114+
<a href="#" class="ms-2" id="remove-queue" onclick="closeActiveQueue()">
115115
<i class="bi bi-x text-danger fs-3"></i>
116116
</a>
117117
<a href="#" class="ms-2" onclick="rebuildQueue(); return false">
118118
<i class="bi bi-repeat text-muted fs-5"></i>
119119
</a>
120+
<button class="ms-3 btn btn-sm btn-danger" href="#" id="reset-discussion"
121+
data-bs-toggle="modal" data-bs-target="#resetDiscussionModal">
122+
Reset
123+
</button>
120124
</div>
121125
</div>
122126
</div>
@@ -129,14 +133,12 @@ <h2 class="m-0 fs-3 p-1">
129133
</p>
130134
</div>
131135
<div class="card-footer mb-0 d-flex justify-content-center">
132-
<div class="mx-auto">
133-
<button class="new-btns btn btn-lg btn-primary fs-2 py-4 px-5 py-lg-3 px-lg-4 mx-5 mx-lg-3"
134-
onclick="enterQueue('clarifier')">Clarifier</button>
135-
<button class="new-btns btn btn-lg btn-primary fs-2 py-4 px-5 py-lg-3 px-lg-4 mx-5 mx-lg-3"
136-
onclick="enterQueue('point')">New Point</button>
137-
<button class="new-btns btn btn-lg btn-primary fs-2 py-4 px-5 py-lg-3 px-lg-4 mx-5 mx-lg-3"
138-
id="createQueueModalBtn" data-bs-toggle="modal" data-bs-target="#createQueueModal">New Topic</button>
139-
</div>
136+
<button class="new-btns btn btn-lg btn-primary fs-2 py-4 px-3 py-lg-3 px-lg-4 mx-2 mx-lg-3"
137+
onclick="enterQueue('clarifier')">Clarifier</button>
138+
<button class="new-btns btn btn-lg btn-primary fs-2 py-4 px-3 py-lg-3 px-lg-4 mx-2 mx-lg-3"
139+
onclick="enterQueue('point')">New Point</button>
140+
<button class="new-btns btn btn-lg btn-primary fs-2 py-4 px-3 py-lg-3 px-lg-4 mx-2 mx-lg-3"
141+
id="createQueueModalBtn" data-bs-toggle="modal" data-bs-target="#createQueueModal">New Topic</button>
140142
</div>
141143
</div>
142144
</div>
@@ -166,6 +168,31 @@ <h1 class="modal-title fs-5" id="createQueueModalLabel">New Queue</h1>
166168
</div>
167169
</div>
168170

171+
<!-- Reset Discussion Modal -->
172+
<div class="modal fade" id="resetDiscussionModal" tabindex="-1" aria-labelledby="resetDiscussionModalLabel"
173+
aria-hidden="true">
174+
<div class="modal-dialog">
175+
<div class="modal-content">
176+
<div class="modal-header">
177+
<h1 class="modal-title fs-5" id="resetDiscussionModalLabel">Reset Discussion</h1>
178+
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
179+
</div>
180+
<div class="modal-body">
181+
<div class="mb-3">
182+
<div class="alert alert-info" role="alert">
183+
NOTE: this will clear ALL data on Dairy Queen
184+
</div>
185+
</div>
186+
</div>
187+
<div class="modal-footer">
188+
<button type="button" class="btn btn-danger" data-bs-dismiss="modal">Cancel</button>
189+
<button type="button" class="btn btn-primary" data-bs-dismiss="modal"
190+
onclick="resetDiscussionFormSubmit()">Reset Discussion</button>
191+
</div>
192+
</div>
193+
</div>
194+
</div>
195+
169196
<div class="toast-container position-absolute d-flex flex-column">
170197
<div class="toast" role="alert" aria-live="assertive" aria-atomic="true">
171198
<div class="toast-header">

‎static/javascript/index.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,23 @@ function newQueueFormSubmit() {
111111
topicElement.value = "";
112112
}
113113

114+
function resetDiscussionFormSubmit() {
115+
if (!window.userInfo.is_eboard) {
116+
console.error("Only E-Board members can create reset queues");
117+
return;
118+
}
119+
120+
fetchAPI(`${window.location.origin}/api/discussion/reset`, {
121+
method: "PUT"
122+
})
123+
}
124+
114125
function joinWebsocket(retryCount = 0) {
115126
const isSecure = window.location.protocol == "https:";
116127
const protocol = isSecure ? "wss" : "ws";
117128
const socket = new WebSocket(`${protocol}://${window.location.host}/api/joinws`);
118129

119-
socket.addEventListener("message", (event) => {
130+
socket.addEventListener("message", async (event) => {
120131
const eventData = JSON.parse(event.data);
121132

122133
switch (eventData.type) {
@@ -143,6 +154,9 @@ function joinWebsocket(retryCount = 0) {
143154
case "move-to-queue":
144155
loadQueueDom(eventData.queue);
145156
break;
157+
case "refresh":
158+
await rebuildQueue();
159+
break;
146160
}
147161
});
148162

0 commit comments

Comments
 (0)