Skip to content

Commit

Permalink
Merge pull request #1397 from nextcloud/renovate/master-nextcloud-esl…
Browse files Browse the repository at this point in the history
…int-config-8.x

chore(deps): bump @nextcloud/eslint-config from 7.0.2 to v8 (master)
  • Loading branch information
st3iny committed Jul 10, 2023
2 parents 8668bd8 + bb92a57 commit 3666d56
Show file tree
Hide file tree
Showing 12 changed files with 2,504 additions and 1,231 deletions.
4 changes: 2 additions & 2 deletions js/twofactor_totp-main-login-setup.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/twofactor_totp-main-login-setup.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/twofactor_totp-main-settings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/twofactor_totp-main-settings.js.map

Large diffs are not rendered by default.

3,679 changes: 2,476 additions & 1,203 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -40,7 +40,7 @@
"devDependencies": {
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/eslint-config": "^7.0.2",
"@nextcloud/eslint-config": "^8.3.0-beta.2",
"@nextcloud/stylelint-config": "^2.3.0",
"@nextcloud/webpack-vue-config": "^5.1.0",
"@vue/test-utils": "^1.3.5",
Expand Down
10 changes: 5 additions & 5 deletions src/components/LoginSetup.vue
Expand Up @@ -33,10 +33,10 @@
</template>

<script>
import Logger from '../logger'
import { saveState } from '../services/StateService'
import SetupConfirmation from './SetupConfirmation'
import STATE from '../state'
import Logger from '../logger.js'
import { saveState } from '../services/StateService.js'
import SetupConfirmation from './SetupConfirmation.vue'
import STATE from '../state.js'
export default {
name: 'LoginSetup',
Expand Down Expand Up @@ -68,7 +68,7 @@ export default {
this.qrUrl = qrUrl
this.loading = false
}
},
)
},
confirm() {
Expand Down
12 changes: 6 additions & 6 deletions src/components/PersonalTotpSettings.vue
Expand Up @@ -49,9 +49,9 @@
<script>
import confirmPassword from '@nextcloud/password-confirmation'
import Logger from '../logger'
import SetupConfirmation from './SetupConfirmation'
import state from '../state'
import Logger from '../logger.js'
import SetupConfirmation from './SetupConfirmation.vue'
import state from '../state.js'
export default {
name: 'PersonalTotpSettings',
Expand Down Expand Up @@ -106,7 +106,7 @@ export default {
})
.catch((e) => {
OC.Notification.showTemporary(
t('twofactor_totp', 'Could not enable TOTP')
t('twofactor_totp', 'Could not enable TOTP'),
)
Logger.error('Could not enable TOTP', e)
Expand Down Expand Up @@ -137,8 +137,8 @@ export default {
OC.Notification.showTemporary(
t(
'twofactor_totp',
'Could not verify your key. Please try again'
)
'Could not verify your key. Please try again',
),
)
}
Expand Down
4 changes: 2 additions & 2 deletions src/main-login-setup.js
Expand Up @@ -20,8 +20,8 @@
*/

import Vue from 'vue'
import Logger from './logger'
import LoginSetup from './components/LoginSetup'
import Logger from './logger.js'
import LoginSetup from './components/LoginSetup.vue'

Vue.mixin({
methods: {
Expand Down
6 changes: 3 additions & 3 deletions src/main-settings.js
Expand Up @@ -21,10 +21,10 @@

import Vue from 'vue'
import { loadState } from '@nextcloud/initial-state'
import Logger from './logger'
import store from './store'
import Logger from './logger.js'
import store from './store.js'

import PersonalTotpSettings from './components/PersonalTotpSettings'
import PersonalTotpSettings from './components/PersonalTotpSettings.vue'

Vue.mixin({
methods: {
Expand Down
8 changes: 4 additions & 4 deletions src/store.js
@@ -1,8 +1,8 @@
import Vue from 'vue'
import Vuex from 'vuex'

import { saveState } from './services/StateService'
import state from './state'
import { saveState } from './services/StateService.js'
import state from './state.js'

Vue.use(Vuex)

Expand All @@ -18,7 +18,7 @@ export const actions = {
({ state, secret, qrUrl }) => {
commit('setState', state)
return { qrUrl, secret }
}
},
)
},

Expand All @@ -31,7 +31,7 @@ export const actions = {

disable({ commit }) {
return saveState({ state: state.STATE_DISABLED }).then(({ state }) =>
commit('setState', state)
commit('setState', state),
)
},
}
Expand Down
2 changes: 1 addition & 1 deletion src/tests/components/PersonalTotpSettings.spec.js
Expand Up @@ -22,7 +22,7 @@
import { shallowMount, createLocalVue } from '@vue/test-utils'
import Vuex from 'vuex'

import PersonalTotpSettings from '../../components/PersonalTotpSettings'
import PersonalTotpSettings from '../../components/PersonalTotpSettings.vue'

const localVue = createLocalVue()

Expand Down

0 comments on commit 3666d56

Please sign in to comment.