Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hotfix] main-suyeon 브랜치 최종 동기화 및 자잘한 이슈 적용 #128

Merged
merged 26 commits into from
Jul 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a85e599
Update create-jira-issue.yml - branch suyen
hooni0918 Jun 30, 2024
ae91aa7
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
c4a843e
Update create-jira-issue.yml - 재수정
hooni0918 Jun 30, 2024
9703716
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
995c7b4
Update create-jira-issue.yml - log추가
hooni0918 Jun 30, 2024
13d71b6
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
b33a975
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
a6030d6
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
1885e40
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
c943533
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
e91dd2a
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
8be4a4b
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
7981a65
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
e9352b8
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
55addab
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
98d3a54
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
eb3947e
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
620d8f6
Update create-jira-issue.yml
hooni0918 Jun 30, 2024
8fed3af
Update create-jira-issue.ymlㅇㅇ
hooni0918 Jun 30, 2024
ac32819
feat:애플로그인 기능 추가
hooni0918 Jul 1, 2024
275b759
Merge pull request #111 from OMZigak/feat/#110-AppleLogin
youz2me Jul 3, 2024
6550629
hotfix/#126 suyeon 브랜치 병합 및 이슈 사항 적용
youz2me Jul 6, 2024
a5bf39e
fix: 충돌 해결
JinUng41 Jul 7, 2024
25ce428
fix: 충돌 해결
JinUng41 Jul 7, 2024
e5de9c8
fix/#128 Icon 폴더 추가
youz2me Jul 7, 2024
544465b
hotfix/126 컬러 에셋 이름 변경
youz2me Jul 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 25 additions & 53 deletions .github/workflows/create-jira-issue.yml
Original file line number Diff line number Diff line change
@@ -1,77 +1,49 @@
name: Create Jira Issue and Sync with GitHub
name: Create Branch from Issue

on:
issues:
types: [opened]
push:
branches:
- 'feat/*'
- 'fix/*'
- 'docs/*'
- 'setting/*'
- 'add/*'
- 'refactor/*'
- 'chore/*'

jobs:
create_jira_issue:
if: github.event_name == 'issues'
create_branch:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Create Jira issue
env:
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
JIRA_BASEURL: ${{ secrets.JIRA_BASEURL }}
JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
JIRA_PROJECT_KEY: ${{ secrets.JIRA_PROJECT_KEY }}
- name: Setup Git Config
run: |
ISSUE_TITLE="${{ github.event.issue.title }}"

JSON_DATA=$(jq -n \
--arg key "$JIRA_PROJECT_KEY" \
--arg summary "$ISSUE_TITLE" \
'{
"fields": {
"project": {
"key": $key
},
"summary": $summary,
"description": "No description provided.",
"issuetype": {
"name": "Task"
}
}
}')

echo "JSON Data: $JSON_DATA"
RESPONSE=$(curl -D- \
-u "$JIRA_EMAIL:$JIRA_API_TOKEN" \
-X POST \
--data "$JSON_DATA" \
-H "Content-Type: application/json" \
"$JIRA_BASEURL/rest/api/2/issue/")
echo "Jira API response: $RESPONSE"
JIRA_ISSUE_KEY=$(echo "$RESPONSE" | grep -oP '(?<=key\":\")\w+-\d+')
echo "JIRA_ISSUE_KEY=$JIRA_ISSUE_KEY" >> $GITHUB_ENV
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: Create branch for the issue
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
export LANG=en_US.UTF-8
ISSUE_NUMBER=${{ github.event.issue.number }}
ISSUE_TITLE="${{ github.event.issue.title }}"
# 접두사 추출
PREFIX=$(echo "$ISSUE_TITLE" | grep -oE '^(feat|fix|docs|setting|add|refactor|chore)')
if [ -z "$PREFIX" ]; then PREFIX="feature"; fi
TITLE_NO_PREFIX=$(echo "$ISSUE_TITLE" | sed -e "s/$PREFIX : //")
CLEAN_TITLE=$(echo "$TITLE_NO_PREFIX" | iconv -c -f utf-8 -t ascii//TRANSLIT | sed 's/[^a-zA-Z0-9]//g')
BRANCH_NAME="${PREFIX}/#${ISSUE_NUMBER}-${CLEAN_TITLE}"
# 브랜치 이름 생성
BRANCH_NAME="${PREFIX}/#${ISSUE_NUMBER}-$(echo "$ISSUE_TITLE" | iconv -c -f utf-8 -t ascii//TRANSLIT | sed 's/[^a-zA-Z0-9-]//g')"
echo "Creating branch with name: $BRANCH_NAME"
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

git branch
git status

git checkout -b "$BRANCH_NAME"
git push "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}" "$BRANCH_NAME"
if [ $? -ne 0 ]; then
echo "Checkout to $BRANCH_NAME failed."
exit 1
else
echo "Checkout to $BRANCH_NAME completed."
fi

git push --set-upstream "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}" "$BRANCH_NAME"
if [ $? -ne 0 ]; then
echo "Failed to push branch $BRANCH_NAME"
exit 1
else
echo "Pushed $BRANCH_NAME successfully."
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*
Expand Down
20 changes: 20 additions & 0 deletions KkuMulKum.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
78B9286E2C29402C006D9942 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B9286D2C29402C006D9942 /* SceneDelegate.swift */; };
78B928752C29402E006D9942 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78B928742C29402E006D9942 /* Assets.xcassets */; };
78B928782C29402E006D9942 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78B928762C29402E006D9942 /* LaunchScreen.storyboard */; };
DD865B642C3920F000C351A2 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD865B632C3920F000C351A2 /* LoginViewController.swift */; };
DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */; };
DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE742C385FB1007C6059 /* HomeViewController.swift */; };
DDA2EE772C385FC3007C6059 /* GroupListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */; };
Expand Down Expand Up @@ -95,6 +96,7 @@
78B928742C29402E006D9942 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
78B928772C29402E006D9942 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
78B928792C29402E006D9942 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DD865B632C3920F000C351A2 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
DDA2EE742C385FB1007C6059 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupListViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -210,6 +212,22 @@
path = KkuMulKum;
sourceTree = "<group>";
};
DD865B652C3920F600C351A2 /* Onboarding */ = {
isa = PBXGroup;
children = (
DD865B662C39210E00C351A2 /* Login */,
);
path = Onboarding;
sourceTree = "<group>";
};
DD865B662C39210E00C351A2 /* Login */ = {
isa = PBXGroup;
children = (
DD865B632C3920F000C351A2 /* LoginViewController.swift */,
);
path = Login;
sourceTree = "<group>";
};
DDA2EE7B2C386078007C6059 /* Home */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -258,6 +276,7 @@
DDA2EE7B2C386078007C6059 /* Home */,
DDA2EE7C2C38607F007C6059 /* GroupList */,
DDA2EE7D2C386087007C6059 /* MyPage */,
DD865B652C3920F600C351A2 /* Onboarding */,
);
path = Source;
sourceTree = "<group>";
Expand Down Expand Up @@ -482,6 +501,7 @@
DED5DBF22C34534A006ECE7E /* BaseCollectionReusableView.swift in Sources */,
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */,
DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */,
DD865B642C3920F000C351A2 /* LoginViewController.swift in Sources */,
DE254AAC2C31192400A4015E /* UILabel+.swift in Sources */,
DE254AB72C3119D000A4015E /* ReuseIdentifiable.swift in Sources */,
DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */,
Expand Down
6 changes: 6 additions & 0 deletions KkuMulKum/Resource/Assets.xcassets/Icon/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "back.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "camera.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "check.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "date.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "delete.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "deleteDark.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "group.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "groupPlus.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "home.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "my.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "penalty.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading