Skip to content

Commit 57ae2ec

Browse files
AmazingMoonAmazingMoon
authored
Merge pull request #26 from luaChina/develop
Develop
2 parents 1166ae4 + d4a5375 commit 57ae2ec

24 files changed

+1592
-1211
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ root = true
33

44
[*]
55
indent_style = space
6-
indent_size = 2
6+
indent_size = 4
77
end_of_line = lf
88
charset = utf-8
99
trim_trailing_whitespace = true

‎assets/sass/app.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
//bootstrap
2-
@import '~bootstrap/scss/bootstrap.scss';
1+
@import "./common.scss";
2+
@import "~bootstrap/scss/bootstrap.scss";
3+
4+
@import "../css/animate";
5+
6+
@import "./markdown-editor.scss";
37

4-
@import '../css/animate';
58

6-
@import './markdown-editor.scss';

‎assets/sass/common.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
pointer-cursor {
2+
cursor: pointer;
3+
}

‎assets/sass/markdown-editor.scss

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
@import '../css/dracula.css'; // highlight.js 里的样式
1+
@import "../css/dracula.css"; // highlight.js 里的样式
22

3-
.markdown-preview, .editor-preview-side {
3+
.markdown-preview,
4+
.editor-preview-side {
45
pre code {
56
display: block;
67
overflow-x: auto;
@@ -9,7 +10,8 @@
910
background: #282a36;
1011
color: #ffffff;
1112
letter-spacing: -0.3px;
12-
font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
13+
font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New,
14+
monospace;
1315
border: 0;
1416
border-radius: 0;
1517
line-height: 1.5;
@@ -37,12 +39,13 @@
3739
color: #333;
3840
}
3941
h4 {
40-
font-size: 1.0rem;
42+
font-size: 1rem;
4143
line-height: 18px;
4244
margin: 20px 0 2px;
4345
color: #333;
4446
}
45-
h5,h6 {
47+
h5,
48+
h6 {
4649
font-size: 1rem;
4750
line-height: 17px;
4851
margin: 10px 0 -4px;
@@ -55,8 +58,7 @@
5558
color: #777777;
5659
}
5760
img {
58-
display: block;
59-
width: 400px;
60-
margin: auto;
61+
max-width: 100%;
62+
height: auto;
6163
}
6264
}

‎components/app-footer.vue

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,5 @@
11
<template>
2-
<div class="footer container-fluid text-white mt-5">
3-
<nav class="p-4 text-center d-flex justify-content-center">
4-
<div class="mr-5">
5-
<a target="_blank" href="https://github.com/luaChina" class="link" rel="nofollow">
6-
<font-awesome-icon :icon="['fab', 'github']" style="width: 21px;height: auto"/>
7-
</a>
8-
</div>
9-
<div class="mr-5 wechat-qrcode-wrapper" data-toggle="tooltip" data-placement="bottom" title="联系作者">
10-
<font-awesome-icon :icon="['fas', 'comment']" style="width: 21px;height: auto"/>
11-
<div class="d-flex justify-content-center">
12-
<img class="wechat-qrcode" src="~/assets/images/wechat-qrcode-100x100.jpeg" alt="wechat">
13-
</div>
14-
</div>
15-
<div class="mr-5 qq-qrcode-wrapper" data-toggle="tooltip" data-placement="bottom" title="加入 qq 群">
16-
<font-awesome-icon :icon="['fab', 'qq']" style="width: 18px;height: auto"/>
17-
<div class="d-flex justify-content-center">
18-
<img class="qq-qrcode" src="~/assets/images/qq-group-qrcode-100x100.jpeg" alt="wechat">
19-
</div>
20-
</div>
21-
<div>
22-
<a target="_blank" href="https://www.facebook.com/groups/2274306536124822/" class="mr-5 link" rel="nofollow">
23-
<font-awesome-icon :icon="['fab', 'facebook']" style="width: 21px;height: auto"/>
24-
</a>
25-
</div>
26-
<div>
27-
<a target="_blank" href="https://twitter.com/horan18927220" class="link" rel="nofollow">
28-
<font-awesome-icon :icon="['fab', 'twitter']" style="width: 21px;height: auto"/>
29-
</a>
30-
</div>
31-
</nav>
2+
<div class="footer container-fluid text-white mt-5 pt-4">
323
<div class="row text-center">
334
<div class="col">
345
<p class="text-light">技术支撑</p>
@@ -50,7 +21,7 @@
5021
<div class="row border-top border-dark">
5122
<div class="col">
5223
<div class="footer-copyright text-center">Designed by
53-
<font-awesome-icon :icon="['fab', 'sketch']" style="width: 18px;height: auto;"/>
24+
<i class="bi bi-layout-wtf"></i>
5425
<a class="text-white font-italic" href="https://github.com/horan-geeker" target="_blank" rel="nofollow"> Horan</a>
5526
and
5627
<a class="text-white font-italic" href="https://github.com/AmazingMoon" target="_blank" rel="nofollow"> Amazing</a>

‎components/app-header.vue

Lines changed: 221 additions & 127 deletions
Large diffs are not rendered by default.

‎components/markdown-editor.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
<script>
1111
import SimpleMDE from 'simplemde'
12-
import 'font-awesome/css/font-awesome.min.css'
1312
import 'simplemde/dist/simplemde.min.css'
1413
require('codemirror/theme/monokai.css'); // codemirror
1514
require('inline-attachment/src/inline-attachment');

‎components/oauth-login.vue

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,51 @@
11
<template>
2-
<div>
3-
<div class="row text-muted mt-4 mb-4">
4-
<div class="col-3 border-bottom mb-2"></div>
5-
<div class="col-6 text-center">其他登录方式</div>
6-
<div class="col-3 border-bottom mb-2"></div>
2+
<div>
3+
<div class="row text-muted mt-4 mb-4">
4+
<div class="col-3 border-bottom mb-2"></div>
5+
<div class="col-6 text-center">其他登录方式</div>
6+
<div class="col-3 border-bottom mb-2"></div>
7+
</div>
8+
<div class="d-flex justify-content-around">
9+
<div class="text-center">
10+
<button
11+
type="button"
12+
class="btn btn-outline-secondary"
13+
@click="githubLogin"
14+
>
15+
<i class="bi bi-github"></i>&nbsp;GitHub登录
16+
</button>
17+
</div>
18+
<div class="text-center pointer-cursor" @click="smsLogin">
19+
<button type="button" class="btn btn-outline-secondary">
20+
<i class="bi bi-chat-text-fill"></i>&nbsp;验证码登录
21+
</button>
22+
</div>
23+
</div>
724
</div>
8-
<div class="d-flex justify-content-around">
9-
<div class="text-center">
10-
<a :href="'https://github.com/login/oauth/authorize/?client_id=' + github_client_id + '&redirect_uri=' + github_redirect_url + '&scope=user:email'" rel="nofollow">
11-
<font-awesome-icon :icon="['fab', 'github']" style="width: 34px;height: 34px;color:black"/>
12-
</a>
13-
<div class="text-muted">GitHub 登录</div>
14-
</div>
15-
<div class="text-center" @click="smsLogin">
16-
<a>
17-
<font-awesome-icon :icon="['fas', 'sms']" style="width: 34px;height: 34px;color:black"/>
18-
</a>
19-
<div class="text-muted">短信验证码登录</div>
20-
</div>
21-
</div>
22-
</div>
2325
</template>
2426

25-
2627
<script>
27-
import config from '~/config/api.js'
28+
import config from "~/config/api.js";
2829
29-
export default {
30+
export default {
3031
data() {
31-
return {
32-
github_redirect_url: config.apiUrl + '/oauth/github',
33-
github_client_id: config.githubClientId
34-
}
32+
return {
33+
github_redirect_url: config.apiUrl + "/oauth/github",
34+
github_client_id: config.githubClientId
35+
};
3536
},
3637
methods: {
37-
smsLogin() {
38-
this.$parent.changeLoginWay();
39-
}
38+
githubLogin() {
39+
location.href =
40+
"https://github.com/login/oauth/authorize/?client_id=" +
41+
this.github_client_id +
42+
"&redirect_uri=" +
43+
this.github_redirect_url +
44+
"&scope=user:email";
45+
},
46+
smsLogin() {
47+
this.$parent.changeLoginWay();
48+
}
4049
}
41-
}
50+
};
4251
</script>

‎layouts/default.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
<nuxt />
44
</div>
55
</template>
6-
6+
<script>
7+
export default { name: "layout" };
8+
</script>
79
<style>
810
html {
9-
font-family: 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI',
10-
Roboto, 'Helvetica Neue', Arial, sans-serif;
11+
font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI",
12+
Roboto, "Helvetica Neue", Arial, sans-serif;
1113
font-size: 16px;
1214
word-spacing: 1px;
1315
-ms-text-size-adjust: 100%;

‎nuxt.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,13 @@ module.exports = {
4444
{src: '~plugins/vee-validate', ssr: false},
4545
{src: '~plugins/vue-star', ssr: false},
4646
{src: '~plugins/markdown-editor', ssr: false},
47-
{src: '~plugins/fontawesome', ssr: true}
4847
],
4948

5049
/*
5150
** Nuxt.js modules
5251
*/
5352
modules: [
54-
// Doc: https://bootstrap-vue.js.org/docs/
55-
'bootstrap-vue/nuxt'
53+
5654
],
5755

5856
/*

0 commit comments

Comments
 (0)