Skip to content

Commit

Permalink
Release v4.0.9 (#331)
Browse files Browse the repository at this point in the history
* Hides error style appropriately

* Fixed lint error

* release

* Removed # from ID

* Fixed bugs with service centre API

* release

* print styles

* build

* Removed outline: 0;

* release

* Adding 'Continue' as button text when empty

* release

* print stylesheet fix on firefox

* Adjusted fancybox z-index

* release

* Changed profile to qld

* Added another API call to search

* release

* updated docs with new header and footer

* Limit the number of related services to 3

* release

* Removed CSS pointer event

* Update components.html

Updated Quick Exit description in line with recent changes.

* Update components.html

Update to accordion desription to include Usage consdiderations (QOL-6152)

* Squizdev (#246)

* Added another API call to search

* release

* Limit the number of related services to 3

* release

* Removed CSS pointer event

Co-authored-by: Arisa Furumoto <[email protected]>

* DC-15515 - Update links on Global Header

* DC-15515 - Updated quick exit to work with new header and footer

* Removed all Rectangle & Oval IDs

* release

* Optimised search code & API calls

* release

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* Removed bold text style on focus

* release

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* Plugin/Preset files are not allowed to export objects, only functions. In /Users/asifamin/WebstormProjects/qg-web-template

* updated babel

* updated package.json file

* QOL-5651 - Fix aggregation page spacing issues

* QOL-5651 - Fix aggregation page spacing issues

* QOL-5651 - Fix aggregation page spacing issues

* FireFox print styles fix

* QOL-6696-replace fs-path in github package.json with alternative

* Changed max-width of breadcrumb

* release

* bold style added for checked checkbox's label

* release

* Quick exit fix with StickyFIll plugin

* Quick exit fix with StickyFIll plugin

* deleted release folder

* deleted release folder

* testing

testing

testing CORS

testing CORS

testing CORS

testing CORS

making feedback form great again

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

DC-16164 Squiz FB component bug fix

testing Mopinions feedback code

updated feedback function

updated feedback function

updated feedback function

* removed thank you page template from SWE and transferred to Submission handler

* removed thank you template and commented code

* update default template link

* submission handler url refinements

* submission handler url refinements

* local maps api

* re-adding back release folder

* Google Maps API integration

* release

* format for geocode lookup

* handling new geocode lookup method

* arcgis suburb lookup client side

* Qol 6741 location and feedback (#249)

* testing

testing

testing CORS

testing CORS

testing CORS

testing CORS

making feedback form great again

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

DC-16164 Squiz FB component bug fix

testing Mopinions feedback code

updated feedback function

updated feedback function

updated feedback function

* removed thank you page template from SWE and transferred to Submission handler

* removed thank you template and commented code

* update default template link

* submission handler url refinements

* submission handler url refinements

* gulp 4 update (#250)

* gulp 4 in swe 4

* added callbacks to terminate gulp task after completion

* babel and webpack latest updates

* added release banner to the updated webpack config

* added Franchise links

* submission handler url refinements

* removing location module for testing SWE4 release

* added initial state to reset radio button

* Added other contact option button link

* QOL-7028 - outline fix

* QOL-7022 feedback form reset

* QOL-7025 - funnelback search fix

* QOL-7025 - funnelback search fix

* QOL-7034 - IE11 - Progressive reveal

* QOL-7034 - IE11 - Progressive reveal

* treatment for processing coordinates based on env

* fix for bootstrap popper megamenu

* QOL-7024-Menu-Overlap-fix

* QOL-7024-Menu-Overlap-fix

* updated gitignore

* Added location module

* Added location module

* Added location module

* Added location module

* Added location module

* Added location module

* Added location module

* added grey callput box

* added grey callput box

* commented in location module for release v4

* release v4 without location module

* updated social sharing module to work on non matrix env

* added grey callput box

* rerun circle ci tests

* added share link import

* added autocomplete.html

* QOL-7042-Google-Address-Autocomplete-theme-addition

* QOL-7042-Google-Address-Autocomplete-theme-addition

* QOL-7042-Google-Address-Autocomplete-theme-addition

* accordion change on hash change

* accordion change on hash change

* added special case for HSC service centres

* added babel transform

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7121 - SWE - Upgrade existing global alert

* QOL-7121 - SWE - Upgrade existing global alert

* updated version number

* QOL-7155-Added links and updated version number

* added container classes for footer feedback and contact us

* added container classes for footer feedback and contact us

* added container classes for footer feedback and contact us

* changed absolute links to relative links

* changed attribute name to reflect the results URL not the results

* autocomplete enhancements

* autocomplete enhancements

* call out button styles changes

* updated gulp git process and NPM package

* updated gulp git process and NPM package

* QOL-7246-Remove-position-sticky (#252)

* QOL-7216 SWE forms script issue

* increment version

* QOL-7216 SWE forms script issue

* incremented the patch version

* Qol 7081 card component additional features (#255)

* QOL-7246-Remove-position-sticky

* QOL-7081 Card component additional features

* QOL-7081 Card component additional features

* QOL-7216 SWE forms script issue

* QOL-7216 SWE forms script issue

* QOL-7216 SWE forms script issue

* removed console log message

* DC-17887 Alert strip style

* QOL-6989 Callout - SWE component

* QOL-7081 - Card component additional features

* removed comments

* cards styles and equal height script

* cards enhancements

* cards enhancements

* cards enhancements

* cards fix for home page and reverted topic index page

* updated test setup or new header and footer

* Qol 7331 reset feedback form.js (#265)

* QOL-7331 - Feedback on reset() function in feedback-form.js

* QOL-7331 - Feedback on reset() function in feedback-form.js

* QOL-7328 Page content is hidden on mobile view

* fixed nested dropdown expand issue

* added gh-pages deployment option for testing changes

* reverted the content hiding

* reverted the content hiding

* updated tests and included header small screen test

* updated circle ci config file

* SWE doc to use prod submission handler link

* form reset not to include hidden field

* updated NPM

* QOL-5711 - Critical "Red" variation of Alert component

* Docs update -> components are now divided with a index page to navigate

* updated date

* QOL-7111 New SWE component: Secondary (outline) button

* QOL-7035 Style changes to "Hint" text and changed to import Boostrap directly

* QOL-7035 Style changes to "Hint" text and changed to import Boostrap directly

* Added footer feedback test

* added test for recaptcha check

* Added a gulp task to create a test branch on web template release for testing

* corrected html

* corrected recaptcha multiple on  a single page (#274)

* corrected recaptcha multiple on  a single page

* corrected recaptcha multiple on  a single page

* corrected recaptcha multiple on  a single page

* corrected recaptcha multiple on  a single page

* corrected recaptcha multiple on  a single page

* QOL-7342 Migrate table styles to SWE (#276)

* updated gulp task to handle external lib plugins (#277)

* DC-15203 Issue and fix for IE print cutting off content

* removed comments

* cleaned radio button code

* updated custom radio button and checkbox js

* Qol 7441 update swe npm build (#275)

* updated NPM release task

* updated NPM release task

* updated NPM release task

* Merge branch 'master' into release-v4.0.4

# Conflicts:
#	e2e/__tests__/components/funnelback-search-test.js
#	e2e/__tests__/funnelback-search-test.js
#	e2e/__tests__/templates.js
#	gulp/gh-pages.js
#	package.json
#	src/docs/components.html

* reverted DC-15203 Needs more investigation

* DC-18815 Franchise print CSS

* Qol 6665 floating images full width (#281)

* Release v4.0.3 (#266)

* added missing style from a merge

* release

* rearranging search controls

* update to tabindex for hidden breadcrumb items

* release

* progress for service centre

* error handling

* release

* service centre data fetching

* service centre data fetching

* release

* jqueryify

* release

* same window link

* release

* proper URL for service centres

* release

* accordion accessibility changes

* other assets transfer task improvments

* get coordinates by address, not suburb

* release

* swapping out FA icons for SVG

* release

* Bug fixes on  mobile view

* release

* Changed max-width of each column

* release

* Adjusted the size based of the footer column width

* release

* Fixed the position of the text in Set your location button

* release

* input colour and limiting suggestions

* QOL-6366 Rollback

* env file Improvements

* Fixes for accessibility issues

* release

* accordion improvements

* Fixed animation on the button

* accordion improvements

* release

* Added hover state for the Set your location button

* release

* scoping as qg-global-breadcrumb

* release

* Added an ability to navigate with arrowkeys

* fixfor global breadcrumb

* release

* release

* Wait for the results to load

* release

* z-index to show the outline

* Added underline on hover & focus

* Added color to the inner span

* Tab to avoid dropdown elements

* release

* added a GIT task to create a test branch which can be easily synched to Squiz for testing the changes

* Autocomplete arrow key navigation

* Hides error style appropriately

* Fixed lint error

* release

* Removed # from ID

* Fixed bugs with service centre API

* release

* print styles

* build

* Removed outline: 0;

* release

* Adding 'Continue' as button text when empty

* release

* print stylesheet fix on firefox

* Adjusted fancybox z-index

* release

* Changed profile to qld

* Added another API call to search

* release

* updated docs with new header and footer

* Limit the number of related services to 3

* release

* Removed CSS pointer event

* Update components.html

Updated Quick Exit description in line with recent changes.

* Update components.html

Update to accordion desription to include Usage consdiderations (QOL-6152)

* Squizdev (#246)

* Added another API call to search

* release

* Limit the number of related services to 3

* release

* Removed CSS pointer event

Co-authored-by: Arisa Furumoto <[email protected]>

* DC-15515 - Update links on Global Header

* DC-15515 - Updated quick exit to work with new header and footer

* Removed all Rectangle & Oval IDs

* release

* Optimised search code & API calls

* release

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* Removed bold text style on focus

* release

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* DC-15515 - Updated links

* Plugin/Preset files are not allowed to export objects, only functions. In /Users/asifamin/WebstormProjects/qg-web-template

* updated babel

* updated package.json file

* QOL-5651 - Fix aggregation page spacing issues

* QOL-5651 - Fix aggregation page spacing issues

* QOL-5651 - Fix aggregation page spacing issues

* FireFox print styles fix

* QOL-6696-replace fs-path in github package.json with alternative

* Changed max-width of breadcrumb

* release

* bold style added for checked checkbox's label

* release

* Quick exit fix with StickyFIll plugin

* Quick exit fix with StickyFIll plugin

* deleted release folder

* deleted release folder

* testing

testing

testing CORS

testing CORS

testing CORS

testing CORS

making feedback form great again

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

DC-16164 Squiz FB component bug fix

testing Mopinions feedback code

updated feedback function

updated feedback function

updated feedback function

* removed thank you page template from SWE and transferred to Submission handler

* removed thank you template and commented code

* update default template link

* submission handler url refinements

* submission handler url refinements

* local maps api

* re-adding back release folder

* Google Maps API integration

* release

* format for geocode lookup

* handling new geocode lookup method

* arcgis suburb lookup client side

* Qol 6741 location and feedback (#249)

* testing

testing

testing CORS

testing CORS

testing CORS

testing CORS

making feedback form great again

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

replaced yarn with npm

DC-16164 Squiz FB component bug fix

testing Mopinions feedback code

updated feedback function

updated feedback function

updated feedback function

* removed thank you page template from SWE and transferred to Submission handler

* removed thank you template and commented code

* update default template link

* submission handler url refinements

* submission handler url refinements

* gulp 4 update (#250)

* gulp 4 in swe 4

* added callbacks to terminate gulp task after completion

* babel and webpack latest updates

* added release banner to the updated webpack config

* added Franchise links

* submission handler url refinements

* removing location module for testing SWE4 release

* added initial state to reset radio button

* Added other contact option button link

* QOL-7028 - outline fix

* QOL-7022 feedback form reset

* QOL-7025 - funnelback search fix

* QOL-7025 - funnelback search fix

* QOL-7034 - IE11 - Progressive reveal

* QOL-7034 - IE11 - Progressive reveal

* treatment for processing coordinates based on env

* fix for bootstrap popper megamenu

* QOL-7024-Menu-Overlap-fix

* QOL-7024-Menu-Overlap-fix

* updated gitignore

* Added location module

* Added location module

* Added location module

* Added location module

* Added location module

* Added location module

* Added location module

* added grey callput box

* added grey callput box

* commented in location module for release v4

* release v4 without location module

* updated social sharing module to work on non matrix env

* added grey callput box

* rerun circle ci tests

* added share link import

* added autocomplete.html

* QOL-7042-Google-Address-Autocomplete-theme-addition

* QOL-7042-Google-Address-Autocomplete-theme-addition

* QOL-7042-Google-Address-Autocomplete-theme-addition

* accordion change on hash change

* accordion change on hash change

* added special case for HSC service centres

* added babel transform

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7043-Themed checkboxes & radio buttons: Optional image

* QOL-7121 - SWE - Upgrade existing global alert

* QOL-7121 - SWE - Upgrade existing global alert

* updated version number

* QOL-7155-Added links and updated version number

* added container classes for footer feedback and contact us

* added container classes for footer feedback and contact us

* added container classes for footer feedback and contact us

* changed absolute links to relative links

* changed attribute name to reflect the results URL not the results

* autocomplete enhancements

* autocomplete enhancements

* call out button styles changes

* updated gulp git process and NPM package

* updated gulp git process and NPM package

* QOL-7246-Remove-position-sticky (#252)

* QOL-7216 SWE forms script issue

* increment version

* QOL-7216 SWE forms script issue

* incremented the patch version

* Qol 7081 card component additional features (#255)

* QOL-7246-Remove-position-sticky

* QOL-7081 Card component additional features

* QOL-7081 Card component additional features

* QOL-7216 SWE forms script issue

* QOL-7216 SWE forms script issue

* QOL-7216 SWE forms script issue

* removed console log message

* DC-17887 Alert strip style

* QOL-6989 Callout - SWE component

* QOL-7081 - Card component additional features

* removed comments

* cards styles and equal height script

* cards enhancements

* cards enhancements

* cards enhancements

* cards fix for home page and reverted topic index page

* updated test setup or new header and footer

* Qol 7331 reset feedback form.js (#265)

* QOL-7331 - Feedback on reset() function in feedback-form.js

* QOL-7331 - Feedback on reset() function in feedback-form.js

* QOL-7328 Page content is hidden on mobile view

* fixed nested dropdown expand issue

* added gh-pages deployment option for testing changes

* reverted the content hiding

* reverted the content hiding

* updated tests and included header small screen test

* updated circle ci config file

* DC-18495-reset-not-to-include-hidden-fields

* merge with master

* updated NPM

Co-authored-by: Oliver Neal <[email protected]>
Co-authored-by: AsifAmin <[email protected]>
Co-authored-by: Arisa Furumoto <[email protected]>
Co-authored-by: Mitchell Anderson <[email protected]>
Co-authored-by: jackie-QLD <[email protected]>

* print styles for guide pages and including release folder for Matrix testing

* global location included dynamically

* removing logging

* QOL-7412 New SWE component: Clickable cards

* QOL-7412 New SWE component: Clickable cards

* deleted release folder

* Added thumbnail image styles in cards

* changed key to original transport key

Co-authored-by: Oliver Neal <[email protected]>
Co-authored-by: AsifAmin <[email protected]>
Co-authored-by: Arisa Furumoto <[email protected]>
Co-authored-by: Mitchell Anderson <[email protected]>
Co-authored-by: jackie-QLD <[email protected]>

* removed duplicate test files

* Transferred remaining tables style from Matrix Assets

* modified gulp task to remove map file from external lib files

* Merged Jackie's cards content changes

* Scrollable table fix

* Print styles enhancements

* Updated print styles

* Cut In Image Style enhacement

* removed temp pages

* added callback to indicate task finish in git clone function

* Feedback and Cards update

* Cards Enhancements

* load fancybox on any 'cut-in' class

* updated SWE version number

* QOL-7538-Full-width-hero-image-on-Aggregation-page

* Updated URL for quick exit

* Updated Quick exit test

* Qol 7538 full width aggregation page (#285)

* updated SWE version number

* QOL-7538-Full-width-hero-image-on-Aggregation-page

* layout fix

* theme updates

* styling updates

* Transferred Franchise specific keys to the Matrix Assets folder.

* QOL-7546-Section-navigation-enhancements

* QOL-7546-Section-navigation-enhancements

* Section Nav enhancements

* Section Nav Enhancements

* Reverted changes for the Google Keys placement.

* Fixed a bug Bootstrap collapse is colliding with Single page application url.

* Fixed a bug Bootstrap collapse is colliding with Single page application url.

* QOL-7485-Services-list-page-on-qld

* Updated Step nav to work with qg-section-nav class

* Updated hashTrigger function

* Updated Quick exit test

Co-authored-by: reactnodeaws3 <[email protected]>
Co-authored-by: reactnodeaws3 <[email protected]>

* Added Header and Footer templates without location. (#286)

* styles update in section nav

* added comments

* added comments

* Qol 7818 accordion enhancements (#289)

* QOL-7763 SWE4: Bug: Recaptcha should not be enabled on all pages until a form requests it

* QOL-7818 accordion enhacements

* Added comments for feedback form

* Added comments

* QOL-7082-Inpage-Nav-Component (#292)

* Accordion Doc updates

* QOL-7417 Featured services: Colour contrast issue for hyperlinks

* DC-19850-Google Analytics set-up for Accordion

* DC-19850-Google Analytics set-up for Accordion

* added comments and other code improvements (#294)

* added comments and other code improvements

* added comments and other code improvements

* updated Read Me

* Es6 enhancements (#295)

* Updated to ES6 class and added commenst

* fixed eslint error

* accordion focus fix

* removed sample meta title

* added guide page check and added comments

* Added tables doc page

* QOL-7592-Search results page model

* QOL-7592-updated fade time

* QOL-7592-updated fade time

* removed console.log

* fixed function Parentheses (#320)

* fixed function Parentheses

* updated jest and puppeteer plugin and updated a deprecated function

* updated host name

* updated wait time for a click

* removed python image

* added waitForSelector selector

* added waitForSelector selector

* CHG-9413-Housing - Reside & Outage form not working (Hotfix on release v4.0.7)

* updated footer feedback test timeout

* Qol 8010 new promotional banner component to aggregation page (#325)

* search page model

* removed console logs

* QOL-7592_Search_results_page_model_SWE

* QOL-7592_Search_results_page_model_styles-enhancement

* QOL-7592_test-updates

* QOL-7592_corrected-config

* QOL-7592_updated-waitfor

* QOL-7592_updated-waitfor

* updated jest and puppeteer packages

* Qol 7592 search results page model swe] (#315)

* search page model

* removed console logs

* QOL-7592_Search_results_page_model_SWE

* QOL-7592_Search_results_page_model_styles-enhancement

* QOL-7592_test-updates

* QOL-7592_corrected-config

* QOL-7592_updated-waitfor

* QOL-7592_updated-waitfor

* updated jest and puppeteer packages

* Directory structure improvements and qg prefix for all the files

* spacing improvement if container contains one element

* formatted eslint

* formatted eslint

* Added service finder page

* upgraded to es6 code style and added comments

* updated version

* blurb section updates

* updated readme to include NPM scripts descriptions

* updated readme to include NPM scripts descriptions

* updated readme to include NPM scripts descriptions

* updated version

* common template for contact us section (#326)

* display close icon if value is present

* styles fix for Search Page model (#327)

* transferred to service finder specific file as this is only related with service finder

* transferred to service finder specific file as this is only related with service finder

* for backward compatibility with ID qg-global-search-form and qg-search-query and no class attribute

* corrected example content

* corrected example content

* corrected example content

Co-authored-by: Arisa Furumoto <[email protected]>
Co-authored-by: Oliver Neal <[email protected]>
Co-authored-by: jackie-QLD <[email protected]>
Co-authored-by: AsifAmin <[email protected]>
Co-authored-by: Mitchell Anderson <[email protected]>
Co-authored-by: Asif Amin <[email protected]>
Co-authored-by: reactnodeaws3 <[email protected]>
Co-authored-by: reactnodeaws3 <[email protected]>
  • Loading branch information
9 people authored Aug 18, 2021
1 parent e306ecf commit c644bec
Show file tree
Hide file tree
Showing 57 changed files with 3,572 additions and 516 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ jobs:
build:
docker:
- image: circleci/node:10.16.0
- image: circleci/python:3.7-stretch

working_directory: ~/repo

Expand Down
2 changes: 1 addition & 1 deletion e2e/__tests__/components/carousel-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('SWE Components testing', () => {
const carItem1 = await page.evaluate("document.querySelectorAll('.carousel-item')[0].getAttribute('class')");
expect(carItem1).toMatch(/active/);
await page.click('.right.carousel-control');
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
expect(await page.evaluate("document.querySelectorAll('.carousel-item')[1].getAttribute('class')")).toMatch(/active/);
}, ct.TO);

Expand Down
4 changes: 2 additions & 2 deletions e2e/__tests__/components/funnelback-search-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ describe('SWE Header testing', () => {
test('Funnelback search is working as expected', async () => {
expect(await page.evaluate('window.getComputedStyle(document.querySelector(\'.qg-search-concierge-initial\')).getPropertyValue("visibility")')).toBe('hidden');
await page.click('input#qg-search-query');
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
expect(await page.evaluate('window.getComputedStyle(document.querySelector(\'.qg-search-concierge-initial\')).getPropertyValue("visibility")')).toBe('visible');
await page.type('#qg-search-query', 'jobs', { delay: 20 });
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
const element = await page.$('.qg-search-concierge-content li button');
const text = await page.evaluate(element => element.textContent, element);
expect(text).toMatch(/jobs/);
Expand Down
4 changes: 2 additions & 2 deletions e2e/__tests__/components/quick-exit-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ describe('SWE Components testing', () => {
expect(await page.evaluate('window.getComputedStyle(document.querySelector(\'.qg-tooltip__wrapper\')).getPropertyValue("display")')).not.toBe('none');
// 3. -> 'tips to browse safely' navigating to the correct link
await page.click('.qg-quick-exit__tip-link');
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
expect(await page.evaluate(() => location.href)).toBe('https://www.qld.gov.au/help/tips-to-browse-safely-online');
await page.goBack();
// 4. -> 'close this site' is working as expected and browser back is not taking to the same page
await page.click('.qg-quick-exit__button');
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
expect(await page.evaluate(() => location.href)).toBe('https://www.google.com.au/');
await page.goBack();
expect(await page.evaluate(() => location.href)).not.toBe(`${ct.APP_URL}/docs/quick-exit.html`);
Expand Down
10 changes: 6 additions & 4 deletions e2e/__tests__/layout/footer-feedback-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,22 @@ describe('SWE Footer testing', () => {
test('Footer feedback', async () => {
await page.click('.qg-feedback-toggle');
// check getRecaptcha input value is populated as expected and is false by default
await page.waitForTimeout(ct.WT);
const getRecaptcha = await page.$eval('input[name=g-recaptcha-response]', el => $(el).val());
expect(getRecaptcha).toMatch(/false/);
await page.click('#page-feedback-about-this-website');
await page.click('#fs-very-satisfied');
await page.type('#comments', 'Useful website', { delay: 20 });
await page.click('#feedback-page .btn-global-primary');
await page.waitFor(ct.WT);
// check getRecaptcha input value changed
expect(await page.$eval('input[name=g-recaptcha-response]', el => $(el).val())).not.toMatch(/false/);
await page.waitForTimeout(ct.WT);
await page.waitForSelector('.thankyou p');
const element = await page.$('.thankyou');
const text = await page.evaluate(element => element.textContent, element);
expect(text).toMatch(/Thank you for your feedback. Your feedback is important to us and will be used to improve the website./);
// check getRecaptcha input value changed
expect(await page.$eval('input[name=g-recaptcha-response]', el => $(el).val())).not.toMatch(/false/);
await page.click('#qg-primary-content li a');
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
// check franchise input value is populated as expected
const franchiseVal = await page.$eval('input[name=franchise]', el => $(el).val());
expect(franchiseVal).toMatch(/Franchise Title/);
Expand Down
6 changes: 3 additions & 3 deletions e2e/__tests__/layout/header-sm-screen-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ describe('Header on small screen devices', () => {
// main menu
expect(await page.evaluate("document.querySelector('#qg-site-nav').getAttribute('class')")).not.toMatch(/collapse show/);
(await page.$('#qg-show-menu')).click();
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
expect(await page.evaluate("document.querySelector('#qg-site-nav').getAttribute('class')")).toMatch(/collapse show/);

// nested menu
expect(await page.evaluate("document.querySelector('.mega-menu').getAttribute('class')")).not.toMatch(/dropdown-menu mega-menu show/);
(await page.$('#qgPrimaryNavForQueenslanders')).click();
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
expect(await page.evaluate("document.querySelector('.mega-menu').getAttribute('class')")).toMatch(/dropdown-menu mega-menu show/);
}, ct.TO);

test('Should display the search on clicking search icon', async () => {
expect(await page.evaluate("document.querySelector('#qg-global-search-form').getAttribute('class')")).not.toMatch(/qg-search-form qg-global-web-autocomplete collapse/);
(await page.$('#qg-show-search')).click();
await page.waitFor(ct.WT);
await page.waitForTimeout(ct.WT);
expect(await page.evaluate("document.querySelector('#qg-global-search-form').getAttribute('class')")).toMatch(/qg-search-form qg-global-web-autocomplete collapse/);
}, ct.TO);

Expand Down
2 changes: 1 addition & 1 deletion gulp/build-tasks/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = function (gulp, plugins, connect, connectssi, argv, path, rando
root: subpath ? `${root}/${subpath}` : `${root}`,
port: port || argv.port || 8086,
livereload: true,
host: '0.0.0.0',
host: 'localhost',
middleware: function () {
return [connectssi({
baseDir: root,
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "Queensland-Government-Web-Template",
"version": "4.0.7",
"subVersion": "4.0.7",
"wt-version": "4.0.7",
"version": "4.0.9",
"subVersion": "4.0.9",
"wt-version": "4.0.9",
"description": "This template is designed to provide a template for all Franchise websites, and the underpinning technology for new Agency websites.",
"main": "gulpfile.babel.js",
"repository": {
Expand Down Expand Up @@ -87,13 +87,13 @@
"html-loader": "^0.5.1",
"html-webpack-plugin": "^2.28.0",
"image-webpack-loader": "^3.3.1",
"jest": "^24.9.0",
"jest": "^27.0.4",
"jest-puppeteer": "^4.4.0",
"json-loader": "^0.5.7",
"node-sass": "^4.12.0",
"node-ssi": "^0.3.2",
"np": "^6.5.0",
"puppeteer": "^1.20.0",
"puppeteer": "^10.0.0",
"regenerator-runtime": "^0.13.5",
"replace-in-file": "^6.1.0",
"run-sequence": "^1.1.5",
Expand Down
15 changes: 13 additions & 2 deletions readme/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,19 @@ Install all the node packages (If behind a corporate web proxy please have a loo
```bash
npm install or yarn install
```

## 3. Testing Setup
## 3. NPM Scripts descriptions
| Name | Description |
| ------------- | ------------- |
| npm **start** | Starts a local server and watch for changes
| npm run **release** | Create a release folder with all the minified files and templates |
| npm run **publish-npm** | Publish the release folder on NPM package manager. (npm repo link https://github.com/qld-gov-au/web-template-release) |
| npm run **publish-cdn** | Publish the release folder on Static CDN |
| npm run **create-swe-release** | Create a Github release on this (qg-web-template) repository |
| npm run **publish-test-npm** | Creates a branch release-vX.Y.Z-test on web-template-release repo (https://github.com/qld-gov-au/web-template-release) which can be deployed on Matrix for testing |
| npm run **publish-test-cdn** | Creates a branch release-vX.Y.Z-test on static CDN repository which can be deployed on TEST environment of applications using Bamboo for testing
| npm **test** | Run tests (Jest and Puppeteer)

## 4. Testing Setup

**To start a local server**
```bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
$accordion_v2: $('.qg-accordion-v2'),
$accHeading: $('.acc-heading'),
},

/**
* Initialise qgAccordion
* @return {undefined}
Expand All @@ -29,22 +30,25 @@
this.legacyAccordion();
}
},

urlHash: function (){
return decodeURI(window.location.hash.replace(/\/|#|{|}|\+|\\/g, ''));
},

/**
* hashTrigger function open matching accordion if it finds #title-Of-Accordion in the url
* @return {undefined}
**/
// TODO check hashTrigger function looks like not working
hashTrigger: function (){
let hashVal = this.urlHash();
if (hashVal.length > 0) {
let findHashVal = this.config.$accordion.find('#' + hashVal + '');
console.log(findHashVal);
findHashVal.click();
findHashVal.parent('article').find('.acc-heading').focus();
}
},

toggleOpenCloseClass: function(curr){
if (curr.hasClass('qg-accordion--open')){
curr.removeClass('qg-accordion--open').addClass('qg-accordion--closed');
Expand All @@ -54,6 +58,7 @@
curr.attr('aria-expanded', 'true');
}
},

/**
* accordionClick -> click on an accordion
* @return {undefined}
Expand All @@ -65,6 +70,7 @@
self.toggleOpenCloseClass($(this));
});
},

/**
* keyboardAccessibility -> accordion to work with keyboard
* @param {string} event -> click , keypress etc
Expand All @@ -82,6 +88,7 @@
return false;
}
},

/**
* collapseAll -> collapse all accordion on a page
* @return {undefined}
Expand All @@ -99,6 +106,7 @@
}
});
},

/**
* expandAll -> expand all accordion on a page
* @return {undefined}
Expand All @@ -116,6 +124,7 @@
}
});
},

/**
* gaTracking -> enable tracking on accordion, this function adds an attribute 'data-analytics-link-group' with a acc title
* @return {undefined}
Expand All @@ -126,6 +135,7 @@
$(this).attr('data-analytics-link-group', title);
});
},

/**
* legacyAccordion function supports swe2 accordion in use at some places
* @return {undefined}
Expand All @@ -146,6 +156,7 @@
}
}
});

// focus heading on click
$('input[name=tabs]').click(function () {
$(this).parent('article').find('.acc-heading').focus();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
.alert {
position: relative;
color: #000;

& > :first-child{
margin-bottom:0;
}
& > :nth-child(2){
margin-top: 0.75rem;
}
h2 {
margin-top: 5px;
font-size: 1.2em;
}

&.alert-danger {
color: #000000;
border: none;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.qg-promotional-banner__container{
background: #f6f6f6;
margin-top: 2rem;
margin-bottom: 2rem;
padding: 2rem 0;
.qg-promotional-banner__info{
@include media-breakpoint-down(sm) {
margin-bottom: 3rem;
}
}
.qg-promotional-banner__popular-apps {
.qg-promotional-banner__popular-apps-title{
font-weight: bold;
}
}
}
9 changes: 4 additions & 5 deletions src/assets/_project/_blocks/components/forms/qg-recaptcha.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Any form with form attribute data-recaptcha="true", will run and validate with Google invisible recaptcha
*/
import keys from '../../data/qg-google-keys';

(function ($, swe) {
'use strict';
var qgRecaptcha = {
Expand Down Expand Up @@ -138,7 +137,7 @@ import keys from '../../data/qg-google-keys';
// Recaptcha version 2
v2Captcha: function (form, subBtn, key){
try {
//console.log('v2 key: ' + key);
// console.log('v2 key: ' + key);
grecaptcha.render(subBtn, {
sitekey: key,
callback: () => {
Expand All @@ -163,7 +162,7 @@ import keys from '../../data/qg-google-keys';
},
// Recaptcha version 3
v3Captcha: function (form, greptcha, key, action){
//console.log('v3 key: ' + key);
// console.log('v3 key: ' + key);
try {
grecaptcha.execute(key, {action: action})
.then(function (token) {
Expand Down Expand Up @@ -211,11 +210,11 @@ import keys from '../../data/qg-google-keys';
if (manualSitekey !== undefined && manualAction !== undefined) { //v3 manual form
self.v3Captcha(form, greptcha, manualSitekey, manualAction);
} else if (manualAction !== undefined) { //v3 manual with feedback key but differnt action
self.v3Captcha(form, greptcha, self.footerFeedbackGoogleRecaptchaApiKey, manualAction);
self.v3Captcha(form, greptcha, self.footerFeedbackGoogleRecaptchaApiKey(), manualAction);
} else if (manualSitekey !== undefined) { //v2 manual (no action in v2)
self.v2Captcha(form, subBtn, manualSitekey);
} else { //default v2 with default key
self.v2Captcha(form, subBtn, self.googleRecaptchaApiKey);
self.v2Captcha(form, subBtn, self.googleRecaptchaApiKey());
}
});
loadedRecaptcha = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,18 @@
> :first-child {
padding-top: 0;
margin-top: 0;
margin-bottom: 0;
}
> :nth-child(2) {
margin-top: 0.75rem;
}

a {
color: #FFFFFF;

&:hover, &:active, &:focus, &:visited {
color: #FFFFFF !important;
text-decoration: none !important;
text-decoration: none !important;
}

&.btn {
Expand Down
52 changes: 0 additions & 52 deletions src/assets/_project/_blocks/components/opengraph/opengraph.js

This file was deleted.

Loading

0 comments on commit c644bec

Please sign in to comment.