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

New home page #15

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

New home page #15

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
ecd6265
restructure homepage + icons
amirbashan Dec 18, 2024
122e7b7
fix build issue
amirbashan Dec 19, 2024
0724201
fix home links build
amirbashan Dec 22, 2024
33f740f
fix
amirbashan Dec 22, 2024
e01bf3d
Merge branch 'main' of https://github.com/kolzchut/srm-frontend into …
amirbashan Jan 13, 2025
6aa2d98
fix break
amirbashan Jan 13, 2025
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
4 changes: 3 additions & 1 deletion projects/srm/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ import { SearchResultsPageComponent } from './search-results-page/search-results
import { SrpStaticFiltersComponent } from './search-results-page/srp-static-filters/srp-static-filters.component';
import { SrpMapToggleComponent } from './search-results-page/srp-map-toggle/srp-map-toggle.component';
import { SrpAreaSearchButtonsComponent } from './search-results-page/srp-area-search-buttons/srp-area-search-buttons.component';
import { HomeLinksComponent } from './home-links/home-links.component';

@NgModule({
declarations: [
Expand Down Expand Up @@ -155,7 +156,8 @@ import { SrpAreaSearchButtonsComponent } from './search-results-page/srp-area-se
SearchResultsPageComponent,
SrpStaticFiltersComponent,
SrpMapToggleComponent,
SrpAreaSearchButtonsComponent
SrpAreaSearchButtonsComponent,
HomeLinksComponent,
],
imports: [
BrowserModule,
Expand Down
35 changes: 35 additions & 0 deletions projects/srm/src/app/home-links/home-links.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<div class='homepage-groups' #homepageGroups>
@for (group of groups; track group.title) {
<div class='homepage-group' [style.gridRowEnd]='"span 15"'>
<div class='homepage-group-title'>
<h3>
<img src='../../assets/img/filter-category-icon-title.svg'>
<span>{{group.title}}</span>
<span *ngIf='(!!group.query)' class='arrow-left'></span>
</h3>
</div>
<div class='homepage-group-items'>
@for (item of group.items; track item.query) {
<a class='homepage-group-item' [routerLink]='["/s", item.query]'
[queryParams]="{from: 'homepage-group-item'}"
interactionEvent='homepage-link' interactionEventWhere='homepage' [interactionEventContent]='item.title'
clickOnReturn>
<img src='../../assets/img/filter-category-icon.svg'>
<span>
{{item.title}}
</span>
</a>
}
</div>
<a *ngIf='(!!group.query && !!group.group_link)'
class='homepage-group-more'
[routerLink]='["/s", group.query]'
[queryParams]="{from: 'homepage-group-more'}"
interactionEvent='homepage-link-group' interactionEventWhere='homepage' [interactionEventContent]='group.title'
clickOnReturn>
<span class='after'></span>
<span>{{group.group_link}}</span>
</a>
</div>
}
</div>
140 changes: 140 additions & 0 deletions projects/srm/src/app/home-links/home-links.component.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
@import '../../common.less';

.transition(@property) {
transition-property: @property;
transition-duration: 300ms;
transition-timing-function: ease-in-out;
}

.homepage-groups {
.desktop({
padding: 48px 64px;
padding-bottom: 64px;
display: grid;
grid-gap: 0 16px;
grid-template-columns: repeat(auto-fill, minmax(300px,1fr));
});
.mobile({
display: flex;
flex-flow: column;;
align-items: stretch;
padding: 16px 8px;
});

h2 {
padding: 0 24px;
}

.homepage-group {
display: flex;
flex-flow: column;
align-items: flex-start;
gap: 4px;
padding: 16px;
width: 100%;
.desktop({
max-width: 560px;
height: min-content;
});

.homepage-group-title {
text-decoration: none;
}
a.homepage-group-title {
cursor: pointer;
}

h3 {
margin: 0;
display: flex;
flex-flow: row;
align-items: center;
gap: 4px;
span {
.font-rag-sans;
color: @color-gray-1;
font-weight: 400;
.desktop({
font-size: 24px;
line-height: 28px;
});
.mobile({
font-size: 20px;
line-height: 20px;
});
.transition(color);
}
.arrow-left {
display: inline-block;
.background-image;
background-image: url(../../assets/img/icon-arrow-left-blue-3.svg);
background-size: 24px;
width: 24px;
height: 24px;
opacity: 0;
.transition(opacity);
}
}

.homepage-group-more {
display: flex;
flex-flow: row;
align-items: center;
.font-rag-sans;
color: @color-blue-2;
font-weight: 300;

cursor: pointer;
.after {
display: inline-block;
.background-image;
background-image: url(../../assets/img/icon-after.svg);
background-size: 16px;
width: 16px;
height: 16px;
}
&:hover {
text-decoration: underline;
font-weight: 400;
}
}

.transition(border-color background-color);
border: 1px solid rgba(255,255,255,0);
background-color: rgba(255,255,255,0);;

.homepage-group-items {
display: flex;
flex-flow: row wrap;
align-items: center;
gap: 4px;
.homepage-group-item {
border-radius: 4px;
border: 1px solid @color-gray-6;
background-color: white;
.font-rag-sans;
color: @color-blue-2;
font-weight: 300;
display: flex;
justify-content: center;
align-items: center;
.desktop({
padding: 0 0 0 8px;
font-size: 20px;
line-height: 28px;
});
.mobile({
padding: 4px 0 4px 8px;
font-size: 16px;
line-height: 20px;
});
cursor: pointer;
&:hover {
border: 1px solid @color-blue-6;
background: @color-blue-7;
color: @color-blue-0;
}
}
}
}
}
37 changes: 37 additions & 0 deletions projects/srm/src/app/home-links/home-links.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { Component } from '@angular/core';
import { HomepageEntry } from '../consts';
import { ApiService } from '../api.service';

@Component({
selector: 'app-home-links',
templateUrl: './home-links.component.html',
styleUrl: './home-links.component.less'
})
export class HomeLinksComponent {
groups: {
title: string,
query: string,
group_link: string,
items: HomepageEntry[]
}[] = [];

constructor(private api: ApiService) {
api.getHomepage().subscribe((homepage: HomepageEntry[]) => {
const groupMap = new Map<string, HomepageEntry[]>();
homepage.forEach((entry) => {
if (!groupMap.has(entry.group)) {
groupMap.set(entry.group, []);
this.groups.push({
title: entry.group,
query: entry.query,
group_link: entry.group_link,
items: groupMap.get(entry.group)!,
});
}
if (entry.title) {
groupMap.get(entry.group)!.push(entry);
}
});
});
}
}
59 changes: 7 additions & 52 deletions projects/srm/src/app/homepage/homepage.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class='part1'>
<div class='part1-bg'></div>
<div class='header'>
<div class='menu-button layout-mobile'>
<div *ngIf='layout.desktop()' class='menu-button'>
<app-menu-icon colorScheme='light'></app-menu-icon>
</div>
<div class='logo-tagline'>
Expand All @@ -16,18 +16,18 @@ <h1 class='tagline'>
</div>
</div>

<div class='intro' [class.searching]='searchConfig.searching' >
<div *ngIf='layout.desktop()' class='intro' [class.searching]='searchConfig.searching' >
לחפש ולמצוא <strong>כל שירות</strong> חברתי<br/>
מכל רשות, עמותה או ארגון<br class='layout-mobile'/>&nbsp;בהתאמה אישית לצרכיך&nbsp;
מכל רשות, עמותה או ארגון&nbsp;בהתאמה אישית לצרכיך&nbsp;
</div>
<div class='search' role="main" #search [class.searching]='searchConfig.searching' >
<div class='searchbox-container layout-desktop' appArrowToTab (keydown)='keydown($event)'>
<div *ngIf='layout.desktop()' class='searchbox-container' appArrowToTab (keydown)='keydown($event)'>
<app-search-bar [config]='searchConfig' (focus)='$event ? updateFocus($event) : null' [homepage]='true'
interactionEvent='homepage-searchbar' interactionEventWhere='homepage'
></app-search-bar>
<app-autocomplete-results [config]='searchConfig'></app-autocomplete-results>
</div>
<div class='searchbox-container layout-mobile'>
<div *ngIf='layout.mobile()' class='searchbox-container'>
<app-search-bar [config]='searchConfig' (focus)='startSearch("", false)' [homepage]='true'
></app-search-bar>
</div>
Expand All @@ -41,57 +41,12 @@ <h1 class='tagline'>
</div>
</div>
<div class='part2'>
<div class='header layout-desktop'>
<div *ngIf='layout.desktop()' class='header'>
<app-desktop-menu-links [homepage]='true'></app-desktop-menu-links>
</div>

<div class='homepage-groups' #homepageGroups>
@for (group of groups; track group.title) {
<div class='homepage-group' [style.gridRowEnd]='"span 15"'>
@if (!!group.query) {
<div class='homepage-group-title'>
<h3>
<span>{{group.title}}</span>
<span class='arrow-left'></span>
</h3>
</div>
} @else {
<div class='homepage-group-title'>
<h3>
<span>{{group.title}}</span>
</h3>
</div>
}
<div class='homepage-group-items'>
@for (item of group.items; track item.query) {
<a class='homepage-group-item' [routerLink]='["/s", item.query]'
[queryParams]="{from: 'homepage-group-item'}"
interactionEvent='homepage-link' interactionEventWhere='homepage' [interactionEventContent]='item.title'
clickOnReturn>{{item.title}}</a>
}
</div>
@if (!!group.query && !!group.group_link) {
<a [routerLink]='["/s", group.query]'
[queryParams]="{from: 'homepage-group-more'}"
class='homepage-group-more'
interactionEvent='homepage-link-group' interactionEventWhere='homepage' [interactionEventContent]='group.title'
clickOnReturn>
<span class='after'></span>
<span>{{group.group_link}}</span>
</a>
}
</div>
}
</div>
<app-home-links></app-home-links>
<app-disclaimer-footer></app-disclaimer-footer>
</div>
</div>
<!-- <div class='backdrop layout-desktop' (focus)='updateFocus(false)' (click)='updateFocus(false)' tabindex="0">
<div class='top'></div>
<div class='bottom'>
<div class='close'></div>
</div>
</div> -->
</div>
<div class='alternate-search layout-mobile' [class.visible]='!searchVisible' (activated)='startSearch("", false)' clickOnReturn aria-label='ביצוע חיפוש באתר'></div>
</div>
Loading