diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js index 898cfe35..ba6996e2 100644 --- a/.electron-vue/webpack.renderer.config.js +++ b/.electron-vue/webpack.renderer.config.js @@ -13,7 +13,7 @@ const { VueLoaderPlugin } = require('vue-loader') let rendererConfig = { entry: { - renderer: path.join(__dirname, '../src/renderer/main.ts') + renderer: path.join(__dirname, '../src/renderer/main.js') }, module: { rules: [ diff --git a/src/renderer/components/Login.vue b/src/renderer/components/Login.vue index bed796f7..dcf7da26 100644 --- a/src/renderer/components/Login.vue +++ b/src/renderer/components/Login.vue @@ -3,13 +3,7 @@ - - + @@ -28,22 +22,22 @@ import { mapState } from 'vuex' export default { data() { return { - ElIconClose, + ElIconClose } }, name: 'login', components: { LoginForm }, computed: { ...mapState({ - page: (state) => state.Login.page, - }), + page: state => state.Login.page + }) }, methods: { close() { this.$store.dispatch('Login/pageBack') return this.$router.push({ path: '/', query: { redirect: 'home' } }) - }, - }, + } + } } diff --git a/src/renderer/main.ts b/src/renderer/main.js similarity index 87% rename from src/renderer/main.ts rename to src/renderer/main.js index 2c2bc935..c04a322a 100644 --- a/src/renderer/main.ts +++ b/src/renderer/main.js @@ -61,10 +61,10 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' import { sync } from 'vuex-router-sync' // import shortkey from 'vue-shortkey' // import VueI18Next from '@panter/vue-i18next' -// import 'vue-resize/dist/vue-resize.css' -// import VueResize from 'vue-resize' -// import VueVirtualScroller from 'vue-virtual-scroller' -// import 'vue-virtual-scroller/dist/vue-virtual-scroller.css' +import 'vue-resize/dist/vue-resize.css' +import VueResize from 'vue-resize' +import VueVirtualScroller from 'vue-virtual-scroller' +import 'vue-virtual-scroller/dist/vue-virtual-scroller.css' import './assets/fonts/fonts.css' import App from './App.vue' @@ -128,14 +128,12 @@ app.use(store) app.use(router) app.use(ElementPlus) app.component('font-awesome-icon', FontAwesomeIcon) +app.use(VueVirtualScroller) +app.use(VueResize) -// Vue.use(ElementUI, { locale }) // Vue.use(shortkey) // Vue.use(VueI18Next) -// Vue.use(VueResize) -// Vue.use(VueVirtualScroller) // Vue.component('popper', Popper) -// Vue.component('font-awesome-icon', FontAwesomeIcon) sync(store, router) diff --git a/src/renderer/router/index.ts b/src/renderer/router/index.js similarity index 98% rename from src/renderer/router/index.ts rename to src/renderer/router/index.js index ff02dee8..1651225c 100644 --- a/src/renderer/router/index.ts +++ b/src/renderer/router/index.js @@ -1,4 +1,4 @@ -import { createRouter, RouteRecordRaw } from 'vue-router' +import { createRouter } from 'vue-router' import Login from '@/components/Login.vue' import Authorize from '@/components/Authorize.vue' @@ -34,7 +34,7 @@ import TimelineSpaceContentsListsShow from '@/components/TimelineSpace/Contents/ import TimelineSpaceContentsFollowRequests from '@/components/TimelineSpace/Contents/FollowRequests.vue' import TimelineSpaceContentsBookmarks from '@/components/TimelineSpace/Contents/Bookmarks.vue' -const routes: Array = [ +const routes = [ { path: '/login', name: 'login', diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts index 74aa87e9..ef1ff98c 100644 --- a/src/renderer/store/index.ts +++ b/src/renderer/store/index.ts @@ -1,5 +1,5 @@ import { createStore, createLogger } from 'vuex' -// import { Route } from 'vue-router' +import { RouteLocationNormalized } from 'vue-router' import App, { AppState } from './App' import GlobalHeader, { GlobalHeaderState } from './GlobalHeader' @@ -22,7 +22,7 @@ export interface RootState { Preferences: PreferencesModuleState Settings: SettingsModuleState molecules: OrganismsModuleState - // route: Route + route: RouteLocationNormalized } export default createStore({