Skip to content

Commit

Permalink
[SS-116] Renames vic-gov-au example to reference to use reference bac…
Browse files Browse the repository at this point in the history
…kend (#1117)

* Rename vic-gov to reference

* use demo site

* Added theming changes.

* Adds reference site .env file

Co-authored-by: MdNadimHossain <[email protected]>
  • Loading branch information
dylankelly and MdNadimHossain authored Feb 22, 2022
1 parent 3de15c4 commit 33746de
Show file tree
Hide file tree
Showing 55 changed files with 90 additions and 87 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
paths:
- ~/.cache
- run:
name: build vic-gov-au nuxt app
command: cd examples/vic-gov-au && yarn build:default
name: build reference nuxt app
command: yarn reference:build
- persist_to_workspace:
root: ~/app
paths: .
Expand Down Expand Up @@ -76,13 +76,13 @@ jobs:
- store_artifacts:
path: test-results
- store_artifacts:
path: examples/vic-gov-au/test/integration/videos
path: examples/reference/test/integration/videos
- store_artifacts:
path: examples/vic-gov-au/test/integration/screenshots
path: examples/reference/test/integration/screenshots



integration-vic-gov:
reference-integration:
# Integration tests confirm FE components are working correctly without testing BE
<<: *defaults
parallelism: 2
Expand All @@ -94,15 +94,15 @@ jobs:
- v9-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
- run:
name: run full integration test
command: yarn test:integration-vic
command: yarn reference:integration
- store_artifacts:
path: test-results
- store_test_results:
path: test-results
- store_artifacts:
path: examples/vic-gov-au/test/integration/videos
path: examples/reference/test/integration/videos
- store_artifacts:
path: examples/vic-gov-au/test/integration/screenshots
path: examples/reference/test/integration/screenshots


integration-example:
Expand All @@ -129,9 +129,9 @@ jobs:
- store_artifacts:
path: test-results
- store_artifacts:
path: examples/vic-gov-au/test/integration/videos
path: examples/basic-examples/test/integration/videos
- store_artifacts:
path: examples/vic-gov-au/test/integration/screenshots
path: examples/basic-examples/test/integration/screenshots

integration-vue-example-app:
# This runs the full suite of integration tests on example vue example app
Expand Down Expand Up @@ -191,7 +191,7 @@ workflows:
requires:
- build
# Run regression tests on release branches
- integration-example:
- reference-integration:
requires:
- build
filters:
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.env

# Editor directories and files
.idea
.vscode
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.app
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY . /app/
RUN rm /app/src/package.json \
&& yarn install

WORKDIR /app/examples/vic-gov-au/
WORKDIR /app/examples/reference/

RUN . /home/.bashrc \
&& yarn run build --modern=client
Expand Down
21 changes: 21 additions & 0 deletions examples/reference/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Tide API
CONTENT_API_SERVER=https://develop.content.reference.sdp.vic.gov.au/
# oAuth client key is needed for Preview to work
CONTENT_API_OAUTH_CLIENT_ID=dc881486-c14a-4b92-a0d0-e5dcd706f5ad

# If using, Google Tag Manager ID goes here see - https://github.com/nuxt-community/gtm-module
# GTM_ID=

# This will enable Nuxt debug and display error details.
DISPLAY_ERROR=1

# Search settings - NONPROD
SEARCH_SERVICE=elasticsearch
SEARCH_LOG=trace

# Credentials to be provided by SDP team during onboarding
# SEARCH_URL=
# SEARCH_HASH=
# SEARCH_INDEX=
# SEARCH_AUTH_USERNAME=
# SEARCH_AUTH_PASSWORD=
File renamed without changes.
46 changes: 46 additions & 0 deletions examples/reference/assets/_theme.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Vic.gov.au site theming variables
// Overwrites values in Ripple
@import '~@dpc-sdp/ripple-global/scss/settings/functions';

$rpl-colors: (
'primary': #7040CA,
'dark_primary': #6728A7,
'secondary': #BD10E0,
'extra_dark_neutral': #011A3C,
'dark_neutral': #465870,
'mid_neutral_1': #D7DBE0,
'mid_neutral_2': #E8EBEE,
'light_neutral': #F6F6F9,
'danger': #AF272F,
'warning': #CA4C21,
'success': #027A83,
'success-2-text': #027a83,
'white': #fff,
'black': #000,
'maximum-blue-purple': #9D9DEF,
'violets-are-blue': #825DFF,
'french-rose': #EF4A81,
'naples-yellow': #F9E062,
);

// Local Custom UI colours
$ref-ui-color-maximum-blue-purple: rpl_color('maximum-blue-purple');
$ref-ui-color-violets-are-blue: rpl_color('violets-are-blue');
$ref-ui-color-french-rose: rpl_color('french-rose');
$ref-ui-color-naples-yellow: rpl_color('naples-yellow');

$rpl-gradients: (
'primary_gradient': linear-gradient(90deg, rpl_color('secondary') 0%, $ref-ui-color-maximum-blue-purple 100%),
'primary_gradient_90': linear-gradient(180deg, rpl_color('secondary') 0%, $ref-ui-color-maximum-blue-purple 100%),
'primary_gradient_0': linear-gradient(0deg, rpl_color('secondary') 0%, $ref-ui-color-maximum-blue-purple 100%),
'decorative_gradient': linear-gradient(-90deg, $ref-ui-color-maximum-blue-purple 0%, $ref-ui-color-violets-are-blue 34.38%, $ref-ui-color-french-rose 60.94%, $ref-ui-color-naples-yellow 98.96%),
'decorative_gradient_0': linear-gradient(0deg, $ref-ui-color-maximum-blue-purple 0%, $ref-ui-color-violets-are-blue 34.38%, $ref-ui-color-french-rose 60.94%, $ref-ui-color-naples-yellow 98.96%),
'decorative_gradient_90': linear-gradient(-180deg, $ref-ui-color-maximum-blue-purple 0%, $ref-ui-color-violets-are-blue 34.38%, $ref-ui-color-french-rose 60.94%, $ref-ui-color-naples-yellow 98.96%),
'decorative_gradient_180': linear-gradient(90deg, $ref-ui-color-maximum-blue-purple 0%, $ref-ui-color-violets-are-blue 34.38%, $ref-ui-color-french-rose 60.94%, $ref-ui-color-naples-yellow 98.96%),
);

// Accordion
$rpl-accordion-border-image: linear-gradient(-90deg, rpl_color('secondary') 0%, $ref-ui-color-maximum-blue-purple 100%);

// Buttons
$rpl-button-active-background-image: rpl_gradient('primary_gradient_0');
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
*/
head: {
titleTemplate: '%s | vic.gov.au',
title: 'vic.gov.au',
title: 'reference.sdp.vic.gov.au',
meta: [
{ charset: 'utf-8' },
{ name: 'viewport', content: 'width=device-width, initial-scale=1' },
Expand Down Expand Up @@ -135,7 +135,10 @@ export default {
* Configuration for ripple-nuxt-ui
* See https://www.npmjs.com/package/@dpc-sdp/ripple-nuxt-ui
*/
ripple: {},
ripple: {
viclogo: false,
viclogoFooter: false
},
/*
* Configuration for ripple-nuxt-tide
* See https://www.npmjs.com/package/@dpc-sdp/ripple-nuxt-tide
Expand All @@ -146,7 +149,7 @@ export default {
username: process.env.CONTENT_API_AUTH_USER,
password: process.env.CONTENT_API_AUTH_PASS
},
site: 4,
site: 19,
// Tide submodules, 1 for enable, 0 for disable.
modules: {
site: 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@dpc-sdp/example-vic-gov-au",
"name": "reference",
"version": "1.28.0",
"description": "Reference nuxt site using Ripple front end and connecting to Tide backend",
"private": true,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
20 changes: 0 additions & 20 deletions examples/vic-gov-au/assets/_theme.scss

This file was deleted.

29 changes: 0 additions & 29 deletions examples/vic-gov-au/example.env

This file was deleted.

Binary file not shown.
Diff not rendered.
12 changes: 4 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,10 @@
"scripts": {
"publish": "lerna publish",
"start:storybook": "cd src && yarn start",
"start:example": "yarn workspace @dpc-sdp/example-vic-gov-au dev",
"start:build-example": "cd examples/vic-gov-au/ && nuxt build --modern=client && nuxt start --modern=client",
"test:integration": "yarn test:integration-example && yarn test:integration-vic",
"test:integration-vic": "cd examples/vic-gov-au/ && yarn test:integration",
"test:integration-example": "cd examples/basic-examples && yarn test:integration",
"test:smoke": "yarn test:smoke-vic",
"test:smoke-vic": "cd examples/vic-gov-au/ && yarn test:smoke",
"test:smoke-example": "cd examples/vic-gov-au/ && yarn test:smoke",
"reference:dev": "yarn workspace reference dev",
"reference:build": "yarn workspace reference build",
"reference:start": "yarn workspace reference start:build",
"reference:integration": "yarn workspace reference test:integration",
"test:unit": "jest --colors",
"build:storybook": "cd src && yarn build-storybook",
"build:vic-gov-au": "cd examples/vic-gov-au && yarn run build --modern=client",
Expand Down
12 changes: 0 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7556,11 +7556,6 @@ argparse@^1.0.7:
dependencies:
sprintf-js "~1.0.2"

argparse@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==

arr-diff@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
Expand Down Expand Up @@ -17115,13 +17110,6 @@ js-yaml@^3.14.0, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.9.0:
argparse "^1.0.7"
esprima "^4.0.0"

js-yaml@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
dependencies:
argparse "^2.0.1"

jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
Expand Down

0 comments on commit 33746de

Please sign in to comment.