From e0cf8a82362d04b72a352ce22ea3292f9caaac85 Mon Sep 17 00:00:00 2001 From: Ryan Pandya Date: Sun, 7 May 2023 14:20:34 -0700 Subject: [PATCH] Switching to office. --- lifetracker-server/package-lock.json | 154 ++++++++++++++++++++++++++- lifetracker-server/package.json | 4 +- lifetracker-server/src/app.js | 42 ++++++-- lifetracker-server/src/import.js | 39 ++++++- 4 files changed, 226 insertions(+), 13 deletions(-) diff --git a/lifetracker-server/package-lock.json b/lifetracker-server/package-lock.json index 9ccafc7..723a206 100644 --- a/lifetracker-server/package-lock.json +++ b/lifetracker-server/package-lock.json @@ -14,7 +14,9 @@ "csv": "^6.2.12", "express": "^4.18.2", "morgan": "^1.10.0", - "nodemon": "^2.0.22" + "node-appwrite": "^9.0.0", + "nodemon": "^2.0.22", + "strftime": "^0.10.1" } }, "node_modules/abbrev": { @@ -51,6 +53,21 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -169,6 +186,17 @@ "fsevents": "~2.3.2" } }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -255,6 +283,14 @@ "ms": "2.0.0" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -404,6 +440,38 @@ "node": ">= 0.8" } }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -675,6 +743,15 @@ "node": ">= 0.6" } }, + "node_modules/node-appwrite": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/node-appwrite/-/node-appwrite-9.0.0.tgz", + "integrity": "sha512-iTcHbuaJfr6bP/HFkRVV+FcaumKkbINqZyypQdl+tYxv6Dx0bkB/YKUXGYfTkgP18TLPWQQB++OGQhi98dlo2w==", + "dependencies": { + "axios": "^1.3.6", + "form-data": "^4.0.0" + } + }, "node_modules/nodemon": { "version": "2.0.22", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", @@ -808,6 +885,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", @@ -984,6 +1066,14 @@ "resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-3.2.6.tgz", "integrity": "sha512-/pyOvaCQFqYTmrFhmMbnAEVo3SsTx1H39eUVPOtYeAgbEUc+rDo7GoP8LbHJgU83mKtzJe/7Nq/ipaAnUOHgJQ==" }, + "node_modules/strftime": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/strftime/-/strftime-0.10.1.tgz", + "integrity": "sha512-nVvH6JG8KlXFPC0f8lojLgEsPA18lRpLZ+RrJh/NkQV2tqOgZfbas8gcU8SFgnnqR3rWzZPYu6N2A3xzs/8rQg==", + "engines": { + "node": ">=0.2.0" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -1096,6 +1186,21 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "axios": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1186,6 +1291,14 @@ "readdirp": "~3.6.0" } }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1257,6 +1370,11 @@ "ms": "2.0.0" } }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1379,6 +1497,21 @@ "unpipe": "~1.0.0" } }, + "follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + }, + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -1570,6 +1703,15 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, + "node-appwrite": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/node-appwrite/-/node-appwrite-9.0.0.tgz", + "integrity": "sha512-iTcHbuaJfr6bP/HFkRVV+FcaumKkbINqZyypQdl+tYxv6Dx0bkB/YKUXGYfTkgP18TLPWQQB++OGQhi98dlo2w==", + "requires": { + "axios": "^1.3.6", + "form-data": "^4.0.0" + } + }, "nodemon": { "version": "2.0.22", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", @@ -1662,6 +1804,11 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", @@ -1792,6 +1939,11 @@ "resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-3.2.6.tgz", "integrity": "sha512-/pyOvaCQFqYTmrFhmMbnAEVo3SsTx1H39eUVPOtYeAgbEUc+rDo7GoP8LbHJgU83mKtzJe/7Nq/ipaAnUOHgJQ==" }, + "strftime": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/strftime/-/strftime-0.10.1.tgz", + "integrity": "sha512-nVvH6JG8KlXFPC0f8lojLgEsPA18lRpLZ+RrJh/NkQV2tqOgZfbas8gcU8SFgnnqR3rWzZPYu6N2A3xzs/8rQg==" + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", diff --git a/lifetracker-server/package.json b/lifetracker-server/package.json index a5cc8a5..24fd609 100644 --- a/lifetracker-server/package.json +++ b/lifetracker-server/package.json @@ -15,6 +15,8 @@ "csv": "^6.2.12", "express": "^4.18.2", "morgan": "^1.10.0", - "nodemon": "^2.0.22" + "node-appwrite": "^9.0.0", + "nodemon": "^2.0.22", + "strftime": "^0.10.1" } } diff --git a/lifetracker-server/src/app.js b/lifetracker-server/src/app.js index e9ca5c9..893da8f 100644 --- a/lifetracker-server/src/app.js +++ b/lifetracker-server/src/app.js @@ -2,19 +2,43 @@ const express = require('express') const bodyParser = require('body-parser') const cors = require('cors') const morgan = require('morgan') - -const { entries } = require('./import.js') - +const sdk = require('node-appwrite') +const client = new sdk.Client() +const databases = new sdk.Databases(client) +const strftime = require('strftime') +client + .setEndpoint('http://ryanpandya.com:8080/v1') // Your API Endpoint + .setProject('lifetracker') // Your project ID + .setKey('015d60dd9dc8fb1b34b9f66459a27b3aded55c93a5b551d78be7a48b94f26e1781020a65407116265e3d93fac9d99e717b676c158bdda351aae22877da8f8b14af4d310d8fe3d4e3005adcc0f228b95f7efae308e638610bd97f9d44e8c322c07f38f9ba17a264efb65d3601c5302c2a5072cd294e69d9baacd19ba9ec9a117f') // Your secret API key + ; + const app = express() app.use(morgan('combined')) app.use(bodyParser.json()) app.use(cors()) - app.get('/database', (req, res) => { - res.send( - entries - // [["05/04", "THU", 0, 0, 0, 98, 0, 0, 0, 5, 5, 5, 5, 5, 67, 67, 101, 5, 63, 58, 78, 58, 58, 58, 3, 3, 7]] - ) - }) + const promise = databases.listDocuments('lifetracker-db', 'ryan'); + promise.then(function ({ documents } = response) { + + + res.send(documents) + }, function (error) { + console.log(error); + }); +}) + +app.get('/entry/:date', (req, res) => { + var date = strftime("%x", new Date(req.params['date']) ); + console.log("Fetching entry for " + date); + + const promise = databases.listDocuments('lifetracker-db', 'ryan'); + promise.then(function ({ documents } = response) { + + entries = documents.map(e => e.Date) + res.send(entries) + }, function (error) { + console.log(error); + }); +}) app.listen(process.env.PORT || 8081) diff --git a/lifetracker-server/src/import.js b/lifetracker-server/src/import.js index d5e22e8..bbd8838 100644 --- a/lifetracker-server/src/import.js +++ b/lifetracker-server/src/import.js @@ -1,10 +1,45 @@ -var fs = require('fs'); +const fs = require('fs'); +const strftime = require('strftime'); + +const sdk = require('node-appwrite'); + +// Init SDK +const client = new sdk.Client(); + +const databases = new sdk.Databases(client); + var data = fs.readFileSync('data.csv') .toString() // convert Buffer to string .split('\n') // split string to lines .slice(1) // remove first line .map(e => e.trim()) // remove white spaces for each line - .map(e => e.split(',').map(e => e.trim())); // split each line to array + .map(e => { + var entry = e.split(','); // split each line to array + var date = strftime("%Y-%m-%d", new Date("2023/" + entry[0])); + var hours = entry.slice(2, 26).map(h => parseFloat(h)); + var mood = parseInt(entry[26]); + var comments = entry.slice(27).filter(x => x != "").join().replace(/^"/,"").replace(/"$/,'') + + var dbEntry = { + Date: date, + Hours: hours, + Mood: mood, + Comments: comments + }; + client + .setEndpoint('http://ryanpandya.com:8080/v1') // Your API Endpoint + .setProject('lifetracker') // Your project ID + .setKey('015d60dd9dc8fb1b34b9f66459a27b3aded55c93a5b551d78be7a48b94f26e1781020a65407116265e3d93fac9d99e717b676c158bdda351aae22877da8f8b14af4d310d8fe3d4e3005adcc0f228b95f7efae308e638610bd97f9d44e8c322c07f38f9ba17a264efb65d3601c5302c2a5072cd294e69d9baacd19ba9ec9a117f') // Your secret API key + + const promise = databases.createDocument('lifetracker-db', 'ryan', date, dbEntry); + + promise.then(function (response) { + console.log(response); + return (response); + }, function (error) { + console.log(error); + }); + }) exports.entries = data; \ No newline at end of file