Skip to content

Commit e17d036

Browse files
Merge branch 'main' into feature/integrate-graphql-codegen
2 parents f15fe68 + 7cd6d44 commit e17d036

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1326
-1594
lines changed

.github/ansible/production/proxy.yaml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
11
- name: Deploy Production Nest Proxy
22
hosts: production_nest_proxy
33
tasks:
4-
- name: Copy proxy docker-compose.yaml
5-
ansible.builtin.copy:
6-
src: '{{ github_workspace }}/proxy/docker-compose.yaml'
7-
dest: ~/docker-compose.yaml
8-
mode: '0644'
9-
10-
- name: Copy proxy configuration file
11-
ansible.builtin.copy:
12-
src: '{{ github_workspace }}/proxy/production.conf'
13-
dest: ~/production.conf
14-
mode: '0644'
15-
16-
- name: Copy headers.conf
17-
ansible.builtin.copy:
18-
src: '{{ github_workspace }}/proxy/headers.conf'
19-
dest: ~/headers.conf
20-
mode: '0644'
21-
22-
- name: Copy redirects.conf
23-
ansible.builtin.copy:
24-
src: '{{ github_workspace }}/proxy/redirects.conf'
25-
dest: ~/redirects.conf
4+
- name: Copy proxy configuration files
5+
copy:
6+
src: '{{ github_workspace }}/proxy/{{ item }}'
7+
dest: ~/
268
mode: '0644'
9+
loop:
10+
- blocked_ips.conf
11+
- docker-compose.yaml
12+
- headers.conf
13+
- production.conf
14+
- redirects.conf
2715

2816
- name: Retart services
2917
shell:

.github/ansible/staging/proxy.yaml

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
11
- name: Deploy Staging Nest Proxy
22
hosts: staging_nest_proxy
33
tasks:
4-
- name: Copy proxy docker-compose.yaml
5-
ansible.builtin.copy:
6-
src: '{{ github_workspace }}/proxy/docker-compose.yaml'
7-
dest: ~/docker-compose.yaml
4+
- name: Copy proxy configuration files
5+
copy:
6+
src: '{{ github_workspace }}/proxy/{{ item }}'
7+
dest: ~/
88
mode: '0644'
9+
loop:
10+
- blocked_ips.conf
11+
- docker-compose.yaml
12+
- headers.conf
13+
- redirects.conf
14+
- staging.conf
915

10-
- name: Copy proxy configuration file
11-
ansible.builtin.copy:
12-
src: '{{ github_workspace }}/proxy/staging.conf'
13-
dest: ~/staging.conf
14-
mode: '0644'
15-
16-
- name: Copy headers.conf
17-
ansible.builtin.copy:
18-
src: '{{ github_workspace }}/proxy/headers.conf'
19-
dest: ~/headers.conf
20-
mode: '0644'
21-
22-
- name: Copy redirects.conf
23-
ansible.builtin.copy:
24-
src: '{{ github_workspace }}/proxy/redirects.conf'
25-
dest: ~/redirects.conf
26-
mode: '0644'
27-
28-
- name: Update Docker images
16+
- name: Retart services
2917
shell:
30-
cmd: docker compose pull
18+
cmd: docker compose up -d --pull always
3119

32-
- name: Retart services
20+
- name: Prune docker images
3321
shell:
34-
cmd: docker compose restart
22+
cmd: docker image prune -f

.github/workflows/run-ci-cd.yaml

Lines changed: 242 additions & 115 deletions
Large diffs are not rendered by default.

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
exclude: (.github|pnpm-lock.yaml)
1111

1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.12.10
13+
rev: v0.12.11
1414
hooks:
1515
- id: ruff
1616
args:

backend/poetry.lock

Lines changed: 234 additions & 277 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cspell/pnpm-lock.yaml

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/__tests__/unit/components/Footer.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ describe('Footer', () => {
316316
expect(footer).toHaveClass(
317317
'mt-auto',
318318
'w-full',
319-
'border-t',
319+
'border-t-1',
320320
'bg-slate-200',
321321
'dark:bg-slate-800',
322322
'xl:max-w-full'

frontend/__tests__/unit/components/LoginPageContent.test.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,9 @@ describe('LoginPageContent', () => {
467467
expect(loginCard).toHaveClass(
468468
'w-full',
469469
'max-w-sm',
470-
'space-y-6',
470+
'flex',
471+
'flex-col',
472+
'gap-6',
471473
'rounded-2xl',
472474
'border',
473475
'border-gray-200',

frontend/__tests__/unit/components/MultiSearch.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ describe('Rendering', () => {
146146
'h-12',
147147
'w-full',
148148
'rounded-lg',
149-
'border',
149+
'border-1',
150150
'border-gray-300',
151151
'pl-10',
152152
'pr-10',

frontend/__tests__/unit/components/NavButton.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ describe('<NavButton />', () => {
213213
'hover:ring-1',
214214
'hover:ring-[#b0c7de]',
215215
'hover:ring-offset-0',
216-
'focus-visible:outline-none',
216+
'focus-visible:outline-hidden',
217217
'focus-visible:ring-1',
218218
'focus-visible:ring-ring'
219219
)
@@ -323,7 +323,7 @@ describe('<NavButton />', () => {
323323
it('should maintain focus visibility with focus-visible classes', () => {
324324
renderNavButton()
325325
const link = screen.getByRole('link')
326-
expect(link).toHaveClass('focus-visible:outline-none', 'focus-visible:ring-1')
326+
expect(link).toHaveClass('focus-visible:outline-hidden', 'focus-visible:ring-1')
327327
})
328328
})
329329

0 commit comments

Comments
 (0)