-
-
-
+
+
+
+
+
+
+
-
-
diff --git a/client/src/components/DashBoard.vue b/client/src/components/DashBoard.vue
index bd70ba0e..842c6f03 100644
--- a/client/src/components/DashBoard.vue
+++ b/client/src/components/DashBoard.vue
@@ -33,7 +33,6 @@
あなたが借りている物品
まとめて返却
-
Month
@@ -70,13 +69,14 @@
-
+
{{ selectedItem.description }}
返却するものにまとめる
+
+ 詳細
+
diff --git a/client/src/components/ItemDetailPage.vue b/client/src/components/ItemDetailPage.vue
index 089a508f..ca5d5117 100644
--- a/client/src/components/ItemDetailPage.vue
+++ b/client/src/components/ItemDetailPage.vue
@@ -20,7 +20,7 @@
- 削除
+ 削除
@@ -65,6 +65,12 @@
:size="25"
/>
{{ owner.user.name }} {{ checkRentalable(owner) }}
+
@@ -116,6 +122,7 @@ import RegisterOwnerForm from './shared/RegisterOwnerForm'
import RentalForm from './shared/RentalForm'
import CommentDialog from './shared/CommentDialog'
import ReturnForm from './shared/ReturnForm'
+import EditOwner from './shared/EditOwner'
import WannaRental from './shared/WannaRental'
export default {
@@ -126,6 +133,7 @@ export default {
RentalForm,
CommentDialog,
ReturnForm,
+ EditOwner,
WannaRental
},
data () {
@@ -138,7 +146,10 @@ export default {
created () {
axios
.get(`/api/items/` + this.$route.params.id)
- .then(res => (this.data = res.data))
+ .then(res => {
+ this.data = res.data
+ this.$store.commit('setNavBarTitle', res.data.name)
+ })
.catch(e => { alert(e) })
},
mounted () {
@@ -146,6 +157,7 @@ export default {
window.addEventListener('resize', this.conputeWidth)
},
beforeDestroy () {
+ this.$store.commit('resetNavBarTitle')
window.removeEventListener('resize', this.conputeWidth)
},
computed: {
@@ -160,6 +172,17 @@ export default {
return false
}
return this.data.likes.find(user => user.name === this.$store.state.me.name)
+ },
+ checkOwnOrAdmin () {
+ if (this.data.owners) {
+ const owner = this.data.owners.find(element => {
+ return element.owner_id === this.$store.state.me.ID
+ })
+ if (owner || this.$store.state.me.admin) {
+ return true
+ }
+ }
+ return false
}
},
methods: {
@@ -191,7 +214,7 @@ export default {
} else if (rentalableCount === 1) {
return '貸し出し可能'
}
- return '貸し出し可能' + '×' + rentalableCount
+ return '貸し出し可能' + '×' + rentalableCount + ' /' + owner.count
},
createLogMessage (log) {
const userName = log.user.name
@@ -202,6 +225,10 @@ export default {
ownerWord = ''
logComment = '追加しました'
}
+ if (log.type === 3) {
+ ownerWord = ''
+ logComment = '減らしました'
+ }
const logTime = log.CreatedAt.replace('T', ' ').replace('+09:00', '')
return `${userName}さんが${ownerWord}物品を${logComment} - ${logTime}`
},
diff --git a/client/src/components/ItemListPage.vue b/client/src/components/ItemListPage.vue
index 49cfa028..da7e5702 100644
--- a/client/src/components/ItemListPage.vue
+++ b/client/src/components/ItemListPage.vue
@@ -57,12 +57,18 @@ export default {
break
}
},
+ beforeDestroy () {
+ this.$store.commit('resetNavBarTitle')
+ },
methods: {
async search () {
let searchParam = this.$route.query.search
if (this.$route.query.search === undefined) {
searchParam = ''
}
+ if (searchParam) {
+ this.$store.commit('setNavBarTitle', `Search: ${searchParam}`)
+ }
const res = await axios.get(`/api/items?search=` + searchParam)
.catch(e => {
alert(e)
diff --git a/client/src/components/RegisterItemPage.vue b/client/src/components/RegisterItemPage.vue
index d664611d..81bcb12c 100644
--- a/client/src/components/RegisterItemPage.vue
+++ b/client/src/components/RegisterItemPage.vue
@@ -49,16 +49,28 @@
@@ -107,7 +119,8 @@ export default {
closeText: 'close',
target: ''
},
- errorMessage: 'エラー'
+ errorMessage: 'エラー',
+ loading: false
}
},
watch: {
@@ -140,14 +153,16 @@ export default {
this.img_name = files[0].name
},
async createImage (file) {
+ this.loading = true
let form = new FormData()
form.enctype = 'multipart/form-data'
form.append('file', file)
- const data = await axios.post(`${traQBaseURL}/files`, form).catch(e => alert(e))
+ const data = await axios.post(`/api/files`, form).catch(e => alert(e))
if (!data) {
this.setAlert('close', '画像の投稿に失敗しました')
}
- this.img_url = `${traQBaseURL}/files/${data.data.fileId}/thumbnail`
+ this.img_url = data.data.url
+ this.loading = false
},
remove () {
this.img_url = ''
diff --git a/client/src/components/UserPage.vue b/client/src/components/UserPage.vue
index 574042c3..c7ea14cf 100644
--- a/client/src/components/UserPage.vue
+++ b/client/src/components/UserPage.vue
@@ -8,7 +8,7 @@
- ![]()
+ ![]()
@@ -82,12 +82,18 @@ export default {
this.mount()
}
},
+ computed: {
+ navigateImagePath () {
+ return this.$route.params.name !== 'sienka' ? `https://q.trap.jp/api/1.0/public/icon/${this.$route.params.name}` : `./../img/sienka-icon.jpg`
+ }
+ },
mounted () {
this.conputeWidth()
window.addEventListener('resize', this.conputeWidth)
this.mount()
},
beforeDestroy () {
+ this.$store.commit('resetNavBarTitle')
window.removeEventListener('resize', this.conputeWidth)
},
methods: {
@@ -101,6 +107,7 @@ export default {
}
},
async mount () {
+ this.$store.commit('setNavBarTitle', `${this.$route.params.name}'s User Page`)
const resItems = await axios.get('api/items?user=' + this.$route.params.name)
.catch(e => {
alert(e)
diff --git a/client/src/components/core/NavBar.vue b/client/src/components/core/NavBar.vue
index a6e5039c..f9019aa3 100644
--- a/client/src/components/core/NavBar.vue
+++ b/client/src/components/core/NavBar.vue
@@ -129,6 +129,11 @@ export default {
watch: {
'$route' (val) {
this.title = val.name
+ },
+ '$store.state.navBarTitle' (val) {
+ if (this.$store.state.navBarTitle) {
+ this.title = val
+ }
}
},
async created () {
diff --git a/client/src/components/shared/Dialog.vue b/client/src/components/shared/Dialog.vue
index d6bfde04..b386aa9b 100644
--- a/client/src/components/shared/Dialog.vue
+++ b/client/src/components/shared/Dialog.vue
@@ -4,7 +4,6 @@
v-model="dialog.isOpen"
v-if="dialog.isOpen"
max-width="700"
- max-height="650"
>
diff --git a/client/src/components/shared/EditOwner.vue b/client/src/components/shared/EditOwner.vue
new file mode 100644
index 00000000..8ad0387d
--- /dev/null
+++ b/client/src/components/shared/EditOwner.vue
@@ -0,0 +1,118 @@
+
+
+
+ mdi-pencil編集
+
+
+
+
+ 所有者の情報を更新する
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 更新
+
+
+
+