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

Compare commits

base: Max:e5c117bbdbcd04a3158f60dbfff6db009cc0ce73
Branches Tags
Max:dev
..
compare: Max:789a4e47d4ebfcd7280cc100ecda0cf7cf6ca45a
Branches Tags
Max:dev

2 Commits
e5c117bbdb ... 789a4e47d4

Author SHA1 Message Date
Max
789a4e47d4 Added metric tracking and some other little fixes 2022-12-20 17:42:38 +00:00
Max
952a1dd1b1 Tweaking node versions and project settings 
* Removed node sass lets hope it doesn't break anything
 2022-10-23 19:37:05 +00:00
11 changed files with 1264 additions and 554 deletions
Show Stats Expand all files Collapse all files

577
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
client/package.json
View File

@ -7,21 +7,21 @@
"build": "vue-cli-service build" "build": "vue-cli-service build"
}, },
"dependencies": { "dependencies": {
"axios": "^0.20.0", "axios": "^1.1.3",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"es6-promise": "^4.2.8", "es6-promise": "^4.2.8",
"fomantic-ui-css": "^2.8.7", "fomantic-ui-css": "^2.9.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-chartjs": "^5.0.1",
"vue-router": "^3.2.0", "vue-router": "^3.2.0",
"vuedraggable": "^2.24.3",
"vuex": "^3.4.0" "vuex": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-router": "^5.0.8",
"@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-plugin-vuex": "^5.0.8",
"@vue/cli-service": "~4.5.0", "@vue/cli-service": "^5.0.8",
"node-sass": "^4.12.0",
"sass-loader": "^8.0.2",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.11"
}, },
"browserslist": [ "browserslist": [

12
client/src/assets/semantic-helper.css
View File

@ -14,7 +14,17 @@
src: local('Roboto Bold'), local('Roboto-Bold'), url(./roboto-latin-bold.woff2) format('woff2'); src: local('Roboto Bold'), local('Roboto-Bold'), url(./roboto-latin-bold.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
} }
body {
margin: 0;
padding: 0;
overflow-x: hidden;
min-width: 320px;
background: #FFFFFF;
font-family: 'Roboto', system-ui, -apple-system, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 14px;
line-height: 1.4285em;
color: rgba(0, 0, 0, 0.87);
}
:root { :root {

12
client/src/components/GlobalSiteMenu.vue
View File

@ -316,12 +316,6 @@
</div> </div>
</div> </div>
<div class="menu-section">
<router-link class="menu-item menu-button" exact-active-class="active" to="/help">
<i class="question circle outline icon"></i>Help
</router-link>
</div>
<div class="menu-section" v-if="loggedIn"> <div class="menu-section" v-if="loggedIn">
<router-link class="menu-item menu-button" exact-active-class="active" to="/settings"> <router-link class="menu-item menu-button" exact-active-class="active" to="/settings">
<i class="cog icon"></i>Settings <i class="cog icon"></i>Settings
@ -334,6 +328,12 @@
</router-link> </router-link>
</div> </div>
<div class="menu-section">
<router-link class="menu-item menu-button" exact-active-class="active" to="/help">
<i class="question circle outline icon"></i>Help
</router-link>
</div>
<div class="menu-section" v-if="loggedIn"> <div class="menu-section" v-if="loggedIn">
<div class="menu-item menu-button" v-on:click="logout()"> <div class="menu-item menu-button" v-on:click="logout()">
<i class="log out icon"></i>Log Out <i class="log out icon"></i>Log Out

18
client/src/main.js
View File

@ -13,19 +13,19 @@ import router from './router'
// import 'fomantic-ui-css/semantic.css'; // import 'fomantic-ui-css/semantic.css';
//Required site and reset CSS //Required site and reset CSS
import 'fomantic-ui-css/components/reset.css' import 'fomantic-ui-css/components/reset.min.css'
import 'fomantic-ui-css/components/site.css' //modified to remove included LATO fonts import 'fomantic-ui-css/components/site.css' //modified to remove included LATO fonts
//Only include parts that are used //Only include parts that are used
import 'fomantic-ui-css/components/button.css' import 'fomantic-ui-css/components/button.min.css'
import 'fomantic-ui-css/components/container.css' import 'fomantic-ui-css/components/container.min.css'
import 'fomantic-ui-css/components/form.css' import 'fomantic-ui-css/components/form.min.css'
import 'fomantic-ui-css/components/grid.css' import 'fomantic-ui-css/components/grid.min.css'
import 'fomantic-ui-css/components/header.css' import 'fomantic-ui-css/components/header.min.css'
import 'fomantic-ui-css/components/icon.css' //Modified to remove brand icons import 'fomantic-ui-css/components/icon.css' //Modified to remove brand icons
import 'fomantic-ui-css/components/input.css' import 'fomantic-ui-css/components/input.min.css'
import 'fomantic-ui-css/components/segment.css' import 'fomantic-ui-css/components/segment.min.css'
import 'fomantic-ui-css/components/label.css' import 'fomantic-ui-css/components/label.min.css'
//Overwrite and site styles and themes and good stuff //Overwrite and site styles and themes and good stuff

1149
client/src/pages/CycletrackingPage.vue
View File

File diff suppressed because it is too large Load Diff

2
server/models/User.js
View File

@ -9,7 +9,7 @@ const speakeasy = require('speakeasy')
let User = module.exports = {} let User = module.exports = {}
const version = '3.5.0' const version = '3.6.2'
//Login a user, if that user does not exist create them //Login a user, if that user does not exist create them
//Issues login token //Issues login token

2
startDevServerAndClient.sh
View File

@ -8,4 +8,4 @@ screen -dmS "NoteClientScreen" bash -c "cd /home/mab/ss/client; npm run serve --
echo '::--:: Starting API server (/api), watching for file changes...' echo '::--:: Starting API server (/api), watching for file changes...'
cd /home/mab/ss/server cd /home/mab/ss/server
pm2 flush pm2 flush
pm2 start ecosystem.config.js pm2 start ecosystem.config.js

8
staticFiles/assets/logo.svg
View File

@ -11,9 +11,9 @@
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<g style="display:inline" transform="translate(0,-164.70832)" id="layer1"> <g style="display:inline" transform="translate(0,-164.70832)" id="layer1">
<path id="path3813-4" d="m 56.22733,165.36641 -55.56249926,15.875 8e-7,63.5 47.62499846,11.90625 v 27.78125 l -47.76066333,-13.9757 0.13566407,10.00695 55.56249926,15.875 v -47.625 l -47.6249985,-11.90625 -8e-7,-47.625 47.7606633,-13.94121 c 0.135664,-2.30629 -0.135664,-9.87129 -0.135664,-9.87129 z" style="fill:#0f7425;fill-opacity:1;stroke:none;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/> <path id="path3813-4" d="m 56.22733,165.36641 -55.56249926,15.875 8e-7,63.5 47.62499846,11.90625 v 27.78125 l -47.76066333,-13.9757 0.13566407,10.00695 55.56249926,15.875 v -47.625 l -47.6249985,-11.90625 -8e-7,-47.625 47.7606633,-13.94121 c 0.135664,-2.30629 -0.135664,-9.87129 -0.135664,-9.87129 z" style="fill:#0f7425;fill-opacity:1;stroke:none;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;shape-rendering:crispedges"/>
<path id="path4563" d="m 20.508581,220.92891 c 15.265814,-14.23899 27.809717,-7.68002 39.687499,3.96875 v -7.9375 C 51.75093,200.8366 37.512584,206.01499 20.508581,205.05391 Z" style="fill:#04cb03;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/> <path id="path4563" d="m 20.508581,220.92891 c 15.265814,-14.23899 27.809717,-7.68002 39.687499,3.96875 v -7.9375 C 51.75093,200.8366 37.512584,206.01499 20.508581,205.05391 Z" style="fill:#04cb03;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;shape-rendering:crispedges"/>
<path id="path4563-6" d="m 111.78985,220.92891 c -15.265834,-14.23899 -27.809737,-7.68002 -39.68752,3.96875 v -7.9375 c 8.445151,-16.12356 22.683497,-10.94517 39.68752,-11.90625 z" style="display:inline;fill:#04cb03;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/> <path id="path4563-6" d="m 111.78985,220.92891 c -15.265834,-14.23899 -27.809737,-7.68002 -39.68752,3.96875 v -7.9375 c 8.445151,-16.12356 22.683497,-10.94517 39.68752,-11.90625 z" style="display:inline;fill:#04cb03;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;shape-rendering:crispedges"/>
<path id="path3813-4-2" d="m 76.07108,165.36641 55.5625,15.875 v 63.5 l -47.625,11.90625 v 27.78125 l 47.76067,-13.9757 -0.13567,10.00695 -55.5625,15.875 v -47.625 l 47.625,-11.90626 V 189.17891 L 75.93542,175.2377 c -0.13567,-2.30629 0.13566,-9.87129 0.13566,-9.87129 z" style="display:inline;fill:#04cb03;fill-opacity:1;stroke:none;stroke-width:0.52916676;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/> <path id="path3813-4-2" d="m 76.07108,165.36641 55.5625,15.875 v 63.5 l -47.625,11.90625 v 27.78125 l 47.76067,-13.9757 -0.13567,10.00695 -55.5625,15.875 v -47.625 l 47.625,-11.90626 V 189.17891 L 75.93542,175.2377 c -0.13567,-2.30629 0.13566,-9.87129 0.13566,-9.87129 z" style="display:inline;fill:#04cb03;fill-opacity:1;stroke:none;stroke-width:0.52916676;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;shape-rendering:crispedges"/>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

2
syncDown.sh
View File

@ -12,4 +12,4 @@
# z - Compress for speed # z - Compress for speed
# h - Human Readable file sizes # h - Human Readable file sizes
rsync -e 'ssh' --exclude-from=dontSync.txt -havzC --update mab@marvin.local:/home/mab/pi/ . rsync -e 'ssh' --exclude-from=dontSync.txt -havzC --update mab@marvin.local:/home/mab/ss/ .

20
updatedomain.sh Executable file
View File

@ -0,0 +1,20 @@
#!/bin/sh
# Send updated dynamic IP address to Namecheap, in order to update subdomains.
# This uses curl (separate pkg) to send the change; Namecheap automatically detects source IP if the ip field (like domain, password) ..
# is not specified.
# info helper
info() { printf "\n%s %s\n\n" "$( date )" "$*" >&2; }
info "Starting IP update for subdomains"
PASSWORD="12a35d53c2c54d6281265e3e086e541b"
HOST="maxg.cc"
SUBDOMAIN="x.maxg.cc"
#echo "https://dynamicdns.park-your-domain.com/update?host=$SUBDOMAIN&domain=$HOST&password=$PASSWORD"
curl "https://dynamicdns.park-your-domain.com/update?host=$SUBDOMAIN&domain=$HOST&password=$PASSWORD"
info "IP update done"