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
Fixes #825 : Created components for the background selection #826
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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 |
|---|---|---|
|
|
@@ -28,6 +28,9 @@ indent_size = 2 | |
| [*.css] | ||
| indent_size = 4 | ||
|
|
||
| [*.scss] | ||
| indent_size = 2 | ||
|
|
||
| [Makefile] | ||
| indent_style = tab | ||
|
|
||
|
|
||
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
5 changes: 5 additions & 0 deletions
5
frontend/app/components/background-component/color-bg-component.js
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,5 @@ | ||
| import Component from '@ember/component'; | ||
|
|
||
| export default Component.extend({ | ||
| }); | ||
|
|
11 changes: 11 additions & 0 deletions
11
frontend/app/components/background-component/def-image-component.js
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,11 @@ | ||
| import Component from '@ember/component'; | ||
|
|
||
| export default Component.extend({ | ||
| init() { | ||
| // To be inflated from the backend data | ||
| this.image = ''; | ||
| // this.images = [{ 'id': 0, 'name': 'Test 0' }, { 'id': 1, 'name': 'Test 1' }]; | ||
| return this._super(...arguments); | ||
| } | ||
| }); | ||
|
|
||
5 changes: 5 additions & 0 deletions
5
frontend/app/components/background-component/image-component.js
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,5 @@ | ||
| import Component from '@ember/component'; | ||
|
|
||
| export default Component.extend({ | ||
| }); | ||
|
|
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 |
|---|---|---|
|
|
@@ -13,3 +13,8 @@ footer { | |
| padding-bottom: 30px; | ||
| padding-top: 30px; | ||
| } | ||
|
|
||
| .center-width { | ||
| max-width: 42%; | ||
| } | ||
|
|
||
5 changes: 5 additions & 0 deletions
5
frontend/app/templates/components/background-component/color-bg-component.hbs
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,5 @@ | ||
| <div class="field"> | ||
| <label>Select from a custom color</label> | ||
| {{col-pick-input value=defColor}} | ||
| </div> | ||
|
|
15 changes: 15 additions & 0 deletions
15
frontend/app/templates/components/background-component/def-image-component.hbs
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,15 @@ | ||
| <div class="field"> | ||
| <label>Select from default backgrounds</label> | ||
| {{#ui-dropdown class="selection" selected="Bob" onChange=(action (mut image))}} | ||
| <div class="default text">Select background from list</div> | ||
| <i class="dropdown icon"></i> | ||
| <div class="menu"> | ||
| {{#each images as |image|}} | ||
| <div data-value="{{gender.id}}" class="item"> | ||
| {{image.name}} | ||
| </div> | ||
| {{/each}} | ||
| </div> | ||
| {{/ui-dropdown}} | ||
| </div> | ||
|
|
5 changes: 5 additions & 0 deletions
5
frontend/app/templates/components/background-component/image-component.hbs
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,5 @@ | ||
| <div class="field"> | ||
| <label>Upload Background Image</label> | ||
| <input name="bg-image" type="file" accept="image/*"> | ||
| </div> | ||
|
|
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 |
|---|---|---|
| @@ -1,14 +1,36 @@ | ||
| <div class="ui hidden divider"></div> | ||
| <div class="ui raised segment"> | ||
| <div class="ui form"> | ||
| <div class="column"> | ||
| {{ data-component/csv-component sendCSV=(action 'mutateCSV') }} | ||
| <div class="center-width"> | ||
| <div class="ui raised segment"> | ||
| <div class="ui form width-container"> | ||
| <div class="center aligned column"> | ||
| {{ data-component/csv-component sendCSV=(action 'mutateCSV') }} | ||
| </div> | ||
| <div class="ui horizontal divider"> | ||
| Or | ||
| </div> | ||
| <div class="center aligned column"> | ||
| {{ data-component/text-component sendText=(action 'mutateText') }} | ||
| </div> | ||
| </div> | ||
| <div class="ui horizontal divider"> | ||
| Or | ||
| </div> | ||
| <div class="ui raised segment"> | ||
| <div class="ui form width-container"> | ||
| <div class="center aligned column"> | ||
| {{ background-component/def-image-component }} | ||
| </div> | ||
| <div class="ui horizontal divider"> | ||
| Or | ||
| </div> | ||
| <div class="center aligned column"> | ||
| {{ background-component/color-bg-component }} | ||
| </div> | ||
| <div class="ui horizontal divider"> | ||
| Or | ||
| </div> | ||
| <div class="center aligned column"> | ||
| {{ background-component/image-component }} | ||
| </div> | ||
| </div> | ||
| <div class="center aligned column"> | ||
| {{ data-component/text-component sendText=(action 'mutateText') }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
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,6 @@ | ||
| { | ||
| "name": "badgeyay", | ||
| "dependencies": { | ||
| "colpick": "2.0.2" | ||
| } | ||
| } |
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.
Please remove this comment
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 is for the reference at later stage, if someone wants to work on the file. Can be removed easily by setting flag in eslint and fixing through
--fixcheers 👍