Skip to content

Commit

Permalink
updated the filenames
Browse files Browse the repository at this point in the history
  • Loading branch information
dwilt committed Mar 18, 2018
1 parent b1029c9 commit 9c4cfb1
Show file tree
Hide file tree
Showing 23 changed files with 160 additions and 96 deletions.
4 changes: 2 additions & 2 deletions src/components/App/App.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import "./App.css";

import PropTypes from "prop-types";

import { Quiz, Results } from "components";
import { Quiz, Completed } from "components";

class App extends Component {
static propTypes = {
Expand All @@ -17,7 +17,7 @@ class App extends Component {

switch (state) {
case `completed`:
content = <Results />;
content = <Completed />;
break;

case `quiz`:
Expand Down
21 changes: 21 additions & 0 deletions src/components/Completed/Completed/Completed.component.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React, { PureComponent } from "react";


import {
CompletedHeader,
Results,
} from "components";

import "./Completed.css";

export default class Completed extends PureComponent {
render() {

return (
<div className={`Completed`}>
<CompletedHeader/>
<Results/>
</div>
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { connect } from "react-redux";

import { quizNameSelector } from "selectors";

import Results from "./Results.component";
import CompletedResults from "./Completed.component";

export default connect((st) => ({
name: quizNameSelector(st),
}))(Results);
}))(CompletedResults);
5 changes: 5 additions & 0 deletions src/components/Completed/Completed/Completed.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.Completed {
padding: 80px 20px 0;
}


2 changes: 2 additions & 0 deletions src/components/Completed/Completed/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { default as Completed } from './Completed.container';

Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import React, { PureComponent } from 'react';

import PropTypes from 'prop-types';

import {

} from 'components';

import './CompletedHeader.css';

export default class CompletedHeader extends PureComponent {
static propTypes = {
name: PropTypes.string.isRequired,
};

render() {
const {name} = this.props;

return (
<header className={`CompletedHeader`}>
<div className={`CompletedHeader__header-content`}>
<h1 className={`CompletedHeader__title`}>{`Congratulations ${name}, you're finished!`}</h1>
<h2 className={`CompletedHeader__coding-strength`}>
{`Your Coding Strength is: `}
<strong>{`Javascript Proficiency`}</strong>
</h2>
<p>
Based on your responses, you have solid
understanding of the foundational JavaScript
essentials you need to learn mobile app development.
Consider getting started with a training program
that offers opportunities for practical, real world
experience building apps.
</p>

<p>
You can review your results below, and we also sent
a recap email with your responses to your inbox. If
you want me to review your assessment results and
provide completely personalized recommendations to
make sure you get started right, click below to book
a <strong>{`free 15-minute coaching session`}</strong>{` `}
with me!
</p>
<a
href={`#`}
className={`CompletedHeader__schedule-call-button btn`}
>
Schedule a free coaching call
</a>
</div>
</header>
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { connect } from 'react-redux';

import {
quizNameSelector,
} from 'selectors';


import CompletedHeader from './CompletedHeader.component';

export default connect((st) => ({
name: quizNameSelector(st),
}), {})(CompletedHeader);
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
.Results {
padding: 80px 20px 0;
}

.Results__header {
.CompletedHeader {
padding-bottom: 45px;
margin-bottom: 45px;
border-bottom: 1px solid #E8E8E8
}

.Results__header-content {
.CompletedHeader__header-content {
max-width: 800px;
}

.Results__title {
.CompletedHeader__title {
color: var(--very-dark-blue);
font-size: 2rem;
line-height: 1.3;
margin-bottom: 40px;
font-weight: 900;
}

.Results__coding-strength {
.CompletedHeader__coding-strength {
font-size: 1.5rem;
line-height: 1.3;
margin-bottom: 20px;
}

.Results__schedule-call-button {
.CompletedHeader__schedule-call-button {
margin-top: 25px
}

1 change: 1 addition & 0 deletions src/components/Completed/CompletedHeader/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as CompletedHeader } from './CompletedHeader.container';
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import {
questions,
} from 'questions';

import './ResultsList.css';
import './CompletedResultsList.css';

export default class ResultsList extends PureComponent {
export default class CompletedResultsList extends PureComponent {
static propTypes = {
answers: PropTypes.arrayOf(PropTypes.shape({
id: PropTypes.string.isRequired,
Expand All @@ -20,13 +20,13 @@ export default class ResultsList extends PureComponent {
const { answers } = this.props;

return (
<ol className={`ResultsList`}>
<ol className={`CompletedResultsList`}>
{answers.map((answer, i) => {
const { question } = questions.find(q => q.id === answer.id);

return (
<li key={answer.id}>
<p className={`ResultsList__question-title`}>{`${i + 1}. ${question}`}</p>
<p className={`CompletedResultsList__question-title`}>{`${i + 1}. ${question}`}</p>
</li>
);
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { connect } from 'react-redux';
import {quizAnswersSelector} from 'selectors';


import ResultsList from './ResultsList.component';
import CompletedResultsList from './CompletedResultsList.component';

export default connect((st) => ({
answers: quizAnswersSelector(st)
}), {})(ResultsList);
}), {})(CompletedResultsList);
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.CompletedResultsList {
list-style-type: none;
margin: 0;
}

.CompletedResultsList > li {
margin: 0
}

.CompletedResultsList__question-title {
margin-bottom: 20px
}
1 change: 1 addition & 0 deletions src/components/Completed/CompletedResultsList/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as CompletedResultsList } from './CompletedResultsList.container';
22 changes: 22 additions & 0 deletions src/components/Completed/Results/Results.component.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React, { PureComponent } from 'react';

import PropTypes from 'prop-types';

import {
CompletedResultsList
} from 'components';

import './Results.css';

export default class Results extends PureComponent {

render() {

return (
<div>
<h2 className={`Results__title`}>{`Quiz Results`}</h2>
<CompletedResultsList/>
</div>
);
}
}
6 changes: 6 additions & 0 deletions src/components/Completed/Results/Results.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.Results__title {
font-size: 2rem;
color: var(--dark-gray);
margin-bottom: 40px;
font-weight: 900
}
1 change: 1 addition & 0 deletions src/components/Completed/Results/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as Results } from './Results.component';
4 changes: 4 additions & 0 deletions src/components/Completed/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export * from './Completed';
export * from './CompletedHeader';
export * from './CompletedResultsList';
export * from './Results';
59 changes: 0 additions & 59 deletions src/components/Results/Results/Results.component.js

This file was deleted.

1 change: 0 additions & 1 deletion src/components/Results/Results/index.js

This file was deleted.

12 changes: 0 additions & 12 deletions src/components/Results/ResultsList/ResultsList.css

This file was deleted.

1 change: 0 additions & 1 deletion src/components/Results/ResultsList/index.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/components/Results/index.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export * from './ActionButton';
export * from './ActivityIndicator';
export * from './App';
export * from './Completed';
export * from './EmailCapture';
export * from './NameCapture';
export * from './QuestionAnswer';
export * from './Quiz';
export * from './QuizProgressIndicator';
export * from './QuizQuestion';
export * from './Results';
export * from './TextInput';

0 comments on commit 9c4cfb1

Please sign in to comment.