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

Merge branch 'dashboard-refactor' into 'master'

Browse Source 
refactor mail

See merge request mohit.panjvani/crater-web!57
This commit is contained in:
Mohit Panjwani
2019-11-19 15:11:17 +00:00
parent 28dbdee1a4 6378d77cfa
commit fedea1f97e
7 changed files with 18743 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Space/EnvironmentManager.php
View File

@ -142,7 +142,7 @@ class EnvironmentManager
if(env('MAIL_FROM_ADDRESS') !== NULL && env('MAIL_FROM_NAME') !== NULL ) { if(env('MAIL_FROM_ADDRESS') !== NULL && env('MAIL_FROM_NAME') !== NULL ) {
$mailFromCredential = $mailFromCredential =
'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n". 'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
'MAIL_FROM_NAME='.config('mail.from.name')."\n\n"; 'MAIL_FROM_NAME="'.config('mail.from.name')."\"\n\n";
} }
switch ($request->mail_driver) { switch ($request->mail_driver) {
@ -165,7 +165,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.$request->mail_password."\n". 'MAIL_PASSWORD='.$request->mail_password."\n".
'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n". 'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
break; break;
@ -187,7 +187,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n". 'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
$extraMailData= $extraMailData=
'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n". 'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n".
@ -221,7 +221,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n". 'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
$extraMailData= $extraMailData=
'SES_KEY='.$request->mail_ses_key."\n". 'SES_KEY='.$request->mail_ses_key."\n".
@ -253,7 +253,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n". 'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
break; break;
@ -275,7 +275,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n". 'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
break; break;
} }

18721
public/assets/css/laraspace.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/css/laraspace.css.map
View File

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
View File

@ -1,4 +1,6 @@
{ {
"/assets/js/app.js": "/assets/js/app.js?id=d025b2d85b5f0847a142", "/assets/js/app.js": "/assets/js/app.js",
"/assets/css/laraspace.css": "/assets/css/laraspace.css?id=361d275866b6299acb36" "/assets/css/laraspace.css": "/assets/css/laraspace.css",
"/assets/js/app.js.map": "/assets/js/app.js.map",
"/assets/css/laraspace.css.map": "/assets/css/laraspace.css.map"
} }

4
resources/assets/js/store/modules/auth/actions.js
View File

@ -75,3 +75,7 @@ export const logout = ({ commit, dispatch, state }, noRequest = false) => {
}) })
}) })
} }
export const loginOnBoardingUser = ({ commit, dispatch, state }, token) => {
commit(types.AUTH_SUCCESS, token)
}

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

@ -36,9 +36,9 @@ export default {
data () { data () {
return { return {
mailConfigData: { mailConfigData: {
mail_driver: 'smtp' mail_driver: 'mail'
}, },
mail_driver: 'smtp', mail_driver: 'mail',
loading: false, loading: false,
mail_drivers: [] mail_drivers: []
} }

6
resources/assets/js/views/wizard/Settings.vue
View File

@ -101,6 +101,7 @@
import MultiSelect from 'vue-multiselect' import MultiSelect from 'vue-multiselect'
import { validationMixin } from 'vuelidate' import { validationMixin } from 'vuelidate'
import Ls from '../../services/ls' import Ls from '../../services/ls'
import { mapActions } from 'vuex'
const { required, minLength, email } = require('vuelidate/lib/validators') const { required, minLength, email } = require('vuelidate/lib/validators')
export default { export default {
@ -149,6 +150,9 @@ export default {
this.getOnboardingData() this.getOnboardingData()
}, },
methods: { methods: {
...mapActions('auth', [
'loginOnBoardingUser'
]),
async getOnboardingData () { async getOnboardingData () {
let response = await window.axios.get('/api/admin/onboarding') let response = await window.axios.get('/api/admin/onboarding')
if (response.data) { if (response.data) {
@ -201,6 +205,8 @@ export default {
// this.$emit('next') // this.$emit('next')
this.loading = false this.loading = false
Ls.set('auth.token', response.data.token) Ls.set('auth.token', response.data.token)
this.loginOnBoardingUser(response.data.token)
window.toastr['success']('Login Successful')
this.$router.push('/admin/dashboard') this.$router.push('/admin/dashboard')
} }
} }