Skip to content

Commit fbc60a8

Browse files
mgernimgerni
authored
Merge pull request #60 from rmobis/rmobis/clm-integration
fix unofficial dashboard + return 400 when generating task fails
2 parents 4412dca + 1824d61 commit fbc60a8

2 files changed

Lines changed: 27 additions & 28 deletions

File tree

‎taskapp.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def api_task_progress(user):
207207
def api_generate_task(user):
208208
current_task = get_taskCurrent(user.username)
209209
if current_task:
210-
return jsonify({'message': 'User already has a task'})
210+
return jsonify({'message': 'User already has a task'}), 400
211211

212212
generate_task(user.username)
213213
current_task = get_taskCurrent(user.username)
@@ -220,7 +220,7 @@ def api_generate_task(user):
220220
}
221221
})
222222

223-
return jsonify({'message': 'No available tasks to generate!'})
223+
return jsonify({'message': 'No available tasks to generate!'}), 400
224224

225225
@app.route('/api/v1/resource/complete_task')
226226
@token_required
@@ -1082,4 +1082,4 @@ def change_official_status():
10821082
if (isProd):
10831083
app.run(host='0.0.0.0')
10841084
else:
1085-
app.run(host="0.0.0.0", port=5000)
1085+
app.run(host="0.0.0.0", port=5001)

‎templates/dashboard_unofficial_v2.html‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="decoration-top-left shadow"></div>
1010
</div>
1111
<div class="triangle-top-right">
12-
<div class="decoration-top-right shadow"></div>
12+
<div class="decoration-top-right shadow"></div>
1313
</div>
1414
<div class="triangle-bottom-left">
1515
<div class="decoration-bottom-left shadow"></div>
@@ -34,54 +34,54 @@
3434
{% if image_easy == None %}
3535
<img id="easy_image_preview" src="/static/assets/Cake_of_guidance_detail.png" alt="" width="25px" height="25px">
3636
{% else %}
37-
<img class="image-preview" id="easy_image_preview" src="/static/assets/{{image_easy}}" alt="" name="{{task_easy}}" width="25px" height="25px">
37+
<img class="image-preview" id="easy_image_preview" src="{{image_easy}}" alt="" name="{{task_easy}}" width="25px" height="25px">
3838
{% endif %}
3939
</div>
4040
<div class="square cut-corners bg-override">
4141
{% if image_medium == None %}
4242
<img id="medium_image_preview" src="/static/assets/Cake_of_guidance_detail.png" alt="" width="25px" height="25px">
4343
{% else %}
44-
<img id="medium_image_preview" src="/static/assets/{{image_medium}}" name="{{task_medium}}" alt="" width="25px" height="25px">
44+
<img id="medium_image_preview" src="{{image_medium}}" name="{{task_medium}}" alt="" width="25px" height="25px">
4545
{% endif %}
4646
</div>
4747
<div class="square cut-corners bg-override">
4848
{% if image_hard == None %}
4949
<img id="hard_image_preview" src="/static/assets/Cake_of_guidance_detail.png" alt="" width="25px" height="25px">
5050
{% else %}
51-
<img id="hard_image_preview" src="/static/assets/{{image_hard}}" name="{{task_hard}}" alt="" width="25px" height="25px">
51+
<img id="hard_image_preview" src="{{image_hard}}" name="{{task_hard}}" alt="" width="25px" height="25px">
5252
{% endif %}
5353
</div>
5454
<div class="square cut-corners bg-override">
5555
{% if image_elite == None %}
5656
<img id="elite_image_preview" src="/static/assets/Cake_of_guidance_detail.png" alt="" width="25px" height="25px">
5757
{% else %}
58-
<img id="elite_image_preview" src="/static/assets/{{image_elite}}" name="{{task_elite}}" alt="" width="25px" height="25px">
58+
<img id="elite_image_preview" src="{{image_elite}}" name="{{task_elite}}" alt="" width="25px" height="25px">
5959
{% endif %}
6060
</div>
6161
<div class="square cut-corners bg-override">
6262
{% if image_master == None %}
6363
<img id="master_image_preview" src="/static/assets/Cake_of_guidance_detail.png" alt="" width="25px" height="25px">
6464
{% else %}
65-
<img id="master_image_preview" src="/static/assets/{{image_master}}" name="{{task_master}}" alt="" width="25px" height="25px">
65+
<img id="master_image_preview" src="{{image_master}}" name="{{task_master}}" alt="" width="25px" height="25px">
6666
{% endif %}
6767
</div>
68-
68+
6969
</div>
7070

7171
<p id="b" class="rsText active-task-tooltip">placeholder text</p>
7272

7373
<br>
74-
<br>
75-
74+
<br>
75+
7676
<div id="Easy" class="tier">
7777
<hr>
7878
<div class="task-content rsText">
7979
<div id="frame-container">
8080
{% if image_easy == None %}
8181
<a id="easy_placeholder" href="#" class="imageTask" data-tip="Generate a Task!"><img id="easy_image" class="frame item-image imageTask" data-tip="Generate a Task!" src="/static/assets/Cake_of_guidance_detail.png"/></a>
8282
{% else %}
83-
<a id="easy_imageTask" class="imageTask" href="{{link_easy}}" target="_blank" data-tip="{{tip_easy}}"><img id="easy_image"class="frame item-image" src="/static/assets/{{image_easy}}"/></a>
84-
83+
<a id="easy_imageTask" class="imageTask" href="{{link_easy}}" target="_blank" data-tip="{{tip_easy}}"><img id="easy_image"class="frame item-image" src="{{image_easy}}"/></a>
84+
8585
{% endif %}
8686
</div>
8787
<div id="message-container">
@@ -98,17 +98,17 @@
9898
<button id="complete_unofficial" class="button-style" name="easy"><img class="responsive-image" src="/static/complete_task_button.png" name="easy" alt=""></button>
9999
</div>
100100
</div>
101-
102-
103-
101+
102+
103+
104104
<div id="Medium" class="tier" style="display: none;">
105105
<hr>
106106
<div class="task-content rsText">
107107
<div id="frame-container">
108108
{% if image_medium == None %}
109109
<a id="medium_placeholder" href="#" class="imageTask" data-tip="Generate a Task!"><img id="medium_image" class="frame item-image imageTask" data-tip="Generate a Task!" src="/static/assets/Cake_of_guidance_detail.png"/></a>
110110
{% else %}
111-
<a id="medium_imageTask" href="{{link_medium}}" target="_blank" data-tip="{{tip_medium}}"><img id="medium_image"class="frame item-image imageTask" src="/static/assets/{{image_medium}}"/></a>
111+
<a id="medium_imageTask" href="{{link_medium}}" target="_blank" data-tip="{{tip_medium}}"><img id="medium_image"class="frame item-image imageTask" src="{{image_medium}}"/></a>
112112
{% endif %}
113113
</div>
114114
<div id="message-container">
@@ -125,16 +125,16 @@
125125
<button id="complete_unofficial" class="button-style" name="medium"><img class="responsive-image" src="/static/complete_task_button.png" alt=""></button>
126126
</div>
127127
</div>
128-
128+
129129
<div id="Hard" class="tier" style="display: none;">
130130
<hr>
131131
<div class="task-content rsText">
132132
<div id="frame-container">
133133
{% if image_hard == None %}
134134
<a id="hard_placeholder" href="#" class="imageTask" data-tip="Generate a Task!"><img id="hard_image" class="frame item-image imageTask" data-tip="Generate a Task!" src="/static/assets/Cake_of_guidance_detail.png"/></a>
135135
{% else %}
136-
<a id="hard_imageTask" class="imageTask" href="{{link_hard}}" target="_blank" data-tip="{{tip_hard}}"><img id="hard_image"class="frame item-image imageTask" src="/static/assets/{{image_hard}}"/></a>
137-
136+
<a id="hard_imageTask" class="imageTask" href="{{link_hard}}" target="_blank" data-tip="{{tip_hard}}"><img id="hard_image"class="frame item-image imageTask" src="{{image_hard}}"/></a>
137+
138138
{% endif %}
139139
</div>
140140
<div id="message-container">
@@ -151,16 +151,16 @@
151151
<button id="complete_unofficial" class="button-style" name="hard"><img class="responsive-image" src="/static/complete_task_button.png" alt=""></button>
152152
</div>
153153
</div>
154-
154+
155155
<div id="Elite" class="tier" style="display: none;">
156156
<hr>
157157
<div class="task-content rsText">
158158
<div id="frame-container">
159159
{% if image_elite == None %}
160160
<a id="elite_placeholder" href="#" class="imageTask" data-tip="Generate a Task!"><img id="elite_image" class="frame item-image imageTask" data-tip="Generate a Task!" src="/static/assets/Cake_of_guidance_detail.png"/></a>
161161
{% else %}
162-
<a id="elite_imageTask" class="imageTask" href="{{link_elite}}" target="_blank" data-tip="{{tip_elite}}"><img id="elite_image"class="frame item-image imageTask" src="/static/assets/{{image_elite}}"/></a>
163-
162+
<a id="elite_imageTask" class="imageTask" href="{{link_elite}}" target="_blank" data-tip="{{tip_elite}}"><img id="elite_image"class="frame item-image imageTask" src="{{image_elite}}"/></a>
163+
164164
{% endif %}
165165
</div>
166166
<div id="message-container">
@@ -177,15 +177,15 @@
177177
<button id="complete_unofficial" class="button-style" name="elite"><img class="responsive-image" src="/static/complete_task_button.png" alt=""></button>
178178
</div>
179179
</div>
180-
180+
181181
<div id="Master" class="tier" style="display: none;">
182182
<hr>
183183
<div class="task-content rsText">
184184
<div id="frame-container">
185185
{% if image_master == None %}
186186
<a id="master_placeholder" href="#" class="imageTask" data-tip="Generate a Task!"><img id="master_image" class="frame item-image imageTask" data-tip="Generate a Task!" src="/static/assets/Cake_of_guidance_detail.png"/></a>
187187
{% else %}
188-
<a id="master_imageTask" class="imageTask" href="{{link_master}}" target="_blank" data-tip="{{tip_master}}"><img id="master_image"class="frame item-image imageTasks" src="/static/assets/{{image_master}}"/></a>
188+
<a id="master_imageTask" class="imageTask" href="{{link_master}}" target="_blank" data-tip="{{tip_master}}"><img id="master_image"class="frame item-image imageTasks" src="{{image_master}}"/></a>
189189
{% endif %}
190190
</div>
191191
<div id="message-container">
@@ -202,7 +202,7 @@
202202
<button id="complete_unofficial" class="button-style" name="master"><img class="responsive-image" src="/static/complete_task_button.png" alt=""></button>
203203
</div>
204204
</div>
205-
205+
206206
</div>
207207
</div>
208208
</div>
@@ -224,4 +224,3 @@
224224
</script>
225225

226226
{% endblock %}
227-

0 commit comments

Comments
 (0)