Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

icon to userpage #225

Merged
merged 5 commits into from
Nov 2, 2019
Merged

icon to userpage #225

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b78da2
icon to userpage
series2 Oct 22, 2019
4fe104a
支援課のアイコンuriの表示
series2 Oct 22, 2019
60cad78
computedには判定のロジックのみ与えたつもりです。
series2 Oct 22, 2019
45b3f4b
imageurlのロジックの場所を変えた
series2 Oct 25, 2019
eb87b0b
遅くなりすみません。修正しました。遅くなったのでコンフリクトが少し心配です...。
series2 Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/components/UserPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
<div>
<v-avatar size="200">
<img :src="`https://q.trap.jp/api/1.0/public/icon/${$route.params.name}`" />
<img :src="$route.params.name!=='sienka'?`https://q.trap.jp/api/1.0/public/icon/${$route.params.name}`:'https://pbs.twimg.com/profile_images/877073041351622657/n31PKuuM.jpg'" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

支援課かどうかの判定のロジックはcomputedに書いてほしいです(伝わるかな)

</v-avatar>
</div>
</div>
Expand Down
8 changes: 7 additions & 1 deletion client/src/components/shared/Icon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<template>
<v-btn
dark
icon
:to="`/users/${user.name}`"
>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

なんかめっちゃインデントずれてる

<v-avatar :size="size">
<v-img :src="'https://q.trap.jp/api/1.0/public/icon/' + user.name" width="100%" alt=""/>
<v-img :src="user.name!=='sienka'?'https://q.trap.jp/api/1.0/public/icon/' + user.name:'https://pbs.twimg.com/profile_images/877073041351622657/n31PKuuM.jpg'" width="100%" alt=""/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

東工大のアイコンは直リンクじゃなくてこっちで保持しようか
アイコンダウンロードしてclient/public/img/~~.jpgに保存してここから呼ぶようにしてください

</v-avatar>
</v-btn>
</template>

<script>
Expand Down