Added better default files for foreground and background

Wappsto · May 3, 2022 · 8716c17 · 8716c17
1 parent c42c3ff
commit 8716c17
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 4 deletions.
diff --git a/examples/bare/background/main.js b/examples/bare/background/main.js
@@ -0,0 +1,5 @@
+const Wappsto = require('wappsto-wapp');
+
+Wappsto.startLogging();
+
+console.log('Background wapp started and stopped');
diff --git a/examples/bare/background/package.json b/examples/bare/background/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "wappsto-wapp": "*"
+    }
+}
diff --git a/examples/bare/foreground/index.html b/examples/bare/foreground/index.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script src="https://cdn.jsdelivr.net/npm/wappsto-wapp@latest/dist/wappsto-wapp.min.js"></script>
+    <script src="main.js"></script>
+    <title>Foreground Wapp</title>
+  </head>
+
+  <body>
+    <h1>Foreground Wapp</h1>
+
+    <script type="text/javascript">
+      start();
+    </script>
+  </body>
+</html>
diff --git a/examples/background/main.js → examples/simple/background/main.js b/examples/background/main.js → examples/simple/background/main.js
diff --git a/examples/background/package.json → examples/simple/background/package.json b/examples/background/package.json → examples/simple/background/package.json
diff --git a/examples/foreground/index.html → examples/simple/foreground/index.html b/examples/foreground/index.html → examples/simple/foreground/index.html
diff --git a/examples/foreground/main.js → examples/simple/foreground/main.js b/examples/foreground/main.js → examples/simple/foreground/main.js
diff --git a/lib/wapp.js b/lib/wapp.js
@@ -208,8 +208,16 @@ class Wapp {
     dirs.concat(this.wapp_folders_create).forEach((f) => {
       const path = folderMapping[f] || f;
       files.createFolders(`${path}/.`);
-      if (createExamples && exampleFiles[f]) {
-        const exPath = `${__dirname}/../examples/${f}`;
+
+      if (exampleFiles[f]) {
+        let exPath = `${__dirname}/../examples/`;
+        if (createExamples) {
+          exPath += 'simple';
+        } else {
+          exPath += 'bare';
+        }
+        exPath += `/${f}`;
+
         exampleFiles[f].forEach((file) => {
           fs.copyFileSync(`${exPath}/${file}`, `${path}/${file}`);
         });

diff --git a/test/wapp.test.js b/test/wapp.test.js
@@ -93,7 +93,8 @@ test('create new empty wapp', async (t) => {
   t.deepEqual(files.fileExists('manifest.json'), true);
   t.deepEqual(files.directoryExists('foreground'), true);
   t.deepEqual(files.directoryExists('background'), false);
-  t.deepEqual(files.fileExists('foreground/index.html'), false);
+  t.deepEqual(files.fileExists('foreground/index.html'), true);
+  t.deepEqual(files.fileExists('foreground/main.js'), true);
 
   const manifest = files.loadJsonFile('manifest.json');
   t.deepEqual(manifest.name, answer.name);
@@ -107,6 +108,11 @@ test('create new empty wapp', async (t) => {
 test('update empty files', async (t) => {
   const wapp = new Wapp();
 
+  if (files.directoryExists('foreground')) {
+    files.deleteFile('foreground/main.js');
+    files.deleteFile('foreground/index.html');
+  }
+
   const updatedFiles = await wapp.update();
   t.deepEqual(updatedFiles, []);
 });
@@ -418,7 +424,8 @@ test('create new custom wapp', async (t) => {
   t.deepEqual(files.directoryExists('customForeground'), true);
   t.deepEqual(files.directoryExists('customBackground'), false);
   t.deepEqual(files.directoryExists('background'), false);
-  t.deepEqual(files.fileExists('customForeground/index.html'), false);
+  t.deepEqual(files.fileExists('customForeground/index.html'), true);
+  t.deepEqual(files.fileExists('customForeground/main.js'), true);
 
   const manifest = files.loadJsonFile('manifest.json');
   t.deepEqual(manifest.name, answer.name);