Refactor expected project layout a bit

Closes #12
medic · Jul 24, 2017 · 2204eab · 2204eab
1 parent d2289da
commit 2204eab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -49,10 +49,9 @@ This tool expects a project to be sctructured as follows:
 		resources/
 			icon-one.png
 			…
+		rules.nools.js
 		targets.json
-		tasks/
-			rules.nools.js
-			schedules.json
+		tasks.json
 		forms/
 			app/
 				my_project_form.xlsx

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medic-configurer-beta",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

diff --git a/src/fn/compile-app-settings.js b/src/fn/compile-app-settings.js
@@ -8,9 +8,9 @@ module.exports = (projectDir /*, couchUrl */) => {
       const files = {
         app_settings: fs.readJson(fromProject('app_settings.json')),
         contact_summary: readJs(fromProject('contact-summary.js')),
-        nools: readJs(fromProject('tasks/rules.nools.js')),
+        nools: readJs(fromProject('rules.nools.js')),
         targets: fs.readJson(fromProject('targets.json')),
-        tasks_schedules: fs.readJson(fromProject('tasks/schedules.json')),
+        tasks_schedules: fs.readJson(fromProject('tasks.json')),
       };
 
       const app_settings = files.app_settings;

diff --git a/src/fn/initialise-project-layout.js b/src/fn/initialise-project-layout.js
@@ -5,11 +5,9 @@ const LAYOUT = {
   'contact-summary.js': '',
   'resources.json': {},
   resources: {},
+  'rules.nools.js': '',
   'targets.json': {},
-  tasks: {
-    'rules.nools.js': '',
-    'schedules.json': {},
-  },
+  'tasks.json': {},
   forms: {
     app: {},
     contact: {},