diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 000000000..6b6114114 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/sendou-ink/v16/.suo b/.vs/sendou-ink/v16/.suo new file mode 100644 index 000000000..d98a432cb Binary files /dev/null and b/.vs/sendou-ink/v16/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 000000000..b3648e6f2 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/models/placement.js b/models/placement.js index e60acf78e..436c35abf 100644 --- a/models/placement.js +++ b/models/placement.js @@ -11,4 +11,11 @@ const placementSchema = new mongoose.Schema({ year: {type: Number, min: 2017, required: true} }) +placementSchema.virtual('player', { + ref: 'Player', + localField: 'unique_id', + foreignField: 'unique_id', + justOne: true +}) + module.exports = mongoose.model('Placement', placementSchema) \ No newline at end of file diff --git a/react-ui/src/App.js b/react-ui/src/App.js index b33a17c87..746236e06 100644 --- a/react-ui/src/App.js +++ b/react-ui/src/App.js @@ -5,18 +5,17 @@ import MainMenu from './components/Misc/MainMenu' import NotFound from './components/Misc/NotFound' import { BrowserRouter as Router, Route, Switch } from 'react-router-dom' -import WeaponLeaderboardSelector from './components/XLeaderboard/WeaponLeaderboardSelector' +import PageXLeaderboard from './components/XLeaderboard/PageXLeaderboard' import XSearch from './components/XSearch/XSearch' import InfoPlayer from './components/XSearch/InfoPlayer' -import InfoWeapon from './components/XSearch/InfoWeapon' import ScrollToTop from './utils/ScrollToTop' -import MapListGenerator from './components/Tools/MapListGenerator' -import Rotations from './components/Tools/Rotations' -import MapPlanner from './components/Tools/MapPlanner' +import PageMapListGenerator from './components/Tools/PageMapListGenerator' +import PageRotations from './components/Tools/PageRotations' +import PageMapPlanner from './components/Tools/PageMapPlanner' import Links from './components/Misc/Links' import UserPage from './components/SoloLadder/UserPage' -import HomePage from './components/Misc/HomePage' -import BuildSearch from './components/SoloLadder/BuildSearch' +import PageHome from './components/Misc/PageHome' +import PageBuilds from './components/Tools/PageBuilds' import Admin from './components/Misc/Admin' import Calendar from './components/Tools/Calendar' import XTrends from './components/XSearch/XTrends' @@ -28,23 +27,19 @@ const App = () => { -
- } /> - } /> + } /> + } /> } /> - - - } /> } /> - + } /> - + } /> @@ -53,16 +48,16 @@ const App = () => { } /> - + } /> - } /> - } /> @@ -80,7 +75,6 @@ const App = () => { } /> } /> -