Skip to content

Commit ca5e408

Browse files
committed
Merge branch 'master' of github.com:coding-blocks/hackerblocks.projectx
2 parents cd452a2 + 41fa7ef commit ca5e408

File tree

4 files changed

+48
-6
lines changed

4 files changed

+48
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,35 @@
11
import Component from '@ember/component';
2+
import { inject as service } from '@ember/service';
3+
import { jsonToTable } from '../../../util/json-to-table';
24

35
export default Component.extend({
6+
languageSelection: service('language-selection'),
7+
8+
init() {
9+
this._super(...arguments);
10+
let contest = this.get('contest');
11+
12+
13+
document.addEventListener('contextmenu', function (event) {
14+
event.preventDefault();
15+
});
16+
17+
18+
document.addEventListener('keydown', function (event) {
19+
if (
20+
event.key === 'F12' ||
21+
(event.ctrlKey && event.shiftKey && event.key === 'I') ||
22+
(event.ctrlKey && event.shiftKey && event.key === 'C') ||
23+
(event.ctrlKey && event.shiftKey && event.key === 'J') ||
24+
(event.ctrlKey && event.key === 'U')
25+
) {
26+
event.preventDefault();
27+
}
28+
});
29+
},
30+
31+
jsonToTable(data) {
32+
const table = jsonToTable(data);
33+
return table;
34+
}
435
});

app/pods/components/problem-explanation/template.hbs

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<div class="py-4">
2-
<p>
3-
{{markdown-to-html problem.details.description}}
4-
</p>
1+
<div class="py-4 no-select">
2+
<p>{{markdown-to-html problem.details.description}}</p>
3+
54
<div class="extra-bold">Input Format</div>
65
<p>
76
{{markdown-to-html problem.details.input_format}}
@@ -22,7 +21,11 @@
2221
</div>
2322
<div class="extra-bold">Sample Output</div>
2423
<div class="bg-grey br-5 w-60 px-4 py-2 my-2">
25-
<pre>{{problem.details.sample_output}}</pre>
24+
{{#if (includes contest.allowedLanguages "mysql")}}
25+
<pre>{{json-to-table problem.details.sample_output}}</pre>
26+
{{else}}
27+
<pre>{{problem.details.sample_output}}</pre>
28+
{{/if}}
2629
</div>
2730
{{#if problem.details.explanation}}
2831
<div class="extra-bold">Explanation</div>

app/styles/app.scss

+8
Original file line numberDiff line numberDiff line change
@@ -292,4 +292,12 @@ body{
292292
100% {
293293
box-shadow: 0 0 0 6px rgba(167, 89, 47, 0.032);
294294
}
295+
}
296+
297+
.no-select {
298+
user-select: none;
299+
-webkit-user-select: none;
300+
-moz-user-select: none;
301+
-ms-user-select: none;
302+
pointer-events: none;
295303
}

config/environment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function (environment) {
55
modulePrefix: "hackerblocks",
66
podModulePrefix: "hackerblocks/pods",
77
environment,
8-
rootURL: "/app",
8+
rootURL: "/",
99
locationType: "auto",
1010
"ember-simple-auth-token": {
1111
identificationField: "code",

0 commit comments

Comments
 (0)