fixed some stuff on devdex

ForwardFeed · Sep 23, 2024 · e525e7c · e525e7c
1 parent 050cdc8
commit e525e7c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/devDexServer/config_template.ts b/devDexServer/config_template.ts
@@ -5,8 +5,8 @@ const config: Config =  {
     hostname: "localhost",
     protocol: "http",
     projectName: "eliteredux", //care to put well that into the .gitignore
-    token: "You token",
-    version: "Latest",
+    token: "",
+    version: "2.1",
     remote:  {
         owner: "Elite-Redux",
         repo: "eliteredux-source",

diff --git a/devDexServer/index.ts b/devDexServer/index.ts
@@ -3,6 +3,6 @@ import { fetchChanges, initGitRepoIfDoesNotExist, setRemoteUrl } from "./src/git
 import { updateData } from "./src/nextdex_controls.js";
 
 initGitRepoIfDoesNotExist(function(){
-    setRemoteUrl(fetchChanges)
+    fetchChanges()
     startServer()
 })
diff --git a/devDexServer/src/git_control.ts b/devDexServer/src/git_control.ts
@@ -8,8 +8,9 @@ import file_list from "./file_list.js";
 
 const folderPath = path.join('./', config.projectName)
 
-export function setRemoteUrl(callback = ()=>{}){
-    const cmdSetRemote = `git remote set-url origin https://${config.token}@github.com/${config.remote.owner}/${config.remote.repo}`
+export function setRemoteUrl(callback: ()=> void){
+    const cmdSetRemote = `git remote set-url origin https://${config.token}@github.com/${config.remote.owner}/${config.remote.repo} &&\
+git config --global http.sslVerify false`
     console.log(`Running ${cmdSetRemote}`)
     exec(cmdSetRemote, {cwd: folderPath}, (err, stdout, stderr)=>{
         if (stdout) console.log('STDOUT: ', stdout)
@@ -29,7 +30,7 @@ export function initGitRepoIfDoesNotExist(callback: ()=> void){
         callback()
     } else {
         console.log(`Repository does not exist, initializing it`)
-        cloneRepository(callback)
+        cloneRepository((()=>{setRemoteUrl(callback)}))
     }
 
 
@@ -47,7 +48,7 @@ function cloneRepository(callback: ()=> void){
             console.error(`Failed when initing git in the subfolder \nerror:`, err)
             return
         }
-        setRemoteUrl(callback)
+        callback()
     }) 
 }
 

diff --git a/devDexServer/src/server.ts b/devDexServer/src/server.ts
@@ -13,7 +13,7 @@ export function startServer(){
     addRoutes(app)
     const staticPath = path.join(__dirname, '../../../static')
     console.log(`Preparing static files from ${staticPath} on /`)
-    app.use("/", express.static(staticPath))
+    app.use("/", express.static(staticPath, {etag: false}))
     console.log('Initialize listening')
     app.listen(config.port, ()=>{
         console.log(`Listening on port ${config.protocol}:/${config.hostname}:${config.port}/`)