Skip to content

Commit 0ac2d4d

Browse files
princiyaprinciya
committed
resolved merge conflicts, fixed linting issues
1 parent 2f7d948 commit 0ac2d4d

File tree

1 file changed

+34
-32
lines changed

1 file changed

+34
-32
lines changed

‎pyscriptjs/src/components/pyrepl.ts

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class PyRepl extends BaseEvalElement {
7575

7676
// }
7777
// })
78-
];
78+
];
7979
const customTheme = EditorView.theme({
8080
'&.cm-focused .cm-editor': { outline: '0px' },
8181
'.cm-scroller': { lineHeight: 2.5 },
@@ -95,51 +95,53 @@ export class PyRepl extends BaseEvalElement {
9595
let startState = EditorState.create({
9696
doc: this.code.trim(),
9797
extensions: extensions
98-
})
98+
});
9999

100-
this.editor = new EditorView({
100+
this.editor = new EditorView({
101101
state: startState,
102102
parent: this.editorNode
103-
})
103+
});
104104

105-
let mainDiv = document.createElement('div');
106-
addClasses(mainDiv, ["parentBox", "group", "flex", "flex-col", "mt-2", "mx-8"])
107-
// add Editor to main PyScript div
105+
let mainDiv = document.createElement('div');
106+
addClasses(mainDiv, ["parentBox", "group", "flex", "flex-col", "mt-2", "mx-8"])
107+
// add Editor to main PyScript div
108108

109-
// Butons DIV
110-
var eDiv = document.createElement('div');
111-
addClasses(eDiv, "buttons-box opacity-0 group-hover:opacity-100 relative top-0 right-0 flex flex-row-reverse space-x-reverse space-x-4 font-mono text-white text-sm font-bold leading-6 dev-buttons-group -mt-2 first-of-type:m-0".split(" "))
112-
eDiv.setAttribute("role", "group");
109+
// Butons DIV
110+
var eDiv = document.createElement('div');
111+
addClasses(eDiv, "buttons-box opacity-0 group-hover:opacity-100 relative top-0 right-0 flex flex-row-reverse space-x-reverse space-x-4 font-mono text-white text-sm font-bold leading-6 dev-buttons-group -mt-2 first-of-type:m-0".split(" "))
112+
eDiv.setAttribute("role", "group");
113113

114-
// Play Button
115-
this.btnRun = document.createElement('button');
116-
this.btnRun.innerHTML = '<svg id="" class="svelte-fa svelte-ps5qeg" style="height:1em;vertical-align:-.125em;transform-origin:center;overflow:visible" viewBox="0 0 384 512" aria-hidden="true" role="img" xmlns="http://www.w3.org/2000/svg"><g transform="translate(192 256)" transform-origin="96 0"><g transform="translate(0,0) scale(1,1)"><path d="M361 215C375.3 223.8 384 239.3 384 256C384 272.7 375.3 288.2 361 296.1L73.03 472.1C58.21 482 39.66 482.4 24.52 473.9C9.377 465.4 0 449.4 0 432V80C0 62.64 9.377 46.63 24.52 38.13C39.66 29.64 58.21 29.99 73.03 39.04L361 215z" fill="currentColor" transform="translate(-192 -256)"></path></g></g></svg>';
117-
let buttonClasses = ["mr-2", "block", "py-2", "px-4", "rounded-full"];
118-
addClasses(this.btnRun, buttonClasses);
119-
addClasses(this.btnRun, ["bg-green-500"])
120-
eDiv.appendChild(this.btnRun);
121-
122-
this.btnRun.onclick = wrap(this);
114+
// Play Button
115+
this.btnRun = document.createElement('button');
116+
this.btnRun.innerHTML = '<svg id="" class="svelte-fa svelte-ps5qeg" style="height:1em;vertical-align:-.125em;transform-origin:center;overflow:visible" viewBox="0 0 384 512" aria-hidden="true" role="img" xmlns="http://www.w3.org/2000/svg"><g transform="translate(192 256)" transform-origin="96 0"><g transform="translate(0,0) scale(1,1)"><path d="M361 215C375.3 223.8 384 239.3 384 256C384 272.7 375.3 288.2 361 296.1L73.03 472.1C58.21 482 39.66 482.4 24.52 473.9C9.377 465.4 0 449.4 0 432V80C0 62.64 9.377 46.63 24.52 38.13C39.66 29.64 58.21 29.99 73.03 39.04L361 215z" fill="currentColor" transform="translate(-192 -256)"></path></g></g></svg>';
117+
let buttonClasses = ["mr-2", "block", "py-2", "px-4", "rounded-full"];
118+
addClasses(this.btnRun, buttonClasses);
119+
addClasses(this.btnRun, ["bg-green-500"])
120+
eDiv.appendChild(this.btnRun);
121+
122+
this.btnRun.onclick = wrap(this);
123123

124-
function wrap(el: any){
125-
async function evaluatePython() {
126-
el.evaluate()
124+
function wrap(el: any){
125+
async function evaluatePython() {
126+
el.evaluate();
127+
}
128+
return evaluatePython;
127129
}
128130

129131
// Settings button
130132
this.btnConfig = document.createElement('button');
131133
this.btnConfig.innerHTML =
132134
'<svg id="" class="svelte-fa svelte-ps5qeg" style="height:1em;vertical-align:-.125em;transform-origin:center;overflow:visible" viewBox="0 0 512 512" aria-hidden="true" role="img" xmlns="http://www.w3.org/2000/svg"><g transform="translate(256 256)" transform-origin="128 0"><g transform="translate(0,0) scale(1,1)"><path d="M495.9 166.6C499.2 175.2 496.4 184.9 489.6 191.2L446.3 230.6C447.4 238.9 448 247.4 448 256C448 264.6 447.4 273.1 446.3 281.4L489.6 320.8C496.4 327.1 499.2 336.8 495.9 345.4C491.5 357.3 486.2 368.8 480.2 379.7L475.5 387.8C468.9 398.8 461.5 409.2 453.4 419.1C447.4 426.2 437.7 428.7 428.9 425.9L373.2 408.1C359.8 418.4 344.1 427 329.2 433.6L316.7 490.7C314.7 499.7 307.7 506.1 298.5 508.5C284.7 510.8 270.5 512 255.1 512C241.5 512 227.3 510.8 213.5 508.5C204.3 506.1 197.3 499.7 195.3 490.7L182.8 433.6C167 427 152.2 418.4 138.8 408.1L83.14 425.9C74.3 428.7 64.55 426.2 58.63 419.1C50.52 409.2 43.12 398.8 36.52 387.8L31.84 379.7C25.77 368.8 20.49 357.3 16.06 345.4C12.82 336.8 15.55 327.1 22.41 320.8L65.67 281.4C64.57 273.1 64 264.6 64 256C64 247.4 64.57 238.9 65.67 230.6L22.41 191.2C15.55 184.9 12.82 175.3 16.06 166.6C20.49 154.7 25.78 143.2 31.84 132.3L36.51 124.2C43.12 113.2 50.52 102.8 58.63 92.95C64.55 85.8 74.3 83.32 83.14 86.14L138.8 103.9C152.2 93.56 167 84.96 182.8 78.43L195.3 21.33C197.3 12.25 204.3 5.04 213.5 3.51C227.3 1.201 241.5 0 256 0C270.5 0 284.7 1.201 298.5 3.51C307.7 5.04 314.7 12.25 316.7 21.33L329.2 78.43C344.1 84.96 359.8 93.56 373.2 103.9L428.9 86.14C437.7 83.32 447.4 85.8 453.4 92.95C461.5 102.8 468.9 113.2 475.5 124.2L480.2 132.3C486.2 143.2 491.5 154.7 495.9 166.6V166.6zM256 336C300.2 336 336 300.2 336 255.1C336 211.8 300.2 175.1 256 175.1C211.8 175.1 176 211.8 176 255.1C176 300.2 211.8 336 256 336z" fill="currentColor" transform="translate(-256 -256)"></path></g></g></svg>';
133135
this.btnConfig.onclick = function toggleNavBar(evt) {
134-
console.log('clicked');
135-
componentDetailsNavOpen.set(!propertiesNavOpen);
136-
137-
currentComponentDetails.set([
138-
{ key: 'auto-generate', value: true },
139-
{ key: 'output', value: 'default' },
140-
{ key: 'source', value: 'self' },
141-
{ key: 'output-mode', value: 'clear' },
142-
]);
136+
console.log('clicked');
137+
componentDetailsNavOpen.set(!propertiesNavOpen);
138+
139+
currentComponentDetails.set([
140+
{ key: 'auto-generate', value: true },
141+
{ key: 'output', value: 'default' },
142+
{ key: 'source', value: 'self' },
143+
{ key: 'output-mode', value: 'clear' },
144+
]);
143145
};
144146

145147
addClasses(this.btnConfig, buttonClasses);

0 commit comments

Comments
 (0)