Skip to content

Commit

Permalink
fix: something
Browse files Browse the repository at this point in the history
  • Loading branch information
Myxogastria0808 committed May 14, 2024
1 parent efb3f82 commit 7461dba
Show file tree
Hide file tree
Showing 9 changed files with 118 additions and 47 deletions.
24 changes: 11 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,36 @@

#### PRs をするブランチ (Default branch)

※feature ブランチの PRs 先は develop ブランチ

- develop

### 以下のブランチは、すべて develop ブランチにマージすること

#### 機能を追加する際に作成するブランチ

- feature/feat/#[issue-number]-[issue-summary]
- feat/#[issue-number]-[issue-summary]

example) feature/feat/#12-add-card-button-component
example) feat/#12-add-card-button-component

#### バグ修正をする際に作成するブランチ

- feature/bugfix/#[issue-number]-[issue-summary]
- bugfix/#[issue-number]-[issue-summary]

example) feature/bugfix/#12-fix-button-function
example) bugfix/#12-fix-button-function

#### バグ以外の修正や変更をする際に作成するブランチ

- feature/fix/#[issue-number]-[issue-summary]
- fix/#[issue-number]-[issue-summary]

example) feature/fix/#12-change-title
example) fix/#12-change-title

#### 設定の変更等をする際に作成するブランチ

- feature/config/#[issue-number]-[issue-summary]
- config/#[issue-number]-[issue-summary]

example) feature/config/#12-add-prettier-config
example) config/#12-add-prettier-config

#### その他、以下の条件の下で勝手に新たな種類の feture ブランチを作成してもよい
#### その他、以下の条件の下で勝手に新たな種類のブランチを作成してもよい

- feature/[github の username]/[自由にして良い部分]/#[issue-number]-[issue-summary]
- [GitHub の username]/[自由にして良い部分]/#[issue-number]-[issue-summary]

example) feature/Myxogastria0808/nyoki/#112-add-my-config-file
example) Myxogastria0808/nyoki/#112-add-my-config-file
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed public/favicon.ico
Binary file not shown.
Empty file modified public/favicon.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/layouts/Layout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const { title } = Astro.props;
<meta charset="UTF-8" />
<meta name="description" content="Astro description" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/jsys24-hackathon-sample/favicon.svg" />
<link rel="icon" type="image/svg+xml" href="/jsys24-hackathon/favicon.svg" />
<meta name="generator" content={Astro.generator} />
<title>{title}</title>
</head>
Expand Down
11 changes: 10 additions & 1 deletion src/pages/appare45/about.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
---
title: 自己紹介
title: "自己紹介"
author: "appare45"
---

<div style="width:100%; max-width:900px; margin-left:auto; margin-right:auto; padding: 0px auto;">

# appare45

こんにちは
Expand All @@ -17,3 +20,9 @@ title: 自己紹介
## 学類

情報科学類

</div>

<a href="../" style="text-decoration: none;">
<div style="padding: 10px; border-radius: 10px; border: 1px solid gray; box-shadow: 0px 5px 15px 0px rgba(81, 81, 81, 0.35); width: 45px; margin: auto; font-size: 15px; color: black; text-align: center;">戻る</div>
</a>
65 changes: 58 additions & 7 deletions src/pages/appare45/index.astro
Original file line number Diff line number Diff line change
@@ -1,35 +1,86 @@
---
import Layout from "../../layouts/Layout.astro";
// ファイル名を拡張子無しで書いてください。
const markdowns: string[] = ["about"];
const posts = await Astro.glob("./*md");
---

<Layout title="jsys24-hackathon">
<h1>jsys24-hackathon</h1>
<ul>
{
markdowns.map((markdown) => (
posts.map((post) => (
<li>
<a href={"./" + markdown + "/"}>{markdown}</a>
<a href={post.url}>
<div class="item-box">
{typeof post.frontmatter.title !== "undefined" ? (
<h2>{post.frontmatter.title}</h2>
) : (
<h2>タイトルなし</h2>
)}
{typeof post.frontmatter.author !== "undefined" ? (
<p class="author">著者: {post.frontmatter.author}</p>
) : (
<p class="author" />
)}
</div>
</a>
</li>
))
}
</ul>
<a href="../">
<div class="back-box">戻る</div>
</a>
</Layout>

<style>
h1 {
text-align: center;
font-size: 25px;
margin-top: 30px;
margin-bottom: 30px;
margin-bottom: 60px;
}
ul {
width: 200px;
width: 300px;
margin: auto;
}
li {
margin-top: 30px;
margin-bottom: 30px;
list-style: none;
}
a {
text-decoration: none;
}
.item-box {
padding: 10px;
border-radius: 10px;
border: 1px solid gray;
box-shadow: 0px 5px 15px 0px rgba(81, 81, 81, 0.35);
& h2 {
font-size: 20px;
color: black;
}
& .author {
margin-top: 10px;
font-size: 18;
color: gray;
}
}
.item-box:hover {
box-shadow: 0px 5px 15px 0px rgba(151, 151, 151, 0.35);
}
.back-box {
padding: 10px;
border-radius: 10px;
border: 1px solid gray;
box-shadow: 0px 5px 15px 0px rgba(81, 81, 81, 0.35);
width: 45px;
margin: auto;
font-size: 15px;
color: black;
text-align: center;
}
.back-box:hover {
box-shadow: 0px 5px 15px 0px rgba(151, 151, 151, 0.35);
}
</style>
20 changes: 19 additions & 1 deletion src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ const members: string[] = ["appare45"];
{
members.map((member) => (
<li>
<a href={"./" + member + "/"}>{member}</a>
<a href={"./" + member + "/"}>
<div class="item-box">{member}</div>
</a>
</li>
))
}
Expand All @@ -38,6 +40,22 @@ const members: string[] = ["appare45"];
margin: auto;
}
li {
margin-top: 20px;
margin-bottom: 20px;
list-style: none;
}
a {
text-decoration: none;
}
.item-box {
padding: 10px;
border-radius: 10px;
border: 1px solid gray;
text-align: center;
color: black;
box-shadow: 0px 5px 15px 0px rgba(81, 81, 81, 0.35);
}
.item-box:hover {
box-shadow: 0px 5px 15px 0px rgba(151, 151, 151, 0.35);
}
</style>
41 changes: 18 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -353,27 +353,27 @@
resolved "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz"
integrity sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==

"@esbuild/darwin-arm64@0.20.2":
"@esbuild/linux-x64@0.20.2":
version "0.20.2"
resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz"
integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz"
integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==

"@esbuild/darwin-arm64@0.21.1":
"@esbuild/linux-x64@0.21.1":
version "0.21.1"
resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.1.tgz"
integrity sha512-BLT7TDzqsVlQRmJfO/FirzKlzmDpBWwmCUlyggfzUwg1cAxVxeA4O6b1XkMInlxISdfPAOunV9zXjvh5x99Heg==
resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.1.tgz"
integrity sha512-da4/1mBJwwgJkbj4fMH7SOXq2zapgTo0LKXX1VUZ0Dxr+e8N0WbS80nSZ5+zf3lvpf8qxrkZdqkOqFfm57gXwA==

"@img/[email protected]":
"@img/[email protected]":
version "1.0.2"
resolved "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.2.tgz"
integrity sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ==

"@img/[email protected]":
version "0.33.3"
resolved "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.3.tgz"
integrity sha512-FaNiGX1MrOuJ3hxuNzWgsT/mg5OHG/Izh59WW2mk1UwYHUwtfbhk5QNKYZgxf0pLOhx9ctGiGa2OykD71vOnSw==
resolved "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.3.tgz"
integrity sha512-Q4I++herIJxJi+qmbySd072oDPRkCg/SClLEIDh5IL9h1zjhqjv82H0Seupd+q2m0yOfD+/fJnjSoDFtKiHu2g==
optionalDependencies:
"@img/sharp-libvips-darwin-arm64" "1.0.2"

"@img/[email protected]":
version "1.0.2"
resolved "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.2.tgz"
integrity sha512-tcK/41Rq8IKlSaKRCCAuuY3lDJjQnYIW1UXU1kxcEKrfL8WR7N6+rzNoOxoQRJWTAECuKwgAHnPvqXGN8XfkHA==
"@img/sharp-libvips-linux-x64" "1.0.2"

"@jridgewell/gen-mapping@^0.3.5":
version "0.3.5"
Expand Down Expand Up @@ -428,10 +428,10 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@rollup/rollup-darwin-arm64@4.17.2":
"@rollup/rollup-linux-x64-gnu@4.17.2":
version "4.17.2"
resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz"
integrity sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==
resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz"
integrity sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==

"@shikijs/[email protected]":
version "1.5.1"
Expand Down Expand Up @@ -1302,11 +1302,6 @@ flattie@^1.1.1:
resolved "https://registry.npmjs.org/flattie/-/flattie-1.1.1.tgz"
integrity sha512-9UbaD6XdAL97+k/n+N7JwX46K/M6Zc6KcFYskrYL8wbBV/Uyk0CTAMY0VT+qiK5PM7AIc9aTWYtq65U7T+aCNQ==

fsevents@~2.3.2, fsevents@~2.3.3:
version "2.3.3"
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==

function-bind@^1.1.2:
version "1.1.2"
resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
Expand Down

0 comments on commit 7461dba

Please sign in to comment.