Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 240082e

Browse files
authored
Merge pull request #250 from FlowzPlatform/develop
Develop
2 parents 606d9a9 + 9cc60d6 commit 240082e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+14137
-6800
lines changed

client/build/webpack.base.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ module.exports = {
3333
test: /\.(js|vue)$/,
3434
loader: 'eslint-loader',
3535
enforce: 'pre',
36+
exclude: /node_modules/,
3637
include: [resolve('src'), resolve('test')],
3738
options: {
3839
formatter: require('eslint-friendly-formatter')

client/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"element-ui": "^1.4.12",
3434
"feathers-hooks": "^2.1.0",
3535
"feathers-socketio": "^2.0.0",
36-
"fs": "0.0.1-security",
3736
"grapesjs": "^0.10.7",
3837
"grapesjs-blocks-basic": "^0.1.1",
3938
"grapesjs-mjml": "0.0.8",
@@ -109,7 +108,7 @@
109108
"eslint": "^3.19.0",
110109
"eslint-config-standard": "^6.2.1",
111110
"eslint-friendly-formatter": "^3.0.0",
112-
"eslint-loader": "^1.7.1",
111+
"eslint-loader": "^1.9.0",
113112
"eslint-plugin-html": "^3.2.2",
114113
"eslint-plugin-promise": "^3.4.0",
115114
"eslint-plugin-standard": "^2.0.1",

client/src/components/EmailVerification.vue

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,8 @@
4040
</template>
4141

4242
<script>
43-
/*eslint-disable*/
4443
// import axios from 'axios'
4544
import modelAuthentication from '@/api/authentication'
46-
import modelUser from '@/api/user'
47-
import config from '@/config'
4845
import psl from 'psl'
4946
export default {
5047
name: 'email-verification',
@@ -70,16 +67,17 @@ export default {
7067
this.loading = true
7168
7269
var auth = await modelAuthentication.social(this.formLogin).catch(error => {
73-
this.$Message.error(error.response.data)
70+
this.$Message.error(error.response.data)
7471
return
7572
})
7673
if (auth) {
7774
this.$store.commit('SET_TOKEN', auth.logintoken)
78-
// Token Store in cookie
79-
let location = psl.parse(window.location.hostname) // get parent domain
80-
location = location.domain === null ? location.input : location.domain
81-
this.$cookie.set('auth_token', auth.logintoken, {expires: 1, domain: location}) // Store in cookie
82-
this.$store.commit('SET_ROLE', null)
75+
76+
// Token Store in cookie
77+
let location = psl.parse(window.location.hostname) // get parent domain
78+
location = location.domain === null ? location.input : location.domain
79+
this.$cookie.set('auth_token', auth.logintoken, {expires: 1, domain: location}) // Store in cookie
80+
this.$store.commit('SET_ROLE', null)
8381
this.$router.push({path: '/'}) // Redirect to dashbord
8482
}
8583
this.loading = false
@@ -92,9 +90,9 @@ export default {
9290
mounted () {
9391
// let params = new URLSearchParams(window.location.search)
9492
// this.formLogin.id = params.get('ob_id')
95-
let url = new URL(window.location.href);
96-
let ob_id = url.search.split('=')[1]
97-
this.formLogin.id = ob_id
93+
let url = new URL(window.location.href)
94+
let obId = url.search.split('=')[1]
95+
this.formLogin.id = obId
9896
}
9997
}
10098
</script>

0 commit comments

Comments
 (0)