Skip to content

Commit 23ede27

Browse files
authored
merge pr#4 from develop
project updated
2 parents 051b6e8 + b694d47 commit 23ede27

8 files changed

+23
-25
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ Thumbs.db
4747

4848

4949
# data keys
50+
NASA KEY.txt
5051
/src/app/shared/nasa_key.ts

src/app/app-routing.module.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { NgModule } from '@angular/core';
22
import { RouterModule, Routes } from '@angular/router';
33
import {HomeComponent} from "./components/home/home.component";
4+
import {ApodComponent} from "./components/nasa/apod/apod.component";
45

56
const routes: Routes = [
67
{ path: 'home', component: HomeComponent },
7-
{ path: '', redirectTo: 'home', pathMatch: 'full'},
8-
{ path: '**', redirectTo: 'home', pathMatch: 'full'}
8+
{ path: 'apod', component: ApodComponent },
9+
{ path: '', redirectTo: 'apod', pathMatch: 'full'},
10+
{ path: '**', redirectTo: 'apod', pathMatch: 'full'}
911
];
1012

1113
@NgModule({

src/app/app.component.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<div class="bg-dark p-5"
2-
style="max-width: 100vw; min-height: 100vh">
1+
<div class="bg-dark">
32
<router-outlet></router-outlet>
43
<app-info></app-info>
54
</div>

src/app/app.component.scss

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
.bg-dark {
2-
background-color:black;
3-
background-image:
4-
radial-gradient(white, rgba(255,255,255,.1) 2px, transparent 20px),
5-
radial-gradient(white, rgba(255,255,255,.08) 1px, transparent 25px),
6-
radial-gradient(white, rgba(255,255,255,.05) 2px, transparent 30px),
7-
radial-gradient(rgba(255,255,255,.4), rgba(255,255,255,.02) 2px, transparent 35px);
2+
max-width: 100vw;
3+
min-height: 100vh;
4+
padding: 3rem 2rem;
5+
background-color: black;
6+
background-image: radial-gradient(white, rgba(255, 255, 255, .1) 2px, transparent 20px),
7+
radial-gradient(white, rgba(255, 255, 255, .08) 1px, transparent 25px),
8+
radial-gradient(white, rgba(255, 255, 255, .05) 2px, transparent 30px),
9+
radial-gradient(rgba(255, 255, 255, .4), rgba(255, 255, 255, .02) 2px, transparent 35px);
810
background-size: 550px 550px, 350px 350px, 250px 250px, 150px 150px;
911
background-position: 0 0, 40px 60px, 130px 270px, 70px 100px;
1012
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<app-apod></app-apod>
1+
<div class="container"></div>

src/app/components/info/info.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div *ngIf="dataSocialNetworks.length > 0"
2-
class="fixed-bottom bg-dark d-flex justify-content-between px-3 pt-3">
2+
class="fixed-bottom bg-dark d-flex justify-content-between p-2">
33
<div class="d-flex networks">
44
<a *ngFor="let socialNetwork of dataSocialNetworks"
55
href="{{socialNetwork.url}}" target="_blank">
@@ -9,7 +9,7 @@
99
</a>
1010
</div>
1111
<div class="d-flex author">
12-
<p class="text-end">
12+
<p class="text-end m-0">
1313
<i class="pi pi-code m-1"></i>
1414
Angel Lucero | 2023</p>
1515
</div>
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
<p-toast></p-toast>
22

33
<div *ngIf="nasaResponse" class="container">
4-
<div class="text-center">
5-
<h1 class="display-5">{{nasaResponse?.title}}</h1>
4+
<div class="content text-center">
5+
<h1 class="display-4">{{nasaResponse?.title}}</h1>
66
<p>{{title}}</p>
7-
</div>
8-
<div class="content">
97
<div class="d-flex justify-content-center">
108
<p-image *ngIf="nasaResponse?.media_type === 'image'"
11-
src="{{nasaResponse?.hdurl}}" alt="Image" width="400" [preview]="true"></p-image>
9+
src="{{nasaResponse?.hdurl}}" alt="Image" width="100%" [preview]="true"></p-image>
1210
<video *ngIf="nasaResponse?.media_type === 'video'"
1311
autoplay="true" name="media">
1412
<source src="{{nasaResponse?.url}}" type="video/mp4">
1513
</video>
1614
</div>
17-
<div class="description mt-3">
18-
<p>{{nasaResponse?.explanation}}</p>
19-
</div>
20-
<div class="credits mt-3">
21-
<p style="font-style: italic;
15+
<p class="description mt-3">{{nasaResponse?.explanation}}</p>
16+
<p class="description mt-3" style="font-style: italic;
2217
color: #bebebe">Copyright: {{nasaResponse?.copyright || 'Not found'}}</p>
23-
</div>
2418
</div>
2519
</div>

src/app/services/social-networks.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class SocialNetworksService {
1717
},
1818
{
1919
name: 'Instagram',
20-
url: 'https://www.instagram.com/angellucero24/',
20+
url: 'https://www.instagram.com/angel.lu24/',
2121
icon: 'pi-instagram',
2222
},
2323
{

0 commit comments

Comments
 (0)