Skip to content

Commit 2640961

Browse files
author
Vanessa Naff
committedNov 3, 2018
Merge branch 'develop' of github.com:NorthwestGreenChemistry/PrISM
2 parents 5ed1a71 + 5d5ef18 commit 2640961

24 files changed

+3559
-26030
lines changed
 

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,14 @@ app/renderer.prod.js
4343
app/renderer.prod.js.map
4444
app/style.css
4545
app/style.css.map
46+
app/package-lock.json
4647
dist
4748
dll
4849
main.js
4950
main.js.map
5051

5152
.idea
5253
npm-debug.log.*
54+
55+
# For npm people
56+
package-lock.json

‎.travis.yml

+70-23
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,83 @@
11
sudo: true
22
matrix:
33
include:
4-
- os: osx
5-
osx_image: xcode9.4
6-
language: node_js
7-
node_js:
8-
- node
9-
- '9'
10-
env:
11-
- ELECTRON_CACHE=$HOME/.cache/electron
12-
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
4+
- os: osx
5+
osx_image: xcode9.4
6+
language: node_js
7+
node_js:
8+
- node
9+
- '9'
10+
env:
11+
- ELECTRON_CACHE=$HOME/.cache/electron
12+
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
13+
14+
- os: linux
15+
services: docker
16+
language: node_js
17+
node_js:
18+
- node
19+
- '9'
20+
addons:
21+
apt:
22+
sources:
23+
- ubuntu-toolchain-r-test
24+
packages:
25+
- gcc-multilib
26+
- g++-8
27+
- g++-multilib
28+
- icnsutils
29+
- graphicsmagick
30+
- xz-utils
31+
- xorriso
32+
- rpm
33+
1334
before_cache:
14-
- rm -rf $HOME/.cache/electron-builder/wine
35+
- rm -rf $HOME/.cache/electron-builder/wine
36+
1537
cache:
1638
yarn: true
1739
directories:
18-
- node_modules
19-
- app/node_modules
20-
- "$(npm config get prefix)/lib/node_modules"
21-
- flow-typed
22-
- "$HOME/.cache/electron"
23-
- "$HOME/.cache/electron-builder"
24-
- "$HOME/docker"
40+
- node_modules
41+
- app/node_modules
42+
- "$(npm config get prefix)/lib/node_modules"
43+
- flow-typed
44+
- "$HOME/.cache/electron"
45+
- "$HOME/.cache/electron-builder"
46+
- "$HOME/docker"
47+
2548
before_install:
26-
- npm install -g serverless
27-
- curl -o- -L https://yarnpkg.com/install.sh | bash
28-
- export PATH="$HOME/.yarn/bin:$PATH"
49+
- npm install -g serverless
50+
- curl -o- -L https://yarnpkg.com/install.sh | bash
51+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-8"; fi
52+
- export PATH="$HOME/.yarn/bin:$PATH"
53+
2954
install:
30-
- yarn
55+
- yarn
56+
# On Linux, initialize "virtual display". See before_script
57+
- |
58+
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
59+
/sbin/start-stop-daemon \
60+
--start \
61+
--quiet \
62+
--pidfile /tmp/custom_xvfb_99.pid \
63+
--make-pidfile \
64+
--background \
65+
--exec /usr/bin/Xvfb \
66+
-- :99 -ac -screen 0 1280x1024x16
67+
else
68+
:
69+
fi
70+
71+
before_script:
72+
# On Linux, create a "virtual display". This allows browsers to work properly
73+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
74+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
75+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sleep 3; fi
76+
3177
script:
32-
- yarn build
33-
- yarn dist
78+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then yarn build && yarn dist; fi
79+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then yarn build && yarn dist -- --mac --win; fi
80+
3481
deploy:
3582
provider: releases
3683
skip_cleanup: true

‎README.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
    
12
[![Build Status](https://travis-ci.com/NorthwestGreenChemistry/PrISM.svg?branch=develop)](https://travis-ci.com/NorthwestGreenChemistry/PrISM)
3+
    
4+
<img src="https://forthebadge.com/images/badges/built-with-science.svg" />
5+
<img src="https://forthebadge.com/images/badges/made-with-javascript.svg" />
6+
<img src="https://forthebadge.com/images/badges/powered-by-responsibility.svg" />
7+
28
# PrISM
39

410
<img src="/app/assets/0-prism-cycle/prism-infographic.png" width="400" height="460" alt="Prism Wheel">
@@ -15,7 +21,9 @@ Northwest Green Chemistry does not transmit client data to a server or maintain
1521

1622
**How do I download it?**
1723

18-
*TBD after packaging.* 🙃
24+
[PrISM Releases ✨](https://github.com/NorthwestGreenChemistry/PrISM/releases)
25+
26+
Select the latest release. Find your installer (mac, win, or linux) under **Assets** and click to download. That's it!
1927

2028
**How do I use it?**
2129

‎app/app.global.css

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* See https://github.com/webpack-contrib/sass-loader#imports
44
*/
55
@import "~@fortawesome/fontawesome-free/css/all.css";
6+
@import url('https://fonts.googleapis.com/css?family=Nunito+Sans:regular,bold,italic&subset=latin,latin-ext');
67

78
body {
89
position: relative;

‎app/assets/prism-infographic.ai

+2,389
Large diffs are not rendered by default.

‎app/assets/quiz/guiding_questions1.json

+22-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"title": "Background",
33
"type": "object",
44
"properties": {
5-
"firstquestion": {
6-
"title": "How would you describe the type of product are you planning to make? For example, is the product a substance, a formulated chemical product, a material, or an article? Is it a homogenous or heterogenous material? What is the product?",
5+
"How would you describe the type of product are you planning to make? For example, is the product a substance, a formulated chemical product, a material, or an article? Is it a homogenous or heterogenous material? What is the product?": {
76
"description": "For a complicated product with many components, it may be valuable to complete PrISM for each component as opposed to only for the whole product.",
87
"type": "string"
98
},
@@ -28,8 +27,7 @@
2827
"title": "Feedstock priorities",
2928
"type": "object",
3029
"properties": {
31-
"question": {
32-
"title": "What is the preferred feedstock goal or goals? Please select all that apply.",
30+
"What is the preferred feedstock goal or goals? Please select all that apply.": {
3331
"type": "array",
3432
"items": {
3533
"type": "string",
@@ -45,6 +43,26 @@
4543
},
4644
"uniqueItems": "true"
4745
}
46+
},
47+
"dependencies": {
48+
"question": {
49+
"oneOf": [
50+
{
51+
"properties" : {
52+
"question": {
53+
"items": {
54+
"enum": [
55+
"Other"
56+
]
57+
}
58+
},
59+
"Other": {
60+
"type": "string"
61+
}
62+
}
63+
}
64+
]
65+
}
4866
}
4967
},
5068
"production": {
+168-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,168 @@
1-
{}
1+
{
2+
"title": "Introduction to Production and Manufacturing",
3+
"type": "object",
4+
"properties": {
5+
"chemicalInventory" : {
6+
"title": "See Resource: Chemical Inventory:",
7+
"type": "object",
8+
"properties": {
9+
"chemsUsed": {
10+
"title": "What chemicals and materials are used during production and manufacturing? Consider reagents, catalysts, auxiliaries, and ingredients intentionally added to provide performance properties.",
11+
"description" : "(See Chemical Inventory)",
12+
"type": "string"
13+
},
14+
"usedHazardous": {
15+
"title": "Are the chemicals used during production and manufacturing hazardous?",
16+
"type": "string",
17+
"enum": ["Yes", "No", "I don't know"]
18+
},
19+
"chemManufacturing": {
20+
"title": "What chemicals and materials are produced during production and manufacturing?",
21+
"description": "(See Chemical Inventory)",
22+
"type" : "string"
23+
},
24+
"manufacturingHazard": {
25+
"title": "Are the chemicals produced during production and manufacturing hazardous?",
26+
"type": "string",
27+
"enum": ["Yes", "No", "I don't know"]
28+
},
29+
"workerHazards": {
30+
"title": "Are the chemicals used or produced in a form that is hazardous to workers? For example, if wood is used in manufacturing, are you producing wood dust which is an inhalation hazard?",
31+
"type": "string",
32+
"enum": ["Yes", "No", "I don't know"]
33+
},
34+
"chemInhaled": {
35+
"title": "Are the chemicals in a form that can be inhaled, ingested or absorbed through the skin?",
36+
"type": "string",
37+
"enum": ["Yes", "No", "I don't know"]
38+
}
39+
},
40+
"dependencies": {
41+
"workerHazards": {
42+
"oneOf": [
43+
{
44+
"properties" : {
45+
"workerHazards": {
46+
"enum": [
47+
"Yes"
48+
]
49+
},
50+
"What is the hazard?": {
51+
"type": "string"
52+
}
53+
}
54+
}
55+
]
56+
}
57+
}
58+
},
59+
"exposureAssessment": {
60+
"title": "See Resource: Exposure Assessment:",
61+
"type": "object",
62+
"properties": {
63+
"exposedWho": {
64+
"title": "Who is likely to be exposed to production chemicals during production and manufacturing? Workers? Nearby communities?",
65+
"description": "Check all that apply.",
66+
"type": "array",
67+
"items": {
68+
"type": "string",
69+
"enum": [
70+
"Workers",
71+
"Workers' families (e.g. by workers carrying dust home on clothing)",
72+
"Nearby communities",
73+
"Farther out communities (e.g. downstream)",
74+
"Unsure/don't know"
75+
]
76+
},
77+
"uniqueItems": "true"
78+
},
79+
"exposedHow": {
80+
"title": "For chemicals used and produced during production and manufacturing, what are the likely routes of exposure?",
81+
"type": "array",
82+
"items": {
83+
"type": "string",
84+
"enum": [
85+
"Oral",
86+
"Dermal",
87+
"Inhalation",
88+
"Other",
89+
"Don't Know"
90+
]
91+
},
92+
"uniqueItems": "true"
93+
}
94+
}
95+
},
96+
"hazardAssessment": {
97+
"title": "See Resource: Hazard Assessment:",
98+
"type": "object",
99+
"properties": {
100+
"screeningAssessment": {
101+
"title": "Have you conducted a screening chemical hazard assessment on the chemicals used and produced?",
102+
"type": "string",
103+
"enum": ["Yes - all", "Yes - some", "No", "I don't know"]
104+
},
105+
"comprehensiveAssessment": {
106+
"title": "Have you conducted a comprehensive chemical hazard assessment, particularly on chemicals for which there is worker and/or community exposure?",
107+
"type": "string",
108+
"enum": ["Yes - all", "Yes - some", "No", "I don't know"]
109+
},
110+
"mappedExposure": {
111+
"title": "Have you mapped chemical exposure to chemical hazards using a method such as control banding described in the next column?",
112+
"description": "LINK TO CONTROL BANDING",
113+
"type": "string",
114+
"enum": ["Yes - all", "Yes - some", "No", "I don't know"]
115+
}
116+
}
117+
},
118+
"stakeholder": {
119+
"title": "See Resource: Stakeholder Considerations:",
120+
"type": "object",
121+
"properties": {
122+
"neighbors": {
123+
"title": "Are there potential impacts be to workers and those who live around the production or manufacturing facility who may be exposed to chemicals used in production and manufacturing? Chemicals don't need to be hazardous to be a nuisance to neighbors (e.g. odors).",
124+
"type": "string",
125+
"enum": ["Yes", "No", "I don't know"]
126+
}
127+
}
128+
},
129+
"lifecycle": {
130+
"title": "See Resource: Life Cycle Considerations:",
131+
"type": "object",
132+
"properties": {
133+
"productionWaste": {
134+
"title": "What wastes are created during production and manufacturing?",
135+
"type": "string"
136+
},
137+
"hazardousWaste": {
138+
"title": "Are these wastes hazardous?",
139+
"type": "string",
140+
"enum": ["Yes", "No", "I don't know"]
141+
},
142+
"wasteDisposal": {
143+
"title": "How are these wastes disposed of?",
144+
"type": "array",
145+
"items": {
146+
"type": "string",
147+
"enum": [
148+
"Landfill",
149+
"Waste-to-energy",
150+
"Recycling",
151+
"Industrial composting",
152+
"Wastewater treatment plant (down the drain)",
153+
"Direct discharge to environement",
154+
"Other (fill in box)",
155+
"I don't know"
156+
]
157+
},
158+
"uniqueItems": "true"
159+
},
160+
"measurement": {
161+
"title": "Do you measure the use of energy, water and materials and the generation of waste in order to benchmark a product against other products to maximize resource efficiency?",
162+
"type": "string",
163+
"enum": ["Yes", "No", "I don't know"]
164+
}
165+
}
166+
}
167+
}
168+
}

0 commit comments

Comments
 (0)
Please sign in to comment.