Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

home and idea page changes #183

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

home and idea page changes #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84afb6f
Update home.component.scss
om1621 Apr 2, 2019
a1e3384
changed homepage
om1621 Apr 11, 2019
d9ddd49
updated navbar
om1621 Apr 11, 2019
a5a73ae
some fixes
om1621 Apr 11, 2019
fb7d858
added svgs
om1621 Apr 11, 2019
46ee98c
small fixes
om1621 Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
450 changes: 324 additions & 126 deletions src/app/home/home.component.html
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions src/app/home/home.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,13 @@
width: 100%;
margin-top: 10px;
}
.mat-raised-button.ng-star-inserted{
margin: 0 0 0 50px;
border-radius: 18px;
}
img{
margin:0 0 0 140px;
}
.community-button.mat-raised-button.mat-primary{
margin: 10px 0 0;
}
2 changes: 1 addition & 1 deletion src/app/shared/activity-actions/activity-actions.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
align-items: center;
}
.card-icons > mat-icon {
margin: 5px;
margin-left: 15px;
}
126 changes: 60 additions & 66 deletions src/app/shell/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,60 @@
<mat-toolbar class="mat-elevation-z1 navbar header">
<div class="container">
<div fxHide.gt-sm fxLayoutAlign="start center">
<button class="menu-button" mat-icon-button (click)="sidenav.toggle()"><mat-icon>menu</mat-icon></button>
</div>
<div class="header__content" fxHide.lt-md>
<a class="brand header__full-logo" routerLink="/"
><img src="../../../assets/cynthesize-logo.png" alt="Cynthesize" width="30px" /><b
style="vertical-align: text-bottom;
color: blue;
margin: 7px;"
>Cynthesize
</b></a
>
</div>
<span fxFlex></span>
<div class="v-desktop" fxHide.lt-md>
<button class="header__link" mat-button routerLink="/view/feed/ideas">
<span translate>Ideas</span>
</button>
<button class="header__link" mat-button routerLink="/view/feed/projects/ongoing" [matMenuTriggerFor]="menu">
<span translate>Collaborate </span>
</button>
<mat-menu #menu="matMenu">
<button class="header__link" mat-menu-item routerLink="/add/idea">
<span translate>New Idea</span>
</button>
<button class="header__link" mat-menu-item routerLink="/add/project">
<span translate>New Project</span>
</button>
</mat-menu>
<button class="header__link" mat-button routerLink="/">
<span translate>Become a mentor</span>
</button>
<button class="header__link" mat-button routerLink="/view/feed/projects/launched">
<span translate>Launched Projects</span>
</button>
<button mat-icon-button [matMenuTriggerFor]="userMenu" *ngIf="authenticationService.isAuthenticated()">
<mat-icon> person </mat-icon>
</button>
<button
mat-raised-button
style="background-color: orange; color: white;"
*ngIf="!authenticationService.isAuthenticated()"
(click)="authenticationService.login()"
>
Login/Signup
</button>
<mat-menu #userMenu="matMenu" class="profile-menu">
<div>
<div class="user-info">
<div class="user-image" *ngIf="profilepPic">
<cl-image height="50" crop="scale" public-id="{{ profilepPic }}" secure="true"></cl-image>
</div>
<div class="username">{{ username }}</div>
</div>
<mat-divider></mat-divider>
<div class="user-links">
<div class="user-link" routerLink="/user/{{ username }}">Profile</div>
<div class="user-link" (click)="logout()">Logout</div>
</div>
</div>
</mat-menu>
</div>
</div>
</mat-toolbar>
<mat-toolbar class="mat-elevation-z1 navbar header">
<div class="container">
<div fxHide.gt-sm fxLayoutAlign="start center">
<button class="menu-button" mat-icon-button (click)="sidenav.toggle()"><mat-icon>menu</mat-icon></button>
</div>
<div class="header__content" fxHide.lt-md>
<a class="brand header__full-logo" routerLink="/"
><img src="../../../assets/cynthesize-logo.png" alt="Cynthesize" width="30px" /><b
style="vertical-align: text-bottom;
color: blue;
margin: 7px;"
>Cynthesize
</b></a
>
</div>
<span fxFlex></span>
<div class="v-desktop" fxHide.lt-md>
<button class="header__link" mat-button routerLink="/view/feed/ideas">
<span translate>Ideas</span>
</button>
<button class="header__link" mat-button routerLink="/view/feed/projects/ongoing" [matMenuTriggerFor]="menu">
<span translate>Collaborate </span>
</button>
<mat-menu #menu="matMenu">
<button class="header__link" mat-menu-item routerLink="/add/idea">
<span translate>New Idea</span>
</button>
<button class="header__link" mat-menu-item routerLink="/add/project">
<span translate>New Project</span>
</button>
</mat-menu>
<button class="header__link" mat-button routerLink="/">
<span translate>Become a mentor</span>
</button>
<button class="header__link" style="background-color: orange; color: white;
border-radius: 10px;
margin-left: 30px;" mat-button routerLink="/view/feed/projects/launched">
<span translate>Launched Projects</span>
</button>
<button mat-icon-button [matMenuTriggerFor]="userMenu" *ngIf="authenticationService.isAuthenticated()">
<mat-icon> person </mat-icon>
</button>
<mat-menu #userMenu="matMenu" class="profile-menu">
<div>
<div class="user-info">
<div class="user-image" *ngIf="profilepPic">
<cl-image height="50" crop="scale" public-id="{{ profilepPic }}" secure="true"></cl-image>
</div>
<div class="username">{{ username }}</div>
</div>
<mat-divider></mat-divider>
<div class="user-links">
<div class="user-link" routerLink="/user/{{ username }}">Profile</div>
<div class="user-link" (click)="logout()">Logout</div>
</div>
</div>
</mat-menu>
</div>
</div>
</mat-toolbar>
55 changes: 55 additions & 0 deletions src/assets/logos/social/envelope.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/logos/social/full1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/logos/social/full2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions src/assets/logos/social/placeholder-filled-point.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 43 additions & 0 deletions src/assets/logos/social/smartphone-call.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions src/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ body {
box-sizing: border-box;
font-family: "Montserrat", sans-serif;
font-weight: 400;
background: #f7f8fb;
background: white;
color: white;
font-size: 0.8rem;
}
Expand All @@ -68,11 +68,13 @@ body {
}

.top-margin-120 {
margin: 120px 0;
margin: 0px 0;
}

.pointer {
cursor: pointer;
color:#0264FB;
font-weight: bold;
}

.page {
Expand Down Expand Up @@ -105,7 +107,7 @@ body {
}

.mat-form-field-appearance-fill .mat-form-field-flex {
border-radius: 40px !important;
border-radius: 10px !important;
background-color: white;
border: #8e8e8e solid;
}
Expand Down Expand Up @@ -200,7 +202,7 @@ body {
}

.active-context {
color: blue;
color:blue;
font-weight: bold;
}

Expand Down