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

Fix #580: updating package.json, package.json in src/frontend and gatsby-config.js #656

Merged
merged 5 commits into from
Feb 8, 2020
Merged

Fix #580: updating package.json, package.json in src/frontend and gatsby-config.js #656

merged 5 commits into from
Feb 8, 2020

Conversation

lozinska
Copy link
Contributor

@lozinska lozinska commented Feb 5, 2020

Issue This PR Addresses

Fixes #580 , Fixes #581

Type of Change

  • Bugfix: Change which fixes an issue
  • New Feature: Change which adds functionality
  • Documentation Update: Change which improves documentation
  • UI: Change which improves UI

Description

Updating package.json, package.json and gatsby-config.json in src/frontend/. Removed redundant information. Shifting devDependencies from src/frontend/package.json
"json-loader": "^0.5.7", "node-sass": "^4.13.1", "sass": "^1.24.4",
to package.json

Checklist

  • Quality: This PR builds and passes our npm test and works locally
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not (if applicable)
  • Documentation: This PR includes updated/added documentation to user exposed functionality or configuration variables are added/changed or an explanation of why it does not(if applicable)

@vercel
Copy link

vercel bot commented Feb 5, 2020 •
edited

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

🔍 Inspect: https://zeit.co/humphd/telescope/7aa40ukxv
✅ Preview: https://telescope-git-fork-lozinska-issue-580.humphd.now.sh

humphd
humphd requested changes Feb 5, 2020
View reviewed changes
src/frontend/package.json Outdated
"private": true,
"description": "A simple starter to get up and developing quickly with Gatsby",
"description": "A tool for tracking blogs in orbit around Seneca's open source involvement",
"version": "0.1.0",
"author": "Kyle Mathews <mathews.kyle@gmail.com>",
Copy link
Contributor

Choose a reason for hiding this comment

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

You can remove this.

src/frontend/package.json Outdated
@@ -21,28 +21,15 @@
"react-dom": "^16.12.0",
"react-helmet": "^5.2.1"
},
"devDependencies": {
Copy link
Contributor

Choose a reason for hiding this comment

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

You can revert this change, because @miggs125 is doing it in #647

package.json Outdated
@@ -101,6 +101,9 @@
"spam-filter": "1.1.1",
"stoppable": "1.1.0",
"valid-url": "1.0.9",
"json-loader": "^0.5.7",
Copy link
Contributor

Choose a reason for hiding this comment

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

You can revert this change, since we'll get it when we do our post-install.

Copy link
Contributor

Choose a reason for hiding this comment

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

git checkout master package.json

And you can get rid of this change, which we don't need.

src/frontend/gatsby-config.js Outdated
author: `@gatsbyjs`,
title: `Telescope`,
description: `A tool for tracking blogs in orbit around Seneca's open source involvement`,
author: `ICT Students and professors`,
Copy link
Contributor

Choose a reason for hiding this comment

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

Technically, I think we're called SDDS not ICT now :(

@humphd
Copy link
Contributor

humphd commented Feb 6, 2020

This can get rebased to pick up some changes in the frontend package.json.

humphd
humphd reviewed Feb 7, 2020
View reviewed changes
src/frontend/package.json Outdated
"serve": "gatsby serve",
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

You have failed merge conflict markers in here causing the JSON parser to fail.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I see. Fixing it now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@humphd I have updated my files but now I'm getting new error
image
I don't know what to do to fix this error

cindyledev
cindyledev previously approved these changes Feb 8, 2020
View reviewed changes
humphd
humphd requested changes Feb 8, 2020
View reviewed changes
Copy link
Contributor

@humphd humphd left a comment

Choose a reason for hiding this comment

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

One thing to fix and this is ready.

src/frontend/package.json Outdated
"bugs": {
"url": "https://github.com/gatsbyjs/gatsby/issues"
"clean": "gatsby clean",
"compile-sass": "node-sass src/sass/main.scss src/css/style.css -w"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think @miggs125 removed this line when he removed SASS. It's safe to remove it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@humphd line 32?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, just line 32, sorry for not being clear. Line 31 is good, leave it in.

manekenpix
manekenpix approved these changes Feb 8, 2020
View reviewed changes
Copy link
Member

@manekenpix manekenpix left a comment

Choose a reason for hiding this comment

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

👍

@humphd humphd merged commit 25ffe01 into Seneca-CDOT:master Feb 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@humphd humphd humphd approved these changes

@manekenpix manekenpix manekenpix approved these changes

@cindyledev cindyledev cindyledev left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove redundant information from frontend package.json Update gatsby-config.js file
4 participants
@lozinska @humphd @manekenpix @cindyledev