Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51e0182399 | ||
|
|
5882a957ad | ||
|
|
f4d2c30493 | ||
|
|
3848ab47df | ||
|
|
84657b9610 | ||
|
|
2bcf9a2f02 |
@@ -0,0 +1,85 @@
|
|||||||
|
name: CI/CD
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: ghcr.io
|
||||||
|
IMAGE_NAME: ${{ github.repository }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
name: Test
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
working-directory: app
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '22'
|
||||||
|
cache: 'npm'
|
||||||
|
cache-dependency-path: app/package-lock.json
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: npm test
|
||||||
|
|
||||||
|
build-and-push:
|
||||||
|
name: Build and push image (dev)
|
||||||
|
needs: test
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Log in to GitHub Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Extract image metadata
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||||
|
tags: |
|
||||||
|
type=raw,value=dev
|
||||||
|
type=sha,prefix=dev-
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Build and push
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: ./app
|
||||||
|
push: true
|
||||||
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
|
|
||||||
|
- name: Summary
|
||||||
|
run: |
|
||||||
|
echo "### Dev image published :rocket:" >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
echo "" >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
echo '```' >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
echo "${{ steps.meta.outputs.tags }}" >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
echo '```' >> "$GITHUB_STEP_SUMMARY"
|
||||||
@@ -20,3 +20,31 @@ docker compose up --build
|
|||||||
Then open `http://localhost:3001` and create an account. PostgreSQL data is kept
|
Then open `http://localhost:3001` and create an account. PostgreSQL data is kept
|
||||||
in the `postgres-data` Docker volume, so it survives app and container restarts.
|
in the `postgres-data` Docker volume, so it survives app and container restarts.
|
||||||
To remove the database as well, run `docker compose down -v`.
|
To remove the database as well, run `docker compose down -v`.
|
||||||
|
|
||||||
|
## CI/CD
|
||||||
|
|
||||||
|
On every push to `main`, GitHub Actions (`.github/workflows/ci-cd.yml`) runs the
|
||||||
|
test suite, then builds and publishes a dev image to the GitHub Container
|
||||||
|
Registry:
|
||||||
|
|
||||||
|
```
|
||||||
|
ghcr.io/odweta/fakturovac:dev
|
||||||
|
```
|
||||||
|
|
||||||
|
A commit-pinned tag (`ghcr.io/odweta/fakturovac:dev-<short-sha>`) is published
|
||||||
|
alongside `:dev` for traceability. Pull requests only run the test job.
|
||||||
|
|
||||||
|
To pull and run the latest dev image in a testing environment:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker login ghcr.io -u <your-github-username> # only needed if the package is private
|
||||||
|
docker pull ghcr.io/odweta/fakturovac:dev
|
||||||
|
docker run -d -p 3001:3001 \
|
||||||
|
-e DATABASE_URL=postgres://fakturovac:fakturovac@<db-host>:5432/fakturovac \
|
||||||
|
-e NODE_ENV=production \
|
||||||
|
ghcr.io/odweta/fakturovac:dev
|
||||||
|
```
|
||||||
|
|
||||||
|
The package's visibility (public/private) is managed under the repository's
|
||||||
|
**Packages** settings on GitHub; no extra secrets are required since the
|
||||||
|
workflow authenticates with the built-in `GITHUB_TOKEN`.
|
||||||
+12
-6
@@ -572,16 +572,22 @@ const renderInvoicePdf = async (document, invoice) => {
|
|||||||
document.y += 35;
|
document.y += 35;
|
||||||
document.moveTo(document.page.margins.left, document.y).lineTo(document.page.margins.left + pageWidth, document.y)
|
document.moveTo(document.page.margins.left, document.y).lineTo(document.page.margins.left + pageWidth, document.y)
|
||||||
.strokeColor(navy).lineWidth(1.5).stroke();
|
.strokeColor(navy).lineWidth(1.5).stroke();
|
||||||
document.y += 12;
|
const paymentCardHeight = 105;
|
||||||
const paymentTop = document.y;
|
const paymentTop = document.page.height - document.page.margins.bottom - paymentCardHeight;
|
||||||
document.roundedRect(document.page.margins.left, paymentTop, pageWidth, 165, 4).fillAndStroke('#f4f7fb', line);
|
const paymentLineHeight = 18;
|
||||||
|
const qrSize = paymentLineHeight * 3;
|
||||||
|
document.roundedRect(document.page.margins.left, paymentTop, pageWidth, paymentCardHeight, 4)
|
||||||
|
.fillAndStroke('#f4f7fb', line);
|
||||||
document.fillColor(navy).font(boldFont).fontSize(11).text('Platební údaje', document.page.margins.left + 10, paymentTop + 10);
|
document.fillColor(navy).font(boldFont).fontSize(11).text('Platební údaje', document.page.margins.left + 10, paymentTop + 10);
|
||||||
document.fillColor(bodyText).font(regularFont).fontSize(10)
|
document.fillColor(bodyText).font(regularFont).fontSize(10)
|
||||||
.text(`Číslo účtu: ${pdfText(payment.cisloUctu)}`, document.page.margins.left + 10, paymentTop + 35)
|
.text(`Číslo účtu: ${pdfText(payment.cisloUctu)}`, document.page.margins.left + 10, paymentTop + 35)
|
||||||
.text(`IBAN: ${pdfText(payment.iban)}`, document.page.margins.left + 10, paymentTop + 55)
|
.text(`IBAN: ${pdfText(payment.iban)}`, document.page.margins.left + 10, paymentTop + 35 + paymentLineHeight)
|
||||||
.text(`SWIFT: ${pdfText(payment.swift)}`, document.page.margins.left + 10, paymentTop + 75);
|
.text(`SWIFT: ${pdfText(payment.swift)}`, document.page.margins.left + 10, paymentTop + 35 + paymentLineHeight * 2);
|
||||||
if (qrBuffer) {
|
if (qrBuffer) {
|
||||||
document.image(qrBuffer, document.page.margins.left + pageWidth - 155, paymentTop + 10, { width: 145, height: 145 });
|
document.image(qrBuffer, document.page.margins.left + pageWidth - qrSize - 10, paymentTop + 30, {
|
||||||
|
width: qrSize,
|
||||||
|
height: qrSize
|
||||||
|
});
|
||||||
}
|
}
|
||||||
document.end();
|
document.end();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -312,13 +312,8 @@
|
|||||||
<select id="dueDateOption">
|
<select id="dueDateOption">
|
||||||
<option value="14">14 dní</option>
|
<option value="14">14 dní</option>
|
||||||
<option value="30">30 dní</option>
|
<option value="30">30 dní</option>
|
||||||
<option value="custom">Vlastní počet dní</option>
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group custom-due-days-group" hidden>
|
|
||||||
<label for="customDueDays">Počet dní</label>
|
|
||||||
<input id="customDueDays" type="number" min="1" step="1" value="14" />
|
|
||||||
</div>
|
|
||||||
<output id="dueDateDisplay" class="due-date-display"></output>
|
<output id="dueDateDisplay" class="due-date-display"></output>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -41,8 +41,6 @@ const savePasswordButton = document.getElementById("savePasswordButton");
|
|||||||
const cancelPasswordButton = document.getElementById("cancelPasswordButton");
|
const cancelPasswordButton = document.getElementById("cancelPasswordButton");
|
||||||
const passwordStatus = document.getElementById("passwordStatus");
|
const passwordStatus = document.getElementById("passwordStatus");
|
||||||
const dueDateOption = document.getElementById("dueDateOption");
|
const dueDateOption = document.getElementById("dueDateOption");
|
||||||
const customDueDays = document.getElementById("customDueDays");
|
|
||||||
const customDueDaysGroup = document.querySelector(".custom-due-days-group");
|
|
||||||
const dueDateDisplay = document.getElementById("dueDateDisplay");
|
const dueDateDisplay = document.getElementById("dueDateDisplay");
|
||||||
const paymentPresetSelect = document.getElementById("paymentPresetSelect");
|
const paymentPresetSelect = document.getElementById("paymentPresetSelect");
|
||||||
const paymentPresetName = document.getElementById("paymentPresetName");
|
const paymentPresetName = document.getElementById("paymentPresetName");
|
||||||
@@ -110,9 +108,7 @@ const getClientLabel = (client) => [
|
|||||||
|
|
||||||
const formatCzechDate = (dateValue) => new Date(`${dateValue}T00:00:00`).toLocaleDateString("cs-CZ");
|
const formatCzechDate = (dateValue) => new Date(`${dateValue}T00:00:00`).toLocaleDateString("cs-CZ");
|
||||||
|
|
||||||
const getDueDays = () => dueDateOption.value === "custom"
|
const getDueDays = () => Number.parseInt(dueDateOption.value, 10) || 14;
|
||||||
? Math.max(1, Number.parseInt(customDueDays.value, 10) || 14)
|
|
||||||
: Number.parseInt(dueDateOption.value, 10);
|
|
||||||
|
|
||||||
const getDueDate = () => {
|
const getDueDate = () => {
|
||||||
const dueDate = new Date();
|
const dueDate = new Date();
|
||||||
@@ -122,7 +118,6 @@ const getDueDate = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const updateDueDate = () => {
|
const updateDueDate = () => {
|
||||||
customDueDaysGroup.hidden = dueDateOption.value !== "custom";
|
|
||||||
dueDateDisplay.textContent = `Splatnost: ${formatCzechDate(getDueDate())}`;
|
dueDateDisplay.textContent = `Splatnost: ${formatCzechDate(getDueDate())}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user