Skip to content
This repository has been archived by the owner on Dec 14, 2019. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ScrisStudio/linx.vue
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.0
Choose a base ref
...
head repository: ScrisStudio/linx.vue
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 11 commits
  • 13 files changed
  • 3 contributors

Commits on Feb 14, 2019

  1. introducing linx.vuetemplate

    scris authored Feb 14, 2019
    Copy the full SHA
    df95308 View commit details
  2. Update README.md

    scris authored Feb 14, 2019
    Copy the full SHA
    a2a35f8 View commit details

Commits on Feb 15, 2019

  1. yarn

    scris committed Feb 15, 2019
    Copy the full SHA
    1df4f53 View commit details
  2. modification

    scris committed Feb 15, 2019
    Copy the full SHA
    94bd62f View commit details
  3. electron modification

    scris committed Feb 15, 2019
    Copy the full SHA
    4d3eceb View commit details

Commits on Jun 2, 2019

  1. Copy the full SHA
    33e8726 View commit details
  2. update for security

    Bump webpack-bundle-analyzer from 2.13.1 to 3.3.2
    RoderickQiu authored Jun 2, 2019
    Copy the full SHA
    4b3dd0c View commit details

Commits on Jun 9, 2019

  1. Bump handlebars from 4.1.0 to 4.1.2

    Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.1.2.
    - [Release notes](https://github.com/wycats/handlebars.js/releases)
    - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
    - [Commits](handlebars-lang/handlebars.js@v4.1.0...v4.1.2)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jun 9, 2019
    Copy the full SHA
    f7571eb View commit details
  2. update for security

    Bump handlebars from 4.1.0 to 4.1.2
    RoderickQiu authored Jun 9, 2019
    Copy the full SHA
    893f0f0 View commit details

Commits on Jul 2, 2019

  1. Update README.md

    scris authored Jul 2, 2019
    Copy the full SHA
    cbcf29c View commit details
  2. Update README.md

    scris authored Jul 2, 2019
    Copy the full SHA
    4680499 View commit details
Showing with 11,111 additions and 96 deletions.
  1. +1 −0 .gitignore
  2. +0 −2 .npmrc
  3. +16 −34 README.md
  4. BIN app/.DS_Store
  5. +8 −2 dist/electron.js
  6. +7 −0 dist/renderer.electron.js
  7. +2 −1 index.html
  8. +0 −55 index.js
  9. +1 −1 package.json
  10. BIN src/.DS_Store
  11. +1 −1 src/components/linx.vue
  12. 0 stats.json
  13. +11,075 −0 yarn.lock
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ package-lock.json
/dist/*
!/dist/package.json
!/dist/electron.js
!/dist/renderer.electron.js
npm-debug.log*
yarn-debug.log*
yarn-error.log*
2 changes: 0 additions & 2 deletions .npmrc

This file was deleted.

50 changes: 16 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
**In a short period, it won't be continued, to find a good framework, you may see [Quasar](https://github.com/quasarframework/quasar) or [cordova-electron](https://github.com/apache/cordova-electron/blob/master/DOCUMENTATION.md)**

<h3 align="center">linx.vue</h3>

---
@@ -7,51 +9,32 @@ Linx.vue is a boilerplate to create applications that run on Web, Mobile Phones
- It is the modified environment that was used in developing <https://github.com/scris/scristask> 1.10+.
- Some code is from <https://github.com/halfrost/vue-objccn>, so I currently choose to use GPL v3, however I will rewrite these 3 files one day and change the project into MIT.

# Setup

``` bash
# install dependencies
npm install
## Setup automatically

# cordova setup
# first edit the project name in app/config.xml
```bash
vue init scris/linx.vuetemplate myproj
yarn
cd app
npm install
yarn
cordova platform add ios
cordova platform add android
cordova platform add browser
```

# Then

Then edit your information in:

```bash
# edit for vue
package.json

# edit README
README.md

# edit for cordova
app/package.json

# edit for electron
dist/package.json
```
Now it is time to build your web app.

Just use it like using vue-cli. (with vue-router)
## After setting up

Now it is time to build your web app.
Just use it like using vue-cli 3.
You will find it easy to use.

You can use `process.env.LINX_AGENT` to get which kind of devices is the user currently using.
if you get `electron` , do things in standalone devices.
if you get `cordova`, do things in mobile phones.
if you get other answers or get nothing, mark it as in the web environment.
You can use `process.env.LINX_AGENT` to get which kind of devices is the user currently using.
if you get `electron` , do things in standalone devices.
if you get `cordova`, do things in mobile phones.
if you get other answers or get nothing, mark it as in the web environment.

If you wanna make some changes for electron, go to see `dist/electron.js` as the main part and `dist/renderer.electron.js` as the renderer part.

# Commands
## Commands

``` bash
# serve with hot reload at localhost:8080
@@ -84,7 +67,6 @@ npm run candroid
# run Electron tests
npm run edev

# before typing these lines,
# build for Mac X64
npm run emac

Binary file modified app/.DS_Store
Binary file not shown.
10 changes: 8 additions & 2 deletions dist/electron.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Modules to control application life and create native browser window
const {app, BrowserWindow} = require('electron')
const {app, BrowserWindow, ipcMain} = require('electron')

const path = require('path')
const url = require('url')
@@ -58,4 +58,10 @@ app.on('activate', function () {
})

// In this file you can include the rest of your app's specific main process
// code. You can also put them in separate files and require them here.
// code. You can also put them in separate files and require them here.


ipcMain.on('startRender', function(){
// Do sth
// See render.electron.js & index.html for more things.
})
7 changes: 7 additions & 0 deletions dist/renderer.electron.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
if(process.env.LINX_AGENT == 'electron') {
const ipc = require('electron').ipcRenderer;
function linxRenderer(){
ipc.send("startRender")
}
linxRenderer();
}
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="minimal-ui,width=device-width"/>
<link rel="apple-touch-icon" href="./task.png">
<link rel="apple-touch-icon" href="">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="white">
<title>
@@ -42,6 +42,7 @@
</head>
<body>
<div id="container"><div id="app"></div></div>
<script src="renderer.electron.js"></script>
<!-- built files will be auto injected -->
</body>
</html>
55 changes: 0 additions & 55 deletions index.js

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.12.0",
"webpack-bundle-analyzer": "^2.9.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-dev-server": "2.9.1",
"webpack-merge": "^4.1.4"
},
Binary file modified src/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion src/components/linx.vue
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<div id="linx-main">
<div id="linx-about" class="linx-about">
<p>Linx.vue is a CLI tool to create applications that run on Web, Mobile Phones and Standalone Devices in one go. </p>
<p>You are now using: {{ linxagent }}</p>
<p>You are now using: <span v-html="linxagent"></span></p>
<img src=".././assets/scris.png"/>
</div>
</div>
Empty file removed stats.json
Empty file.
Loading