noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to ember-cli 2.7.0

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-08-19 13:35:09 +01:00
parent a05a92736c
commit 7ae94e1e31
10 changed files with 88 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/.jshintrc
View file

@ -27,6 +27,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"esversion": 6,
"unused": true
}

2
gui/.travis.yml
View file

@ -12,7 +12,9 @@ cache:
before_install:
- npm config set spin false
- npm install -g bower
- bower --version
- npm install phantomjs-prebuilt
- phantomjs --version
install:
- npm install

59
gui/Makefile Normal file
View file

@ -0,0 +1,59 @@
# Copyright © 2016 Abcum Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
GO ?= go
LDF :=
# The `make default` command cleans
# the go build and test files and
# then runs a build and install.
.PHONY: default
default:
@echo "Choose a Makefile target:"
@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print " - " $$1}}' | sort
# The `make setup` command installs
# the 3rd party dependencies needed
# to run this package.
.PHONY: setup
setup:
@echo "Setup..."
npm install -g bower
npm install -g ember-cli@2.7.0
# The `make install` command installs
# the 3rd party dependencies needed
# to run this package.
.PHONY: install
install:
@echo "Installing..."
npm cache clean && bower cache clean
rm -rf node_modules bower_components dist tmp
npm install && bower install
# The `make upgrade` command updates
# ember-cli and runs the ember-cli
# init command.
.PHONY: upgrade
upgrade:
@echo "Upgrading..."
npm cache clean && bower cache clean
rm -rf node_modules bower_components dist tmp
npm install --save-dev ember-cli@2.7.0
npm install && bower install
ember init

37
gui/README.md
View file

@ -2,36 +2,11 @@
The web gui for Surreal built using ember.js.
[![](https://img.shields.io/circleci/token/adb5ca379a334a4011fa894275c312fe35833d6d/project/abcum/surreal/master.svg?style=flat-square)](https://circleci.com/gh/abcum/surreal) [![](https://img.shields.io/badge/ember--cli-2.6.3-orange.svg?style=flat-square)](https://github.com/abcum/surreal) [![](https://img.shields.io/badge/license-Commercial-00bfff.svg?style=flat-square)](https://github.com/abcum/surreal)
[![](https://img.shields.io/circleci/token/adb5ca379a334a4011fa894275c312fe35833d6d/project/abcum/surreal/master.svg?style=flat-square)](https://circleci.com/gh/abcum/surreal) [![](https://img.shields.io/badge/ember--cli-2.7.0-orange.svg?style=flat-square)](https://github.com/abcum/surreal) [![](https://img.shields.io/badge/license-Commercial-00bfff.svg?style=flat-square)](https://github.com/abcum/surreal)
#### Setup
## Development
- Install node - `brew install node`
- Install bower - `npm install -g bower`
- Install ember-cli - `npm install -g ember-cli@2.6.3`
#### Installing
- Clean cache - `npm cache clean && bower cache clean`
- Clean build - `rm -rf node_modules bower_components dist tmp`
- Install application dependencies - `npm install && bower install`
#### Upgrading
- Clean cache - `npm cache clean && bower cache clean`
- Clean build - `rm -rf node_modules bower_components dist tmp`
- Upgrade project ember-cli `npm install --save-dev ember-cli@2.6.3`
- Install application dependencies - `npm install && bower install`
- Initialise ember - `ember init`
#### Development
- Serve application - `ember serve`
#### Testing
- Initialise tests - `npm test`
#### Deployment
- Deploy production app by pushing to master branch on github.com
- `make setup` (install bower and ember-cli)
- `make install` (install bower and ember-cli dependencies)
- `make upgrade` (upgrade ember-cli to the specified version)
- `npm test` (run all tests defined in the package)

8
gui/app/index.html
View file

@ -9,16 +9,16 @@
{{content-for "head"}}
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/gui.css">
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="{{rootURL}}assets/gui.css">
{{content-for "head-footer"}}
</head>
<body>
{{content-for "body"}}
<script src="assets/vendor.js"></script>
<script src="assets/gui.js"></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/gui.js"></script>
{{content-for "body-footer"}}
</body>

3
gui/app/router.js
View file

@ -2,7 +2,8 @@ import Ember from 'ember';
import config from './config/environment';
const Router = Ember.Router.extend({
location: config.locationType
location: config.locationType,
rootURL: config.rootURL
});
Router.map(function() {

3
gui/bower.json
View file

@ -1,9 +1,8 @@
{
"name": "gui",
"dependencies": {
"ember": "~2.6.0",
"ember": "~2.7.0",
"ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0"
}
}

7
gui/package.json
View file

@ -21,7 +21,7 @@
"devDependencies": {
"broccoli-asset-rev": "^2.4.2",
"ember-ajax": "^2.0.1",
"ember-cli": "2.6.3",
"ember-cli": "2.7.0",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6",
"ember-cli-dependency-checker": "^1.2.0",
@ -29,11 +29,12 @@
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0",
"ember-cli-qunit": "^1.4.0",
"ember-cli-qunit": "^2.0.0",
"ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-data": "^2.6.0",
"ember-data": "^2.7.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",

2
gui/tests/.jshintrc
View file

@ -47,6 +47,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"esversion": 6,
"unused": true
}

17
gui/tests/index.html
View file

@ -10,9 +10,9 @@
{{content-for "head"}}
{{content-for "test-head"}}
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/gui.css">
<link rel="stylesheet" href="assets/test-support.css">
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="{{rootURL}}assets/gui.css">
<link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
{{content-for "head-footer"}}
{{content-for "test-head-footer"}}
@ -21,12 +21,11 @@
{{content-for "body"}}
{{content-for "test-body"}}
<script src="testem.js" integrity=""></script>
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/gui.js"></script>
<script src="assets/tests.js"></script>
<script src="assets/test-loader.js"></script>
<script src="{{rootURL}}testem.js" integrity=""></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
<script src="{{rootURL}}assets/gui.js"></script>
<script src="{{rootURL}}assets/tests.js"></script>
{{content-for "body-footer"}}
{{content-for "test-body-footer"}}