lab 8 done

lab 8 p6/7 done
p6/7 started (Freezing due to no experience in redux)
2026-04-24 12:16:17 +10:00 · 2026-04-23 16:49:22 +10:00 · 2026-04-16 22:52:43 +10:00 · 2026-04-16 20:07:10 +10:00
20 changed files with 21 additions and 876 deletions
--- a/labs/lab6/src/App.tsx
+++ b/labs/lab6/src/App.tsx
@@ -2,7 +2,7 @@ import NavBar from './components/Navbar'
 import Gallery from "./components/Gallery";
 import Content from "./components/Content";
 import CustomFooter from "./components/CustomFooter";
-import Task from "./Task"
+

 import './styles/App.css'

@@ -13,7 +13,6 @@ function App() {
      <Gallery/>
      <Content/>
      <CustomFooter/>
-      <Task/>
    </>
  )
 }
--- a/labs/lab6/src/Task.tsx
+++ b/labs/lab6/src/Task.tsx
@@ -1,38 +0,0 @@
-import { useState,useEffect } from "react"
-import type {ReactElement} from "react"
-const lines = [
-    "Ночь, улица, фонарь, аптека,",
-    "Бессмыссленный и тусклый свет.",
-    "Живи ещё хоть четверть века - ",
-    "Всё будет так. Исхода нет.",
-    "Умрёшь -  начнёшь опять сначала",
-    "И повториться всё как встарь:",
-    "Ночь, ледяная рябь канала",
-    "Аптека, Улица, фонарь."
-];
-
-interface ComponentProps {
-    Inputinterval: number
-}
-
-
-const Task = ({Inputinterval}:ComponentProps): ReactElement =>{
-    const [interval, updateInterval] = useState<number>(Inputinterval);
-    const [lineIdx, updateLineIdx] = useState<number>(0);
-    const updateLine = ():void =>{
-        updateLineIdx((lineIdx+1)%lines.length);
-    }
-    useEffect(()=>{
-        const intervalId = setInterval(updateLine,Number(interval));
-        return ()=>{ clearInterval(intervalId)}
-    })
-    return(
-        <>
-        <input type="number" value={interval} onChange={(event)=>{updateInterval(Number(event.target.value))}}></input>
-        <div className="blackDiv">
-            <h2 className="bigWhite">{lines[lineIdx]}</h2>
-        </div>
-        </>
-    )
-}
-export default Task;
--- a/labs/lab6/src/components/BuildCard.tsx
+++ b/labs/lab6/src/components/BuildCard.tsx
@@ -24,10 +24,8 @@ interface ComponentProps {


 function BuildCard({ building,cardNum} : ComponentProps) {
-    const reverseModifier = cardNum % 2 == 0 ? "-reverse" : "";
-
    return (
-      <Card sx={{  display: 'flex', flexDirection:{xs:"column", sm:"row"+reverseModifier} }} >
+      <Card  style={cardNum%2==0?{'flexDirection':'row-reverse'}:{}}sx={{  display: 'flex' }} >
        <CardMedia
            component="img"
            alt={ building.title }
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -8,22 +8,17 @@
      "name": "site",
      "version": "0.0.0",
      "dependencies": {
-        "@dnd-kit/core": "^6.3.1",
-        "@dnd-kit/sortable": "^10.0.0",
        "@emotion/react": "^11.14.0",
        "@emotion/styled": "^11.14.1",
        "@mui/icons-material": "^9.0.0",
        "@mui/material": "^9.0.0",
        "@mui/x-charts": "^9.0.1",
        "@mui/x-data-grid": "^9.0.1",
-        "@reduxjs/toolkit": "^2.11.2",
        "@types/d3": "^7.4.3",
        "d3": "^7.9.0",
        "react": "^19.2.4",
        "react-dom": "^19.2.4",
-        "react-redux": "^9.2.0",
-        "react-router-dom": "^7.14.1",
-        "redux": "^5.0.1"
+        "react-router-dom": "^7.14.1"
      },
      "devDependencies": {
        "@babel/core": "^7.29.0",
@@ -283,59 +278,6 @@
        "node": ">=6.9.0"
      }
    },
-    "node_modules/@dnd-kit/accessibility": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
-      "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@dnd-kit/core": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
-      "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@dnd-kit/accessibility": "^3.1.1",
-        "@dnd-kit/utilities": "^3.2.2",
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@dnd-kit/sortable": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
-      "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
-      "license": "MIT",
-      "dependencies": {
-        "@dnd-kit/utilities": "^3.2.2",
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@dnd-kit/core": "^6.3.0",
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@dnd-kit/utilities": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
-      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
    "node_modules/@emnapi/core": {
      "version": "1.9.2",
      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.2.tgz",
@@ -1208,32 +1150,6 @@
        "url": "https://opencollective.com/popperjs"
      }
    },
-    "node_modules/@reduxjs/toolkit": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.11.2.tgz",
-      "integrity": "sha512-Kd6kAHTA6/nUpp8mySPqj3en3dm0tdMIgbttnQ1xFMVpufoj+ADi8pXLBsd4xzTRHQa7t/Jv8W5UnCuW4kuWMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@standard-schema/spec": "^1.0.0",
-        "@standard-schema/utils": "^0.3.0",
-        "immer": "^11.0.0",
-        "redux": "^5.0.1",
-        "redux-thunk": "^3.1.0",
-        "reselect": "^5.1.0"
-      },
-      "peerDependencies": {
-        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
-        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-redux": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/@rolldown/binding-android-arm64": {
      "version": "1.0.0-rc.15",
      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.15.tgz",
@@ -1547,18 +1463,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@standard-schema/spec": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
-      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
-      "license": "MIT"
-    },
-    "node_modules/@standard-schema/utils": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
-      "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
-      "license": "MIT"
-    },
    "node_modules/@tybys/wasm-util": {
      "version": "0.10.1",
      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
@@ -1938,12 +1842,6 @@
        "@types/react": "*"
      }
    },
-    "node_modules/@types/use-sync-external-store": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
-      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
-      "license": "MIT"
-    },
    "node_modules/@typescript-eslint/eslint-plugin": {
      "version": "8.58.1",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.1.tgz",
@@ -3505,16 +3403,6 @@
        "node": ">= 4"
      }
    },
-    "node_modules/immer": {
-      "version": "11.1.4",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.4.tgz",
-      "integrity": "sha512-XREFCPo6ksxVzP4E0ekD5aMdf8WMwmdNaz6vuvxgI40UaEiu6q3p8X52aU6GdyvLY3XXX/8R7JOTXStz/nBbRw==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
    "node_modules/import-fresh": {
      "version": "3.3.1",
      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -4308,29 +4196,6 @@
      "integrity": "sha512-Dn0t8IQhCmeIT3wu+Apm1/YVsJXsGWi6k4sPdnBIdqMVtHtv0IGi6dcpNpNkNac0zB2uUAqNX3MHzN8c+z2rwQ==",
      "license": "MIT"
    },
-    "node_modules/react-redux": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
-      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/use-sync-external-store": "^0.0.6",
-        "use-sync-external-store": "^1.4.0"
-      },
-      "peerDependencies": {
-        "@types/react": "^18.2.25 || ^19",
-        "react": "^18.0 || ^19",
-        "redux": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "redux": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/react-router": {
      "version": "7.14.1",
      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.14.1.tgz",
@@ -4385,21 +4250,6 @@
        "react-dom": ">=16.6.0"
      }
    },
-    "node_modules/redux": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
-      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "license": "MIT"
-    },
-    "node_modules/redux-thunk": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
-      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "redux": "^5.0.0"
-      }
-    },
    "node_modules/reselect": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
@@ -4637,7 +4487,9 @@
      "version": "2.8.1",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
+      "dev": true,
+      "license": "0BSD",
+      "optional": true
    },
    "node_modules/type-check": {
      "version": "0.4.0",
--- a/site/package.json
+++ b/site/package.json
@@ -10,22 +10,17 @@
    "preview": "vite preview"
  },
  "dependencies": {
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/sortable": "^10.0.0",
    "@emotion/react": "^11.14.0",
    "@emotion/styled": "^11.14.1",
    "@mui/icons-material": "^9.0.0",
    "@mui/material": "^9.0.0",
    "@mui/x-charts": "^9.0.1",
    "@mui/x-data-grid": "^9.0.1",
-    "@reduxjs/toolkit": "^2.11.2",
    "@types/d3": "^7.4.3",
    "d3": "^7.9.0",
    "react": "^19.2.4",
    "react-dom": "^19.2.4",
-    "react-redux": "^9.2.0",
-    "react-router-dom": "^7.14.1",
-    "redux": "^5.0.1"
+    "react-router-dom": "^7.14.1"
  },
  "devDependencies": {
    "@babel/core": "^7.29.0",
--- a/site/src/chart/components/GroupChart.tsx
+++ b/site/src/chart/components/GroupChart.tsx
@@ -10,43 +10,21 @@ type GroupProps = {
 };


-
-
 function GroupChart({ data }: GroupProps) {
    const [isBar, setIsBar] = useState(true);
-    const [doStack, setDoStack] = useState(false);
    const [series, setSeries] = useState({
-        'min': false,
-        'mean': false,
        'max': true,
+        'mean': false,
+        'min': false,
    });
-
-    const deltas = data.map((val) => {
-        const out = { ...val };
-        const deltaMinMean = (val["mean"] - (Number(series["min"])?val["min"]:0));
-        const deltaMeanMax = (val["max"] - (Number(series["mean"])?val["mean"]:(series["min"]?val["min"]:0)));
-        out["mean"] = deltaMinMean;
-        out["max"] = deltaMeanMax;
-        return out;
-    })
-    const formatLabel =  (key:string)=>(value:number,didx:{dataIndex:number}):number => {
-        const idx= didx["dataIndex"]
-        return String(data[idx][key]);
-    }
-
    const selectedSeries = Object.entries(series).filter(item => item[1] === true);
-
    let seriesY = selectedSeries.map(item => {
        return {
            dataKey: item[0],
            label: item[0],
-            barLabel: (selectedSeries.length === 1) && (data.length < 20) ? ('value' as const) : undefined,
-            stack: doStack && isBar ? 'prices' : undefined,
-            valueFormatter: (doStack && isBar)? formatLabel(item[0]):(v:number)=>String(v) 
+            barLabel: selectedSeries.length === 1 ? ('value' as const) : undefined,
        }
    });
-        console.log(seriesY)
-    console.log(doStack)
    const chartSetting = {
        yAxis: [{ label: 'Price ($)' }],
        height: 400,
@@ -55,7 +33,7 @@ function GroupChart({ data }: GroupProps) {
    return (
        <Container maxWidth="lg">
            {isBar && <BarChart
-                dataset={doStack ? deltas : data}
+                dataset={data}
                xAxis={[{ scaleType: 'band', dataKey: 'group' }]}
                series={seriesY}
                slotProps={{
@@ -65,7 +43,7 @@ function GroupChart({ data }: GroupProps) {
                }}
                {...chartSetting}
            />}
-            {!isBar && <LineChart
+            {!isBar &&<LineChart
                dataset={data}
                xAxis={[{ scaleType: 'band', dataKey: 'group' }]}
                series={seriesY}
@@ -76,7 +54,7 @@ function GroupChart({ data }: GroupProps) {
                }}
                {...chartSetting}
            />}
-            <SettingChart series={series} setSeries={setSeries} isBar={isBar} setIsBar={setIsBar} doStack={doStack} setDoStack={setDoStack} />
+            <SettingChart series={series} setSeries={setSeries} isBar={isBar} setIsBar={setIsBar} />
        </Container>
    )
 };
--- a/site/src/chart/components/SettingChart.tsx
+++ b/site/src/chart/components/SettingChart.tsx
@@ -7,8 +7,6 @@ import Stack from '@mui/material/Stack';
 import Divider from '@mui/material/Divider';
 import RadioGroup from '@mui/material/RadioGroup';
 import Radio from '@mui/material/Radio';
-import Switch from '@mui/material/Switch';
-


 type tSeries = {
@@ -21,12 +19,9 @@ type CheckboxProps = {
  setSeries: React.Dispatch<React.SetStateAction<tSeries>>;
  isBar: boolean;
  setIsBar: React.Dispatch<React.SetStateAction<boolean>>
-  doStack: boolean;
-  setDoStack: React.Dispatch<React.SetStateAction<boolean>>
-
 };

-function SettingChart({ series, setSeries, isBar, setIsBar, doStack, setDoStack }: CheckboxProps) {
+function SettingChart({ series, setSeries, isBar, setIsBar }: CheckboxProps) {
  const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    setSeries({
      ...series,
@@ -34,10 +29,6 @@ function SettingChart({ series, setSeries, isBar, setIsBar, doStack, setDoStack
    });
  };

-  const changeDoStack =(event:React.ChangeEvent<HTMLInputElement>)=>{
-    setDoStack(event.target.checked)
-  }
-
  const handleRadioButtonChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    setIsBar(event.target.value === "bar");
  };
@@ -98,17 +89,6 @@ function SettingChart({ series, setSeries, isBar, setIsBar, doStack, setDoStack
          }
          label="Min price"
        />
-        
-       <FormControlLabel
-          control={
-        <Switch 
-          checked={doStack}
-          onChange={changeDoStack} 
-          
-          />
-          }
-           label="Do Stack"
-        />
      </FormControl>
    </Stack>
  )
--- a/site/src/data.tsx
+++ b/site/src/data.tsx
@@ -173,8 +173,8 @@ type GroupedRamPrice =Array<{
    id: number;
    group: string | number;
    min:number;
-    mean:number;
    max:number;
+    mean:number;
 }>;

 const gropuedPrices = groupBycolumns.map((col) => {
@@ -184,10 +184,9 @@ const gropuedPrices = groupBycolumns.map((col) => {
        out.push({
            id: out.length + 1,
            group: key,
-            mean: Math.round((d3.mean(prices) ?? 0)*1000)/1000,
-            max: d3.max(prices) ?? 0,
            min: d3.min(prices) ?? 0,
-
+            max: d3.max(prices) ?? 0,
+            mean: Math.round((d3.mean(prices) ?? 0)*1000)/1000,
        });
    });

--- a/site/src/main.tsx
+++ b/site/src/main.tsx
@@ -1,6 +1,6 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
-import { Provider } from 'react-redux';
+
 import {
  createBrowserRouter,
  RouterProvider,
@@ -9,9 +9,8 @@ import {
 import List from "./list/List";
 import Chart from "./chart/Chart";
 import Main from "./main/Main";
-import Quiz from "./quiz/QuizPage";
 import ProjectDetails from "./projectDetails/ProjectDetails";
-import store from './store';
+


 const router = createBrowserRouter([
@@ -31,10 +30,6 @@ const router = createBrowserRouter([
    path: "/chart",
    element: <Chart />,
  },
-   {
-    path: "/quiz",
-    element: <Quiz />,
-  },
 ]);


@@ -42,8 +37,6 @@ const router = createBrowserRouter([
 import './styles/index.css'
 createRoot(document.getElementById('root')!).render(
  <StrictMode>
-    <Provider store={store}>
-      <RouterProvider router={router} />
-    </Provider>
+    <RouterProvider router={router} />
  </StrictMode>,
 )
--- a/site/src/main/components/Gallery.tsx
+++ b/site/src/main/components/Gallery.tsx
@@ -15,7 +15,7 @@ function Gallery() {
          sx={{
            columnCount: {
              xs: '1 !important',
-              sm: '1 !important',
+              sm: '3 !important',
              md: '3 !important',
              lg: '3 !important',
            },
--- a/site/src/quiz/QuizPage.tsx
+++ b/site/src/quiz/QuizPage.tsx
@@ -1,15 +0,0 @@
-import NavBar from "../components/Navbar";
-import Footer from "../components/CustomFooter";
-import Quiz from "./features/Quiz";
-
-function QuizPage() {
-    return (
-        <>
-        <NavBar active="4" />
-        <Quiz />
-        <Footer />
-        </>
-    );
-}
-
-export default  QuizPage;
--- a/site/src/quiz/components/SortableItem.tsx
+++ b/site/src/quiz/components/SortableItem.tsx
@@ -1,42 +0,0 @@
-import { useSortable } from '@dnd-kit/sortable';
-import { CSS } from '@dnd-kit/utilities';
-import { ListItem, ListItemText, ListItemButton, ListItemIcon} from '@mui/material';
-import DragIndicatorIcon from '@mui/icons-material/DragIndicator';
-
-interface SortableItemProps {
-   item: string;
-   id: string;// чтобы тайпскрипт компилятор не жаловался, добавил в инетрфейс, хотя и так компилируется нормально
-   isDisabled:boolean;
-}
-
-export function SortableItem({ item ,isDisabled}: SortableItemProps) {
-      const id = item; /* идентификатор для useSortable */
-      const {
-        attributes,
-        listeners,
-        setNodeRef,
-        transform,
-        transition,
-      } = useSortable({ id });
-
-      const style = {
-        transform: CSS.Transform.toString(transform),
-        transition,
-      };
-
-      return (
-        <ListItem ref={ isDisabled ? undefined : setNodeRef } style={ style } { ...attributes } { ...listeners }>
-          <ListItemButton
-              sx={{
-              border: '1px solid gray',
-              borderRadius: '5px',
-              height:"4.4em"
-            }}>
-            <ListItemIcon>
-              <DragIndicatorIcon />
-            </ListItemIcon>
-            <ListItemText primary={ item } />
-          </ListItemButton>
-        </ListItem>
-      );
-    }
--- a/site/src/quiz/features/Choosing.tsx
+++ b/site/src/quiz/features/Choosing.tsx
@@ -1,72 +0,0 @@
-import { Grid, List, ListItem, ListItemButton, ListItemText } from '@mui/material';
-import { useDispatch, useSelector } from 'react-redux';
-import type { tTasks } from "../quizData"
-import { useEffect } from 'react';
-import { addList, mixUp } from './quizSlice';
-import Checkbox from '@mui/material/Checkbox';
-import type { RootState } from '../../store';
-import type { ChangeEvent } from 'react';
-import { setCheckedItems } from './quizSlice';
-
-
-interface ComponentProps {
-  tasks: tTasks;
-  index: number;
-}
-
-function Matching({ tasks, index }: ComponentProps) {
-  const dispatch = useDispatch();
-  const answers: boolean[] = tasks.map((item) => Boolean(item.answer));
-  const items: string[] = tasks.map((item) => String(item.answer));
-  const arr = useSelector((state: RootState) => state.quiz.userAnswers[index]);
-  // const correctAnswers = useSelector((state: RootState) => state.quiz.correctAnswers[index]);
-  const questions = useSelector((state: RootState) => state.quiz.questions[index]);
-  const isDisabled = useSelector((state: RootState) => state.quiz.isTestingDone);
-  useEffect(() => {
-    dispatch(addList({ index, items: items,questions:tasks.map((item) => String(item.question)), answers: answers, quizType: "M" }));
-  }, []);
-
-  useEffect(() => {
-    dispatch(mixUp());
-  }, []);
-
-
-  const handleCheckboxAction = (checkboxIndex: number) => (_: ChangeEvent<HTMLInputElement, Element>, checked: boolean) => {
-    let answersCopy = arr.map((x)=>(Boolean(x)));
-    answersCopy[checkboxIndex] = checked;
-    dispatch(setCheckedItems({ index, items: answersCopy }));
-  };
-  
-  // console.log(arr);
-
-  return (
-    <Grid container spacing={2}>
-      <Grid size={12}>
-        <List>
-          {tasks.map((_, itemIndex) => (
-            <ListItem key={itemIndex}>
-              <ListItemButton
-                sx={{
-                  border: '1px solid gray',
-                  borderRadius: '5px',
-                  textAlign: 'right',
-                }}>
-                <ListItemText primary={arr == undefined ? "loading": questions[itemIndex]} />
-                <Checkbox
-                  onChange={isDisabled ? (..._) => { _ } : handleCheckboxAction(itemIndex)}
-                  checked={Boolean(arr == undefined ? false : arr[itemIndex])}
-                  sx={{ '& .MuiSvgIcon-root': { fontSize: 28 } }}
-                />
-              </ListItemButton>
-            </ListItem>
-          ))}
-        </List>
-      </Grid>
-      <Grid size={12}>
-
-      </Grid>
-    </Grid>
-  );
-}
-
-export default Matching
--- a/site/src/quiz/features/Matching.tsx
+++ b/site/src/quiz/features/Matching.tsx
@@ -1,53 +0,0 @@
-import { Grid, List, ListItem, ListItemButton, ListItemText } from '@mui/material';
-import type { tTasks } from "../quizData"
-import SortableList from '../features/SortableList';
-import { useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import { addList, mixUp } from './quizSlice';
-interface ComponentProps {
-  tasks: tTasks;
-  index: number;
-}
-
-function Matching({ tasks, index }: ComponentProps) {
-  const dispatch = useDispatch();
-  const answers: string[] = tasks.map((item) => String(item.answer));
-  // Добавляем список ответов очередного задания в хранилище
-  useEffect(() => {
-    dispatch(addList({ index, items: answers, answers:answers, questions:tasks.map((item) => String(item.question)), quizType: "M" }));
-  }, []);
-
-  useEffect(() => {
-    dispatch(mixUp());
-  }, []);
-
-
-
-  return (
-    <Grid container spacing={2}>
-      <Grid size={6}>
-        <List>
-          {tasks.map((item, index) => (
-            <ListItem key={index}>
-              <ListItemButton
-                sx={{
-                  border: '1px solid gray',
-                  borderRadius: '5px',
-                  textAlign: 'right',
-                  height:"4.4em"
-                }}>
-                <ListItemText primary={item.question} />
-              </ListItemButton>
-            </ListItem>
-          ))}
-        </List>
-      </Grid>
-
-      <Grid size={6}>
-        <SortableList index={index} answers={answers} />
-      </Grid>
-    </Grid>
-  );
-}
-
-export default Matching
--- a/site/src/quiz/features/Quiz.tsx
+++ b/site/src/quiz/features/Quiz.tsx
@@ -1,98 +0,0 @@
-import { Box, Button, Container, Typography } from '@mui/material';
-import { quiz } from "../quizData";
-import { useSelector } from 'react-redux';
-import { useState } from 'react';
-import Matching from './Matching';
-import Sorting from './Sorting';
-import Choosing from './Choosing';
-import type { RootState } from '../../store';
-import store from '../../store';
-import { useDispatch } from 'react-redux';
-import { mixUp, startTesting, stopTesting } from './quizSlice';
-
-function QuizStats() {
-  let correctAnswers = useSelector((state: RootState) => state.quiz.correctAnswers);
-  const userAnswers = useSelector((state: RootState) => state.quiz.userAnswers);
-
-  const correctCount = (index: number): number => {
-    let state = store.getState();
-    if (state.quiz.correctAnswers.length <= index) {
-      return 0;
-    }
-    return userAnswers[index].reduce((prev, answ, i) => prev + Number(correctAnswers[index][i] === answ), 0);
-  }
-
-  const counts = userAnswers.map((_,index)=>correctCount(index));
-  const questionCounts = userAnswers.map((answers)=>answers.length);
-
-  const total= counts.reduce((x,c)=>c+x,0);
-  const totalQuestionCount= questionCounts.reduce((x,c)=>c+x,0);
-
-  const donePercentage = Math.round(total/totalQuestionCount*100*100)/100;
-
-  const quizPartText = (counter: number, len: number, taskIndex:number) => {
-    if (counter == len) {
-      return <Typography key={taskIndex}>Task {taskIndex+1}: everethyng is correct</Typography>
-    }
-    return  <Typography key={taskIndex}>Task {taskIndex+1}: correct {counter}/{len}</Typography>
-  }
-
-
-  return (
-    <Container sx={{ margin: "auto", d:"flex",flexDirection:"column" }}>
-      <h2>Результаты теста</h2>
-      {
-        counts.map((count,idx)=>quizPartText(count,questionCounts[idx],idx))
-      }
-      <h3>Итого {donePercentage}% Верно</h3>
-    </Container>
-  )
-}
-
-
-function Quiz() {
-  const dispatch = useDispatch();
-  const [displayingResults, setDisplayingResults] = useState(false);
-  const resetQuiz = () => {
-    setDisplayingResults(false);
-    dispatch(mixUp());
-    dispatch(startTesting());
-  }
-
-  const checkQuiz = () => {
-    setDisplayingResults(true);
-    dispatch(stopTesting());
-  }
-
-
-  return (
-    <Container maxWidth="md">
-      {quiz.map((item, index) => (
-        <Box key={item.id} component="section" sx={{ m: 2, p: 2}}>
-          <Typography variant="h5" gutterBottom>
-            {index + 1}. {item.title}
-          </Typography>
-          {[
-
-            <Matching index={index} tasks={item.tasks} key={index}/>, 
-            
-            <Sorting index={index} tasks={item.tasks} key={index}/>,
-            
-            <Choosing index={index} tasks={item.tasks} key={index}/>
-             
-             ][(["M", "S", "C"].indexOf(item.type))]}
-        </Box>
-        
-      ))}
-        <Box sx={{ display: 'flex', justifyContent: 'space-around' }}>
-                <Button onClick={checkQuiz} variant="contained">Check</Button>
-                <Button onClick={resetQuiz} variant="contained">Reset</Button>
-              </Box>
-
-      {displayingResults && <QuizStats />}
-
-    </Container>
-  );
-}
-
-export default Quiz
--- a/site/src/quiz/features/SortableList.tsx
+++ b/site/src/quiz/features/SortableList.tsx
@@ -1,44 +0,0 @@
-import { DndContext, closestCenter } from '@dnd-kit/core';
-import { SortableContext, verticalListSortingStrategy, arrayMove } from '@dnd-kit/sortable';
-import { useDispatch, useSelector } from 'react-redux';
-import { setDraggedItems } from './quizSlice';
-import type { RootState } from '../../store';
-import List from '@mui/material/List';
-import { SortableItem } from '../components/SortableItem';
-interface ComponentProps {
-  index: number;
-  answers: string[];
-}
-
-function SortableList({ index}: ComponentProps) {
-
-  const dispatch = useDispatch();
-  const arr = useSelector((state: RootState) => state.quiz.userAnswers[index])
-  const isDisabled = useSelector((state: RootState) => state.quiz.isTestingDone)
-  const draggedItems = arr || []; 
-
-  const handleDragEnd = (event: any) => {
-    const { active, over } = event;
-    if (active.id !== over.id) {
-       const oldIndex = draggedItems.indexOf(active.id);
-       const newIndex = draggedItems.indexOf(over.id);
-       const newList = arrayMove(draggedItems, oldIndex, newIndex);
-       dispatch(setDraggedItems({ index, items: newList }));
-    } 
-  };
-
-  return (
-    <DndContext collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
-      <SortableContext items={draggedItems.map((x)=> String(x))}
-        strategy={verticalListSortingStrategy}>
-        <List>
-          {draggedItems.map((item) => (
-            <SortableItem key={String(item)} item={String(item)} id={String(item)} isDisabled={isDisabled} />
-          ))}
-        </List>
-      </SortableContext>
-    </DndContext>
-  );
-}
-
-export default SortableList;
--- a/site/src/quiz/features/Sorting.tsx
+++ b/site/src/quiz/features/Sorting.tsx
@@ -1,35 +0,0 @@
-import { Grid} from '@mui/material';
-import type { tTasks } from "../quizData"
-import SortableList from '../features/SortableList';
-import { useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import { addList, mixUp } from './quizSlice';
-interface ComponentProps {
-  tasks: tTasks;
-  index: number;
-}
-
-function Matching({ tasks, index }: ComponentProps) {
-  const dispatch = useDispatch();
-  const answers: string[] = tasks.map((item) => String(item.answer));
-  // Добавляем список ответов очередного задания в хранилище
-  useEffect(() => {
-    dispatch(addList({ index, items: answers, answers:answers,questions:tasks.map((item) => String(item.question)), quizType: "M" }));
-  }, []);
-
-  useEffect(() => {
-    dispatch(mixUp());
-  }, []);
-
-
-
-  return (
-    <Grid container spacing={2}>
-      <Grid size={12}>
-        <SortableList index={index} answers={answers} />
-      </Grid>
-    </Grid>
-  );
-}
-
-export default Matching
--- a/site/src/quiz/features/quizSlice.tsx
+++ b/site/src/quiz/features/quizSlice.tsx
@@ -1,85 +0,0 @@
-import { createSlice } from '@reduxjs/toolkit';
-import type { PayloadAction } from '@reduxjs/toolkit';
-
-function shuffle<T>(array: Array<T>): Array<T> {
-  let currentIndex = array.length;
-
-  // While there remain elements to shuffle...
-  while (currentIndex != 0) {
-
-    // Pick a remaining element...
-    let randomIndex = Math.floor(Math.random() * currentIndex);
-    currentIndex--;
-
-    // And swap it with the current element.
-    [array[currentIndex], array[randomIndex]] = [
-      array[randomIndex], array[currentIndex]];
-  }
-  return array;
-}
-
-interface QuizState {
-  userAnswers: (string | boolean)[][]; // хранит перемещаемые элементы каждого списка ответов
-  questions: string[][];
-  correctAnswers: (string | boolean)[][];// ответы для вопрсов, в случае с matching просто правильная последоавтельность, для sorting аналогично, для choosе последоватеьность boolean 
-  quizTypes: Array<"M" | "S" | "C">;
-  isTestingDone: boolean// запрет на взаимодействие с квизом после окончания тестирования, чтобю юзер не наглел
-}
-
-const initialState: QuizState = {
-  userAnswers: [],
-  correctAnswers: [],
-  quizTypes: [],
-  questions:[],
-  isTestingDone: false,
-};
-
-const listsSlice = createSlice({
-  name: 'lists',
-  initialState,
-  reducers: {
-    addList: (state, action: PayloadAction<{ index: number; items: string[]; questions: string[]; answers: (string|boolean)[]; quizType : "S" | "M" | "C"}>) => {
-      const { index, items,questions,answers,quizType} = action.payload;
-      state.questions.splice(index, 1, questions); 
-      state.userAnswers.splice(index, 1, items); // с нулём создаётся по 2 экземпляра, видно в отладке
-      state.quizTypes.splice(index, 1, quizType); //
-      state.correctAnswers.splice(index, 1, answers);
-
-    },
-    setDraggedItems: (state, action: PayloadAction<{ index: number; items:  (string|boolean)[] }>) => {
-      const { index, items } = action.payload;
-      if (index >= 0 && index < state.userAnswers.length) {
-        state.userAnswers[index] = items; // обновляем конкретный список
-      }
-    },
-    setCheckedItems: (state, action: PayloadAction<{ index: number; items:  boolean[] }>) => {
-      const { index, items } = action.payload;
-      if (index >= 0 && index < state.userAnswers.length) {
-        state.userAnswers[index] = items; // обновляем конкретный список
-      }
-    },
-    mixUp: (state) => {
-      state.userAnswers = state.userAnswers.map((list,index) => {
-        if(typeof(state.correctAnswers[index][0])==="boolean"){
-          list.map(()=>false);
-          let indexes = shuffle( list.map((_,idx)=>idx));
-          state.correctAnswers[index]=state.correctAnswers[index].map((_,i,arr)=>arr[indexes[i]])
-          state.questions[index]=state.questions[index].map((_,i,arr)=>arr[indexes[i]])
-          return list.map(()=>false)
-        }
-        return shuffle<string|boolean>(list);
-      })
-    },
-    stopTesting: (state) => {
-      state.isTestingDone = true;
-    },
-    startTesting: (state) => {
-      state.isTestingDone = false;
-    }
-  },
-});
-
-// Экспортируем действия и редьюсер
-export const { addList, setDraggedItems,setCheckedItems, mixUp, startTesting, stopTesting } = listsSlice.actions;
-export type { QuizState }
-export default listsSlice.reducer;
--- a/site/src/quiz/quizData.tsx
+++ b/site/src/quiz/quizData.tsx
@@ -1,152 +0,0 @@
-export type tTasks ={
-    "question": string; /* вопрос задания*/
-    "answer": string|number|boolean; /* ответ задания*/
-}[]
-
-export type tQuizzes = {
-    "id": number, 
-    "type": "M" | "S" | "C", /*  Match Sort Choose*/
-    "title": string, /* формулировка задания */
-    "tasks": tTasks, 
-}[];
-
-export const quiz: tQuizzes = [
-  {
-    "id": 0,
-    "type": "C",
-    "title": "RAM price jump: pick true statements",
-    "tasks": [
-      {
-        "question": "AI server demand pushed DRAM contracts up in 2024-2025",
-        "answer": true
-      },
-      {
-        "question": "Laptop DDR5 demand was the main global driver",
-        "answer": false
-      },
-      {
-        "question": "HBM supply limits affected overall memory pricing",
-        "answer": true
-      },
-      {
-        "question": "Memory prices stayed flat through 2025",
-        "answer": false
-      }
-    ]
-  },
-  {
-    "id": 1,
-    "type": "M",
-    "title": "Match RAM market terms",
-    "tasks": [
-      {
-        "question": "HBM",
-        "answer": "High Bandwidth Memory"
-      },
-      {
-        "question": "DRAM",
-        "answer": "Dynamic Random Access Memory"
-      },
-      {
-        "question": "NAND",
-        "answer": "Flash storage memory"
-      },
-      {
-        "question": "Contract price",
-        "answer": "Long-term negotiated memory price"
-      }
-    ]
-  },
-  {
-    "id": 2,
-    "type": "S",
-    "title": "Sort AI stack by deployment flow",
-    "tasks": [
-      {
-        "question": "1",
-        "answer": "Collect and clean data"
-      },
-      {
-        "question": "2",
-        "answer": "Train model"
-      },
-      {
-        "question": "3",
-        "answer": "Optimize for inference"
-      },
-      {
-        "question": "4",
-        "answer": "Deploy and monitor"
-      }
-    ]
-  },
-  {
-    "id": 3,
-    "type": "C",
-    "title": "AI trends: choose true",
-    "tasks": [
-      {
-        "question": "Edge AI adoption grew in 2024-2026",
-        "answer": true
-      },
-      {
-        "question": "LLMs removed the need for GPUs",
-        "answer": false
-      },
-      {
-        "question": "Smaller task-specific models are still widely used",
-        "answer": true
-      },
-      {
-        "question": "AI inference always runs only in cloud",
-        "answer": false
-      }
-    ]
-  },
-  {
-    "id": 4,
-    "type": "M",
-    "title": "Match low-energy embedded methods",
-    "tasks": [
-      {
-        "question": "Sleep mode",
-        "answer": "Turns off CPU blocks between events"
-      },
-      {
-        "question": "DVFS",
-        "answer": "Adjusts voltage and frequency to save power"
-      },
-      {
-        "question": "Interrupt wakeup",
-        "answer": "Wakes MCU only on external/internal trigger"
-      },
-      {
-        "question": "Duty cycling",
-        "answer": "Runs sensors and radio in short active bursts"
-      }
-    ]
-  },
-  {
-    "id": 5,
-    "type": "S",
-    "title": "Sort low-energy embedded design steps",
-    "tasks": [
-      {
-        "question": "1",
-        "answer": "Measure baseline current"
-      },
-      {
-        "question": "2",
-        "answer": "Set sleep and wake strategy"
-      },
-      {
-        "question": "3",
-        "answer": "Tune radio and sensor duty cycle"
-      },
-      {
-        "question": "4",
-        "answer": "Validate battery-life target"
-      }
-    ]
-  }
-]
--- a/site/src/store.tsx
+++ b/site/src/store.tsx
@@ -1,15 +0,0 @@
-import { configureStore } from '@reduxjs/toolkit';
-import listsReducer from './quiz/features/quizSlice';
-
-
-const store = configureStore({
-  reducer: {
-    quiz: listsReducer,
-  },
-  devTools: { trace: true ,traceLimit: 25},
-});
-
-export type RootState = ReturnType<typeof store.getState>;
-export type AppDispatch = typeof store.dispatch;
-
-export default store;
Author	SHA1	Message	Date
OkunElya	c37b24ec38	lab 8 done	2026-04-24 12:16:17 +10:00
OkunElya	7684b8d705	lab 8 p6/7 done	2026-04-23 16:49:22 +10:00
OkunElya	0b76fc69e5	p6/7 started (Freezing due to no experience in redux)	2026-04-16 22:52:43 +10:00
OkunElya	4f8f033306	copied lab7	2026-04-16 20:07:10 +10:00