Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
7470e9f
Create ChatApp.js
wardetu Jun 22, 2019
d93dd18
Add files via upload
wardetu Jun 22, 2019
490cdd2
Add files via upload
wardetu Jun 22, 2019
c5e0f0e
Update GradingWorkspace.tsx
wardetu Jun 22, 2019
6c6169e
Update AssessmentWorkspace.tsx
wardetu Jun 22, 2019
03ad30d
Chatkit token provider
flxffy Jun 22, 2019
92dbfd6
Update readme
flxffy Jun 22, 2019
029e1d7
Merge branch 'master' of https://github.com/source-academy/cadet-fron…
flxffy Jun 22, 2019
38f8640
Crude way to work around no connection
wardetu Jun 24, 2019
3fad4bb
Add a .
wardetu Jun 24, 2019
f2fc2e2
Update connection check
wardetu Jun 26, 2019
da97adf
resolved conflict
flxffy Jun 28, 2019
9e885c9
MessageList js to tsx
flxffy Jun 28, 2019
f4521e8
Input js to tsx
flxffy Jun 28, 2019
0760181
Remove chat scss
flxffy Jun 28, 2019
f9a1355
Option to disable chatkit during development
flxffy Jun 28, 2019
379b1be
Chatkit room id from backend
flxffy Jul 1, 2019
8f111b3
minor fix
flxffy Jul 1, 2019
b2fb526
todo for chatkit client merge
flxffy Jul 1, 2019
94ab685
Add files via upload
wardetu Jul 1, 2019
8064cda
Remove the outer class
wardetu Jul 1, 2019
a49c29f
Add pretty date for chat msg
wardetu Jul 1, 2019
36337ea
Move styling to scss file
wardetu Jul 1, 2019
fd9b009
Move styling to scss file
wardetu Jul 1, 2019
eb359fc
revert to previous
flxffy Jul 2, 2019
2264a48
remove grading result view mde
flxffy Jul 2, 2019
45b491d
Remove MDE and replace comment field
wardetu Jul 1, 2019
bac6dc1
remove redundant comments
flxffy Jul 2, 2019
6d4ac7e
Update AssessmentWorkspace.tsx
wardetu Jul 1, 2019
19d3a16
remove redundant comments
flxffy Jul 2, 2019
6d47858
resolved conflict
flxffy Jul 2, 2019
d807b52
fixed input.tsx format
flxffy Jul 2, 2019
f186fa2
Added jwt-decode dependency
flxffy Jul 2, 2019
7b448df
fix travis
huutienvt98 Jul 2, 2019
4af4937
Merge branch 'master' of https://github.com/wardetu/cadet-frontend
huutienvt98 Jul 2, 2019
6b7ca5c
Update package.json
wardetu Jul 2, 2019
f39f9b9
Update package.json
wardetu Jul 2, 2019
192dcc6
_chat.scss format
flxffy Jul 2, 2019
afe4677
resolved conflict
flxffy Jul 2, 2019
06bd217
resolved conflict
flxffy Jul 2, 2019
761c9f1
Changed USE_CHATKIT
flxffy Jul 2, 2019
519b061
Regroup imports + add a horizontal line
wardetu Jul 3, 2019
958aa55
Move dependencies
wardetu Jul 3, 2019
e0de702
Use TextArea from blueprintjs
wardetu Jul 3, 2019
fb20b58
Update Input.tsx
wardetu Jul 3, 2019
d0f8220
Update package.json
wardetu Jul 4, 2019
f8180de
Update AssessmentWorkspace.tsx
wardetu Jul 4, 2019
79eed2a
Update AssessmentWorkspace.tsx
wardetu Jul 4, 2019
625b360
Update ChatApp.js
wardetu Jul 4, 2019
c77e733
Update AssessmentWorkspace.tsx
wardetu Jul 4, 2019
aee3802
Update package.json
wardetu Jul 4, 2019
504255d
Update package-lock.json
wardetu Jul 4, 2019
89b857c
Update package-lock.json
wardetu Jul 4, 2019
272e0bb
Update README.md
wardetu Jul 4, 2019
b27ebd8
Update README.md
wardetu Jul 4, 2019
484ad5a
Update README.md
wardetu Jul 4, 2019
c2da552
Merge branch 'master' of https://github.com/source-academy/cadet-fron…
flxffy Jul 4, 2019
1bf2538
Resolved conflict
flxffy Jul 5, 2019
ba38f0f
Resolved conflict
flxffy Jul 7, 2019
c5d8f30
Minor fix to comment being overwritten when new grades are submitted
flxffy Jul 7, 2019
d2984f6
Removed print
flxffy Jul 7, 2019
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 .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ REACT_APP_LUMINUS_CLIENT_ID=your_luminus_client_id_here
REACT_APP_VERSION=$npm_package_version
REACT_APP_BACKEND_URL=http://localhost:4001
REACT_APP_USE_BACKEND=TRUE
REACT_APP_CHATKIT_INSTANCE_LOCATOR=instance_locator_here_otherwise_empty_string
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@

## For Windows Users

### Running cadet-frontend
Run `npm run win-start`

### Dealing with hooks
In package.json, change line 28:\
"pre-push": "bash scripts/test.sh",\
to an empty line.

Please note that doing this will disable the test suite, so you will need to run the tests manually instead. Using Git Bash (or any other UNIX-based command line), run the following:\
cd scripts\
bash test.sh
`cd scripts`
`bash test.sh`

## js-slang

Expand Down Expand Up @@ -85,3 +82,11 @@ Because we use a local version of `js-slang`, the CI just breaks all the time.
## TypeScript Coding Conventions

We reference [this guide](https://github.com/piotrwitek/react-redux-typescript-guide).

## Chatkit

The chat functionality replacing the previous comment field found in assignments is built on top of Chatkit. Its documentation can be found [here](https://pusher.com/docs/chatkit).

If you are using Chatkit without the backend server running, use the [test token provider](https://pusher.com/docs/chatkit/reference/test-token-provider), and hardcode `userId` and `roomId`.

Internet connection is required for usage.
Loading