diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f262434 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +addons: + chrome: stable +language: node_js +node_js: + - 8 +before_script: + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start + - npm config set spin false +install: + - npm install +script: + - npm run ci diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..1849098 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +# Changelog + +# Next Release + +# v0.0.1 + +* Added Travis Testing +* Improved Logo and Favicon +* Added loading Spinner + +# v0.0.1-alpha.1 + +* Initial Alpha Release diff --git a/LICENSE b/LICENSE.MIT similarity index 100% rename from LICENSE rename to LICENSE.MIT diff --git a/README.md b/README.md index 88aa6b8..4b16e59 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,11 @@ This is the repository for the LocalLoop web interface, for traders and customers to see and submit data to the service. +| Branch | Status | +| --- | --- | +| *Master:* | [![Build Status](https://travis-ci.org/Pear-Trading/FoodLoop-Web.svg?branch=master)](https://travis-ci.org/Pear-Trading/FoodLoop-Web) | +| *Development:* | [![Build Status](https://travis-ci.org/Pear-Trading/FoodLoop-Web.svg?branch=development)](https://travis-ci.org/Pear-Trading/FoodLoop-Web) | + ## Getting Started To get started with development, you will need an up to date version of @@ -30,6 +35,15 @@ npm install The app defaults to using the development server. For other options, see `src/environments/environments.ts` +## Licences + +### CoreUI + +The interface itself is based off of [CoreUI][core-ui] which is MIT Licenced. +For information, see [MIT Licence](./LICENCE.MIT) included in this repo. + +[core-ui]: http://coreui.io + # Old README This is the old README with some minor tips on getting started, and more reading. diff --git a/package.json b/package.json index 2eadefd..9c56d35 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,19 @@ { - "name": "coreui-angular", - "version": "1.0.0-alpha.5", - "description": "Open Source Bootstrap Admin Template", + "name": "localloop-web", + "version": "0.0.1", + "description": "LocalLoop Web - Web interface for LocalLoop app", "author": "", - "url": "http://coreui.io", - "copyright": "Copyright 2017 creativeLabs Łukasz Holeczek", - "license": "MIT", + "url": "http://www.peartrade.org", + "copyright": "Copyright 2017 Pear Trading Ltd", "scripts": { "ng": "ng", "start": "ng serve", "build": "ng build", "test": "ng test", + "test:once": "ng test --watch=false", "lint": "ng lint", - "e2e": "ng e2e" + "e2e": "ng e2e", + "ci": "npm run test:once && npm run e2e" }, "private": true, "dependencies": { diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 102b8dc..51a7564 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -66,6 +66,6 @@ diff --git a/src/app/providers/org-graphs.service.spec.ts b/src/app/providers/org-graphs.service.spec.ts new file mode 100644 index 0000000..15d24a7 --- /dev/null +++ b/src/app/providers/org-graphs.service.spec.ts @@ -0,0 +1,5 @@ +import { TestBed, ComponentFixture, async } from '@angular/core/testing'; + +describe('Service: OrgGraphsService', () => { + +}); diff --git a/src/assets/img/favicon.png b/src/assets/img/favicon.png index 7f62aff..91257a5 100644 Binary files a/src/assets/img/favicon.png and b/src/assets/img/favicon.png differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png index 98a1946..2d2e5da 100644 Binary files a/src/assets/img/logo.png and b/src/assets/img/logo.png differ diff --git a/src/img/favicon.png b/src/img/favicon.png deleted file mode 100644 index 7f62aff..0000000 Binary files a/src/img/favicon.png and /dev/null differ diff --git a/src/img/logo.png b/src/img/logo.png deleted file mode 100644 index 98a1946..0000000 Binary files a/src/img/logo.png and /dev/null differ diff --git a/src/index.html b/src/index.html index 66b3a33..3ea6f13 100644 --- a/src/index.html +++ b/src/index.html @@ -5,12 +5,12 @@ - - - + + + - CoreUI - Open Source Bootstrap Admin Template + LocalLoop - Tracking Local Spending @@ -22,7 +22,107 @@ - Loading... + + +
+
+
+
+
+
+ diff --git a/src/scss/_custom-variables.scss b/src/scss/_custom-variables.scss index 87c9731..8970f09 100644 --- a/src/scss/_custom-variables.scss +++ b/src/scss/_custom-variables.scss @@ -48,7 +48,7 @@ $navbar-border: ( ); $navbar-brand-width: 155px; $navbar-brand-bg: #fff; -$navbar-brand-logo: url('../img/logo.png'); +$navbar-brand-logo: url('../assets/img/logo.png'); $navbar-brand-logo-size: 70px auto; $navbar-brand-border: ( bottom: (