Skip to content

Commit ab39bff

Browse files
fdelavegaluigi-borriello-dev
fdelavega
and
luigi-borriello-dev
authored
Add new landing page version (Ficodes#224)
* New landing (Ficodes#221) * Footer first implementation * New footer * Fix env * First commit * Header and dashboard fix for incoming demo * Complete * header * Dashboard * Homepage completa * x * Update enviroment * Homepage implementation complete * Fix link (Ficodes#222) * Footer first implementation * New footer * Fix env * First commit * Header and dashboard fix for incoming demo * Complete * header * Dashboard * Homepage completa * x * Update enviroment * Homepage implementation complete * SBX LINKS * Fix issues with default footer * Fix issues with the header and footer * Use vars for new dome header colors * Recover missing translations * Update package-lock.json file * Fix cypress tests * Add missing data-cy attribute to header * Add missing data-cy attributes in header --------- Co-authored-by: Luigi <email@luigiborriello.dev>
1 parent 558fa38 commit ab39bff

55 files changed

Lines changed: 7150 additions & 3751 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.vscode/settings.json‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"editor.defaultFormatter": "vscode.typescript-language-features",
3+
"editor.formatOnSave": true,
4+
"editor.formatOnPaste": false,
5+
"editor.formatOnType": false,
6+
"[typescript]": {
7+
"editor.defaultFormatter": "vscode.typescript-language-features",
8+
"editor.formatOnSave": true
9+
},
10+
"[typescriptreact]": {
11+
"editor.defaultFormatter": "vscode.typescript-language-features"
12+
},
13+
"[javascript]": {
14+
"editor.defaultFormatter": "vscode.typescript-language-features"
15+
},
16+
"[javascriptreact]": {
17+
"editor.defaultFormatter": "vscode.typescript-language-features"
18+
},
19+
"[json]": {
20+
"editor.defaultFormatter": "vscode.json-language-features",
21+
"editor.formatOnSave": true
22+
},
23+
"[jsonc]": {
24+
"editor.defaultFormatter": "vscode.json-language-features",
25+
"editor.formatOnSave": true
26+
},
27+
"[html]": {
28+
"editor.defaultFormatter": "vscode.html-language-features",
29+
"editor.formatOnSave": true
30+
},
31+
"[css]": {
32+
"editor.defaultFormatter": "vscode.css-language-features",
33+
"editor.formatOnSave": true
34+
},
35+
"[scss]": {
36+
"editor.defaultFormatter": "vscode.css-language-features",
37+
"editor.formatOnSave": true
38+
},
39+
"editor.codeActionsOnSave": {
40+
"source.organizeImports": "explicit"
41+
},
42+
"typescript.tsdk": "node_modules/typescript/lib",
43+
"typescript.validate.enable": true,
44+
"typescript.updateImportsOnFileMove.enabled": "always",
45+
"typescript.preferences.importModuleSpecifier": "relative",
46+
"typescript.preferences.importModuleSpecifierEnding": "auto",
47+
"typescript.preferences.quoteStyle": "single",
48+
"typescript.suggest.autoImports": true,
49+
"typescript.suggest.completeFunctionCalls": true,
50+
"editor.inlineSuggest.enabled": true,
51+
"editor.parameterHints.enabled": true,
52+
"editor.suggestSelection": "first",
53+
"editor.tabCompletion": "on",
54+
"angular.enable-strict-mode-prompt": false,
55+
"angular.trace.server": "off",
56+
"editor.tabSize": 2,
57+
"editor.insertSpaces": true,
58+
"editor.detectIndentation": false,
59+
"files.eol": "\n",
60+
"files.trimTrailingWhitespace": true,
61+
"files.insertFinalNewline": true,
62+
"editor.wordWrap": "on",
63+
"editor.minimap.enabled": false,
64+
"editor.renderWhitespace": "selection",
65+
"editor.bracketPairColorization.enabled": true,
66+
"editor.guides.bracketPairs": true,
67+
"files.exclude": {
68+
"**/.angular/**": true,
69+
"**/.cache/**": true,
70+
"**/dist/**": true,
71+
"**/coverage/**": true,
72+
"**/.DS_Store": true
73+
},
74+
"git.autofetch": true,
75+
"git.confirmSync": false,
76+
"explorer.compactFolders": false,
77+
"workbench.startupEditor": "none"
78+
}

‎cypress/e2e/dashboard.cy.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@ describe('/dashboard',{
1313

1414
it('should have all required elements in dashboard', ()=>{
1515
checkHeaderPreLogin()
16-
cy.getBySel('browseServices').should('not.be.disabled')
16+
cy.getBySel('browseServicesDashboard').should('not.be.disabled')
1717
cy.getBySel('mainText').should('exist')
1818
cy.getBySel('publishOff').should('exist')
1919
cy.getBySel('publishOff').should('have.attr', 'href', init_config.domeRegister)
2020
cy.getBySel('vServices').should('exist')
21-
cy.getBySel('vServices').should('have.text', '1 verified services')
21+
cy.getBySel('vServices').invoke('text').then((text) => {
22+
expect(text.trim()).to.eq('1 verified services')
23+
})
2224
cy.getBySel('rPublishers').should('exist')
23-
cy.getBySel('rPublishers').should('have.text', '1 registered providers')
25+
cy.getBySel('rPublishers').invoke('text').then((text) => {
26+
expect(text.trim()).to.eq('1 registered providers')
27+
})
2428
cy.getBySel('nameServices').should('have.length', init_stat.services.length)
2529
cy.getBySel('nameOrgs').should('have.length', init_stat.organizations.length)
2630

2731
})
2832

2933
})
30-

‎cypress/support/constants.ts‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -237,18 +237,20 @@ export const checkHeaderPreLogin = () => {
237237
if ($body.find('[data-cy=publishOffering]').length > 0) cy.getBySel('publishOffering').should('exist')
238238
if ($body.find('[data-cy=browse]').length > 0) cy.getBySel('browse').should('exist')
239239
if ($body.find('[data-cy=about]').length > 0) cy.getBySel('about').should('exist')
240+
if ($body.find('[data-cy=knowledge]').length > 0) {
241+
cy.getBySel('knowledge').should('exist')
242+
cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
243+
}
244+
if ($body.find('[data-cy=darkMode]').length > 0) {
245+
cy.getBySel('darkMode').should('exist')
246+
cy.getBySel('darkMode').click()
247+
cy.getBySel('moonSVG').should('be.hidden')
248+
cy.getBySel('sunSVG').should('not.be.hidden')
249+
cy.getBySel('darkMode').click()
250+
cy.getBySel('sunSVG').should('be.hidden')
251+
cy.getBySel('moonSVG').should('not.be.hidden')
252+
}
240253
})
241-
cy.getBySel('knowledge').should('exist')
242-
cy.getBySel('darkMode').should('exist')
243-
244-
cy.getBySel('darkMode').click()
245-
cy.getBySel('moonSVG').should('be.hidden')
246-
cy.getBySel('sunSVG').should('not.be.hidden')
247-
cy.getBySel('darkMode').click()
248-
cy.getBySel('sunSVG').should('be.hidden')
249-
cy.getBySel('moonSVG').should('not.be.hidden')
250-
251-
cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
252254
};
253255

254256
export const checkHeaderPostLogin = () => {
@@ -259,18 +261,20 @@ export const checkHeaderPostLogin = () => {
259261
if ($body.find('[data-cy=publishOffering]').length > 0) cy.getBySel('publishOffering').should('exist')
260262
if ($body.find('[data-cy=browse]').length > 0) cy.getBySel('browse').should('exist')
261263
if ($body.find('[data-cy=about]').length > 0) cy.getBySel('about').should('exist')
264+
if ($body.find('[data-cy=knowledge]').length > 0) {
265+
cy.getBySel('knowledge').should('exist')
266+
cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
267+
}
268+
if ($body.find('[data-cy=darkMode]').length > 0) {
269+
cy.getBySel('darkMode').should('exist')
270+
cy.getBySel('darkMode').click()
271+
cy.getBySel('moonSVG').should('be.hidden')
272+
cy.getBySel('sunSVG').should('not.be.hidden')
273+
cy.getBySel('darkMode').click()
274+
cy.getBySel('sunSVG').should('be.hidden')
275+
cy.getBySel('moonSVG').should('not.be.hidden')
276+
}
262277
})
263-
cy.getBySel('knowledge').should('exist')
264-
cy.getBySel('darkMode').should('exist')
265-
266-
cy.getBySel('darkMode').click()
267-
cy.getBySel('moonSVG').should('be.hidden')
268-
cy.getBySel('sunSVG').should('not.be.hidden')
269-
cy.getBySel('darkMode').click()
270-
cy.getBySel('sunSVG').should('be.hidden')
271-
cy.getBySel('moonSVG').should('not.be.hidden')
272-
273-
cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
274278
};
275279

276280

‎src/app/app.component.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.app-content {
2+
min-height: calc(100vh - 88px);
3+
min-height: calc(100dvh - 88px);
4+
display: flex;
5+
flex-direction: column;
6+
}
7+
8+
.app-content > main {
9+
flex: 1 0 auto;
10+
}

‎src/app/app.component.html‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
<bae-header class="fixed w-full z-50 top-0 start-0"></bae-header>
1+
<bae-header></bae-header>
22

3-
<main
4-
class="bg-no-repeat bg-right pb-[60px] pt-[75px]"
5-
6-
>
7-
<router-outlet></router-outlet>
8-
</main>
9-
@if (providerThemeName == "DOME") {
10-
<app-chatbot-widget class="relative z-50"></app-chatbot-widget>
11-
}
3+
<div class="app-content">
4+
<main class="bg-no-repeat bg-right">
5+
<router-outlet></router-outlet>
6+
</main>
7+
8+
<bae-footer class="w-full z-30 bottom-0 start-0"></bae-footer>
9+
</div>
1210

13-
<bae-footer class="fixed w-full z-30 bottom-0 start-0"></bae-footer>
11+
@if (providerThemeName === "DOME") {
12+
<app-chatbot-widget class="relative z-50"></app-chatbot-widget>
13+
}
1414

1515
@if(isProduction){
16-
<script type="text/javascript"> _linkedin_partner_id = "8700705"; window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || []; window._linkedin_data_partner_ids.push(_linkedin_partner_id); </script><script type="text/javascript"> (function(l) { if (!l){window.lintrk = function(a,b){window.lintrk.q.push([a,b])}; window.lintrk.q=[]} var s = document.getElementsByTagName("script")[0]; var b = document.createElement("script"); b.type = "text/javascript";b.async = true; b.src = "https://snap.licdn.com/li.lms-analytics/insight.min.js"; s.parentNode.insertBefore(b, s);})(window.lintrk); </script> <noscript> <img height="1" width="1" style="display:none;" alt="" src="https://px.ads.linkedin.com/collect/?pid=8700705&fmt=gif" /> </noscript>
17-
}
16+
<script
17+
type="text/javascript"> _linkedin_partner_id = "8700705"; window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || []; window._linkedin_data_partner_ids.push(_linkedin_partner_id); </script>
18+
<script
19+
type="text/javascript"> (function (l) { if (!l) { window.lintrk = function (a, b) { window.lintrk.q.push([a, b]) }; window.lintrk.q = [] } var s = document.getElementsByTagName("script")[0]; var b = document.createElement("script"); b.type = "text/javascript"; b.async = true; b.src = "https://snap.licdn.com/li.lms-analytics/insight.min.js"; s.parentNode.insertBefore(b, s); })(window.lintrk); </script>
20+
<noscript> <img height="1" width="1" style="display:none;" alt=""
21+
src="https://px.ads.linkedin.com/collect/?pid=8700705&fmt=gif" /> </noscript>
22+
}

0 commit comments

Comments
 (0)