Skip to content

Commit

Permalink
Merge pull request #45 from Potits-chats/fix-responsive
Browse files Browse the repository at this point in the history 
Fix responsive
  • Loading branch information
@Eva1512
Eva1512 authored May 13, 2024
2 parents bdd5b42 + 9164ed5 commit a103600
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 32 deletions.
35 changes: 9 additions & 26 deletions src/app/components/footer/footer.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,36 @@
<footer noHeaderFooter [restrictedRoutes]="['/connexion', '/inscription', '/erreur', '/tchat']" class="bg-slate-50">
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
<div class="py-16 text-center"> <!-- Center the content in the container -->
<div class="py-16 text-center">
<a routerLink="/" class="mx-auto flex items-center justify-center">
<!-- Center the image and text horizontally and vertically -->
<img src="../../../assets/logo-potit-chat.png" class="mr-3 h-20 sm:h-20" alt="Flowbite Logo" />
<span class="text-xl text-orange-500 font-semibold whitespace-nowrap dark:text-orange-500">
Potits Chats
</span>
</a>
<nav class="mt-10 text-sm" aria-label="quick links">
<div class="flex justify-center gap-x-6">
<div class="flex justify-center gap-x-6 flex-wrap">
<a class="inline-block rounded-lg px-2 py-1 text-sm text-slate-700 hover:bg-slate-100 hover:text-slate-900"
routerLink="/a-propos">A propos</a>
routerLink="/a-propos">À propos</a>
<a class="inline-block rounded-lg px-2 py-1 text-sm text-slate-700 hover:bg-slate-100 hover:text-slate-900"
routerLink="/contact">Nous contacter</a>
<a class="inline-block rounded-lg px-2 py-1 text-sm text-slate-700 hover:bg-slate-100 hover:text-slate-900"
routerLink="/mentions-legales">Mentions légales</a>
<a class="inline-block rounded-lg px-2 py-1 text-sm text-slate-700 hover:bg-slate-100 hover:text-slate-900"
href="#bug-report">Signaler un bug</a>
<a class="inline-block rounded-lg px-2 py-1 text-sm text-slate-700 hover:bg-slate-100 hover:text-slate-900"
href="#newsletter">Newsletter</a>
</div>
</nav>
</div>



<div
class="flex flex-col items-center border-t border-slate-400/10 py-10 sm:flex-row-reverse sm:justify-between">
<div class="flex flex-col items-center border-t border-slate-400/10 py-10 sm:flex-row-reverse sm:justify-between">
<div class="flex gap-x-6">
<a class="group" aria-label="TaxPal on Twitter" href="https://twitter.com">
<svg aria-hidden="true" class="h-6 w-6 fill-slate-500 group-hover:fill-slate-700">
<path
d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0 0 22 5.92a8.19 8.19 0 0 1-2.357.646 4.118 4.118 0 0 0 1.804-2.27 8.224 8.224 0 0 1-2.605.996 4.107 4.107 0 0 0-6.993 3.743 11.65 11.65 0 0 1-8.457-4.287 4.106 4.106 0 0 0 1.27 5.477A4.073 4.073 0 0 1 2.8 9.713v.052a4.105 4.105 0 0 0 3.292 4.022 4.093 4.093 0 0 1-1.853.07 4.108 4.108 0 0 0 3.834 2.85A8.233 8.233 0 0 1 2 18.407a11.615 11.615 0 0 0 6.29 1.84">
</path>
</svg>

...
</a>

<a class="group" aria-label="TaxPal on GitHub" href="https://github.com">
<svg aria-hidden="true" class="h-6 w-6 fill-slate-500 group-hover:fill-slate-700">
<path
d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0 1 12 6.844a9.59 9.59 0 0 1 2.504.337c1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.02 10.02 0 0 0 22 12.017C22 6.484 17.522 2 12 2Z">
</path>
</svg></a>
...
</a>
</div>
<p class="mt-6 text-sm text-slate-500 sm:mt-0">Copyright © <!-- -->2024<!-- --> Potits Chats. All rights
<p class="mt-6 text-sm text-slate-500 sm:mt-0">Copyright © 2024 Potits Chats. All rights
reserved.
</p>
</div>
</div>
</footer>
</footer>
11 changes: 5 additions & 6 deletions src/app/components/header/header.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
{{ envProd ?
'Site en cours de développement, certaines fonctionnalités peuvent ne pas être disponibles. Merci de votre compréhension.'
:
"Attention vous n'êtes pas sur le serveur de production ! Ce serveur est un serveur de test uniquement." }}
"Attention ce serveur est un serveur de test uniquement." }}
</div>



<nav class="bg-white border-gray-200 px-4 lg:px-6 py-2.5 dark:bg-gray-800">
<nav class="bg-white border-gray-200 px-4 lg:px-6 py-4 dark:bg-gray-800">
<div class="flex flex-wrap justify-between items-center mx-auto max-w-screen-xl">
<a routerLink="/" class="flex items-center">
<img src="../../../assets/logo-potit-chat.png" class="mr-3 h-20 sm:h-20" alt="Flowbite Logo" />
Expand Down Expand Up @@ -45,7 +44,7 @@

<button data-collapse-toggle="mobile-menu-2" type="button"
class="inline-flex items-center p-2 ml-1 text-sm text-gray-500 rounded-lg lg:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
aria-controls="mobile-menu-2" aria-expanded="false">
aria-controls="mobile-menu-2" [attr.aria-expanded]="isMenuOpen" (click)="toggleMenu()">
<span class="sr-only">Open main menu</span>
<svg class="w-6 h-6" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
Expand All @@ -60,7 +59,7 @@
</svg>
</button>
</div>
<div class="hidden justify-between items-center w-full lg:flex lg:w-auto lg:order-1" id="mobile-menu-2">
<div [class.hidden]="!isMenuOpen" class="hidden justify-between items-center w-full lg:flex lg:w-auto lg:order-1" id="mobile-menu-2">
<ul class="flex flex-col mt-4 font-medium lg:flex-row lg:space-x-8 lg:mt-0">
<li>
<a routerLink="/animaux" class="nav-link" routerLinkActive="active">Adopter</a>
Expand All @@ -71,7 +70,7 @@
<li>
<a routerLink="/dons" class="nav-link" routerLinkActive="active">Dons</a>
</li>
<div class="w-96">
<div class="w-full lg:w-96">
<div class="relative rounded-md">
<div class="absolute inset-y-0 left-0 flex items-center pl-3">
<button>
Expand Down
6 changes: 6 additions & 0 deletions src/app/components/header/header.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,18 @@ export class HeaderComponent {
isCollapsed = true;
faUser = faUser;
faPowerOff = faPowerOff;
public isMenuOpen: boolean = false;

constructor(
public auth: AuthService,
@Inject(DOCUMENT) private doc: Document
) {}


toggleMenu() {
this.isMenuOpen = !this.isMenuOpen;
}

envProd = environment.production;

loginWithRedirect() {
Expand Down

0 comments on commit a103600

Please sign in to comment.