Project restructuring, fixing minor bugs related to vue CLI upgrade

* 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

View File

@@ -1,5 +1,5 @@
{
"name": "client",
"name": "solidscribe",
"version": "0.1.0",
"private": true,
"scripts": {
@@ -8,19 +8,21 @@
},
"dependencies": {
"axios": "^0.20.0",
"core-js": "^3.8.3",
"core-js": "^3.6.5",
"es6-promise": "^4.2.8",
"fomantic-ui-css": "^2.8.7",
"vue": "^2.6.14",
"vue-router": "^3.5.1",
"vuex": "^3.6.2"
"vue": "^2.6.11",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-plugin-vuex": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"vue-template-compiler": "^2.6.14"
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"node-sass": "^4.12.0",
"sass-loader": "^8.0.2",
"vue-template-compiler": "^2.6.11"
},
"browserslist": [
"> 1%",

View File

@@ -1,17 +1,69 @@
<!DOCTYPE html>
<html lang="">
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="icon" href="/api/static/assets/favicon.ico" type="image/ico"/>
<link rel="shortcut icon" href="/api/static/assets/favicon.ico" type="image/x-icon"/>
<meta name="theme-color" content="#000" />
<link rel="manifest" href="/api/static/assets/manifest.json">
<title>Solid Scribe - An easy, encrypted Note App</title>
<!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
</head>
<body>
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
<strong>We're sorry but Solid Scribe doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<div id="app">
<!-- placeholder data for scrapers with no JS -->
<style>
body {
background-color: #212221;
color: #aeaeae;
height: 100vh;
width: 100%;
}
.centered {
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
font-family: Arial, Helvetica, sans-serif;
}
.logo {
width: 200px;
height: auto;
}
.scrape-info {
opacity: 0;
}
</style>
<div class="centered">
<img class="logo" src="/api/static/assets/logo.svg" alt="Solid Scribe Logo - if you can read this your connection is really slow">
<h1>Solid Scribe</h1>
<h3>An easy, encrypted Note App</h3>
<h4>Loading...</h4>
</div>
<div class="scrape-info">
<h1>Solid Scribe</h1>
<h2>A note application that respects your privacy.</h2>
<p>Take notes with a clean editor that works on desktop or mobile.</p>
<p>Search notes, links and files to find what you need.</p>
<p>Accessable everywhere.</p>
<p>Categorize notes with tags.</p>
<p>Share data with fellow users.</p>
<p>Encrypt notes for additional security.</p>
<b>This site requires Javascipt to run.</b>
</div>
</div>
<!-- built files will be auto injected -->
</body>
</html>
</html>

View File

@@ -164,7 +164,7 @@ div.ui.basic.green.label {
border-color: var(--dark_border_color) !important;
}
/*Overwrites for modifiable theme color */
i.green.icon.icon.icon.icon {
i.green.icon.icon.icon.icon, i.green.icon.icon.icon.icon.icon {
color: var(--main-accent);
}
.button {

View File

@@ -329,8 +329,8 @@
</div>
<div class="menu-section" v-if="loggedIn">
<router-link class="menu-item menu-button" exact-active-class="active" to="/cycletrack">
<i class="calendar check outlin icon"></i>Cycle Track
<router-link class="menu-item menu-button" exact-active-class="active" to="/metrictrack">
<i class="calendar check outlin icon"></i>Metric Track
</router-link>
</div>

View File

@@ -121,9 +121,6 @@
<div class="ui centered dividing header">
<br>
Metric Tracking Beta
<span v-on:click="deleteData()">
<i class="clickable trash icon"></i>
</span>
</div>
<!-- data input -->
@@ -136,16 +133,16 @@
</div>
<div class="ui four wide right aligned middle aligned column">
<span v-if="saving == 0">
<i class="heart icon"></i>
<i class=" icon"></i>
</span>
<span v-if="saving == 1">
<i class="asterisk icon"></i>
Modified <i class="asterisk icon"></i>
</span>
<span v-if="saving == 2">
<i class="sync loading icon"></i>
Saving <i class="sync loading icon"></i>
</span>
<span v-if="saving == 3">
<i class="green circle check icon"></i>
Saved <i class="green circle check icon"></i>
</span>
</div>
</div>
@@ -309,10 +306,10 @@
</div>
<div class="ui basic segment">
<div class="ui clickable" v-on:click="toggleFolded('key')">
<a class="ui clickable" v-on:click="toggleFolded('key')">
<i class="tiny circular blue clickable plus icon"></i>
Calendar Explanation
</div>
</a>
<div class="ui segment key-holder" v-if="folded.includes('key')">
<div class="day">
<span class="number">1</span>
@@ -410,6 +407,12 @@
<div class="ui segment">
If you do get pregnant, your body needs the lining thats why your period stops during pregnancy. Your period comes back when youre not pregnant anymore.
</div>
<div class="ui segment">
Delete all data. Can not be undone.
<span class="ui tiny compact icon button" v-on:click="deleteData()">
<i class="clickable trash icon"></i>
</span>
</div>
</div>
</div>
@@ -703,7 +706,7 @@
},
fetchCycleData(){
axios.post('/api/cycle-tracking/get')
axios.post('/api/metric-tracking/get')
.then(({ data }) => {
if(data.hasOwnProperty("text")){
@@ -744,7 +747,7 @@
// 0 blank, 1 modified, 2 saving, 3 saved
this.saving = 2 // Working
this.totalEntries = Object.keys(this.cycleData).length
axios.post('/api/cycle-tracking/save', { cycleData:appData })
axios.post('/api/metric-tracking/save', { cycleData:appData })
.then(response => {
// { this.$bus.$emit('notification', 'Data Saved') }
this.saving = 3 //Saved
@@ -755,7 +758,7 @@
.catch(error => { this.$bus.$emit('notification', error) })
},
deleteData(){
axios.post('/api/cycle-tracking/save', { cycleData:'' })
axios.post('/api/metric-tracking/save', { cycleData:'' })
.then(response => {
{ this.$bus.$emit('notification', 'Data Deleted') }
this.fetchCycleData()

View File

@@ -117,9 +117,9 @@ export default new Router({
},
// Cycle Tracking
{
path: '/cycletrack',
name: 'Cycle Tracking',
meta: {title:'Cycle Tracking'},
path: '/metrictrack',
name: 'Metric Tracking',
meta: {title:'Metric Tracking'},
component: () => import(/* webpackChunkName: "CycletrackingPage" */ '@/pages/CycletrackingPage')
},
]

View File

@@ -1,4 +0,0 @@
const { defineConfig } = require('@vue/cli-service')
module.exports = defineConfig({
transpileDependencies: true
})