Skip to content

Commit

Permalink
Merge branch 'dependabot/npm_and_yarn/electron-7.2.4' of github.com:h…
Browse files Browse the repository at this point in the history
…alfrost/vue-objccn into dependabot/npm_and_yarn/electron-7.2.4
  • Loading branch information
halfrost committed Jul 30, 2020
2 parents 70fb01b + 6b78c7b commit 012fc84
Show file tree
Hide file tree
Showing 5 changed files with 2,204 additions and 2,053 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
<a href="https://github.com/halfrost/vue-objccn/pulls"><img src="https://img.shields.io/badge/PR-Welcome-brightgreen.svg"></a>
<a href="http://weibo.com/halfrost"><img src="https://img.shields.io/badge/weibo-@halfrost-red.svg?style=flat"></a>
<img src="https://img.shields.io/badge/made%20with-%3C3-red.svg">
<img src="https://visitor-badge.laobi.icu/badge?page_id=halfrost.vue-objccn">
</p>

Use Vue.js to develop a cross-platform full stack application of [Objc china](https://objccn.io/).

- [x] ✅ Desktop application available for three platforms, Mac, Linux and Windows
- [x] ✅ Web application supports desktop browsers and mobile browsers
- [x] ✅ Mobile App which uses the Cordova framework, supports iOS,Androi,Windows Phone and BlackBerry platforms
- [x] ✅ Mobile App which uses the Cordova framework, supports iOS, Android, Windows Phone and BlackBerry platforms
- [ ] ❌ Native Mobile App, which can use Weex framework to support both iOS and Android

> Note: This project is just a bit of fun and purely for learning purpose, please support [喵神(@onevcat)](https://github.com/onevcat) and [Objc china](https://objccn.io/).
Expand Down
1 change: 1 addition & 0 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<a href="https://github.com/halfrost/vue-objccn/pulls"><img src="https://img.shields.io/badge/PR-Welcome-brightgreen.svg"></a>
<a href="http://weibo.com/halfrost"><img src="https://img.shields.io/badge/weibo-@halfrost-red.svg?style=flat"></a>
<img src="https://img.shields.io/badge/made%20with-%3C3-red.svg">
<img src="https://visitor-badge.laobi.icu/badge?page_id=halfrost.vue-objccn">
</p>

利用 Vue.js 实现 [Objc中国](https://objccn.io/) 的跨平台全栈应用
Expand Down
2 changes: 1 addition & 1 deletion build/webpack.base.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = {
{
test: /\.js$/,
loader: 'babel-loader',
include: [resolve('src'), resolve('test')]
include: [resolve('src'), resolve('test'), resolve('node_modules/markdown-it-highlightjs/index.js'),]
},
{
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
Expand Down

0 comments on commit 012fc84

Please sign in to comment.