Skip to content

Commit e9dd7d8

Browse files
committed
Merge branch 'main' into feature/meta-set-agency
2 parents dca5284 + 579f195 commit e9dd7d8

File tree

280 files changed

+33028
-3982
lines changed

Some content is hidden

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

280 files changed

+33028
-3982
lines changed

.commitlintrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"$schema": "https://json.schemastore.org/commitlintrc.json",
3+
"extends": [
4+
"@commitlint/config-conventional"
5+
],
6+
"rules": {
7+
"subject-case": [
8+
2,
9+
"always",
10+
[
11+
"lower-case",
12+
"sentence-case",
13+
"start-case",
14+
"upper-case"
15+
]
16+
]
17+
}
18+
}

.env

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ IMWEB_TEST_API_SECRET=d
3737

3838
# KAKAOTALK
3939
KAKAO_TALK_CLIENT_ID=a
40-
KAKAO_TALK_TEST_REFRESH_TOKEN=b
40+
KAKAO_TALK_CLIENT_SECRET=b
41+
KAKAO_TALK_TEST_REFRESH_TOKEN=c
42+
43+
#KOREA_EXIM_BANK
44+
KOREA_EXIM_BANK_API_KEY=a
4145

4246
# META (instgram, facebook)
4347
META_CLIENT_ID=a
@@ -50,6 +54,10 @@ NAVER_CLIENT_SECRET=b
5054
# OPENAI
5155
OPENAI_API_KEY=a
5256

57+
# OPEN_DATA
58+
OPEN_DATA_KOREA_METEOROLOGICAL_ADMINISTRATION=a
59+
OPEN_DATA_API_KEY=b
60+
5361
# SERP
5462
SERP_API_KEY=a
5563

@@ -60,11 +68,25 @@ TEST_SWEET_TRACKER_T_INVOICE=b
6068
# TYPEFORM
6169
TYPEFORM_PERSONAL_ACCESS_KEY=a
6270

71+
# WORK24
72+
WORK24_SUBJECT_KEY=a # 학과 정보
73+
WORK24_PSYCHOLOGICAL_TEST_KEY=b # 심리검사
74+
WORK24_OCCUPATION_KEY=c # 직무 정보
75+
WORK24_COMMON_CODE_KEY=d # 공통 코드
76+
WORK24_JOB_INFO_KEY=d # 직업 정보
77+
6378
# ZOOM
6479
ZOOM_TEST_AUTHORIZATION_CODE=a
6580
ZOOM_TEST_REFRESH_TOKEN=b
6681
ZOOM_TEST_AUTHORIZATION_HEADER=c
6782

83+
# Stability AI
84+
STABILITY_AI_API_KEY=a
85+
STABILITY_AI_HOST=https://api.somewhere.com
86+
STABILITY_AI_ENGINE_ID=c
87+
STABILITY_AI_DEFAULT_STEP=45
88+
STABILITY_AI_CFG_SCALE=6
89+
6890

6991
######################################################
7092
# INHOUSE SERVERS
@@ -78,3 +100,8 @@ CONNECTOR_BRANCH_API_SERVER=https://api.somewhere.com
78100
# LLM PROXY
79101
HAMLET_URL=https://api.somewhere.com
80102
SHAKESPEARE_URL=https://api.somewhere.com
103+
HAMLET_CHAT_COMPLETION_REQUEST_ENDPOINT=a
104+
HAMLET_HEADER_KEY_NAME=b
105+
HAMLET_HEADER_KEY_VALUE=c
106+
HAMLET_PROMPT_NODE_MODEL_NAME=some_model
107+
HAMLET_PROMPT_NODE_REQUEST_ENDPOINT=d

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# CheckList
2+
- [ ] passed test code
3+
- [ ] api tags
4+
- [ ] RouteIcon
5+
- [ ] docs (summary, input, returns )

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
env:
3737
SECRETS_CONTEXT: ${{ toJson(secrets) }}
3838
- name: Run Test Program
39-
run: npm run test
39+
run: npm run test -- --exclude sweet_tracker korea_exim
Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,45 @@
1-
name: website
1+
name: Version Bump
2+
23
on:
34
push:
45
branches:
56
- main
67
paths:
7-
- "src/**"
8-
- "package.json"
9-
- "nestia.config.js"
10-
- "website/**"
11-
- "website/package.json"
12-
- ".github/workflows/website.yml"
13-
14-
permissions:
15-
contents: write
8+
- "src/api/structures/**"
9+
- "src/controllers/**"
1610

1711
jobs:
18-
deploy:
12+
version_bump:
1913
runs-on: ubuntu-latest
2014
steps:
21-
- uses: actions/checkout@v4
22-
- uses: actions/setup-node@v4
15+
- name: Checkout repository
16+
uses: actions/checkout@v2
17+
18+
- name: Setup Node.js
19+
uses: actions/setup-node@v2
2320
with:
2421
node-version: 20.x
25-
- name: Root Install
26-
run: npm install
22+
2723
- name: Secrets to Env
2824
run: |
2925
rm .env
3026
jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$SECRETS_CONTEXT" > .env
3127
env:
3228
SECRETS_CONTEXT: ${{ toJson(secrets) }}
29+
3330
- name: Build
3431
working-directory: website
3532
run: npm install && npm run build
33+
3634
- name: Deploy
3735
uses: JamesIves/github-pages-deploy-action@v4
3836
with:
3937
branch: gh-pages
4038
folder: ./website/out
39+
40+
- name: Bump version
41+
run: |
42+
git config --local user.email "[email protected]"
43+
git config --local user.name "GitHub Actions"
44+
npm version patch -m "Bump version to %s [skip ci]"
45+
git push --follow-tags

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ Session.vim
1010

1111
*.log
1212

13-
**/*.DS_Store
13+
**/*.DS_Store
14+
15+
hancell_test_file.cell

.husky/_/.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
applypatch-msg
2+
h
3+
post-applypatch
4+
post-checkout
5+
post-commit
6+
post-rewrite
7+
pre-applypatch
8+
pre-auto-gc
9+
pre-push
10+
pre-rebase
11+
prepare-commit-msg

.husky/_/commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/husky.sh"
3+
4+
npx commitlint --edit "$1"

.husky/_/husky.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# common commands
2+
echo "husky worked..."

.husky/_/post-merge

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/husky.sh"
3+
4+
if ! which npm > /dev/null;
5+
then
6+
echo
7+
echo 'You should run the package installation since there are changes in the package locking file.'
8+
echo 'Please install npm first, and put the command below:'
9+
echo
10+
echo 'npm ci'
11+
echo
12+
exit 0
13+
fi;
14+
15+
# 현재 `HEAD` 포인터와 병합하기 전 `HEAD(ORIG_HEAD)` 포인터 사이에 변경된 파일 목록 중 `package-lock.json` 파일이 있는지 확인
16+
if [[ $(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD) =~ 'package-lock.json' ]];
17+
then # `npm.lock` 파일이 변경 되었다면 의존성 설치
18+
echo
19+
echo 'The package locking file has been modified and will run the installation silently.'
20+
echo
21+
npm ci
22+
else
23+
echo
24+
echo 'Did not run the package installation since there are no changes in the package locking file.'
25+
echo
26+
fi;

0 commit comments

Comments
 (0)