Skip to content

Local rama2 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
ad7887b
Ajout composants
AdonisVienet Feb 21, 2023
e9843e2
Merge pull request #1 from AdonisVienet/localAdonis
AdonisVienet Feb 21, 2023
6f401ce
ajout services
Feb 21, 2023
8b31416
ajout des models
BaptisteMchlt Feb 21, 2023
8a1f6f5
Merge pull request #2 from AdonisVienet/localRama
AdonisVienet Feb 21, 2023
35b7c49
Merge pull request #3 from AdonisVienet/localBapt
AdonisVienet Feb 21, 2023
ddbde1c
finition des modeles/services/components
BaptisteMchlt Feb 21, 2023
8690870
Merge pull request #4 from AdonisVienet/localBapt
AdonisVienet Feb 21, 2023
0e1f1e5
premier essai des pages web
BaptisteMchlt Feb 22, 2023
1bea99c
Merge pull request #6 from AdonisVienet/localBapt
AdonisVienet Feb 22, 2023
b5bc227
login ok
Feb 22, 2023
a1e2ccb
Merge https://github.com/AdonisVienet/agenceImmoFront into localRama
Feb 22, 2023
cf01e06
Merge pull request #7 from AdonisVienet/localRama2
AdonisVienet Feb 22, 2023
045d0f8
page d'accueil 1er jet
BaptisteMchlt Feb 23, 2023
67fb214
Merge pull request #8 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
9ee94a3
push page d'accueil chocolate
BaptisteMchlt Feb 23, 2023
65d99b9
Merge pull request #10 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
cd43913
c'est la fin du login
BaptisteMchlt Feb 23, 2023
9396cca
Merge pull request #11 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
c9fc082
Hello Adonis
BaptisteMchlt Feb 23, 2023
feea12a
Merge pull request #12 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
0ca6e98
pas ouf comme commit
BaptisteMchlt Feb 23, 2023
b294097
Profil utilisateur
AdonisVienet Feb 23, 2023
48cd4c4
Merge pull request #13 from AdonisVienet/localAdo
AdonisVienet Feb 23, 2023
49080ca
normalement la liste d'utilisateur fonctionne
BaptisteMchlt Feb 24, 2023
0c7ec4d
liste utilisateur fonctionne
BaptisteMchlt Feb 24, 2023
38a0754
Merge branch 'master' into localBapt
AdonisVienet Feb 24, 2023
c414c1b
Merge pull request #14 from AdonisVienet/localBapt
AdonisVienet Feb 24, 2023
c9d8ce7
Ajout list offre (sans image)
AdonisVienet Feb 24, 2023
8138831
Merge pull request #15 from AdonisVienet/localAdo
AdonisVienet Feb 24, 2023
298c7a5
le formulaire d'ajout is terminado
BaptisteMchlt Feb 24, 2023
1108a6a
Merge branch 'master' of https://github.com/AdonisVienet/agenceImmoFr…
BaptisteMchlt Feb 24, 2023
9539581
Merge pull request #16 from AdonisVienet/localBapt
AdonisVienet Feb 24, 2023
964cf02
formulaire okkk
Feb 24, 2023
181e72e
formu okk
Feb 24, 2023
062cf9a
l'onglet contact est fait
BaptisteMchlt Feb 24, 2023
b61cddf
Merge pull request #18 from AdonisVienet/localBapt
AdonisVienet Feb 24, 2023
66916e5
formu okk
Feb 24, 2023
de5c356
Merge branch 'master' of https://github.com/AdonisVienet/agenceImmoFr…
Feb 26, 2023
4c9b323
Recherche avancée
Feb 27, 2023
a9868ba
liste des offres et espace perso fonctionnel
AdonisVienet Feb 27, 2023
885690c
Merge pull request #19 from AdonisVienet/localAdo
AdonisVienet Feb 27, 2023
90d8760
Merge branch 'master' into localRama2
Feb 27, 2023
2220ac6
Merge pull request #20 from AdonisVienet/localRama2
AdonisVienet Feb 27, 2023
a42e068
recherche okkkkkk
Feb 27, 2023
d4048dc
description bien
Feb 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
premier essai des pages web
  • Loading branch information
BaptisteMchlt committed Feb 22, 2023
commit 0e1f1e56692013f2232a90bcd83230d11e6cda55
6 changes: 3 additions & 3 deletions src/app/components/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<footer class="footer ">
<div class="container-fluid">
<nav class="pull-left">
<!--<nav class="pull-left">
<ul>
<li>
<a href="https://www.creative-tim.com">
Expand All @@ -23,11 +23,11 @@
</a>
</li>
</ul>
</nav>
</nav>-->
<div class="copyright pull-right">
&copy;
{{test | date: 'yyyy'}}, made with love by
<a href="https://www.creative-tim.com" target="_blank">Creative Tim</a> for a better web.
</div>
</div>
</footer>
</footer>
32 changes: 16 additions & 16 deletions src/app/components/sidebar/sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import { Component, OnInit } from '@angular/core';

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

@Component({
Expand All @@ -32,9 +32,9 @@ export class SidebarComponent implements OnInit {
this.menuItems = ROUTES.filter(menuItem => menuItem);
}
isMobileMenu() {
if ($(window).width() > 991) {
return false;
}
return true;
if ($(window).width() > 991) {
return false;
}
return true;
};
}
995 changes: 581 additions & 414 deletions src/app/dashboard/dashboard.component.html

Large diffs are not rendered by default.

47 changes: 19 additions & 28 deletions src/app/icons/icons.component.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@

<div class="main-content">
<div class="container-fluid">
<div class="card card-plain">
<div class="card-header card-header-danger">
<h4 class="card-title">Material Design Icons</h4>
<p class="card-category">Handcrafted by our friends from
<a target="_blank" href="https://fonts.google.com/icons">Google</a>
</p>
</div>
<div class="row">
<div class="col-md-12">
<div class="card-body">
<div class="iframe-container d-none d-lg-block">
<iframe src="https://material.io/design/iconography/system-icons.html#grid-and-keyline-shapes">
<p>Your browser does not support iframes.</p>
</iframe>
</div>
<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">
<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
<a href="https://fonts.google.com/icons" target="_blank">Material Icons</a>
</h5>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="container-fluid">
<div class="card card-plain">
<div class="card-header card-header-danger">
<h4 class="card-title">Liste de tous les utilisateurs</h4>
<p class="card-category">Seuls les administrateurs peuvent y avoir accès. Les modifications sont
enregistrées directement dans la DB
</p>
</div>
<div class="row">
<div class="col-md-12">
<div class="card-body">
<p>gentille liste de tous les utilisateurs</p>
<p>Cliquer sur modifier/sauvegarder</p>
</div>
</div>
</div>
</div>
</div>
</div>
116 changes: 60 additions & 56 deletions src/app/layouts/admin-layout/admin-layout.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<app-footer></app-footer>
</div>
</div>
<div class="fixed-plugin">
<!--<div class="fixed-plugin">
<div class="dropdown show-dropdown open show">
<a href="#" data-toggle="dropdown" aria-expanded="true">
<i class="fa fa-cog fa-2x"> </i>
Expand Down Expand Up @@ -73,76 +73,80 @@
</li>
</ul>
</div>
</div>
</div>-->
</div>
<!-- Buy-Modal-angular -->
<div class="modal modal-angular fade" id="buy" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body text-center">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="margin-top">
Free Version
</h4>
<div class="separator"></div>
<a href="https://www.creative-tim.com/product/material-dashboard" class="modal-button" target="_blank">
<div class="wrapper-card">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body text-center">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<h4 class="margin-top">
Free Version
</h4>
<div class="separator"></div>
<a href="https://www.creative-tim.com/product/material-dashboard" class="modal-button" target="_blank">
<div class="wrapper-card">
<div class="image-container">
<img src="./assets/img/html.png" alt="unloaded">
</div>
Html5
<div class="separator"></div>
<div class="product-type">
FREE
</div>
</div>
</a>
<a href="https://www.creative-tim.com/product/material-dashboard-angular2" class="modal-button"
target="_blank">
<div class="wrapper-card">
<div class="image-container image-angular-cli">
<img src="./assets/img/angular.png" alt="unloaded">
</div>
Angular
<div class="separator"></div>
<div class="product-type">
FREE
</div>
</div>
</a>
<h4>
PRO Version
</h4>
<div class="separator"></div>
<a href="https://www.creative-tim.com/product/material-dashboard-pro" class="modal-button"
target="_blank">
<div class="image-container">
<img src="./assets/img/html.png" alt="unloaded">
</div>
Html5
<div class="separator"></div>
<div class="product-type">
FREE
<div class="price">
from
<span>
49
<i class="fa fa-usd" aria-hidden="true"></i>
</span>
</div>
</div>
</a>
<a href="https://www.creative-tim.com/product/material-dashboard-angular2" class="modal-button" target="_blank">
<div class="wrapper-card">
</a>
<a href="https://www.creative-tim.com/product/material-dashboard-pro-angular2" class="modal-button"
target="_blank">
<div class="image-container image-angular-cli">
<img src="./assets/img/angular.png" alt="unloaded">
</div>
Angular
<div class="separator"></div>
<div class="product-type">
FREE
<div class="price">
from
<span>
59
<i class="fa fa-usd" aria-hidden="true"></i>
</span>
</div>
</div>
</a>
<h4>
PRO Version
</h4>
<div class="separator"></div>
<a href="https://www.creative-tim.com/product/material-dashboard-pro" class="modal-button" target="_blank">
<div class="image-container">
<img src="./assets/img/html.png" alt="unloaded">
</div>
Html5
<div class="separator"></div>
<div class="price">
from
<span>
49
<i class="fa fa-usd" aria-hidden="true"></i>
</span>
</div>
</a>
<a href="https://www.creative-tim.com/product/material-dashboard-pro-angular2" class="modal-button" target="_blank">
<div class="image-container image-angular-cli">
<img src="./assets/img/angular.png" alt="unloaded">
</div>
Angular
<div class="separator"></div>
<div class="price">
from
<span>
59
<i class="fa fa-usd" aria-hidden="true"></i>
</span>
</div>
</a>
</a>
</div>
</div>
</div>
</div>

</div>
</div>
6 changes: 5 additions & 1 deletion src/app/maps/maps.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<div id="map"></div>
<!--<div id="map"></div>-->
<div>
<p>Bonjour à tous, ici c'est l'endroit des statistiques (seuls admin)
<p>
</div>
Loading