Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"name": "@code-dot-org/ml-activities",
"version": "0.0.1",
"version": "0.0.2",
"description": "",
"main": "dist/main.js",
"jest": {
"testEnvironment": "node"
"testEnvironment": "node",
"moduleNameMapper": {
".+\\.(jpg|jpeg|png)$": "identity-obj-proxy"
}
},
"scripts": {
"build": "webpack -p",
Expand All @@ -19,7 +22,7 @@
},
"repository": {
"type": "git",
"url": "git+ssh://git@github.com/code-dot-org/dance-party.git"
"url": "git+ssh://git@github.com/code-dot-org/ml-activities.git"
},
"author": "",
"license": "Apache-2.0",
Expand All @@ -45,6 +48,8 @@
"css-loader": "^3.2.0",
"eslint": ">=4.18.2",
"eslint-plugin-react": "^7.11.0",
"idempotent-babel-polyfill": "6.26.0-1",
"identity-obj-proxy": "^3.0.0",
"jest": "^15.0.0",
"jquery": "1.12.1",
"jquery-ui": "^1.12.1",
Expand All @@ -60,6 +65,7 @@
"react-dom": "~15.4.0",
"react-test-renderer": "~15.4.0",
"style-loader": "^1.0.0",
"url-loader": "^2.2.0",
"webpack": "4.19.1",
"webpack-cli": "^3.3.6",
"webpack-dev-server": "^3.1.4",
Expand Down
4 changes: 3 additions & 1 deletion src/demo/helpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import queryString from 'query-string';
import {Modes} from './constants';
import {FishBodyPart} from '../utils/fishData';
import underwaterBackground from '../../public/images/underwater-background.png';

export const backgroundPathForMode = mode => {
let imgName;
Expand All @@ -11,7 +12,8 @@ export const backgroundPathForMode = mode => {
// Temporarily show background for every mode.
imgName = 'underwater';

return imgName ? backgroundPath(imgName) : null;
// TODO: fix this
return imgName ? underwaterBackground : null;
};

export const backgroundPath = imgName => {
Expand Down
2 changes: 1 addition & 1 deletion src/demo/models/loading.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'babel-polyfill';
import 'idempotent-babel-polyfill';
import {initRenderer} from '../renderer';
import {setState} from '../state';
import {Modes} from '../constants';
Expand Down
2 changes: 1 addition & 1 deletion src/demo/models/pond.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'babel-polyfill';
import 'idempotent-babel-polyfill';
import _ from 'lodash';
import {setState, getState} from '../state';
import constants, {ClassType} from '../constants';
Expand Down
2 changes: 1 addition & 1 deletion src/demo/models/predict.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'babel-polyfill';
import 'idempotent-babel-polyfill';
import {setState} from '../state';
import {generateOcean} from '../../utils/generateOcean';

Expand Down
2 changes: 1 addition & 1 deletion src/demo/models/train.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'babel-polyfill';
import 'idempotent-babel-polyfill';
import {setState, getState} from '../state';
import {ClassType} from '../constants';
import SimpleTrainer from '../../utils/SimpleTrainer';
Expand Down
2 changes: 1 addition & 1 deletion src/demo/renderer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'babel-polyfill';
import 'idempotent-babel-polyfill';
import {getState, setState} from './state';
import constants, {Modes, ClassType} from './constants';
import CanvasCache from './canvasCache';
Expand Down
11 changes: 6 additions & 5 deletions src/demo/ui.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {Modes, DataSet} from './constants';
import {toMode} from './toMode';
import {init as initModel} from './models';
import {onClassifyFish} from './models/train';
import aiBotClosed from '../../public/images/ai-bot-closed.png';

const styles = {
header: {
Expand Down Expand Up @@ -217,7 +218,7 @@ class ActivityIntro extends React.Component {
Next, you’re going to teach A.I. a new word just by showing examples
of that type of fish.
</div>
<img style={styles.activityIntroBot} src="images/ai-bot-closed.png" />
<img style={styles.activityIntroBot} src={aiBotClosed} />
<Footer>
<Button
style={styles.continueButton}
Expand Down Expand Up @@ -318,7 +319,7 @@ class TrainingIntro extends React.Component {
Now let's teach A.I. what <b>{state.word.toUpperCase()}</b> fish look
like.
</div>
<img style={styles.trainingIntroBot} src="images/ai-bot-closed.png" />
<img style={styles.trainingIntroBot} src={aiBotClosed} />
<Footer>
<Button
style={styles.continueButton}
Expand All @@ -344,7 +345,7 @@ class Train extends React.Component {
<Body>
<Header>A.I. Training</Header>
<div style={trainQuestionTextStyle}>{questionText}</div>
<img style={styles.trainBot} src="images/ai-bot-closed.png" />
<img style={styles.trainBot} src={aiBotClosed} />
<Button
style={styles.trainButtonYes}
onClick={() => onClassifyFish(true)}
Expand Down Expand Up @@ -377,7 +378,7 @@ class Predict extends React.Component {
return (
<Body>
<Header>A.I. Sorting</Header>
<img style={styles.predictBot} src="images/ai-bot-closed.png" />
<img style={styles.predictBot} src={aiBotClosed} />
<Footer>
{state.canSkipPredict && (
<Button
Expand Down Expand Up @@ -406,7 +407,7 @@ class Pond extends React.Component {
<Body>
<Header>A.I. Results</Header>
<div style={styles.pondText}>{pondText}</div>
<img style={styles.pondBot} src="images/ai-bot-closed.png" />
<img style={styles.pondBot} src={aiBotClosed} />
</Body>
);
}
Expand Down
6 changes: 6 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export {init as initModel} from './demo/models';
export {default as constants} from './demo/constants';
export {Modes} from './demo/constants';
export * from './demo/state';
export {render as renderCanvas} from './demo/renderer';
export {default as UI} from './demo/ui';
Loading