This is an automated email from the git hooks/post-receive script. New commit to branch chorem-ng in repository chorem. See http://git.chorem.org/chorem.git commit b0520584687fe6210a5a47e87c19898f6f9a3e3c Author: kootox <jean.couteau@gmail.com> Date: Sun Mar 29 16:10:43 2015 +0200 UI architecture --- chorem-ui-angular/pom.xml | 43 ++++++++- chorem-ui-angular/src/main/webapp/about.html | 1 + chorem-ui-angular/src/main/webapp/home.html | 113 +++++++++++++++++++++++ chorem-ui-angular/src/main/webapp/index.html | 120 +++++++++++++++++++++++++ chorem-ui-angular/src/main/webapp/js/chorem.js | 35 ++++++++ 5 files changed, 310 insertions(+), 2 deletions(-) diff --git a/chorem-ui-angular/pom.xml b/chorem-ui-angular/pom.xml index 3303ea9..0699900 100644 --- a/chorem-ui-angular/pom.xml +++ b/chorem-ui-angular/pom.xml @@ -20,11 +20,16 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <properties> - <angularVersion>1.3.13</angularVersion> + <angularVersion>1.3.14</angularVersion> <bootstrapVersion>3.3.2</bootstrapVersion> - <angularUiBootstrapVersion>0.12.0</angularUiBootstrapVersion> + <angularUiBootstrapVersion>0.12.1</angularUiBootstrapVersion> <jqueryVersion>2.1.3</jqueryVersion> <fontAwesomeVersion>4.3.0-1</fontAwesomeVersion> + <angularUiSelectVersion>0.11.2</angularUiSelectVersion> + <select2Version>3.5.2</select2Version> + <bootcardsVersion>1.1.0</bootcardsVersion> + <jqueryUiVersion>1.11.4</jqueryUiVersion> + <angularUiRouterVersion>0.2.13</angularUiRouterVersion> </properties> <dependencies> @@ -62,6 +67,40 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-select</artifactId> + <version>${angularUiSelectVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>select2</artifactId> + <version>${select2Version}</version> + <scope>runtime</scope> + </dependency> + + <!--dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>bootcards</artifactId> + <version>${bootcardsVersion}</version> + <scope>runtime</scope> + </dependency--> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery-ui</artifactId> + <version>${jqueryUiVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-router</artifactId> + <version>${angularUiRouterVersion}</version> + </dependency> + </dependencies> diff --git a/chorem-ui-angular/src/main/webapp/about.html b/chorem-ui-angular/src/main/webapp/about.html new file mode 100644 index 0000000..7d877fd --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/about.html @@ -0,0 +1 @@ +<h1>About</h1> \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/home.html b/chorem-ui-angular/src/main/webapp/home.html new file mode 100644 index 0000000..c11ceac --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/home.html @@ -0,0 +1,113 @@ +<h1>Chorem</h1> + +<div class="row"> + + <div class="bootcards-cards"> + + <div class="col-sm-4"> + + <div class="panel panel-default bootcards-summary"> + + <div class="panel-heading"> + <h3 class="panel-title">Résumé</h3> + </div> + + <div class="panel-body"> + <div class="row"> + <div class="col-xs-6 col-sm-4"> + <a class="bootcards-summary-item" href="/contacts" style="padding-top:35px;"> + <i class="fa fa-3x fa-users"></i> + <h4> + Personnes + <span class="label label-info">40</span> + </h4> + </a> + </div> + <div class="col-xs-6 col-sm-4"> + <a class="bootcards-summary-item" href="/companies" style="padding-top:35px;"> + <i class="fa fa-3x fa-building-o"></i> + <h4> + Sociétés + <span class="label label-info">40</span> + </h4> + </a> + </div> + <div class="col-xs-6 col-sm-4"> + <a class="bootcards-summary-item" href="/notes" style="padding-top:35px;"> + <i class="fa fa-3x fa-clipboard"></i> + <h4> + Notes + <span class="label label-info">40</span> + </h4> + </a> + </div> + <div class="col-xs-6 col-sm-4"> + <a class="bootcards-summary-item" href="/charts" style="padding-top:35px;"> + <i class="fa fa-3x fa-bar-chart-o"></i> + <h4> + Charts + <span class="label label-info">4</span> + </h4> + </a> + </div> + <div class="col-xs-6 col-sm-4"> + <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> + <i class="fa fa-3x fa-files-o"></i> + <h4> + Files + <span class="label label-info">36</span> + </h4> + </a> + </div> + </div> + </div> + + <div class="panel-footer"> + </div> + + </div> + + </div> + + <div class="col-sm-4"> + + <div class="panel panel-default bootcards-summary"> + + <div class="panel-heading"> + <h3 class="panel-title">Facturation</h3> + </div> + + <div class="panel-body"> + TODO + </div> + + <div class="panel-footer"> + </div> + + </div> + + </div> + + <div class="col-sm-4"> + + <div> + + <div class="panel panel-default bootcards-chart"> + + <div class="panel-heading"> + <h3 class="panel-title">Chiffre d'affaire/Bénéfice (en k€)</h3> + </div> + + <!--bar chart--> + <div class="bootcards-chart-canvas" id="chartClosedSales"></div> + + <div class="panel-footer + </div>"> + </div> + + </div> + + </div> + </div> + </div> +</div> diff --git a/chorem-ui-angular/src/main/webapp/index.html b/chorem-ui-angular/src/main/webapp/index.html new file mode 100644 index 0000000..7ca5bee --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/index.html @@ -0,0 +1,120 @@ +<!DOCTYPE html> +<html lang="en" ng-app="chorem"> + +<head> + <meta charset="utf-8"> + <title>Chorem</title> + <link rel="stylesheet" href="webjars/bootstrap/3.3.2/css/bootstrap.min.css"> + + <script src="webjars/angularjs/1.3.14/angular.min.js"></script> + <script src="webjars/angularjs/1.3.14/angular-route.js"></script> + <script src="webjars/angularjs/1.3.14/angular-sanitize.js"></script> + + <script src="webjars/angular-ui-router/0.2.13/angular-ui-router.js"></script> + + <script src="js/chorem.js"></script> + <link href="webjars/bootcards/1.1.0/css/bootcards-desktop.min.css" rel="stylesheet"/> + <link href="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/css/bootcards-desktop..." rel="stylesheet"/> + <link href="webjars/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" /> + <script src="webjars/jquery/2.1.3/jquery.min.js"></script> + + <link href="webjars/angular-ui-select/0.11.2/select.css" rel="stylesheet"/> + <script src="webjars/angular-ui-select/0.11.2/select.js"></script> + <link rel="stylesheet" href="webjars/select2/3.5.2/select2.css"> + + <script src="webjars/angular-ui-bootstrap/0.12.1/ui-bootstrap-tpls.js"></script> + + +</head> + +<body> + + <!-- fixed top navbar --> + <div class="navbar navbar-default navbar-fixed-top" role="navigation"> + <div class="container"> + <div class="navbar-header"> + <a class="navbar-brand no-break-out" title="Chorem" ui-sref="home"> + <i class="fa fa-dashboard"></i> + Chorem + </a> + </div> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + + <li> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> + <i class="fa fa-building-o"></i> + CRM + <span class="caret"></span> + </a> + <ul class="dropdown-menu" role="menu"> + <li><a href="#/crm/companies"> + <i class="fa fa-building-o"></i> + Sociétés + </a></li> + <li><a href="/chorem/wikitty/Company/edit/new"><span class="glyphicon glyphicon-plus glyphicon-black"></span> Add company</a></li> + <li class="divider"></li> + <li><a href="/chorem/wikitty/Person/search"><span class="glyphicon glyphicon-th-list"></span> All person</a></li> + <li><a href="/chorem/wikitty/Person/edit/new"><span class="glyphicon glyphicon-plus"></span> Add person</a></li> + <li class="divider"></li> + <li><a href="/chorem/wikitty/Employee/search"><span class="glyphicon glyphicon-th-list"></span> All employee</a></li> + <li><a href="/chorem/wikitty/Employee/edit/new"><span class="glyphicon glyphicon-plus"></span> Add employee</a></li> + <li class="divider"></li> + <li><a href="/chorem/wikitty/ContactDetails/search"><span class="glyphicon glyphicon-th-list"></span> All contact details</a></li> + <li><a href="/chorem/wikitty/ContactDetails/edit/new"><i class="glyphicon glyphicon-plus"></i> Add contact details</a></li> + <li class="divider"></li> + <li><a href="/chorem/wikitty/Touch/search"><span class="glyphicon glyphicon-th-list"></span> All touch</a></li> + <li><a href="/chorem/wikitty/Touch/edit/new"><i class="glyphicon glyphicon-plus"></i> Add touch</a></li> + <li class="divider"></li> + <li><a href="/chorem/crm/export"> Export</a></li> + </ul> + </li> + <li> + <a href="#"> + <i class="fa fa-users"></i> + Projets + </a> + </li> + <li> + <a href="/#"> + <i class="fa fa-clipboard"></i> + Commercial + </a> + </li> + <li> + <a href="/#"> + <i class="fa fa-bar-chart-o"></i> + Financial + </a> + </li> + <li> + <a href="/#"> + <i class="fa fa-bar-chart-o"></i> + HR + </a> + </li> + <li> + <a ui-sref="about" > + <i class="fa fa-gears"></i> + Admin + </a> + </li> + </ul> + </div> + </div> + </div> + + <div ui-view class="container"></div> + + + +<!-- Load the required JavaScript libraries --> + +<script src="webjars/bootstrap/3.3.2/js/bootstrap.js"></script> +<script src="webjars/jquery-ui/1.11.4/jquery-ui.min.js"></script> + +<!-- Bootcards JS file --> +<script src="webjars/bootcards/1.1.0/js/bootcards.js"></script> +<script src="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/js/bootcards.js"></script> + +</body> \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/js/chorem.js b/chorem-ui-angular/src/main/webapp/js/chorem.js new file mode 100644 index 0000000..10d5f4b --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/js/chorem.js @@ -0,0 +1,35 @@ +var chorem = angular.module('chorem', ['ngRoute','ui.select','ngSanitize', 'ui.bootstrap', 'ui.router']); + +chorem.run( + [ '$rootScope', '$state', '$stateParams', + function ($rootScope, $state, $stateParams) { + $rootScope.$state = $state; + $rootScope.$stateParams = $stateParams; +}]); + + +chorem.config( + [ '$stateProvider', '$urlRouterProvider', + function ($stateProvider, $urlRouterProvider) { + + ////////////////////////// + // State Configurations // + ////////////////////////// + // Use $stateProvider to configure your states. + $stateProvider + ////////// + // Home // + ////////// + .state("home", { + url: "/", + templateUrl: 'home.html' + }) + + /////////// + // About // + /////////// + .state('about', { + url: '/about', + templateUrl: 'about.html' + }); +}]); \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.