diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 40bbcfd..0000000 --- a/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM golang:1.22-alpine AS builder -WORKDIR /app -COPY . . -RUN go build -o main cmd/mrp/main.go - -FROM alpine:latest -WORKDIR /root/ -COPY --from=builder /app/main . -COPY --from=builder /app/ui/dist ./ui/dist -EXPOSE 8080 -CMD ["./main"] diff --git a/backend/.dockerignore b/backend/.dockerignore index 2c5c1ad..d055b02 100644 --- a/backend/.dockerignore +++ b/backend/.dockerignore @@ -3,3 +3,6 @@ bin main .git .env +uploads/ +uploads_backups/ +*.md diff --git a/backend/Dockerfile b/backend/Dockerfile index 317a16b..9570b67 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -18,7 +18,6 @@ FROM alpine:latest WORKDIR /root/ COPY --from=builder /app/main . -COPY --from=builder /app/uploads ./uploads EXPOSE 8090 CMD ["./main"] diff --git a/backend/cmd/remake-background/main.go b/backend/cmd/remake-background/main.go new file mode 100644 index 0000000..1e47828 --- /dev/null +++ b/backend/cmd/remake-background/main.go @@ -0,0 +1,28 @@ +package main + +import ( + "fmt" + "log" + + "github.com/disintegration/imaging" +) + +func main() { + path := "./uploads/items/background.png" + + img, err := imaging.Open(path) + if err != nil { + log.Fatal(err) + } + + resized := imaging.Resize(img, 1920, 0, imaging.Lanczos) + + newPath := "./uploads/items/background.jpg" + + err = imaging.Save(resized, newPath, imaging.JPEGQuality(82)) + if err != nil { + log.Fatal(err) + } + + fmt.Println("Готово") +} diff --git a/backend/handlers/item_handlers.go b/backend/handlers/item_handlers.go index 6cd0dbc..d0aab1f 100644 --- a/backend/handlers/item_handlers.go +++ b/backend/handlers/item_handlers.go @@ -26,7 +26,7 @@ func GetItem(c *gin.Context) { if item.AvatarURL != "" { item.AvatarURL = fmt.Sprintf("/static/items/%s", item.AvatarURL) } else { - item.AvatarURL = fmt.Sprintf("/static/items/background.png") + item.AvatarURL = fmt.Sprintf("/static/items/background.jpg") } c.JSON(http.StatusOK, item) @@ -44,7 +44,7 @@ func GetAllItems(c *gin.Context) { if items[i].AvatarURL != "" { items[i].AvatarURL = fmt.Sprintf("/static/items/%s", items[i].AvatarURL) } else { - items[i].AvatarURL = fmt.Sprintf("/static/items/background.png") + items[i].AvatarURL = fmt.Sprintf("/static/items/background.jpg") } } diff --git a/backend/uploads/items/background.jpg b/backend/uploads/items/background.jpg new file mode 100644 index 0000000..ecbf885 Binary files /dev/null and b/backend/uploads/items/background.jpg differ diff --git a/docker-compose.yml b/docker-compose.yml index b718db1..c1fe6c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,8 @@ services: - DB_DSN=host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} port=${DB_PORT} sslmode=disable depends_on: - db + volumes: + - ./backend/uploads/:/root/uploads/ # Фронтенд на React frontend: diff --git a/frontend/.dockerignore b/frontend/.dockerignore index 2d82f2c..d6d7019 100644 --- a/frontend/.dockerignore +++ b/frontend/.dockerignore @@ -1,5 +1,5 @@ -node_modules -dist +node_modules/ +dist/ build .git .env diff --git a/frontend/src/assets/Исходники/background.jpg b/frontend/src/assets/Исходники/background.jpg new file mode 100644 index 0000000..ecbf885 Binary files /dev/null and b/frontend/src/assets/Исходники/background.jpg differ diff --git a/frontend/src/assets/Исходники/background.png b/frontend/src/assets/Исходники/background.png deleted file mode 100644 index a4f4d93..0000000 Binary files a/frontend/src/assets/Исходники/background.png and /dev/null differ diff --git a/frontend/src/pages/Main.jsx b/frontend/src/pages/Main.jsx index 0303767..6763d99 100644 --- a/frontend/src/pages/Main.jsx +++ b/frontend/src/pages/Main.jsx @@ -1,5 +1,5 @@ import PageLayout from "../components/PageLayout"; -import bgLayout from "../assets/Исходники/background.png"; +import bgLayout from "../assets/Исходники/background.jpg"; import Arrow from "../components/Arrow"; import { useEffect, useState } from "react"; @@ -20,8 +20,8 @@ export default function Dashboard() {