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

Develop #290

Closed
wants to merge 202 commits into from
Closed
Changes from 6 commits
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
1f44dc7
google tag manager added
rhernandez-intertech Apr 19, 2023
5dc98dc
big brother in prod only
rhernandez-intertech Apr 21, 2023
799ca46
Merge pull request #117 from ORNL-AMO/issue-116
rhernandez-intertech Apr 21, 2023
93474ca
Added .github/workflows - web app deployment pipeline
esserhr Sep 5, 2023
0713b2e
Updated workflows/main.yml - Added branch condition
esserhr Sep 6, 2023
544bf4b
Update web.yml - change caching configuration, update build steps
esserhr Sep 19, 2023
d12c199
Merge pull request #118 from ORNL-AMO/issue-61
rhernandez-intertech Dec 6, 2023
f62674f
added Hydrogen as fuel
rhernandez-intertech Dec 15, 2023
8fb7fe5
Merge pull request #129 from ORNL-AMO/issue-127
nbintertech Dec 19, 2023
30c33bf
added hydrogen test project
rhernandez-intertech Dec 19, 2023
bd0fb98
Merge pull request #132 from ORNL-AMO/issue-128
nbintertech Dec 21, 2023
437ace2
cleaned up data and formatted into table
rhernandez-intertech Jan 8, 2024
b18f762
added key ID to charts
rhernandez-intertech Jan 10, 2024
526b662
table reformatted
rhernandez-intertech Jan 12, 2024
7f001c0
fix vulns
nbintertech Jan 16, 2024
a3781dd
Updated web.yml - add dynamic node setup based on version set in pack…
esserhr Jan 17, 2024
59a0990
Updated package.json - add node/npm engine versions
esserhr Jan 17, 2024
4c74995
year recap graph errors fixed
rhernandez-intertech Jan 19, 2024
ed9aa25
Merge pull request #133 from ORNL-AMO/issue-131
nbintertech Jan 19, 2024
5ea7fe6
Merge pull request #136 from ORNL-AMO/updates
nbintertech Jan 19, 2024
1e4a896
Merge pull request #134 from ORNL-AMO/issue-130
nbintertech Jan 22, 2024
6c859a2
Reorganized year recap, various renaming, add hiddenSpending key
nbintertech Jan 22, 2024
ad533a7
remove debuggers
nbintertech Jan 22, 2024
1fcad2c
Merge pull request #141 from ORNL-AMO/pre-2.0-updates
rhernandez-intertech Jan 22, 2024
7d8eb8d
Merge pull request #137 from ORNL-AMO/integrate-cicd
esserhr Jan 22, 2024
394bbce
carbon replaced with GHG
rhernandez-intertech Jan 22, 2024
1962c1c
Updated web.yml - use npm install instead of ci
esserhr Jan 23, 2024
2ab4f82
Updated web.yml - allow eslint warnings during builds
esserhr Jan 23, 2024
aa28f1e
Merge pull request #149 from ORNL-AMO/integrate-cicd
esserhr Jan 23, 2024
036209a
Merge pull request #148 from ORNL-AMO/issue-135
nbintertech Jan 23, 2024
7073c05
Add financing start year
nbintertech Jan 24, 2024
9bd6c47
Remove semicolon rules
nbintertech Jan 24, 2024
d1e3044
Add GHG/Carbon savings milestone mechanic
nbintertech Jan 24, 2024
4884f65
Merge pull request #151 from ORNL-AMO/financing-150
rhernandez-intertech Jan 24, 2024
070cda5
Merge pull request #152 from ORNL-AMO/update-linter0rules
rhernandez-intertech Jan 24, 2024
54a90a3
Strict mode off, remove quotes, inferrable types rules
nbintertech Jan 25, 2024
aec4bea
Merge pull request #156 from ORNL-AMO/eslint-updates
nbintertech Jan 25, 2024
ea4a8f0
Merge branch 'financing-feat' of https://github.com/ORNL-AMO/Choose-Y…
nbintertech Jan 25, 2024
908a32e
Merge branch 'financing-feat' into issue-146
nbintertech Jan 25, 2024
4448215
Display capital funding rewards at Year recap
nbintertech Jan 25, 2024
c57e645
Merge pull request #158 from ORNL-AMO/issue-146
rhernandez-intertech Jan 25, 2024
03c0948
Break up dialog components
nbintertech Jan 29, 2024
3f04946
Remove redundant dialog props
nbintertech Jan 29, 2024
c7b799f
Merge branch 'financing-feat' of https://github.com/ORNL-AMO/Choose-Y…
nbintertech Jan 29, 2024
f368ea0
Merge pull request #161 from ORNL-AMO/issue-142
nbintertech Jan 29, 2024
d9616ae
Merge pull request #162 from ORNL-AMO/financing-feat
nbintertech Jan 29, 2024
b1592f6
update eslint
nbintertech Jan 29, 2024
e89e244
Merge pull request #163 from ORNL-AMO/update-eslint
nbintertech Jan 29, 2024
1638854
added new properties to define project type
rhernandez-intertech Jan 29, 2024
8457936
Merge pull request #165 from ORNL-AMO/issue-164
nbintertech Jan 29, 2024
4f0d5d3
Db't err on quotes
nbintertech Jan 29, 2024
b0b0bec
Merge pull request #166 from ORNL-AMO/issue-142
nbintertech Jan 29, 2024
062729f
added two hydrogen projects
rhernandez-intertech Jan 30, 2024
01f3cfb
Add financing options to project info and compare dialogs
nbintertech Feb 2, 2024
383d89f
Merge pull request #169 from ORNL-AMO/issue-142
nbintertech Feb 2, 2024
11f3924
Add choose financing options at game settings
nbintertech Feb 2, 2024
7431824
Merge pull request #168 from ORNL-AMO/issue-119
nbintertech Feb 2, 2024
31c5c5e
Merge pull request #171 from ORNL-AMO/issue-170
nbintertech Feb 2, 2024
754e11e
set lastScrollY sate to -1 when loading Year Recap
rhernandez-intertech Feb 5, 2024
d2c55ad
Updated workflow conf - added dev deploy, updated runner labels
esserhr Feb 5, 2024
86c2df7
Merge pull request #175 from ORNL-AMO/173-add-action-job-for-deploys-…
esserhr Feb 5, 2024
f69221b
in scope 1 added fuel switching back
rhernandez-intertech Feb 6, 2024
1b90206
Merge pull request #174 from ORNL-AMO/issue-138
nbintertech Feb 6, 2024
7915b0f
Merge pull request #178 from ORNL-AMO/issue-19
nbintertech Feb 6, 2024
fa6f98a
Add logic and mechanics for financing option, regular projects, and r…
nbintertech Feb 8, 2024
6f08300
Merge pull request #183 from ORNL-AMO/issue-143
nbintertech Feb 8, 2024
e5393b7
Merge branch 'cyos-0.2.0' into financing-merge-fix
nbintertech Feb 8, 2024
4b87fa2
Add responsiveness to year recap charts, alternate colors
nbintertech Feb 9, 2024
7b843ea
Merge pull request #184 from ORNL-AMO/financing-merge-fix
rhernandez-intertech Feb 9, 2024
cddd8e8
Merge branch 'cyos-0.2.0' into issue-167
nbintertech Feb 9, 2024
d5daff1
Merge pull request #185 from ORNL-AMO/issue-167
nbintertech Feb 9, 2024
dc0a7cb
remove nused info cards
nbintertech Feb 12, 2024
d43f5f0
Allow user to implement 2 capital funding rounds
nbintertech Feb 12, 2024
e5d9dda
Merge pull request #188 from ORNL-AMO/issue-187
rhernandez-intertech Feb 12, 2024
ce8c208
Merge pull request #190 from ORNL-AMO/issue-126
rhernandez-intertech Feb 12, 2024
21c3e9a
Add Financing info to year recap projects, tighten up styles
nbintertech Feb 13, 2024
f9ba942
fix capital funding read out
nbintertech Feb 13, 2024
fadda35
Find financing option by page id not index
nbintertech Feb 13, 2024
bcf1f93
change electron installer cmd name
nbintertech Feb 13, 2024
39b65a3
Merge pull request #194 from ORNL-AMO/issue-172
rhernandez-intertech Feb 13, 2024
143033d
Merge pull request #195 from ORNL-AMO/issue-191
rhernandez-intertech Feb 13, 2024
bb97545
Add gameplay readme, fix bugs related to unimplementing renewable
nbintertech Feb 14, 2024
4520a4c
Fix can't render header elements in MUI rendered p tag
nbintertech Feb 14, 2024
405ea47
Fix can't render header elements in MUI rendered p tag
nbintertech Feb 14, 2024
16cc1f7
Merge pull request #198 from ORNL-AMO/issue-147-197
rhernandez-intertech Feb 14, 2024
f4e985b
Merge branch 'cyos-0.2.0' of https://github.com/ORNL-AMO/Choose-Your-…
nbintertech Feb 15, 2024
a4fe0e3
Various financing fixes
nbintertech Feb 15, 2024
15f3292
Only look at financed completed projects
nbintertech Feb 15, 2024
27dac53
Merge pull request #199 from ORNL-AMO/testing-financing
rhernandez-intertech Feb 15, 2024
4d53d11
Hide renewed project in subsequent years, fix previous year broke on …
nbintertech Feb 15, 2024
7b658b2
Handle prev/next year capital funding and financing state, update war…
nbintertech Feb 19, 2024
0d4185a
Merge pull request #205 from ORNL-AMO/issue-200
rhernandez-intertech Feb 19, 2024
f295581
remove dev process check
nbintertech Feb 20, 2024
4f76a8b
Merge pull request #207 from ORNL-AMO/remove-dev
nbintertech Feb 20, 2024
a837e1a
Merge pull request #208 from ORNL-AMO/cyos-0.2.0
nbintertech Feb 20, 2024
e3371cd
add godmode in develop
nbintertech Feb 22, 2024
d578039
Merge pull request #210 from ORNL-AMO/issue-123
nbintertech Feb 22, 2024
2a91c17
Fix cap warning
nbintertech Feb 22, 2024
93fd3bb
Merge pull request #211 from ORNL-AMO/issue-123
nbintertech Feb 22, 2024
77df7e1
Make small solar carport renewable, Remove small solar carport mainte…
nbintertech Feb 23, 2024
f208824
Ensure projects only apply hidden events in first year
nbintertech Feb 23, 2024
160a854
godmode budget update
nbintertech Feb 23, 2024
4b4b1be
Merge pull request #217 from ORNL-AMO/update-godmode
nbintertech Feb 23, 2024
3c7062d
Fix adding duplicate financed projects and rebates when time traveling
nbintertech Feb 23, 2024
a364957
Change xaas to eaas, fix start year in game intervals
nbintertech Feb 26, 2024
d45f437
Merge pull request #218 from ORNL-AMO/issue-216
rhernandez-intertech Feb 26, 2024
40fdc90
snazzy up Capital funding card and header
nbintertech Feb 26, 2024
627eaeb
Move methods to be members of component class
nbintertech Feb 26, 2024
95c5f8e
Merge pull request #219 from ORNL-AMO/issue-215
rhernandez-intertech Feb 26, 2024
157c675
Add yearly emissions factors for electricity
nbintertech Feb 26, 2024
95f13b7
quick fix to Nat Gas unit in chart
rhernandez-intertech Feb 26, 2024
28b8ccc
Merge pull request #220 from ORNL-AMO/issue-186
rhernandez-intertech Feb 26, 2024
2aada5e
Merge pull request #221 from ORNL-AMO/issue-193
rhernandez-intertech Feb 26, 2024
14d40f8
budget and enery cost carryover settings implemented with always opti…
rhernandez-intertech Feb 27, 2024
9e66ddd
Add yearly emissions factors for electricity
nbintertech Feb 26, 2024
00751b1
budget increases by 1/2 at year 6
rhernandez-intertech Feb 27, 2024
d907bed
Merge pull request #222 from ORNL-AMO/issue-213
rhernandez-intertech Feb 27, 2024
0750368
Merge branch 'develop' into cyos-conflict
nbintertech Feb 27, 2024
637810e
Merge pull request #223 from ORNL-AMO/cyos-conflict
rhernandez-intertech Feb 27, 2024
1cf093c
bug fixes to godmode and hidden cost check w/ renewable dependency
nbintertech Feb 27, 2024
7c6dd55
Merge pull request #225 from ORNL-AMO/hotfix-dev
nbintertech Feb 27, 2024
3d104a2
updated projects, added new projects, and changed hydrogen to landfil…
rhernandez-intertech Feb 28, 2024
d3067a8
Merge pull request #226 from ORNL-AMO/issue-224
nbintertech Feb 28, 2024
796299f
Change PPPA related language
nbintertech Feb 28, 2024
8ca114d
Merge pull request #228 from ORNL-AMO/issue-214
nbintertech Feb 28, 2024
07a45c1
updates and fixes to projects
rhernandez-intertech Feb 28, 2024
1ea5359
Merge pull request #231 from ORNL-AMO/issue-230
nbintertech Feb 28, 2024
ab315db
year recap clean up
rhernandez-intertech Feb 28, 2024
4e23b6c
Merge pull request #232 from ORNL-AMO/issue-227
nbintertech Feb 28, 2024
f735c8a
fix project costs
nbintertech Feb 28, 2024
a695ef8
remove godmode with offending server env var
nbintertech Feb 28, 2024
55e76ef
Merge pull request #233 from ORNL-AMO/issue-229
nbintertech Feb 28, 2024
34bb056
Change small solar carport, rooftop mid solar to one time payment tha…
nbintertech Feb 29, 2024
eeca215
Merge branch 'develop' of https://github.com/ORNL-AMO/Choose-Your-Own…
nbintertech Feb 29, 2024
13db289
Merge pull request #236 from ORNL-AMO/issue-229
nbintertech Feb 29, 2024
fd5a6eb
cleanup console logs
nbintertech Feb 29, 2024
19bf896
Merge pull request #238 from ORNL-AMO/cleanup-logs
nbintertech Feb 29, 2024
9b00e8d
landfill gas defaults
nbintertech Feb 29, 2024
59552a7
Merge pull request #239 from ORNL-AMO/hotfix-any-bugs
nbintertech Feb 29, 2024
8ac22f0
Fix prev year capita funding state
nbintertech Feb 29, 2024
9f9bf18
Merge pull request #241 from ORNL-AMO/issue-200-b
nbintertech Feb 29, 2024
67427f2
fixed bug when calculating emissionsFromElectricityFormatted in dashb…
rhernandez-intertech Feb 29, 2024
8f63be2
Merge pull request #242 from ORNL-AMO/issue-235
nbintertech Feb 29, 2024
b026ff3
Update README, describing variable for must finance projects
nbintertech Feb 29, 2024
d94ba69
Merge pull request #243 from ORNL-AMO/hotfix-any-bugs
nbintertech Feb 29, 2024
356ed90
Add env files for dev/prod
nbintertech Mar 1, 2024
b5e7a43
Updated web.yml - added conditional to build step and updated build s…
esserhr Mar 6, 2024
c8eb3fd
Merge pull request #244 from ORNL-AMO/issue-240
nbintertech Mar 6, 2024
0c7b7d2
Add End of Game report
nbintertech Mar 6, 2024
04eb094
Merge branch 'develop' of https://github.com/ORNL-AMO/Choose-Your-Own…
nbintertech Mar 6, 2024
07ade0b
Add raw text shorttitle
nbintertech Mar 6, 2024
8fd1325
Project cost updates, add isPPA flag and apply costs every year
nbintertech Mar 11, 2024
b4c9d36
end year report chart changed to GHG reductions
rhernandez-intertech Mar 11, 2024
64a9fa9
Capital funds eligibiility added to forklift proj
nbintertech Mar 12, 2024
a562d83
Update financing options text, switch order of form
nbintertech Mar 12, 2024
b4fac52
Implement limits for financed projects
nbintertech Mar 12, 2024
ffadeaf
Merge pull request #249 from ORNL-AMO/issue-248
nbintertech Mar 12, 2024
8a2ad2f
Merge pull request #254 from ORNL-AMO/issue-252
nbintertech Mar 12, 2024
ecf0f01
energy cost savings applied to next years budget is reduced by 50%
rhernandez-intertech Mar 12, 2024
7e33d33
Merge pull request #257 from ORNL-AMO/issue-255
rhernandez-intertech Mar 12, 2024
07a3cdf
Merge branch 'develop' of https://github.com/ORNL-AMO/Choose-Your-Own…
rhernandez-intertech Mar 12, 2024
3254ead
Merge pull request #247 from ORNL-AMO/issue-123-b
rhernandez-intertech Mar 12, 2024
75e1857
old compressor project gets a surprise
rhernandez-intertech Mar 12, 2024
82b35ed
Fix logic for getting fully funded status
nbintertech Mar 13, 2024
ecea5d1
Merge pull request #259 from ORNL-AMO/issue-206
nbintertech Mar 13, 2024
b4291bb
fix implemented PPA's always apply costs
nbintertech Mar 13, 2024
bdd1c91
Merge pull request #260 from ORNL-AMO/issue-206
nbintertech Mar 13, 2024
66c6dfc
fixed to Old Compressors surpise
rhernandez-intertech Mar 13, 2024
ec2c5c9
Fix wrong arg type from undetected merge conf
nbintertech Mar 13, 2024
9076e81
Merge pull request #262 from ORNL-AMO/hotfix
nbintertech Mar 13, 2024
52817bc
Merge pull request #258 from ORNL-AMO/issue-256
nbintertech Mar 13, 2024
577d483
Use title and text of surprise
nbintertech Mar 13, 2024
73e7b74
Merge pull request #263 from ORNL-AMO/fix-surprises
nbintertech Mar 13, 2024
acbe9af
Update spending results and fix cost per carbon kg
nbintertech Mar 13, 2024
ed9eea1
Merge branch 'develop' into issue-206
nbintertech Mar 13, 2024
0f2860e
Update yearEndtotalSpending comment
nbintertech Mar 13, 2024
6779dbc
Add EOG projections, fix year recap projections
nbintertech Mar 14, 2024
1c85a61
Merge pull request #267 from ORNL-AMO/issue-180
nbintertech Mar 14, 2024
986b4f0
Add choose god mode budget
nbintertech Mar 14, 2024
be3b6ab
Merge pull request #268 from ORNL-AMO/hotfix-add-custom-budget
nbintertech Mar 14, 2024
b32aaeb
Fix end game year in electricity emissions factors obvject
nbintertech Mar 14, 2024
10e2f9b
end of year charts no longer go out of range
rhernandez-intertech Mar 14, 2024
5a9e50c
Obey loan terms in 2 year
nbintertech Mar 15, 2024
cb9fb20
Merge pull request #272 from ORNL-AMO/issue-265
nbintertech Mar 15, 2024
df0c7c5
Merge branch 'develop' of https://github.com/ORNL-AMO/Choose-Your-Own…
nbintertech Mar 15, 2024
028c905
Merge pull request #269 from ORNL-AMO/issue-266
nbintertech Mar 15, 2024
6b3c729
Merge pull request #271 from ORNL-AMO/issue-253
nbintertech Mar 15, 2024
f77b1bf
Merge branch 'develop' into issue-251
nbintertech Mar 15, 2024
11a8174
Merge pull request #273 from ORNL-AMO/issue-251
nbintertech Mar 15, 2024
523229a
Make EOG report viewable at lose page
nbintertech Mar 15, 2024
89ca92e
Merge pull request #274 from ORNL-AMO/issue-270
nbintertech Mar 15, 2024
d8e5958
end of game chart title fix
rhernandez-intertech Mar 15, 2024
94b0222
Add yearly cost savings to selected renewable projects
nbintertech Mar 18, 2024
861ff84
Merge pull request #276 from ORNL-AMO/issue-237
nbintertech Mar 18, 2024
20f87f1
Remove offending comma
nbintertech Mar 18, 2024
d2c0d46
Merge pull request #277 from ORNL-AMO/issue-275
nbintertech Mar 18, 2024
2ce1130
Fixes to End of Game report
rhernandez-intertech Mar 18, 2024
fc5c0af
Merge pull request #280 from ORNL-AMO/issue-123-c
nbintertech Mar 19, 2024
54203d1
removed case study from waste heat recovery and changed electreicity …
rhernandez-intertech Mar 20, 2024
b2613c9
increased NG starting val and adjusted project %'s
rhernandez-intertech Mar 20, 2024
5c3dc5b
Merge pull request #282 from ORNL-AMO/issue-115
nbintertech Mar 21, 2024
345b0e7
Merge pull request #283 from ORNL-AMO/issue-278
nbintertech Mar 21, 2024
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
11 changes: 11 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: CI/CD

on:
push:
branches:
- 'main'
workflow_dispatch:

jobs:
web:
uses: ./.github/workflows/web.yml
51 changes: 51 additions & 0 deletions .github/workflows/web.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Web

on:
workflow_call:

jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Get Node version
run: echo "BUILD_NODE_VER=$(grep -o -P -m 1 '(?<=node":\s").*(?=")' package.json)" >> $GITHUB_ENV
- name: Node setup
uses: actions/setup-node@v3
with:
node-version: ${{ env.BUILD_NODE_VER }}
- name: Cache dependencies
uses: actions/cache@v3
with:
path: ~/.npm
key: npm-${{ hashFiles('package-lock.json') }}
restore-keys: npm-
- name: Install dependencies
run: npm ci
- name: Build
run: npm run build
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: build
path: ./build

deploy:
runs-on: [self-hosted, amo-tools]
needs: build
env:
APACHE_DIR: /var/www/html
BACKUP_DIR: /opt/actions-runner/backups
steps:
- name: Get artifact
uses: actions/download-artifact@v3
with:
name: build
- name: Deploy
run: |
tar -czf $BACKUP_DIR/cyos_$(printf '%(%Y-%m-%d)T\n' -1)_${GITHUB_SHA::7}.tar.gz $APACHE_DIR/cyos
rm -rf $APACHE_DIR/cyos/*
chgrp -R apache ./
mv ./* $APACHE_DIR/cyos/
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@
"name": "choose-your-own-solution",
"version": "0.1.0",
"private": true,
"engines": {
"node": "20.10.0",
"npm": "10.2.3"
},
"dependencies": {
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",