Skip to content

Commit

Permalink
Merge pull request #579 from woowacourse-teams/develop
Browse files Browse the repository at this point in the history
[release] v1.0.1
  • Loading branch information
hyeonic authored Sep 14, 2022
2 parents b0124fb + 3d7e6bc commit 9db5a87
Show file tree
Hide file tree
Showing 38 changed files with 1,223 additions and 539 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/backend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,15 @@ jobs:
run: ./gradlew build

- name: Publish Unit Test Results
uses: EnricoMi/publish-unit-test-result-action@v1
if: ${{ always() }}
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
files: build/test-results/**/*.xml
junit_files: ${{ github.workspace }}/backend/build/test-results/**/*.xml

- name: Add coverage to PR
id: jacoco
uses: madrapps/[email protected]
with:
paths: ${{ github.workspace }}/backend/build/jacoco/index.xml
token: ${{ secrets.GITHUB_TOKEN }}

2 changes: 1 addition & 1 deletion backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ sonarqube {
property "sonar.sources", "src"
property "sonar.language", "java"
property "sonar.sourceEncoding", "UTF-8"
property "sonar.profile", "Sonar way"
property "sonar.profile", "Dallog Custom Java Ruleset"
property "sonar.java.binaries", "${buildDir}/classes"
property "sonar.test.inclusions", "**/*Test.java"
property 'sonar.exclusions', '**/jacoco/**'
Expand Down
9 changes: 9 additions & 0 deletions frontend/src/api/profile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import dallogApi from './';
const profileApi = {
endpoint: {
get: '/api/members/me',
delete: '/api/members/me',
patch: '/api/members/me',
},
headers: {
Expand All @@ -20,6 +21,14 @@ const profileApi = {
return response;
},

delete: async (accessToken: string) => {
const response = await dallogApi.delete(profileApi.endpoint.delete, {
headers: { ...profileApi.headers, Authorization: `Bearer ${accessToken}` },
});

return response;
},

patch: async (accessToken: string, body: Pick<ProfileType, 'displayName'>) => {
const response = await dallogApi.patch(profileApi.endpoint.patch, body, {
headers: { ...profileApi.headers, Authorization: `Bearer ${accessToken}` },
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

72 changes: 0 additions & 72 deletions frontend/src/components/FilterCategoryList/FilterCategoryList.tsx

This file was deleted.

10 changes: 10 additions & 0 deletions frontend/src/components/Profile/Profile.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ const logoutButtonStyle = ({ colors }: Theme) => css`
font-size: 3rem;
`;

const withdrawalButtonStyle = ({ colors }: Theme) => css`
padding: 2rem 3rem;
border: 1px solid ${colors.RED_400};
border-radius: 3px;
font-size: 3rem;
color: ${colors.RED_400};
`;

const menu = ({ colors }: Theme) => css`
position: relative;
Expand Down Expand Up @@ -126,4 +135,5 @@ export {
nameStyle,
nameButtonStyle,
skeletonStyle,
withdrawalButtonStyle,
};
Loading

0 comments on commit 9db5a87

Please sign in to comment.