diff --git a/package.json b/package.json index 0bae6b4..f9f5c5c 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "back": "node back", - "front": "parcel serve front/index.html", + "back": "node src/back", + "front": "parcel serve src/front/index.html", "lint": "eslint ." }, "keywords": [], diff --git a/script/update-network b/script/update-network index a8ea191..2e0f91b 100755 --- a/script/update-network +++ b/script/update-network @@ -1,6 +1,6 @@ #!/usr/bin/env node -const network = require('../back/data/network'); +const network = require('../src/tam/network'); const path = require('path'); const fs = require('fs'); @@ -10,7 +10,7 @@ const fs = require('fs'); const data = await network.fetch(lines); fs.writeFileSync( - path.join(__dirname, '../back/data/network.json'), + path.join(__dirname, '../src/tam/network.json'), JSON.stringify( data, (_, value) => diff --git a/back/.eslintrc.json b/src/back/.eslintrc.json similarity index 100% rename from back/.eslintrc.json rename to src/back/.eslintrc.json diff --git a/back/index.js b/src/back/index.js similarity index 80% rename from back/index.js rename to src/back/index.js index e87d476..0dbc908 100644 --- a/back/index.js +++ b/src/back/index.js @@ -1,7 +1,7 @@ const express = require('express'); -const util = require('./util'); -const realtime = require('./data/realtime'); +const util = require('../util'); +const realtime = require('../tam/realtime'); const app = express(); const port = 4321; diff --git a/front/.eslintrc.json b/src/front/.eslintrc.json similarity index 100% rename from front/.eslintrc.json rename to src/front/.eslintrc.json diff --git a/front/index.html b/src/front/index.html similarity index 100% rename from front/index.html rename to src/front/index.html diff --git a/front/index.js b/src/front/index.js similarity index 78% rename from front/index.js rename to src/front/index.js index fdff2fd..b9befd8 100644 --- a/front/index.js +++ b/src/front/index.js @@ -2,6 +2,6 @@ require('regenerator-runtime/runtime'); const {createMap} = require('./map'); -require('./data'); +require('../tam/simulation'); createMap(/* map = */ 'map'); diff --git a/front/map.js b/src/front/map.js similarity index 98% rename from front/map.js rename to src/front/map.js index 423e02c..1953999 100644 --- a/front/map.js +++ b/src/front/map.js @@ -21,7 +21,7 @@ const color = require('color'); const mapboxToken = `pk.eyJ1IjoibWF0dGVvZGVsYWJyZSIsImEiOiJja2NxaTUyMmUwcmFhMn\ h0NmFsdzQ3emxqIn0.cyxF0h36emIMTk3cc4VqUw`; -const network = require('../back/data/network.json'); +const network = require('../tam/network.json'); const makeDataSources = async () => { diff --git a/back/data/network.js b/src/tam/network.js similarity index 100% rename from back/data/network.js rename to src/tam/network.js diff --git a/back/data/network.json b/src/tam/network.json similarity index 100% rename from back/data/network.json rename to src/tam/network.json diff --git a/back/data/realtime.js b/src/tam/realtime.js similarity index 100% rename from back/data/realtime.js rename to src/tam/realtime.js diff --git a/front/data.js b/src/tam/simulation.js similarity index 98% rename from front/data.js rename to src/tam/simulation.js index eaabce6..c08e3fe 100644 --- a/front/data.js +++ b/src/tam/simulation.js @@ -1,5 +1,5 @@ const axios = require('axios'); -const network = require('../back/data/network.json'); +const network = require('./network.json'); const server = 'http://localhost:4321'; diff --git a/back/data/sources/osm.js b/src/tam/sources/osm.js similarity index 100% rename from back/data/sources/osm.js rename to src/tam/sources/osm.js diff --git a/back/data/sources/tam.js b/src/tam/sources/tam.js similarity index 100% rename from back/data/sources/tam.js rename to src/tam/sources/tam.js diff --git a/back/util.js b/src/util.js similarity index 100% rename from back/util.js rename to src/util.js