Skip to content

Commit 0e086fc

Browse files
MagmaMCNetMagmaMCNet
committed
24/8/22-7.00am
1 parent ee3553f commit 0e086fc

12 files changed

Lines changed: 12391 additions & 55 deletions

File tree

‎Assets/css.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,9 @@ pre {
162162
bottom: 0;
163163
opacity: 0;
164164
}
165+
}
166+
167+
canvas {
168+
image-rendering: pixelated;
169+
image-rendering: crisp-edges;
165170
}

‎Base/Mapper_Top.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,53 @@
5656
'WHEEL_DOWN': 5
5757
}
5858

59+
INTKEYS = {
60+
8: '',
61+
13: '',
62+
46: '',
63+
187: '',
64+
188: '',
65+
189: '-',
66+
32: ' ',
67+
48:'0',
68+
49:'1',
69+
50:'2',
70+
51:'3',
71+
52:'4',
72+
53:'5',
73+
54:'6',
74+
55:'7',
75+
56:'8',
76+
57:'9',
77+
97 :'A',
78+
98 :'B',
79+
99 :'C',
80+
100:'D',
81+
101:'E',
82+
102:'F',
83+
103:'G',
84+
104:'H',
85+
105:'I',
86+
106:'J',
87+
107:'K',
88+
108:'L',
89+
109:'M',
90+
110:'N',
91+
111:'O',
92+
112:'P',
93+
113:'Q',
94+
114:'R',
95+
115:'S',
96+
116:'T',
97+
117:'U',
98+
118:'V',
99+
119:'W',
100+
120:'X',
101+
121:'Y',
102+
122:'Z',
103+
109:'-',
104+
}
105+
59106
KEYS = {
60107
'UNKNOWN': 0,
61108
'BACKSPACE': 8,
@@ -1938,3 +1985,4 @@ def __getattr__(self, keyname):
19381985
FPS_Modules = Custom_Modules.Fps_mod()
19391986
Mouse = Custom_Modules.Mouse()
19401987

1988+

‎Base/Skulpt/skulpt-stdlib.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Base/Skulpt/skulpt.min.js‎

Lines changed: 12196 additions & 0 deletions
Large diffs are not rendered by default.

‎Modules/JsForPy.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
var $builtinmodule = function(name) {
22
mod = {}
33

4+
function openInNewTab(href) {
5+
Object.assign(document.createElement('a'), {
6+
target: '_blank',
7+
href: href,
8+
}).click();
9+
}
410
mod.console = new Sk.builtin.func(function() {
511
console.info(console);
612
return console
713
});
8-
mod.window = new Sk.builtin.func(function() {
9-
console.info(window.Location);
10-
return window
14+
mod.newtab = new Sk.builtin.func(function(value) {
15+
openInNewTab(value.v)
1116
});
1217

1318
//

‎Modules/filez/filez.js‎

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
var $builtinmodule = function(name) {
22
//
3-
const parm = new URLSearchParams(window.location.search).get("ID");
3+
var parm = new URLSearchParams(window.location.search).get("ID");
44
mod = {}
5+
mod.SetID = new Sk.builtin.func(function(FilezId) {
6+
parm = Sk.ffi.remapToJs(FilezId);
7+
})
58
mod.fread = new Sk.builtin.func(function(filename) {
6-
return $.ajax({ type: "GET", url: "../../Modules/filez/filez.php?filez=read&filename=" + filename.v + "&ID=" + parm, async: false }).responseText
9+
return Sk.ffi.remapToPy(
10+
JSON.parse(
11+
$.ajax({
12+
type: "GET",
13+
url: "../../Modules/filez/filez.php?filez=read&filename=" + filename.v + "&ID=" + parm,
14+
async: false
15+
}).responseText)
16+
)
717
});
818
mod.fwrite = new Sk.builtin.func(function(filename, content, type) {
919
var data = new FormData();
@@ -17,10 +27,12 @@ var $builtinmodule = function(name) {
1727
xhr.send(data);
1828
});
1929
mod.scan = new Sk.builtin.func(function(folder) {
20-
var scannedfolder = $.ajax({ type: "GET", url: "../../Modules/filez/filez.php?filez=scan&filename=" + folder.v + "&ID=" + parm, async: false }).responseText
21-
console.log(scannedfolder)
30+
var scannedfolder = $.ajax({
31+
type: "GET",
32+
url: "../../Modules/filez/filez.php?filez=scan&filename=" + folder.v + "&ID=" + parm,
33+
async: false
34+
}).responseText
2235
scannedfolder.replace(/\[|\]/g, '').split(',')
23-
console.log(scannedfolder)
2436
return Sk.ffi.remapToPy(JSON.parse(scannedfolder))
2537

2638
});
@@ -31,38 +43,54 @@ var $builtinmodule = function(name) {
3143
[/null/, "key"],
3244
[/.*/, "number"],
3345
]
34-
mod.send = new Sk.builtin.func(function(file, key, value, type, key2, ji = false, key3 = "nono1") {
35-
var readfile = JSON.parse($.ajax({ type: "GET", url: "../../Modules/filez/filez.php?filez=read&filename=" + file.v + "&ID=" + parm, async: false }).responseText);
36-
if (type.v == "=") {
37-
if (ji.v == true) {
38-
readfile[key.v][key2.v] = JSON.parse(value.v);
39-
} else {
40-
if (key3.v == "nono1") {
41-
readfile[key.v][key2.v] = value.v;
46+
mod.send = new Sk.builtin.func(function(file, value, key = "null", type = "=", stringit = false) {
47+
var readfile = JSON.parse($.ajax({
48+
type: "GET",
49+
url: "../../Modules/filez/filez.php?filez=read&filename=" + file.v + "&ID=" + parm,
50+
async: false
51+
}).responseText);
52+
if (key == "null") {
53+
readfile = value.v;
54+
} else {
55+
if (type.v == "=") {
56+
readfile[key.v] = value.v;
57+
} else if (type.v == "+") {
58+
if (stringit) {
59+
readfile[key.v] = String(parseInt(readfile[key.v]) + parseInt(value.v));
4260
} else {
43-
readfile[key.v][key2.v][key3.v] = value.v;
61+
readfile[key.v] = parseInt(readfile[key.v]) + parseInt(value.v);
4462
}
63+
64+
} else if (type.v == "-") {
65+
readfile[key.v] = parseInt(readfile[key.v]) - parseInt(value.v);
4566
}
46-
} else if (type.v == "-") {
47-
if (key3.v == "nono1") {
48-
readfile[key.v][key2.v] = toString(parseInt(readfile[key.v][key2.v]) - value.v);
49-
} else {
50-
readfile[key.v][key2.v][key3.v] = toString(parseInt(readfile[key.v][key2.v][key3.v]) - value.v);
51-
}
52-
} else if (type.v == "+") {
53-
readfile[key.v][key2.v] = toString(parseInt(readfile[key.v][key2.v]) + value.v);
5467

5568
}
5669

70+
5771
var data = new FormData();
5872
data.append("filename", file.v);
59-
data.append("content", JSON.stringify(readfile).replaceAll(":{", ":{\n").replaceAll(":[", ":[\n").replaceAll(",", ",\n"));
73+
data.append("content", JSON.stringify(readfile));
6074
data.append("type", "c");
6175
data.append("filez", "write");
6276
data.append("ID", parm);
6377
var xhr = (window.XMLHttpRequest) ? new XMLHttpRequest() : new activeXObject("Microsoft.XMLHTTP");
6478
xhr.open('post', '../../Modules/filez/filez.php', true);
6579
xhr.send(data);
80+
if (key == "null") {
81+
return readfile;
82+
} else {
83+
return readfile[key.v];
84+
}
85+
});
86+
mod.deletes = new Sk.builtin.func(function(filename) {
87+
var data = new FormData();
88+
data.append("filename", filename.v);
89+
data.append("filez", "delete");
90+
data.append("ID", parm);
91+
var xhr = (window.XMLHttpRequest) ? new XMLHttpRequest() : new activeXObject("Microsoft.XMLHTTP");
92+
xhr.open('post', '../../Modules/filez/filez.php', true);
93+
xhr.send(data);
6694
});
6795
return mod;
6896
}

‎Modules/filez/filez.php‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<?php
22
if(isset($_REQUEST['ID'])) {
3+
$homefolder = "../../Share/".$_REQUEST['ID']."/";
34
$rootfolder = "../../Share/".$_REQUEST['ID']."/__FILEZ__/";
45
$folder = $rootfolder.$_REQUEST['filename'];
56

67
if(!is_dir($rootfolder)) {
78
mkdir($rootfolder, 0777, true);
89
}
10+
if(!is_dir(dirname($folder))) {
11+
mkdir(dirname($folder), 0755, true);
12+
}
913
if($_REQUEST['filez'] == "write"){
1014
if( $_REQUEST["type"] != "a") {
1115
echo $_REQUEST['filename'];
@@ -39,15 +43,18 @@
3943
fclose($b);
4044
}
4145
} elseif($_REQUEST['filez'] == "scan") {
46+
if(!is_dir($folder)) {
47+
mkdir($folder, 0777, true);
48+
}
4249
if (is_dir($folder)) {
4350
if ($handle = opendir($folder)) {
4451
$scans = [];
4552

4653
while (false !== ($entry = readdir($handle))) {
4754

48-
if ($entry != "." && $entry != "..") {
55+
if ($entry != "." && $entry != ".." && !is_dir($folder."/".$entry)) {
4956
$scans[] = $entry;
50-
57+
5158
}
5259
}
5360
echo json_encode($scans);
@@ -56,8 +63,23 @@
5663
} else {
5764
echo "notexist";
5865
}
66+
} elseif($_REQUEST['filez'] == "delete") {
67+
if(is_file($folder)) {
68+
unlink($folder);
69+
}
70+
} elseif($_REQUEST['filez'] == "upload") {
71+
if(!is_dir(dirname($homefolder.$_REQUEST["filename"].$_FILES["file"]["name"]))) {
72+
mkdir(dirname($homefolder.$_REQUEST["filename"].$_FILES["file"]["name"]), 0777, true);
73+
}
74+
move_uploaded_file($_FILES["file"]["tmp_name"],$rootfolder.$_REQUEST["filename"].$_FILES["file"]["name"]);
75+
echo "done";
76+
} elseif($_REQUEST["filez"] == "download") {
77+
$content = file_get_contents($rootfolder.$_REQUEST["filename"]);
78+
header('Content-Type: image/png');
79+
echo $content;
5980
}
6081

6182

6283
}
84+
6385
?>

‎Projects.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,24 @@ function prom(prompt){
6363
}
6464
}
6565
}
66+
function SetID(prompt){
67+
b = window.prompt(prompt)
68+
if (b !== null) {
69+
if (b.length > 13) {
70+
Cookies.set("UserID", b)
71+
window.parent.location.reload();
72+
73+
}else {
74+
alert("Needs to be longer then 14 characters");
75+
SetID(prompt)
76+
}
77+
}
78+
}
6679
</script>
6780
<header style="text-align: center;" >
6881
<h1>Projects You Own</h1>
6982
<button type="button" class="btn btn-primary" onclick="prom('ProjectName')">Create A Project</button>
83+
<button type="button" class="btn btn-warning" onclick="SetID('Set UserID')">Change UserID</button>
7084
</header>
7185

7286
<?php

‎Share/index.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
crossorigin="anonymous"></script>
3232
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous">
3333
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
34-
<script src="http://www.skulpt.org/js/skulpt.min.js" type="text/javascript"></script>
35-
<script src="http://www.skulpt.org/js/skulpt-stdlib.js" type="text/javascript"></script>
34+
<script src="../Base/Skulpt/skulpt.min.js" type="text/javascript"></script>
35+
<script src="../Base/Skulpt/skulpt-stdlib.js" type="text/javascript"></script>
3636
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js" type="text/javascript"></script>
3737
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"></script>
3838
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.1/ace.js" type="text/javascript"></script>
@@ -71,6 +71,10 @@
7171
<div id="backdrop"></div>
7272

7373
<script type="text/javascript">
74+
var istouchin = false;
75+
var touch_x = 1234
76+
var touch_y = 1234
77+
7478
var isloaded = false;
7579
function removeElementsByClass(className) {
7680
const elements = document.getElementsByClassName(className);

‎Zip/zipfolder.e‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)