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

multiple chat room stuff frontend #39

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5f5c110
sign up with success/error message
nicole-chang Nov 17, 2020
3dfb0bf
boundaries across screen sizes, fish have different speeds
ryanjackson10 Nov 25, 2020
1a5a57c
sign in and sign out forms, css is messy but at least everything is c…
nicole-chang Nov 28, 2020
d9363e4
fish are 3d models + different kinds of fish
ryanjackson10 Dec 2, 2020
0238b4d
slight changes to movement, hook is now 3d
ryanjackson10 Dec 4, 2020
28defa7
small changes and game over graphic
ryanjackson10 Dec 5, 2020
bac59b4
Merge pull request #31 from ucladevx/rj_fishingGame
ryanjackson10 Dec 6, 2020
844210c
loading graphic, one more model
ryanjackson10 Dec 9, 2020
97cbd90
file-loader missing fixed
Ishnoor-Singh Dec 12, 2020
49759c7
collision detection
kiwamoto14 Nov 8, 2020
ee3ba0f
context addition
kiwamoto14 Nov 12, 2020
7cdec3b
image background
kiwamoto14 Nov 25, 2020
6b7f3dd
backend integration
kiwamoto14 Dec 1, 2020
be7ab8a
background improvement
kiwamoto14 Dec 3, 2020
737d7bd
multiple players
kiwamoto14 Dec 7, 2020
5a88137
wip
Ishnoor-Singh Dec 12, 2020
b157ec8
refactored folder structure
Ishnoor-Singh Dec 12, 2020
5311dd9
further refactor
Ishnoor-Singh Dec 12, 2020
dc4a2e3
Merge pull request #32 from ucladevx/rj_fishingGame
Ishnoor-Singh Dec 12, 2020
dfbba61
useContext is not working but here's what i have
nicole-chang Dec 12, 2020
65c4427
Merge pull request #33 from ucladevx/rj_movingMesh
Ishnoor-Singh Dec 12, 2020
4fb1115
username label
ryanjackson10 Dec 13, 2020
aa6a62d
Delete kid.glb
ryanjackson10 Dec 13, 2020
6b223df
Merge pull request #34 from ucladevx/usernameLabels
Ishnoor-Singh Dec 13, 2020
6a67d40
sign up with success/error message
nicole-chang Nov 17, 2020
378cd9c
sign in and sign out forms, css is messy but at least everything is c…
nicole-chang Nov 28, 2020
98f12ed
useContext is not working but here's what i have
nicole-chang Dec 12, 2020
81e4b11
wip
Ishnoor-Singh Dec 12, 2020
0f2b93b
fixed chat
Ishnoor-Singh Dec 14, 2020
1cbb41f
everything works together, i think
Ishnoor-Singh Dec 14, 2020
52803fb
Merge branch 'nc_login' of https://github.com/ucladevx/clubbruin-fron…
Ishnoor-Singh Dec 14, 2020
7c875fb
Merge pull request #35 from ucladevx/nc_login
Ishnoor-Singh Dec 14, 2020
e52047a
fixed merge issues
Ishnoor-Singh Dec 17, 2020
ef156de
login page looks nicer aside from fonts
nicole-chang Dec 18, 2020
0de682e
use sessionStorage to maintain login and username in chat after refre…
nicole-chang Jan 17, 2021
86f0b07
starting to make multiple chatrooms
nicole-chang Feb 19, 2021
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 build/.DS_Store
Binary file not shown.
Binary file added build/assets/.DS_Store
Binary file not shown.
Binary file added build/models/.DS_Store
Binary file not shown.
Binary file added build/models/Hybopsis.glb
Binary file not shown.
Binary file added build/models/another.glb
Binary file not shown.
Binary file added build/models/fish1.glb
Binary file not shown.
Binary file added build/models/hook1.glb
Binary file not shown.
Binary file added build/models/hook_.glb
Binary file not shown.
Binary file added build/models/largerfish.glb
Binary file not shown.
Binary file added build/models/line.glb
Binary file not shown.
Binary file added build/models/redfish.glb
Binary file not shown.
Binary file added build/models/shark.glb
Binary file not shown.
2 changes: 2 additions & 0 deletions build/static/css/main.1b762230.chunk.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build/static/css/main.1b762230.chunk.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions build/static/js/2.925e49c8.chunk.js

Large diffs are not rendered by default.

89 changes: 89 additions & 0 deletions build/static/js/2.925e49c8.chunk.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/

/*!
Copyright (c) 2017 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <http://feross.org>
* @license MIT
*/

/*! [email protected] */

/*! https://mths.be/utf8js v2.1.2 by @mathias */

/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

/** @license React v0.20.1
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v0.26.1
* react-reconciler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v16.13.1
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.1
* react-dom-test-utils.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.1
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.1
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.1
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License */
1 change: 1 addition & 0 deletions build/static/js/2.925e49c8.chunk.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build/static/js/3.92b72a17.chunk.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading