diff options
| -rw-r--r-- | .dockerignore | 5 | ||||
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | Dockerfile | 10 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | backend/go.mod (renamed from go.mod) | 0 | ||||
| -rw-r--r-- | backend/go.sum (renamed from go.sum) | 0 | ||||
| -rw-r--r-- | backend/main.go (renamed from main.go) | 0 | ||||
| -rw-r--r-- | backend/static/favicon.svg (renamed from static/favicon.svg) | 0 | ||||
| -rw-r--r-- | backend/static/index.js (renamed from static/index.js) | 0 | ||||
| -rw-r--r-- | backend/templates/read-feeds.html (renamed from templates/read-feeds.html) | 0 | ||||
| -rw-r--r-- | backend/templates/settings.html (renamed from templates/settings.html) | 0 | ||||
| -rw-r--r-- | backend/templates/unread-feeds.html (renamed from templates/unread-feeds.html) | 0 | ||||
| -rw-r--r-- | frontend/biome.jsonc | 6 | ||||
| -rw-r--r-- | frontend/css/style.css (renamed from css/style.css) | 0 | ||||
| -rw-r--r-- | frontend/package-lock.json (renamed from package-lock.json) | 0 | ||||
| -rw-r--r-- | frontend/package.json (renamed from package.json) | 8 | ||||
| -rw-r--r-- | tailwind.config.js | 8 |
17 files changed, 27 insertions, 29 deletions
diff --git a/.dockerignore b/.dockerignore index cf6b7bf..48e8cc4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,6 @@ -/node_modules +/backend/feedaka +/frontend/node_modules +/frontend/dist -/feedaka /feedaka.db /feedaka.db-journal @@ -1,7 +1,6 @@ -/node_modules +/backend/feedaka +/frontend/node_modules +/frontend/dist -/feedaka /feedaka.db /feedaka.db-journal - -/static/style.css @@ -2,10 +2,10 @@ FROM node:22-alpine AS frontend-builder WORKDIR /app -COPY package.json package-lock.json ./ +COPY frontend/package.json frontend/package-lock.json ./ RUN npm install -COPY . ./ +COPY frontend/ ./ RUN npm run build ########################################## @@ -15,11 +15,11 @@ FROM golang:1.23-alpine AS backend-builder WORKDIR /app RUN apk update && apk add --no-cache build-base sqlite -COPY go.mod go.sum ./ +COPY backend/go.mod backend/go.sum ./ RUN go mod download -COPY . ./ -COPY --from=frontend-builder /app/static/style.css ./static/style.css +COPY backend/ ./ +COPY --from=frontend-builder /app/dist/style.css ./static/style.css RUN CGO_ENABLED=1 GOOS=linux go build -o feedaka main.go ########################################## @@ -1,14 +1,14 @@ serve: build - FEEDAKA_BASE_PATH="" FEEDAKA_PORT=8080 ./feedaka + FEEDAKA_BASE_PATH="" FEEDAKA_PORT=8080 ./backend/feedaka build: - npm run check - npm run build - go build -o feedaka main.go + cd frontend && npm run check + cd frontend && npm run build + cd backend && go build -o feedaka main.go fmt: - go fmt . - npm run fmt + cd frontend && npm run fmt + cd backend && go fmt . docker-build: fmt docker build -t feedaka . diff --git a/main.go b/backend/main.go index 018a4b2..018a4b2 100644 --- a/main.go +++ b/backend/main.go diff --git a/static/favicon.svg b/backend/static/favicon.svg index 3602b2c..3602b2c 100644 --- a/static/favicon.svg +++ b/backend/static/favicon.svg diff --git a/static/index.js b/backend/static/index.js index 6354bbd..6354bbd 100644 --- a/static/index.js +++ b/backend/static/index.js diff --git a/templates/read-feeds.html b/backend/templates/read-feeds.html index 08a2626..08a2626 100644 --- a/templates/read-feeds.html +++ b/backend/templates/read-feeds.html diff --git a/templates/settings.html b/backend/templates/settings.html index 65efd8d..65efd8d 100644 --- a/templates/settings.html +++ b/backend/templates/settings.html diff --git a/templates/unread-feeds.html b/backend/templates/unread-feeds.html index 676f24e..676f24e 100644 --- a/templates/unread-feeds.html +++ b/backend/templates/unread-feeds.html diff --git a/frontend/biome.jsonc b/frontend/biome.jsonc new file mode 100644 index 0000000..d84439e --- /dev/null +++ b/frontend/biome.jsonc @@ -0,0 +1,6 @@ +{ + "$schema": "https://biomejs.dev/schemas/2.0.4/schema.json", + "files": { + "includes": ["!dist/"] + } +} diff --git a/css/style.css b/frontend/css/style.css index f1d8c73..f1d8c73 100644 --- a/css/style.css +++ b/frontend/css/style.css diff --git a/package-lock.json b/frontend/package-lock.json index 2113d28..2113d28 100644 --- a/package-lock.json +++ b/frontend/package-lock.json diff --git a/package.json b/frontend/package.json index a95cb6b..2ef02e3 100644 --- a/package.json +++ b/frontend/package.json @@ -4,10 +4,10 @@ "description": "", "main": "index.js", "scripts": { - "check": "biome check --write .", - "fmt": "biome check .", - "build": "tailwindcss -i ./css/style.css -o ./static/style.css", - "watch": "tailwindcss -i ./css/style.css -o ./static/style.css --watch" + "check": "biome check .", + "fmt": "biome check --write .", + "build": "tailwindcss -i ./css/style.css -o ./dist/style.css", + "watch": "tailwindcss -i ./css/style.css -o ./dist/style.css --watch" }, "author": "nsfisis", "license": "MIT", diff --git a/tailwind.config.js b/tailwind.config.js deleted file mode 100644 index e67c242..0000000 --- a/tailwind.config.js +++ /dev/null @@ -1,8 +0,0 @@ -/** @type {import('tailwindcss').Config} */ -module.exports = { - content: ["./templates/**/*.html"], - theme: { - extend: {}, - }, - plugins: [], -}; |
