Skip to content
This repository has been archived by the owner on Oct 11, 2023. It is now read-only.

[LRP2] Hydra-ize local play and server deploys. #309

Merged
merged 1,543 commits into from
Dec 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1543 commits
Select commit Hold shift + click to select a range
a46d00b
fixed spacing issue from help message (#238)
JustinPinero May 14, 2021
02ec6ed
Mobile restyling Fixes (#239)
JustinPinero May 17, 2021
1073970
fixed fonts on level dispaly and progress bar, changed logout button …
JustinPinero May 26, 2021
4c1e578
fixed sizing of messages, sizing of text, send button styling
JustinPinero May 26, 2021
475ea76
Merge pull request #242 from facebookresearch/ui-fixes-3
JustinPinero Jun 10, 2021
643bb5d
parse actions with wierd quotes (#244)
JackUrb Jun 14, 2021
7b9b396
Updating parser for multithreading (#251)
JackUrb Aug 9, 2021
7fa6605
added say and do buttons added documentation
JustinPinero Aug 20, 2021
6e53c89
removed unused code and added more documentation to chatdisplay compo…
JustinPinero Aug 20, 2021
118a438
adding mobile style fixes to progress bar and level display
JustinPinero Aug 23, 2021
33868e8
wired tell feature
JustinPinero Aug 24, 2021
ae54785
fixed repsonsive styling of player info icons on mobile
JustinPinero Aug 24, 2021
66244c4
adding redux
JustinPinero Aug 25, 2021
d902725
added redux and redux toolkit
JustinPinero Aug 31, 2021
e93bf67
added typescript to game app
JustinPinero Aug 31, 2021
817e784
Server data browsing scripts and fixes (#255)
JackUrb Sep 1, 2021
9a9be9d
Requirements fix (#258)
JackUrb Sep 1, 2021
475ffba
Human to player (#259)
JackUrb Sep 1, 2021
d3837c2
Crowdsourcing UI (#261)
JackUrb Sep 1, 2021
3777b36
Merge branch 'main' into using-model-pool
JackUrb Sep 1, 2021
68640bc
Fixing npc assignment bug (#263)
JackUrb Sep 7, 2021
c83984e
added redux foundation, added personal info slices, added xp, giftxp,…
JustinPinero Sep 8, 2021
65746ea
added increaseXp and decrementGiftXp to reducer actions
JustinPinero Sep 8, 2021
e9d4f2f
added foundation for redux websocket integration
JustinPinero Sep 9, 2021
13a8a70
added documentation to slices, wired xp and giftxp redux state into e…
JustinPinero Sep 10, 2021
13b8a2e
removed passed props from experience info components
JustinPinero Sep 10, 2021
12506bd
added sessioninfo section to features, added session xp slice, added …
JustinPinero Sep 10, 2021
4547328
removed xp props from sidebar
JustinPinero Sep 10, 2021
5c42499
fixed emoji picker redux action, added view slice
JustinPinero Sep 13, 2021
9cc7403
Added documentation to GamePage for new state and useEffects, removed…
JustinPinero Sep 13, 2021
f4496b0
added chatInput Slice
JustinPinero Sep 13, 2021
90f79e1
restructured messages and types, restyling messages
JustinPinero Sep 13, 2021
fc69fed
fixed overlapping system messages
JustinPinero Sep 13, 2021
eb89633
restructured message types and styles, fixed help message overlap bug…
JustinPinero Sep 14, 2021
a6d2e00
restyled help message for both mobile and desktop
JustinPinero Sep 14, 2021
784c85e
Multi-agent chat first pass (#264)
JackUrb Sep 14, 2021
519f3cb
removed console logs, unused code, added substantial documentation, r…
JustinPinero Sep 14, 2021
6cfcb03
added styling for safari browser, added styling for mobile, fixed mai…
JustinPinero Sep 14, 2021
2b9ddb7
building tutorial popover
JustinPinero Sep 16, 2021
32f15cb
added info button
JustinPinero Sep 16, 2021
c369b33
added tutorial popover component, added gamecopy file with tutorial c…
JustinPinero Sep 16, 2021
f5a42d5
added tooltips to both chat display and sidebar
JustinPinero Sep 16, 2021
9b4f8c9
added help mode, added on click tool tips to playerinfo, Character i…
JustinPinero Sep 22, 2021
9713b81
added tooltips and animations to quest message, status message, agent…
JustinPinero Sep 22, 2021
ea63ee3
added tooltips and animations for inventory, send button, chat input,…
JustinPinero Sep 22, 2021
7d14f99
added infobutton component, added render condition to infobutton in s…
JustinPinero Sep 24, 2021
0350863
fixed toggle to clear tooltips during switch when in help mode
JustinPinero Sep 24, 2021
be8a582
added and styled final tool tips, fixed cycle tooltips on chat bar, f…
JustinPinero Sep 24, 2021
79eeed9
Merge pull request #267 from facebookresearch/help-mode
JustinPinero Sep 24, 2021
73a0935
Merge pull request #265 from facebookresearch/gameapp-ui-update4
JustinPinero Sep 27, 2021
cee8d88
Added lightqa readme that shows how to run seq2seq2seq interactively …
leox1v Oct 13, 2021
ae75d8d
Creating a light world object from an instance of the old graph (#269)
mojtaba-komeili Oct 14, 2021
8b62f36
Updated lightqa readme with new checkpoints. (#270)
leox1v Oct 15, 2021
f051a33
Clarifying the equipped objects (#271)
mojtaba-komeili Oct 20, 2021
87e2711
Documentation time (#273)
JackUrb Jan 24, 2022
cd09544
Creating `light` master script for ParlAI tooling (#274)
JackUrb Jan 24, 2022
44d366e
adding common sense + world builder code
Alex-Gurung Jan 27, 2022
e33dc86
Merging in teachers and code for RL-Quests paper. (#275)
JackUrb Jan 31, 2022
b302099
Rl quests merge (#276)
JackUrb Jan 31, 2022
efa0673
Intro code for new project (#279)
JackUrb Feb 15, 2022
cab6d82
Merge branch 'main' into commonsense-merge
Alex-Gurung Feb 15, 2022
4301100
Merge pull request #278 from facebookresearch/commonsense-merge
Alex-Gurung Feb 15, 2022
758d141
initial setup for both object interaction tasks
Alex-Gurung Mar 1, 2022
ab82ce7
small cleanup task reviewing
Alex-Gurung Mar 1, 2022
64593f3
default attr. from light db, make editable
Alex-Gurung Mar 3, 2022
6605891
small bug fix & format changes
Alex-Gurung Mar 7, 2022
3cf14ad
slightly cleaner in-place update
Alex-Gurung Mar 7, 2022
3696e01
Task lightgame (#281)
JustinPinero Mar 16, 2022
e3b9fab
messy separation into tasks, needs cleanup
Alex-Gurung Mar 22, 2022
717d6f0
Pre-authorized worker login (#282)
JackUrb Mar 24, 2022
e498c24
polishing new tasks, making to-fill more distinct
Alex-Gurung Mar 28, 2022
481ff18
remove location box from attribute task
Alex-Gurung Mar 28, 2022
fd7f3a9
updating constraint task with backstory q
Alex-Gurung Mar 28, 2022
3c82cfb
rename narration field, remove deleted obj
Alex-Gurung Mar 30, 2022
77dbae6
removed deleted options, action phrase
Alex-Gurung Mar 30, 2022
e22f91d
Gameapp instruction modal removal (#285)
JustinPinero Apr 11, 2022
20f8e87
Tutorial world, full implementation (#266)
JackUrb Apr 12, 2022
e1ca97a
Single model, reusing ActionParser (#286)
JackUrb Apr 12, 2022
badc60d
World hotfix
JackUrb Apr 12, 2022
cd4e2cc
Small deploy-related fixes (#287)
JackUrb Apr 14, 2022
3983f6a
LIGHT Tutorial fixes (#289)
JackUrb Apr 19, 2022
dd6850f
Worldbuilder update (#272)
JustinPinero May 6, 2022
63051b9
New database stubs for updated data model
JackUrb May 11, 2022
388efc2
Enums, Dataclasses
JackUrb May 12, 2022
bad0d45
addressing some comments
JackUrb May 16, 2022
a8ad858
Filling out UserDB
JackUrb May 17, 2022
f229661
Abstract enforce get first
JackUrb May 18, 2022
8eba75d
Clearer argument - num_turns
JackUrb May 18, 2022
411148f
Using enums in DB
JackUrb May 18, 2022
1ef8be9
Initial episode data model
JackUrb May 18, 2022
b198bb9
Update content loggers to use episode formatting
JackUrb May 18, 2022
256ef7b
Updating tables to work with testing
JackUrb May 18, 2022
0cd1267
Fixing some test changes
JackUrb May 18, 2022
9167d22
Fixing small warnings that were noise during tests
JackUrb May 18, 2022
f32a6d0
Moving default log path
JackUrb May 19, 2022
320d4f1
Test fix
JackUrb May 19, 2022
e178702
Correcting math thanks to Kurt
JackUrb May 20, 2022
b167526
updating narration and first 2 grounding tasks
Alex-Gurung May 24, 2022
acbfdcb
Merge branch 'main' into object-interaction-tasks
Alex-Gurung May 24, 2022
cf7a6c6
updates for whole pipline
Alex-Gurung Jun 13, 2022
255f1ef
cleanup, deleted a file
Alex-Gurung Jun 13, 2022
22836bd
Updating env DB classes to SQLAlchemy
JackUrb Jul 15, 2022
dffe54c
Name keys and Elems coded
JackUrb Jul 18, 2022
bcc7766
Adding arbitrary node attributes
JackUrb Jul 19, 2022
1083f9d
First complete pass of EnvDB
JackUrb Jul 19, 2022
49b4fb6
Mypy fixings
JackUrb Jul 20, 2022
cabd75a
Fixing agents
JackUrb Jul 20, 2022
9d597e6
Writing some tests
JackUrb Jul 20, 2022
b71af9b
Finishing tests for object and room creates and queries
JackUrb Jul 20, 2022
ea380f1
Edge testing
JackUrb Jul 20, 2022
29f3489
Arbitrary attributes testing
JackUrb Jul 20, 2022
30f333f
Quests and testing
JackUrb Jul 22, 2022
688729a
And finally, DBGraph tests
JackUrb Jul 22, 2022
f25e2ac
fixing episode change
JackUrb Jul 22, 2022
d3099f1
TODO function
JackUrb Jul 22, 2022
7e8b0ed
final mypy fixes
JackUrb Jul 22, 2022
fffa66f
DBID testing
JackUrb Jul 25, 2022
c8d3b7b
a -> either a or an depending on aeiou
JackUrb Jul 25, 2022
94d5bfc
adding WorldConfig to hold complex configuration vars
JackUrb Jul 25, 2022
80d0e78
Moving episode_db into relevant GraphBuilders
JackUrb Jul 25, 2022
8d790c1
Game launches, but not logging
JackUrb Jul 25, 2022
7de8b52
Local BaseDB, now saving episodes
JackUrb Jul 26, 2022
d24e6f4
Missing files
JackUrb Jul 26, 2022
e6bad03
deleting miscommit
JackUrb Jul 26, 2022
f8db342
test fix
JackUrb Jul 26, 2022
b81ec10
Migrating to UserDB
JackUrb Jul 26, 2022
600b323
No more LIGHTDatabase in TornadoServer
JackUrb Jul 27, 2022
223c1a8
Fixing tests
JackUrb Jul 27, 2022
b6907c8
Works after testing locally
JackUrb Jul 27, 2022
c9545be
Updated messaging for unimplemented
JackUrb Jul 27, 2022
e8245f2
Merge branch 'main' into using-model-pool
JackUrb Jul 27, 2022
5ff01b8
Merge branch 'using-user-db' into using-model-pool
JackUrb Jul 27, 2022
1222534
Upgrading OneRoomGraphBuilder to ModelPool
JackUrb Jul 27, 2022
a04ca43
Completing (almost) the rest of Modelpool references
JackUrb Jul 27, 2022
576c36e
Works without loading models in play_map
JackUrb Jul 27, 2022
3de846a
Model pool actually works
JackUrb Jul 27, 2022
bce3937
Safety working as well
JackUrb Jul 28, 2022
173d21f
Rebuild on main, committed (#299)
JackUrb Jul 28, 2022
a06a3a9
Merge branch 'main' into new-data-model
JackUrb Jul 28, 2022
bc78c56
Merge branch 'new-data-model' into new-users-table
JackUrb Jul 28, 2022
9a18269
Merge branch 'new-users-table' into new-episode-logging
JackUrb Jul 28, 2022
71ea8ab
Merge branch 'new-episode-logging' into new-environment-db
JackUrb Jul 28, 2022
22eb9b6
Merge branch 'new-environment-db' into using-episode-db
JackUrb Jul 28, 2022
6807aae
Merge branch 'using-episode-db' into using-user-db
JackUrb Jul 28, 2022
c6213b6
Merge branch 'using-user-db' into using-model-pool
JackUrb Jul 28, 2022
d23811e
requirements
JackUrb Jul 28, 2022
5d96c92
removing prints
JackUrb Jul 28, 2022
67bd4ce
Fix tests on `main` (#301)
JackUrb Jul 29, 2022
6577160
Merge branch 'main' into new-data-model
JackUrb Jul 29, 2022
f4f3ee6
Merge branch 'new-data-model' into new-users-table
JackUrb Jul 29, 2022
2f35c75
Merge branch 'new-users-table' into new-episode-logging
JackUrb Jul 29, 2022
0eefe18
Merge branch 'new-episode-logging' into new-environment-db
JackUrb Jul 29, 2022
9b9b075
Merge branch 'new-environment-db' into using-episode-db
JackUrb Jul 29, 2022
ba079df
Merge branch 'using-episode-db' into using-user-db
JackUrb Jul 29, 2022
edb1208
Merge branch 'using-user-db' into using-model-pool
JackUrb Jul 29, 2022
6a072f1
Fixing some tests, skipping starspace
JackUrb Jul 29, 2022
18567ab
Runs on server too
JackUrb Jul 29, 2022
650ede7
Creating LIGHT's ModelServer
JackUrb Aug 3, 2022
b0b7e76
Undo server change
JackUrb Aug 3, 2022
8b13128
tornado simplicity
JackUrb Aug 3, 2022
28af17b
Handling for inline candidate models
JackUrb Aug 4, 2022
6d97730
But regular models should also work without this
JackUrb Aug 4, 2022
7c929f0
Async... all of the things...
JackUrb Aug 8, 2022
2a3a123
Async the server too
JackUrb Aug 9, 2022
62df6e1
clearing up async server tests
JackUrb Aug 9, 2022
ac1fce2
Correct async mock
JackUrb Aug 9, 2022
50d9717
internalize init_world
JackUrb Aug 9, 2022
84e299b
clean up tornado usage
JackUrb Aug 9, 2022
74b4adb
small GameInstance bug
JackUrb Aug 9, 2022
32dc1da
small GameInstance bug
JackUrb Aug 9, 2022
961f225
Some deploy fixes
JackUrb Aug 9, 2022
5e5cd73
now using aws as a storage backend
JackUrb Aug 10, 2022
fc9de7d
Moving safety model to async part
JackUrb Aug 11, 2022
12fd62a
Some safety fixes
JackUrb Aug 11, 2022
c619d18
test fixes
JackUrb Aug 11, 2022
28af8a2
Merge branch 'using-async-models' into using-aws-storage
JackUrb Aug 11, 2022
33d8bd3
silly elif fix
JackUrb Aug 11, 2022
0b7b074
Taking bug-fixes from stable server
JackUrb Aug 12, 2022
4816280
Model server changes too
JackUrb Aug 12, 2022
3bdd642
Skip another web test, works in prod, refactor incoming
JackUrb Aug 12, 2022
ca10bbb
Ensure we're not using FB user data
JackUrb Aug 12, 2022
635d51b
Methods for scrubbing the datasets
JackUrb Aug 12, 2022
7411e4f
Deleting player data and related graph info
JackUrb Aug 12, 2022
bfe6534
Fixing bugs, adding tests
JackUrb Aug 12, 2022
a52ed27
Environment exporting
JackUrb Aug 15, 2022
30113b7
Export episode DB too
JackUrb Aug 15, 2022
a350ef0
Enums for model types
JackUrb Aug 15, 2022
ec44bba
Merge branch 'using-model-pool' of https://github.com/facebookresearc…
JackUrb Aug 15, 2022
f4ebb43
Merge branch 'using-model-server' of https://github.com/facebookresea…
JackUrb Aug 15, 2022
32bc7aa
Checking for non-list to convert first
JackUrb Aug 15, 2022
99ac9ce
Merge branch 'using-async-models' of https://github.com/facebookresea…
JackUrb Aug 15, 2022
4f31174
Slightly more clarity
JackUrb Aug 15, 2022
ac08d85
60 != 90
JackUrb Aug 15, 2022
4b17f84
Creating initial hydra classes and structures
JackUrb Aug 16, 2022
f7e87ad
base model loading classes
JackUrb Aug 17, 2022
d67e8ed
progress towards play_map
JackUrb Aug 17, 2022
3ad5310
Merge branch 'using-model-pool' into next-1-hydrize
JackUrb Aug 17, 2022
0c7675a
Merge branch 'using-stable-server' into next-1-hydrize
JackUrb Aug 17, 2022
c413a3e
Model loading works from hydra
JackUrb Aug 17, 2022
18ceb06
Play-map works again
JackUrb Aug 17, 2022
879b134
Main tests passing again
JackUrb Aug 17, 2022
ac08391
Restoring broken point for tutorial
JackUrb Aug 17, 2022
f57787a
Making ModelServer work again
JackUrb Aug 17, 2022
af7e970
Server works for local deploy with hydra config
JackUrb Aug 17, 2022
ac8c2ee
Server tests now passing
JackUrb Aug 17, 2022
12209d8
hydra 1.2
JackUrb Aug 18, 2022
4ae2a05
temporary hydra force upgrade for tests
JackUrb Aug 18, 2022
dd3b6a0
pre-publish review
JackUrb Aug 18, 2022
183449b
Implementing New Users Tables (#292)
JackUrb Aug 22, 2022
84843af
New Episode logging (#293)
JackUrb Aug 22, 2022
0c4b397
New environment db (#295)
JackUrb Aug 22, 2022
a17f38b
Using `EpisodeDB` in main game path (#297)
JackUrb Aug 22, 2022
d4691d4
Using `UserDB` as main game identity storage (#298)
JackUrb Aug 22, 2022
2bef3dc
Creating and using the `ModelPool` (#300)
JackUrb Aug 22, 2022
c05132b
Fixing bad merge
JackUrb Aug 22, 2022
643e1b2
Merge branch 'new-data-model' of https://github.com/facebookresearch/…
JackUrb Aug 22, 2022
93a6362
Creating LIGHT's ModelServer (#302)
JackUrb Aug 22, 2022
bf1b367
`asyncio` all over LIGHT (#304)
JackUrb Aug 22, 2022
a372a2e
AWS Option for LIGHT data model storage (#305)
JackUrb Aug 22, 2022
baad3d4
dropped change on merge
JackUrb Aug 22, 2022
c376dbb
Stable Server commit before coming refactors (#306)
JackUrb Aug 22, 2022
17de201
Privacy commitment improvements (#307)
JackUrb Aug 22, 2022
ce07613
Base architecture README
JackUrb Aug 22, 2022
85e2502
Merge branch 'refactor-phase-2-full-deploy' into next-1-hydrize
JackUrb Aug 22, 2022
a7aef3d
Addressing comments
JackUrb Aug 22, 2022
703b3d7
Missed a FLAGS
JackUrb Aug 22, 2022
fa347e2
Small fixes for episode db keys
JackUrb Aug 25, 2022
a349b1f
Merge branch 'new-data-model' of https://github.com/facebookresearch/…
JackUrb Aug 25, 2022
4d77a0f
Merge branch 'new-data-model' into next-1-hydrize
JackUrb Aug 25, 2022
0978216
world dissociation
JackUrb Aug 30, 2022
bf5b04a
Small episode test cleanup
JackUrb Aug 30, 2022
bb2e262
Merge branch 'main' into new-data-model
JackUrb Aug 31, 2022
7fedbbd
Adding headers
JackUrb Aug 31, 2022
5eefa84
Some rollbacks, some copyright fixes
JackUrb Aug 31, 2022
0a45ad2
More header fixes
JackUrb Aug 31, 2022
3b6940e
Clean up irrelevant paths
JackUrb Aug 31, 2022
71365c9
Merge branch 'new-data-model' into refactor-phase-2-full-deploy
JackUrb Aug 31, 2022
950399e
Merge branch 'refactor-phase-2-full-deploy' into next-1-hydrize
JackUrb Aug 31, 2022
669d086
Adding missing hydra configs
JackUrb Aug 31, 2022
f11c653
Login page differs between dev and prod
JackUrb Aug 31, 2022
01f83f3
Dropping older tests
JackUrb Aug 31, 2022
dbf5852
correct config import loc
JackUrb Aug 31, 2022
7d64ec2
Forgot to commit the files somehow
JackUrb Sep 1, 2022
52b315b
Small fixes
JackUrb Sep 6, 2022
0db6b1a
Merge branch 'main' into next-1-hydrize
JackUrb Dec 9, 2022
b307992
0.2.0
JackUrb Dec 9, 2022
e24e190
Update world.py
JackUrb Dec 9, 2022
0653e1e
fixing old mistake
JackUrb Dec 9, 2022
77767e5
next-1-hydrize
JackUrb Dec 9, 2022
6b7cf05
Merge branch 'next-1-hydrize' of https://github.com/facebookresearch/…
JackUrb Dec 9, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8]
python-version: [3.8]

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion deploy/web/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GAME_DIR="${WEBDIR}/gameapp/"
LANDING_DIR="${WEBDIR}/landingapp/"
SERVER_FILE="${WEBDIR}/server/run_server.py"

CONF_FN="./configs/"$1"/config.js"
CONF_FN="./configs/"$1".js"

if [ -z "$1" ];
then
Expand All @@ -23,6 +23,7 @@ then
fi

cp $CONF_FN $BUILDER_DIR"src/config.js"
cp $CONF_FN $LANDING_DIR"src/config.js"
cp $CONF_FN $GAME_DIR"src/config.js"

mkdir build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const DEV = {
host: "https://dev.light-rpg.ai",
hostname: "dev.light-rpg.ai",
port: "80",
login: "pass",
};

export default DEV;
16 changes: 0 additions & 16 deletions deploy/web/configs/dev/config

This file was deleted.

28 changes: 0 additions & 28 deletions deploy/web/configs/devfair-no-models/config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const DEV = {
host: "http://localhost",
hostname: "localhost",
port: "35496",
login: "pass",
};

export default DEV;
14 changes: 0 additions & 14 deletions deploy/web/configs/devfair/config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const DEV = {
host: "http://localhost",
hostname: "localhost",
port: "35496",
login: "pass",
};

export default DEV;
26 changes: 0 additions & 26 deletions deploy/web/configs/local-no-models/config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const DEV = {
host: "http://localhost",
hostname: "localhost",
port: "35494",
login: "pass",
};

export default DEV;
12 changes: 0 additions & 12 deletions deploy/web/configs/local/config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const DEV = {
host: "http://localhost",
hostname: "localhost",
port: "35494",
login: "pass",
};

export default DEV;
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const DEV = {
host: "https://www.light-rpg.ai",
hostname: "www.light-rpg.ai",
port: "80",
login: "fb",
};

export default DEV;
16 changes: 0 additions & 16 deletions deploy/web/configs/prod/config

This file was deleted.

4 changes: 1 addition & 3 deletions deploy/web/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ then
exit 1
fi

CONF_FN=$WEBDIR"/configs/"$1"/config"

cat $CONF_FN | python $SERVER_FILE `xargs -0`
python $SERVER_FILE deploy=$1
8 changes: 6 additions & 2 deletions deploy/web/landingapp/src/AppRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@

import React from "react";
import { HashRouter, Route, Redirect, Switch } from "react-router-dom";
/* CONFIG */
import CONFIG from "./config.js";

import AboutPage from "./pages/AboutPage";
import LandingPage from "./pages/LandingPage";
import TermsPage from "./pages/TermsPage";
import TutorialPage from "./pages/TutorialPage";
import LoginPage from "./pages/LoginPage";
import DevLoginPage from "./pages/DevLoginPage";
import ProdLoginPage from "./pages/ProdLoginPage";
import LogoutPage from "./pages/LogoutPage";
import ErrorPage from "./pages/ErrorPage";

import "./styles.css";

const AppRouter = () => {
const use_page = CONFIG.login == "fb" ? ProdLoginPage : DevLoginPage;
return (
<div className="app-container">
<HashRouter>
Expand All @@ -26,7 +30,7 @@ const AppRouter = () => {
<Route path="/tutorial" component={TutorialPage} exact />
<Route path="/about" component={AboutPage} exact />
<Route path="/terms" component={TermsPage} exact />
<Route path="/login" component={LoginPage} exact />
<Route path="/login" component={use_page} exact />
<Route path="/bye" component={LogoutPage} exact />
<Route path="/error" component={ErrorPage} exact />
<Route component={ErrorPage} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React from "react";

import "./styles.css";

const LoginPage = (props) => {
const DevLoginPage = (props) => {
return (
<div className="loginpage-container">
<div className="login-form__container">
Expand All @@ -33,21 +33,9 @@ const LoginPage = (props) => {
/>
</div>
</form>
<div
className="login-form__field"
style={{ justifyContent: "center", marginTop: "8px" }}
>
<form action="/auth/fblogin?next={{next}}" method="get">
<input
className="login-form__submit"
type="submit"
value="Sign In With Facebook"
/>
</form>
</div>
</div>
</div>
);
};

export default LoginPage;
export default DevLoginPage;
39 changes: 39 additions & 0 deletions deploy/web/landingapp/src/pages/ProdLoginPage/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*****
* Copyright (c) Meta Platforms, Inc. and affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";

import "./styles.css";

const ProdLoginPage = (props) => {
return (
<div className="loginpage-container">
<div className="login-form__container">
<h1 style={{ color: "white" }}>Login</h1>
<p>
We use Facebook Login as an identity provider, however we do not store
any information about you or your Facebook account. By logging in you
agree to our <a href="/#/terms">terms</a> and you accept our use of
cookies to mark you as logged in as you navigate the site.
</p>
<div
className="login-form__field"
style={{ justifyContent: "center", marginTop: "8px" }}
>
<form action="/auth/fblogin?next={{next}}" method="get">
<input
className="login-form__submit"
type="submit"
value="Sign In With Facebook"
/>
</form>
</div>
</div>
</div>
);
};

export default ProdLoginPage;
Loading