Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
788f615
Updated WOZ interface to control LED
kaimihata Jan 31, 2020
a795f0c
Updates the robot's LED from WOZ
kaimihata Jan 31, 2020
915b1ab
Merge pull request #1 from kaimihata/patch-5
kaimihata Jan 31, 2020
cd769fe
C-EMAR update
kaimihata Apr 29, 2020
2d7eefb
Updates
kaimihata May 5, 2020
6c56d49
Link to robot face
kaimihata May 5, 2020
1ec65ee
add in front end of disclosure/diary c-emar
simran18 May 5, 2020
92c5acf
Linked diary button
kaimihata May 6, 2020
0887ccd
Create CNAME
kaimihata May 8, 2020
b23f47a
Delete CNAME
kaimihata May 8, 2020
e9f40a6
Create CNAME
kaimihata May 8, 2020
a01a388
Text changes
kaimihata May 8, 2020
bfe15ac
Merge branch 'master' of https://github.com/kaimihata/robotfrontend
kaimihata May 8, 2020
79b8ede
Update CNAME
kaimihata May 8, 2020
b3abe14
Update CNAME
kaimihata May 8, 2020
8e65705
adding databse features and VAS
simran18 May 12, 2020
0418920
First round of bug fixes
kaimihata May 12, 2020
26ccffe
Login change and database VAS changes
kaimihata May 12, 2020
6c9ab73
Fixed diary and stress data recording
kaimihata May 12, 2020
9d48c4f
Another round of bug fixes from trello
kaimihata May 12, 2020
98de87d
More bug fixes
kaimihata May 13, 2020
ea5bf39
add profile pic and fix db errors for group id
simran18 May 13, 2020
9a93615
update changes
simran18 May 13, 2020
043d736
add instruction, contact and update index:
simran18 May 13, 2020
b00d71d
Merge
kaimihata May 14, 2020
08f7db3
embed videos to contact
simran18 May 14, 2020
6d8d13a
Finalized bug fixes for testing
kaimihata May 15, 2020
ece0063
Merge branch 'simran' of https://github.com/kaimihata/robotfrontend
kaimihata May 15, 2020
6fb63f0
Updated signin page
kaimihata May 15, 2020
b646093
Add changes based on testing
simran18 May 17, 2020
9b38384
add new diary prompt
simran18 May 17, 2020
99ea053
responsiveness of index and edit
madigan-99 May 18, 2020
8541914
Bug fixes and merge
kaimihata May 18, 2020
0fd2e5c
Fixed bug with profile pic
kaimihata May 18, 2020
db84b4d
Checks participants with those listed in firebase/participants
kaimihata May 20, 2020
46d1384
merge with master
simran18 May 20, 2020
b41c07e
add changes from testing 2
simran18 May 20, 2020
b80e158
responsiveness
madigan-99 May 20, 2020
42fa54c
update changes for index start here and new faces
simran18 May 20, 2020
3c942b4
style changes
madigan-99 May 20, 2020
8e4f61b
Add changes to sign in
simran18 May 21, 2020
7845dad
Merge
kaimihata May 22, 2020
0497b9d
Merge
kaimihata May 22, 2020
5641ab1
Face edit and face render changes based on feedback
kaimihata May 22, 2020
247ac7e
Updated instructions
kaimihata May 22, 2020
a189464
Fixed merge change with index screen
kaimihata May 22, 2020
8aa484e
Face edit bug fixes
kaimihata May 23, 2020
c457c1b
temp changes
madigan-99 May 23, 2020
6b3332b
responsivenes and landscape
madigan-99 May 23, 2020
2983b6a
Merge pull request #2 from kaimihata/yuyu-dev
kaimihata May 23, 2020
e447799
Face edit bug fixes
kaimihata May 23, 2020
61f39d4
Merge pull request #3 from kaimihata/kai-dev
kaimihata May 23, 2020
df8acb6
Removed face tilt
kaimihata May 23, 2020
e8712f4
add changes based on latest testing
simran18 May 23, 2020
873db40
Merge branch 'simran'
kaimihata May 23, 2020
c877bfc
update video for texting
simran18 May 23, 2020
e005233
width on instructions
madigan-99 May 23, 2020
3c99b88
Merge branch 'simran'
kaimihata May 24, 2020
90d193f
Update contact.html
kaimihata May 24, 2020
b3ed628
Storing deleted faces
kaimihata May 28, 2020
80223c9
Updated duration logging
kaimihata May 29, 2020
8e86cf5
Storing create new face in database
kaimihata May 29, 2020
a126364
Diary logging
kaimihata May 29, 2020
1ceabb5
Diary double recording
kaimihata May 29, 2020
0a2f4b6
Gets group id from database
kaimihata May 30, 2020
90c1a94
Bug with face render finish button
kaimihata Jun 1, 2020
5142a38
Fixed bug when deleting faces
kaimihata Jun 5, 2020
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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
teendesignlab.com
Binary file added assets/EMAR.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 assets/EMAR_128.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 assets/EMAR_256.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 assets/EMAR_512.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 assets/EMAR_64.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 assets/Google_signin_button.sketch
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 assets/heart-emar.png
Empty file added assets/initial_data.json
Empty file.
Binary file added assets/ios/1x/btn_google_dark_disabled_ios.png
Binary file added assets/ios/1x/btn_google_dark_focus_ios.png
Binary file added assets/ios/1x/btn_google_dark_normal_ios.png
Binary file added assets/ios/1x/btn_google_dark_pressed_ios.png
Binary file added assets/ios/1x/btn_google_light_disabled_ios.png
Binary file added assets/ios/1x/btn_google_light_focus_ios.png
Binary file added assets/ios/1x/btn_google_light_normal_ios.png
Binary file added assets/ios/1x/btn_google_light_pressed_ios.png
Binary file added assets/ios/2x/btn_google_dark_focus_ios@2x.png
Binary file added assets/ios/2x/btn_google_dark_normal_ios@2x.png
Binary file added assets/ios/2x/btn_google_dark_pressed_ios@2x.png
Binary file added assets/ios/2x/btn_google_light_focus_ios@2x.png
Binary file added assets/ios/2x/btn_google_light_normal_ios@2x.png
Binary file added assets/ios/3x/btn_google_dark_disabled_ios@3x.png
Binary file added assets/ios/3x/btn_google_dark_focus_ios@3x.png
Binary file added assets/ios/3x/btn_google_dark_normal_ios@3x.png
Binary file added assets/ios/3x/btn_google_dark_pressed_ios@3x.png
Binary file added assets/ios/3x/btn_google_light_focus_ios@3x.png
Binary file added assets/ios/3x/btn_google_light_normal_ios@3x.png
Binary file added assets/ios/3x/btn_google_light_pressed_ios@3x.png
Loading