Skip to content

resync to main #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hoxolotl merged 16 commits into from
Nov 22, 2024
Merged

resync to main #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9ca2f76
add svg headers
ylebre Sep 20, 2024
e9138e2
remove unused files
ylebre Oct 16, 2024
d60911e
update to latest version
ylebre Oct 16, 2024
5a93d9b
update to latest version
ylebre Oct 16, 2024
a809f67
update simplyedit to latest version
ylebre Oct 16, 2024
fc344e7
Merge pull request #17 from SimplyEdit/tripleBinding
ylebre Oct 16, 2024
3dd313e
update simplycode
ylebre Oct 16, 2024
a307707
update simplycode
ylebre Oct 17, 2024
d6e1090
remove unused files
ylebre Oct 17, 2024
cc8d33d
only do squirrel build on windows for now
ylebre Oct 17, 2024
48f4b5d
make all dmg-things optional (for mac builds)
ylebre Oct 17, 2024
0275ff6
add static codemirror, to be removed later
ylebre Oct 17, 2024
8343282
fix postinstall to grab the correct files and place them where they b…
ylebre Oct 17, 2024
c7d59ff
fix slashes - make sure componentDirectory never starts with a slash
ylebre Oct 17, 2024
d2b0a78
update simplycode
ylebre Nov 8, 2024
4d51135
update simplyedit
ylebre Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion forge.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
makers: [
{
name: '@electron-forge/maker-squirrel',
platforms: ['linux', 'windows'],
platforms: ['windows'],
config: {
bin: 'simplycode',
}
Expand Down
24 changes: 17 additions & 7 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ function readRecursive(componentPath) {
componentPath = componentPath.substring(0, (componentPath.length - 1))
}
const pathicles = componentPath.split('\/');
if (pathicles[0] == ''){
pathicles.shift()
}
const componentName = pathicles.pop();
const componentDirectory = pathicles.join('/');

Expand Down Expand Up @@ -222,8 +225,10 @@ app.whenReady().then(() => {

let pathicles = componentPath.split('\/');
let componentName = pathicles.pop();
if (pathicles[0] == ''){
pathicles.shift()
}
let componentDirectory = pathicles.join('/');
pathicles.shift();

if(pathicles[0] === "api") {
pathicles.shift();
Expand Down Expand Up @@ -290,12 +295,12 @@ app.whenReady().then(() => {
// headers: { 'content-type': 'text/html' }
})
} else {
var target = __dirname + '/simplycode' + componentDirectory + '\/' + componentName;
var target = __dirname + '/simplycode/' + componentDirectory + '\/' + componentName;
if(fs.existsSync(target)) {
if (fs.lstatSync(target).isDirectory()) {
// Do the recursive read thing;
} else {
const filestuff = fs.readFileSync(__dirname + '/simplycode' + componentDirectory + '\/' + componentName)
const filestuff = fs.readFileSync(__dirname + '/simplycode/' + componentDirectory + '\/' + componentName)
return new Response(filestuff, {
// headers: { 'content-type': 'text/html' }
})
Expand Down Expand Up @@ -323,7 +328,6 @@ app.whenReady().then(() => {
if (pathicles[0] == ''){
pathicles.shift()
}

let componentDirectory = pathicles.join('/');

switch (request.method){
Expand Down Expand Up @@ -361,20 +365,26 @@ app.whenReady().then(() => {

} else {
var target = dataDir + componentDirectory + '\/' + componentName;
let headers = {};
if (componentName.match(/\.svg$/)) {
headers = {
'content-type' : 'image/svg+xml'
}
}
if(fs.existsSync(target)) {
const filestuff = fs.readFileSync(target)
return new Response(filestuff, {
// headers: { 'content-type': 'text/html' }
headers: headers
})
} else {
if (
(componentPath.indexOf("/js/simply") === 0) ||
(componentPath.indexOf("/simply") === 0) ||
(componentPath.indexOf("/hope") === 0)
) {
const filestuff = fs.readFileSync(__dirname + '/simplycode' + componentDirectory + '\/' + componentName)
const filestuff = fs.readFileSync(__dirname + '/simplycode/' + componentDirectory + '\/' + componentName)
return new Response(filestuff, {
// headers: { 'content-type': 'text/html' }
headers: headers
})
}
return new Response("Not found", {"status" : 404})
Expand Down
Loading