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

merge master

Browse Source
This commit is contained in:
Jay_Makwana
2019-11-19 20:39:30 +05:30
parent 98579040cc e63836e1d7
commit 6378d77cfa
7 changed files with 14 additions and 191258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.env.example
View File

@ -1,15 +1,15 @@
APP_ENV=local APP_ENV=production
APP_KEY= APP_KEY=base64:kgk/4DW1vEVy7aEvet5FPp5un6PIGe/so8H0mvoUtW0=
APP_DEBUG=true APP_DEBUG=false
APP_LOG_LEVEL=debug APP_LOG_LEVEL=debug
APP_URL=http://localhost APP_URL=http://crater.test
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3306 DB_PORT=3306
DB_DATABASE=homestead DB_DATABASE=crater
DB_USERNAME=homestead DB_USERNAME=root
DB_PASSWORD=secret DB_PASSWORD=bytefury
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=file CACHE_DRIVER=file

1
app/Http/Controllers/EnvironmentController.php
View File

@ -37,6 +37,7 @@ class EnvironmentController extends Controller
if(array_key_exists("success", $results)) { if(array_key_exists("success", $results)) {
Artisan::call('config:clear'); Artisan::call('config:clear');
Artisan::call('storage:link');
Artisan::call('key:generate --force'); Artisan::call('key:generate --force');
Artisan::call('migrate --seed --force'); Artisan::call('migrate --seed --force');
Artisan::call('migrate', ['--path' => 'vendor/laravel/passport/database/migrations', '--force' => true]); Artisan::call('migrate', ['--path' => 'vendor/laravel/passport/database/migrations', '--force' => true]);

191247
public/assets/js/app.js
View File

File diff suppressed because one or more lines are too long

2
public/assets/js/app.js.map
View File

File diff suppressed because one or more lines are too long

3
resources/assets/js/bootstrap.js vendored
View File

@ -92,8 +92,7 @@ global.axios.interceptors.response.use(undefined, function (err) {
if (err.response.data.error === 'invalid_credentials') { if (err.response.data.error === 'invalid_credentials') {
window.toastr['error']('Invalid Credentials') window.toastr['error']('Invalid Credentials')
} }
if (err.response.data && (err.response.statusText === 'Unauthorized' || err.response.data === ' Unauthorized.')) {
if (err.response.data && err.response.statusText === 'Unauthorized') {
store.dispatch('auth/logout', true) store.dispatch('auth/logout', true)
} else { } else {
throw err throw err

4
resources/assets/js/plugins/en.js
View File

@ -581,7 +581,7 @@ export default {
from_name: 'From Mail Name', from_name: 'From Mail Name',
from_mail: 'From Mail Address', from_mail: 'From Mail Address',
encryption: 'Mail Encryption', encryption: 'Mail Encryption',
mail_config_desc: 'Below details will be used to update the mail environment. Also you can change the details anytime after logging in.' mail_config_desc: 'Below is the form for Configuring Email driver for sending emails from the app. You can also configure third party providers like Sendgrid, SES etc.'
}, },
pdf: { pdf: {
title: 'PDF Setting', title: 'PDF Setting',
@ -757,7 +757,7 @@ export default {
from_name: 'From Mail Name', from_name: 'From Mail Name',
from_mail: 'From Mail Address', from_mail: 'From Mail Address',
encryption: 'Mail Encryption', encryption: 'Mail Encryption',
mail_config_desc: 'Below details will be used to update the mail environment. Also you can change the details anytime after logging in.' mail_config_desc: 'Below is the form for Configuring Email driver for sending emails from the app. You can also configure third party providers like Sendgrid, SES etc.'
}, },
req: { req: {
system_req: 'System Requirements', system_req: 'System Requirements',

1
resources/assets/js/views/wizard/EmailConfiguration.vue
View File

@ -14,6 +14,7 @@
</form> </form>
</div> </div>
</template> </template>
<script> <script>
import MultiSelect from 'vue-multiselect' import MultiSelect from 'vue-multiselect'
import { validationMixin } from 'vuelidate' import { validationMixin } from 'vuelidate'