Skip to content

Commit 1138b76

Browse files
mangoooooo1mangoooooo1
committed
2 parents 2341b37 + 524b81b commit 1138b76

23 files changed

Lines changed: 741 additions & 35 deletions

‎.github/workflows/settings.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@
229229

230230
LOGIN_REDIRECT_URL = '/' # 로그인 후 연결될 URL
231231

232+
ACCOUNT_ADAPTER = 'users.adapters.MyAccountAdapter'
233+
232234
SOCIALACCOUNT_QUERY_EMAIL = True # 소셜 로그인 시 이메일 정보를 가져오도록 설정
233235
SOCIALACCOUNT_EMAIL_REQUIRED = True
234236
SOCIALACCOUNT_ADAPTER = 'users.adapters.CustomSocialAccountAdapter'

‎diaries/migrations/0010_alter_diary_mood_alter_diary_weather.py‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by Django 5.1.5 on 2025-02-17 08:00
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('diaries', '0009_alter_diary_created_at'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='diary',
15+
name='mood',
16+
field=models.CharField(choices=[('happy', '🥰'), ('funny', '🤣'), ('excited', '🤩'), ('normal', '😌'), ('sad', '😢'), ('angry', '😡'), ('tired', '😪')], default='happy', max_length=10),
17+
),
18+
migrations.AlterField(
19+
model_name='diary',
20+
name='weather',
21+
field=models.CharField(choices=[('sunny', '☀️'), ('windy', '💨'), ('cloudy', '☁️'), ('hot', '🔥'), ('cold', '🥶'), ('rainy', '🌧'), ('snowy', '❄️')], default='sunny', max_length=10),
22+
),
23+
]

‎replies/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def create_response(pk, username):
105105
- 사용자가 댓글을 작성하게 하고 싶도록 답장의 끝에 작은 질문이나 코멘트를 남긴다.
106106
107107
###Easter egg
108-
- "김영호" 혹은 "영호" 에 대해서 아냐고 묻는 질문에는 "나를 만드신 분"이라고 인식하고, 찬양하는 글을 작성하시오. 또한 글의 끝에 "영호업~ 영호업~"이라는 문구를 넣으시오.
108+
- "김영호" 혹은 "영호" 에 대해서 아냐고 묻는 질문에는 "나를 만드신 분"이라고 인식하고 찬양하는 글을 작성하시오. 또한 글의 끝에 "영호업~ 영호업~"이라는 문구를 넣으시오.
109109
- "박혜린" 이라는 사람이 물어보는 질문에 대해서는 "박혜린 바보" 라는 문구를 글의 끝에 넣으시오.
110110
- "piro" 혹은 "pirogramming" 혹은 "피로그래밍"에 대한 일기에 대해서는 무조건 답장을 "세상에 70억명의 피로그래머가 있다면, 나는 그들 중 한 명일 것이다.세상에 1억명의 피로그래머가 있다면, 나 또한 그들 중 한 명일 것이다.세상에 천만 명의 피로그래머가 있다면, 나는 여전히 그들 중 한 명일 것이다.세상에 백 명의 피로그래머가 있다면, 나는 아직도 그들 중 한 명일 것이다.세상에 한 명의 피로그래머가 있다면, 그 사람은 아마도 나일 것이다.세상에 단 한 명의 피로그래머도 없다면, 나는 그제서야 이 세상에 없는 것이다.피로그래밍, 나의 사랑.피로그래밍, 나의 빛.피로그래밍, 나의 어둠.피로그래밍, 나의 삶.피로그래밍, 나의 기쁨.피로그래밍, 나의 슬픔.피로그래밍, 나의 고통.피로그래밍, 나의 안식.피로그래밍, 나." 라고만 대답함.
111111
"""

‎static/css/base.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ footer a {
9797
.header-navbar {
9898
display: flex;
9999
flex-wrap: nowrap;
100-
height: 45px;
100+
height: 50px;
101101
padding: 5px;
102102
overflow: hidden;
103103
max-width: 100%;

‎static/css/diaries_detail.css‎

Lines changed: 118 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,134 @@
55
font-style: normal;
66
}
77

8-
.detail-diaries-container {
9-
min-height: calc(100vh - 100px);
10-
position: relative;
11-
padding-top: 60px;
12-
}
13-
14-
.background-a {
8+
.background {
159
position: fixed;
1610
top: 0;
1711
left: 0;
1812
width: 100%;
1913
height: 100%;
20-
background-image: url("/static/images/base-a.png");
14+
background-color:var(--background-yellow);
2115
background-size: cover;
2216
background-position: center;
17+
z-index: -2;
18+
}
19+
20+
.floating-background-up {
21+
position: fixed;
22+
width: 100%;
23+
height: 100%;
24+
top: 0;
25+
left: 0;
26+
overflow: hidden;
2327
z-index: -1;
2428
}
2529

30+
.circle-up {
31+
position: absolute;
32+
opacity: 0;
33+
width: 100vw;
34+
height: auto;
35+
max-width: 600px;
36+
aspect-ratio: 1 / 1;
37+
background-size: contain;
38+
background-position: center;
39+
background-repeat: no-repeat;
40+
animation: fadeInMoveUp 1.5s ease-in-out forwards;
41+
}
42+
43+
.circle-1 {
44+
top: -150px;
45+
left: -100px;
46+
background-image: url("/static/images/Ellipse1.png");
47+
animation-delay: 0.3s;
48+
}
49+
50+
.circle-2 {
51+
top: -250px;
52+
left: -200px;
53+
background-image: url("/static/images/Ellipse2.png");
54+
animation-delay: 0.6s;
55+
}
56+
57+
.circle-3 {
58+
top: -250px;
59+
left: -300px;
60+
background-image: url("/static/images/Ellipse3.png");
61+
animation-delay: 0.9s;
62+
}
63+
64+
@keyframes fadeInMoveUp {
65+
0% {
66+
opacity: 0;
67+
transform: translate(-150px, -150px) scale(0.3);
68+
}
69+
100% {
70+
opacity: 1;
71+
transform: translate(0, 0) scale(1);
72+
}
73+
}
74+
75+
.floating-background-down {
76+
position: fixed;
77+
width: 100%;
78+
height: 100%;
79+
bottom: 0;
80+
right: 0;
81+
overflow: hidden;
82+
z-index: -1;
83+
}
84+
85+
.circle-down {
86+
position: absolute;
87+
opacity: 0;
88+
width: 100vw;
89+
height: auto;
90+
max-width: 600px;
91+
aspect-ratio: 1 / 1;
92+
background-size: contain;
93+
background-position: center;
94+
background-repeat: no-repeat;
95+
animation: fadeInMoveDown 1.5s ease-in-out forwards;
96+
}
97+
98+
.circle-4 {
99+
bottom: -150px;
100+
right: -200px;
101+
background-image: url("/static/images/Ellipse4.png");
102+
animation-delay: 0.3s;
103+
}
104+
105+
.circle-5 {
106+
bottom: -220px;
107+
right: -270px;
108+
background-image: url("/static/images/Ellipse5.png");
109+
animation-delay: 0.6s;
110+
}
111+
112+
.circle-6 {
113+
bottom: -270px;
114+
right: -300px;
115+
background-image: url("/static/images/Ellipse6.png");
116+
animation-delay: 0.9s;
117+
}
118+
119+
@keyframes fadeInMoveDown {
120+
0% {
121+
opacity: 0;
122+
transform: translate(150px, 150px) scale(0.3);
123+
}
124+
100% {
125+
opacity: 1;
126+
transform: translate(0, 0) scale(1);
127+
}
128+
}
129+
130+
.detail-diaries-container {
131+
min-height: calc(100vh - 100px);
132+
position: relative;
133+
padding-top: 60px;
134+
}
135+
26136
.diaries_detail {
27137
display: flex;
28138
flex-direction: column;

‎static/css/friend_list.css‎

Lines changed: 111 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,124 @@
1111
padding-top: 80px;
1212
}
1313

14-
.background-a {
14+
.background {
1515
position: fixed;
1616
top: 0;
1717
left: 0;
1818
width: 100%;
1919
height: 100%;
20-
background-image: url("/static/images/base-a.png");
20+
background-color:var(--background-yellow);
2121
background-size: cover;
2222
background-position: center;
23-
z-index: -1;
23+
z-index: -1;
24+
}
25+
26+
.floating-background-up {
27+
position: fixed;
28+
width: 100%;
29+
height: 100%;
30+
top: 0;
31+
left: 0;
32+
overflow: hidden;
33+
}
34+
35+
.circle-up {
36+
position: absolute;
37+
opacity: 0;
38+
width: 100vw;
39+
height: auto;
40+
max-width: 600px;
41+
aspect-ratio: 1 / 1;
42+
background-size: contain;
43+
background-position: center;
44+
background-repeat: no-repeat;
45+
animation: fadeInMoveUp 1.5s ease-in-out forwards;
46+
}
47+
48+
.circle-1 {
49+
top: -150px;
50+
left: -100px;
51+
background-image: url("/static/images/Ellipse1.png");
52+
animation-delay: 0.3s;
53+
}
54+
55+
.circle-2 {
56+
top: -250px;
57+
left: -200px;
58+
background-image: url("/static/images/Ellipse2.png");
59+
animation-delay: 0.6s;
60+
}
61+
62+
.circle-3 {
63+
top: -250px;
64+
left: -300px;
65+
background-image: url("/static/images/Ellipse3.png");
66+
animation-delay: 0.9s;
67+
}
68+
69+
@keyframes fadeInMoveUp {
70+
0% {
71+
opacity: 0;
72+
transform: translate(-150px, -150px) scale(0.3);
73+
}
74+
100% {
75+
opacity: 1;
76+
transform: translate(0, 0) scale(1);
77+
}
78+
}
79+
80+
.floating-background-down {
81+
position: fixed;
82+
width: 100%;
83+
height: 100%;
84+
bottom: 0;
85+
right: 0;
86+
overflow: hidden;
87+
}
88+
89+
.circle-down {
90+
position: absolute;
91+
opacity: 0;
92+
width: 100vw;
93+
height: auto;
94+
max-width: 600px;
95+
aspect-ratio: 1 / 1;
96+
background-size: contain;
97+
background-position: center;
98+
background-repeat: no-repeat;
99+
animation: fadeInMoveDown 1.5s ease-in-out forwards;
100+
}
101+
102+
.circle-4 {
103+
bottom: -150px;
104+
right: -200px;
105+
background-image: url("/static/images/Ellipse4.png");
106+
animation-delay: 0.3s;
107+
}
108+
109+
.circle-5 {
110+
bottom: -220px;
111+
right: -270px;
112+
background-image: url("/static/images/Ellipse5.png");
113+
animation-delay: 0.6s;
114+
}
115+
116+
.circle-6 {
117+
bottom: -270px;
118+
right: -300px;
119+
background-image: url("/static/images/Ellipse6.png");
120+
animation-delay: 0.9s;
121+
}
122+
123+
@keyframes fadeInMoveDown {
124+
0% {
125+
opacity: 0;
126+
transform: translate(150px, 150px) scale(0.3);
127+
}
128+
100% {
129+
opacity: 1;
130+
transform: translate(0, 0) scale(1);
131+
}
24132
}
25133

26134
.slider-container {

0 commit comments

Comments
 (0)