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

2
client/src/assets/semantic-helper.css
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 {

4
client/src/components/GlobalSiteMenu.vue
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>

27
client/src/pages/CycletrackingPage.vue
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 — that’s why your period stops during pregnancy. Your period comes back when you’re 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()

6
client/src/router/index.js
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')
},
]