Merge pull request #983 from getgridea/dev

update build dir and netlify deploy support

.eslintrc.js

@@ -64,6 +64,7 @@ module.exports = {
     'import/no-extraneous-dependencies': 0,
     'global-require': 0,
     'no-continue': 0,
+    'linebreak-style': 0,
   },
   parserOptions: {
     parser: '@typescript-eslint/parser',

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org

package.json

@@ -1,14 +1,14 @@
 {
   "name": "gridea",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "private": true,
   "description": "A static blog writing client. You can use it to record your life, mood, knowledge, notes and ideas...",
   "keywords": [
     "gridea",
     "static-site",
     "static-site-generator"
   ],
-  "homepage": "http://gridea.dev",
+  "homepage": "https://gridea.dev",
   "license": "MIT",
   "author": {
     "name": "EryouHao",
@@ -25,7 +25,7 @@
     "@iktakahiro/markdown-it-katex": "^3.1.0",
     "@sentry/electron": "^1.2.0",
     "ant-design-vue": "^1.3.5",
-    "axios": "^0.18.1",
+    "axios": "^0.27.2",
     "bluebird": "^3.5.3",
     "ejs": "^2.6.1",
     "electron-google-analytics": "^0.1.0",
@@ -34,7 +34,7 @@
     "fs-extra": "^7.0.1",
     "gray-matter": "^4.0.1",
     "hpagent": "^1.0.0",
-    "isomorphic-git": "^1.17.1",
+    "isomorphic-git": "1.17.1",
     "junk": "^3.1.0",
     "less": "^3.9.0",
     "lowdb": "^1.0.0",

public/default-files/posts/hello-gridea.md

@@ -13,7 +13,7 @@ feature: /post-images/hello-gridea.png
 
 [Github](https://github.com/getgridea/gridea)  
 [Gridea 主页](https://gridea.dev/)  
-[示例网站](http://fehey.com/)
+[示例网站](https://fehey.com/)
 
 ## 特性👇
 📝  你可以使用最酷的 **Markdown** 语法，进行快速创作  

public/default-files/themes/fly/templates/includes/head.ejs

@@ -1,37 +1,37 @@
-
-<meta charset="utf-8" >
-
-<title><%= siteTitle %></title>
-<meta name="description" content="<%= themeConfig.siteDescription %>">
-
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css">
-
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
-<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
-<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
-
-<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
-  <% if (commentSetting.commentPlatform === 'gitalk') { %>
-    <link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
-  <% } %>
-
-  <% if (commentSetting.commentPlatform === 'disqus') { %>
-    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/disqusjs.css" />
-  <% } %>
-<% } %>
-
-<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
-<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
-
-<% if (site.customConfig.ga) { %>
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '<%= site.customConfig.ga %>');
-</script>
-<% } %>
+
+<meta charset="utf-8" >
+
+<title><%= siteTitle %></title>
+<meta name="description" content="<%= themeConfig.siteDescription %>">
+
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css">
+
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
+<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
+<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
+
+<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
+  <% if (commentSetting.commentPlatform === 'gitalk') { %>
+    <link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
+  <% } %>
+
+  <% if (commentSetting.commentPlatform === 'disqus') { %>
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/disqusjs.css" />
+  <% } %>
+<% } %>
+
+<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+<script src="//cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
+
+<% if (site.customConfig.ga) { %>
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '<%= site.customConfig.ga %>');
+</script>
+<% } %>

public/default-files/themes/fly/templates/post.ejs

@@ -31,7 +31,7 @@
               </span>
             <% } %>
           </div>
-          <div class="post-content">
+          <div class="post-content" v-pre>
             <%- post.content %>
           </div>
         </div>

public/default-files/themes/notes/templates/post.ejs

@@ -4,7 +4,7 @@
     <meta name="description" content="<%- post.description %>" />
     <meta name="keywords" content="<%- post.tags.map(tag => tag.name).join(',') %>" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
-    <script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
+    <script src="//cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
   </head>
   <body>
     <div class="main">
@@ -32,7 +32,7 @@
               <img class="post-feature-image" src="<%= post.feature %>" alt="">
             <% } %>
             <div class="post-content-wrapper">
-              <div class="post-content">
+              <div class="post-content" v-pre>
                 <%- post.content %>
               </div>
               <div class="toc-container">

public/default-files/themes/paper/templates/_blocks/head.ejs

@@ -1,36 +1,36 @@
-<meta charset="utf-8" >
-
-<title><%= siteTitle %></title>
-<meta name="description" content="<%= themeConfig.siteDescription %>">
-
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
-
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
-<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/paper.min.css" />
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
-<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
-
-<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
-  <% if (commentSetting.commentPlatform === 'gitalk') { %>
-    <link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
-  <% } %>
-
-  <% if (commentSetting.commentPlatform === 'disqus') { %>
-    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/disqusjs.css" />
-  <% } %>
-<% } %>
-<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
-
-
-<link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
-<% if (site.customConfig.ga) { %>
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '<%= site.customConfig.ga %>');
-</script>
-<% } %>
+<meta charset="utf-8" >
+
+<title><%= siteTitle %></title>
+<meta name="description" content="<%= themeConfig.siteDescription %>">
+
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
+
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
+<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/paper.min.css" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
+<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
+
+<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
+  <% if (commentSetting.commentPlatform === 'gitalk') { %>
+    <link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
+  <% } %>
+
+  <% if (commentSetting.commentPlatform === 'disqus') { %>
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/disqusjs.css" />
+  <% } %>
+<% } %>
+<script src="//cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
+
+
+<link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
+<% if (site.customConfig.ga) { %>
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '<%= site.customConfig.ga %>');
+</script>
+<% } %>

public/default-files/themes/paper/templates/post.ejs

@@ -22,7 +22,7 @@
             <% if (post.feature) { %>
               <img src="<%= post.feature %>" alt="<%= post.title %>">
             <% } %>
-            <div class="post-content">
+            <div class="post-content" v-pre>
               <%- post.content %>
             </div>
           </article>

public/default-files/themes/simple/templates/_blocks/scripts.ejs

@@ -13,7 +13,7 @@ var app = new Vue({
 </script>
 
 <% if (site.customConfig.renderCode) { %>
-  <script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
+  <script src="//cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
   <script>
     hljs.initHighlightingOnLoad()
   </script>

src/assets/styles/custom.less

@@ -13,7 +13,7 @@
 
 .ant-table-thead > tr > th {
   background: #ffffff;
-  color: #434343b0;
+  color: #1b1b18b0;
   font-weight: normal;
 }
 
@@ -52,6 +52,9 @@
     margin-left: 8px;
     outline: none;
     transition: all 0.3s;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     i {
       font-weight: bold;
     }
@@ -156,14 +159,14 @@
     padding: 4px 8px;
     margin-bottom: 8px;
     color: #b1b1b1;
-    border-radius: 2px;
+    border-radius: 6px;
     transition: all 0.3s;
     &:hover {
       background: #efefef;
     }
   }
   .ant-tabs-tab-active {
-    color: #434343;
+    color: #1b1b18;
   }
 }
 
@@ -206,6 +209,9 @@
   background: #f3f7f9;
   margin: 12px;
   font-size: 14px;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .ant-modal-close {
@@ -228,7 +234,7 @@
 .ant-menu-inline .ant-menu-item, .ant-menu-inline .ant-menu-submenu-title {
   width: 90%;
   margin-left: 5%;
-  border-radius: 8px;
+  border-radius: 6px;
   color: #666;
 }
 

src/assets/styles/var.less

@@ -1,15 +1,15 @@
-@primary-color: #555;
-@primary-bg: #f7f6f6;
-@danger-color: #fa5252;
-
-@border-radius-base : 2px;
-@link-color: #1a5ccf;
-@border-color: #e8e8e88a;
-
-@btn-default-border: #eaeaea;
-
-@label-color: #555;
-
-@font-family: PingFang SC,-apple-system,SF UI Text,Lucida Grande,STheiti,Microsoft YaHei,sans-serif;
-
+@primary-color: #1b1b18;
+@primary-bg: #f7f6f6;
+@danger-color: #fa5252;
+
+@border-radius-base : 6px;
+@link-color: #1a5ccf;
+@border-color: #e8e8e88a;
+
+@btn-default-border: #eaeaea;
+
+@label-color: #1b1b18;
+
+@font-family: PingFang SC,-apple-system,SF UI Text,Lucida Grande,STheiti,Microsoft YaHei,sans-serif;
+
 @input-hover-border-color: #999;

src/components/Main.vue

@@ -262,6 +262,11 @@ export default class App extends Vue {
 
   public publish() {
     const { setting } = this.site
+    if (setting.platform === 'netlify' && !setting.netlifyAccessToken && !setting.netlifySiteId) {
+      this.$message.error(`🙁  ${this.$t('syncWarning')}`)
+      return false
+    }
+
     if (!setting.branch && !setting.domain && !setting.token && !setting.repository) {
       this.$message.error(`🙁  ${this.$t('syncWarning')}`)
       return false
@@ -373,6 +378,12 @@ export default class App extends Vue {
 
 /deep/ .ant-menu-item {
   padding-left: 16px !important;
+  transition: all 0.3s;
+  cursor: default;
+
+  &:hover {
+    background-color: #fff;
+  }
 }
 
 /deep/ .ant-menu-vertical .ant-menu-item:after, .ant-menu-vertical-left .ant-menu-item:after, .ant-menu-vertical-right .ant-menu-item:after, .ant-menu-inline .ant-menu-item:after {