Skip to content
Snippets Groups Projects
Commit d4c8ac72 authored by 최지원's avatar 최지원
Browse files

Merge branch 'board-loading' into 'master'

Add Loading text in Finder&Loster Board

See merge request !17
parents 49d4af17 89460f70
Branches
No related tags found
1 merge request!17Add Loading text in Finder&Loster Board
...@@ -36,7 +36,13 @@ ...@@ -36,7 +36,13 @@
</v-flex> </v-flex>
<v-flex md12> <v-flex md12>
<material-card color="green" title="발견 게시판" text="제목을 클릭하여 게시글을 확인하세요."> <material-card color="green" title="발견 게시판" text="제목을 클릭하여 게시글을 확인하세요.">
<v-card :elevation="20" width="300" :shaped="true" v-if="dataLoading" class="mx-auto">
<v-card-text>
<strong class="display-3 center">LOADING....</strong>
</v-card-text>
</v-card>
<v-data-table <v-data-table
v-if="!dataLoading"
:headers="headers" :headers="headers"
:items="items" :items="items"
item-key="_id" item-key="_id"
...@@ -87,8 +93,8 @@ export default { ...@@ -87,8 +93,8 @@ export default {
items: [], items: [],
search: '', search: '',
loginDialog: false, loginDialog: false,
image:null image:null,
dataLoading: true
}), }),
created() { created() {
var log; var log;
...@@ -100,11 +106,13 @@ export default { ...@@ -100,11 +106,13 @@ export default {
this.loginDialog = true; this.loginDialog = true;
} }
else{ else{
this.dataLoading = true;
this.items = response.data.finderboards; this.items = response.data.finderboards;
for(let i=0; i<this.items.length; i++){ for(let i=0; i<this.items.length; i++){
var base64data=Buffer.from(this.items[i].image.data.data,'binary').toString('base64'); var base64data=Buffer.from(this.items[i].image.data.data,'binary').toString('base64');
this.items[i].image='data:image/jpeg;base64,'+base64data; this.items[i].image='data:image/jpeg;base64,'+base64data;
} }
this.dataLoading = false;
} }
}).catch(err => { }).catch(err => {
alert("ERR while FET losterboard" + err) alert("ERR while FET losterboard" + err)
......
...@@ -36,7 +36,13 @@ ...@@ -36,7 +36,13 @@
</v-flex> </v-flex>
<v-flex md12> <v-flex md12>
<material-card color="green" title="실종 게시판" text="제목을 클릭하여 게시글을 확인하세요."> <material-card color="green" title="실종 게시판" text="제목을 클릭하여 게시글을 확인하세요.">
<v-card :elevation="20" width="300" :shaped="true" v-if="dataLoading" class="mx-auto">
<v-card-text>
<strong class="display-3 center">LOADING....</strong>
</v-card-text>
</v-card>
<v-data-table <v-data-table
v-if="!dataLoading"
:headers="headers" :headers="headers"
:items="items" :items="items"
item-key="_id" item-key="_id"
...@@ -87,8 +93,8 @@ export default { ...@@ -87,8 +93,8 @@ export default {
items: [], items: [],
search: '', search: '',
loginDialog: false, loginDialog: false,
image:null image:null,
dataLoading: true
}), }),
created() { created() {
var log; var log;
...@@ -100,14 +106,13 @@ export default { ...@@ -100,14 +106,13 @@ export default {
this.loginDialog = true; this.loginDialog = true;
} }
else{ else{
this.$http.get('/losterboard') this.dataLoading = true;
.then(response => {
this.items = response.data.losterboards; this.items = response.data.losterboards;
for(let i=0; i<this.items.length; i++){ for(let i=0; i<this.items.length; i++){
var base64data=Buffer.from(this.items[i].image.data.data,'binary').toString('base64'); var base64data=Buffer.from(this.items[i].image.data.data,'binary').toString('base64');
this.items[i].image='data:image/jpeg;base64,'+base64data; this.items[i].image='data:image/jpeg;base64,'+base64data;
} }
}); this.dataLoading = false;
} }
}).catch(err => { }).catch(err => {
alert("ERR while FET losterboard" + err) alert("ERR while FET losterboard" + err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment