Skip to content
Snippets Groups Projects
Commit 51c63d82 authored by Jonny Ngo Luong's avatar Jonny Ngo Luong
Browse files

feat: fixed css to be responsive and tests are fixed to run (#28)

parent b3fca42a
No related branches found
No related tags found
1 merge request!26"Add Sass styling to components"
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { HomeComponent } from './home.component';
describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ HomeComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(HomeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
......@@ -36,7 +36,7 @@ div.container{
div.postContainer{
width: 100%;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-template-columns: repeat(auto-fill, 384px);
gap: 30px;
}
}
\ No newline at end of file
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule } from '@angular/forms';
import { TextInputComponent } from './text-input.component';
import { TextAreaInputComponent } from './text-area-input.component';
describe('TextInputComponent', () => {
let component: TextInputComponent;
let fixture: ComponentFixture<TextInputComponent>;
let component: TextAreaInputComponent;
let fixture: ComponentFixture<TextAreaInputComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ TextInputComponent ],
declarations: [ TextAreaInputComponent ],
imports: [ FormsModule ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(TextInputComponent);
fixture = TestBed.createComponent(TextAreaInputComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
......
......@@ -25,6 +25,7 @@ div.cardWrapper > div {
flex-direction: column;
gap: 10px;
background-color: #fff;
box-shadow: inset 0px 4px 4px rgb(0 0 0 / 50%);
padding: 20px 10px;
}
p.status {
......
......@@ -61,11 +61,11 @@ describe('UserProfileEditFormComponent', () => {
component.email = "Email";
expect(component.checkForm()).toBeFalse();
expect(component.statusMessage).toBe("Passordet kan ikke være tom");
expect(component.statusMessage).toBe("Passordet kan ikke være tomt");
component.password = "password";
expect(component.checkForm()).toBeFalse();
expect(component.statusMessage).toBe("Passordet kan ikke være tom");
expect(component.statusMessage).toBe("Passordet kan ikke være tomt");
component.confirm_password = "hei";
expect(component.checkForm()).toBeFalse();
......
<div class="profile">
<div class="profile_info">
<div class="titleWrapper">
<div class="img"></div>
<div class="info">
<p class="name">{{user.getUsername}} Doe</p>
<p class="email">{{user.getEmail}}</p>
<p class="phone_number">+47 123 45 678</p>
<div class="infoWrapper">
<div class="profile_info">
<div class="titleWrapper">
<div class="img"></div>
<div class="info">
<p class="name">{{user.getUsername}} Doe</p>
<p class="email">{{user.getEmail}}</p>
<p class="phone_number">+47 123 45 678</p>
</div>
</div>
</div>
<div class="cardWrapper">
<div class="rating">
Mine omtaler:
<i class="material-icons">star</i>
<i class="material-icons">star</i>
<i class="material-icons">star</i>
<i class="material-icons">star_half</i>
<i class="material-icons">star_border</i>
</div>
<div class="location">
Geografi: Trondheim, Oslo
</div>
<div class="description">
<pre>
<div class="cardWrapper">
<div class="rating">
Mine omtaler:
<i class="material-icons">star</i>
<i class="material-icons">star</i>
<i class="material-icons">star</i>
<i class="material-icons">star_half</i>
<i class="material-icons">star_border</i>
</div>
<div class="location">
Geografi: Trondheim, Oslo
</div>
<div class="description">
<pre>
Om profilen min:
Fiskeboller er digg
Fotball er livet
......@@ -30,9 +31,10 @@ Fotball er livet
(=’.’) + (=’.’) = (=’.’)=’,’)
(,(‘’)(‘’) (,(‘’)(‘’) (,(“)(“)(“)(“)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
</pre>
</pre>
</div>
<app-button (click)="placeholder()" text="Rediger profil" class="btn pink"></app-button>
</div>
<app-button (click)="placeholder()" text="Rediger profil" class="btn pink"></app-button>
</div>
</div>
<div class="post_list">
......
......@@ -5,8 +5,9 @@
padding: 0 5% 5% 5%;
font-family: 'Josefin Sans', sans-serif;
transform: translateY(-100px);
.profile_info {
.infoWrapper {
order: 2;
margin-top: 40px;
}
}
div.profile_info {
......@@ -49,6 +50,7 @@ div.profile_info {
padding: 20px 10px;
pre {
font-size: 0.75rem;
padding: 5px;
}
}
}
......@@ -70,4 +72,16 @@ div.post_list {
& > a {
align-self: flex-end;
}
}
div.posts {
display: grid;
grid-template-columns: repeat(auto-fill,300px);
grid-gap: 10px;
}
:host ::ng-deep app-post-thumbnail div.postthumb {
width: 300px;
& > img {
width: 280px !important;
height: 280px !important;
}
}
\ No newline at end of file
......@@ -24,6 +24,7 @@ div.cardWrapper > div {
display: flex;
flex-direction: column;
background-color: #fff;
box-shadow: inset 0px 4px 4px rgb(0 0 0 / 50%);
gap: 10px;
padding: 20px 10px;
.split {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment