Skip to content

Commit a2067e6

Browse files
erika-hortenciaerika-hortencia
authored
Merge pull request #2 from erika-hortencia/dev
Dev
2 parents 62d56ae + b7d2264 commit a2067e6

20 files changed

+188
-385
lines changed

‎.gitignore

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,43 @@
1-
# Compiled class file
2-
*.class
1+
/.ideas
32

4-
# Log file
5-
*.log
3+
# Compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
/bazel-out
68

7-
# BlueJ files
8-
*.ctxt
9+
# Node
10+
/node_modules
911

10-
# Mobile Tools for Java (J2ME)
11-
.mtj.tmp/
12+
npm-debug.log
13+
yarn-error.log
1214

13-
# Package Files #
14-
*.jar
15-
*.war
16-
*.nar
17-
*.ear
18-
*.zip
19-
*.tar.gz
20-
*.rar
15+
# IDEs and editors
16+
.idea/
17+
.project
18+
.classpath
19+
.c9/
20+
*.launch
21+
.settings/
22+
*.sublime-workspace
2123

22-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
23-
hs_err_pid*
24-
replay_pid*
24+
# Visual Studio Code
25+
.vscode/*
26+
!.vscode/settings.json
27+
!.vscode/tasks.json
28+
!.vscode/launch.json
29+
!.vscode/extensions.json
30+
.history/*
31+
32+
# Miscellaneous
33+
/.angular/cache
34+
.sass-cache/
35+
/connect.lock
36+
/coverage
37+
/libpeerconnection.log
38+
testem.log
39+
/typings
40+
41+
# System files
42+
.DS_Store
43+
Thumbs.db

‎angular-blog/src/app/app.component.html

Lines changed: 2 additions & 336 deletions
Large diffs are not rendered by default.

‎angular-blog/src/app/app.component.spec.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎angular-blog/src/app/app.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { Component } from '@angular/core';
22
import { RouterOutlet } from '@angular/router';
3+
import { HomeComponent } from './pages/home/home.component';
34

45
@Component({
56
selector: 'app-root',
6-
imports: [RouterOutlet],
7+
imports: [RouterOutlet, HomeComponent],
78
templateUrl: './app.component.html',
89
styleUrl: './app.component.css'
910
})

‎angular-blog/src/app/components/big-card/big-card.component.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
.container__big-card{
2+
border: solid white 2px;
3+
width: 453px;
4+
height: 750px;
5+
margin-left: 10px;
6+
margin-right: 10px;
7+
8+
display: flex;
9+
flex-direction: column;
10+
align-items: flex-start;
11+
justify-content: flex-start;
12+
}
13+
14+
.big-card__title > h1{
15+
font-size: 40px;
16+
margin-top: 15px;
17+
}
18+
19+
.big-card__description > p{
20+
color: grey;
21+
margin-top: 10px;
22+
}
23+
24+
.big-card__image{
25+
width: 453px;
26+
}

‎angular-blog/src/app/components/big-card/big-card.component.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<div class="container__big-card">
2+
<div class="big-card__image">
3+
<img
4+
src="https://digest.med.br/wp-content/uploads/2024/07/no-image.jpg"
5+
alt=""
6+
height="450px"
7+
srcset=""
8+
>
9+
</div>
10+
<div class="big-card__title">
11+
<h1>News:</h1>
12+
</div>
13+
<div class="big-card__description">
14+
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
15+
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
16+
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
17+
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."</p>
18+
</div>
19+
</div>

‎angular-blog/src/app/components/big-card/big-card.component.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-big-card',
5+
imports: [],
6+
templateUrl: './big-card.component.html',
7+
styleUrl: './big-card.component.css'
8+
})
9+
export class BigCardComponent {
10+
11+
}

‎angular-blog/src/app/components/menu-bar/menu-bar.component.css

Whitespace-only changes.

‎angular-blog/src/app/components/menu-bar/menu-bar.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<p>menu-bar works!</p>

‎angular-blog/src/app/components/menu-bar/menu-bar.component.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-menu-bar',
5+
imports: [],
6+
templateUrl: './menu-bar.component.html',
7+
styleUrl: './menu-bar.component.css'
8+
})
9+
export class MenuBarComponent {
10+
11+
}

‎angular-blog/src/app/components/menu-title/menu-title.component.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.container__menu-title{
2+
color: white;
3+
}
4+
5+
.container__menu-title > h1 {
6+
margin-top: 10px;
7+
margin-bottom: 10px;
8+
font-size: 150px;
9+
font-weight: bolder;
10+
font-family:'Trebuchet MS';
11+
display: flex;
12+
justify-content: center;
13+
}
14+
15+
.container__menu-title > hr {
16+
margin-top: 5px;
17+
margin-bottom: 5px;
18+
}

‎angular-blog/src/app/components/menu-title/menu-title.component.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="container__menu-title">
2+
<hr>
3+
<h1>TESTING 1,2,3...</h1>
4+
<hr>
5+
</div>

‎angular-blog/src/app/components/menu-title/menu-title.component.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Component, OnInit } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-menu-title',
5+
templateUrl: './menu-title.component.html',
6+
styleUrls: ['./menu-title.component.css']
7+
})
8+
export class MenuTitleComponent implements OnInit{
9+
nconstructor() { }
10+
11+
ngOnInit(): void {
12+
}
13+
14+
}

‎angular-blog/src/app/components/small-card/small-card.component.css

Whitespace-only changes.

‎angular-blog/src/app/components/small-card/small-card.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<p>small-card works!</p>

‎angular-blog/src/app/components/small-card/small-card.component.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Component } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-small-card',
5+
templateUrl: './small-card.component.html',
6+
styleUrls: ['./small-card.component.css']
7+
})
8+
export class SmallCardComponent {
9+
10+
}

‎angular-blog/src/app/pages/home/home.component.css

Whitespace-only changes.

‎angular-blog/src/app/pages/home/home.component.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<app-menu-title></app-menu-title>
2+
<div class="articles">
3+
<div class="articles__main">
4+
<app-big-card></app-big-card>
5+
</div>
6+
<div class="articles__others">
7+
8+
</div>
9+
</div>

‎angular-blog/src/app/pages/home/home.component.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Component } from '@angular/core';
2+
import { MenuTitleComponent } from '../../components/menu-title/menu-title.component';
3+
import { BigCardComponent } from '../../components/big-card/big-card.component';
4+
5+
@Component({
6+
selector: 'app-home',
7+
imports: [MenuTitleComponent, BigCardComponent],
8+
templateUrl: './home.component.html',
9+
styleUrl: './home.component.css'
10+
})
11+
export class HomeComponent {
12+
13+
}

‎angular-blog/src/styles.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
11
/* You can add global styles to this file, and also import other style files */
2+
*{
3+
margin: 0;
4+
padding: 0;
5+
box-sizing: border-box;
6+
background-color:midnightblue;
7+
color: white;
8+
font-family:'Trebuchet MS';
9+
}

0 commit comments

Comments
 (0)