Skip to content

Commit 00a03e8

Browse files
authored
chore: 0.5.1 버전을 배포한다.
chore: 0.5.1 버전을 배포한다.
2 parents 4fbd193 + 359caa0 commit 00a03e8

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

backend/src/main/java/com/woowacourse/naepyeon/repository/rollingpaper/RollingpaperRepositoryImpl.java

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public Page<Rollingpaper> findByAddresseeId(final Long addresseeId, final Pageab
2626
final List<Rollingpaper> content = queryFactory
2727
.selectFrom(rollingpaper)
2828
.where(isAddresseeIdEq(addresseeId))
29+
.orderBy(rollingpaper.id.desc())
2930
.offset(pageRequest.getOffset())
3031
.limit(pageRequest.getPageSize())
3132
.fetch();

backend/src/test/java/com/woowacourse/naepyeon/acceptance/MemberAcceptanceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ void findReceivedRollingpapers() {
8484
final List<ReceivedRollingpaperResponseDto> actual = receivedRollingpapersResponseDto.getRollingpapers();
8585
final String teamName = "woowacourse-4th";
8686
final List<ReceivedRollingpaperResponseDto> expected = List.of(
87-
new ReceivedRollingpaperResponseDto(rollingpaperId1, rollingpaperTitle1, teamId, teamName),
88-
new ReceivedRollingpaperResponseDto(rollingpaperId2, rollingpaperTitle2, teamId, teamName)
87+
new ReceivedRollingpaperResponseDto(rollingpaperId2, rollingpaperTitle2, teamId, teamName),
88+
new ReceivedRollingpaperResponseDto(rollingpaperId1, rollingpaperTitle1, teamId, teamName)
8989
);
9090

9191
assertThat(actual)

backend/src/test/java/com/woowacourse/naepyeon/repository/RollingpaperRepositoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ void findByMemberIdAndPageRequest() {
144144
PageRequest.of(1, 3));
145145

146146
assertAll(
147-
() -> assertThat(actual).contains(rollingPaper4, rollingPaper5, rollingPaper6),
148-
() -> assertThat(actual).doesNotContain(rollingPaper1, rollingPaper2, rollingPaper3, rollingPaper7)
147+
() -> assertThat(actual).contains(rollingPaper4, rollingPaper3, rollingPaper2),
148+
() -> assertThat(actual).doesNotContain(rollingPaper1, rollingPaper5, rollingPaper6, rollingPaper7)
149149
);
150150
}
151151

backend/src/test/java/com/woowacourse/naepyeon/service/RollingpaperServiceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ void findReceivedRollingpapers() {
268268
rollingpaperService.findReceivedRollingpapers(memberId, 0, 2);
269269
final List<ReceivedRollingpaperResponseDto> actual = receivedRollingpapersResponseDto.getRollingpapers();
270270
final List<ReceivedRollingpaperResponseDto> expected = List.of(
271-
new ReceivedRollingpaperResponseDto(rollingpaperId1, ROLLINGPAPER_TITLE, teamId,
272-
teamRequestDto.getName()),
273271
new ReceivedRollingpaperResponseDto(rollingpaperId2, ROLLINGPAPER_TITLE, teamId,
272+
teamRequestDto.getName()),
273+
new ReceivedRollingpaperResponseDto(rollingpaperId1, ROLLINGPAPER_TITLE, teamId,
274274
teamRequestDto.getName())
275275
);
276276

frontend/src/pages/LoginPage/index.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ const StyledLandingImage2 = styled(Landing2Image)`
173173
const StyledSocialLoginButtonContainer = styled.div`
174174
position: -webkit-sticky;
175175
position: sticky;
176-
top: 80vh;
176+
top: 70vh;
177177
178178
display: flex;
179179
flex-direction: column;
@@ -183,6 +183,10 @@ const StyledSocialLoginButtonContainer = styled.div`
183183
width: 80%;
184184
margin: 0 auto;
185185
186+
@media only screen and (min-width: 600px) {
187+
top: 80vh;
188+
}
189+
186190
@media only screen and (min-width: 960px) {
187191
width: 500px;
188192
}

frontend/src/pages/RollingpaperCreationPage/components/Step1.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const Step1 = (
6666

6767
const StyledCardList = styled.div`
6868
display: grid;
69-
grid-template-columns: repeat(1, 1fr);
69+
grid-template-columns: repeat(2, 1fr);
7070
grid-row-gap: 24px;
7171
grid-column-gap: 10px;
7272
justify-items: center;

0 commit comments

Comments
 (0)