TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 12:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge with master

Browse Source
This commit is contained in:
yogesh_gohil
2019-11-18 10:14:43 +05:30
parent 0711393bd1 9ae2947cec
commit 52d3c6a944
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Space/Updater.php
View File

@ -107,7 +107,7 @@ class Updater
public static function checkForUpdate() public static function checkForUpdate()
{ {
$data = null; $data = null;
$url = 'https://craterapp.com/downloads/check/latest/'. Setting::getSetting('version'); $url = 'https://craterapp.com/downloads/check/latest/'. Setting::getSetting('version') . '?type=update';
$response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]); $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);

4
resources/assets/js/views/settings/UpdateApp.vue
View File

@ -8,7 +8,7 @@
</p> </p>
<label class="input-label">{{ $t('settings.update_app.current_version') }}</label><br> <label class="input-label">{{ $t('settings.update_app.current_version') }}</label><br>
<label class="version mb-4">{{ currentVersion }}</label> <label class="version mb-4">{{ currentVersion }}</label>
<base-button :outline="true" :disabled="isCheckingforUpdate || isUpdating" size="large" color="theme" @click="checkUpdate" class="mb-4"> <base-button :outline="true" :disabled="isCheckingforUpdate || isUpdating" size="large" color="theme" class="mb-4" @click="checkUpdate">
<font-awesome-icon :class="{'update': isCheckingforUpdate}" style="margin-right: 10px;" icon="sync-alt" /> <font-awesome-icon :class="{'update': isCheckingforUpdate}" style="margin-right: 10px;" icon="sync-alt" />
{{ $t('settings.update_app.check_update') }} {{ $t('settings.update_app.check_update') }}
</base-button> </base-button>
@ -98,7 +98,7 @@ export default {
if (response.data) { if (response.data) {
this.updateData.isMinor = response.data.is_minor this.updateData.isMinor = response.data.is_minor
this.updateData.version = response.data.version.version this.updateData.version = response.data.version.version
this.description = response.data.description this.description = response.data.version.description
this.isUpdateAvailable = true this.isUpdateAvailable = true
} }
} catch (e) { } catch (e) {

2
resources/assets/sass/laraspace.scss vendored
View File

@ -3,10 +3,8 @@
@import "../../../node_modules/bootstrap/scss/functions"; @import "../../../node_modules/bootstrap/scss/functions";
@import "../../../node_modules/bootstrap/scss/variables"; @import "../../../node_modules/bootstrap/scss/variables";
@import 'variables'; @import 'variables';
// Plugins // Plugins
//---------------------------------- //----------------------------------

2
resources/assets/sass/variables.scss vendored
View File

@ -90,7 +90,7 @@ $theme-colors: (
danger: $ls-color-red, danger: $ls-color-red,
light: $ls-color-primary--light, light: $ls-color-primary--light,
dark: $ls-color-secondary dark: $ls-color-secondary
) !default; );
$navbar-dark-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{str-replace(str-replace(#{$navbar-dark-color}, "(", "%28"), ")", "%29")}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"); $navbar-dark-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{str-replace(str-replace(#{$navbar-dark-color}, "(", "%28"), ")", "%29")}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E");
$navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{str-replace(str-replace(#{$navbar-light-color}, "(", "%28"), ")", "%29")}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"); $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{str-replace(str-replace(#{$navbar-light-color}, "(", "%28"), ")", "%29")}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E");