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

Upload video #105

Open
wants to merge 361 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
361 commits
Select commit Hold shift + click to select a range
403aaa4
Added dockerfile for q_api
bordernone Feb 18, 2022
d5f95dc
Updated dockerfile
bordernone Feb 18, 2022
30a6914
Added q_api to docker-compose
bordernone Feb 18, 2022
3de0428
built env yml file for conda with no dependence from mac os
AMChierici Feb 19, 2022
965b968
(tentative) dockerfile for toia-dm
bordernone Feb 19, 2022
c928424
Merge pull request #20 from CAMeL-Lab/recorderBugFix
AMChierici Feb 21, 2022
25675e0
Added video recording tracker
bordernone Feb 21, 2022
ea4e1ba
activate/deactivate q_Api
bordernone Feb 22, 2022
b5862f5
Merge branch 'master' into recording-tracker
bordernone Feb 22, 2022
2ff274f
fixed bug with loading on-boarding questions
bordernone Feb 22, 2022
15a54bb
Player updated with sockets, text-based interaction and mic on/off to…
asgomda Feb 23, 2022
4487f47
Added login session tracker
bordernone Feb 23, 2022
d39ed60
minor code removal
asgomda Feb 23, 2022
6cae560
Merge remote-tracking branch 'origin/recorderBugFix' into recording-t…
bordernone Feb 24, 2022
09f16e5
minor bug fix with q_api activate/deactivate feature
bordernone Feb 24, 2022
1fc359c
Merge pull request #24 from CAMeL-Lab/recorderBugFix
AMChierici Feb 25, 2022
e363c6c
Merge branch 'master' into recording-tracker
bordernone Feb 25, 2022
dc7b0e3
Merge pull request #26 from CAMeL-Lab/recording-tracker
bordernone Feb 25, 2022
5287144
Update README.md
bordernone Feb 25, 2022
20d9142
Update toia_db.sql
bordernone Feb 25, 2022
aba5c87
Merge pull request #29 from CAMeL-Lab/new-db
bordernone Feb 25, 2022
8e97943
Minor bug fix
bordernone Feb 28, 2022
90db517
Fixed sox issue
bordernone Mar 1, 2022
9c9b7ea
Minor update
bordernone Mar 2, 2022
27ecc38
prepend /api/ to all endpoints on express
bordernone Mar 3, 2022
54e9555
serve static react files when in production
bordernone Mar 3, 2022
57e0a3e
Merge pull request #31 from CAMeL-Lab/refactor-server-routes
AMChierici Mar 3, 2022
84a0861
Fixed repetition of suggested question after editing
bordernone Mar 4, 2022
e6e1a4c
Auto add question when input loses focus
bordernone Mar 4, 2022
dee2121
:bug: Fixed #32
bordernone Mar 5, 2022
6947fa4
:sparkles: Display videos count
bordernone Mar 5, 2022
72aed84
:wrench: Added video duration field
bordernone Mar 6, 2022
8c26252
:chart_with_upwards_trend: record video duration
bordernone Mar 6, 2022
5706d07
:chart_with_upwards_trend: display video length in myToia and recorder
bordernone Mar 6, 2022
cbc0fb8
:zap: changed proxy to express-api:3001 in react
bordernone Mar 8, 2022
a35e217
changed names and some descriptions for video types for making them m…
AMChierici Mar 8, 2022
0068e3e
changed onboarding questions for yes/no to reflect actual user experi…
AMChierici Mar 8, 2022
143f706
Merge branch 'bug-fixes-ui-adjustment' of https://github.com/CAMeL-La…
AMChierici Mar 8, 2022
85ddfe7
Added recording timer
bordernone Mar 10, 2022
3d347e5
:art: changed background color of timer
bordernone Mar 10, 2022
2d142b1
added changes to notebook and pipenv environment requirements to refl…
AMChierici Mar 11, 2022
98f1c5a
implemented return top 5 answers. note last line there is a comment e…
AMChierici Mar 11, 2022
bd9ef22
Merge branch 'bug-fixes-ui-adjustment' of https://github.com/CAMeL-La…
AMChierici Mar 11, 2022
f7ad228
Merge pull request #34 from CAMeL-Lab/bug-fixes-ui-adjustment
AMChierici Mar 11, 2022
0ab965f
:rocket: production build for react
bordernone Mar 11, 2022
984552e
:wrench: setup google cloud CORS
bordernone Mar 11, 2022
bdd97f8
:wrench: use same db connection for deployment and production
bordernone Mar 11, 2022
32c59e3
:wrench: persistent storage for mysql
bordernone Mar 11, 2022
6cf4409
:heavy_plus_sign: added sass
bordernone Mar 11, 2022
e1aad47
Merge pull request #35 from CAMeL-Lab/setup-deployment
AMChierici Mar 12, 2022
b94a824
:rocket: setup dialogue manager to use local database
bordernone Mar 12, 2022
ba02569
Merge pull request #36 from CAMeL-Lab/setup-deployment
AMChierici Mar 12, 2022
75889b1
reaserch into question suggester appropriate behavior: the storage --…
AMChierici Mar 13, 2022
d0adc25
minor edit
AMChierici Mar 13, 2022
e42d224
speech to text realtime transcription
asgomda Mar 13, 2022
26f39ad
Merge branch 'master' into recorder-Transcription
asgomda Mar 13, 2022
b0ed795
engine connection need refresh every time the API is called so to get…
AMChierici Mar 14, 2022
b9681e4
:wrench: use docker for both production and development
bordernone Mar 14, 2022
95bc3db
Merge branch 'master' into setup-deployment
bordernone Mar 14, 2022
ae3d936
added dependencies to db and .env files for q_api
AMChierici Mar 14, 2022
1707b58
added environment requirments for question suggester to connect to my…
AMChierici Mar 14, 2022
f012478
changed code to replace the cache with realtime connection to db so t…
AMChierici Mar 14, 2022
a71f1ff
updated the recorder and player with the new button; made the player …
asgomda Mar 15, 2022
e5c8774
:wrench: Integrated q_api with express api
bordernone Mar 15, 2022
b44ddfe
:wrench: update .gitignore
bordernone Mar 15, 2022
de43ef3
Merge pull request #37 from CAMeL-Lab/q_api_improvements
bordernone Mar 15, 2022
cdfa0e3
Merge branch 'master' into setup-deployment
bordernone Mar 15, 2022
f330dbb
:wrench: Updated docker-compose-dev.yml
bordernone Mar 15, 2022
7343484
Merge branch 'master' into recorder-Transcription
asgomda Mar 15, 2022
09e371d
:bug: fix local storage issue on docker
bordernone Mar 15, 2022
0e1977d
Merge pull request #38 from CAMeL-Lab/recorder-Transcription
AMChierici Mar 16, 2022
847a880
:wrench: setup docker volume mounts for development
bordernone Mar 16, 2022
2741ead
:bug: remove unnecessary characters from suggestions
bordernone Mar 16, 2022
5373297
:twisted_rightwards_arrows: integrate q_api with nodejs
bordernone Mar 16, 2022
1a27288
:bug: fixed #39
bordernone Mar 16, 2022
f25f8ea
:wrench: mount volume to enable debugging dialogue manager
bordernone Mar 16, 2022
cf6c6af
:bug: fixed toia-dm crashing after changes in db schema
bordernone Mar 16, 2022
1074813
some minor edits to q_api: notebook reflecting same function as in pr…
AMChierici Mar 16, 2022
f9c503a
:bug: minor bug fix
bordernone Mar 16, 2022
db5e354
some minor edits to q_api: code had a reference to the old storage ob…
AMChierici Mar 16, 2022
0b16c79
minor bug fix
AMChierici Mar 16, 2022
d4110e7
Merge branch 'master' into setup-deployment
AMChierici Mar 16, 2022
a418b14
Merge pull request #40 from CAMeL-Lab/setup-deployment
AMChierici Mar 16, 2022
bb3d4cc
minor edits: improved GPT-3 prompt, changed text indentation to make …
AMChierici Mar 16, 2022
8b9be75
:package: set sass as dependency
bordernone Mar 16, 2022
cb92099
:chart_with_upwards_trend: added metabase
bordernone Mar 17, 2022
e52f334
:chart_with_upwards_trend: Added basic dashboard.
bordernone Mar 17, 2022
0ec9749
:chart_with_upwards_trend: minor changes
bordernone Mar 17, 2022
1a39953
:rocket: added metabase to production env
bordernone Mar 17, 2022
9709c45
:wrench: change proxy react
bordernone Mar 17, 2022
2173e38
Merge pull request #43 from CAMeL-Lab/setup-deployment
bordernone Mar 17, 2022
174f229
:bug: fixed #42
bordernone Mar 20, 2022
6887226
Merge pull request #44 from CAMeL-Lab/setup-deployment
AMChierici Mar 20, 2022
abcbed6
:sparkles: added search feature
bordernone Mar 24, 2022
0c79f6b
:memo: Updated readme
bordernone Mar 24, 2022
83505a4
:memo: minor format change
bordernone Mar 24, 2022
8a404f4
:memo: updated readme
bordernone Mar 24, 2022
48cfc14
:art: changed ui of search box.
bordernone Mar 25, 2022
55c30c1
:bug: Fixed issue of streams count not appearing after new stream is …
bordernone Mar 25, 2022
919c355
:wrench: only request for 3 suggestions.
bordernone Mar 25, 2022
970ff6c
:memo: Updated readme adding a node about RAM allocation for docker.
bordernone Mar 25, 2022
a90b288
:memo: fixed typo
bordernone Mar 25, 2022
bbbd2f3
:memo: Note on where to put the credential files
bordernone Mar 25, 2022
de09c51
Merge pull request #45 from CAMeL-Lab/add-search-feature
AMChierici Apr 4, 2022
bd959d6
:sparkles: added dynamic loader for question card
bordernone Apr 7, 2022
5bc173d
Merge pull request #50 from CAMeL-Lab/dynamically-load-questions
AMChierici Apr 8, 2022
39644ca
edited and added filler video requirements for onboarding
AMChierici Apr 8, 2022
3947028
Merge pull request #51 from CAMeL-Lab/new_fillers
bordernone Apr 8, 2022
27c42a6
:coffin: remove unnecessary files
bordernone Apr 8, 2022
06c71c7
:see_no_evil: update gitignore
bordernone Apr 8, 2022
bcce5ff
Merge pull request #52 from CAMeL-Lab/fix-metabase-persistency
bordernone Apr 8, 2022
507f38d
:bug: fix socket not connecting issue
bordernone Apr 11, 2022
7fdb933
:bug: fixed spinner issue
bordernone Apr 11, 2022
de02daf
:sparkles: save player feedback
bordernone Apr 16, 2022
1885f8d
Implemented the rating feature for the player videos
asgomda Apr 24, 2022
52349d3
Merge pull request #53 from CAMeL-Lab/playerImprovements
AMChierici Apr 26, 2022
9194c6b
:pencil: minor change
bordernone Apr 28, 2022
6881b0b
Merge branch 'master' into log-conversation
bordernone Apr 28, 2022
5991816
:sparkles: record conversation logs
bordernone Apr 29, 2022
ea41f92
added suggestive search functionality into the player question input box
asgomda May 3, 2022
714bfc1
:bug: fixed minor bug
bordernone May 6, 2022
7fdd04d
minor changes to voice input
asgomda May 9, 2022
172042c
Merge branch 'playerImprovements' into log-conversation
bordernone May 24, 2022
64805bb
:twisted_rightwards_arrows: merged playerImprovements with log-conver…
bordernone May 24, 2022
cb3c3d1
:art: format code
bordernone May 24, 2022
3a9e1a4
:bug: fixed #57
bordernone May 28, 2022
3c9ff81
Merge branch 'bug-fix' into log-conversation
bordernone May 28, 2022
4211c2b
:sparkles: added video transition animation
bordernone May 29, 2022
03fbac2
:sparkles: enforce login for interacting with toia
bordernone May 29, 2022
1afb90f
added temporary developments and experiments for enhanced dialogue ma…
AMChierici May 30, 2022
8e6f36a
Merge pull request #55 from CAMeL-Lab/log-conversation
AMChierici May 30, 2022
5b621b0
:sparkles: skip 1s for non-filler videos in player
bordernone Jun 9, 2022
4d9c276
Merge branch 'skip-1s-player' into develop
bordernone Jun 9, 2022
d1d135a
:lock: restrict interaction with toia to allowed users only
bordernone Jun 9, 2022
6c83009
Merge branch 'restrict-interaction-player' into develop
bordernone Jun 9, 2022
a605fd1
added dev packages for exploring openai search models
AMChierici Jun 14, 2022
c3047e1
added explorations on transformers models and settled for openai ada …
AMChierici Jun 14, 2022
dc899d9
notebook to run manual suggestions for the experiment.
AMChierici Jun 14, 2022
cb6e51f
added notebooks/output/ to gitignore to ignore files saved there
AMChierici Jun 14, 2022
c8821d7
introduced new toia_answer function that uses gpt, saved into utils_g…
AMChierici Jun 16, 2022
3dcc345
Merge pull request #63 from CAMeL-Lab/develop
AMChierici Jun 16, 2022
fb0e9d0
:sparkles: fix player search
bordernone Jun 23, 2022
14da82b
Merge branch 'fix-player-search' into develop
bordernone Jun 23, 2022
28252f6
:sparkles: added column to store embeddings
bordernone Jun 23, 2022
2fc5c29
Merge branch 'store-embeddings' into develop
bordernone Jun 23, 2022
77c9ae4
:construction: fetch required field for saving embeddings
bordernone Jul 13, 2022
7a0e05e
Fully implemented question suggestion cards
asgomda Jul 13, 2022
1ba9ccd
Added Smart Question Generation
ma5638 Jul 19, 2022
86fa116
Merge pull request #65 from CAMeL-Lab/develop
AMChierici Jul 28, 2022
0c7b2d9
resolving DM bug
AMChierici Jul 28, 2022
c754e4d
:pencil: code format for merge
bordernone Aug 1, 2022
e68e347
:pencil: code format for merge
bordernone Aug 1, 2022
371d33f
:pencil: format code
bordernone Aug 1, 2022
1852bb3
:pencil: code format
bordernone Aug 1, 2022
e9ef18e
:pencil2: changed functions order
bordernone Aug 1, 2022
66a95b5
:pencil: minor update
bordernone Aug 1, 2022
6e896a0
Merge branch 'player-question-suggestions'
bordernone Aug 1, 2022
a0133b6
:twisted_rightwards_arrows: merge branches
bordernone Aug 1, 2022
b977d8b
:bug: fix player permission issue
bordernone Aug 7, 2022
7545ff4
Commented out code added by Ali on my branch, and fixed problem with …
AMChierici Aug 7, 2022
a8f285f
added line to change np.array stored as txt back to np.array
AMChierici Aug 7, 2022
6850bf7
debugged create embeddings script and main API.
AMChierici Aug 18, 2022
c20a73f
Added smart question generation feature to develop.
ma5638 Aug 18, 2022
ad532b0
SmartQGeneration (Edge Case Handled):
ma5638 Aug 23, 2022
8ead77f
Merge pull request #68 from CAMeL-Lab/DEVELOP-SmartQ
AMChierici Aug 23, 2022
6ecac34
Merge branch 'DEVELOP' into dm-embeddings
AMChierici Aug 23, 2022
6ed394e
Merge pull request #70 from CAMeL-Lab/dm-embeddings
AMChierici Aug 23, 2022
0e58a2e
:construction: added script to load populate ada search and generate …
bordernone Sep 7, 2022
1a8dd1c
:bug: fix issue with create_embeddings.py
bordernone Sep 9, 2022
be1c6e5
Fixed bugs:
ma5638 Sep 15, 2022
33daa67
updated readme
gauthamdk Sep 16, 2022
0989df2
Merge pull request #79 from CAMeL-Lab/DEVELOP-update_readme
AMChierici Sep 16, 2022
66938db
Update PATCH.py
bordernone Sep 19, 2022
1b6a148
:sparkles: undo 1s skip. skip at the end.
bordernone Sep 19, 2022
8188e88
Merge pull request #82 from CAMeL-Lab/generate-variants
AMChierici Sep 19, 2022
5df4e18
Merge remote-tracking branch 'origin/DEVELOP-SmartQ' into DEVELOP
bordernone Sep 20, 2022
f932384
:sparkles: only display accessible streams
bordernone Sep 20, 2022
6ca52ba
Merge pull request #83 from CAMeL-Lab/DEVELOP-display-accessible-streams
AMChierici Sep 20, 2022
0ea4d1b
Merge pull request #84 from CAMeL-Lab/DEVELOP
AMChierici Sep 20, 2022
5a2617e
Update index.js
bordernone Sep 20, 2022
a42cc14
Merge pull request #85 from CAMeL-Lab/DEVELOP
bordernone Sep 20, 2022
2811bbc
:bug: fixed: video stops after 1 sec
bordernone Sep 21, 2022
87552a7
Update Player.js
bordernone Sep 21, 2022
24ca7aa
Merge pull request #90 from CAMeL-Lab/DEVELOP-fix-player-bug
AMChierici Sep 23, 2022
dc768e4
:bug: fix player feedback
bordernone Sep 23, 2022
5453fef
Merge pull request #91 from CAMeL-Lab/fix-player-feedback
AMChierici Sep 23, 2022
dadd1eb
Bug Fix:
ma5638 Sep 23, 2022
fda4a08
Fixed Player Bugs:
ma5638 Sep 25, 2022
4aed5a7
:bug: fix conversation log
bordernone Sep 29, 2022
089ac68
I edited this to remove the option of GPT-2 because it takes ages to …
AMChierici Sep 30, 2022
31ac461
:bug: fix bugs
bordernone Sep 30, 2022
14fa0df
Features Added:
ma5638 Oct 1, 2022
e924e64
Merge branch 'DEVELOP' into
ma5638 Oct 1, 2022
a5b61cd
Fix Indent Bug in Q_API
ma5638 Oct 1, 2022
fe5d2d8
:zap: skip toia-dm call if question is an exact match
bordernone Oct 1, 2022
0af6786
Merge branch 'DEVELOP' into DEVELOP-PlayerFeaturesCleanup
bordernone Oct 1, 2022
d89085e
rollback changes that fixed #77
bordernone Oct 1, 2022
642b6b0
Added features:
ma5638 Oct 2, 2022
b6ff2da
Fixed bugs:
ma5638 Oct 2, 2022
4c71615
Fixed Merge Bug:
ma5638 Oct 2, 2022
1e696d2
Fixed bug:
ma5638 Oct 2, 2022
2a33dc0
Merge pull request #93 from CAMeL-Lab/DEVELOP-PlayerFeaturesCleanup
AMChierici Oct 2, 2022
dedcee9
:bug: replace absolute url with relative
bordernone Oct 2, 2022
400b9fd
Merge pull request #92 from CAMeL-Lab/DEVELOP-PlayerFeaturesCleanup
AMChierici Oct 2, 2022
ac503d8
Merge branch 'master' into DEVELOP
bordernone Oct 3, 2022
1df8cb9
:bug: fix rating bug
bordernone Oct 3, 2022
5940f68
:chart_with_upwards_trend: record question asked mode
bordernone Oct 3, 2022
efb9d85
:bug: fix filler bug
bordernone Oct 6, 2022
a4417c6
:bug: show rating after video has played
bordernone Oct 10, 2022
0c626fa
:lipstick: add prettier
bordernone Oct 10, 2022
10072a3
:lipstick: increase prettier printWidth
bordernone Oct 10, 2022
92a2dfc
added video entry function
bordernone Nov 3, 2022
f62cee1
minor update to store ada_search
bordernone Nov 7, 2022
a9e4296
add upload video feature
bordernone Nov 27, 2022
ad5d704
add upload video feature
bordernone Nov 27, 2022
015660a
add embeddings when creating video
bordernone Nov 27, 2022
310f03f
add embeddings when creating video
bordernone Nov 27, 2022
2d80a3b
Fixed issues
bordernone Dec 4, 2022
7ce61de
Fixed issues
bordernone Dec 4, 2022
b7d6e91
bring back permissions
bordernone Dec 4, 2022
f4ad743
bring back permissions
bordernone Dec 4, 2022
30ae3b7
Update package.json
bordernone Dec 4, 2022
4d59b64
Update package.json
bordernone Dec 4, 2022
623b74a
minor fixes
bordernone Dec 6, 2022
fc6e202
minor fixes
bordernone Dec 6, 2022
d074e3c
change the match threshold to 0
bordernone Dec 6, 2022
cf26ea0
change the match threshold to 0
bordernone Dec 6, 2022
76f84f2
push
Soojin-Lee0819 Feb 8, 2023
42e21ee
push
Soojin-Lee0819 Feb 8, 2023
6d713e0
Merge branch 'upload-video' of github.com:CAMeL-Lab/TOIA-2.0 into upl…
Soojin-Lee0819 Feb 8, 2023
c300b29
add player page for Shhh
Soojin-Lee0819 Feb 17, 2023
9507a46
no changes made - test
Soojin-Lee0819 Feb 17, 2023
f1c91ae
changed ui for player page
Soojin-Lee0819 Feb 22, 2023
75077b3
last push before making new branch
Soojin-Lee0819 Mar 12, 2023
f12dfde
PUSH
Soojin-Lee0819 Mar 15, 2023
0f61316
developing update to DM. In this commit, we have an updated toia_answ…
AMChierici Mar 15, 2023
905d730
Merge branch 'upload-video' of https://github.com/CAMeL-Lab/TOIA-2.0 …
AMChierici Mar 15, 2023
8e77f65
little debug for util_gpt3.py
Soojin-Lee0819 Mar 15, 2023
0fd9785
developing a new toia_answer functions that uses conversation logs as…
AMChierici Mar 16, 2023
e36cdc1
Spring break implementation
Soojin-Lee0819 Mar 21, 2023
4ab9726
Merge branch 'upload-video' of github.com:CAMeL-Lab/TOIA-2.0 into upl…
Soojin-Lee0819 Mar 21, 2023
f8d5e35
last push before deployment
Soojin-Lee0819 Apr 2, 2023
197092a
Update README.md
Soojin-Lee0819 Jun 2, 2023
734d1aa
Update README.md
Soojin-Lee0819 Jun 2, 2023
af53f2a
Update README.md
Soojin-Lee0819 Jun 2, 2023
9a52838
Update README.md
Soojin-Lee0819 Jun 2, 2023
3b5a9e2
commtented code and updated ReadMe File
Soojin-Lee0819 Jun 4, 2023
5aa32ec
cleaned up requirements for dm
AMChierici Nov 17, 2023
701052e
fix dm bug
bordernone Nov 17, 2023
0a38377
minor adjustments
bordernone Nov 21, 2023
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ server/.env
server/Accounts/
server/package-lock.json
server/q_api/notebooks/.ipynb_checkpoints
server/manual_save
.env
interface/.env
server/toia-dm/.env
28 changes: 16 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# TOIA-2.0

This is a repository for the TOIA 2.0 System.
This is a repository for TOIA 2.0 System with Soojin's Capstone Project "Elephant in the Room". You can watch a short demo
[here](https://www.youtube.com/watch?v=4EK19DnM4_c), and read the full documentation [here](https://meadow-oboe-807.notion.site/Elephant-in-the-Room-060a99def2bb4b8192e351aac2db52f1).

# Project Specific Setup

All the code that is written for the project is under the file named shhh... including ShhhPage.js ShhhPlayer.js, shhhsuggestivesearch.js and ShhhPage.css.

# Developer Setup

Expand All @@ -13,24 +17,24 @@ There are three `.env` files. One in the root directory, one in the `/interface`

EXPRESS_PORT=3001
DM_PORT=5001

ENVIRONMENT=development

EXPRESS_HOST=http://localhost
DM_ROUTE=http://toia-dm:5001/dialogue_manager
Q_API_ROUTE=http://q_api:5000/generateNextQ

DB_CONNECTION=mysql
DB_DATABASE=toia

DB_HOST=mysql
DB_USERNAME=root
DB_PASSWORD=

GC_BUCKET=
GOOGLE_SPEECH_API_CREDENTIALS_FILE=/speech_to_text/toia-capstone-2021-b944d1cc65aa.json
GOOGLE_CLOUD_STORE_CREDENTIALS_FILE=/toia-capstone-2021-a17d9d7dd482.json

OPENAI_API_KEY=

1. Set the `DB_PASSWORD`
Expand All @@ -55,11 +59,11 @@ Note: It's probably a good idea to place Google cloud related environment variab

## Database Migration

1. Create a folder called `Accounts` in the server folder, if it does not exist.
1. Create a folder called `Accounts` in the server folder, if it does not exist.
2. Copy the video folders to the `Accounts` folder provided by admin.
3. Navigate to [localhost:8080](localhost:8080) with the username and password provided in `.env` in the root folder.
4. Drop all the tables in toia (if needed backup the current toia db using export).
5. Import the database sql file into the toia table.
5. Import the database sql file into the toia table.

## Running the app

Expand All @@ -72,10 +76,10 @@ Make sure you have installed docker and the docker daemon is running.
Making Changes Under Development Mode

- The docker-compose file is setup such that react and nodejs changes are reflected as soon as you change the files in `/interface` or `/server`
- If you change anything inside `/server/q_api` or `/server/toia-dm`, you have to restart that particular container.
- If you change anything inside `/server/q_api` or `/server/toia-dm`, you have to restart that particular container.
- By default, the files and database are persistent under development mode (Check volume mounts in `docker-compose-dev.yml`). If you wish to start a fresh environment, run `docker-compose down -v` to make sure all the volumes are purged when shutting down the containers. Then start the containers using the command above.
- If the dialogue manager (toia-dm) shuts down when running in docker, change docker settings to allow more RAM (check [this](https://stackoverflow.com/questions/44533319/how-to-assign-more-memory-to-docker-container)).
- If the dialogue manager (toia-dm) shuts down when running in docker, change docker settings to allow more RAM (check [this](https://stackoverflow.com/questions/44533319/how-to-assign-more-memory-to-docker-container)).

#### Production mode

- Change the `ENVIRONMENT` variable in .env file to production and run `docker-compose up`
- Change the `ENVIRONMENT` variable in .env file to production and run `docker-compose up`
4 changes: 3 additions & 1 deletion docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ services:
- ${DM_PORT}:${DM_PORT}
volumes:
- ./server/toia-dm:/app
tty: true
depends_on:
mysql:
condition: service_healthy
Expand Down Expand Up @@ -86,7 +87,8 @@ services:
- /app/node_modules
env_file:
- ./.env
- ./interface/.env
environment:
- CHOKIDAR_USEPOLLING=true

metabase-sql-wrapper:
build:
Expand Down
4 changes: 3 additions & 1 deletion interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"firebase": "^8.6.8",
"fuse.js": "^6.4.6",
"get-blob-duration": "^1.2.0",
"i18next-browser-languagedetector": "^7.0.1",
"id3js": "^2.1.1",
"install": "^0.13.0",
"mp3": "^0.1.0",
Expand All @@ -32,14 +33,15 @@
"react-bottom-scroll-listener": "^5.0.0",
"react-dom": "^17.0.1",
"react-elastic-carousel": "^0.11.5",
"react-flag-icon-css": "^1.0.25",
"react-notifications": "^1.7.3",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.1",
"react-select": "^4.2.1",
"react-speech-recognition": "^3.8.2",
"react-switch": "^6.0.0",
"react-webcam": "^5.2.4",
"sass": "^1.49.9",
"sass": "1.39.0",
"semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^2.0.1",
"socket.io": "^4.3.2",
Expand Down
83 changes: 82 additions & 1 deletion interface/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,30 @@
color: white;
opacity: 0.8;
}


.nav-shhh_icon {
top: 0%;
left: 50%;
position: absolute;
font-weight: 800;
font-size: 20px;
line-height: 22px;
display: flex;
align-items: center;
justify-content: center;
letter-spacing: -0.015em;
height: 40px;
width: 145px;
border-radius: 3px;
cursor: pointer;
color: white;
opacity: 0.8;
}
.elephant-icon{
width: 30px;
}

.nav-login_icon {
top: 0%;
left: 90%;
Expand All @@ -141,7 +165,11 @@
opacity: 0.8;
}

.nav-about_icon:hover {
.nav-shhh_icon:hover{
opacity: 1;
}

.nav-about_icon:hover{
opacity: 1;
}
.nav-talk_icon:hover {
Expand All @@ -154,6 +182,55 @@
opacity: 1;
}

/* Dropdown Button */
.nav-dropbtn {
background-color: transparent;
color: white;
width: 30px;
text-align: center;
font-size: 16px;
border: none;
}

/* The container <div> - needed to position the dropdown content */
.nav-dropdown {
top: 0%;
left: 0%;
position: relative;
display: inline-block;
}

/* Dropdown Content (Hidden by Default) */
.nav-dropdown-content {
display: none;
position: absolute;
background-color: #f1f1f1;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
z-index: 1;
}

/* Links inside the dropdown */
.nav-dropdown-content a {
color: black;
width: 30px;
height: 20px;
text-align: center;
text-decoration: none;
display: block;
}

.nav-dropdown-content div.header:hover::after {
background-color: transparent;
}
/* Change color of dropdown links on hover */
.nav-dropdown-content option:hover {background-color: #ddd;}

/* Show the dropdown menu on hover */
.nav-dropdown:hover .nav-dropdown-content {display: block;}

/* Change the background color of the dropdown button when the dropdown content is shown */
/* .nav-dropdown:hover .nav-dropbtn {background-color: #3e8e41;} */

/*login popup*/
.login_popup {
height: 40vh;
Expand Down Expand Up @@ -273,3 +350,7 @@
.fade-exit-done {
opacity: 0;
}




Binary file added interface/src/images/birth/alison.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/birth/ashley.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/birth/christian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/birth/kaylee.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/birth/kieona.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/birth/krista.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/birth/stephanie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/bishnu.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/child_birth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/brian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/ian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/james.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/jj.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/kekyong.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/leila.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/norman.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/rahma.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/rina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/sally.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/death/serene.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/elephant-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/elephant.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/gautam.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/muhammad.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/src/images/sex.png
Binary file added interface/src/images/sex/chris.png
Binary file added interface/src/images/sex/ellis.png
Binary file added interface/src/images/sex/kendel.png
Binary file added interface/src/images/sex/kenny.png
Binary file added interface/src/images/sex/klarissa.png
Binary file added interface/src/images/sex/lauren.png
Binary file added interface/src/images/sex/lucy.png
Binary file added interface/src/images/sex/zaldy.png
Binary file added interface/src/images/soojin.jpeg
1 change: 1 addition & 0 deletions interface/src/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
@import "pages/Player.css";
@import "pages/SignUpPage.css";
@import "semantic-ui-css/semantic.css";

10 changes: 5 additions & 5 deletions interface/src/pages/AboutUsPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
font-size: 3rem;
text-align: left;
letter-spacing: -0.015em;
position: absolute;
/* position: absolute; */
/* left: 50%; */
top: 80px;
color: black;
Expand All @@ -129,15 +129,15 @@
}
.about-grid {
padding: 5px;
overflow-y: auto;
/* overflow-y: auto; */
height: 70%;
/* width: 84vw; */
width: 113.5%;
/* width: 113.5%; */
/* left: 8%;
top: 25%; */
left: -6.5%;
top: 175px;
position: absolute;
/* position: absolute; */
display: flex;
flex-wrap: wrap;
flex-direction: row;
Expand All @@ -153,7 +153,7 @@
font-size: 20px;
font-weight: 500;
text-align: center;
margin-bottom: 0px;
margin-bottom: 30px !important;
}

.image-sizing {
Expand Down
63 changes: 31 additions & 32 deletions interface/src/pages/AboutUsPage.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
import React, { useState, useEffect } from "react";
import axios from "axios";
import React, { useEffect, useState } from "react";
import {
NotificationContainer,
NotificationManager
} from "react-notifications";
import { Modal } from "semantic-ui-react";
import submitButton from "../icons/submit-button.svg";
import sampleVideo from "../icons/sample-video.svg";
import alberto from "../images/alberto.jpeg";
import wahib from "../images/wahib.jpg";
import kertu from "../images/kertu.jpg";
import armaan from "../images/armaan.jpg";
import bishnu from "../images/bishnu.jpg";
import camel from "../images/camel.png";
import erin from "../images/erin.jpeg";
import nizar from "../images/nizar.jpg";
import gautam from "../images/gautam.jpeg";
import goffredo from "../images/goffredo.jpeg";
import tyeece from "../images/Tyeece.jpg";
import armaan from "../images/armaan.jpg";
import kertu from "../images/kertu.jpg";
import muhammad from "../images/muhammad.jpeg";
import nizar from "../images/nizar.jpg";
import nyuad from "../images/nyuad-rb.png";
import camel from "../images/camel.png";
import history from "../services/history";
import { Modal } from "semantic-ui-react";
import sigDail from "../pdf/SIGDIAL_2021_TOIA_camera_ready_.pdf";
import axios from "axios";
import {
NotificationContainer,
NotificationManager,
} from "react-notifications";
import soojin from "../images/soojin.jpeg";
import toia_logo from "../images/TOIA_Logo.png";
import tyeece from "../images/Tyeece.jpg";
import wahib from "../images/wahib.jpg";
import sigDail from "../pdf/SIGDIAL_2021_TOIA_camera_ready_.pdf";
import history from "../services/history";
import Tracker from "../utils/tracker";

function AvatarViewPage() {
Expand Down Expand Up @@ -61,6 +64,10 @@ function AvatarViewPage() {
{ still: erin, member: "Erin Collins" },
{ still: goffredo, member: "Goffredo Puccetti" },
{ still: nizar, member: "Nizar Habash" },
{ still: soojin, member: "Soojin Lee" },
{ still: muhammad, member: "Muhammad Ali" },
{ still: gautam, member: "Gautam Dinesh" },
{ still: bishnu, member: "Bishnu Dev" },
];

const renderTeam = (card, index) => {
Expand Down Expand Up @@ -205,8 +212,7 @@ function AvatarViewPage() {
size="large"
style={inlineStyle.modal}
open={open}
onClose={() => dispatch(false)}
>
onClose={() => dispatch(false)}>
<Modal.Header className="login_header">
<h1 className="login_welcome login-opensans-normal">
Welcome Back
Expand Down Expand Up @@ -243,8 +249,7 @@ function AvatarViewPage() {
/>
<div
className="login_text login-montserrat-black"
onClick={signup}
>
onClick={signup}>
Don't have an Account? Sign Up
</div>
</form>
Expand All @@ -253,32 +258,27 @@ function AvatarViewPage() {
<div className="nav-heading-bar">
<div
onClick={home}
className="nav-toia_icon app-opensans-normal"
>
className="nav-toia_icon app-opensans-normal">
TOIA
</div>
<div
onClick={about}
className="nav-about_icon app-monsterrat-black nav-selected"
>
className="nav-about_icon app-monsterrat-black nav-selected">
About Us
</div>
<div
onClick={library}
className="nav-talk_icon app-monsterrat-black "
>
className="nav-talk_icon app-monsterrat-black ">
Talk To TOIA
</div>
<div
onClick={garden}
className="nav-my_icon app-monsterrat-black "
>
className="nav-my_icon app-monsterrat-black ">
My TOIA
</div>
<div
onClick={isLoggedIn ? logout : openModal}
className="nav-login_icon app-monsterrat-black"
>
className="nav-login_icon app-monsterrat-black">
{isLoggedIn ? "Logout" : "Login"}
</div>
</div>
Expand Down Expand Up @@ -320,8 +320,7 @@ function AvatarViewPage() {
</a>
<a
href="https://github.com/wahibkamran/TOIA-2.0"
className="reference-item"
>
className="reference-item">
Github Repo
</a>
</div>
Expand Down
Loading