Merge branch 'dev-1.x' into main

.env.production

@@ -1,5 +1,4 @@
 # just a flag
 ENV = 'production'
-
 # base api
 VUE_APP_BASE_API = '/api'

.npmignore

@@ -0,0 +1,44 @@
+# Ignored config files.
+_config.*.yml
+
+# Ignored folders
+.DS_Store
+node_modules
+dist
+build
+public
+src
+tests
+
+# local env files
+.env
+.env.local
+.env.*.local
+.env.*
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+# Other ignored source files
+.editorconfig
+.eslintignore
+.eslintrc.js
+.prettierrc
+.yo-rc.json
+babel.config.js
+postcss.config.js
+tailwind.config.js
+tsconfig.json
+vue.config.js

CHANGELOG.md

@@ -2,6 +2,44 @@
 
 All notable changes to this project will be documented in this file.
 
+### 1.1.0 (2021-04-03)
+
+Since this version, the theme can be simply installed using NPM or Yarn, makes it much easier for theme users!
+
+```shell
+npm install hexo-theme-aurora --save
+# or use yarn
+yarn add hexo-theme-aurora
+```
+
+Config file `_config.yml` now need to be added in the root folder of your Hexo blog.
+You simply create a `_config.aurora.yml` to change the theme.
+
+To get a default theme template, simply run the following command: (This is for linux OS, for Windows, you can copy it yourself from node_modules folder. )
+
+```shell
+cp -rf ./node_modules/hexo-theme-aurora/_config.yml ./_config.aurora.yml
+```
+
+For new configuration setup and usage please read the [usage document](https://aurora.tridiamond.tech).
+
+### Features
+
+- Theme can be installed by using NPM or Yarn.
+- Beian now support `number` and `link` properties. (#18)
+- Gitalk now support configuring the `proxy` property. (#16)
+- Added 3 different configurable profile avatar styles.
+- Added sponsor list to README.md
+
+### Improvements
+
+- Changed the outdated QQ avatar API url.
+
+### Bug Fixes
+
+- Fixed horizontal article's tag skeleton display error.
+- Fixed Gitalk not creating an issue on custom page. (#20)
+
 ### 1.0.2 (2021-04-01)
 
 #### Improvements

CHANGELOG_CN.md

@@ -2,6 +2,45 @@
 
 对这个项目的所有值得注意的变化都将记录在这个文件中。
 
+### 1.1.0 (2021-04-03)
+
+这个版本开始，主题可以简单地使用 NPM 或 Yarn 安装，让主题用户更容易使用!
+
+```shell
+npm install hexo-theme-aurora --save
+# 或者使用 Yarn
+yarn add hexo-theme-aurora
+```
+
+因为主题是使用 NPM 或者 Yarn 安装的，而不是 clone 到 themes 文件夹的。所以我们需要自己创建一个配置文件。
+
+你只需要在 Hexo 博客的根目录下创建一个 `_config.aurora.yml` 配置文件来配置主题。
+
+如果你想获得一个默认的主题配置模版，你可以执行以下命令（但是这个命令只能在 Linux 或者 MacOS 下执行，如果你用的是 Windows 系统，可以自行在 node_modules 中找到对应目录复制过来）
+
+```shell
+cp -rf ./node_modules/hexo-theme-aurora/_config.yml ./_config.aurora.yml
+```
+
+有关新的配置设置和使用方法，请阅读[使用文档](https://aurora.tridiamond.tech/zh)。
+
+### 新功能
+
+- 可以使用 NPM 或 Yarn 安装主题。
+- 备案配置现在支持 `number`（备案号） 和 `link`（链接） 属性。(#18)
+- Gitalk 现在支持配置 `proxy`（代理）属性。(# 16)
+- 增加了 3 种可配置的头像风格。
+- 在 README.md 中增加了赞助商列表。
+
+### 更新与优化
+
+- 更新了失效的 QQ 头像 API 地址。
+
+### Bug 修复
+
+- 修复了推荐文章中的标签骨架显示错误。
+- 修复了 Gitalk 在自定义页面不会创建 issue 的问题。 (#20)
+
 ### 1.0.2 (2021-04-01)
 
 #### 更新

README.md

@@ -12,9 +12,10 @@
 <p align="center">
   <img src="https://img.shields.io/github/stars/auroral-ui/hexo-theme-aurora">
   <img src="https://img.shields.io/github/forks/auroral-ui/hexo-theme-aurora">
-  <img src="https://img.shields.io/github/v/release/auroral-ui/hexo-theme-aurora">
-  <img src="https://img.shields.io/github/release-date/auroral-ui/hexo-theme-aurora">
   <img src="https://img.shields.io/github/issues/auroral-ui/hexo-theme-aurora">
+  <img src="https://img.shields.io/npm/v/hexo-theme-aurora">
+  <img src="https://img.shields.io/npm/dy/hexo-theme-aurora">
+  <img src="https://img.shields.io/github/last-commit/auroral-ui/hexo-theme-aurora/main">
   <img src="https://img.shields.io/github/license/auroral-ui/hexo-theme-aurora">
 </p>
 
@@ -32,49 +33,64 @@
 
 Aurora is a next generation theme using Aurora colours and UI elements. It give you the feel of smooth flow of colours and a futuristic feeling.
 
+> This theme can be installed by using NPM or Yarn since version 1.1.0+, please check the [usage document](https://aurora.tridiamond.tech) for more details.
+
 <br/>
 
 ![](https://img-blog.csdnimg.cn/202103280030531.png)
 
 ![](https://img-blog.csdnimg.cn/20210328003140590.png)
 
+## 🏅 My sponsors (Coffee Suppliers)
+
+Keep me working on this project 💙
+
+[Click here to check out how to sponsor me.](https://github.com/auroral-ui/hexo-theme-aurora#-donation)
+
+### 🥇 Golden Supplier
+
+<p>
+  <a href="https://github.com/TriDiamond" alt="TriDiamond"><img src="https://avatars.githubusercontent.com/u/24708758?v=4" height="50" width="50"></a>
+  <a href="https://github.com/MozLee" alt="MozLee"><img src="https://q4.qlogo.cn/g?b=qq&nk=68879747&s=100" height="50" width="50"></a>
+</p>
+
 ## 🏳️‍🌈 What's in Aurora?
 
 **Let's us take a look at the feature list and plans for Aurora:**
 
 ### ⭐️ Features
 
-- <span class="tag done-tag">✔</span> **`Featured section`** - _Can add a feature meta to any post, those will be pinned into the feature section on the home page._
-- <span class="tag done-tag">✔</span> **`Multi-language support`** - _Can dynamically switch the language of the main texts in the application._
-- <span class="tag done-tag">✔</span> **`Statistics`** - _Statistic of article words, posts, categories and tags counts._
-- <span class="tag done-tag">✔</span> **`Article reading time`** - _Show the estimated reading time of an article._
-- <span class="tag done-tag">✔</span> **`Mathjax support`** - _Support mathjax syntax in markdown files._
-- <span class="tag done-tag">✔</span> **`SPA`** - _No page loading or freezing from page to page._
-- <span class="tag new-tag">NEW</span> **`Comment plugins`** - _Support the using Gitalk or Valine plugins_
-- <span class="tag new-tag">NEW</span> **`Comment plugins`** - _Support the using Gitalk or Valine plugins_
-- <span class="tag new-tag">NEW</span> **`Blog search`** - _Enable to search all the articles in the blog._
-- <span class="tag new-tag">NEW</span> **`Latest comments`** - _Added a widget showing the latest comments, supported using `Gitalk` or `Valine`._
+- Featured section - _Can add a feature meta to any post, those will be pinned into the feature section on the home page._
+- Multi-language support - _Can dynamically switch the language of the main texts in the application._
+- Statistics - _Statistic of article words, posts, categories and tags counts._
+- Article reading time - _Show the estimated reading time of an article._
+- Mathjax support - _Support mathjax syntax in markdown files._
+- SPA - _No page loading or freezing from page to page._
+- Comment plugins - _Support the using Gitalk or Valine plugins_
+- Comment plugins - _Support the using Gitalk or Valine plugins_
+- Blog search - _Enable to search all the articles in the blog._
+- Latest comments - _Added a widget showing the latest comments, supported using `Gitalk` or `Valine`._
 
 ### 🎨 Theme
 
-- <span class="tag done-tag">✔</span> **`Light and dark`** - _Light and dark theme support._
-- <span class="tag done-tag">✔</span> **`Magazine Layout`** - _Modern magazine grid layout._
-- <span class="tag done-tag">✔</span> **`Gradient Colours`** - _Modern gradient colour styles_.
-- <span class="tag done-tag">✔</span> **`Timeline styled archives`** - _Archived posts into a timeline format_.
+- Light and dark - _Light and dark theme support._
+- Magazine Layout - _Modern magazine grid layout._
+- Gradient Colours - _Modern gradient colour styles_.
+- Timeline styled archives - _Archived posts into a timeline format_.
 
 ### 🛠 Configuration
 
-- <span class="tag done-tag">✔</span> **`Beian Config`** - _This feature is especially for China users, for those that need to put Beian info at the footer of the blog._
-- <span class="tag done-tag">✔</span> **`Customizable menu`** - _Can customize your menu with internal links, external links, custom pages._
-- <span class="tag new-tag">NEW</span> **`Post navigation`** - _Can navigate to the previous and next article at the end of the article page._
-- <span class="tag new-tag">NEW</span> **`Custom pages`** - _Can add any custom pages, need to use the customized menu to display in the menu._
-- <span class="tag new-tag">NEW</span> **`Page navbar`** - _Can set up a sidebar on the specific page, act as the sub-menu of the page._
+- Beian Config - _This feature is especially for China users, for those that need to put Beian info at the footer of the blog._
+- Customizable menu - _Can customize your menu with internal links, external links, custom pages._
+- Post navigation - _Can navigate to the previous and next article at the end of the article page._
+- Custom pages - _Can add any custom pages, need to use the customized menu to display in the menu._
+- Page navbar - _Can set up a sidebar on the specific page, act as the sub-menu of the page._
 
 ## 🚀 What is yet to come?
 
 **Everything listed here are currently under development.**
 
-- <span class="tag wip-tag">WIP</span> **`Related posts`** - _Show a list of the related posts at the end of an article. _
+- Related posts - _Show a list of the related posts at the end of an article. _
 
 ## 🍼 Feedback
 
@@ -119,5 +135,5 @@ Thanks for your love in advance! ☀️
 
 <a href="https://discord.gg/VC7CrYfds5" target="_blank"><img src="https://discordapp.com/api/guilds/801943105913225246/widget.png?style=banner3" alt="ObsidiaNext Community Discord Server"></a>
 
-- Joint QQGroup `909955326`
+- Join QQGroup `909955326`
 - [Join Telegram Group](https://t.me/joinchat/R2m4eho2lbcHLR7nDvxd6A)

_config.yml

@@ -17,21 +17,24 @@ site:
   multi_language: true
   logo: https://img-blog.csdnimg.cn/20210313122054101.png
   avatar: https://img-blog.csdnimg.cn/20210313122054101.png
-  beian: ''
+  beian:
+    number: ''
+    link: ''
 
 #! ---------------------------------------------------------------
 #! Authors Configs
 #！ @docs https://obsidianext.tridiamond.tech/guide/authors.html
 #! ---------------------------------------------------------------
 authors:
-  tom:
-    name: Tom Cat
-    avatar: https://img-blog.csdnimg.cn/20210313122054101.png
-    link: https://github.com/TriDiamond
-  John:
-    name: John
-    avatar: https://img-blog.csdnimg.cn/20210313122054101.png
-    link: https://github.com/TriDiamond
+  # Examples:
+  # tom:
+  #   name: Tom Cat
+  #   avatar: https://img-blog.csdnimg.cn/20210313122054101.png
+  #   link: https://github.com/TriDiamond
+  # John:
+  #   name: John
+  #   avatar: https://img-blog.csdnimg.cn/20210313122054101.png
+  #   link: https://github.com/TriDiamond
 
 #! ---------------------------------------------------------------
 #! Menu Configs
@@ -41,38 +44,31 @@ menu:
   About: true
   Tags: true
   Archives: true
-  # Custom menus
-  message-board:
-    name: 'MessageBoard'
-    i18n: 'message-board'
-    path: '/page/message-board'
-  # frontend-tutorials:
-  #   name: 'Tutorials'
-  #   path: 'https://github.com/tridiamond'
-  projects:
-    name: 'Projects' # if no i18n is set, this will be used as menu name
-    #i18n: 'project' # i18n need to be configured in src/locales/language/en.json or cn.json
-    path: # Will not be used if there are sub-menus
-    children:
-      obsidian:
-        name: 'Obsidian Theme'
-        path: 'https://github.com/tridiamond'
+  # Example custom menus:
+  # message-board:
+  #   name: 'MessageBoard'
+  #   i18n:
+  #     cn: '留言板'
+  #     en: 'Message Board'
+  #   path: '/page/message-board'
+  # projects:
+  #   name: 'Projects'
+  #   i18n:
+  #     cn: '项目'
+  #     en: 'Projects'
+  #   path:
+  #   children:
+  #     obsidian:
+  #       name: 'Obsidian Theme'
+  #       path: 'https://github.com/tridiamond'
 
 #! ---------------------------------------------------------------
 #! Theme Config
 #! @docs https://obsidianext.tridiamond.tech/guide/theme.html
 #! ---------------------------------------------------------------
 theme:
-  # Theme dark mode
-  # "enable" can be set as:
-  #   true: force default to be dark-mode
-  #   false: force default to be light-mode
-  #   'auto': adapt to system's mode
   dark_mode: true
-
-  # Gradient colors used for the theme
-  # This consist of 3 gradient colors
-  # each can be customized
+  profile_shape: diamond # support `circle`, `diamond`, `rounded`
   gradient:
     color_1: '#24c6dc'
     color_2: '#5433ff'
@@ -89,7 +85,7 @@ socials:
   wechat: ''
   qq: ''
   weibo: 'https://weibo.com/u/7318914058'
-  zhifu: 'https://www.zhihu.com/people/tridiamond'
+  zhihu: 'https://www.zhihu.com/people/tridiamond'
   csdn: 'https://blog.csdn.net/TriDiamond6'
   juejin: 'https://juejin.cn/user/1873223546578589'
 
@@ -98,10 +94,6 @@ socials:
 #! @docs https://obsidianext.tridiamond.tech/guide/theme.html
 #! ---------------------------------------------------------------
 site_meta:
-  # CDN switcher
-  # -> can be `cn` or `en`
-  # -> cn will use China's cdn
-  # -> en will use international cdn
   cdn: cn
 
 #! ---------------------------------------------------------------
@@ -117,14 +109,11 @@ gitalk:
   repo: 'dev-blog-comments'
   owner: 'TriDiamond'
   admin: ['TriDiamond']
-  # Ensure uniqueness and length less than 50
-  # If using 'pathname' ensure length is less than 50 characters
-  # or use 'uid' instead for better compatibility (If you use other theme before, this will lost your comments)
   id: uid
-  # Facebook-like distraction
   language: en
   distractionFreeMode: true
   recentComment: true
+  proxy: ''
 
 # Valine comment plugin (recommended!)
 # see https://valine.js.org/quickstart.html
@@ -144,3 +133,10 @@ valine:
 # see http://ibruce.info/2015/04/04/busuanzi/
 busuanzi:
   enable: true
+
+#! ---------------------------------------------------------------
+#! Injections
+#! ---------------------------------------------------------------
+injects:
+  scripts:
+  css: