Skip to content

Commit d663c73

Browse files
committed
Drop task builds
1 parent a561557 commit d663c73

77 files changed

Lines changed: 956 additions & 4834 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/codebattle/assets/css/style.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2724,3 +2724,4 @@ a.cb-text-light:hover {
27242724
border-bottom-color: rgba(0, 0, 0, 0.3);
27252725
}
27262726
}
2727+

apps/codebattle/assets/js/app.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import { LiveSocket } from "phoenix_live_view";
3636

3737
import "./widgets/lib/sentry";
3838
import {
39-
renderBuilderWidget,
4039
renderEventPage,
4140
renderGroupTournamentPage,
4241
renderGameThreejsPage,
@@ -53,6 +52,7 @@ import {
5352
renderSettingPage,
5453
renderStairwayGamePage,
5554
renderStreamPage,
55+
renderTaskPreviewPage,
5656
renderTournamentAdminPage,
5757
renderTournamentPage,
5858
renderTournamentEditPage,
@@ -103,7 +103,6 @@ window.addEventListener("phx:page-loading-stop", (_info) => NProgress.done());
103103

104104
liveSocket.connect();
105105

106-
const builderWidgetRoot = document.getElementById("builder-widget-root");
107106
const gameWidgetRoot = document.getElementById("game-widget-root");
108107
const gameThreejsRoot = document.getElementById("game-threejs-root");
109108
const heatmapRoot = document.getElementById("heatmap-root");
@@ -127,6 +126,7 @@ const hallOfFameRoot = document.getElementById("hall-of-fame-root");
127126
const headToHeadRoot = document.getElementById("head-to-head-root");
128127
const seasonsRoot = document.getElementById("seasons-root");
129128
const seasonShowRoot = document.getElementById("season-show-root");
129+
const taskPreviewRoot = document.getElementById("task-preview-root");
130130

131131
if (gameWidgetRoot) {
132132
renderGameWidget(gameWidgetRoot);
@@ -136,10 +136,6 @@ if (gameThreejsRoot) {
136136
renderGameThreejsPage(gameThreejsRoot);
137137
}
138138

139-
if (builderWidgetRoot) {
140-
renderBuilderWidget(builderWidgetRoot);
141-
}
142-
143139
if (heatmapRoot) {
144140
renderHeatmapWidget(heatmapRoot);
145141
}
@@ -223,3 +219,7 @@ if (seasonsRoot) {
223219
if (seasonShowRoot) {
224220
renderSeasonShowPage(seasonShowRoot);
225221
}
222+
223+
if (taskPreviewRoot) {
224+
renderTaskPreviewPage(taskPreviewRoot);
225+
}

apps/codebattle/assets/js/widgets/App.jsx

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ const TournamentEdit = React.lazy(() => import("./pages/tournament/EditTournamen
7373
const TournamentPlayer = React.lazy(() => import("./pages/tournamentPlayer"));
7474
const GroupTournament = React.lazy(() => import("./pages/groupTournament"));
7575
const TournamentsSchedule = React.lazy(() => import("./pages/schedule"));
76+
const TaskPreview = React.lazy(() => import("./pages/taskPreview"));
7677
const UserProfile = React.lazy(() => import("./pages/profile"));
7778
const UserSettings = React.lazy(() => import("./pages/settings"));
7879

@@ -121,25 +122,6 @@ export function GameThreejsPage() {
121122
);
122123
}
123124

124-
export function Builder() {
125-
return (
126-
<Provider store={store}>
127-
<PersistGate loading={null} persistor={persistor}>
128-
<Suspense>
129-
<NiceModal.Provider>
130-
<RoomWidget
131-
pageName={PageNames.builder}
132-
mainMachine={mainMachine}
133-
taskMachine={taskMachine}
134-
editorMachine={editorMachine}
135-
/>
136-
</NiceModal.Provider>
137-
</Suspense>
138-
</PersistGate>
139-
</Provider>
140-
);
141-
}
142-
143125
export function Lobby() {
144126
return (
145127
<Provider store={store}>
@@ -363,6 +345,16 @@ export function SeasonsPage() {
363345
);
364346
}
365347

348+
export function TaskPreviewPage() {
349+
return (
350+
<Provider store={store}>
351+
<Suspense>
352+
<TaskPreview />
353+
</Suspense>
354+
</Provider>
355+
);
356+
}
357+
366358
export function SeasonShowPage() {
367359
return (
368360
<Provider store={store}>

apps/codebattle/assets/js/widgets/components/LanguagePicker.jsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ import React, { useContext } from "react";
22

33
import { useDispatch } from "react-redux";
44

5-
import { inTestingRoomSelector, openedReplayerSelector } from "../machines/selectors";
6-
import {
7-
sendCurrentLangAndSetTemplate,
8-
updateCurrentLangAndSetTemplate,
9-
} from "../middlewares/Room";
5+
import { openedReplayerSelector } from "../machines/selectors";
6+
import { sendCurrentLangAndSetTemplate } from "../middlewares/Room";
107
import useMachineStateSelector from "../utils/useMachineStateSelector";
118

129
import LanguagePickerView from "./LanguagePickerView";
@@ -17,13 +14,8 @@ function LanguagePicker({ status, editor }) {
1714

1815
const { mainService } = useContext(RoomContext);
1916
const isOpenedReplayer = useMachineStateSelector(mainService, openedReplayerSelector);
20-
const isTestingRoom = useMachineStateSelector(mainService, inTestingRoomSelector);
2117
const changeLang = ({ label: { props } }) => {
22-
if (isTestingRoom) {
23-
dispatch(updateCurrentLangAndSetTemplate(props.slug));
24-
} else {
25-
dispatch(sendCurrentLangAndSetTemplate(props.slug));
26-
}
18+
dispatch(sendCurrentLangAndSetTemplate(props.slug));
2719
};
2820

2921
return (

apps/codebattle/assets/js/widgets/config/gameModes.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ export default {
44
standard: "standard",
55
tournament: "tournament",
66
history: "history",
7-
builder: "builder",
87
};

apps/codebattle/assets/js/widgets/config/gameStateCodes.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ export default {
77
timeout: "timeout",
88
rematchRejected: "rematch_rejected",
99
rematchInApproval: "rematch_in_approval",
10-
builder: "builder",
1110
};

apps/codebattle/assets/js/widgets/config/modalCodes.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
const modalCodes = {
2-
taskParamsModal: "task_params_modal",
32
gameResultModal: "game_results_modal",
4-
taskConfigurationModal: "task_configuration_modal",
53
taskDescriptionModal: "task_description_modal",
64
tournamentStatisticsModal: "tournament_statistics_modal",
75
tournamentDescriptionModal: "tournament_description_modal",
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const pageNames = {
22
game: "game",
3-
builder: "builder",
43
};
54

65
export default pageNames;

apps/codebattle/assets/js/widgets/index.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React from "react";
33
import { createRoot } from "react-dom/client";
44

55
import {
6-
Builder,
76
EventPage,
87
GroupTournamentPage,
98
Game,
@@ -16,6 +15,7 @@ import {
1615
RegistrationPage,
1716
SeasonsPage,
1817
SeasonShowPage,
18+
TaskPreviewPage,
1919
SettingsPage,
2020
StairwayGamePage,
2121
StreamPage,
@@ -30,7 +30,6 @@ import {
3030

3131
const Heatmap = React.lazy(() => import("./pages/profile/Heatmap"));
3232

33-
export const renderBuilderWidget = (domElement) => createRoot(domElement).render(<Builder />);
3433
export const renderEventPage = (domElement) => createRoot(domElement).render(<EventPage />);
3534
export const renderGroupTournamentPage = (domElement) =>
3635
createRoot(domElement).render(<GroupTournamentPage />);
@@ -53,6 +52,8 @@ export const renderHeadToHeadPage = (domElement) =>
5352
export const renderSeasonsPage = (domElement) => createRoot(domElement).render(<SeasonsPage />);
5453
export const renderSeasonShowPage = (domElement) =>
5554
createRoot(domElement).render(<SeasonShowPage />);
55+
export const renderTaskPreviewPage = (domElement) =>
56+
createRoot(domElement).render(<TaskPreviewPage />);
5657
export const renderTournamentAdminPage = (domElement) =>
5758
createRoot(domElement).render(<TournamentAdminPage />);
5859
export const renderTournamentPage = (domElement) =>

apps/codebattle/assets/js/widgets/machines/game.js

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ const states = {
2222
gameOver: "game_over",
2323

2424
stored: "stored",
25-
26-
builder: "builder.idle",
27-
testing: "builder.testing",
2825
},
2926
replayer: {
3027
empty: "empty",
@@ -174,7 +171,6 @@ const machine = {
174171
on: {
175172
LOAD_GAME: [
176173
{ target: "waiting", cond: "isWaitingGame" },
177-
{ target: "builder", cond: "isTaskBuilder" },
178174
{ target: "active", cond: "isActiveGame" },
179175
{
180176
target: "game_over",
@@ -254,28 +250,6 @@ const machine = {
254250
failure: {
255251
type: "final",
256252
},
257-
builder: {
258-
initial: "idle",
259-
states: {
260-
idle: {
261-
on: {
262-
OPEN_TESTING: [
263-
{
264-
target: "idle",
265-
cond: "haveOnlyFreeAccess",
266-
actions: ["showPremiumSubscribeRequestModal"],
267-
},
268-
{ target: "testing" },
269-
],
270-
},
271-
},
272-
testing: {
273-
on: {
274-
OPEN_TASK_BUILDER: "idle",
275-
},
276-
},
277-
},
278-
},
279253
},
280254
},
281255
replayer: {
@@ -352,7 +326,6 @@ export const config = {
352326
guards: {
353327
// game guards
354328
isWaitingGame: (_ctx, { payload }) => payload.state === GameStateCodes.waitingOpponent,
355-
isTaskBuilder: (_ctx, { payload }) => payload.state === GameStateCodes.builder,
356329
isActiveGame: (_ctx, { payload }) => payload.state === GameStateCodes.playing,
357330
haveOnlyFreeAccess: (ctx) => ctx.subscriptionType === "free",
358331
isGameOver: (_ctx, { payload }) => payload.state === GameStateCodes.gameOver,

0 commit comments

Comments
 (0)