Skip to content

Commit bb0292f

Browse files
committed
4 spaces instead of 2
1 parent c6f8569 commit bb0292f

20 files changed

Lines changed: 1354 additions & 1250 deletions

File tree

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
name: Docker Build and Publish
22

33
on:
4-
push:
5-
branches: [master]
6-
tags: ["v*.*.*"]
7-
pull_request:
8-
branches: [master]
4+
push:
5+
branches: [master]
6+
tags: ["v*.*.*"]
7+
pull_request:
8+
branches: [master]
99

1010
env:
11-
REGISTRY: ghcr.io
12-
IMAGE_NAME: ${{ github.repository }}
11+
REGISTRY: ghcr.io
12+
IMAGE_NAME: ${{ github.repository }}
1313

1414
jobs:
15-
build-and-push:
16-
runs-on: ubuntu-latest
17-
permissions:
18-
contents: read
19-
packages: write
15+
build-and-push:
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
packages: write
2020

21-
steps:
22-
- name: Checkout repository
23-
uses: actions/checkout@v6.0.2
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v6.0.2
2424

25-
- name: Log in to GitHub Container Registry
26-
uses: docker/login-action@v3.7.0
27-
with:
28-
registry: ${{ env.REGISTRY }}
29-
username: ${{ github.actor }}
30-
password: ${{ secrets.GITHUB_TOKEN }}
25+
- name: Log in to GitHub Container Registry
26+
uses: docker/login-action@v3.7.0
27+
with:
28+
registry: ${{ env.REGISTRY }}
29+
username: ${{ github.actor }}
30+
password: ${{ secrets.GITHUB_TOKEN }}
3131

32-
- name: Extract metadata for Docker
33-
id: meta
34-
uses: docker/metadata-action@v5.10.0
35-
with:
36-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
37-
tags: |
38-
type=ref,event=branch
39-
type=ref,event=pr
40-
type=semver,pattern={{version}}
41-
type=semver,pattern={{major}}.{{minor}}
42-
type=sha
32+
- name: Extract metadata for Docker
33+
id: meta
34+
uses: docker/metadata-action@v5.10.0
35+
with:
36+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
37+
tags: |
38+
type=ref,event=branch
39+
type=ref,event=pr
40+
type=semver,pattern={{version}}
41+
type=semver,pattern={{major}}.{{minor}}
42+
type=sha
4343
44-
- name: Build and push Docker image
45-
uses: docker/build-push-action@v6.18.0
46-
with:
47-
context: .
48-
push: ${{ github.event_name != 'pull_request' }}
49-
tags: ${{ steps.meta.outputs.tags }}
50-
labels: ${{ steps.meta.outputs.labels }}
44+
- name: Build and push Docker image
45+
uses: docker/build-push-action@v6.18.0
46+
with:
47+
context: .
48+
push: ${{ github.event_name != 'pull_request' }}
49+
tags: ${{ steps.meta.outputs.tags }}
50+
labels: ${{ steps.meta.outputs.labels }}

.prettierrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"tabWidth": 4,
3+
"useTabs": false
4+
}

.vscode/tasks.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "2.0.0",
3-
"tasks": [
4-
{
5-
"label": "Run Prettier and Ruff",
6-
"type": "shell",
7-
"command": "uvx ruff check --fix && bunx prettier . --write",
8-
"group": {
9-
"kind": "build",
10-
"isDefault": true
11-
},
12-
"problemMatcher": []
13-
}
14-
]
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Run Prettier and Ruff",
6+
"type": "shell",
7+
"command": "uvx ruff check --fix && bunx prettier . --write",
8+
"group": {
9+
"kind": "build",
10+
"isDefault": true
11+
},
12+
"problemMatcher": []
13+
}
14+
]
1515
}

compose.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
# database or a cache. For examples, see the Awesome Compose repository:
99
# https://github.com/docker/awesome-compose
1010
services:
11-
server:
12-
build:
13-
context: .
14-
ports:
15-
- 8000:8000
11+
server:
12+
build:
13+
context: .
14+
ports:
15+
- 8000:8000
1616

1717
# The commented out section below is an example of how to define a PostgreSQL
1818
# database that your application can use. `depends_on` tells Docker Compose to

notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Feedback from prototype on commit ece5b6f251f4d88116b7c7f8a082741df6cac693
1313
- [ ] Is there a map of rooms?
1414
- [ ] Can you see when rooms are free?
1515
- [ ] Do you have types of rooms?
16-
- [ ] Sizes
17-
- [ ] Conference etc.
16+
- [ ] Sizes
17+
- [ ] Conference etc.
1818
- [ ] Can you resize the message box in the support notes?
1919
- [ ] Can you have separate tabs in Admin rather than scrolling down.
2020
- [x] Can you use 2FA for users' password via email.

0 commit comments

Comments
 (0)