Skip to content

Commit 9a11a38

Browse files
authored
Improve blog section (#237)
* Improve blog section * Remove hardcoding in register links
1 parent 82b64fb commit 9a11a38

9 files changed

Lines changed: 124 additions & 124 deletions

File tree

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,54 @@
1-
<div class="bg-secondary-50 dark:bg-secondary-200 fixed inset-0 flex flex-col">
2-
<!-- Sticky header + breadcrumb wrapper -->
3-
<div class="sticky top-0 z-10">
4-
<!-- Header -->
5-
<section id="jumbo"
6-
class="w-full bg-cover bg-right-bottom pt-8"
7-
style="background-image: url(assets/images/bg_1_shadow.png)">
8-
9-
<div class="pt-8 pb-8 px-4 w-full text-left lg:pt-16 lg:px-12">
10-
<div class="flex flex-row mx-auto max-w-screen-xl justify-between">
11-
<div class="flex flex-col">
12-
<h1 class="mb-4 text-4xl font-extrabold tracking-tight md:text-5xl lg:text-6xl text-white">
1+
<div class="bg-secondary-50 dark:bg-secondary-200 flex min-h-full flex-col">
2+
<section class="w-full bg-[#DDE6F6]">
3+
<div
4+
class="mx-auto w-full max-w-[1440px] px-6 py-10 sm:px-8 md:px-10 md:py-12 lg:px-16 xl:px-[160px]">
5+
<div class="flex flex-row mx-auto max-w-screen-xl justify-between">
6+
<div class="flex flex-col">
7+
<h1
8+
class="text-[clamp(2.75rem,2.1rem+2.1vw,3.75rem)] font-extrabold leading-[0.95] tracking-[0.02em] text-[#0B1528]">
139
{{entry.title}}
14-
</h1>
15-
<p class="text-lg font-normal lg:text-xl text-secondary-50">
16-
Created by
17-
<b class="text-primary-50">
18-
{{entry.author}}
19-
</b>
20-
on {{entry.date | date:'EEEE, dd/MM/yy, HH:mm'}}.
21-
</p>
22-
</div>
23-
</div>
10+
</h1>
11+
<p class="mt-4 text-[clamp(1rem,0.92rem+0.35vw,1.25rem)] leading-[1.6] text-[#4C5A6B]">
12+
Created by
13+
<b class="text-[#2D58A7]">
14+
{{entry.author}}
15+
</b>
16+
on {{entry.date | date:'EEEE, dd/MM/yy, HH:mm'}}.
17+
</p>
18+
</div>
2419
</div>
25-
</section>
20+
</div>
21+
<div class="pb-4">
22+
<nav class="flex px-5 py-3 shadow-lg text-gray-700 border border-gray-200 bg-secondary-50 dark:bg-secondary-100 dark:border-gray-800 dark:text-white">
23+
<ol class="inline-flex items-center space-x-1 md:space-x-2 rtl:space-x-reverse">
24+
<li class="inline-flex items-center">
25+
<button (click)="goBack()"
26+
class="inline-flex items-center text-sm font-medium text-gray-500 dark:text-white hover:text-primary-100 dark:hover:text-primary-50">
27+
<svg class="w-3 h-3 mr-2 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 12 10">
28+
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M5 1 1 5l4 4m6-8L7 5l4 4"/>
29+
</svg>
30+
Back
31+
</button>
32+
</li>
33+
<li aria-current="page">
34+
<div class="flex items-center">
35+
<svg class="rtl:rotate-180 w-3 h-3 mx-1 text-gray-400 dark:text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 6 10">
36+
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 9 4-4-4-4"/>
37+
</svg>
38+
<span class="ms-1 text-sm font-medium text-gray-500 dark:text-white md:ms-2">Entry details</span>
39+
</div>
40+
</li>
41+
</ol>
42+
</nav>
43+
</div>
44+
</section>
2645

27-
<!-- Breadcrumb -->
28-
<nav class="flex px-5 py-3 shadow-lg text-gray-700 border border-gray-200 bg-secondary-50 dark:bg-secondary-100 dark:border-gray-800 dark:text-white">
29-
<ol class="inline-flex items-center space-x-1 md:space-x-2 rtl:space-x-reverse">
30-
<li class="inline-flex items-center">
31-
<button (click)="goBack()" class="inline-flex items-center text-sm font-medium text-gray-500 dark:text-white hover:text-primary-100 dark:hover:text-primary-50">
32-
<svg class="w-3 h-3 mr-2 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 12 10">
33-
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M5 1 1 5l4 4m6-8L7 5l4 4"/>
34-
</svg>
35-
Back
36-
</button>
37-
</li>
38-
<li aria-current="page">
39-
<div class="flex items-center">
40-
<svg class="rtl:rotate-180 w-3 h-3 mx-1 text-gray-400 dark:text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 6 10">
41-
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 9 4-4-4-4"/>
42-
</svg>
43-
<span class="ms-1 text-sm font-medium text-gray-500 dark:text-white md:ms-2">Entry details</span>
44-
</div>
45-
</li>
46-
</ol>
47-
</nav>
48-
</div>
49-
50-
<!-- Scrollable content -->
51-
<div class="flex-1 overflow-y-auto p-8 lg:pt-8 lg:p-16">
52-
<markdown class="text-gray-700 dark:text-secondary-50 whitespace-pre-line"
53-
[data]="entry.content">
54-
</markdown>
46+
<div class="flex-1 mx-auto w-full max-w-[1440px] p-4 pb-16 sm:px-8 md:px-10 lg:px-16 xl:px-[160px]">
47+
<div
48+
class="mx-auto w-full max-w-screen-xl rounded-lg border border-gray-300 bg-white p-6 shadow-lg dark:border-secondary-300 dark:bg-secondary-100 md:p-8 lg:p-10">
49+
<markdown class="text-gray-700 dark:text-secondary-50 whitespace-pre-line break-words"
50+
[data]="entry.content">
51+
</markdown>
52+
</div>
5553
</div>
5654
</div>

src/app/pages/dome-blog/dome-blog.component.html

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
<!-- Full height app wrapper -->
2-
<div class="bg-secondary-50 dark:bg-secondary-200 fixed inset-0 flex flex-col">
3-
<!-- Sticky header -->
4-
<section id="jumbo"
5-
class="sticky top-0 z-10 w-full bg-cover bg-right-bottom pt-8"
6-
style="background-image: url(assets/images/bg_1_shadow.png)">
7-
8-
<div class="pt-8 pb-8 px-4 w-full text-left lg:pt-16 lg:px-12">
9-
<div class="flex flex-row mx-auto max-w-screen-xl justify-between">
2+
<div class="bg-secondary-50 dark:bg-secondary-200 flex min-h-full flex-col">
3+
<section class="w-full bg-[#DDE6F6]">
4+
<div
5+
class="mx-auto flex w-full max-w-[1440px] flex-col gap-6 px-6 py-10 sm:px-8 md:px-10 md:py-12 lg:px-16 xl:px-[160px]">
6+
<div class="flex flex-row items-start justify-between gap-4">
107
<div class="flex flex-col">
11-
<h1 class="mb-4 text-4xl font-extrabold tracking-tight md:text-5xl lg:text-6xl text-white">
8+
<h1
9+
class="text-[clamp(2.75rem,2.1rem+2.1vw,3.75rem)] font-extrabold leading-[0.95] tracking-[0.02em] text-[#0B1528]">
1210
Blog
1311
</h1>
14-
<!--<p class="text-lg font-normal lg:text-xl text-secondary-50">
15-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor
16-
</p>-->
1712
</div>
1813
@if(checkAdmin){
19-
<button type="button" data-cy="newBlogEntry" (click)="goToCreate()" class="ml-2 mr-8 mb-4 text-white max-h-12 bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center align-middle me-2">
14+
<button type="button" data-cy="newBlogEntry" (click)="goToCreate()"
15+
class="h-fit text-white bg-[#2D58A7] hover:bg-[#244A8D] focus:ring-4 focus:outline-none focus:ring-[#2D58A733] font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center align-middle">
2016
<p class="pl-2 pr-2">Add a new entry</p>
2117
<svg class="w-[18px] h-[18px] text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
2218
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
@@ -28,9 +24,9 @@ <h1 class="mb-4 text-4xl font-extrabold tracking-tight md:text-5xl lg:text-6xl t
2824
</section>
2925

3026
<!-- Only this area scrolls -->
31-
<div class="flex-1 overflow-y-auto p-4 pb-16">
27+
<div class="flex-1 mx-auto w-full max-w-[1440px] px-6 pb-16 pt-4 sm:px-8 md:px-10 lg:px-16 xl:px-[160px]">
3228
@for(entry of entries; track entry){
33-
<div class="flex flex-col m-4 mx-auto max-w-screen-xl w-full border border-gray-300 dark:border-secondary-300 bg-white dark:bg-secondary-100 rounded-lg shadow-lg p-8">
29+
<div class="mb-8 flex w-full flex-col border border-gray-300 bg-white p-8 shadow-lg rounded-lg dark:border-secondary-300 dark:bg-secondary-100">
3430
<div class="flex inline-flex justify-between">
3531
<h2 class="text-2xl font-bold mb-4 dark:text-white break-words">{{ entry.title }}</h2>
3632
@if(entry.partyId == partyId){
Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
<!-- Full height app wrapper -->
2-
<div class="bg-secondary-50 dark:bg-secondary-200 fixed inset-0 flex flex-col">
3-
<!-- Sticky header -->
4-
<section id="jumbo"
5-
class="sticky top-0 z-10 w-full bg-cover bg-right-bottom pt-8"
6-
style="background-image: url(assets/images/bg_1_shadow.png)">
7-
8-
<div class="pt-8 pb-8 px-4 w-full text-left lg:pt-16 lg:px-12">
2+
<div class="bg-secondary-50 dark:bg-secondary-200 flex min-h-full flex-col">
3+
<section class="w-full bg-[#DDE6F6]">
4+
<div
5+
class="mx-auto w-full max-w-[1440px] px-6 py-10 sm:px-8 md:px-10 md:py-12 lg:px-16 xl:px-[160px]">
96
<div class="flex flex-row mx-auto max-w-screen-xl justify-between">
107
<div class="flex flex-col">
11-
<h1 class="mb-4 text-4xl font-extrabold tracking-tight md:text-5xl lg:text-6xl text-white">
8+
<h1
9+
class="text-[clamp(2.75rem,2.1rem+2.1vw,3.75rem)] font-extrabold leading-[0.95] tracking-[0.02em] text-[#0B1528]">
1210
Create a new entry
1311
</h1>
1412
</div>
1513
</div>
1614
</div>
17-
</section>
18-
<!-- Breadcrumb -->
19-
<div class="pb-4">
20-
<nav class="flex px-5 py-3 shadow-lg text-gray-700 border border-gray-200 bg-secondary-50 dark:bg-secondary-100 dark:border-gray-800 dark:text-white" aria-label="Breadcrumb">
15+
<div class="pb-4">
16+
<nav class="flex px-5 py-3 shadow-lg text-gray-700 border border-gray-200 bg-secondary-50 dark:bg-secondary-100 dark:border-gray-800 dark:text-white"
17+
aria-label="Breadcrumb">
2118
<ol class="inline-flex items-center space-x-1 md:space-x-2 rtl:space-x-reverse">
2219
<li class="inline-flex items-center">
23-
<button (click)="goBack()" class="inline-flex items-center text-sm font-medium text-gray-500 dark:text-white hover:text-primary-100 dark:hover:text-primary-50">
20+
<button (click)="goBack()"
21+
class="inline-flex items-center text-sm font-medium text-gray-500 dark:text-white hover:text-primary-100 dark:hover:text-primary-50">
2422
<svg class="w-3 h-3 mr-2 text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 12 10">
2523
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M5 1 1 5l4 4m6-8L7 5l4 4"/>
2624
</svg>
@@ -37,50 +35,52 @@ <h1 class="mb-4 text-4xl font-extrabold tracking-tight md:text-5xl lg:text-6xl t
3735
</li>
3836
</ol>
3937
</nav>
40-
</div>
41-
<!-- End Breadcrumb -->
38+
</div>
39+
</section>
4240

43-
<div class="flex-1 overflow-y-auto p-4 pb-16">
44-
@if(loading){
45-
<div role="status" class="w-full h-full flex justify-center align-middle">
46-
<svg aria-hidden="true" class="w-12 h-12 text-gray-200 animate-spin dark:text-gray-600 fill-secondary-400" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
47-
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
48-
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
49-
</svg>
50-
<span class="sr-only">Loading...</span>
51-
</div>
52-
} @else {
53-
<!-- Stepper -->
54-
<form [formGroup]="entryForm">
55-
56-
<form class="md:p-8" [formGroup]="entryForm">
57-
<label for="title" class="font-bold text-lg dark:text-white">Title</label>
58-
<input data-cy="blogEntryTitle" id="title" type="text" formControlName="title"
59-
class="mb-2 bg-gray-50 dark:bg-secondary-300 border border-gray-300 dark:border-gray-800 dark:text-white text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5"/>
60-
61-
<label class="font-bold text-lg col-span-2 dark:text-white">Content</label>
62-
<app-markdown-textarea class="h-[500px]" formControlName="content"></app-markdown-textarea>
63-
</form>
64-
<!-- Navigation Buttons -->
65-
@if(blogId){
66-
<div class="flex justify-end mt-6 space-x-4">
67-
68-
<button data-cy="blogEntryCreate" (click)="update()" [disabled]="entryForm.invalid"
69-
class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100 disabled:opacity-50">
70-
Update entry
71-
</button>
72-
</div>
73-
} @else {
74-
<div class="flex justify-end mt-6 space-x-4">
75-
76-
<button data-cy="blogEntryCreate" (click)="create()" [disabled]="entryForm.invalid"
77-
class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100 disabled:opacity-50">
78-
Create entry
79-
</button>
41+
<div class="flex-1 mx-auto w-full max-w-[1440px] p-4 pb-16 sm:px-8 md:px-10 lg:px-16 xl:px-[160px]">
42+
<div class="mx-auto w-full max-w-screen-xl rounded-lg border border-gray-300 bg-white p-6 shadow-lg dark:border-secondary-300 dark:bg-secondary-100 md:p-8">
43+
@if(loading){
44+
<div role="status" class="flex min-h-[300px] w-full items-center justify-center">
45+
<svg aria-hidden="true" class="w-12 h-12 text-gray-200 animate-spin dark:text-gray-600 fill-secondary-400" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
46+
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
47+
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
48+
</svg>
49+
<span class="sr-only">Loading...</span>
8050
</div>
81-
}
82-
</form>
83-
}
51+
} @else {
52+
<!-- Stepper -->
53+
<form [formGroup]="entryForm">
54+
55+
<form class="md:p-8" [formGroup]="entryForm">
56+
<label for="title" class="font-bold text-lg dark:text-white">Title</label>
57+
<input data-cy="blogEntryTitle" id="title" type="text" formControlName="title"
58+
class="mb-2 bg-gray-50 dark:bg-secondary-300 border border-gray-300 dark:border-gray-800 dark:text-white text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5"/>
59+
60+
<label class="font-bold text-lg col-span-2 dark:text-white">Content</label>
61+
<app-markdown-textarea class="h-[500px]" formControlName="content"></app-markdown-textarea>
62+
</form>
63+
<!-- Navigation Buttons -->
64+
@if(blogId){
65+
<div class="flex justify-end mt-6 space-x-4">
66+
67+
<button data-cy="blogEntryCreate" (click)="update()" [disabled]="entryForm.invalid"
68+
class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100 disabled:opacity-50">
69+
Update entry
70+
</button>
71+
</div>
72+
} @else {
73+
<div class="flex justify-end mt-6 space-x-4">
74+
75+
<button data-cy="blogEntryCreate" (click)="create()" [disabled]="entryForm.invalid"
76+
class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100 disabled:opacity-50">
77+
Create entry
78+
</button>
79+
</div>
80+
}
81+
</form>
82+
}
83+
</div>
8484
</div>
8585

8686
</div>
@@ -98,4 +98,4 @@ <h3 class="text-lg font-medium">Error</h3>
9898
</div>
9999
</div>
100100
</div>
101-
}
101+
}

src/app/pages/landing-pages/customers/landing-page-customers.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Component } from "@angular/core";
2+
import { environment } from "src/environments/environment";
23
import { LandingCustomersBuyOptionsComponent } from './landing-customers-buy-options/landing-customers-buy-options.component';
34
import { LandingCustomersFaqsComponent } from './landing-customers-faqs/landing-customers-faqs.component';
45
import { LandingCustomersFinalCtaComponent } from './landing-customers-finalCta/landing-customers-finalCta.component';
@@ -16,5 +17,5 @@ import { LandingpageCustomersWhyJoinComponent } from "./landing-customers-whyJoi
1617
styleUrl: "./landing-page-customers.component.css"
1718
})
1819
export class LandingPageCustomersComponent {
19-
ONBOARDING_CUSTOMERS_LINK = "https://onboard.sbx.evidenceledger.eu/register-customer";
20+
ONBOARDING_CUSTOMERS_LINK = environment.DOME_CUSTOMER_REGISTER_LINK;
2021
}

0 commit comments

Comments
 (0)