lafrite/Sousmargot
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Compare commits

base: lafrite:e191a47be59bd88583d23b78fc5101d7ebfa892f
Branches Tags
lafrite:master
lafrite:split_front_back
lafrite:dev
lafrite:passleouinj
..
compare: lafrite:9e123a95428804aa6871ff77e79bfb6f2627a890
Branches Tags
lafrite:split_front_back
lafrite:dev
lafrite:passleouinj
lafrite:master

No commits in common. "e191a47be59bd88583d23b78fc5101d7ebfa892f" and "9e123a95428804aa6871ff77e79bfb6f2627a890" have entirely different histories.
e191a47be5 ... 9e123a9542

9 changed files with 121 additions and 224 deletions
Show Stats Expand all files Collapse all files

7
src/App.vue
View File

@ -1,8 +1,6 @@
<template> <template>
<Nav></Nav> <Nav></Nav>
<div class="content"> <router-view></router-view>
<router-view></router-view>
</div>
</template> </template>
<script> <script>
@ -16,5 +14,4 @@ export default {
} }
</script> </script>
<style> <style></style>
</style>

101
src/background.js
View File

@ -7,78 +7,77 @@ const isDevelopment = process.env.NODE_ENV !== 'production'
// Scheme must be registered before the app is ready // Scheme must be registered before the app is ready
protocol.registerSchemesAsPrivileged([ protocol.registerSchemesAsPrivileged([
{ scheme: 'app', privileges: { secure: true, standard: true } } { scheme: 'app', privileges: { secure: true, standard: true } }
]) ])
async function createWindow() { async function createWindow() {
// Create the browser window. // Create the browser window.
const win = new BrowserWindow({ const win = new BrowserWindow({
width: 800, width: 800,
height: 600, height: 600,
autoHideMenuBar: true, webPreferences: {
webPreferences: {
// Use pluginOptions.nodeIntegration, leave this alone // Use pluginOptions.nodeIntegration, leave this alone
// See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION, nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION,
contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION
}
})
if (process.env.WEBPACK_DEV_SERVER_URL) {
// Load the url of the dev server if in development mode
await win.loadURL(process.env.WEBPACK_DEV_SERVER_URL)
if (!process.env.IS_TEST) win.webContents.openDevTools()
} else {
createProtocol('app')
// Load the index.html when not in development
win.loadURL('app://./index.html')
} }
})
if (process.env.WEBPACK_DEV_SERVER_URL) {
// Load the url of the dev server if in development mode
await win.loadURL(process.env.WEBPACK_DEV_SERVER_URL)
if (!process.env.IS_TEST) win.webContents.openDevTools()
} else {
createProtocol('app')
// Load the index.html when not in development
win.loadURL('app://./index.html')
}
} }
// Quit when all windows are closed. // Quit when all windows are closed.
app.on('window-all-closed', () => { app.on('window-all-closed', () => {
// On macOS it is common for applications and their menu bar // On macOS it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q // to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') { if (process.platform !== 'darwin') {
app.quit() app.quit()
} }
}) })
app.on('activate', () => { app.on('activate', () => {
// On macOS it's common to re-create a window in the app when the // On macOS it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open. // dock icon is clicked and there are no other windows open.
if (BrowserWindow.getAllWindows().length === 0) createWindow() if (BrowserWindow.getAllWindows().length === 0) createWindow()
}) })
// This method will be called when Electron has finished // This method will be called when Electron has finished
// initialization and is ready to create browser windows. // initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs. // Some APIs can only be used after this event occurs.
app.on('ready', async () => { app.on('ready', async () => {
if (isDevelopment && !process.env.IS_TEST) { if (isDevelopment && !process.env.IS_TEST) {
// Install Vue Devtools // Install Vue Devtools
try { try {
//await installExtension(VUEJS_DEVTOOLS) //await installExtension(VUEJS_DEVTOOLS)
// vuedev tools for vue3 // vuedev tools for vue3
await installExtension('ljjemllljcmogpfapbkkighbhhppjdbg') await installExtension('ljjemllljcmogpfapbkkighbhhppjdbg')
} catch (e) { } catch (e) {
console.error('Vue Devtools failed to install:', e.toString()) console.error('Vue Devtools failed to install:', e.toString())
}
} }
createWindow() }
createWindow()
}) })
// Exit cleanly on request from parent process in development mode. // Exit cleanly on request from parent process in development mode.
if (isDevelopment) { if (isDevelopment) {
if (process.platform === 'win32') { if (process.platform === 'win32') {
process.on('message', (data) => { process.on('message', (data) => {
if (data === 'graceful-exit') { if (data === 'graceful-exit') {
app.quit() app.quit()
} }
}) })
} else { } else {
process.on('SIGTERM', () => { process.on('SIGTERM', () => {
app.quit() app.quit()
}) })
} }
} }

19
src/components/nav.vue
View File

@ -1,20 +1,11 @@
<template> <template>
<h1>Sous Margot</h1>
<!--
<nav> <nav>
<h1><router-link to="/"> Sous Margot </router-link></h1> <router-link to="/"> Home </router-link>
<div class="nav-link"> <router-link to="/config"> Config </router-link>
<router-link to="/edit">
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="user-edit" class="svg-inline--fa fa-user-edit fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" width='25px' height="25px">
<path fill="currentColor" d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h274.9c-2.4-6.8-3.4-14-2.6-21.3l6.8-60.9 1.2-11.1 7.9-7.9 77.3-77.3c-24.5-27.7-60-45.5-99.9-45.5zm45.3 145.3l-6.8 61c-1.1 10.2 7.5 18.8 17.6 17.6l60.9-6.8 137.9-137.9-71.7-71.7-137.9 137.8zM633 268.9L595.1 231c-9.3-9.3-24.5-9.3-33.8 0l-37.8 37.8-4.1 4.1 71.8 71.7 41.8-41.8c9.3-9.4 9.3-24.5 0-33.9z"></path>
</svg>
</router-link>
<router-link to="/config">
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="user-cog" class="svg-inline--fa fa-user-cog fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" width='25px' height="25px">
<path fill="black" d="M610.5 373.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 400.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm201.2 226.5c-2.3-1.2-4.6-2.6-6.8-3.9l-7.9 4.6c-6 3.4-12.8 5.3-19.6 5.3-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-5.5-17.7 1.9-36.4 17.9-45.7l7.9-4.6c-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-16-9.2-23.4-28-17.9-45.7.9-2.9 2.2-5.8 3.2-8.7-3.8-.3-7.5-1.2-11.4-1.2h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c10.1 0 19.5-3.2 27.2-8.5-1.2-3.8-2-7.7-2-11.8v-9.2z"></path>
</svg>
</router-link>
</div>
</nav> </nav>
-->
</template> </template>
<script> <script>

6
src/router.js
View File

@ -2,7 +2,6 @@ import { createRouter, createWebHistory } from 'vue-router'
import Home from "@/views/home.vue" import Home from "@/views/home.vue"
import Config from "@/views/config.vue" import Config from "@/views/config.vue"
import Edit from "@/views/edit.vue"
const routes = [ const routes = [
{ {
@ -10,11 +9,6 @@ const routes = [
name: 'home', name: 'home',
component: Home component: Home
}, },
{
path: '/edit',
name: 'edit',
component: Edit
},
{ {
path: '/config', path: '/config',
name: 'config', name: 'config',

6
src/store/config/index.js
View File

@ -136,13 +136,9 @@ const config = {
return state.descAll return state.descAll
}, },
descEditable (state) { descEditable (state) {
// All description of attributes for months that are editable // All description of attributes for months
return state.descAll.filter(d => d.type == 'editable') return state.descAll.filter(d => d.type == 'editable')
}, },
descComputed (state) {
// All description of attributes for months that are computed
return state.descAll.filter(d => d.type != 'editable')
},
descOf: (state) => (desc) => { descOf: (state) => (desc) => {
return state.descAll.filter(d => d.name == desc)[0] return state.descAll.filter(d => d.name == desc)[0]
}, },

120
src/style.css
View File

@ -1,68 +1,46 @@
body { body {
background-color: whitesmoke; background-color: whitesmoke;
margin: 0;
}
nav {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
padding: 0 20px;
color: black;
}
nav h1 {
font-size: 2em;
border-bottom: 1px solid #000;
}
nav a {
color: black;
text-decoration: none;
}
.content {
margin: 10px;
} }
button { button {
color: black; color: black;
padding: 4px; padding: 4px;
box-shadow: 1px 1px 2px gray; box-shadow: 1px 1px 2px gray;
text-align: center; text-align: center;
display: inline-block; display: inline-block;
border-radius: 5px; border-radius: 5px;
background-color: white; background-color: white;
margin-top: 5px; margin-top: 5px;
font-size: 0.8em; font-size: 0.8em;
width: auto; width: auto;
transition: all 0.2s ease-out; transition: all 0.2s ease-out;
} }
button:hover { button:hover {
background-color: black; background-color: black;
color: white; color: white;
transition: all 0.2s ease-out; transition: all 0.2s ease-out;
} }
.validate { .validate {
border: 2px solid green; border: 2px solid green;
color: green; color: green;
} }
.validate:hover { .validate:hover {
background-color: green; background-color: green;
color: white; color: white;
} }
.cancel { .cancel {
border: 2px solid red; border: 2px solid red;
color: red; color: red;
} }
.cancel:hover { .cancel:hover {
background-color: red; background-color: red;
color: white; color: white;
} }
.edit { .edit {
border: 2px solid orange; border: 2px solid orange;
color: orange; color: orange;
} }
.edit:hover { .edit:hover {
background-color: orange; background-color: orange;
@ -70,41 +48,41 @@ button:hover {
} }
.boxed { .boxed {
box-shadow: 2px 2px 5px gray; box-shadow: 2px 2px 5px gray;
border-left: 1rem solid black; border-left: 1rem solid black;
border-radius: 10px; border-radius: 10px;
background-color: white; background-color: white;
} }
.boxed-green { .boxed-green {
box-shadow: 2px 2px 5px gray; box-shadow: 2px 2px 5px gray;
border-left: 1rem solid green; border-left: 1rem solid green;
border-radius: 10px; border-radius: 10px;
background-color: white; background-color: white;
} }
.hightlights { .hightlights {
display: grid; display: grid;
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
grid-gap: 20px; grid-gap: 20px;
} }
.hightlight > ul { .hightlight > ul{
list-style-type: none; list-style-type: none;
display: flex; display: flex;
flex-flow: column wrap; flex-flow: column wrap;
padding-inline-start: 0; padding-inline-start: 0;
margin-block-start: 0; margin-block-start: 0;
margin-block-end: 0; margin-block-end: 0;
} }
.hightlight > ul > li { .hightlight > ul > li {
margin: 5px; margin: 5px;
flex-direction: column-reverse; flex-direction: column-reverse;
} }
.hightlight > ul :first-child { .hightlight > ul :first-child{
font-size: 2rem; font-size: 2rem;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
} }
.hightlight > ul :last-child { .hightlight > ul :last-child{
text-align: end; text-align: end;
} }

37
src/views/config.vue
View File

@ -1,40 +1,3 @@
<template> <template>
<h1>Config</h1> <h1>Config</h1>
<h2> Données </h2>
<h3>Données éditables</h3>
<ul>
<li v-for="param in descEditable" :key='param.name'>
{{ param }}
</li>
</ul>
<h3>Données calculées</h3>
<ul>
<li v-for="param in descComputed" :key='param.name'>
{{ param }}
</li>
</ul>
</template> </template>
<script>
import { mapGetters } from 'vuex'
export default {
name: 'config',
data () {
return {}
},
computed: {
...mapGetters('config', {
'descEditable': 'descEditable',
'descComputed': 'descComputed',
}),
},
methods: {
},
mounted () {
},
}
</script>

22
src/views/edit.vue
View File

@ -1,22 +0,0 @@
<template>
<h1>Edition</h1>
</template>
<script>
export default {
name: 'edit',
data () {
return {}
},
computed: {
},
methods: {
},
mounted () {
},
}
</script>

25
src/views/home.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<div id="content"> <div id="content">
<section id="months"> <section id="months">
<create-month /> <create-month/>
<months-list /> <months-list/>
</section> </section>
<section id="stats"> <section id="stats">
<ca-on-period /> <ca-on-period/>
<ca-repartition /> <ca-repartition/>
</section> </section>
</div> </div>
</template> </template>
<script> <script>
@ -43,15 +43,16 @@ export default {
<style scoped> <style scoped>
#content { #content {
display: grid; display: grid;
grid-template-columns: minmax(580px, 2fr) minmax(450px, 1fr); grid-template-columns: minmax(580px, 2fr) minmax(450px, 1fr);
grid-template-areas: "stats months"; grid-template-areas:
gap: 1em; "stats months";
gap: 1em;
} }
#stats { #stats {
grid-area: stats; grid-area: stats;
} }
#months { #months {
grid-area: months; grid-area: months;
} }
</style> </style>