shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logo styling, file upload bugfix and modules anchor bugfix

Browse Source
This commit is contained in:
Burak Civan 2021-06-01 10:30:57 +03:00
parent d99e42520d
commit 57efd15b5f
7 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Wizard/Data.php
View File

@ -125,8 +125,8 @@ class Data extends Controller
$company->api_key = setting('apps.api_key');
$company->financial_start = setting('localisation.financial_start');
if ($company->company_logo) {
$logo = $company->company_logo;
if ($company->logo) {
$logo = \Plank\Mediable\Media::find($company->logo);
$logo->path = route('uploads.get', $logo->id);

17
resources/assets/js/Wizard.vue
View File

@ -6,17 +6,13 @@
:modules="modules.data"
:currency_codes="currency_codes"
:company="company"
:pageLoad="page_loaded"
></router-view>
</template>
<script>
export default {
name: "Wizard",
data: function () {
return {
page_loaded: true,
};
},
created() {
let self = this;
@ -36,12 +32,7 @@ export default {
return data.currency_codes[key];
});
setTimeout(
function () {
self.page_loaded = false;
}.bind(self),
800
);
});
},
@ -58,6 +49,7 @@ export default {
taxes: {},
finish: {},
},
page_loaded: true
};
},
};
@ -69,6 +61,11 @@ export default {
display: flex;
align-items: center;
justify-content: center;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 9999;
}
.document-loading div {

9
resources/assets/js/views/wizard/Company.vue
View File

@ -14,6 +14,11 @@
</div>
<form ref="form" class="w-100">
<div class="card-body">
<div class="document-loading" v-if="pageLoad">
<div>
<i class="fas fa-spinner fa-pulse fa-7x"></i>
</div>
</div>
<div class="row mb-4">
<div class="col-12 mb-4">
<base-input
@ -139,6 +144,10 @@ export default {
type: String,
default: "text",
},
pageLoad: {
type: [Boolean, String]
}
},
data() {

9
resources/assets/js/views/wizard/Currencies.vue
View File

@ -15,6 +15,11 @@
</div>
<div class="card-body">
<div class="document-loading" v-if="pageLoad">
<div>
<i class="fas fa-spinner fa-pulse fa-7x"></i>
</div>
</div>
<div class="d-flex justify-content-end mb-3">
<base-button
type="success"
@ -323,6 +328,10 @@ export default {
translations: {
type: [Object, Array],
},
pageLoad: {
type: [Boolean, String]
}
},
data() {

13
resources/assets/js/views/wizard/Finish.vue
View File

@ -11,6 +11,11 @@
</el-steps>
</div>
<div class="card-body bg-default">
<div class="document-loading" v-if="pageLoad">
<div>
<i class="fas fa-spinner fa-pulse fa-7x"></i>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
<div class="content-header">
@ -27,10 +32,10 @@
<div class="card">
<div class="card-header py-2">
<h4 class="ml--3 mb-0 float-left">
<a :href="item.slug">{{ item.name }}</a>
<a :href="route_url + '/apps/' + item.slug">{{ item.name }}</a>
</h4>
</div>
<a :href="route_url + '/' + item.slug"
<a :href="route_url + '/apps/' + item.slug"
><img
v-for="(file, indis) in item.files"
:key="indis"
@ -101,6 +106,10 @@ export default {
translations: {
type: [Object, Array],
},
pageLoad: {
type: [Boolean, String]
}
},

9
resources/assets/js/views/wizard/Taxes.vue
View File

@ -11,6 +11,11 @@
</el-steps>
</div>
<div class="card-body">
<div class="document-loading" v-if="pageLoad">
<div>
<i class="fas fa-spinner fa-pulse fa-7x"></i>
</div>
</div>
<div class="d-flex justify-content-end mb-3">
<base-button
type="success"
@ -247,6 +252,10 @@ export default {
translations: {
type: [Object, Array],
},
pageLoad: {
type: [Boolean, String]
}
},
data() {

5
resources/views/layouts/wizard.blade.php
View File

@ -8,11 +8,6 @@
<div id="app">
<div class="card-body">
<div class="document-loading" v-if="!page_loaded">
<div>
<i class="fas fa-spinner fa-pulse fa-7x"></i>
</div>
</div>
@include('flash::message')