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

Add logic for v1.0 #9

Merged
merged 4 commits into from
Mar 13, 2021
Merged

Add logic for v1.0 #9

merged 4 commits into from
Mar 13, 2021

Conversation

mykyta-shulipa
Copy link
Collaborator

No styles yet
ref #1

@mykyta-shulipa
Copy link
Collaborator Author

Screen Shot 2021-03-11 at 1 55 40 AM

Screen Shot 2021-03-11 at 1 55 32 AM

Screen Shot 2021-03-11 at 1 55 51 AM

@OleksiyRudenko
Copy link
Member

v1.2 (#3) is to introduce jsx and also end up with component props handling.
For illustrative purposes we'd need to have at least one parametrized component before <Component prop="val" /> syntax gets introduced.
That's what parametrization of UnitSwitch component might look like: 736a0b8
I could implement it as a part of transition from v1.1 to v1.2, or we might introduce this type of pain in v1.0 already.
What do you think?

@OleksiyRudenko
Copy link
Member

P.S. My proposal is to have dev branch as a target branch for merges, keeping main codeless until lectures are delivered one by one.

@OleksiyRudenko OleksiyRudenko changed the base branch from main to dev March 12, 2021 19:19
@OleksiyRudenko
Copy link
Member

  • Changed target branch to dev
  • Made UnitSwitch a weirdly parametrized component

@OleksiyRudenko OleksiyRudenko self-assigned this Mar 12, 2021
@OleksiyRudenko OleksiyRudenko linked an issue Mar 12, 2021 that may be closed by this pull request
@OleksiyRudenko OleksiyRudenko requested review from OleksiyRudenko and removed request for OleksiyRudenko March 12, 2021 19:27
@mykyta-shulipa
Copy link
Collaborator Author

@OleksiyRudenko

P.S. My proposal is to have dev branch as a target branch for merges, keeping main codeless until lectures are delivered one by one.

Any branch here is not hidden, so if we decide to hide code from students:) we could consider work in some other repository and push here (or work here and push to another one).
But having main branch clean is a good idea anyway 👍

@mykyta-shulipa
Copy link
Collaborator Author

mykyta-shulipa commented Mar 12, 2021

@OleksiyRudenko LGTM.
Do you think we could merge this and continue working on v1.0 scope (styles etc.) in upcoming PRs?

@OleksiyRudenko
Copy link
Member

@nktssh basically, we can.
Merging of the changes from #12 and pushing dev to a new divergence point will cause non-crtitical conflicts (package config). We can resolve those in this PR (following the proposal below) or later on, locally, or at any further PR review stage.

The proposed plan:

  1. Squash-merge Add boilerplate #12 into/onto main once changes get approved (this would become a starting point for the students)
  2. Rebase dev onto main
  3. Resolve conflicts in this PR (package* will cause conflicts)
  4. Merge this PR into dev

Once the above done the further development is conflict-safe

@OleksiyRudenko OleksiyRudenko mentioned this pull request Mar 13, 2021
@mykyta-shulipa mykyta-shulipa merged commit 086fad4 into dev Mar 13, 2021
@mykyta-shulipa mykyta-shulipa deleted the v1.0 branch March 13, 2021 10:03
OleksiyRudenko added a commit that referenced this pull request Mar 30, 2021
* feat (component): Add logic for v1.0 (no styles)

* feat(component): Make UnitSwitch component parametrized

* chores(dependencies): Resolve conflicts

Co-authored-by: OleksiyRudenko <[email protected]>
mykyta-shulipa pushed a commit that referenced this pull request Apr 21, 2021
* feat (component): Add logic for v1.0 (no styles)

* feat(component): Make UnitSwitch component parametrized

* chores(dependencies): Resolve conflicts

Co-authored-by: OleksiyRudenko <[email protected]>
mykyta-shulipa pushed a commit that referenced this pull request Apr 29, 2021
* feat (component): Add logic for v1.0 (no styles)

* feat(component): Make UnitSwitch component parametrized

* chores(dependencies): Resolve conflicts

Co-authored-by: OleksiyRudenko <[email protected]>
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.

Add component functions (v1.0)
2 participants