Skip to content

Commit 515b415

Browse files
authored
Merge pull request #12 from ryo-arima/develop
Develop
2 parents 27a02de + fed7e09 commit 515b415

36 files changed

+51
-270
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ dist-ssr
2222
*.njsproj
2323
*.sln
2424
*.sw?
25+
26+
tool/back/etc/mark1/main.yaml

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "src/util"]
2+
path = src/util
3+
url = https://github.com/ryo-arima/mark1-util-ts

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ s:
22
git add .
33
commit-emoji
44
git push origin develop
5+
6+
exec-backend:
7+
docker exec -it mark1 /bin/bash

docker-compose.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ services:
33
image: ryoarima/rocky-arm-mark1:latest
44
container_name: mark1
55
network_mode: host
6+
volumes:
7+
- ./tool/back/etc/mark1:/etc/mark1
68
depends_on:
79
- mysql
810
- redis

src/util

Submodule util added at e576286

src/util/back/controller/common.ts

Whitespace-only changes.

src/util/back/controller/group.ts

Whitespace-only changes.

src/util/back/controller/member.ts

Whitespace-only changes.

src/util/back/controller/user.ts

Whitespace-only changes.

src/util/back/repository/common.ts

Whitespace-only changes.

src/util/back/repository/group.ts

Whitespace-only changes.

src/util/back/repository/member.ts

-73
This file was deleted.

src/util/back/repository/user.ts

-103
This file was deleted.

src/util/back/usecase/common.ts

Whitespace-only changes.

src/util/back/usecase/group.ts

Whitespace-only changes.

src/util/back/usecase/member.ts

Whitespace-only changes.

src/util/back/usecase/user.ts

Whitespace-only changes.

src/util/config.ts

-7
This file was deleted.

src/util/entity/form/common.ts

Whitespace-only changes.

src/util/entity/form/group.ts

Whitespace-only changes.

src/util/entity/form/member.ts

Whitespace-only changes.

src/util/entity/form/user.ts

Whitespace-only changes.

src/util/entity/request/group.ts

-9
This file was deleted.

src/util/entity/request/member.ts

-11
This file was deleted.

src/util/entity/request/user.ts

-11
This file was deleted.

src/util/entity/response/common.ts

-10
This file was deleted.

src/util/entity/response/group.ts

-14
This file was deleted.

src/util/entity/response/member.ts

-16
This file was deleted.

src/util/entity/response/user.ts

-16
This file was deleted.

src/util/entity/store/common.ts

Whitespace-only changes.

src/util/entity/store/group.ts

Whitespace-only changes.

src/util/entity/store/member.ts

Whitespace-only changes.

src/util/entity/store/user.ts

Whitespace-only changes.

src/util/front/controller/common.ts

Whitespace-only changes.

src/util/front/repository/common.ts

Whitespace-only changes.
+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
Application:
2+
Common:
3+
MemberRoles:
4+
- group_admin
5+
- group_editor
6+
- group_viewer
7+
Server:
8+
port: 8000
9+
admin:
10+
emails:
11+
12+
jwt:
13+
key: "secret"
14+
mail:
15+
host: "smtp.mail.com"
16+
port: 587
17+
user: ""
18+
tmp:
19+
letters: ""
20+
length: 6
21+
Client:
22+
HomePath: "etc/.mark1"
23+
ServerEndpoint: "http://localhost:8000"
24+
UserEmail: "[email protected]"
25+
UserPassword: "secret"
26+
HomeDir: "etc/.mark1"
27+
28+
MySQL:
29+
host: 127.0.0.1
30+
user: root
31+
pass: mysql
32+
port: 3306
33+
db: mark1
34+
35+
Redis:
36+
host: 127.0.0.1
37+
port: 6379
38+
user: "default"
39+
pass: "mysecretpassword"
40+
db: 0

0 commit comments

Comments
 (0)