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

handing in forum work #498

Open
wants to merge 122 commits into
base: teamru-inviteUser
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
cd70cdc
Merge pull request #386 from HackRU/env/dev
shivanmodha Nov 4, 2020
8a14d5d
Merge pull request #387 from HackRU/env/dev
shivanmodha Nov 4, 2020
568bf8e
Merge pull request #389 from HackRU/env/dev
shivanmodha Nov 5, 2020
85b9c23
Merge pull request #391 from HackRU/env/dev
shivanmodha Nov 6, 2020
05d824c
Merge pull request #394 from HackRU/env/dev
shivanmodha Nov 7, 2020
e331cce
Merge pull request #396 from HackRU/env/dev
shivanmodha Nov 7, 2020
8755ab9
Merge pull request #399 from HackRU/env/dev
shivanmodha Nov 7, 2020
4ea15e6
Merge pull request #402 from HackRU/env/dev
shivanmodha Nov 7, 2020
476deba
Merge pull request #403 from HackRU/env/dev
shivanmodha Nov 13, 2020
d531ef8
Update freeze
zain08816 Feb 11, 2021
409886d
Flip freeze
zain08816 Feb 11, 2021
fd51260
Merge pull request #413 from HackRU/freeze-update
shivanmodha Feb 11, 2021
ab9d269
Update HackRU dates
zain08816 Mar 10, 2021
526c807
Resync with prod and audit fix
shivanmodha Mar 13, 2021
90bde06
Updated for production
shivanmodha Mar 14, 2021
9d61366
updated dates
shivanmodha Mar 14, 2021
4996e73
Merge pull request #421 from HackRU/date-update
shivanmodha Mar 14, 2021
6b34024
Fix linter
shivanmodha Mar 14, 2021
51cb297
Merge pull request #422 from HackRU/date-update
shivanmodha Mar 14, 2021
698c384
this seems to be the culprit https://github.com/aws/aws-cli/issues/5262
shivanmodha Mar 14, 2021
c2ec3f2
Downgrade production build version
shivanmodha Mar 14, 2021
63446fb
Update Birthday
GabrielWeinbrenner Mar 15, 2021
59d85fa
Correct file
GabrielWeinbrenner Mar 15, 2021
37f214a
Merge pull request #424 from HackRU/BirthdayFix
shivanmodha Mar 15, 2021
7e12c66
Update "Who can come?" FAQ
zain08816 Mar 26, 2021
35ab093
Merge pull request #425 from HackRU/tech-support
shivanmodha Mar 26, 2021
50d8bae
Merge pull request #419 from HackRU/teamru-inviteUser
zain08816 Mar 28, 2021
ae9a2d4
Bump y18n from 4.0.0 to 4.0.1
dependabot[bot] Mar 30, 2021
cdab389
Merge pull request #426 from HackRU/dependabot/npm_and_yarn/y18n-4.0.1
shivanmodha Apr 12, 2021
8c2a137
Add current schedule
zain08816 Apr 16, 2021
72d0fc7
Update Live links
zain08816 Apr 16, 2021
f39d4a0
Disable CTF
zain08816 Apr 16, 2021
b1c6c3d
Enable dayof flags
zain08816 Apr 17, 2021
9862179
Add protection for non TeamRU user
zain08816 Apr 17, 2021
02076ef
Updated twitch url and browserlist
shivanmodha Apr 17, 2021
5b46da7
Updated check-in flow
shivanmodha Apr 17, 2021
a9e9a52
Fix linter
shivanmodha Apr 17, 2021
7f7644d
Merge pull request #427 from HackRU/event-prep
zain08816 Apr 17, 2021
b3c89af
Updated check-in workflow
shivanmodha Apr 17, 2021
cd0a0ea
Merge pull request #429 from HackRU/event-prep
shivanmodha Apr 17, 2021
0d175ca
Caching smh
zain08816 Apr 17, 2021
c7bdbae
Merge pull request #431 from HackRU/event-prep
shivanmodha Apr 17, 2021
d06ac07
Freeze site
zain08816 Apr 18, 2021
60342f6
Merge pull request #433 from HackRU/event-prep
shivanmodha Apr 18, 2021
842c7b7
Fix updating wrong values
zain08816 Apr 19, 2021
2124543
Merge pull request #435 from HackRU/registration-fix
shivanmodha Apr 22, 2021
b1da03d
Bump ssri from 6.0.1 to 6.0.2
dependabot[bot] Apr 30, 2021
0390e05
Bump url-parse from 1.4.7 to 1.5.1
dependabot[bot] May 6, 2021
f52dc43
Bump lodash from 4.17.20 to 4.17.21
dependabot[bot] May 6, 2021
412f552
Bump hosted-git-info from 2.8.8 to 2.8.9
dependabot[bot] May 9, 2021
af25d36
Bump chart.js from 2.9.3 to 2.9.4
dependabot[bot] May 12, 2021
fef9e44
Merge pull request #440 from HackRU/dependabot/npm_and_yarn/chart.js-…
shivanmodha May 25, 2021
0df2352
Merge pull request #439 from HackRU/dependabot/npm_and_yarn/hosted-gi…
shivanmodha May 25, 2021
78b545d
Merge pull request #438 from HackRU/dependabot/npm_and_yarn/lodash-4.…
shivanmodha May 25, 2021
83fef5a
Merge pull request #436 from HackRU/dependabot/npm_and_yarn/ssri-6.0.2
shivanmodha May 25, 2021
afcbbe3
Merge pull request #437 from HackRU/dependabot/npm_and_yarn/url-parse…
shivanmodha May 25, 2021
c429310
added cancellable promise hook, fixed issue with the teamviewer doubl…
PinkmanusRex Sep 4, 2021
088a81b
removed the explicit type for the useRef in useCancellablePromise as …
PinkmanusRex Sep 8, 2021
0486b8e
added jest tests for the CancellablePromise hooks
PinkmanusRex Sep 9, 2021
da7c5db
added tests and pure components
PinkmanusRex Sep 10, 2021
db7fc37
fixed the pathing in pure_components and added additional styling
PinkmanusRex Sep 10, 2021
31a72f3
added an additional wrapper to deal with grid templating
PinkmanusRex Sep 10, 2021
2ae2a3c
removed overflow from over-grid as content-container should handle th…
PinkmanusRex Sep 11, 2021
72b7120
changed the onclick logic inside InviteItem to allow for dynamic conf…
PinkmanusRex Sep 12, 2021
37b667d
initial useDebounce, but must unit test
PinkmanusRex Sep 12, 2021
a5444c3
tested and corrected bugs in useDebounce using jest testing
PinkmanusRex Sep 12, 2021
c344ca8
Merge pull request #445 from HackRU/teamru-inviteUser
GabrielWeinbrenner Sep 13, 2021
e2d4eba
created index.js files for CancellablePromise and useDebounce to make…
PinkmanusRex Sep 13, 2021
13d6104
changed modal button to round button, added cursor pointer to the sty…
PinkmanusRex Sep 14, 2021
0494f01
add green hover to confirm button, red hover to cancel button. switch…
PinkmanusRex Sep 21, 2021
47e3630
Registration
GabrielWeinbrenner Sep 21, 2021
463b233
About page
GabrielWeinbrenner Sep 21, 2021
39b85fb
Update registration birth date end value
rzmk Sep 22, 2021
86c1849
Update SEO description to Fall 2021
rzmk Sep 22, 2021
565653c
Merge branch 'env/dev' into env/dev
PinkmanusRex Sep 22, 2021
5975233
Merge pull request #449 from rzmk/miscellaneous
GabrielWeinbrenner Sep 22, 2021
580a518
Update waiver for Fall 2021
rzmk Sep 22, 2021
24a5a6c
Close schedule
rzmk Sep 22, 2021
a110df6
Add searchbox to Explore
rzmk Sep 22, 2021
39015e4
Add teams searchbox functionality
rzmk Sep 23, 2021
85ff7c8
Add matches pagination and margin changes
rzmk Sep 23, 2021
0db6738
Empty response/teams handling
rzmk Sep 23, 2021
39c9c9f
Revert Defaults teamru value
rzmk Sep 23, 2021
a0d48dd
Add helpful comments
rzmk Sep 23, 2021
1823bdc
Fix Enter key page reload, request data on paginations
rzmk Sep 23, 2021
aaf420a
API requests on pagination and search
rzmk Sep 23, 2021
fedd75f
Redundant else statement
rzmk Sep 23, 2021
23e345d
Merge pull request #453 from rzmk/close-schedule
GabrielWeinbrenner Sep 23, 2021
4900a9c
Merge pull request #452 from rzmk/waiver-update
GabrielWeinbrenner Sep 23, 2021
ad1a446
Fix Schedule lint error for checks
rzmk Sep 23, 2021
30ffb1d
Merge pull request #455 from rzmk/lint-fix
GabrielWeinbrenner Oct 4, 2021
369b18a
Merge pull request #446 from PinkmanusRex/env/dev
GabrielWeinbrenner Oct 6, 2021
ce7709d
Merge pull request #454 from rzmk/explore-update
GabrielWeinbrenner Oct 6, 2021
7d7366a
Update Defaults.js
GabrielWeinbrenner Oct 12, 2021
c980203
faq changes
GabrielWeinbrenner Oct 13, 2021
1ed7a67
Remove Twitch Link from live
rzmk Oct 15, 2021
4aea915
Merge pull request #460 from rzmk/twitch-link
GabrielWeinbrenner Oct 15, 2021
1727a9c
Add schedule and update links
rzmk Oct 16, 2021
ff76381
Merge pull request #462 from rzmk/sched-links
GabrielWeinbrenner Oct 16, 2021
4996b91
Merge pull request #450 from HackRU/teamru-inviteUser
GabrielWeinbrenner Oct 16, 2021
9235b5e
update prod URL, flip teamru flag to true
anitejb Oct 16, 2021
93eb3ad
dayof flag on and fix checkin link
rzmk Oct 16, 2021
f86e19a
Merge pull request #464 from rzmk/f21-qfixes
GabrielWeinbrenner Oct 16, 2021
0f9a557
Merge pull request #463 from HackRU/teamRU-f21-launch
GabrielWeinbrenner Oct 16, 2021
b8972f1
Fix All Teams to show all users
rzmk Oct 16, 2021
f5a3cc0
Merge pull request #466 from rzmk/allTeamsFix
GabrielWeinbrenner Oct 16, 2021
fcaa032
Fix hacking end time
rzmk Oct 17, 2021
eb7af60
Set to 12PM rather than 11:59PM
rzmk Oct 17, 2021
ea2bd4b
Merge pull request #467 from rzmk/hackend-fix
GabrielWeinbrenner Oct 17, 2021
1c56bbb
day of flag
GabrielWeinbrenner Oct 20, 2021
8d384f8
saving progress. creates views without styling. focusing on functiona…
PinkmanusRex Feb 16, 2022
98cac79
further composite components and setting up logic. still need to crea…
PinkmanusRex Feb 17, 2022
7464705
adding 'profile' dependency so that functionality can be mocked. need…
PinkmanusRex Feb 18, 2022
b3b5116
adding in mocking functions to profile js in order to begin testing b…
PinkmanusRex Feb 18, 2022
5f7416f
styling the team posts component and sub-components
PinkmanusRex Feb 19, 2022
e0752b1
saving progress. a pause needed to finalize plans for backend api str…
PinkmanusRex Feb 23, 2022
2c46fd3
changed Profile.js the comment mockup function
PinkmanusRex Mar 2, 2022
006eabd
change the mockup function since they weren't working. will need to i…
PinkmanusRex Mar 25, 2022
802053b
adding some api endpoints
PinkmanusRex Mar 30, 2022
90d81bb
saving some changes so that backend can do a little less work
PinkmanusRex Mar 30, 2022
e9b6026
adding some checking for response's 'ok' status
PinkmanusRex Mar 30, 2022
b5efeaa
forum style changes
Mar 30, 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
4 changes: 2 additions & 2 deletions .github/workflows/dev-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
code-quality:
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

strategy:
fail-fast: true
Expand All @@ -25,7 +25,7 @@ jobs:
- run: npm install
- run: npm run lint
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

strategy:
fail-fast: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
code-quality:
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

strategy:
fail-fast: true
Expand All @@ -25,7 +25,7 @@ jobs:
- run: npm install
- run: npm run lint
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

strategy:
fail-fast: true
Expand Down
19,094 changes: 19,008 additions & 86 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"availity-reactstrap-validation": "^2.5.0",
"axios": "^0.21.1",
"bootstrap": "^4.1.3",
"chart.js": "^2.7.3",
"chart.js": "^2.9.4",
"font-awesome": "^4.7.0",
"material-ui-chip-input": "^1.1.0",
"parallax-js": "^3.1.0",
Expand Down Expand Up @@ -59,6 +59,10 @@
"not op_mini all"
],
"devDependencies": {
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0",
"@testing-library/react-hooks": "^7.0.2",
"@testing-library/user-event": "^13.2.1",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.0",
"env-cmd": "^8.0.2",
Expand All @@ -70,6 +74,8 @@
"eslint-plugin-promise": "^4.0.0",
"eslint-plugin-react": "^7.10.0",
"eslint-plugin-standard": "^3.1.0",
"prettier": "^1.18.2"
"jest": "^24.9.0",
"prettier": "^1.18.2",
"react-test-renderer": "^17.0.2"
}
}
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
.##.....##.##.....##.##....##.##...##..##....##..##.....##.
.##.....##.##.....##..######..##....##.##.....##..#######..

Copyright © 2020 HackRU Team at Rutgers University
Copyright © 2021 HackRU Team at Rutgers University
HackRU Research and Development Team (RnD)
-->
<html lang="en">

<head>
<meta charset="utf-8">
<meta property="og:url" content="https://www.hackru.org/" />
<meta property="og:title" content="HackRU Fall 2020" />
<meta property="og:title" content="HackRU Fall 2021" />
<meta property="og:description" content="Get hyped for the best Hackathon that Rutgers has to offer!" />
<meta property="og:image" content="./assets/fb-banner-upper.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Find out more about HackRU Fall 2020.">
<meta name="description" content="Find out more about HackRU Fall 2021.">
<link rel="icon" href="%PUBLIC_URL%/assets/icons/red_hackru.png">
<link rel="shortcut icon" href="%PUBLIC_URL%/assets/icons/red)hackru.png">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
Expand Down
Binary file modified public/resources/waiver.pdf
Binary file not shown.
68 changes: 38 additions & 30 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import Background from "./Background";
import NavBar from "./NavBar";
import { defaults } from "./Defaults"; // Get a handle to the default application settings
import { Profile } from "./components/Profile"; // User profile storage
import ForumPost from "./components/Forum";

// import Background from "./Background"; // Standard background objects

/**
Expand Down Expand Up @@ -178,44 +180,50 @@ class App extends Component {
if(defaults.teamru){
renderRoutes.push(
<Route
exact
// exact
path="/teamru"
key="teamviewer"
render={(props) => <TeamViewerPage tab={0}
{...props}
{...componentProps} />}
/>
);
renderRoutes.push(
/>,
<Route
exact
path="/teamru/myteam"
key="myteam"
render={(props) => <TeamViewerPage tab={0}
path="/forum/post/:post_uuid"
key="forum"
render={(props) => <ForumPost
{...props}
{...componentProps} />}
/>
);
renderRoutes.push(
<Route
exact
path="/teamru/explore"
key="explore"
render={(props) => <TeamViewerPage tab={1}
{...props}
{...componentProps} />}
/>
);
renderRoutes.push(
<Route
exact
path="/teamru/manage"
key="manage"
render={(props) => <TeamViewerPage tab={2}
{...props}
{...componentProps} />}
/>
{...componentProps}/>}/>
);
// renderRoutes.push(
// <Route
// exact
// path="/teamru/myteam"
// key="myteam"
// render={(props) => <TeamViewerPage tab={0}
// {...props}
// {...componentProps} />}
// />
// );
// renderRoutes.push(
// <Route
// exact
// path="/teamru/explore"
// key="explore"
// render={(props) => <TeamViewerPage tab={1}
// {...props}
// {...componentProps} />}
// />
// );
// renderRoutes.push(
// <Route
// exact
// path="/teamru/manage"
// key="manage"
// render={(props) => <TeamViewerPage tab={2}
// {...props}
// {...componentProps} />}
// />
// );
}
return (
<BrowserRouter style={{ width: "100%" }}>
Expand Down
Loading