Max/SolidScribe
1
0
Fork 0
Code Issues 24 Pull Requests Releases Wiki Activity

Project restructuring, fixing minor bugs related to vue CLI upgrade

Browse Source 
* Removed PWA kit from project, this removes a ton of dependencies
This commit is contained in:
Max
2022-10-23 19:14:31 +00:00
parent 2b76f74dee
commit 0c107a60bd
19 changed files with 195 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/index.js
View File

@@ -319,8 +319,8 @@ var quickNote = require('@routes/quicknoteController')
app.use('/api/quick-note', quickNote)
//cycle tracking endpoint
var cycleTracking = require('@routes/cycletrackingController')
app.use('/api/cycle-tracking', cycleTracking)
var metricTracking = require('@routes/metrictrackingController')
app.use('/api/metric-tracking', metricTracking)
//Output running status
app.listen(ports.express, () => {

10
server/models/CycleTracking.js → server/models/MetricTracking.js
View File

@@ -2,10 +2,10 @@ let db = require('@config/database')
let Note = require('@models/Note')
let CycleTracking = module.exports = {}
let MetricTracking = module.exports = {}
CycleTracking.get = (userId, masterKey) => {
MetricTracking.get = (userId, masterKey) => {
return new Promise((resolve, reject) => {
db.promise()
@@ -25,7 +25,7 @@ CycleTracking.get = (userId, masterKey) => {
} else {
//Or create a new note
let finalId = null
return Note.create(userId, 'Cycle Tracking', '', masterKey)
return Note.create(userId, 'Metric Tracking', '', masterKey)
.then(insertedId => {
finalId = insertedId
db.promise().query('UPDATE note SET quick_note = 2 WHERE id = ? AND user_id = ?',[insertedId, userId])
@@ -47,12 +47,12 @@ CycleTracking.get = (userId, masterKey) => {
})
}
CycleTracking.save = (userId, cycleData, masterKey) => {
MetricTracking.save = (userId, cycleData, masterKey) => {
return new Promise((resolve, reject) => {
let finalId = null
CycleTracking.get(userId, masterKey)
MetricTracking.get(userId, masterKey)
.then(noteObject => {
return Note.update(userId, noteObject.id, cycleData, noteObject.title, noteObject.color, noteObject.pinned, noteObject.archived, null, masterKey)

8
server/routes/cycletrackingController.js → server/routes/metrictrackingController.js
View File

@@ -1,11 +1,11 @@
//
// /api/cycle-tracking
// /api/metric-tracking
//
var express = require('express')
var router = express.Router()
let CycleTracking = require('@models/CycleTracking');
let MetricTracking = require('@models/MetricTracking');
let userId = null
let masterKey = null
@@ -27,13 +27,13 @@ router.use(function setUserId (req, res, next) {
//Get quick note text
router.post('/get', function (req, res) {
CycleTracking.get(userId, masterKey)
MetricTracking.get(userId, masterKey)
.then( data => res.send(data) )
})
//Push text to quick note
router.post('/save', function (req, res) {
CycleTracking.save(userId, req.body.cycleData, masterKey)
MetricTracking.save(userId, req.body.cycleData, masterKey)
.then( data => res.send(data) )
})