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

Inertia web settings page #289

Merged
merged 7 commits into from
Jul 21, 2018
Merged

Conversation

rogermyang
Copy link
Contributor

@rogermyang rogermyang commented Jun 29, 2018

🎟️ Ticket(s): Closes #247


👷 Changes

settings_with_buttons

two new mock button added.

🔦 Testing Instructions

point to http://localhost:7900/web/#/home/settings

@bobheadxi bobheadxi changed the title Roger/247 inertia web settings page Inertia web settings page Jun 29, 2018
@bobheadxi bobheadxi requested review from asitu and zhulia96 June 29, 2018 23:26
Copy link
Member

@bobheadxi bobheadxi left a comment

Choose a reason for hiding this comment

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

Awesome stuff! Left some comments

</TableHeader>

<TableBody>
<TableRow>
Copy link
Member

@bobheadxi bobheadxi Jun 29, 2018

Choose a reason for hiding this comment

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

Sure you can list out the divs like this, but think about what the API returns to the web app:

https://github.com/ubclaunchpad/inertia/blob/master/common/types.go#L4

type DeploymentStatus struct {
	InertiaVersion       string   `json:"version"`
	Branch               string   `json:"branch"`
	CommitHash           string   `json:"commit_hash"`
	CommitMessage        string   `json:"commit_message"`
	BuildType            string   `json:"build_type"`
	Containers           []string `json:"containers"`
	BuildContainerActive bool     `json:"build_active"`
}

maybe there's a cleaner way to generate this table?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right the html is on the redundant side as i was trying to get a more consistent look. I'll get back to this

@@ -232,6 +233,7 @@ class MainWrapper extends React.Component {

<Link to={`${this.props.match.url}/dashboard`}>Click to go to Dashboard</Link>
<Link to={`${this.props.match.url}/containers`}>Click to go to Containers</Link>
<Link to={`${this.props.match.url}/settings`}>Click to go to Settings</Link>
Copy link
Member

Choose a reason for hiding this comment

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

🔥

const IconHeader = ({ title, type }) => (
<div className="iconheader">
const IconHeader = ({ title, type, style }) => (
<div className="iconheader" style={style}>
Copy link
Member

Choose a reason for hiding this comment

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

nice!

@coveralls
Copy link

Pull Request Test Coverage Report for Build 998

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 40.862%

Totals Coverage Status
Change from base Build 992: 0.0%
Covered Lines: 1393
Relevant Lines: 3409

💛 - Coveralls

@bobheadxi bobheadxi added the pr: wip in progress but seeking feedback label Jul 2, 2018
@codecov
Copy link

codecov bot commented Jul 14, 2018

Codecov Report

Merging #289 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #289   +/-   ##
=======================================
  Coverage   38.59%   38.59%           
=======================================
  Files          49       49           
  Lines        3084     3084           
=======================================
  Hits         1190     1190           
  Misses       1744     1744           
  Partials      150      150

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update efd20ea...f5abb5f. Read the comment docs.

Copy link
Member

@bobheadxi bobheadxi left a comment

Choose a reason for hiding this comment

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

Awesome work!

@bobheadxi bobheadxi merged commit f0274c0 into master Jul 21, 2018
@bobheadxi bobheadxi deleted the roger/247-inertia-Web-Settings-Page branch July 21, 2018 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: wip in progress but seeking feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants