deblan/budget-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add favicon

Browse source
This commit is contained in:
Simon Vieille 2024-09-21 00:21:01 +02:00
commit 79fbc06d18
13 changed files with 131 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -23,7 +23,11 @@ front:
NODE_ENV=prod ./node_modules/.bin/webpack
.PHONY:
build: front rice
tpl:
TEMPL_EXPERIMENT=rawgo templ generate
.PHONY:
build: tpl front rice
CGO_ENABLED=$(CGO_ENABLED) \
GOARCH=$(GO_ARCH_AMD) \
GOOS=$(GO_OS_LINUX) \

4
bin/watch.sh
View file

@ -1,9 +1,11 @@
#!/bin/sh
export TEMPL_EXPERIMENT=rawgo
while true; do
rm -f cmd/server/rice-box.go
./node_modules/.bin/webpack
templ generate
make tpl
screen -S budget -d -m go run ./cmd/server
notify-send "Budget" "Ready!"
inotifywait -r . -e close_write

3
config.ini
View file

@ -5,6 +5,9 @@ address = "0.0.0.0"
[security]
secret = "e93865c991358ff7a14f9781fa33ba4f28c33bb8d1cf3490ce6fd68521513536"
[calc]
url = "https://deblan.cloud/index.php/apps/files/files/1402577?dir=%2FAdministratif%2FProjet+de+construction&openfile=true"
[log]
; level = "debug"
level = "warn"

6
config/config.go
View file

@ -23,11 +23,16 @@ type server struct {
Port int
}
type calc struct {
Url string
}
type Config struct {
Database database
Log logging
Security security
Server server
Calc calc
}
var config *Config
@ -52,4 +57,5 @@ func (c *Config) Load(file string) {
config.Security.Secret = cfg.Section("security").Key("secret").String()
config.Server.Address = cfg.Section("server").Key("address").String()
config.Server.Port, _ = cfg.Section("server").Key("port").Int()
config.Calc.Url = cfg.Section("calc").Key("url").String()
}

BIN
frontend/img/favicon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

12
frontend/js/chart/distribution.js
View file

@ -29,7 +29,7 @@ const computeBar = (transactions, stacked) => {
let category = transaction.category ?? emptyCategory
let date = getDate(transaction.date)
if (!indexes.hasOwnProperty(date)) {
indexes[date] = labels.length
labels.push(date)
@ -40,7 +40,7 @@ const computeBar = (transactions, stacked) => {
label: category.label,
data: [],
borderColor: category.color,
backgroundColor : category.color,
backgroundColor: category.color,
fill: true,
cubicInterpolationMode: 'monotone',
}
@ -49,7 +49,7 @@ const computeBar = (transactions, stacked) => {
for (let key in bars) {
labels.forEach(() => {
bars[key].data.push(0)
bars[key].data.push(0)
})
}
@ -61,8 +61,6 @@ const computeBar = (transactions, stacked) => {
let category = transaction.category ?? emptyCategory
let date = getDate(transaction.date)
console.log(category)
bars[category.label].data[indexes[date]] += transaction.debit
})
@ -117,15 +115,13 @@ const computeDoughnut = (transactions) => {
data[indexes[category.id]] += transaction.debit
})
const d = {
return {
labels: labels,
datasets: [{
data: Object.values(data),
backgroundColor: backgroundColor,
}],
}
return d
}
export {

6
frontend/js/router/index.js
View file

@ -33,6 +33,12 @@ const router = createRouter({
meta: { icon: ['fa-solid', 'fa-piggy-bank'] },
component: () => import('../views/BankAccountsView.vue')
},
// {
// path: '/calc',
// name: 'Tableur',
// meta: { icon: ['fa-solid', 'fa-table'] },
// component: () => import('../views/CalcView.vue')
// },
]
})

15
frontend/js/views/CalcView.vue Normal file
View file

@ -0,0 +1,15 @@
<template>
<BContainer fluid class="p-0">
</BContainer>
</template>
<script setup>
import { ref } from "vue"
</script>
<style scoped>
iframe {
width: 100%;
height: 100vh;
}
</style>

22
package-lock.json generated
View file

@ -21,6 +21,7 @@
"@vitejs/plugin-vue": "^5.0.5",
"babel-loader": "^9.1.3",
"css-loader": "^7.1.2",
"file-loader": "^6.2.0",
"mini-css-extract-plugin": "^2.9.1",
"postcss-loader": "^8.1.1",
"sass": "^1.78.0",
@ -4659,6 +4660,27 @@
"node": ">= 4.9.1"
}
},
"node_modules/file-loader": {
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
"devOptional": true,
"license": "MIT",
"dependencies": {
"loader-utils": "^2.0.0",
"schema-utils": "^3.0.0"
},
"engines": {
"node": ">= 10.13.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
},
"peerDependencies": {
"webpack": "^4.0.0 || ^5.0.0"
}
},
"node_modules/fill-range": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",

1
package.json
View file

@ -16,6 +16,7 @@
"@vitejs/plugin-vue": "^5.0.5",
"babel-loader": "^9.1.3",
"css-loader": "^7.1.2",
"file-loader": "^6.2.0",
"mini-css-extract-plugin": "^2.9.1",
"postcss-loader": "^8.1.1",
"sass": "^1.78.0",

5
web/view/template/base.templ
View file

@ -2,10 +2,15 @@ package template
import "gitnet.fr/deblan/budget/web/view"
templ Fav(url string) {
<link rel="icon" type="image/x-icon" href={ url }>
}
templ Head(title string) {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@Fav(view.Asset("static/img/favicon.png"))
<title>{ title }</title>
@templ.Raw(view.EntrypointCss("main"))
</head>

64
web/view/template/base_templ.go
View file

@ -10,7 +10,7 @@ import templruntime "github.com/a-h/templ/runtime"
import "gitnet.fr/deblan/budget/web/view"
func Head(title string) templ.Component {
func Fav(url string) templ.Component {
return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@ -31,19 +31,69 @@ func Head(title string) templ.Component {
templ_7745c5c3_Var1 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><title>")
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"icon\" type=\"image/x-icon\" href=\"")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
var templ_7745c5c3_Var2 string
templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(title)
templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(url)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/view/template/base.templ`, Line: 9, Col: 16}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/view/template/base.templ`, Line: 6, Col: 48}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
return templ_7745c5c3_Err
})
}
func Head(title string) templ.Component {
return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
return templ_7745c5c3_CtxErr
}
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
defer func() {
templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
if templ_7745c5c3_Err == nil {
templ_7745c5c3_Err = templ_7745c5c3_BufErr
}
}()
}
ctx = templ.InitializeContext(ctx)
templ_7745c5c3_Var3 := templ.GetChildren(ctx)
if templ_7745c5c3_Var3 == nil {
templ_7745c5c3_Var3 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
templ_7745c5c3_Err = Fav(view.Asset("static/img/favicon.png")).Render(ctx, templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<title>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
var templ_7745c5c3_Var4 string
templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(title)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/view/template/base.templ`, Line: 14, Col: 16}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</title>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
@ -76,9 +126,9 @@ func JS() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
templ_7745c5c3_Var3 := templ.GetChildren(ctx)
if templ_7745c5c3_Var3 == nil {
templ_7745c5c3_Var3 = templ.NopComponent
templ_7745c5c3_Var5 := templ.GetChildren(ctx)
if templ_7745c5c3_Var5 == nil {
templ_7745c5c3_Var5 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
templ_7745c5c3_Err = templ.Raw(view.EntrypointJs("main")).Render(ctx, templ_7745c5c3_Buffer)

8
webpack.config.js
View file

@ -48,10 +48,10 @@ Encore
config.plugins.push('@babel/plugin-syntax-dynamic-import');
})
// .copyFiles({
// from: './frontend/images',
// to: 'images/[path][name].[hash:8].[ext]'
// })
.copyFiles({
from: './frontend/img',
to: 'img/[path][name].[hash:8].[ext]'
})
// enables Sass/SCSS support
.enableSassLoader()