Skip to content
This repository has been archived by the owner on Apr 18, 2023. It is now read-only.

Vue & React app generator updates #54

Merged

Conversation

Sahana-Srinivasan
Copy link
Contributor

@Sahana-Srinivasan Sahana-Srinivasan commented Jun 19, 2019

Used blockstack-todos Vue packaging and modified Profile/Signed components from estermer's PR 15 to make a Hello, Blockstack app generator for Vue. Minifies the packaging of the React generator and updates the style of all four generators to match blockstack.org.

@Sahana-Srinivasan Sahana-Srinivasan changed the title Hello, Blockstack Vue Hello, Blockstack Vue app generator Jun 19, 2019
This was referenced Jun 19, 2019
@hstove
Copy link
Collaborator

hstove commented Jul 1, 2019

The git diff is hard to parse. It seems like some React and Webpack code is also altered? Is this PR built on top of a different PR that isn't merged to master, yet?

@Sahana-Srinivasan
Copy link
Contributor Author

The git diff is hard to parse. It seems like some React and Webpack code is also altered? Is this PR built on top of a different PR that isn't merged to master, yet?

This encapsulates the React generator updates made in PR 50, yeah. The general app generator/Webpack generator received minor updates just to make the Hello Blockstack page blue and look more similar to blockstack.org. Updated the PR comment.

@zone117x
Copy link
Collaborator

zone117x commented Jul 1, 2019

Looks like this needs the master branch merged in (or rebased on top of the master branch)

Sahana-Srinivasan and others added 2 commits July 2, 2019 14:52
…or into hello-blockstack-vue

# Conflicts:
#	README.md
#	app/index.js
#	app/templates/_package.json
#	package-lock.json
#	package.json
#	react/index.js
#	react/templates/_package.json
#	react/templates/src/components/App.jsx
#	react/templates/src/styles/style.css
#	test/app.js
#	webpack/index.js
#	webpack/templates/_package.json
#	webpack/templates/dist/app.css
#	webpack/templates/dist/index.html
#	webpack/templates/dist/manifest.json
#	webpack/templates/src/index.js
@zone117x zone117x requested a review from hstove July 2, 2019 20:00
@Sahana-Srinivasan
Copy link
Contributor Author

The git diff is hard to parse. It seems like some React and Webpack code is also altered? Is this PR built on top of a different PR that isn't merged to master, yet?

@hstove Yeah, it modifies the blockstack logos/color for all the generators, improves the packaging for the React generator, creates a more robust test script, and adds the Vue generator. Also, Matt and I went through the merge conflicts so the diff should be more coherent now.

@Sahana-Srinivasan Sahana-Srinivasan changed the title Hello, Blockstack Vue app generator Vue & React app penerator updates Jul 12, 2019
@Sahana-Srinivasan Sahana-Srinivasan changed the title Vue & React app penerator updates Vue & React app generator updates Jul 12, 2019
@Sahana-Srinivasan
Copy link
Contributor Author

@zone117x Does this look good to go?

@moxiegirl moxiegirl requested review from yknl and removed request for hstove July 15, 2019 15:22
app/index.js Show resolved Hide resolved
Copy link
Collaborator

@zone117x zone117x left a comment

Choose a reason for hiding this comment

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

Tested all the generated apps, and all working for me on Chrome. The new theming looks great!
Left a few comments & questions about minor stuff. Other than addressing those, this PR looks good to me!

Copy link
Contributor

@yknl yknl left a comment

Choose a reason for hiding this comment

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

Nice work @Sahana-Srinivasan. The updated UI looks great. Just a minor change in addition to what Matt added.

"bootstrap": "^3.3.7",
"react": "^15.5.4",
"react-dom": "^15.5.4"
"blockstack": "^19.2.1",
Copy link
Contributor

Choose a reason for hiding this comment

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

We can update this to 19.2.2 now.

Copy link
Contributor

@yknl yknl left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@zone117x zone117x left a comment

Choose a reason for hiding this comment

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

LGTM. Great job @Sahana-Srinivasan !

@moxiegirl moxiegirl merged commit 3d17790 into stacks-archive:master Jul 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants