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.

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

Change instances of "cc-chooser" to "chooser", other cleanup and small fixes #129

Merged
merged 8 commits into from
Mar 11, 2020

Conversation

akmadian
Copy link
Member

@akmadian akmadian commented Mar 5, 2020

Fixes #128

Description

The repo was renamed from "cc-chooser" to "chooser". This PR updates various strings to reflect that change.

There are also some piggyback fixes that were preventing the site from building. These include:

  • Linting fixes
  • A broken component usage, this required some follow up styling fixes

Other information

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the master branch of the repository.
  • My commit messages follow best practices.
  • I added tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no
    visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@akmadian akmadian requested review from a team, obulat and brenoferreira and removed request for a team March 5, 2020 22:42
@akmadian akmadian changed the title Change instances of "cc-chooser" to "chooser" [WIP]: Change instances of "cc-chooser" to "chooser" Mar 5, 2020
@akmadian akmadian requested review from a team and brenoferreira and removed request for a team and brenoferreira March 5, 2020 22:58
@akmadian
Copy link
Member Author

akmadian commented Mar 5, 2020

Sorry about all the funky review requests, github seems to be automatically adding and removing some requests :/

@akmadian akmadian requested a review from kgodey March 5, 2020 22:59
@akmadian akmadian removed the blocked label Mar 5, 2020
@akmadian akmadian changed the title [WIP]: Change instances of "cc-chooser" to "chooser" Change instances of "cc-chooser" to "chooser" Mar 5, 2020
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

Ari, did you run eslint on the repo?

I have changed the linter settings from vue/essential to vue/recommended in .eslintrc.js, and when I run npm run-script lint from Webstorm (actually, it runs it automatically when I click a green triangle next to lint line in 'package.json'), all the additional new lines are inserted.
I haven't tried running the linter from Visual Studio Code, it might behave differently (it does so with regards to line endings).

I was thinking that automatic linting could be added to github action so that the code in the repo is consistent, and code review is simplified. However, if you think it makes the code unnecessarily long, or makes writing the code unnecessarily difficult, maybe it would be better to restore the linter settings to vue\essential in the '.eslintrc.js'. Otherwise, every time I click on lint in Webstorm, all extra newlines are inserted again, and all component files look as if they were edited.

@akmadian
Copy link
Member Author

akmadian commented Mar 7, 2020

Yep, there were linting errors causing build to fail. I think it's a good idea to add a lint workflow, one for testing, one for linting, one for build maybe? Maybe on each push would be good.

@obulat
Copy link
Contributor

obulat commented Mar 8, 2020

Yep, there were linting errors causing build to fail. I think it's a good idea to add a lint workflow, one for testing, one for linting, one for build maybe? Maybe on each push would be good.

I didn't realize that there were two linting changes: one in 'Cleanup' commit and one in 'Linting fixes' commit, and thought that the change in 'Cleanup' (removing extra new lines) was the final one. So, if I understand correctly now, 'Linting fixes' applied the 'vue/recommended' standard to the whole repo, and this makes the code look consistent and applies recommended Vue.js code style.

I can look into the workflows.

@akmadian
Copy link
Member Author

akmadian commented Mar 8, 2020

@obulat Yep, that's correct. Sounds good re workflows :)

@akmadian akmadian changed the title Change instances of "cc-chooser" to "chooser" Change instances of "cc-chooser" to "chooser", other cleanup and small fixes Mar 8, 2020
package.json Show resolved Hide resolved
@@ -1,28 +1,46 @@
<template>
Copy link
Contributor

Choose a reason for hiding this comment

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

I edited LicenseIcons css only looking at this component, so I added margin-left of 3px to the icons so that they are not too close to the license name in RichText code. Now I see LicenseIcons are used in the HelpSection as well, so because the left margin is local to LicenseCode component, it would be better to add styling here, so that the styling in other components is not affected.

.license-text .photo-license-icons {
    height: 1.4rem!important;
    **margin-left: 3px;**
}

Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

Looks and works great.
Only a 3px styling change is needed, I think :)

@akmadian akmadian merged commit ff6d11b into master Mar 11, 2020
@akmadian akmadian deleted the renaming-updates branch March 11, 2020 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update code and documentation to reflect repo renaming
3 participants