Skip to content

Commit 1bea99c

Browse files
AdonisVienetAdonisVienet
authored
Merge pull request #6 from AdonisVienet/localBapt
premier essai des pages web
2 parents 8690870 + 0e1f1e5 commit 1bea99c

File tree

10 files changed

+927
-756
lines changed

10 files changed

+927
-756
lines changed

‎src/app/components/footer/footer.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<footer class="footer ">
22
<div class="container-fluid">
3-
<nav class="pull-left">
3+
<!--<nav class="pull-left">
44
<ul>
55
<li>
66
<a href="https://www.creative-tim.com">
@@ -23,11 +23,11 @@
2323
</a>
2424
</li>
2525
</ul>
26-
</nav>
26+
</nav>-->
2727
<div class="copyright pull-right">
2828
&copy;
2929
{{test | date: 'yyyy'}}, made with love by
3030
<a href="https://www.creative-tim.com" target="_blank">Creative Tim</a> for a better web.
3131
</div>
3232
</div>
33-
</footer>
33+
</footer>

‎src/app/components/sidebar/sidebar.component.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import { Component, OnInit } from '@angular/core';
22

33
declare const $: any;
44
declare interface RouteInfo {
5-
path: string;
6-
title: string;
7-
icon: string;
8-
class: string;
5+
path: string;
6+
title: string;
7+
icon: string;
8+
class: string;
99
}
1010
export const ROUTES: RouteInfo[] = [
11-
{ path: '/dashboard', title: 'Dashboard', icon: 'dashboard', class: '' },
12-
{ path: '/user-profile', title: 'Client', icon:'person', class: '' },
13-
{ path: '/table-list', title: 'Table List', icon:'content_paste', class: '' },
14-
{ path: '/typography', title: 'Typography', icon:'library_books', class: '' },
15-
{ path: '/icons', title: 'Icons', icon:'bubble_chart', class: '' },
16-
{ path: '/maps', title: 'Maps', icon:'location_on', class: '' },
17-
{ path: '/notifications', title: 'Notifications', icon:'notifications', class: '' },
18-
{ path: '/upgrade', title: 'Upgrade to PRO', icon:'unarchive', class: 'active-pro' },
11+
{ path: '/dashboard', title: 'Accueil', icon: 'home', class: '' },
12+
{ path: '/user-profile', title: 'Compte personnel', icon: 'person', class: '' },
13+
{ path: '/table-list', title: 'Toutes nos offres', icon: 'local_offer', class: '' },
14+
{ path: '/typography', title: '(gérant) Ajouter une offre', icon: 'note_add', class: '' },
15+
{ path: '/icons', title: '(admin) gérer les utilisateurs', icon: 'settings_applications', class: '' },
16+
{ path: '/maps', title: '(admin) Statistiques', icon: 'create', class: '' },
17+
// { path: '/notifications', title: 'Notifications', icon: 'notifications', class: '' },
18+
{ path: '/upgrade', title: 'Contactez-nous !', icon: 'unarchive', class: 'active-pro' },
1919
];
2020

2121
@Component({
@@ -32,9 +32,9 @@ export class SidebarComponent implements OnInit {
3232
this.menuItems = ROUTES.filter(menuItem => menuItem);
3333
}
3434
isMobileMenu() {
35-
if ($(window).width() > 991) {
36-
return false;
37-
}
38-
return true;
35+
if ($(window).width() > 991) {
36+
return false;
37+
}
38+
return true;
3939
};
4040
}

‎src/app/dashboard/dashboard.component.html‎

Lines changed: 581 additions & 414 deletions
Large diffs are not rendered by default.

‎src/app/icons/icons.component.html‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
1-
21
<div class="main-content">
3-
<div class="container-fluid">
4-
<div class="card card-plain">
5-
<div class="card-header card-header-danger">
6-
<h4 class="card-title">Material Design Icons</h4>
7-
<p class="card-category">Handcrafted by our friends from
8-
<a target="_blank" href="https://fonts.google.com/icons">Google</a>
9-
</p>
10-
</div>
11-
<div class="row">
12-
<div class="col-md-12">
13-
<div class="card-body">
14-
<div class="iframe-container d-none d-lg-block">
15-
<iframe src="https://material.io/design/iconography/system-icons.html#grid-and-keyline-shapes">
16-
<p>Your browser does not support iframes.</p>
17-
</iframe>
18-
</div>
19-
<div class="col-md-12 d-none d-sm-block d-md-block d-lg-none d-block d-sm-none text-center ml-auto mr-auto">
20-
<h5>The icons are visible on Desktop mode inside an iframe. Since the iframe is not working on Mobile and Tablets please visit the icons on their original page on Google. Check the
21-
<a href="https://fonts.google.com/icons" target="_blank">Material Icons</a>
22-
</h5>
23-
</div>
24-
</div>
25-
</div>
26-
</div>
27-
</div>
28-
</div>
29-
</div>
2+
<div class="container-fluid">
3+
<div class="card card-plain">
4+
<div class="card-header card-header-danger">
5+
<h4 class="card-title">Liste de tous les utilisateurs</h4>
6+
<p class="card-category">Seuls les administrateurs peuvent y avoir accès. Les modifications sont
7+
enregistrées directement dans la DB
8+
</p>
9+
</div>
10+
<div class="row">
11+
<div class="col-md-12">
12+
<div class="card-body">
13+
<p>gentille liste de tous les utilisateurs</p>
14+
<p>Cliquer sur modifier/sauvegarder</p>
15+
</div>
16+
</div>
17+
</div>
18+
</div>
19+
</div>
20+
</div>

‎src/app/layouts/admin-layout/admin-layout.component.html‎

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<app-footer></app-footer>
1111
</div>
1212
</div>
13-
<div class="fixed-plugin">
13+
<!--<div class="fixed-plugin">
1414
<div class="dropdown show-dropdown open show">
1515
<a href="#" data-toggle="dropdown" aria-expanded="true">
1616
<i class="fa fa-cog fa-2x"> </i>
@@ -73,76 +73,80 @@
7373
</li>
7474
</ul>
7575
</div>
76-
</div>
76+
</div>-->
7777
</div>
7878
<!-- Buy-Modal-angular -->
7979
<div class="modal modal-angular fade" id="buy" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
80-
<div class="modal-dialog" role="document">
81-
<div class="modal-content">
82-
<div class="modal-body text-center">
83-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
84-
<h4 class="margin-top">
85-
Free Version
86-
</h4>
87-
<div class="separator"></div>
88-
<a href="https://www.creative-tim.com/product/material-dashboard" class="modal-button" target="_blank">
89-
<div class="wrapper-card">
80+
<div class="modal-dialog" role="document">
81+
<div class="modal-content">
82+
<div class="modal-body text-center">
83+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
84+
aria-hidden="true">&times;</span></button>
85+
<h4 class="margin-top">
86+
Free Version
87+
</h4>
88+
<div class="separator"></div>
89+
<a href="https://www.creative-tim.com/product/material-dashboard" class="modal-button" target="_blank">
90+
<div class="wrapper-card">
91+
<div class="image-container">
92+
<img src="./assets/img/html.png" alt="unloaded">
93+
</div>
94+
Html5
95+
<div class="separator"></div>
96+
<div class="product-type">
97+
FREE
98+
</div>
99+
</div>
100+
</a>
101+
<a href="https://www.creative-tim.com/product/material-dashboard-angular2" class="modal-button"
102+
target="_blank">
103+
<div class="wrapper-card">
104+
<div class="image-container image-angular-cli">
105+
<img src="./assets/img/angular.png" alt="unloaded">
106+
</div>
107+
Angular
108+
<div class="separator"></div>
109+
<div class="product-type">
110+
FREE
111+
</div>
112+
</div>
113+
</a>
114+
<h4>
115+
PRO Version
116+
</h4>
117+
<div class="separator"></div>
118+
<a href="https://www.creative-tim.com/product/material-dashboard-pro" class="modal-button"
119+
target="_blank">
90120
<div class="image-container">
91121
<img src="./assets/img/html.png" alt="unloaded">
92122
</div>
93123
Html5
94124
<div class="separator"></div>
95-
<div class="product-type">
96-
FREE
125+
<div class="price">
126+
from
127+
<span>
128+
49
129+
<i class="fa fa-usd" aria-hidden="true"></i>
130+
</span>
97131
</div>
98-
</div>
99-
</a>
100-
<a href="https://www.creative-tim.com/product/material-dashboard-angular2" class="modal-button" target="_blank">
101-
<div class="wrapper-card">
132+
</a>
133+
<a href="https://www.creative-tim.com/product/material-dashboard-pro-angular2" class="modal-button"
134+
target="_blank">
102135
<div class="image-container image-angular-cli">
103136
<img src="./assets/img/angular.png" alt="unloaded">
104137
</div>
105138
Angular
106139
<div class="separator"></div>
107-
<div class="product-type">
108-
FREE
140+
<div class="price">
141+
from
142+
<span>
143+
59
144+
<i class="fa fa-usd" aria-hidden="true"></i>
145+
</span>
109146
</div>
110-
</div>
111-
</a>
112-
<h4>
113-
PRO Version
114-
</h4>
115-
<div class="separator"></div>
116-
<a href="https://www.creative-tim.com/product/material-dashboard-pro" class="modal-button" target="_blank">
117-
<div class="image-container">
118-
<img src="./assets/img/html.png" alt="unloaded">
119-
</div>
120-
Html5
121-
<div class="separator"></div>
122-
<div class="price">
123-
from
124-
<span>
125-
49
126-
<i class="fa fa-usd" aria-hidden="true"></i>
127-
</span>
128-
</div>
129-
</a>
130-
<a href="https://www.creative-tim.com/product/material-dashboard-pro-angular2" class="modal-button" target="_blank">
131-
<div class="image-container image-angular-cli">
132-
<img src="./assets/img/angular.png" alt="unloaded">
133-
</div>
134-
Angular
135-
<div class="separator"></div>
136-
<div class="price">
137-
from
138-
<span>
139-
59
140-
<i class="fa fa-usd" aria-hidden="true"></i>
141-
</span>
142-
</div>
143-
</a>
147+
</a>
148+
</div>
144149
</div>
145150
</div>
146-
</div>
147151

148-
</div>
152+
</div>

‎src/app/maps/maps.component.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
<div id="map"></div>
1+
<!--<div id="map"></div>-->
2+
<div>
3+
<p>Bonjour à tous, ici c'est l'endroit des statistiques (seuls admin)
4+
<p>
5+
</div>

0 commit comments

Comments
 (0)