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

Play state #105

Merged
merged 15 commits into from
Apr 26, 2022
Merged

Play state #105

merged 15 commits into from
Apr 26, 2022

Conversation

Abhishek-90
Copy link
Contributor

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce.

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@vercel
Copy link

vercel bot commented Apr 26, 2022

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/atapas/react-play/AuxecB5hAATzadsMSJYqn4tM4p3g
✅ Preview: https://react-play-git-fork-abhishek-90-playstate-atapas.vercel.app

@atapas
Copy link
Member

atapas commented Apr 26, 2022

@Abhishek-90

Build fail log

[12:25:09.308] Cloning github.com/atapas/react-play (Branch: playState, Commit: ebbe0da)
[12:25:09.906] Cloning completed: 597.755ms
[12:25:10.331] Installing build runtime...
[12:25:11.888] Build runtime installed: 1.557s
[12:25:12.570] Looking up build cache...
[12:25:15.753] Build cache downloaded [40.35 MB]: 2742.012ms
[12:25:15.884] Detected package.json
[12:25:15.885] Installing dependencies...
[12:25:16.132] yarn install v1.22.17
[12:25:16.214] [1/4] Resolving packages...
[12:25:16.684] [2/4] Fetching packages...
[12:25:33.280] [3/4] Linking dependencies...
[12:25:33.283] warning " > @testing-library/user-event@13.5.0" has unmet peer dependency "@testing-library/dom@>=7.21.4".
[12:25:33.284] warning "react-helmet > react-side-effect@2.1.1" has incorrect peer dependency "react@^16.3.0 || ^17.0.0".
[12:25:33.285] warning "react-organizational-chart > @emotion/css > @emotion/babel-plugin@11.7.2" has unmet peer dependency "@babel/core@^7.0.0".
[12:25:33.285] warning "react-organizational-chart > @emotion/css > @emotion/babel-plugin > @babel/plugin-syntax-jsx@7.16.7" has unmet peer dependency "@babel/core@^7.0.0-0".
[12:25:33.288] warning "react-scripts > tailwindcss@3.0.12" has unmet peer dependency "autoprefixer@^10.0.2".
[12:25:33.291] warning "react-scripts > eslint-config-react-app > eslint-plugin-flowtype@8.0.3" has unmet peer dependency "@babel/plugin-syntax-flow@^7.14.5".
[12:25:33.291] warning "react-scripts > eslint-config-react-app > eslint-plugin-flowtype@8.0.3" has unmet peer dependency "@babel/plugin-transform-react-jsx@^7.14.9".
[12:25:33.295] warning "react-scripts > react-dev-utils > fork-ts-checker-webpack-plugin@6.5.0" has unmet peer dependency "typescript@>= 2.7".
[12:25:33.303] warning "react-scripts > eslint-config-react-app > @typescript-eslint/eslint-plugin > tsutils@3.21.0" has unmet peer dependency "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta".
[12:25:33.305] warning " > react-shimmer-effect@1.0.9" has incorrect peer dependency "react@^16.8.1".
[12:25:33.305] warning " > react-shimmer-effect@1.0.9" has incorrect peer dependency "react-dom@^16.8.1".
[12:25:49.219] [4/4] Building fresh packages...
[12:25:56.485] Done in 40.36s.
[12:25:56.705] Running "yarn run build"
[12:25:56.885] yarn run v1.22.17
[12:25:56.912] $ react-scripts build
[12:25:58.163] Creating an optimized production build...
[12:26:24.606] Failed to compile.
[12:26:24.606]
[12:26:24.606] src/meta/play-meta.js
[12:26:24.606] Syntax error: Identifier 'States' has already been declared. (13:0) (13:undefined)
[12:26:24.606]
[12:26:24.606]
[12:26:24.666] error Command failed with exit code 1.
[12:26:24.666] info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
[12:26:24.673] Error: Command "yarn run build" exited with 1

Copy link
Member

@atapas atapas left a comment

Choose a reason for hiding this comment

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

@Abhishek-90 You haven't resolved merge conflicts correctly.. hence lots of unnecessary changes went in. Please take care. If you have issues in resolving merge conflicts, see some videos on how to do them. If the problem persists, scrap this branch and PR and create a new fresh one.

src/meta/play-meta.js Outdated Show resolved Hide resolved
src/meta/play-meta.js Outdated Show resolved Hide resolved
src/plays/states/States.jsx Outdated Show resolved Hide resolved
src/plays/states/States.jsx Outdated Show resolved Hide resolved
@Abhishek-90
Copy link
Contributor Author

@atapas I have push the new changes with conflicts resolved

src/meta/play-meta.js Show resolved Hide resolved
@atapas
Copy link
Member

atapas commented Apr 26, 2022

@atapas I have push the new changes with conflicts resolved

I see my older comments are not taken care.

@Abhishek-90
Copy link
Contributor Author

@atapas can you please elaborate ?

@atapas
Copy link
Member

atapas commented Apr 26, 2022

@atapas can you please elaborate ?

state.jsx file.

Copy link
Member

@atapas atapas left a comment

Choose a reason for hiding this comment

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

Given a comment

You are comitting yarn lock and package lock, why? Please do not commit these files if you haven't changed the package.json file. If you pull the latest from the main, these two files shouldn't appear in your to be committed list.

src/meta/play-meta.js Outdated Show resolved Hide resolved
Copy link
Member

@atapas atapas left a comment

Choose a reason for hiding this comment

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

Ok, I'm noticing something. Let me know about it..

I see two CSS file one with capital case and another one with small case? Why do we need two files of same name with different cases? Why cant it be just one state.css file?

Also I still see yarn.lock in the committed list

image

already have state.css file
@Abhishek-90
Copy link
Contributor Author

@atapas Initially I used State.css but changed it to state.css on your suggestion. I meant to delete it from Github, Now I have deleted State.css

about yarn.lock, I deleted it from committed list, I am not sure why it is still showing

@atapas atapas linked an issue Apr 26, 2022 that may be closed by this pull request
@atapas atapas merged commit 2b97b78 into reactplay:main Apr 26, 2022
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.

🐛 [Bug report]: Responsive Design for State Play
2 participants