Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@RaineMtF
RaineMtF authored Jan 5, 2025
1 parent 253472d commit 12bc97b
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 142 deletions.
6 changes: 6 additions & 0 deletions script/getcard.py
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
def getcardl(i):
return {
'name': '名字',
'name_eng': 'Unknown',
'remark': 'awa',
'nickname': '这是昵称',
'nickname_eng': 'meow',
'date': '2099-99-99',
'countdown': -1,
'region': '未知',
'region_eng': '>_<',
'img': 'https://avatars.githubusercontent.com/u/192512683'
}

def getcardr(i):
return {
'name': '名字',
'name_eng': 'Unknown',
'remark': 'awa',
'nickname': '这是昵称',
'nickname_eng': 'meow',
'date': '2099-99-99',
'countdown': -1,
'region': '未知',
'region_eng': '>_<',
'img': 'https://avatars.githubusercontent.com/u/192512683'
}
46 changes: 12 additions & 34 deletions script/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,21 @@ def m_format(content):
getcard.getcardr(2)
]

name = ['']
for i in range(0, 6):
name.append(card[i]['name'])

remark = ['']
for i in range(0, 6):
remark.append(card[i]['remark'])

nickname = ['']
for i in range(0, 6):
nickname.append(card[i]['nickname'])

date = ['']
for i in range(0, 6):
date.append(card[i]['date'])

countdown = ['']
for i in range(0, 6):
countdown.append(card[i]['countdown'])

region = ['']
for i in range(0, 6):
region.append(card[i]['region'])

img = ['']
for i in range(0, 6):
img.append(card[i]['img'])
def m_get(id):
return [''] + list(map(lambda i : i['id'], card[:6]))

return content.format(
subtitle = "小标题",
name = name,
remark = remark,
nickname = nickname,
date = date,
countdown = countdown,
region = region,
img = img
name = m_get('name'),
name_eng = m_get('name_eng'),
remark = m_get('remark'),
nickname = m_get('nickname'),
nickname_eng = m_get('nickname_eng'),
date = m_get('date'),
countdown = m_get('countdown'),
region = m_get('region'),
region_eng = m_get('region_eng'),
img = m_get('img')
) + "\n\n<!-- 这个页面是自动生成的 -->"

def Main():
Expand Down
196 changes: 97 additions & 99 deletions src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,107 +19,105 @@ <h1 class="main-title" id="mainTitle">记忆</h1>
<a id="to_chn" href="#">简体中文</a>
</nav>
</header>
<article>
<section class="content chn">
<div class="card large-card" id="card1">
<div class="avatar" style="background-image: url({img[1]});"></div>
<h2>{name[1]}<span class="remark">@{remark[1]}</span></h2>
<p>昵称：{nickname[1]}</p>
<p>逝世：{date[1]}</p>
<p>倒计时：{countdown[1]} 天</p>
<p>地区：{region[1]}</p>
</div>
<div class="card large-card" id="card2">
<div class="avatar" style="background-image: url({img[2]});"></div>
<h2>{name[2]}<span class="remark">@{remark[2]}</span></h2>
<p>昵称：{nickname[2]}</p>
<p>出生：{date[2]}</p>
<p>倒计时：{countdown[2]} 天</p>
<p>地区：{region[2]}</p>
</div>
<div class="bottom-content">
<div class="card" id="card3">
<h2>{name[3]}<span class="remark hidden">@{remark[3]}</span></h2>
<p>昵称：{nickname[3]}</p>
<p>逝世：{date[3]}</p>
<p>倒计时：{countdown[3]} 天</p>
<p>地区：{region[3]}</p>
</div>
<div class="card" id="card4">
<h2>{name[4]}<span class="remark hidden">@{remark[4]}</span></h2>
<p>昵称：{nickname[4]}</p>
<p>逝世：{date[4]}</p>
<p>倒计时：{countdown[4]} 天</p>
<p>地区：{region[4]}</p>
</div>
</div>
<div class="bottom-content">
<div class="card" id="card5">
<h2>{name[5]}<span class="remark hidden">@{remark[5]}</span></h2>
<p>昵称：{nickname[5]}</p>
<p>出生：{date[5]}</p>
<p>倒计时：{countdown[5]} 天</p>
<p>地区：{region[5]}</p>
</div>
<div class="card" id="card6">
<h2>{name[6]}<span class="remark hidden">@{remark[6]}</span></h2>
<p>昵称：{nickname[6]}</p>
<p>出生：{date[6]}</p>
<p>倒计时：{countdown[6]} 天</p>
<p>地区：{region[6]}</p>
</div>
</div>
<article class="content chn">
<section class="card large-card" id="card1">
<div class="avatar" style="background-image: url({img[1]});"></div>
<h2>{name[1]}<span class="remark">@{remark[1]}</span></h2>
<p>昵称：{nickname[1]}</p>
<p>逝世：{date[1]}</p>
<p>倒计时：{countdown[1]} 天</p>
<p>地区：{region[1]}</p>
</section>
<section class="content eng hidden">
<div class="card large-card" id="card1_eng">
<div class="avatar" style="background-image: url({img[1]});"></div>
<h2>{name[1]}<span class="remark">@{remark[1]}</span></h2>
<p>Nickname: {nickname[1]}</p>
<p>Departed: {date[1]}</p>
<p>Countdown: {countdown[1]} day(s)</p>
<p>Location: {region[1]}</p>
</div>
<div class="card large-card" id="card2_eng">
<div class="avatar" style="background-image: url({img[2]});"></div>
<h2>{name[2]}<span class="remark">@{remark[2]}</span></h2>
<p>Nickname: {nickname[2]}</p>
<p>Born: {date[2]}</p>
<p>Countdown: {countdown[2]} day(s)</p>
<p>Location: {region[2]}</p>
</div>
<div class="bottom-content">
<div class="card" id="card3_eng">
<h2>{name[3]}<span class="remark hidden">@{remark[3]}</span></h2>
<p>Nickname: {nickname[3]}</p>
<p>Departed: {date[3]}</p>
<p>Countdown: {countdown[3]} day(s)</p>
<p>Location: {region[3]}</p>
</div>
<div class="card" id="card4_eng">
<h2>{name[4]}<span class="remark hidden">@{remark[4]}</span></h2>
<p>Nickname: {nickname[4]}</p>
<p>Departed: {date[4]}</p>
<p>Countdown: {countdown[4]} day(s)</p>
<p>Location: {region[4]}</p>
</div>
</div>
<div class="bottom-content">
<div class="card" id="card5_eng">
<h2>{name[5]}<span class="remark hidden">@{remark[5]}</span></h2>
<p>Nickname: {nickname[5]}</p>
<p>Born: {date[5]}</p>
<p>Countdown: {countdown[5]} day(s)</p>
<p>Location: {region[5]}</p>
</div>
<div class="card" id="card6_eng">
<h2>{name[6]}<span class="remark hidden">@{remark[6]}</span></h2>
<p>Nickname: {nickname[6]}</p>
<p>Born: {date[6]}</p>
<p>Countdown: {countdown[6]} day(s)</p>
<p>Location: {region[6]}</p>
</div>
</div>
<section class="card large-card" id="card2">
<div class="avatar" style="background-image: url({img[2]});"></div>
<h2>{name[2]}<span class="remark">@{remark[2]}</span></h2>
<p>昵称：{nickname[2]}</p>
<p>出生：{date[2]}</p>
<p>倒计时：{countdown[2]} 天</p>
<p>地区：{region[2]}</p>
</section>
<div class="bottom-content">
<section class="card" id="card3">
<h2>{name[3]}<span class="remark hidden">@{remark[3]}</span></h2>
<p>昵称：{nickname[3]}</p>
<p>逝世：{date[3]}</p>
<p>倒计时：{countdown[3]} 天</p>
<p>地区：{region[3]}</p>
</section>
<section class="card" id="card4">
<h2>{name[4]}<span class="remark hidden">@{remark[4]}</span></h2>
<p>昵称：{nickname[4]}</p>
<p>逝世：{date[4]}</p>
<p>倒计时：{countdown[4]} 天</p>
<p>地区：{region[4]}</p>
</section>
</div>
<div class="bottom-content">
<section class="card" id="card5">
<h2>{name[5]}<span class="remark hidden">@{remark[5]}</span></h2>
<p>昵称：{nickname[5]}</p>
<p>出生：{date[5]}</p>
<p>倒计时：{countdown[5]} 天</p>
<p>地区：{region[5]}</p>
</section>
<section class="card" id="card6">
<h2>{name[6]}<span class="remark hidden">@{remark[6]}</span></h2>
<p>昵称：{nickname[6]}</p>
<p>出生：{date[6]}</p>
<p>倒计时：{countdown[6]} 天</p>
<p>地区：{region[6]}</p>
</section>
</div>
</article>
<article class="content eng hidden">
<section class="card large-card" id="card1_eng">
<div class="avatar" style="background-image: url({img[1]});"></div>
<h2>{name_eng[1]}<span class="remark">@{remark[1]}</span></h2>
<p>Nickname: {nickname_eng[1]}</p>
<p>Departed: {date[1]}</p>
<p>Countdown: {countdown[1]} day(s)</p>
<p>Location: {region_eng[1]}</p>
</section>
<section class="card large-card" id="card2_eng">
<div class="avatar" style="background-image: url({img[2]});"></div>
<h2>{name_eng[2]}<span class="remark">@{remark[2]}</span></h2>
<p>Nickname: {nickname_eng[2]}</p>
<p>Born: {date[2]}</p>
<p>Countdown: {countdown[2]} day(s)</p>
<p>Location: {region_eng[2]}</p>
</section>
<div class="bottom-content">
<section class="card" id="card3_eng">
<h2>{name_eng[3]}<span class="remark hidden">@{remark[3]}</span></h2>
<p>Nickname: {nickname_eng[3]}</p>
<p>Departed: {date[3]}</p>
<p>Countdown: {countdown[3]} day(s)</p>
<p>Location: {region_eng[3]}</p>
</section>
<section class="card" id="card4_eng">
<h2>{name_eng[4]}<span class="remark hidden">@{remark[4]}</span></h2>
<p>Nickname: {nickname_eng[4]}</p>
<p>Departed: {date[4]}</p>
<p>Countdown: {countdown[4]} day(s)</p>
<p>Location: {region_eng[4]}</p>
</section>
</div>
<div class="bottom-content">
<section class="card" id="card5_eng">
<h2>{name_eng[5]}<span class="remark hidden">@{remark[5]}</span></h2>
<p>Nickname: {nickname_eng[5]}</p>
<p>Born: {date[5]}</p>
<p>Countdown: {countdown[5]} day(s)</p>
<p>Location: {region_eng[5]}</p>
</section>
<section class="card" id="card6_eng">
<h2>{name_eng[6]}<span class="remark hidden">@{remark[6]}</span></h2>
<p>Nickname: {nickname_eng[6]}</p>
<p>Born: {date[6]}</p>
<p>Countdown: {countdown[6]} day(s)</p>
<p>Location: {region_eng[6]}</p>
</section>
</div>
</article>
<!-- partial -->
<script type="module" src="./script.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ $(document).ready(function () {
$(".eng").addClass("hidden");
$(".chn").removeClass("hidden");
});
});
});
9 changes: 1 addition & 8 deletions src/style.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body {
background: linear-gradient(135deg, #007bff, #ffb6ff);
background-image: url("background.jpg");
/* background-image: url("background.jpg"); */
background-size: cover;
background-position: center;
color: white;
Expand Down Expand Up @@ -112,13 +112,6 @@ nav a:hover {
margin-left: 1ex; /* 确保内容不被头部遮挡 */
}

#remark3,
#remark4,
#remark5,
#remark6 {
display: none;
}

.bottom-content {
display: grid;
grid-template-columns: repeat(2, 1fr); /* 下方两个框并排 */
Expand Down

0 comments on commit 12bc97b

Please sign in to comment.