Skip to content

Commit 7d8dea8

Browse files
committed
get tournaments from api for schedule
1 parent 6975c91 commit 7d8dea8

File tree

6 files changed

+402
-56
lines changed

6 files changed

+402
-56
lines changed

services/app/apps/codebattle/assets/css/style.scss

Lines changed: 146 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $cb-hovered-success: #28a428;
55
$secondary: #477591;
66
$link-color: black;
77
$error: #dc3545;
8+
$bg-orange: rgba(238, 55, 55);
89
$orange: rgba(238, 55, 55, 0.76);
910
$link-hover-color: $orange;
1011
$border-radius-sm: 0%;
@@ -15,6 +16,7 @@ $gold: #daa520;
1516
@import '~nprogress/nprogress.css';
1617
@import 'gamePreview';
1718
@import '~react-contexify/dist/ReactContexify.css';
19+
@import 'react-big-calendar/lib/css/react-big-calendar.css';
1820

1921
@font-face {
2022
font-family: 'External';
@@ -2743,7 +2745,7 @@ a:hover {
27432745
border-color: #282c38;
27442746

27452747
&.show,
2746-
&.active,
2748+
&.cb-active,
27472749
&:focus-visible {
27482750
background-color: #3a3f50;
27492751
border-color: #a4b2d6;
@@ -2759,13 +2761,13 @@ a:hover {
27592761
border-color: #a4b2d6;
27602762
}
27612763

2762-
&:active {
2764+
&:not(:disabled):not(.disabled):active,
2765+
&:not(:disabled):not(.disabled).active {
27632766
background-color: #2c303d;
27642767
border-color: #1c1e27;
27652768
}
27662769

2767-
&:disabled,
2768-
&.disabled {
2770+
&:disabled:not(.active) {
27692771
background-color: #21242e;
27702772
border-color: #13151b;
27712773
}
@@ -2785,3 +2787,143 @@ a:hover {
27852787
width: auto;
27862788
height: auto;
27872789
}
2790+
2791+
.cb-separator {
2792+
width: 100%;
2793+
border: 2px solid gray;
2794+
}
2795+
2796+
// react big calendar for tournaments
2797+
2798+
.cb-rbc-calendar {
2799+
background-color: #2a2a35;
2800+
}
2801+
2802+
.cb-rbc-calendar,
2803+
.cb-rbc-calendar * {
2804+
color: #E0E0E0;
2805+
}
2806+
2807+
.cb-rbc-calendar .rbc-btn-group button {
2808+
color: #E0E0E0;
2809+
background-color: #383845;
2810+
border-color: #444;
2811+
}
2812+
2813+
.cb-rbc-calendar .rbc-btn-group button:hover {
2814+
color: white;
2815+
background-color: #454552;
2816+
}
2817+
2818+
.cb-rbc-calendar .rbc-btn-group button:active,
2819+
.cb-rbc-calendar .rbc-btn-group button.rbc-active {
2820+
color: white;
2821+
background-image: none;
2822+
background-color: #555566 !important;
2823+
box-shadow: none;
2824+
border-color: #555566;
2825+
}
2826+
2827+
.cb-rbc-calendar .rbc-toolbar-label {
2828+
color: #FFF;
2829+
font-weight: bold;
2830+
}
2831+
2832+
.cb-rbc-calendar .rbc-header {
2833+
background-color: #2a2a35;
2834+
padding: 8px 0;
2835+
}
2836+
2837+
.cb-rbc-calendar .rbc-row-bg {
2838+
background-color: #2a2a35;
2839+
}
2840+
2841+
2842+
.cb-rbc-calendar .rbc-date-cell {
2843+
color: #E0E0E0;
2844+
}
2845+
2846+
.cb-rbc-calendar .rbc-off-range-bg {
2847+
background-color: #222228;
2848+
}
2849+
2850+
.cb-rbc-calendar .rbc-off-range .rbc-date-cell {
2851+
color: #888;
2852+
}
2853+
2854+
.rbc-overlay {
2855+
color: white;
2856+
background-color: #2a2a35;
2857+
border-radius: 0.5rem;
2858+
}
2859+
2860+
.cb-rbc-calendar .rbc-today {
2861+
background-color: #383845;
2862+
/* Slightly lighter background for "today" */
2863+
}
2864+
2865+
/* Event background (default is usually blue) */
2866+
.cb-rbc-calendar .rbc-event {
2867+
background-color: #5a7b97;
2868+
/* A visible event color */
2869+
color: white;
2870+
/* Event text is white */
2871+
}
2872+
2873+
.rbc-agenda-empty {
2874+
height: 100%;
2875+
text-align: center;
2876+
align-content: center;
2877+
}
2878+
2879+
.rbc-agenda-time-cell {
2880+
border: 1px solid #dee2e6;
2881+
}
2882+
2883+
.rbc-overlay .cb-rbc-event,
2884+
.rbc-row .cb-rbc-event,
2885+
.rbc-events-container .cb-rbc-event {
2886+
cursor: pointer;
2887+
2888+
&.cb-rbc-live-event {
2889+
background-color: $cb-success;
2890+
}
2891+
2892+
&.cb-rbc-canceled-event {
2893+
background-color: var(--gray);
2894+
}
2895+
2896+
&.cb-rbc-upcoming-event {
2897+
background-color: var(--gray);
2898+
}
2899+
2900+
&.cb-rbc-finished-event {
2901+
background-color: $bg-orange;
2902+
}
2903+
}
2904+
2905+
.cb-rbc-event {
2906+
&.cb-rbc-live-event .rbc-agenda-event-cell {
2907+
background-color: $cb-success;
2908+
}
2909+
2910+
&.cb-rbc-canceled-event .rbc-agenda-event-cell {
2911+
background-color: var(--gray);
2912+
}
2913+
2914+
&.cb-rbc-upcoming-event .rbc-agenda-event-cell {
2915+
background-color: var(--gray);
2916+
}
2917+
2918+
&.cb-rbc-finished-event .rbc-agenda-event-cell {
2919+
background-color: $bg-orange;
2920+
}
2921+
2922+
& .rbc-agenda-event-cell {
2923+
cursor: pointer;
2924+
}
2925+
}
2926+
2927+
// &:hover {
2928+
// background-color: rgba(90, 123, 151, 0.2);
2929+
// }

services/app/apps/codebattle/assets/js/widgets/middlewares/Tournament.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,19 @@ export const connectToTournament = (waitingRoomMachine, newTournamentId) => disp
160160
.addListener('tournament:ranking_update', handleTournamentRankingUpdate);
161161
};
162162

163+
export const uploadTournamentsByFilter = (from, to) => axios
164+
.get(`api/v1/tournaments?from=${from}&to=${to}`, {
165+
headers: {
166+
'Content-Type': 'application/json',
167+
'x-csrf-token': window.csrf_token,
168+
},
169+
})
170+
.then(response => {
171+
const data = camelizeKeys(response.data);
172+
173+
return [data.upcomingTournaments, data.userTournaments];
174+
});
175+
163176
// TODO (tournaments): request matches by searched player id
164177
export const uploadPlayers = playerIds => (dispatch, getState) => {
165178
const state = getState();

0 commit comments

Comments
 (0)