Change ts to js for router and app
This commit is contained in:
parent
0c427e8c34
commit
e92dbba320
|
@ -13,7 +13,7 @@ const { VueLoaderPlugin } = require('vue-loader')
|
||||||
|
|
||||||
let rendererConfig = {
|
let rendererConfig = {
|
||||||
entry: {
|
entry: {
|
||||||
renderer: path.join(__dirname, '../src/renderer/main.ts')
|
renderer: path.join(__dirname, '../src/renderer/main.js')
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
|
|
|
@ -3,13 +3,7 @@
|
||||||
<el-header>
|
<el-header>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24" class="close">
|
<el-col :span="24" class="close">
|
||||||
<el-button
|
<el-button type="text" :icon="ElIconClose" @click="close" class="close-button"> </el-button>
|
||||||
type="text"
|
|
||||||
:icon="ElIconClose"
|
|
||||||
@click="close"
|
|
||||||
class="close-button"
|
|
||||||
>
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -28,22 +22,22 @@ import { mapState } from 'vuex'
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
ElIconClose,
|
ElIconClose
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
name: 'login',
|
name: 'login',
|
||||||
components: { LoginForm },
|
components: { LoginForm },
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
page: (state) => state.Login.page,
|
page: state => state.Login.page
|
||||||
}),
|
})
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
close() {
|
close() {
|
||||||
this.$store.dispatch('Login/pageBack')
|
this.$store.dispatch('Login/pageBack')
|
||||||
return this.$router.push({ path: '/', query: { redirect: 'home' } })
|
return this.$router.push({ path: '/', query: { redirect: 'home' } })
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -61,10 +61,10 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
|
||||||
import { sync } from 'vuex-router-sync'
|
import { sync } from 'vuex-router-sync'
|
||||||
// import shortkey from 'vue-shortkey'
|
// import shortkey from 'vue-shortkey'
|
||||||
// import VueI18Next from '@panter/vue-i18next'
|
// import VueI18Next from '@panter/vue-i18next'
|
||||||
// import 'vue-resize/dist/vue-resize.css'
|
import 'vue-resize/dist/vue-resize.css'
|
||||||
// import VueResize from 'vue-resize'
|
import VueResize from 'vue-resize'
|
||||||
// import VueVirtualScroller from 'vue-virtual-scroller'
|
import VueVirtualScroller from 'vue-virtual-scroller'
|
||||||
// import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
|
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
|
||||||
|
|
||||||
import './assets/fonts/fonts.css'
|
import './assets/fonts/fonts.css'
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
|
@ -128,14 +128,12 @@ app.use(store)
|
||||||
app.use(router)
|
app.use(router)
|
||||||
app.use(ElementPlus)
|
app.use(ElementPlus)
|
||||||
app.component('font-awesome-icon', FontAwesomeIcon)
|
app.component('font-awesome-icon', FontAwesomeIcon)
|
||||||
|
app.use(VueVirtualScroller)
|
||||||
|
app.use(VueResize)
|
||||||
|
|
||||||
// Vue.use(ElementUI, { locale })
|
|
||||||
// Vue.use(shortkey)
|
// Vue.use(shortkey)
|
||||||
// Vue.use(VueI18Next)
|
// Vue.use(VueI18Next)
|
||||||
// Vue.use(VueResize)
|
|
||||||
// Vue.use(VueVirtualScroller)
|
|
||||||
// Vue.component('popper', Popper)
|
// Vue.component('popper', Popper)
|
||||||
// Vue.component('font-awesome-icon', FontAwesomeIcon)
|
|
||||||
|
|
||||||
sync(store, router)
|
sync(store, router)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { createRouter, RouteRecordRaw } from 'vue-router'
|
import { createRouter } from 'vue-router'
|
||||||
|
|
||||||
import Login from '@/components/Login.vue'
|
import Login from '@/components/Login.vue'
|
||||||
import Authorize from '@/components/Authorize.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 TimelineSpaceContentsFollowRequests from '@/components/TimelineSpace/Contents/FollowRequests.vue'
|
||||||
import TimelineSpaceContentsBookmarks from '@/components/TimelineSpace/Contents/Bookmarks.vue'
|
import TimelineSpaceContentsBookmarks from '@/components/TimelineSpace/Contents/Bookmarks.vue'
|
||||||
|
|
||||||
const routes: Array<RouteRecordRaw> = [
|
const routes = [
|
||||||
{
|
{
|
||||||
path: '/login',
|
path: '/login',
|
||||||
name: 'login',
|
name: 'login',
|
|
@ -1,5 +1,5 @@
|
||||||
import { createStore, createLogger } from 'vuex'
|
import { createStore, createLogger } from 'vuex'
|
||||||
// import { Route } from 'vue-router'
|
import { RouteLocationNormalized } from 'vue-router'
|
||||||
|
|
||||||
import App, { AppState } from './App'
|
import App, { AppState } from './App'
|
||||||
import GlobalHeader, { GlobalHeaderState } from './GlobalHeader'
|
import GlobalHeader, { GlobalHeaderState } from './GlobalHeader'
|
||||||
|
@ -22,7 +22,7 @@ export interface RootState {
|
||||||
Preferences: PreferencesModuleState
|
Preferences: PreferencesModuleState
|
||||||
Settings: SettingsModuleState
|
Settings: SettingsModuleState
|
||||||
molecules: OrganismsModuleState
|
molecules: OrganismsModuleState
|
||||||
// route: Route
|
route: RouteLocationNormalized
|
||||||
}
|
}
|
||||||
|
|
||||||
export default createStore({
|
export default createStore({
|
||||||
|
|
Loading…
Reference in New Issue