8000 fix login page's css · pycoder404/blog-vue@d922074 · GitHub
[go: up one dir, main page]
Skip to content

Commit d922074

Browse files
pycoder404pycoder404
committed
fix login page's css
1 parent bb34845 commit d922074

File tree

12 files changed

+77
-141
lines changed

12 files changed

+77
-141
lines changed

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"scripts": {
66
"serve": "vue-cli-service serve",
77
"build": "vue-cli-service build",
8+
"report": "vue-cli-service build --report",
89
"lint": "vue-cli-service lint"
910
},
1011
"dependencies": {

‎src/layout/components/MainHeader.vue

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -36,86 +36,7 @@
3636
</el-dropdown>
3737
</div>
3838
</div>
39-
<!-- <div class="main-header">-->
40-
<!-- <div class="left-menu">-->
41-
<!-- <el-link href="/">HOME</el-link>-->
42-
<!-- <el-link href="/">LIST</el-link>-->
43-
<!-- <el-link href="/">HOME</el-link>-->
44-
<!-- <el-link href="/">HOME</el-link>-->
45-
<!-- <el-link href="/">HOME</el-link>-->
46-
<!-- </div>-->
47-
48-
<!-- <div class="right-menu">-->
49-
<!-- <svg-icon icon="alipay"></svg-icon>-->
50-
<!-- <svg-icon icon="error"></svg-icon>-->
51-
<!-- <el-link href="https://github.com/pycoder404/blog-django" target="_blank"><svg-icon icon="git"></svg-icon></el-link>-->
52-
<!-- <svg-icon icon="gmail"></svg-icon>-->
53-
<!-- <svg-icon icon="qq"></svg-icon>-->
54-
<!-- <svg-icon icon="wechat"></svg-icon>-->
55-
56-
<!-- </div>-->
57-
<!-- </div>-->
58-
59-
<!-- <el-row>-->
60-
<!-- <el-col :span="20">-->
61-
<!-- <el-menu-->
62-
<!-- class="el-menu-demo"-->
63-
<!-- mode="horizontal"-->
64-
<!-- background-color="#545c64"-->
65-
<!-- text-color="#fff"-->
66-
<!-- active-text-color="#ffd04b"-->
67-
<!-- @select="handleSelect"-->
68-
<!-- >-->
69-
<!-- <el-menu-item index="1">-->
70-
<!-- <el-link href="/">HOME</el-link>-->
71-
<!-- </el-menu-item>-->
72-
<!-- <el-menu-item index="2">-->
73-
<!-- <el-link href="/article/list">归档</el-link>-->
74-
<!-- </el-menu-item>-->
75-
<!-- <el-menu-item index="3">-->
76-
<!-- <el-link href="/article/list">分类</el-link>-->
77-
<!-- </el-menu-item>-->
78-
<!-- <el-menu-item index="4">-->
79-
<!-- <el-link href="/article/list">标签</el-link>-->
80-
<!-- </el-menu-item>-->
81-
<!-- <el-menu-item index="5">-->
82-
<!-- <el-link href="/article/list">project</el-link>-->
83-
<!-- </el-menu-item>-->
84-
<!-- <el-menu-item index="6">-->
85-
<!-- <el-link href="/article/create">NEW</el-link>-->
86-
<!-- </el-menu-item>-->
87-
<!-- <el-menu-item index="7">-->
88-
<!-- <el-link href="/article/detail">aboutme</el-link>-->
89-
<!-- </el-menu-item>-->
90-
<!-- </el-menu>-->
91-
<!-- </el-col>-->
92-
<!-- <el-col :span="4">-->
93-
<!-- <el-menu-->
94-
<!-- class="el-menu-demo"-->
95-
<!-- mode="horizontal"-->
96-
<!-- background-color="#545c64"-->
97-
<!-- text-color="#fff"-->
98-
<!-- active-text-color="#ffd04b"-->
99-
<!-- >-->
100-
<!-- <el-menu-item index="1">-->
101-
<!-- <el-link href="https://github.com/pycoder404/blog-django" target="_blank">-->
102-
<!-- <svg-icon icon="git"></svg-icon>-->
103-
<!-- </el-link>-->
104-
<!-- </el-menu-item>-->
105-
106-
<!-- <el-menu-item index="3">-->
107-
<!-- <el-link href="https://github.com/pycoder404/blog-django" target="_blank">-->
108-
<!-- <svg-icon icon="gmail"></svg-icon>-->
109-
<!-- </el-link>-->
110-
<!-- </el-menu-item>-->
111-
<!-- <el-menu-item style="" index="4">-->
112-
<!-- <el-link href="https://github.com/pycoder404/blog-django" target="_blank">-->
113-
<!-- <svg-icon icon="wechat"></svg-icon>-->
114-
<!-- </el-link>-->
115-
<!-- </el-menu-item>-->
116-
<!-- </el-menu>-->
117-
<!-- </el-col>-->
118-
<!-- </el-row>-->
39+
11940

12041
</template>
12142

@@ -125,8 +46,6 @@
12546
// import Breadcrumb from '@/components/Breadcrumb'
12647
// import Hamburger from '@/components/Hamburger'
12748
import {ref} from 'vue'
128-
129-
13049
import SvgIcon from '@/components/SvgIcon/index'
13150
13251
export default {

‎src/main.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import store from './store'
1010
import ElementPlus from 'element-plus'
1111
import 'element-plus/dist/index.css'
1212

13-
import {CaretBottom, DeleteFilled, EditPen, Search, Plus} from '@element-plus/icons-vue'
13+
import {CaretBottom, DeleteFilled, EditPen, Search, Plus,User,Lock} from '@element-plus/icons-vu 10000 e'
1414

1515

1616
import hljs from 'highlight.js'
@@ -46,6 +46,8 @@ app.component('EditPen', EditPen)
4646
app.component('CaretBottom', CaretBottom)
4747
app.component('SearchIcon', Search)
4848
app.component('PlusIcon', Plus)
49+
app.component('UserIcon', User)
50+
app.component('LockIcon', Lock)
4951
app.use(router).use(store).use(hljsVuePlugin).use(ElementPlus).use(mavonEditor).mount('#app')
5052
// app.use(ElementPlus, { size: 'small', zIndex: 5000 })
5153
// app.mount('#app')

‎src/permission.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ router.beforeEach(async (to, from, next) => {
2323
// console.log("check is has access token: ",hasAccessToken)
2424
if (hasAccessToken) {
2525
// console.log("has access token:",hasAccessToken)
26-
// FIXME 添加对accessToken的过期检查和refresh
26+
// TODO 添加对accessToken的过期检查和refresh
2727
if (to.path === '/login') {
2828
// if is logged in, redirect to the home page
2929
next({path: '/'})
@@ -32,7 +32,8 @@ router.beforeEach(async (to, from, next) => {
3232
// determine whether the user has obtained his permission roles through getInfo
3333
// console.log("check is has roles")
3434
// console.log(store.getters.roles)
35-
// FIXME Ctrl + F5强制刷新界面，对store有啥影响吗，为啥会导致没有roles，重新获取Info？
35+
// question Ctrl + F5强制刷新界面，对store有啥影响吗，为啥会导致没有roles，重新获取Info？?
36+
// note: 因为store是存在内存中的，所以每次刷新就会判断为空，需要重新获取数据，而cookie保存在本地，所以刷新不会丢失
3637
const hasRoles = store.getters.roles && store.getters.roles.length > 0
3738
if (hasRoles) {
3839
// console.log("yes has roles")
@@ -43,7 +44,7 @@ router.beforeEach(async (to, from, next) => {
4344
try {
4445
// get user info
4546
// note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
46-
// FIXME 这里的roles是user/GetInfo如何反馈的，如何只反馈roles的
47+
// question 这里的roles是user/GetInfo如何反馈的，如何只反馈roles的
4748
// console.log("get info")
4849
const { roles } = await store.dispatch('user/getInfo')
4950
console.log(roles)

‎src/router/index.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,30 @@ const routes = [
2525
{
2626
path: 'list',
2727
component: ArticleList,
28-
name: 'articleListPage'
28+
name: 'articleListPage',
29+
meta: { title: 'ArticleList'}
30+
2931
},
3032
{
3133
path: 'detail/:id(\\d+)/',
3234
component: ArticleDetail,
33-
name: 'articleDetailPage'
35+
name: 'articleDetailPage',
36+
meta: { title: 'ArticleDetail'}
3437

3538
},
3639
{
3740
path: 'edit/:id(\\d+)/',
3841
component: ArticleEdit,
39-
name: 'articleEditPage'
42+
name: 'articleEditPage',
43+
meta: { title: 'ArticleEdit'}
44+
4045

4146
},
4247
{
4348
path: 'create',
4449
component: ArticleCreate,
45-
name: 'articleCreatePage'
50+
name: 'articleCreatePage',
51+
meta: { title: 'ArticleCreate'}
4652
}
4753
]
4854
}

‎src/settings.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module.exports = {
2-
32
title: 'a django-vue blog',
4-
3+
// fixme accessToken should expires in 1 day ,and refresh in 7 days
4+
accessTokenExpire: 7,
5+
refreshTokenExpire: 30,
56
}

‎src/store/modules/user.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ const mutations = {
5151
const actions = {
5252
// user login
5353
login({ commit }, userInfo) {
54-
console.info("login in store")
54+
// console.info("login in store")
5555
const { username, password } = userInfo
5656
return new Promise((resolve, reject) => {
5757
login({ username: username.trim(), password: password }).then(response => {
5858
const data = response
59-
console.log("login done")
59+
// console.log("login done")
6060
commit('SET_ACCESS_TOKEN', data.access)
6161
commit('SET_REFRESH_TOKEN', data.refresh)
6262
// token保存在cookie和store中
6363
setAccessToken(data.access)
6464
setRefreshToken(data.refresh)
65-
console.log("set access token done")
65+
// console.log("set access token done")
6666
resolve()
6767
}).catch(error => {
6868
reject(error)

‎src/utils/auth.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
import Cookies from 'js-cookie'
2+
import defaultSettings from '@/settings'
3+
4+
const accessExpire = defaultSettings.accessTokenExpire || 1
5+
const refreshExpire = defaultSettings.refreshTokenExpire || 7
26

37
//保存在cookie里的token名称
48
const accessTokenKey = 'access_token'
@@ -9,7 +13,7 @@ export function getAccessToken() {
913
}
1014

1115
export function setAccessToken(token) {
12-
return Cookies.set(accessTokenKey, token)
16+
return Cookies.set(accessTokenKey, token, {expires: accessExpire})
1317
}
1418

1519
export function removeAccessToken() {
@@ -22,7 +26,7 @@ export function getRefreshToken() {
2226
}
2327

2428
export function setRefreshToken(token) {
25-
return Cookies.set(refreshTokenKey, token)
29+
return Cookies.set(refreshTokenKey, token, {expires: refreshExpire})
2630
}
2731

2832
export function removeRefreshToken() {

‎src/utils/get-page-title.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import defaultSettings from '@/settings'
22

3-
const title = defaultSettings.title || 'pycoder404 Blog'
3+
const title = defaultSettings.title || 'A Django Vue Blog'
44

55
export default function getPageTitle(pageTitle) {
66
if (pageTitle) {

‎src/utils/request.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const service = axios.create({
1313
service.interceptors.request.use(
1414
config => {
1515
// do something before request is sent
16-
// 在permission中在每一个路由变化之前对accessToken进行过期检查，或者使用refreshToken刷新accessToken
16+
// todo 在permission中在每一个路由变化之前对accessToken进行过期检查，或者使用refreshToken刷新accessToken
1717
// 给请求都添加一个accessToken
1818
if (store.getters.accessToken) {
1919
// let each request carry token
@@ -25,7 +25,6 @@ service.interceptors.request.use(
2525
},
2626
error => {
2727
// do something with request error
28-
console.log("error in config")
2928
console.log(error) // for debug
3029
return Promise.reject(error)
3130
}

0 commit comments

Comments
 (0)
0