Skip to content

Commit 705a61b

Browse files
authored
Merge branch 'devopshobbies:master' into master
2 parents 3dcf0ee + d2f7376 commit 705a61b

File tree

100 files changed

+9
-10689
lines changed

Some content is hidden

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

100 files changed

+9
-10689
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
needs: releaseGithub
4343
steps:
4444
- uses: actions/checkout@v4
45+
with:
46+
submodules: recursive
47+
4548
- name: install requirements
4649
run: pip install -r requirements.txt
4750

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "admin-panel"]
2+
path = admin-panel
3+
url = https://github.com/devopsgpt/admin-panel.git
4+
branch = master

admin-panel

Submodule admin-panel added at 5b9c0c1

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020

2121
web:
2222
build:
23-
context: ./web
23+
context: ./admin-panel
2424
dockerfile: Dockerfile
2525
args:
2626
VITE_API_CLIENT_BASE_URL: "http://localhost:8080/api/"

web/.editorconfig

Lines changed: 0 additions & 12 deletions
This file was deleted.

web/.env.example

Lines changed: 0 additions & 1 deletion
This file was deleted.

web/.gitignore

Lines changed: 0 additions & 24 deletions
This file was deleted.

web/.prettierignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

web/.prettierrc

Lines changed: 0 additions & 10 deletions
This file was deleted.

web/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)