alahouze/accountant-ui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Begin migration to bootstrap v4.

Browse Source
This commit is contained in:
Alexis Lahouze 2017-07-25 22:11:16 +02:00
parent b3d274eabf
commit 0e037e664f
10 changed files with 26 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -7,7 +7,6 @@
"babel-core": "^6.25.0", "babel-core": "^6.25.0",
"babel-eslint": "^7.2.3", "babel-eslint": "^7.2.3",
"babel-loader": "^7.1.1", "babel-loader": "^7.1.1",
"bootstrap-webpack": "^0.0.6",
"css-loader": "^0.28.4", "css-loader": "^0.28.4",
"eslint": "^4.3.0", "eslint": "^4.3.0",
"eslint-config-angular": "^0.5.0", "eslint-config-angular": "^0.5.0",
@ -57,12 +56,9 @@
"angular-messages": "^1.6.5", "angular-messages": "^1.6.5",
"angular-resource": "^1.6.5", "angular-resource": "^1.6.5",
"angular-strap": "^2.3.12", "angular-strap": "^2.3.12",
"angular-ui-notification": "^0.3.6",
"angular2-notifications": "^0.7.4",
"base64util": "^1.0.2", "base64util": "^1.0.2",
"bootbox": "^4.4.0", "bootbox": "^4.4.0",
"bootstrap": "^3.3.7", "bootstrap": "4.0.0-alpha.6",
"bootstrap-additions": "^0.3.1",
"c3": "^0.4.15", "c3": "^0.4.15",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"jquery": "^3.2.1", "jquery": "^3.2.1",

10
src/accounts/accountList.component.ts
View File

@ -15,14 +15,14 @@ import { AccountEditModalComponent } from './accountEditModal.component';
selector: 'account-list', selector: 'account-list',
template: ` template: `
<div class="row"> <div class="row">
<table class="table table-striped table-condensed table-hover"> <table class="table table-sm table-striped table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th>Nom du compte</th> <th>Nom du compte</th>
<th class="col-md-1">Solde courant</th> <th>Solde courant</th>
<th class="col-md-1">Solde pointé</th> <th>Solde pointé</th>
<th class="col-md-1">Découvert autorisé</th> <th>Découvert autorisé</th>
<th class="col-md-1">Actions</th> <th>Actions</th>
</tr> </tr>
</thead> </thead>

2
src/app.module.ts
View File

@ -2,6 +2,8 @@
import 'zone.js'; import 'zone.js';
import 'reflect-metadata'; import 'reflect-metadata';
require('./main.less');
import { AppModule as Ng1AppModule } from './app'; import { AppModule as Ng1AppModule } from './app';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';

2
src/app.ts
View File

@ -31,8 +31,6 @@ import loginModule from '@accountant/login';
import operationModule from '@accountant/operations'; import operationModule from '@accountant/operations';
import schedulerModule from '@accountant/scheduler'; import schedulerModule from '@accountant/scheduler';
require('bootstrap-webpack!./bootstrap.config.ts');
export const AppModule = angular.module('accountant', [ export const AppModule = angular.module('accountant', [
uiRouter, uiRouter,
accountModule, accountModule,

7
src/index.ejs
View File

@ -29,13 +29,8 @@
<body style="padding-bottom: 50px; padding-top: 70px"> <body style="padding-bottom: 50px; padding-top: 70px">
<!-- htmllint attr-bans="$previous" --> <!-- htmllint attr-bans="$previous" -->
<!-- Navbar --> <!-- Navbar -->
<nav class="navbar navbar-fixed-top navbar-inverse"> <nav class="navbar fixed-top navbar-inverse bg-inverse">
<div class="container-fluid">
<!-- Brand -->
<div class="navbar-header">
<a class="navbar-brand" href="#!/accounts">&nbsp;Accountant</a> <a class="navbar-brand" href="#!/accounts">&nbsp;Accountant</a>
</div>
</div>
</nav> </nav>
<div class="container-fluid"> <div class="container-fluid">

21
src/main.less
View File

@ -1,10 +1,9 @@
@import '~font-awesome/less/font-awesome'; @import '~font-awesome/less/font-awesome';
@import (inline) '~bootstrap/dist/css/bootstrap.css';
@import (inline) '~c3/c3.css'; @import (inline) '~c3/c3.css';
@import (inline) '~bootstrap-additions/dist/bootstrap-additions.css';
@import (inline) '~ngx-toastr/toastr.css'; @import (inline) '~ngx-toastr/toastr.css';
.italic { .italic {
@ -22,21 +21,3 @@
.c3-ygrid-line.overdraft line { .c3-ygrid-line.overdraft line {
stroke: #FF0000; stroke: #FF0000;
} }
// Needed for modal backdrop opacity.
.modal-backdrop.am-fade {
opacity: .5;
transition: opacity .15s linear;
&.ng-enter {
opacity: 0;
&.ng-enter-active {
opacity: .5;
}
}
&.ng-leave {
opacity: .5;
&.ng-leave-active {
opacity: 0;
}
}
}

12
src/operations/operations.html
View File

@ -32,12 +32,12 @@
<table class="table table-striped table-condensed table-hover"> <table class="table table-striped table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th class="col-md-1">Date d'op.</th> <th>Date d'op.</th>
<th>Libell&eacute; de l'op&eacute;ration</th> <th>Libell&eacute; de l'op&eacute;ration</th>
<th class="col-md-1">Montant</th> <th>Montant</th>
<th class="col-md-1">Solde</th> <th>Solde</th>
<th class="col-md-2">Cat&eacute;gorie</th> <th>Cat&eacute;gorie</th>
<th class="col-md-2">Actions</th> <th>Actions</th>
</tr> </tr>
</thead> </thead>
@ -50,7 +50,7 @@
</td> </td>
</tr> </tr>
<tr id="{{ operation.id }}" class="form-inline" <tr id="{{ operation.id }}"
ng-class="{stroke: operation.canceled, italic: !operation.confirmed, ng-class="{stroke: operation.canceled, italic: !operation.confirmed,
warning: operation.balance < 0, danger: operation.balance < operationsCtrl.account.authorized_overdraft}" warning: operation.balance < 0, danger: operation.balance < operationsCtrl.account.authorized_overdraft}"
ng-repeat="operation in operationsCtrl.operations | orderBy:'+':true"> ng-repeat="operation in operationsCtrl.operations | orderBy:'+':true">

16
src/scheduler/scheduleList.component.ts
View File

@ -15,17 +15,17 @@ var scheduleFormTmpl = require('./schedule.form.tmpl.html');
selector: 'schedule-list', selector: 'schedule-list',
template: ` template: `
<div class="row"> <div class="row">
<table class="table table-striped table-condensed table-hover"> <table class="table table-sm table-striped table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th class="col-md-1">Date de d&eacute;but</th> <th>Date de d&eacute;but</th>
<th class="col-md-1">Date de fin</th> <th>Date de fin</th>
<th class="col-md-1">Jour</th> <th>Jour</th>
<th class="col-md-1">Fr&eacute;q.</th> <th>Fr&eacute;q.</th>
<th>Libell&eacute; de l'op&eacute;ration</th> <th>Libell&eacute; de l'op&eacute;ration</th>
<th class="col-md-1">Montant</th> <th>Montant</th>
<th class="col-md-2">Cat&eacute;gorie</th> <th>Cat&eacute;gorie</th>
<th class="col-md-1">Actions</th> <th>Actions</th>
</tr> </tr>
</thead> </thead>

2
src/scheduler/scheduleRow.component.ts
View File

@ -17,7 +17,7 @@ import { Schedule } from './schedule';
"[id]": "schedule.id", "[id]": "schedule.id",
}, },
template: ` template: `
<td class="col-md-1">{{ schedule.start_date | date: "yyyy-MM-dd" }}</td> <td>{{ schedule.start_date | date: "yyyy-MM-dd" }}</td>
<td>{{ schedule.stop_date | date: "yyyy-MM-dd" }}</td> <td>{{ schedule.stop_date | date: "yyyy-MM-dd" }}</td>

1
webpack.config.js
View File

@ -44,7 +44,6 @@ module.exports = {
enforce: 'pre', enforce: 'pre',
test: /\.jsx?$/, test: /\.jsx?$/,
//include: path.resolve(__dirname, 'src'), //include: path.resolve(__dirname, 'src'),
exclude: /(node_modules|bootstrap)/,
loader: 'eslint-loader', loader: 'eslint-loader',
options: { options: {
useEslintrc: false, useEslintrc: false,