-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding default config logic - to support defining broadcast safe color definitions #102
Draft
disc7
wants to merge
1
commit into
rokucommunity:master
Choose a base branch
from
disc7:color-cert-overrides
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+53
−4
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,3 +3,4 @@ dist | |
.nyc_output | ||
coverage | ||
*.code-workspace | ||
/src/config/config.local.ts | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { Config } from './configTypes'; | ||
|
||
const defaultConfig: Config = { | ||
colors: { | ||
broadcastSafe: { | ||
black: '161616', | ||
white: 'EBEBEB' | ||
} | ||
} | ||
}; | ||
|
||
export default defaultConfig; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import defaultConfig from './config.default'; | ||
import { Config } from './configTypes'; | ||
|
||
let localConfig: Config; | ||
|
||
async function loadConfig() { | ||
let config; | ||
try { | ||
const module = await import('./config.local'); | ||
config = module.default; | ||
} catch (error) { | ||
config = {}; | ||
} | ||
return config; | ||
} | ||
|
||
loadConfig().then(config => { | ||
localConfig = config; | ||
}).catch(() => { | ||
console.error('Local configuration file is not defined, using default config'); | ||
localConfig = {} as Config; | ||
}); | ||
|
||
const config: Config = { ...defaultConfig, ...localConfig }; | ||
export default config; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
export interface BroadcastSafeColors { | ||
black: string; | ||
white: string; | ||
} | ||
|
||
export interface ColorsConfig { | ||
broadcastSafe: BroadcastSafeColors; | ||
} | ||
|
||
export interface Config { | ||
colors: ColorsConfig; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file looks ignored by mistake
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to include this file but in a way that Typescript is happy with if the values are commented out.