Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixes #825 : Created components for the background selection #826

Merged
merged 1 commit into from May 24, 2018
Merged

Fixes #825 : Created components for the background selection #826

merged 1 commit into from May 24, 2018

Conversation

yashLadha
Copy link
Member

@yashLadha yashLadha commented May 22, 2018 •
edited

Fixes #825

Checklist

  • I have read the Contribution & Best practices Guide and my PR follows them.
  • My branch is up-to-date with the Upstream development branch.
  • I have added necessary documentation (if appropriate)

Preview Link

Changes proposed in this pull request:

  • Added background component

@open-event-bot
Copy link

Hi @yashLadha!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

@codecov
Copy link

codecov bot commented May 22, 2018 •
edited

Codecov Report

Merging #826 into development will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           development   #826   +/-   ##
==========================================
  Coverage          100%   100%           
==========================================
  Files                1      1           
  Lines               43     43           
==========================================
  Hits                43     43

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c42c03c...31fc2b4. Read the comment docs.

@open-event-bot
Copy link

Hi @yashLadha!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

@yashLadha yashLadha force-pushed the background-component branch 4 times, most recently from 7709845 to 5f790bc Compare May 22, 2018 15:56
@yashLadha
Copy link
Member Author

Please review @djmgit @ParthS007 @vaibhavsingh97 @gabru-md

ParthS007
ParthS007 reviewed May 22, 2018
View reviewed changes
Copy link
Member

@ParthS007 ParthS007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ! Please check the comments inline 👍

frontend/app/templates/components/background-component/color-bg-component.hbs
<div class="field">
<label>Select from a custom color</label>
{{col-pick-input value=defColor}}
</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a Line EOF 👍

frontend/app/templates/components/background-component/def-image-component.hbs
{{/each}}
</div>
{{/ui-dropdown}}
</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a line EOF 👍

frontend/app/templates/create-badges.hbs Outdated
<div class="center aligned column">
{{ data-component/text-component sendText=(action 'mutateText') }}
</div>
<div class="ui horizontal divider"></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a second UI form for background-component 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add Or between the choices available 👍

vaibhavsingh97
vaibhavsingh97 suggested changes May 22, 2018
View reviewed changes
Copy link
Member

@vaibhavsingh97 vaibhavsingh97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the changes suggested by @ParthS007

frontend/app/components/background-component/def-image-component.js
init() {
// To be inflated from the backend data
this.image = '';
// this.images = [{ 'id': 0, 'name': 'Test 0' }, { 'id': 1, 'name': 'Test 1' }];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this comment

Copy link
Member Author

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 --fix cheers 👍

ParthS007
ParthS007 approved these changes May 23, 2018
View reviewed changes
Copy link
Member

@ParthS007 ParthS007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@yashLadha
Copy link
Member Author

Please review it @djmgit @vaibhavsingh97 @gabru-md done suggested changes

gabru-md
gabru-md reviewed May 23, 2018
View reviewed changes
Copy link
Member

@gabru-md gabru-md left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

gabru-md
gabru-md approved these changes May 23, 2018
View reviewed changes
Copy link
Member

@gabru-md gabru-md left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@djmgit
Copy link
Member

djmgit commented May 23, 2018

@yashLadha please rebase your branch.

@ParthS007 ParthS007 mentioned this pull request May 23, 2018
Merged
3 tasks
@yashLadha
Copy link
Member Author

Done rebasing @djmgit good to merge 👍

@djmgit djmgit merged commit 112276d into fossasia:development May 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vaibhavsingh97 vaibhavsingh97 vaibhavsingh97 requested changes

@djmgit djmgit djmgit approved these changes

@ParthS007 ParthS007 ParthS007 approved these changes

@gabru-md gabru-md gabru-md approved these changes

Assignees

@yashLadha yashLadha

Labels
ready-to-ship
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Image selection form component
5 participants
@yashLadha @djmgit @vaibhavsingh97 @ParthS007 @gabru-md