Supprimer src/environments/environment.development.ts

Reviewed-on: #1
Co-authored-by: maxime <maxime.jeannin@hotmail.fr>
Co-committed-by: maxime <maxime.jeannin@hotmail.fr>

src/app/app.css

@@ -1,6 +0,0 @@
-main {
-    width: 100%;
-    margin: 2rem;
-    display: flex;  
-    justify-content: center;  
-}

src/app/app.html

@@ -4,8 +4,8 @@
   <input id="my-drawer-4" type="checkbox" class="drawer-toggle" />
 
   <!-- Contenu principal de la page (router-outlet) -->
-  <div class="drawer-content flex flex-col">
+  <div class="drawer-content max-w-full overflow-hidden flex flex-col">
-    <main class="flex-grow p-4">
+    <main class="flex-grow m-0 p-4">
       <router-outlet></router-outlet>
     </main>
   </div>
@@ -13,7 +13,7 @@
   <!-- Sidebar -->
   <div class="drawer-side is-drawer-close:overflow-visible">
     <label for="my-drawer-4" aria-label="close sidebar" class="drawer-overlay"></label>
-    <div class="flex min-h-full flex-col items-start bg-base-200 is-drawer-close:w-14 is-drawer-open:w-64">
+    <div class="flex min-h-full flex-col items-start bg-base-200 is-drawer-close:w-14 is-drawer-open:w-64 mt-16 lg:mt-0">
       <app-sidebar [userEmail]="connectedUserEmail()" />
     </div>
   </div>

src/app/pages/potd/potd.html

@@ -1,16 +1,33 @@
-<div class="hero bg-base-200 min-h-screen">
+@if(isLoading()){
-  <div class="hero-content flex-col lg:flex-col">
+<div class="spinner">
-    <img
+  <span class="loading loading-spinner loading-xl"></span>
-      src={{nasaPOTD()?.url}}
+  <p>Chargement ...</p>
-      class="max-w-mid rounded-lg shadow-2xl"
+</div>
-      alt="{{nasaPOTD()?.explanation}}"
+}
-    />
+@if(!isLoading() && nasaPOTD()){
-    <div>
+  @if(nasaPOTD()?.media_type=="image"){
-      <h1 class="text-5xl font-bold">{{nasaPOTD()?.title}}</h1>
+  <div class="hero bg-base-200 min-h-screen">
-      <p class="text-2x2 font-semibold">{{nasaPOTD()?.copyright}}</p>
+    <div class="hero-content flex-col lg:flex-col">
-      <p class="py-6">
+      <img src={{nasaPOTD()?.url}} class="max-w-mid rounded-lg shadow-2xl" alt="{{nasaPOTD()?.explanation}}" />
-        {{nasaPOTD()?.explanation}}
+      <div>
-      </p>
+        <h1 class="text-5xl font-bold">{{nasaPOTD()?.title}}</h1>
+        <p class="text-2x2 font-semibold">{{nasaPOTD()?.copyright}}</p>
+        <p class="py-6">
+          {{nasaPOTD()?.explanation}}
+        </p>
+      </div>
     </div>
   </div>
-</div>
+  }
+  @if(nasaPOTD()?.media_type==="video"){
+    <div class="videocontainer flex justify-center w-full mt-20">
+      <video class="rounded-md" controls>
+      <source src="{{nasaPOTD()!.url}}" type="video/mp4">
+      </video>
+  </div>
+  }
+
+}
+@if(!isLoading() && !nasaPOTD()){
+<p>Impossible de charger la vidéo.</p>
+}

src/app/pages/potd/potd.ts

@@ -1,4 +1,4 @@
-import { Component, inject, signal } from '@angular/core';
+import { Component, OnInit, inject, signal } from '@angular/core';
 import { NAPOD } from '../../services/napod';
 import { Picture } from '../../interfaces/picture';
 
@@ -8,19 +8,22 @@ import { Picture } from '../../interfaces/picture';
   templateUrl: './potd.html',
   styleUrl: './potd.css'
 })
-export class POTD {
+export class POTD implements OnInit{
 
   private readonly nasaApi = inject(NAPOD)
   nasaPOTD = signal< Picture | null >(null)
+  isLoading = signal<boolean>(true);
   
-  constructor(){
+  ngOnInit(){
     this.nasaApi.getPicOfToday().subscribe({
       next: (data)=>{
         console.log(data)
         this.nasaPOTD.set(data)
+        this.isLoading.set(false);
       },
       error: error =>{
-        console.log(error);        
+        console.log(error);
+        this.isLoading.set(false);        
       }
     }      
   )

src/app/pages/search/searchform/searchform.ts

@@ -1,11 +1,12 @@
-import { Component, inject, signal } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { NAPOD } from '../../../services/napod';
+import { Router, RouterLink } from '@angular/router';
 import { Search } from '../../../services/search';
 import { FormsModule } from '@angular/forms';
 
 @Component({
   selector: 'app-searchform',
-  imports: [FormsModule],
+  imports: [FormsModule, RouterLink],
   templateUrl: './searchform.html',
   styleUrl: './searchform.css',
 })
@@ -14,9 +15,14 @@ export class Searchform {
   private readonly searchService = inject(Search);
   searchString = this.searchService.searchString;
 
+  constructor(private readonly router: Router){
+  
+    }
+
   onSubmit(event: Event) {
     event.preventDefault(); // <-- Empêche le rechargement
     console.log("onSubmit appelé !"); // <-- Devrait s'afficher
+    this.router.navigate(["/home"])
     this.nasaApi.searchForVideos(this.searchService.searchString()).subscribe({
       next: (data)=>{this.searchService.searchResults.set(data);
         console.log(data.collection);

src/app/pages/search/searchresults/searchresults.html

@@ -5,9 +5,8 @@
 }
 
 @if(searchResults()!==null && searchResults()!.collection.items.length!==0){
-  <div class="resultsContainer">
+  <div class="flex justify-center resultsContainer w-full">
-    <ul class="list bg-base-100 rounded-box shadow-md">
+    <ul class="flex max-w-6xl list bg-base-100 rounded-box shadow-md">  
-  
       <li class="p-4 pb-2 text-xs opacity-60 tracking-wide">Results</li>          
               @for(el of searchResults()!.collection.items; track el.data[0].nasa_id){
                 <li class="list-row">
@@ -24,8 +23,7 @@
                     <svg class="size-[1.2em]" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g stroke-linejoin="round" stroke-linecap="round" stroke-width="2" fill="none" stroke="currentColor"><path d="M6 3L20 12 6 21 6 3z"></path></g></svg>
                   </button>
                 </li>                   
-              }                
+              }
-
     </ul>    
   </div>
   }

src/app/pages/video/video.ts

@@ -1,4 +1,4 @@
-import { Component, inject, signal } from '@angular/core';
+import { Component, OnInit, inject, signal } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Collection } from '../../interfaces/nasa-api';
 import { NAPOD } from '../../services/napod';
@@ -11,7 +11,7 @@ import { NAPOD } from '../../services/napod';
   templateUrl: './video.html',
   styleUrl: './video.css'
 })
-export class Video {
+export class Video implements OnInit {
   private readonly route = inject(ActivatedRoute)
   asset=signal<Collection|null>(null);
   //TODO: nom nul pour le service a changer

src/app/shared/header/header.ts

@@ -1,4 +1,4 @@
-import { Component, computed, input, signal, Signal } from '@angular/core';
+import { Component, computed, input } from '@angular/core';
 import { Router, RouterLink } from '@angular/router';
 import { Auth } from '../../services/auth';
 import { Searchform } from "../../pages/search/searchform/searchform";

src/app/shared/sidebar/sidebar.html

@@ -1,17 +1,3 @@
-<!-- 
- <div class="menu bg-base-100 shadow-sm" >              
-        <div><a class="btn btn-ghost text-xl" routerLink="/home">Home</a></div>   
-        <div><a class="btn btn-ghost text-xl" routerLink="/potd">Picture of the day</a></div>      
-        <div><a class="btn btn-ghost text-xl" routerLink="/search">Search</a></div>      
-        @if(isLoggedIn()){
-            <div><a class="btn btn-ghost text-xl" (click)="logout()">Logout</a></div>
-        }                
-        @if(!isLoggedIn()){
-            <div ><a class="btn btn-ghost text-xl" routerLink="/login">Login</a></div> 
-            <div ><a class="btn btn-ghost text-xl" routerLink="/register">Register</a></div>        
-        }
-</div>
--->
 <ul class="menu w-full grow">
   <li>
     <a routerLink="/" class="is-drawer-close:tooltip is-drawer-close:tooltip-right" data-tip="Homepage">

src/environments/environment.ts

@@ -1,3 +1,7 @@
 export const environment = {
-    production: true
+    production: false,
+    NASA_API_BASE_URL : "",
+    NASA_API_KEY: '',
+    NASA_API_IMAGE_BASE_URL:'https://images-api.nasa.gov',
+    AUTH_API_BASE:''
 };