Commit b35c6315 authored by Reza Sahebgharan's avatar Reza Sahebgharan

fix(fix setting btn and webpack config): fix setting btn and webpack config

parent b299d6ae
Pipeline #1075 passed with stage
in 43 minutes and 17 seconds
...@@ -196,6 +196,7 @@ export default { ...@@ -196,6 +196,7 @@ export default {
let scrollerEndPoint = scrollHeight - divHeight; let scrollerEndPoint = scrollHeight - divHeight;
let divScrollerTop = e.target.scrollTop; let divScrollerTop = e.target.scrollTop;
if (divScrollerTop === scrollerEndPoint) { if (divScrollerTop === scrollerEndPoint) {
this.count = Counts.get("transliterationCount"); this.count = Counts.get("transliterationCount");
if (this.transliterationdb.length < this.count) { if (this.transliterationdb.length < this.count) {
this.limit += 5; this.limit += 5;
...@@ -220,15 +221,10 @@ export default { ...@@ -220,15 +221,10 @@ export default {
$subscribe: { $subscribe: {
translitdbuploads: [], translitdbuploads: [],
transliterationdb: function() { transliterationdb: function() {
this.TransliterationLoading = true; // this.TransliterationLoading = true;
return [ return [
{ limit: this.limit }, { limit: this.limit }
{
onStop: error => {
this.TransliterationLoading = false;
}
}
]; ];
}, },
transliterationdbCount: [] transliterationdbCount: []
...@@ -238,7 +234,7 @@ export default { ...@@ -238,7 +234,7 @@ export default {
}, },
transliterationdb() { transliterationdb() {
return TransliterationDb.find({}, { limit: this.limit, sort: { ID: 1 } }); return TransliterationDb.find({}, { sort: { ID: 1 } });
} }
} }
}; };
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
<v-card-text> <v-card-text>
<v-row style="margin:auto"> <v-row style="margin:auto">
<v-col cols="12" class="d-flex justify-center align-center flex-wrap"> <v-col cols="12" class="d-flex justify-center align-center flex-wrap">
<v-list-item-avatar size="200"> <div>
<v-avatar size="200">
<v-img v-if="!temp" :src="src"></v-img> <v-img v-if="!temp" :src="src"></v-img>
<v-img v-else :src="newSrc"></v-img> <v-img v-else :src="newSrc"></v-img>
<v-btn <v-btn
...@@ -17,6 +18,17 @@ ...@@ -17,6 +18,17 @@
> >
<v-icon>add_a_photo</v-icon> <v-icon>add_a_photo</v-icon>
</v-btn> </v-btn>
</v-avatar>
<input
v-show="false"
ref="inputUpload"
type="file"
@change="fileUploadFunc"
accept="image/x-png, image/gif, image/jpeg"
/>
</div>
<input <input
v-show="false" v-show="false"
ref="inputUpload" ref="inputUpload"
...@@ -24,7 +36,6 @@ ...@@ -24,7 +36,6 @@
@change="fileUploadFunc" @change="fileUploadFunc"
accept="image/x-png, image/gif, image/jpeg" accept="image/x-png, image/gif, image/jpeg"
/> />
</v-list-item-avatar>
</v-col> </v-col>
</v-row> </v-row>
<v-row style="margin:auto"> <v-row style="margin:auto">
...@@ -91,7 +102,6 @@ export default { ...@@ -91,7 +102,6 @@ export default {
this.alertSnackbar = true; this.alertSnackbar = true;
}, },
saveUserProfile() { saveUserProfile() {
;
this.loading = true; this.loading = true;
if (this.newSelectedLang == null || this.newSelectedLang == undefined) { if (this.newSelectedLang == null || this.newSelectedLang == undefined) {
this.alertSnackbarMethod(this.$t("UserSetting.chooseLanguage")); this.alertSnackbarMethod(this.$t("UserSetting.chooseLanguage"));
...@@ -163,7 +173,6 @@ export default { ...@@ -163,7 +173,6 @@ export default {
}, },
selectedLang: { selectedLang: {
get() { get() {
;
if (this.users && this.users.length > 0) { if (this.users && this.users.length > 0) {
this.newSelectedLang = this.users[0].profile.language; this.newSelectedLang = this.users[0].profile.language;
return this.users[0].profile.language; return this.users[0].profile.language;
...@@ -193,4 +202,7 @@ export default { ...@@ -193,4 +202,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.v-avatar{
overflow: initial;
}
</style> </style>
\ No newline at end of file
...@@ -206,8 +206,8 @@ const serverConfig = { ...@@ -206,8 +206,8 @@ const serverConfig = {
hot: true, hot: true,
open: true open: true
}, },
devtool: 'source-map', devtool: process.env.NODE_ENV == 'production' ? '' : 'source-map',
mode: "development", mode: process.env.NODE_ENV,
module: { module: {
rules: [{ rules: [{
test: /\.js$/, test: /\.js$/,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment