fix(deps): update module entgo.io/ent to v0.11.8 (#272)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Dockerfile

@@ -41,9 +41,10 @@ COPY --from=builder /go/bin/api /app
 RUN chmod +x /app/api
 
 LABEL Name=homebox Version=0.0.1
+LABEL org.opencontainers.image.source="https://github.com/hay-kot/homebox"
 EXPOSE 7745
 WORKDIR /app
 VOLUME [ "/data" ]
 
 ENTRYPOINT [ "/app/api" ]
-CMD [ "/data/config.yml" ]
+CMD [ "/data/config.yml" ]

Taskfile.yml

@@ -2,6 +2,7 @@ version: "3"
 
 env:
   HBOX_STORAGE_SQLITE_URL: .data/homebox.db?_fk=1
+  HBOX_OPTIONS_ALLOW_REGISTRATION: true
   UNSAFE_DISABLE_PASSWORD_PROJECTION: "yes_i_am_sure"
 tasks:
   setup:

backend/app/api/handlers/v1/controller.go

@@ -44,12 +44,13 @@ type (
 	}
 
 	ApiSummary struct {
-		Healthy  bool     `json:"health"`
-		Versions []string `json:"versions"`
-		Title    string   `json:"title"`
-		Message  string   `json:"message"`
-		Build    Build    `json:"build"`
-		Demo     bool     `json:"demo"`
+		Healthy           bool     `json:"health"`
+		Versions          []string `json:"versions"`
+		Title             string   `json:"title"`
+		Message           string   `json:"message"`
+		Build             Build    `json:"build"`
+		Demo              bool     `json:"demo"`
+		AllowRegistration bool     `json:"allowRegistration"`
 	}
 )
 
@@ -82,11 +83,12 @@ func NewControllerV1(svc *services.AllServices, repos *repo.AllRepos, options ..
 func (ctrl *V1Controller) HandleBase(ready ReadyFunc, build Build) server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		return server.Respond(w, http.StatusOK, ApiSummary{
-			Healthy: ready(),
-			Title:   "Go API Template",
-			Message: "Welcome to the Go API Template Application!",
-			Build:   build,
-			Demo:    ctrl.isDemo,
+			Healthy:           ready(),
+			Title:             "Go API Template",
+			Message:           "Welcome to the Go API Template Application!",
+			Build:             build,
+			Demo:              ctrl.isDemo,
+			AllowRegistration: ctrl.allowRegistration,
 		})
 	}
 }

backend/app/api/static/docs/docs.go

@@ -2425,6 +2425,9 @@ const docTemplate = `{
         "v1.ApiSummary": {
             "type": "object",
             "properties": {
+                "allowRegistration": {
+                    "type": "boolean"
+                },
                 "build": {
                     "$ref": "#/definitions/v1.Build"
                 },

backend/app/api/static/docs/swagger.json

@@ -2417,6 +2417,9 @@
         "v1.ApiSummary": {
             "type": "object",
             "properties": {
+                "allowRegistration": {
+                    "type": "boolean"
+                },
                 "build": {
                     "$ref": "#/definitions/v1.Build"
                 },

backend/app/api/static/docs/swagger.yaml

@@ -564,6 +564,8 @@ definitions:
     type: object
   v1.ApiSummary:
     properties:
+      allowRegistration:
+        type: boolean
       build:
         $ref: '#/definitions/v1.Build'
       demo:

backend/go.mod

@@ -4,8 +4,8 @@ go 1.19
 
 require (
 	ariga.io/atlas v0.9.1-0.20230119145809-92243f7c55cb
-	entgo.io/ent v0.11.7
-	github.com/ardanlabs/conf/v3 v3.1.3
+	entgo.io/ent v0.11.8
+	github.com/ardanlabs/conf/v3 v3.1.4
 	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-playground/validator/v10 v10.11.2
 	github.com/gocarina/gocsv v0.0.0-20230123225133-763e25b40669

backend/go.sum

@@ -2,6 +2,8 @@ ariga.io/atlas v0.9.1-0.20230119145809-92243f7c55cb h1:mbsFtavDqGdYwdDpP50LGOOZ2
 ariga.io/atlas v0.9.1-0.20230119145809-92243f7c55cb/go.mod h1:T230JFcENj4ZZzMkZrXFDSkv+2kXkUgpJ5FQQ5hMcKU=
 entgo.io/ent v0.11.7 h1:V+wKFh0jhAbY/FoU+PPbdMOf2Ma5vh07R/IdF+N/nFg=
 entgo.io/ent v0.11.7/go.mod h1:ericBi6Q8l3wBH1wEIDfKxw7rcQEuRPyBfbIzjtxJ18=
+entgo.io/ent v0.11.8 h1:M/M0QL1CYCUSdqGRXUrXhFYSDRJPsOOrr+RLEej/gyQ=
+entgo.io/ent v0.11.8/go.mod h1:ericBi6Q8l3wBH1wEIDfKxw7rcQEuRPyBfbIzjtxJ18=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
@@ -11,6 +13,8 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/ardanlabs/conf/v3 v3.1.3 h1:16+Nzfc4PBd/ERtYERUFL/75eVKNyW15Y+vn3W1XZzQ=
 github.com/ardanlabs/conf/v3 v3.1.3/go.mod h1:bIacyuGeZjkTdtszdbvOcuq49VhHpV3+IPZ2ewOAK4I=
+github.com/ardanlabs/conf/v3 v3.1.4 h1:c0jJYbqHJcrR/uYImbGC1q7quH3DYxH49zGCT7WLJH4=
+github.com/ardanlabs/conf/v3 v3.1.4/go.mod h1:bIacyuGeZjkTdtszdbvOcuq49VhHpV3+IPZ2ewOAK4I=
 github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

frontend/components/Form/Autocomplete2.vue

@@ -27,7 +27,7 @@
             <li
               :class="[
                 'relative cursor-default select-none py-2 pl-3 pr-9 duration-75 ease-in-out transition-colors',
-                active ? 'bg-primary text-white' : 'text-gray-900',
+                active ? 'bg-primary text-primary-content' : 'text-base-content',
               ]"
             >
               <slot name="display" v-bind="{ item: item, selected, active }">

frontend/lib/api/types/data-contracts.ts

@@ -159,6 +159,7 @@ export interface ItemUpdate {
   soldTime: Date | string;
   soldTo: string;
   warrantyDetails: string;
+  /** Sold */
   warrantyExpires: Date | string;
 }
 
@@ -335,6 +336,7 @@ export interface ActionAmountResult {
 }
 
 export interface ApiSummary {
+  allowRegistration: boolean;
   build: Build;
   demo: boolean;
   health: boolean;

frontend/package.json

@@ -21,7 +21,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^9.4.0",
     "isomorphic-fetch": "^3.0.0",
-    "nuxt": "3.1.1",
+    "nuxt": "3.2.0",
     "prettier": "^2.7.1",
     "typescript": "^4.8.3",
     "vite-plugin-eslint": "^1.8.1",
@@ -40,7 +40,7 @@
     "autoprefixer": "^10.4.8",
     "chart.js": "^4.0.1",
     "daisyui": "^2.24.0",
-    "dompurify": "^2.4.1",
+    "dompurify": "^3.0.0",
     "markdown-it": "^13.0.1",
     "pinia": "^2.0.21",
     "postcss": "^8.4.16",

frontend/pages/index.vue

@@ -101,7 +101,6 @@
 
     toast.success("Logged in successfully");
 
-    // @ts-expect-error - expires is either a date or a string, need to figure out store typing
     authStore.$patch({
       token: data.token,
       expires: data.expiresAt,
@@ -213,12 +212,22 @@
             </form>
           </Transition>
           <div class="text-center mt-6">
-            <button
-              class="text-base-content text-lg hover:bg-primary hover:text-primary-content px-3 py-1 rounded-xl transition-colors duration-200"
+            <BaseButton
+              v-if="status && status.allowRegistration"
+              class="btn-primary btn-wide"
               @click="() => toggleLogin()"
             >
-              {{ registerForm ? "Already a User? Login" : "Not a User? Register" }}
-            </button>
+              <template #icon>
+                <Icon v-if="!registerForm" name="mdi-account-plus-outline" class="w-5 h-5 swap-off" />
+                <Icon v-else name="mdi-login" class="w-5 h-5 swap-off" />
+                <Icon name="mdi-arrow-right" class="w-5 h-5 swap-on" />
+              </template>
+              {{ registerForm ? "Login" : "Register" }}
+            </BaseButton>
+            <p v-else class="text-base-content italic text-sm inline-flex items-center gap-2">
+              <Icon name="mdi-lock" class="w-4 h-4 inline-block" />
+              Registration Disabled
+            </p>
           </div>
         </div>
       </div>

scripts/process-types/main.go

@@ -6,12 +6,23 @@ import (
 	"regexp"
 )
 
-func dateTypes(names []string) map[*regexp.Regexp]string {
-	result := make(map[*regexp.Regexp]string)
-	for _, name := range names {
-		result[regexp.MustCompile(fmt.Sprintf(`%s: string`, name))] = fmt.Sprintf(`%s: Date | string`, name)
+type ReReplace struct {
+	Regex *regexp.Regexp
+	Text  string
+}
+
+func NewReReplace(regex string, replace string) ReReplace {
+	return ReReplace{
+		Regex: regexp.MustCompile(regex),
+		Text:  replace,
+	}
+}
+
+func NewReDate(dateStr string) ReReplace {
+	return ReReplace{
+		Regex: regexp.MustCompile(fmt.Sprintf(`%s: string`, dateStr)),
+		Text:  fmt.Sprintf(`%s: Date | string`, dateStr),
 	}
-	return result
 }
 
 func main() {
@@ -37,29 +48,24 @@ func main() {
 	}
 	text += string(data)
 
-	regexReplace := map[*regexp.Regexp]string{
-		regexp.MustCompile(` PaginationResultRepo`): " PaginationResult",
-		regexp.MustCompile(` Repo`):                 " ",
-		regexp.MustCompile(` Services`):             " ",
-		regexp.MustCompile(` V1`):                   " ",
-		regexp.MustCompile(`\?:`):                   ":",
+	replaces := [...]ReReplace{
+		NewReReplace(` Repo`, " "),
+		NewReReplace(` PaginationResultRepo`, " PaginationResult"),
+		NewReReplace(` Services`, " "),
+		NewReReplace(` V1`, " "),
+		NewReReplace(`\?:`, ":"),
+		NewReDate("createdAt"),
+		NewReDate("updatedAt"),
+		NewReDate("soldTime"),
+		NewReDate("purchaseTime"),
+		NewReDate("warrantyExpires"),
+		NewReDate("expiresAt"),
+		NewReDate("date"),
 	}
 
-	for regex, replace := range dateTypes([]string{
-		"createdAt",
-		"updatedAt",
-		"soldTime",
-		"purchaseTime",
-		"warrantyExpires",
-		"expiresAt",
-		"date",
-	}) {
-		regexReplace[regex] = replace
-	}
-
-	for regex, replace := range regexReplace {
-		fmt.Printf("Replacing '%v' -> '%s'\n", regex, replace)
-		text = regex.ReplaceAllString(text, replace)
+	for _, replace := range replaces {
+		fmt.Printf("Replacing '%v' -> '%s'\n", replace.Regex, replace.Text)
+		text = replace.Regex.ReplaceAllString(text, replace.Text)
 	}
 
 	err = os.WriteFile(path, []byte(text), 0644)