Skip to content

Commit

Permalink
Merge pull request #1044 from rodekruis/develop
Browse files Browse the repository at this point in the history
develop: Redesigned color-scheme
  • Loading branch information
elwinschmitz authored Jun 12, 2024
2 parents 4f3f060 + 7a55eb7 commit a4c841b
Show file tree
Hide file tree
Showing 101 changed files with 5,863 additions and 4,481 deletions.
14 changes: 7 additions & 7 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
"openFiles": [
"README.md",
"package.json",
"src/environments/environment.ts",
],
},
"src/environments/environment.ts"
]
}
},

"portsAttributes": {
"4200": {
"label": "dev-preview",
"label": "dev-preview"
},
"3001": {
"label": "local-data",
},
},
"label": "local-data"
}
}
}
20 changes: 18 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,31 @@ NG_USE_Q_AND_AS=true
# Enable Search-feature for 'Q & A's (Possible value: `true` or leave empty for `false`)
NG_USE_Q_AND_A_SEARCH=true

# Enable language-switcher to switch between Regions (Possible value: `true` or leave empty for `false`)
NG_USE_REGION_PER_LOCALE=true

# Enable Feedback-prompt on Sub-Category and Offer pages (Possible value: `true` or leave empty for `false`)
NG_USE_FEEDBACK_PROMPT=true

# Define the logo used on the main/front-page by an absolute URL (starting with https://)
TXT_APP_LOGO_URL=

# Configuration of text-content
TXT_APP_NAME="Helpful Information"
TXT_APP_NAME="Helpful \n Information"
TXT_MAIN_PAGE_HEADER="The Red Cross provides Helpful Information."
# The (optional) introduction text, (only) visible on the main-page.
# Can be multiple-lines of Markdown syntax or contain some HTML. Newlines need to be specified with `\n` or `<br />`.
TXT_MAIN_PAGE_INTRO="Please choose a location."
# Optional: Prominent area for important content:
# An (optional) notice on the top of the screen, can be overwritten on sub-pages per-region by each region's sheet.
TXT_MAIN_PAGE_NOTICE=
# An (optional) footer at the bottom of the screen, can be overwritten on sub-pages per-region by each region's sheet.
TXT_MAIN_FOOTER=
# An (optional) "About"-page
# Can be multiple-lines of Markdown syntax or contain some HTML. Newlines need to be specified with `\n` or `<br />`.
TXT_PAGE_ABOUT=
# An (optional) "Privacy"-page
# Can be multiple-lines of Markdown syntax or contain some HTML. Newlines need to be specified with `\n` or `<br />`.
TXT_PAGE_PRIVACY=

TXT_ERROR_HEADER="Data Unavailable"
TXT_ERROR_MESSAGE="Reach out to us at: "
Expand Down
23 changes: 15 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ const restrictedGlobals = require('confusing-browser-globals');
/** @type {import('eslint').Linter.Config} */
module.exports = {
root: true,
ignorePatterns: ['projects/**/*', 'coverage', 'www'],
ignorePatterns: ['coverage', 'www'],
overrides: [
{
files: ['*.ts'],
files: ['**/*.ts'],
parserOptions: {
project: ['tsconfig.json'],
createDefaultProgram: true,
Expand All @@ -27,8 +27,7 @@ module.exports = {
'plugin:promise/recommended',
'plugin:no-unsanitized/DOM',
'plugin:regexp/recommended',
'plugin:jasmine/recommended',
'prettier',
'plugin:prettier/recommended',
],
rules: {
'no-extra-boolean-cast': ['error'],
Expand Down Expand Up @@ -106,16 +105,24 @@ module.exports = {
},
},
{
files: ['*.html'],
extends: ['plugin:@angular-eslint/template/recommended', 'prettier'],
files: ['**/*.spec.ts'],
extends: ['plugin:jasmine/recommended', 'plugin:prettier/recommended'],
},
{
files: ['**/*.html'],
extends: [
'plugin:@angular-eslint/template/accessibility',
'plugin:@angular-eslint/template/recommended',
'plugin:prettier/recommended',
],
rules: {},
},
{
files: ['*.js'],
files: ['**/*.js'],
parserOptions: {
ecmaVersion: 2021,
},
extends: ['prettier'],
extends: ['plugin:prettier/recommended'],
rules: {
'sort-imports': ['error'],
},
Expand Down
136 changes: 0 additions & 136 deletions .github/workflows/deploy-production-faq.yml

This file was deleted.

126 changes: 0 additions & 126 deletions .github/workflows/deploy-production-ocw.yml

This file was deleted.

Loading

0 comments on commit a4c841b

Please sign in to comment.