Moved all the source files to ./src

.gitignore

@@ -5,16 +5,13 @@
 
 /.vscode
 
-/assets/www/*
-!/assets/www/.keep
-!/assets/templates/base.gohtml
+/src/assets/www/*
+!/src/assets/www/.keep
+!/src/assets/templates/base.gohtml
 
-/docs/assets/*
-!/docs/assets/.keep
-/docs/src/.obsidian
+/src/docs/assets/*
+!/src/docs/assets/.keep
+/src/docs/src/.obsidian
 
-/web/dist
-/web/node_modules
-
-/web-spa/
-/web-spa/node_modules
+/src/web/dist
+/src/web/node_modules

.go-version

@@ -1 +1 @@
-1.16.0
+1.21.0

.reuse/dep5

@@ -4,7 +4,7 @@ Files:
     CHANGELOG
     modd.conf
     README.md
-    pkg/archiver/README.md
+    src/pkg/archiver/README.md
 Copyright: 2020 Olivier Meunier <olivier@neokraft.net>
 License: AGPL-3.0-only
 
@@ -12,39 +12,41 @@ Files:
     .gitignore
     .go-version
     .golangci.yml
-    go.mod
-    go.sum
-    web/.browserslistrc
-    web/.prettierrc
-    web/package.json
-    web/package-lock.json
+    go.work
+    go.work.sum
+    src/go.mod
+    src/go.sum
+    src/web/.browserslistrc
+    src/web/.prettierrc
+    src/web/package.json
+    src/web/package-lock.json
 Copyright: 2020 Olivier Meunier <olivier@neokraft.net>
 License: CC0-1.0
 
 Files:
-    internal/auth/credentials/assets/wordlist.txt
+    src/internal/auth/credentials/assets/wordlist.txt
 Copyright: EFF
 License: CC0-1.0
 
 Files:
-    pkg/*fixtures/*
+    src/pkg/*fixtures/*
 Copyright: 2020 Olivier Meunier <olivier@neokraft.net>
 License: AGPL-3.0-only
 
 Files:
-    docs/src/*
+    src/docs/src/*
 Copyright: 2023 Olivier Meunier <olivier@neokraft.net>
 License: AGPL-3.0-only
 
 Files:
-    web/media/*.ico
-    web/media/*.json
-    web/media/*.png
-    web/media/*.svg
+    src/web/media/*.ico
+    src/web/media/*.json
+    src/web/media/*.png
+    src/web/media/*.svg
 Copyright: 2021 Olivier Meunier <olivier@neokraft.net>
 License: AGPL-3.0-only
 
 Files:
-    pkg/extract/fftr/site-config/standard/*.json
+    src/pkg/extract/fftr/site-config/standard/*.json
 Copyright: fiveFilter, Wallabag
 License: CC0-1.0

Makefile

@@ -26,7 +26,8 @@ build:
 	go build \
 		-tags "$(BUILD_TAGS)" \
 		-ldflags="$(VERSION_FLAGS) -s -w" \
-		-o dist/readeck
+		-o dist/readeck \
+		./src
 
 # Build the server with only PG support (full static)
 .PHONY: build-pg
@@ -34,37 +35,27 @@ build-pg:
 	go build \
 		-tags "$(BUILD_TAGS) without_sqlite" \
 		-ldflags="$(VERSION_FLAGS) -s -w" \
-		-o dist/readeck_pg
-
-# Build the server in dev mode, without compiling the assets
-.PHONY: build-dev
-build-dev:
-	go build -tags "$(TAGS)" -o dist/readeck
-
+		-o dist/readeck_pg \
+		./src
 
 # Clean the build
 .PHONY: clean
 clean:
 	rm -rf dist
-	rm -rf assets/www/*
-	go clean
+	rm -rf src/assets/www/*
+	make -C src/web clean
 
 list:
 	go list \
 		-tags "$(BUILD_TAGS)" \
 		-ldflags="$(VERSION_FLAGS) -s -w" \
-		-f "{{ .GoFiles }}"
-
-# Launch the documentation
-.PHONY: doc
-doc:
-	@echo "Visit http://localhost:6060/pkg/github.com/readeck/readeck/?m=all"
-	godoc
+		-f "{{ .GoFiles }}" \
+		./src
 
 # Linting
 .PHONY: lint
 lint:
-	golangci-lint run
+	cd src && golangci-lint run
 
 # SLOC
 .PHONY: sloc
@@ -74,7 +65,7 @@ sloc:
 # Launch tests
 .PHONY: test
 test: docs-build web-build
-	go test -tags "$(TAGS)" -cover -count=1 ./...
+	go test -tags "$(TAGS)" -cover -count=1 ./src/...
 
 # Start the HTTP server
 .PHONY: serve
@@ -95,19 +86,20 @@ dev:
 
 .PHONY: help-build
 docs-build:
-	${MAKE} -C docs all
+	${MAKE} -C src/docs all
 
 .PHONY: web-build
 web-build:
-	@$(MAKE) -C web build
+	@$(MAKE) -C src/web build
 
 .PHONY: web-watch
 web-watch:
-	@$(MAKE) -C web watch
+	@$(MAKE) -C src/web watch
 
 
 # Setup the development env
 .PHONY: setup
 setup:
-	${MAKE} -C web setup
+	${MAKE} -C src/web setup
 	go install github.com/cortesi/modd/cmd/modd@latest
+	go install github.com/boyter/scc/v3@latest

go.work

@@ -0,0 +1,5 @@
+go 1.21.0
+
+use (
+    ./src
+)

go.work.sum

@@ -0,0 +1,5 @@
+github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
+github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
+golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=

modd.conf

@@ -1,15 +1,15 @@
-**/*.go
-assets/templates/**
-assets/www/manifest.json
-docs/assets/**/*
-internal/acls/config/*
-pkg/extract/**/*.toml
-pkg/extract/**/*.js
+src/**/*.go
+src/assets/templates/**
+src/assets/www/manifest.json
+src/docs/assets/**/*
+src/internal/acls/config/*
+src/pkg/extract/**/*.toml
+src/pkg/extract/**/*.js
 config.toml {
-    prep: make build-dev
+    prep: make build
     daemon +sigterm: ./dist/readeck serve -c config.toml
 }
 
-docs/src/**/* {
+src/docs/src/**/* {
     prep: make docs-build
 }