Skip to content

Commit

Permalink
Merge branch 'develop' into feature/tide-search-events
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/ripple-tide-search/components/TideSearchPage.vue
  • Loading branch information
David Featherston committed Aug 7, 2023
2 parents 5db04e1 + ab448e6 commit 4a58eb4
Show file tree
Hide file tree
Showing 49 changed files with 1,833 additions and 744 deletions.
4 changes: 4 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"root": true,
"extends": ["@dpc-sdp/eslint-config-ripple"]
}
37 changes: 0 additions & 37 deletions .eslintrc.js

This file was deleted.

8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
**/node_modules
**/dist
**/public
**/src/assets
**/src/styles/_vars.css
**/.storybook/storybook.css
**/storybook-static
**/stories/components/**/*.vue
3 changes: 3 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": ["@dpc-sdp/stylelint-config-ripple"]
}
7 changes: 7 additions & 0 deletions docs/.stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": ["@dpc-sdp/stylelint-config-ripple"],
"rules": {
"selector-class-pattern": ".+",
"custom-property-pattern": ".+"
}
}
1 change: 1 addition & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"dependencies": {
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@dpc-sdp/ripple-ui-forms": "workspace:*",
"@dpc-sdp/stylelint-config-ripple": "workspace:*",
"@modyfi/vite-plugin-yaml": "^1.0.4",
"highlight.js": "^11.7.0",
"iframe-resizer": "^4.3.6"
Expand Down
8 changes: 8 additions & 0 deletions examples/nuxt-app/mock-routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@
"path": "/image-banner",
"fixture": "landingpage/image-banner.json"
},
{
"path": "/arabic-page",
"fixture": "landingpage/languages-ar.json"
},
{
"path": "/korean-page",
"fixture": "landingpage/languages-ko.json"
},
{
"path": "/grants",
"fixture": "search-listing/grants/page.json"
Expand Down
18 changes: 18 additions & 0 deletions examples/nuxt-app/test/features/landingpage/languages.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Feature: Languages

Background:
Given the endpoint "/api/tide/site" with query "?id=8888" returns fixture "/site/reference" with status 200

@mockserver
Scenario: RTL languages load with the correct font and direction
Given the endpoint "/api/tide/page" with query "?path=/arabic-page&site=8888" returns fixture "/landingpage/languages-ar" with status 200
When I visit the page "/arabic-page"
Then The section ".rpl-header" should be display "rtl" in "ar" with the font "Noto Kufi Arabic"
And The section "#rpl-main" should be display "rtl" in "ar" with the font "Noto Kufi Arabic"

@mockserver
Scenario: LTR languages load with the correct font and direction
Given the endpoint "/api/tide/page" with query "?path=/korean-page&site=8888" returns fixture "/landingpage/languages-ko" with status 200
When I visit the page "/korean-page"
Then The section ".rpl-header" should be display "ltr" in "ko" with the font "Noto Sans KR"
And The section "#rpl-main" should be display "ltr" in "ko" with the font "Noto Sans KR"
57 changes: 57 additions & 0 deletions examples/nuxt-app/test/fixtures/landingpage/languages-ar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"title": "Demo Landing Page",
"changed": "2022-11-02T12:47:29+11:00",
"created": "2022-11-02T12:47:29+11:00",
"type": "landing_page",
"department": "Department of Premier and Cabinet",
"nid": "91dede11-10c0-111e1-1100-000000000339",
"summary": "مزايا رياض الأطفال",
"background": "default",
"header": {
"title": "مزايا رياض الأطفال",
"summary": "كيف تساعد خدمة رياض الأطفال المجانية كل طفل في ولاية فيكتوريا على الحصول على أفضل بداية في الحياة"
},
"bodyComponents": [
{
"uuid": "a99aa287-7fac-430b-864e-3a1b044460b1",
"component": "TideLandingPageContent",
"id": "969",
"internalAnchors": [
{
"text": "مزايا رياض الأطفال",
"id": "content-anchor-1",
"type": "h2"
},
{
"text": "في الحياة",
"id": "content-anchor-2",
"type": "h3"
}
],
"props": {
"html": "<p>المجانية كل طفل في ولاية فيكتوريا على الحصول على أفضل بداية في الحياة</p>"
}
}
],
"meta": {
"url": "/department-landing-page",
"langcode": "ar",
"description": "مزايا رياض الأطفال",
"additional": [
{
"tag": "link",
"attributes": {
"rel": "canonical",
"href": "https://develop.content.vic.gov.au/department-landing-page"
}
},
{
"tag": "meta",
"attributes": {
"name": "title",
"content": "مزايا رياض الأطفال | Single Digital Presence Content Management System"
}
}
]
}
}
64 changes: 64 additions & 0 deletions examples/nuxt-app/test/fixtures/landingpage/languages-ko.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"title": "Demo Landing Page",
"changed": "2022-11-02T12:47:29+11:00",
"created": "2022-11-02T12:47:29+11:00",
"type": "landing_page",
"department": "Department of Premier and Cabinet",
"nid": "91dede11-10c0-111e1-1100-000000000339",
"summary": "지역 사회 서비스, 계약업체 청소 및 경비 산업의 빅토리아주",
"background": "default",
"header": {
"title": "지역 사회 서비스, 계약업체 청소 및 경비 산업의 빅토리아주",
"summary": "같은 고용주를 위해 장기간 근무한 근로자는 추가적인 휴가를 받을 수 있습니다."
},
"bodyComponents": [
{
"uuid": "a99aa287-7fac-430b-864e-3a1b044460b1",
"component": "TideLandingPageContent",
"id": "969",
"internalAnchors": [
{
"text": "지역 사회 서비스, 계약업체 청소 및 경비 산업의 빅토리아주",
"id": "content-anchor-1",
"type": "h2"
},
{
"text": "지역 사회 서비스",
"id": "content-anchor-2",
"type": "h3"
}
],
"props": {
"html": "<p>같은 고용주를 위해 장기간 근무한 근로자는 추가적인 휴가를 받을 수 있습니다.</p>"
}
}
],
"meta": {
"url": "/department-landing-page",
"langcode": "en",
"description": "지역 사회 서비스, 계약업체 청소 및 경비 산업의 빅토리아주",
"additional": [
{
"tag": "link",
"attributes": {
"rel": "canonical",
"href": "https://develop.content.vic.gov.au/department-landing-page"
}
},
{
"tag": "meta",
"attributes": {
"name": "title",
"content": "지역 사회 서비스, 계약업체 청소 및 경비 산업의 빅토리아주 | Single Digital Presence Content Management System"
}
},
{
"tag": "meta",
"attributes": {
"property": "og:locale",
"content": "ko"
}
}
]
}
}
6 changes: 6 additions & 0 deletions examples/vue-app/.stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": ["@dpc-sdp/stylelint-config-ripple"],
"rules": {
"custom-property-pattern": ".+"
}
}
1 change: 1 addition & 0 deletions examples/vue-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"dependencies": {
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@dpc-sdp/stylelint-config-ripple": "workspace:*",
"vue": "^3.3.4",
"vue-router": "^4.1.5"
},
Expand Down
12 changes: 4 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"release:publish-alpha": "lerna publish --canary minor --preid alpha --dist-tag alpha --force-publish",
"release:publish-next": "lerna publish --canary minor --preid next --dist-tag next --force-publish",
"release:publish": "lerna publish from-git",
"lint": "eslint . --ext .ts,.vue && pnpm -F @dpc-sdp/ripple-ui-core stylelint",
"lint": "eslint . --ext .ts,.vue && stylelint 'packages/ripple-ui-core/**/*.css'",
"test:unit": "jest --colors --runInBand",
"test:components-core": "pnpm -F @dpc-sdp/ripple-ui-core test:components",
"test:components-forms": "pnpm -F @dpc-sdp/ripple-ui-forms test:components",
Expand All @@ -50,15 +50,15 @@
"@commitlint/cli": "^17.4.4",
"@commitlint/config-conventional": "^17.4.4",
"@cypress/vite-dev-server": "^5.0.5",
"@dpc-sdp/eslint-config-ripple": "workspace:*",
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@dpc-sdp/ripple-ui-forms": "workspace:*",
"@dpc-sdp/stylelint-config-ripple": "workspace:*",
"@jest/globals": "^29.5.0",
"@lerna-lite/cli": "^1.17.0",
"@lerna-lite/publish": "^1.17.0",
"@lerna-lite/version": "^1.17.0",
"@types/jest": "^29.5.0",
"@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.59.11",
"@vitejs/plugin-vue": "^4.1.0",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^29.5.0",
Expand All @@ -71,10 +71,6 @@
"cypress": "12.8.1",
"detab": "^3.0.2",
"eslint": "^8.36.0",
"eslint-config-prettier": "^8.8.0",
"eslint-junit": "^1.0.1",
"eslint-plugin-storybook": "^0.6.10",
"eslint-plugin-vue": "^9.10.0",
"husky": "^8.0.3",
"hygen": "^6.2.11",
"jest": "^29.5.0",
Expand All @@ -83,11 +79,11 @@
"postcss-normalize": "^10.0.1",
"postcss-preset-env": "^8.1.0",
"start-server-and-test": "^2.0.0",
"stylelint": "^15.10.2",
"ts-jest": "^29.0.5",
"typescript": "^5.0.2",
"unist-builder": "^3.0.1",
"vite": "4.1.5",
"vue-eslint-parser": "^9.1.0",
"vue-loader": "^17.0.1"
},
"engines": {
Expand Down
Empty file.
Loading

0 comments on commit 4a58eb4

Please sign in to comment.