Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
78 changes: 78 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"editor.defaultFormatter": "vscode.typescript-language-features",
"editor.formatOnSave": true,
"editor.formatOnPaste": false,
"editor.formatOnType": false,
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features",
"editor.formatOnSave": true
},
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features",
"editor.formatOnSave": true
},
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features",
"editor.formatOnSave": true
},
"[css]": {
"editor.defaultFormatter": "vscode.css-language-features",
"editor.formatOnSave": true
},
"[scss]": {
"editor.defaultFormatter": "vscode.css-language-features",
"editor.formatOnSave": true
},
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
},
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.validate.enable": true,
"typescript.updateImportsOnFileMove.enabled": "always",
"typescript.preferences.importModuleSpecifier": "relative",
"typescript.preferences.importModuleSpecifierEnding": "auto",
"typescript.preferences.quoteStyle": "single",
"typescript.suggest.autoImports": true,
"typescript.suggest.completeFunctionCalls": true,
"editor.inlineSuggest.enabled": true,
"editor.parameterHints.enabled": true,
"editor.suggestSelection": "first",
"editor.tabCompletion": "on",
"angular.enable-strict-mode-prompt": false,
"angular.trace.server": "off",
"editor.tabSize": 2,
"editor.insertSpaces": true,
"editor.detectIndentation": false,
"files.eol": "\n",
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"editor.wordWrap": "on",
"editor.minimap.enabled": false,
"editor.renderWhitespace": "selection",
"editor.bracketPairColorization.enabled": true,
"editor.guides.bracketPairs": true,
"files.exclude": {
"**/.angular/**": true,
"**/.cache/**": true,
"**/dist/**": true,
"**/coverage/**": true,
"**/.DS_Store": true
},
"git.autofetch": true,
"git.confirmSync": false,
"explorer.compactFolders": false,
"workbench.startupEditor": "none"
}
11 changes: 7 additions & 4 deletions cypress/e2e/dashboard.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@ describe('/dashboard',{

it('should have all required elements in dashboard', ()=>{
checkHeaderPreLogin()
cy.getBySel('browseServices').should('not.be.disabled')
cy.getBySel('browseServicesDashboard').should('not.be.disabled')
cy.getBySel('mainText').should('exist')
cy.getBySel('publishOff').should('exist')
cy.getBySel('publishOff').should('have.attr', 'href', init_config.domeRegister)
cy.getBySel('vServices').should('exist')
cy.getBySel('vServices').should('have.text', '1 verified services')
cy.getBySel('vServices').invoke('text').then((text) => {
expect(text.trim()).to.eq('1 verified services')
})
cy.getBySel('rPublishers').should('exist')
cy.getBySel('rPublishers').should('have.text', '1 registered providers')
cy.getBySel('rPublishers').invoke('text').then((text) => {
expect(text.trim()).to.eq('1 registered providers')
})
cy.getBySel('nameServices').should('have.length', init_stat.services.length)
cy.getBySel('nameOrgs').should('have.length', init_stat.organizations.length)

})

})

48 changes: 26 additions & 22 deletions cypress/support/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,18 +237,20 @@ export const checkHeaderPreLogin = () => {
if ($body.find('[data-cy=publishOffering]').length > 0) cy.getBySel('publishOffering').should('exist')
if ($body.find('[data-cy=browse]').length > 0) cy.getBySel('browse').should('exist')
if ($body.find('[data-cy=about]').length > 0) cy.getBySel('about').should('exist')
if ($body.find('[data-cy=knowledge]').length > 0) {
cy.getBySel('knowledge').should('exist')
cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
}
if ($body.find('[data-cy=darkMode]').length > 0) {
cy.getBySel('darkMode').should('exist')
cy.getBySel('darkMode').click()
cy.getBySel('moonSVG').should('be.hidden')
cy.getBySel('sunSVG').should('not.be.hidden')
cy.getBySel('darkMode').click()
cy.getBySel('sunSVG').should('be.hidden')
cy.getBySel('moonSVG').should('not.be.hidden')
}
})
cy.getBySel('knowledge').should('exist')
cy.getBySel('darkMode').should('exist')

cy.getBySel('darkMode').click()
cy.getBySel('moonSVG').should('be.hidden')
cy.getBySel('sunSVG').should('not.be.hidden')
cy.getBySel('darkMode').click()
cy.getBySel('sunSVG').should('be.hidden')
cy.getBySel('moonSVG').should('not.be.hidden')

cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
};

export const checkHeaderPostLogin = () => {
Expand All @@ -259,18 +261,20 @@ export const checkHeaderPostLogin = () => {
if ($body.find('[data-cy=publishOffering]').length > 0) cy.getBySel('publishOffering').should('exist')
if ($body.find('[data-cy=browse]').length > 0) cy.getBySel('browse').should('exist')
if ($body.find('[data-cy=about]').length > 0) cy.getBySel('about').should('exist')
if ($body.find('[data-cy=knowledge]').length > 0) {
cy.getBySel('knowledge').should('exist')
cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
}
if ($body.find('[data-cy=darkMode]').length > 0) {
cy.getBySel('darkMode').should('exist')
cy.getBySel('darkMode').click()
cy.getBySel('moonSVG').should('be.hidden')
cy.getBySel('sunSVG').should('not.be.hidden')
cy.getBySel('darkMode').click()
cy.getBySel('sunSVG').should('be.hidden')
cy.getBySel('moonSVG').should('not.be.hidden')
}
})
cy.getBySel('knowledge').should('exist')
cy.getBySel('darkMode').should('exist')

cy.getBySel('darkMode').click()
cy.getBySel('moonSVG').should('be.hidden')
cy.getBySel('sunSVG').should('not.be.hidden')
cy.getBySel('darkMode').click()
cy.getBySel('sunSVG').should('be.hidden')
cy.getBySel('moonSVG').should('not.be.hidden')

cy.getBySel('knowledge').should('have.attr', 'href', init_config.knowledgeBaseUrl)
};


Expand Down
10 changes: 10 additions & 0 deletions src/app/app.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.app-content {
min-height: calc(100vh - 88px);
min-height: calc(100dvh - 88px);
display: flex;
flex-direction: column;
}

.app-content > main {
flex: 1 0 auto;
}
31 changes: 18 additions & 13 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
<bae-header class="fixed w-full z-50 top-0 start-0"></bae-header>
<bae-header></bae-header>

<main
class="bg-no-repeat bg-right pb-[60px] pt-[75px]"

>
<router-outlet></router-outlet>
</main>
@if (providerThemeName == "DOME") {
<app-chatbot-widget class="relative z-50"></app-chatbot-widget>
}
<div class="app-content">
<main class="bg-no-repeat bg-right">
<router-outlet></router-outlet>
</main>

<bae-footer class="w-full z-30 bottom-0 start-0"></bae-footer>
</div>

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

@if(isProduction){
<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>
}
<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>
}
Loading
Loading