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

Jump to bottom

Stage=>dev #1898

Merged
merged 11 commits into from
Feb 6, 2023
Merged

Stage=>dev #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4953297
Merge pull request #1888 from hypersign-protocol/develop
Raj6939 Feb 3, 2023
0ba13d2
Merge pull request #1890 from hypersign-protocol/develop
Raj6939 Feb 3, 2023
64ad247
Merge pull request #1892 from hypersign-protocol/develop
Raj6939 Feb 4, 2023
7727524
Merge pull request #1894 from hypersign-protocol/develop
Raj6939 Feb 4, 2023
4258587
bug fixed for file upload
Raj6939 Feb 6, 2023
fee16ac
Merge pull request #1895 from hypersign-protocol/bug-fix-for-uploadfile
Raj6939 Feb 6, 2023
ca4ff8b
small change in UI
Raj6939 Feb 6, 2023
a22221e
small bug fixed
Raj6939 Feb 6, 2023
2c9fa1c
Merge pull request #1896 from hypersign-protocol/bug-fix-for-uploadfile
Raj6939 Feb 6, 2023
eca7225
alignment fix
Raj6939 Feb 6, 2023
f153ff6
Merge pull request #1897 from hypersign-protocol/bug-fix-for-uploadfile
Raj6939 Feb 6, 2023
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
24 changes: 10 additions & 14 deletions src/components/admin/createProjectSlider/components/GeneralConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,24 +140,17 @@ input.largerCheckbox {
<tool-tips infoMessage="Banner image (Maximum size 400kb)"></tool-tips><label for="logoUrl" class="col-form-label">Banner<span style="color: red">*</span>: </label>
</div>
<div class="col-lg-9 col-md-9 px-0" style="display: flex">
<div
v-model="project.logoUrl"
type="text"
placeholder=""
id="logoUrl"
:disabled="true"
class="form-control w-100"
>
<input class="form-control w-100" type="text" disabled :placeholder="project.logoUrl? project.logoUrl :'Image of aspect ratio 16:9 or 4:3'">
<input
type="file"
id="file"
ref="file"
@change="fileUploadForBanner"
accept="image/jpeg, image/png"
hidden
/>
<span style="float: right">Image of aspect ratio 16:9 or 4:3</span>
</div>
</div>

<hf-buttons name="" iconClass="fa fa-upload" @executeAction="uploadBtn"
customClass="btn button-theme slight-left-margin-5"></hf-buttons>
</div>
</div>


Expand Down Expand Up @@ -326,8 +319,11 @@ export default {

},
methods: {
uploadBtn(){
this.$refs.file.click();
},
fileUploadForBanner(e) {
let file;
let file = this.$refs.file.files;
if ((file = e.target.files[0])) {
if (file.size > config.banner.bannersize) {
return this.notifyErr("File size is more than 400kb");
Expand Down
32 changes: 19 additions & 13 deletions src/views/admin/setting/OrgSetting.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,17 @@
<div class="row g-3 align-items-center w-100 mt-4">
<div class="text-left col-lg-8 col-md-8 text-left">
<tool-tips infoMessage="Logo (Maximum size 400kb)"></tool-tips><label for="name"
class="col-form-label">Logo:
class="col-form-label pb-4">Logo:
</label>
</div>
<div class="col-lg-4 col-md-4 px-0">
<div style="display:flex;">
<div placeholder="Maximum size 400kb" id="name" class="form-control w-100">
<input type="file" id="file" accept="image/jpeg, image/png" @change="fileUpload">
</div>
</div>
<a href="#" style="float:right;color:#495057" @click.prevent="preview">Preview</a>
<div style="display:flex;">
<input type="file" ref="file" id="file" accept="image/jpeg, image/png" @change="fileUpload" hidden>
<input type="text" class="form-control w-100" :placeholder="fileName!==''?fileName : 'Maximum size 400kb'" :disabled="true">
<hf-buttons name="" iconClass="fa fa-upload" @executeAction="uploadBtn"
customClass="btn button-theme slight-left-margin-5"></hf-buttons>
</div>
<a href="#" style="float:right;color:#495057" @click.prevent="preview">Preview</a>
</div>
</div>
<div class="row g-3 align-items-center w-100 mt-4" style="float:right; padding-right: 1.5%">
Expand Down Expand Up @@ -105,6 +106,7 @@ export default {
},
data(){
return{
fileName:"",
orgSetting: {
buttonBGColor: "#f1b319",
buttonTextColor: "#000000",
Expand Down Expand Up @@ -228,9 +230,13 @@ export default {

}
},
methods: {
fileUpload(e) {
var file
methods: {
uploadBtn(){
this.$refs.file.click();
},
fileUpload(e) {
this.fileName =""
let file = this.$refs.file.files;
if((file = e.target.files[0])) {
if(file.size>config.banner.bannersize)
{
Expand All @@ -241,10 +247,9 @@ export default {
// let dataUrl
reader.onload=e=>{
this.orgSetting.logoPath= e.target.result
this.fileName = file.name
}
}


}
},
preview(){
this.$swal.fire({
Expand Down Expand Up @@ -329,6 +334,7 @@ export default {
this.notifyErr(e)
} finally {
this.isLoading = false;
this.fileName = ""
}
}
},
Expand Down