Merge branch 'release/0.6.0'

.gitignore

@@ -29,6 +29,7 @@ uploads/*
 reports/*
 scripts/*
 VERSION
+ymir*.db
 
 #Sveltekit
 front/node_modules
@@ -41,7 +42,7 @@ front/.env
 front/.vercel_build_output
 front/.svelte-kit
 front/.vscode
-
+front/.npmrc
 
 #IDES
 .idea/*

Makefile

@@ -30,8 +30,8 @@ MAKEFLAGS += --no-print-directory
 GOPATH := $(shell go env GOPATH)
 GOBIN := $(GOPATH)/bin
 
-ARCHES ?= amd64
-OSES ?= linux darwin
+ARCHES ?= amd64 arm64
+OSES ?= linux darwin windows
 OUTTPL = $(DIST_DIR)/$(APP_NAME)-$(VERSION)-{{.OS}}_{{.Arch}}
 GZCMD = tar -czf
 ZIPCMD = zip
@@ -51,6 +51,13 @@ deps:
 	go mod download -x
 	@echo $(DONE) "Deps"
 
+## build: Install missing dependencies. Builds binary in ./build
+.PHONY: front
+front:
+	@echo "Building Front UI"
+	cd front/ && npm run build
+	@echo $(DONE) "Front\n"
+
 ## build: Install missing dependencies. Builds binary in ./build
 .PHONY: build
 build: tidy fmt
@@ -68,11 +75,11 @@ build: tidy fmt
 
 ## dist: Creates a distribution
 .PHONY: dist
-dist: clean reports build
+dist: clean reports front build
 	cd "$(DIST_DIR)"; for dir in ./**; do \
 		#cp $(PKG_DIR)/config.toml $$dir; \
 		#cp -r $(PKG_DIR)/etc $$dir; \
-		cp $(PKG_DIR)/scripts/* $$dir;\
+		#cp $(PKG_DIR)/scripts/* $$dir;\
 		$(GZCMD) "$(basename "$$dir").tar.gz" "$$dir"; \
 	done
 	cd "$(DIST_DIR)"; find . -maxdepth 1 -type f -printf "$(SHACMD) %P | tee \"./%P.sha\"\n" | sh

README.md

@@ -1,5 +1,7 @@
 # Ymir
-Last Update: 8Jan24
+Pronouced - (ˈē-ˌmir')
+
+Last Update: 16Jan24
 
 Ymir is a 3D model manager. In a nutshell it is a light and local version of the printables.com website.
 
@@ -12,10 +14,10 @@ Right now Ymir will only connect to printers using OctoPrint.
 
 I get why Prusa does that and Im cool with it. In fact I own a Prusa printer myself. But a lot of folks dont. 
 Plus Im pretty sure my next printer is gonna be a Voron. Lastly I wanted something I could run locally and
-not have to create an account on.
+not have to create an account on. So since Im a somewhat technical guy I decided to just write my own.
 
 ## Thank you:
-* Your Name Here <-- Always looking for help
+* Your Name Here <-- Always looking for help (Especially with Testing Svelte Frontends)
 
 ## Features
 * Add, edit, and delete model
@@ -85,6 +87,7 @@ You can run the UI separately in dev mode with:
 ```bash
 cd front
 npm run dev
+#Then run the backend server from either cli or your IDE
 ```
 or
 
@@ -148,3 +151,4 @@ A users manual is coming soon.
 * Config subcommand to generate a default config
 * Full Docs site
 * Clean up the codebase -- This was my first time creating a svelte app
+* Refactor Svelte fetches -- [reference](https://scottspence.com/posts/sveltekit-data-loading-understanding-the-load-function)

cmd/import.go

@@ -51,7 +51,7 @@ func init() {
 }
 
 func runImport() {
-	imp := importer.NewImporter(Path)
+	imp := importer.NewImporter(Path, inDb)
 	imp.Tags = *(*[]types.Tags)(unsafe.Pointer(&Tags))
 	err := imp.FindModels()
 	if err != nil {

config/ymir.toml

@@ -7,7 +7,7 @@ stdOut = true
 fileOut = false
 
 [datastore]
-dbFile="ymir2.db"
+dbFile="ymir.db"
 
 [models]
 uploadsTempDir="uploads/tmp"

front/package.json

@@ -13,51 +13,60 @@
 		"format": "prettier --write ."
 	},
 	"devDependencies": {
-		"@floating-ui/dom": "^1.5.3",
-		"@skeletonlabs/skeleton": "^1.12.0",
-		"@sveltejs/adapter-auto": "^2.1.0",
-		"@sveltejs/adapter-static": "^2.0.3",
-		"@sveltejs/kit": "^1.25.0",
-		"@tailwindcss/forms": "^0.5.6",
-		"@tailwindcss/typography": "^0.5.10",
-		"@types/three": "^0.155.1",
-		"@typescript-eslint/eslint-plugin": "^5.62.0",
-		"@typescript-eslint/parser": "^5.62.0",
-		"autoprefixer": "^10.4.15",
-		"eslint": "^8.49.0",
-		"eslint-config-prettier": "^8.10.0",
-		"eslint-plugin-svelte": "^2.33.1",
-		"highlight.js": "^11.8.0",
-		"postcss": "^8.4.29",
-		"prettier": "^3.0.3",
-		"prettier-plugin-svelte": "^2.10.1",
-		"prettier-plugin-tailwindcss": "^0.5.4",
-		"sass": "^1.67.0",
-		"svelte": "^4.2.0",
-		"svelte-check": "^3.5.1",
-		"tailwindcss": "^3.3.3",
-		"tslib": "^2.6.2",
-		"typescript": "^5.2.2",
-		"vite": "^4.4.9"
+		"@skeletonlabs/skeleton": "2.7.0",
+		"@skeletonlabs/tw-plugin": "0.3.1",
+		"@sveltejs/adapter-auto": "^3.0.0",
+		"@sveltejs/adapter-static": "^3.0.1",
+		"@sveltejs/kit": "^2.0.0",
+		"@sveltejs/vite-plugin-svelte": "^3.0.0",
+		"@tailwindcss/forms": "0.5.7",
+		"@tailwindcss/typography": "0.5.10",
+		"@types/eslint": "8.56.0",
+		"@types/node": "20.11.0",
+		"@types/prismjs": "^1.26.3",
+		"@types/three": "^0.160.0",
+		"@typescript-eslint/eslint-plugin": "^6.0.0",
+		"@typescript-eslint/parser": "^6.0.0",
+		"autoprefixer": "10.4.16",
+		"eslint": "^8.56.0",
+		"eslint-config-prettier": "^9.1.0",
+		"eslint-plugin-svelte": "^2.35.1",
+		"postcss": "8.4.33",
+		"postcss-load-config": "^5.0.2",
+		"prettier": "^3.1.1",
+		"prettier-plugin-svelte": "^3.1.2",
+		"prettier-plugin-tailwindcss": "^0.5.11",
+		"sass": "^1.69.7",
+		"svelte": "^4.2.7",
+		"svelte-check": "^3.6.0",
+		"tailwindcss": "3.4.1",
+		"tslib": "^2.4.1",
+		"typescript": "^5.0.0",
+		"vite": "^5.0.3",
+		"vite-plugin-tailwind-purgecss": "0.2.0"
 	},
 	"type": "module",
 	"dependencies": {
-		"@ckeditor/ckeditor5-build-decoupled-document": "^38.1.1",
-		"@threlte/core": "^6.0.8",
-		"@threlte/extras": "^5.6.2",
-		"ckeditor5-custom-build": "file:../../ckeditor5-38.1.0",
+		"@ckeditor/ckeditor5-build-decoupled-document": "^40.2.0",
+		"@floating-ui/dom": "^1.5.4",
+		"@threlte/core": "^7.0.12",
+		"@threlte/extras": "^8.1.1",
 		"ckeditor5-svelte": "^0.0.10",
 		"d3": "^7.8.5",
 		"d3-scale": "^4.0.2",
 		"d3-shape": "^3.2.0",
-		"filepond": "^4.30.4",
+		"filepond": "^4.30.6",
 		"filepond-plugin-file-metadata": "^1.0.8",
 		"filepond-plugin-file-validate-type": "^1.2.8",
 		"filepond-plugin-image-exif-orientation": "^1.0.11",
-		"filepond-plugin-image-preview": "^4.6.11",
+		"filepond-plugin-image-preview": "^4.6.12",
+		"highlight.js": "11.9.0",
 		"just-debounce-it": "^3.2.0",
+		"prismjs": "^1.29.0",
+		"svelte-exmarkdown": "^3.0.3",
 		"svelte-file-dropzone": "^2.0.2",
-		"svelte-filepond": "^0.2.0",
-		"three": "^0.155.0"
+		"svelte-filepond": "^0.2.2",
+		"svelte-jsoneditor": "^0.21.3",
+		"three": "^0.160.0"
 	}
 }