@@ -82,6 +82,74 @@ export default {
// - Gets new session tokens from server and uses them in app
beforeCreate: function(){
+ const root = 'https://www.solidscribe.com'
+ // const root = 'https://192.168.1.164'
+ const manifest = {
+ "theme_color":"#000",
+ "background_color": "#000",
+ "description": "Take Notes",
+ "display_override": ["fullscreen", "minimal-ui"],
+ "display": "standalone",
+ "icons": [
+ {
+ "src": root+"/api/static/assets/logo.png",
+ "sizes": "495x495",
+ "type": "image/png",
+ "purpose": "any"
+ },
+ {
+ "src": root+"/api/static/assets/maskable_icon.png",
+ "sizes": "826x826",
+ "type": "image/png",
+ "purpose": "maskable"
+ }
+ ],
+ "screenshots" : [
+ {
+ "src": root+"/api/static/assets/lightmode.png",
+ "sizes": "1000x1080",
+ "type": "image/png"
+ },
+ {
+ "src": root+"/api/static/assets/darkmode.png",
+ "sizes": "1000x1081",
+ "type": "image/png"
+ }
+ ],
+ "shortcuts" : [
+ {
+ "name": "Files & Links",
+ "url": " /attachments",
+ "description": "All Note files and links",
+ "icons": [{
+ "src": root+"/api/static/assets/icon1.png",
+ "sizes": "96x96",
+ "type": "image/png"
+ }]
+ },
+ {
+ "name": "Metric Track",
+ "url": "/metrictrack",
+ "description": "Metric Tracking",
+ "icons": [{
+ "src": root+"/api/static/assets/icon2.png",
+ "sizes": "96x96",
+ "type": "image/png"
+ }]
+ }
+ ],
+ "name": "Solid Scribe",
+ "short_name": "Solid Scribe",
+ "author": "Max",
+ "scope": root,
+ "start_url": window.location.href
+ }
+
+ const link = document.createElement('link')
+ link.rel = 'manifest'
+ link.href = `data:application/json;base64,${btoa(JSON.stringify(manifest))}`
+ document.head.appendChild(link)
+
//Before all requests going out
axios.interceptors.request.use(
(config) => {
@@ -173,15 +241,15 @@ export default {
mounted: function(){
const isDev = process.env['NODE_ENV'] == 'development'
- if(window.location.hostname.toLowerCase().replace('www.','') != "solidscribe.com" && !isDev){
- this.showFakeSite = true
- setInterval(() => {
- this.redirectSeconds--
- if(this.redirectSeconds == 0){
- window.location.href = 'https://www.solidscribe.com'
- }
- }, 1000)
- }
+ // if(window.location.hostname.toLowerCase().replace('www.','') != "solidscribe.com" && !isDev){
+ // this.showFakeSite = true
+ // setInterval(() => {
+ // this.redirectSeconds--
+ // if(this.redirectSeconds == 0){
+ // window.location.href = 'https://www.solidscribe.com'
+ // }
+ // }, 1000)
+ // }
//Update totals for entire app on event
this.$io.on('update_counts', () => {
diff --git a/client/src/components/NoteInputPanel.vue b/client/src/components/NoteInputPanel.vue
index bd635b3..1cb9210 100644
--- a/client/src/components/NoteInputPanel.vue
+++ b/client/src/components/NoteInputPanel.vue
@@ -1068,6 +1068,10 @@
},
loadNoteNextFromServer(){
+ if(this.statusText != 'saved'){
+ return
+ }
+
clearTimeout(this.reloadNoteDebounce)
this.reloadNoteDebounce = setTimeout(() => {
@@ -1075,13 +1079,27 @@
// this.setText('')
//Focus Regained on Note, check for update
+ console.log('Ajax Call to /api/note/get')
axios.post('/api/note/get', { 'noteId': this.noteid })
.then(response => {
- this.setupLoadedNoteData(response)
+ // Skip note update if it didn't change.
+ const newNoteHash = this.hashString( response.data.text )
+ if(newNoteHash == this.lastNoteHash){
+ console.log('Skipping any changes. Notes match')
+ return
+ }
- //Manually set squire text to show
- this.setText(this.noteText)
+ this.setupLoadedNoteData(response)
+
+ //Manually set squire text
+ const editorElement = document.getElementById('squire-id')
+ editorElement.innerHTML = response.data.text
+
+ this.$nextTick(() => {
+ this.restoreCaretPosition()
+ .catch(e => console.log(e) )
+ })
})
@@ -1098,6 +1116,7 @@
//If user leaves page then returns to page, reload the first batch
if(checkForUpdateTimeout){
+ console.log('Focused then unfocused for greater than 3 seconds. Checking with server.')
this.loadNoteNextFromServer()
this.lastInteractionTimestamp = now
}
@@ -1185,10 +1204,11 @@
this.diffsApplied = diffSinceLastUpdate.length
// console.log('Got Diffs Total -> ', diffSinceLastUpdate)
}
- // console.log(diffSinceLastUpdate)
+ console.log(diffSinceLastUpdate)
this.patchText(diffSinceLastUpdate)
.then(() => {
this.restoreCaretPosition()
+ .catch(e => console.log(e) )
})
})
@@ -1197,11 +1217,16 @@
this.patchText([incomingDiff])
.then(() => {
this.restoreCaretPosition()
+ .catch(e => console.log(e) )
})
})
this.$io.on('new_note_text_saved', ({noteId, hash}) => {
+ if(this.statusText != 'saved'){
+ return
+ }
+
const sameIdCheck = (this.idleNote && this.noteid == noteId)
const differentHashCheck = (hash != this.lastNoteHash)
@@ -1235,6 +1260,8 @@
this.lastRange = this.generateSelector(element)
this.startOffset = parseInt(event.range.startOffset) || 0
+ console.log('Save Range ', [element, this.lastRange, this.startOffset])
+
return
},
restoreCaretPosition(){
diff --git a/client/src/mixins/SquireButtonFunctions.js b/client/src/mixins/SquireButtonFunctions.js
index 0bb34bc..d3b81b4 100644
--- a/client/src/mixins/SquireButtonFunctions.js
+++ b/client/src/mixins/SquireButtonFunctions.js
@@ -377,13 +377,13 @@ const SquireButtonFunctions = {
// this.diffNoteText = this.editor._getHTML()
//Make sure all list items have draggable property
- let container = document.getElementById('squire-id')
- let listItems = container.getElementsByTagName('li')
- for(let itemIndex in listItems){
- // console.log(listItems[itemIndex])
- // listItems[itemIndex].setAttribute('draggable','true')
- }
- // console.log(listItems)
+ // let container = document.getElementById('squire-id')
+ // let listItems = container.getElementsByTagName('li')
+ // for(let itemIndex in listItems){
+ // // console.log(listItems[itemIndex])
+ // // listItems[itemIndex].setAttribute('draggable','true')
+ // }
+ // // console.log(listItems)
},
getText(){
diff --git a/client/src/pages/CycletrackingPage.vue b/client/src/pages/CycletrackingPage.vue
new file mode 100644
index 0000000..d0d1949
--- /dev/null
+++ b/client/src/pages/CycletrackingPage.vue
@@ -0,0 +1,297 @@
+
+
+
+
+
+
Cycle Tracking Beta
+
+
+
+
+
+
+
{{calendar.monthName}}, {{calendar.year}}
+
+ {{ day }}
+
+
+ {{ day }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/src/pages/HomePage.vue b/client/src/pages/HomePage.vue
index 30847eb..8fff6ab 100644
--- a/client/src/pages/HomePage.vue
+++ b/client/src/pages/HomePage.vue
@@ -562,10 +562,10 @@ export default {
},
beforeCreate(){
//Force HTTPS on prod, always. Dev doesn't have certs
- const isDev = process.env['NODE_ENV'] == 'development'
- if (!isDev && location.protocol != 'https:'){
- window.location.replace('https://www.solidscribe.com')
- }
+ // const isDev = process.env['NODE_ENV'] == 'development'
+ // if (!isDev && location.protocol != 'https:'){
+ // window.location.replace('https://www.solidscribe.com')
+ // }
},
beforeMount(){
diff --git a/client/vue.config.js b/client/vue.config.js
new file mode 100644
index 0000000..1e357ff
--- /dev/null
+++ b/client/vue.config.js
@@ -0,0 +1,23 @@
+const fs = require("fs");
+
+module.exports = {
+ pwa: {
+ name: "SolidScribe",
+ iconPaths: {
+ favicon32: null,
+ favicon16: null,
+ appleTouchIcon: null,
+ maskIcon: null,
+ msTileImage: null,
+ },
+ },
+ // devServer: {
+ // disableHostCheck: true,
+ // proxy: "http://localhost:8081",
+ // public: "blarvin.local",
+ // https: {
+ // key: fs.readFileSync("./certs/192.168.1.164+4-key.pem"),
+ // cert: fs.readFileSync("./certs/192.168.1.164+4.pem"),
+ // },
+ // },
+};
diff --git a/configs/dev nginx sites available default.cfg b/configs/dev nginx sites available default.cfg
new file mode 100644
index 0000000..15e1ee0
--- /dev/null
+++ b/configs/dev nginx sites available default.cfg
@@ -0,0 +1,97 @@
+#
+# Working dev server config
+#
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name 192.168.1.164;
+ return 301 https://$host$request_uri;
+}
+
+
+server {
+
+ listen 443 ssl;
+
+ ssl_certificate /home/mab/ss/client/certs/nginx-selfsigned.crt;
+ ssl_certificate_key /home/mab/ss/client/certs/nginx-selfsigned.key;
+ ssl_dhparam /home/mab/ss/client/certs/dhparam.pem;
+
+ ssl_session_cache shared:SSL:1m;
+ ssl_session_timeout 5m;
+ ssl_protocols TLSV1.1 TLSV1.2 TLSV1.3;
+
+ ssl_ciphers HIGH:!aNULL:!MD5;
+ ssl_prefer_server_ciphers on;
+
+ access_log /var/log/nginx/httpslocalhost.access.log;
+ error_log /var/log/nginx/httpslocalhost.error.log;
+
+ client_max_body_size 20M;
+
+ location / {
+ proxy_pass https://127.0.0.1:8081;
+ proxy_set_header Host localhost;
+ proxy_set_header X-Forwarded-Host localhost;
+ proxy_set_header X-Forwarded-Server localhost;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $remote_addr;
+ proxy_redirect off;
+ proxy_connect_timeout 90s;
+ proxy_read_timeout 90s;
+ proxy_send_timeout 90s;
+ proxy_ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ }
+
+ location /sockjs-node {
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-NginX-Proxy true;
+
+ proxy_pass https://127.0.0.1:8081;
+ proxy_redirect off;
+ proxy_ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ }
+
+ location /api {
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-NginX-Proxy true;
+
+ proxy_pass http://127.0.0.1:3000;
+ proxy_redirect off;
+ proxy_ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ }
+
+ location /socket {
+ proxy_pass http://127.0.0.1:3001;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "Upgrade";
+ proxy_set_header Host $host;
+ }
+
+}
+
+
+
+# Prod settings to serve static index
+# location / {
+# autoindex on;
+# #try_files $uri $uri/ /index.html;
+# }
+
+# location / {
+# #autoindex on
+#
+# proxy_pass http://127.0.0.1:8444;
+# proxy_http_version 1.1;
+# proxy_set_header Upgrade $http_upgrade;
+# proxy_set_header Connection 'upgrade';
+# proxy_set_header Host $host;
+# proxy_cache_bypass $http_upgrade;
+# }
\ No newline at end of file
diff --git a/server/models/CycleTracking.js b/server/models/CycleTracking.js
new file mode 100644
index 0000000..8773699
--- /dev/null
+++ b/server/models/CycleTracking.js
@@ -0,0 +1,66 @@
+let db = require('@config/database')
+
+let Note = require('@models/Note')
+
+let CycleTracking = module.exports = {}
+
+
+CycleTracking.get = (userId, masterKey) => {
+ return new Promise((resolve, reject) => {
+
+ db.promise()
+ .query(`
+ SELECT note.id FROM note WHERE quick_note = 2 AND user_id = ? LIMIT 1`, [userId])
+ .then((rows, fields) => {
+
+ //Quick Note is set, return note object
+ if(rows[0][0] != undefined){
+
+ let noteId = rows[0][0].id
+ const note = Note.get(userId, noteId, masterKey)
+ .then(noteData => {
+ return resolve(noteData)
+ })
+
+ } else {
+ //Or create a new note
+ let finalId = null
+ return Note.create(userId, 'Cycle Tracking', '', masterKey)
+ .then(insertedId => {
+ finalId = insertedId
+ db.promise().query('UPDATE note SET quick_note = 2 WHERE id = ? AND user_id = ?',[insertedId, userId])
+ .then((rows, fields) => {
+
+ const note = Note.get(userId, finalId, masterKey)
+ .then(noteData => {
+ return resolve(noteData)
+ })
+
+ })
+ })
+
+ }
+
+
+ })
+ .catch(console.log)
+ })
+}
+
+CycleTracking.save = (userId, cycleData, masterKey) => {
+ return new Promise((resolve, reject) => {
+
+ let finalId = null
+
+ CycleTracking.get(userId, masterKey)
+ .then(noteObject => {
+
+ return Note.update(userId, noteObject.id, cycleData, noteObject.title, noteObject.color, noteObject.pinned, noteObject.archived, null, masterKey)
+
+ })
+ .then( saveResults => {
+ return resolve(saveResults)
+ })
+ })
+
+}
\ No newline at end of file
diff --git a/server/routes/cycletrackingController.js b/server/routes/cycletrackingController.js
new file mode 100644
index 0000000..1efb797
--- /dev/null
+++ b/server/routes/cycletrackingController.js
@@ -0,0 +1,41 @@
+//
+// /api/cycle-tracking
+//
+
+var express = require('express')
+var router = express.Router()
+
+let CycleTracking = require('@models/CycleTracking');
+
+let userId = null
+let masterKey = null
+
+// middleware that is specific to this router
+router.use(function setUserId (req, res, next) {
+
+ //Session key is required to continue
+ if(!req.headers.sessionId){
+ next('Unauthorized')
+ }
+
+ if(req.headers.userId){
+ userId = req.headers.userId
+ masterKey = req.headers.masterKey
+ next()
+ }
+})
+
+//Get quick note text
+router.post('/get', function (req, res) {
+ CycleTracking.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)
+ .then( data => res.send(data) )
+})
+
+
+module.exports = router
\ No newline at end of file
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..3667c08
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,39 @@
+with import
{ };
+
+let
+ pythonPackages = python311Packages;
+in pkgs.mkShell rec {
+ name = "Solid Scribe Env";
+
+ buildInputs = [
+ # node for server
+ nodejs
+ nodePackages.npm
+ pm2
+ ];
+
+ # Run this command, only after creating the virtual environment
+ postVenvCreation = ''
+ unset SOURCE_DATE_EPOCH
+ '';
+
+ postShellHook = ''
+
+ if [[ ! -f lockfile.running ]] ; then
+ echo "No Lock File, starting servers"
+ touch lockfile.running
+
+ # start service
+ # npm run start or whatever
+
+ fi
+
+ # kill everything when main screen is closed
+ function end {
+ echo "Exiting, Removing Lockfile"
+ rm -f lockfile.running
+ }
+ trap end EXIT
+ '';
+
+}
diff --git a/startDevServerAndClient.sh b/startDevServerAndClient.sh
index bb902de..e619fc9 100755
--- a/startDevServerAndClient.sh
+++ b/startDevServerAndClient.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
cd /home/mab/ss
echo '::--:: Starting dev server. cd client; npm run serve -> 192.168.1.164:8081'
diff --git a/staticFiles/.gitignore b/staticFiles/.gitignore
new file mode 100644
index 0000000..6ea6a2f
--- /dev/null
+++ b/staticFiles/.gitignore
@@ -0,0 +1,4 @@
+*
+*/
+!.gitignore
+!assets
diff --git a/staticFiles/assets/logo.png b/staticFiles/assets/logo.png
index 87d1f4b..0b55d79 100755
Binary files a/staticFiles/assets/logo.png and b/staticFiles/assets/logo.png differ
diff --git a/staticFiles/assets/manifest.json b/staticFiles/assets/manifest.json
index d9072b2..b9e16b0 100644
--- a/staticFiles/assets/manifest.json
+++ b/staticFiles/assets/manifest.json
@@ -19,6 +19,5 @@
],
"name": "Solid Scribe",
"short_name": "Solid Scribe",
- "start_url": "/#/notes",
"author":"Max"
}
\ No newline at end of file