Merge branch 'Release-v0.0.1'

This commit is contained in:
Tom Bloor 2017-09-15 15:51:40 +01:00
commit 4188456e0b
13 changed files with 160 additions and 14 deletions

13
.travis.yml Normal file
View file

@ -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

13
CHANGELOG.md Normal file
View file

@ -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

View file

@ -3,6 +3,11 @@
This is the repository for the LocalLoop web interface, for traders and This is the repository for the LocalLoop web interface, for traders and
customers to see and submit data to the service. 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 ## Getting Started
To get started with development, you will need an up to date version of 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 The app defaults to using the development server. For other options, see
`src/environments/environments.ts` `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 # Old README
This is the old README with some minor tips on getting started, and more reading. This is the old README with some minor tips on getting started, and more reading.

View file

@ -1,18 +1,19 @@
{ {
"name": "coreui-angular", "name": "localloop-web",
"version": "1.0.0-alpha.5", "version": "0.0.1",
"description": "Open Source Bootstrap Admin Template", "description": "LocalLoop Web - Web interface for LocalLoop app",
"author": "", "author": "",
"url": "http://coreui.io", "url": "http://www.peartrade.org",
"copyright": "Copyright 2017 creativeLabs Łukasz Holeczek", "copyright": "Copyright 2017 Pear Trading Ltd",
"license": "MIT",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
"test:once": "ng test --watch=false",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e",
"ci": "npm run test:once && npm run e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {

View file

@ -66,6 +66,6 @@
</div> </div>
<footer class="app-footer"> <footer class="app-footer">
<a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs. <a href="http://www.peartrade.org" target="_blank">&copy; 2017 Pear Trading Ltd.</a>
<span class="float-right">Powered by <a href="http://coreui.io">CoreUI</a></span> <span class="float-right">Powered by <a href="http://coreui.io">CoreUI</a></span>
</footer> </footer>

View file

@ -0,0 +1,5 @@
import { TestBed, ComponentFixture, async } from '@angular/core/testing';
describe('Service: OrgGraphsService', () => {
});

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 203 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View file

@ -5,12 +5,12 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="CoreUI - Open Source Bootstrap Admin Template"> <meta name="description" content="LocalLoop - Tracking Local Spending">
<meta name="author" content="Łukasz Holeczek"> <meta name="author" content="Pear Trading Ltd & Shadowcat Systems Ltd">
<meta name="keyword" content="Bootstrap,Admin,Template,Open,Source,AngularJS,Angular,Angular2,Angular 2,Angular4,Angular 4,jQuery,CSS,HTML,RWD,Dashboard,React,React.js,Vue,Vue.js"> <meta name="keyword" content="LocalLoop,Local Spending,Local,Money,Loop,Traders,Pear Trading,Pear Points">
<link rel="shortcut icon" href="assets/img/favicon.png"> <link rel="shortcut icon" href="assets/img/favicon.png">
<title>CoreUI - Open Source Bootstrap Admin Template</title> <title>LocalLoop - Tracking Local Spending</title>
<!-- Icons --> <!-- Icons -->
<link href="assets/css/font-awesome.min.css" rel="stylesheet"> <link href="assets/css/font-awesome.min.css" rel="stylesheet">
@ -22,7 +22,107 @@
<body class="app header-fixed sidebar-fixed"> <body class="app header-fixed sidebar-fixed">
<!-- Enable bootstrap 4 theme --> <!-- Enable bootstrap 4 theme -->
<script>window.__theme = 'bs4';</script> <script>window.__theme = 'bs4';</script>
<app-root><i>Loading...</i></app-root> <app-root>
<style type="text/css">
/* nabbed wholeheartedly from http://tobiasahlin.com/spinkit/*/
.sk-folding-cube {
margin: 20px auto;
width: 40px;
height: 40px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
-webkit-transform: rotateZ(45deg);
transform: rotateZ(45deg);
}
.sk-folding-cube .sk-cube {
float: left;
width: 50%;
height: 50%;
position: relative;
-webkit-transform: scale(1.1);
-ms-transform: scale(1.1);
transform: scale(1.1);
}
.sk-folding-cube .sk-cube:before {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #333;
-webkit-animation: sk-foldCubeAngle 2.4s infinite linear both;
animation: sk-foldCubeAngle 2.4s infinite linear both;
-webkit-transform-origin: 100% 100%;
-ms-transform-origin: 100% 100%;
transform-origin: 100% 100%;
}
.sk-folding-cube .sk-cube2 {
-webkit-transform: scale(1.1) rotateZ(90deg);
transform: scale(1.1) rotateZ(90deg);
}
.sk-folding-cube .sk-cube3 {
-webkit-transform: scale(1.1) rotateZ(180deg);
transform: scale(1.1) rotateZ(180deg);
}
.sk-folding-cube .sk-cube4 {
-webkit-transform: scale(1.1) rotateZ(270deg);
transform: scale(1.1) rotateZ(270deg);
}
.sk-folding-cube .sk-cube2:before {
-webkit-animation-delay: 0.3s;
animation-delay: 0.3s;
}
.sk-folding-cube .sk-cube3:before {
-webkit-animation-delay: 0.6s;
animation-delay: 0.6s;
}
.sk-folding-cube .sk-cube4:before {
-webkit-animation-delay: 0.9s;
animation-delay: 0.9s;
}
@-webkit-keyframes sk-foldCubeAngle {
0%, 10% {
-webkit-transform: perspective(140px) rotateX(-180deg);
transform: perspective(140px) rotateX(-180deg);
opacity: 0;
} 25%, 75% {
-webkit-transform: perspective(140px) rotateX(0deg);
transform: perspective(140px) rotateX(0deg);
opacity: 1;
} 90%, 100% {
-webkit-transform: perspective(140px) rotateY(180deg);
transform: perspective(140px) rotateY(180deg);
opacity: 0;
}
}
@keyframes sk-foldCubeAngle {
0%, 10% {
-webkit-transform: perspective(140px) rotateX(-180deg);
transform: perspective(140px) rotateX(-180deg);
opacity: 0;
} 25%, 75% {
-webkit-transform: perspective(140px) rotateX(0deg);
transform: perspective(140px) rotateX(0deg);
opacity: 1;
} 90%, 100% {
-webkit-transform: perspective(140px) rotateY(180deg);
transform: perspective(140px) rotateY(180deg);
opacity: 0;
}
}
</style>
<div class="sk-folding-cube">
<div class="sk-cube1 sk-cube"></div>
<div class="sk-cube2 sk-cube"></div>
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
</app-root>
</body> </body>
</html> </html>

View file

@ -48,7 +48,7 @@ $navbar-border: (
); );
$navbar-brand-width: 155px; $navbar-brand-width: 155px;
$navbar-brand-bg: #fff; $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-logo-size: 70px auto;
$navbar-brand-border: ( $navbar-brand-border: (
bottom: ( bottom: (