Release 0.1.5

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-custom: https://aceberg.github.io/MyDocs/sponsor
+custom: ['https://www.donationalerts.com/r/andrewerlikh','https://boosty.to/aceberg/donate', 'https://github.com/aceberg#donate']

.version

@@ -1 +1 @@
-VERSION=0.1.4
+VERSION=0.1.5

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.1.5] - 2024-07-01
+### Added
+- Option to use local theme and font, instead of jsdelivr
+
 ## [0.1.4] - 2023-06-12
 ### Fixed
 - Fixed crash when incorrect folder path inserted

Makefile

@@ -9,7 +9,7 @@ mod:
 
 run:
 	cd cmd/$(PKG_NAME)/ && \
-	go run . -c /data/$(PKG_NAME)/config.yaml -b /data/$(PKG_NAME)/blocks.yaml
+	go run . -c /data/$(PKG_NAME)/config.yaml -b /data/$(PKG_NAME)/blocks.yaml -n http://192.168.2.3:8850
 
 fmt:
 	go fmt ./...

README.md

@@ -16,7 +16,8 @@ The app is capable of detecting git repos in folder.
 - [Other installation methods](https://github.com/aceberg/git-confed#installation)   
 - [Usage](https://github.com/aceberg/git-confed#usage)   
 - [Config](https://github.com/aceberg/git-confed#config)   
-- [Options](https://github.com/aceberg/git-confed#options)  
+- [Options](https://github.com/aceberg/git-confed#options) 
+- [Local network only](https://github.com/aceberg/git-confed#local-network-only)  
 - [Thanks](https://github.com/aceberg/git-confed#thanks)
 
 ![screenshot](https://raw.githubusercontent.com/aceberg/git-confed/main/assets/Screenshot%202023-05-26%20at%2016-08-42%20Git%20Config%20Editor.png)     
@@ -123,8 +124,25 @@ urls:
 | --------  | ----------- | ------- | --- | --- |
 | -b | Path to file with code blocks | /data/git-confed/blocks.yaml | $HOME/.config/git-confed/blocks.yaml | /etc/git-confed/blocks.yaml |
 | -c | Path to GUI config file | /data/git-confed/config.yaml | $HOME/.config/git-confed/config.yaml | /etc/git-confed/config.yaml |
+| -n | Path to node modules (see below) | "" | | |
 
 
+## Local network only
+By default, this app pulls themes, icons and fonts from the internet. But, in some cases, it may be useful to have an independent from global network setup. I created a separate [image](https://github.com/aceberg/my-dockerfiles/tree/main/node-bootstrap) with all necessary modules and fonts.
+Run with Docker:
+```sh
+docker run --name node-bootstrap          \
+    -p 8850:8850                          \
+    aceberg/node-bootstrap
+```
+```sh
+docker run --name git-confed \
+    -v ~/.dockerdata/git-confed:/data/git-confed \
+    -v /path/to/git/repos/folder:/repos \
+    -p 8848:8848 \
+    aceberg/git-confed -n "http://$YOUR_IP:8850"
+```
+
 ## Thanks
 - All go packages listed in [dependencies](https://github.com/aceberg/git-confed/network/dependencies)
 - [Bootstrap](https://getbootstrap.com/)

cmd/git-confed/main.go

@@ -9,14 +9,16 @@ import (
 
 const confPath = "/data/git-confed/config.yaml"
 const blocksPath = "/data/git-confed/blocks.yaml"
+const nodePath = ""
 
 func main() {
 	blocksPtr := flag.String("b", blocksPath, "Path to blocks yaml file")
 	confPtr := flag.String("c", confPath, "Path to config yaml file")
+	nodePtr := flag.String("n", nodePath, "Path to node modules")
 	flag.Parse()
 
 	check.Path(*blocksPtr)
 	check.Path(*confPtr)
 
-	web.Gui(*confPtr, *blocksPtr) // webgui.go
+	web.Gui(*confPtr, *blocksPtr, *nodePtr) // webgui.go
 }

go.mod

@@ -1,24 +1,29 @@
 module github.com/aceberg/git-confed
 
-go 1.20
+go 1.22.4
 
 require (
-	github.com/spf13/viper v1.15.0
+	github.com/spf13/viper v1.19.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )