Compare commits
83 Commits
hw4
...
sem2-lab1-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
64b82e3982 | ||
| 627f74838c | |||
| 4b6d65a946 | |||
| e64b644b33 | |||
| f17768bb8e | |||
| 4cf18c4895 | |||
| c3996ec6c6 | |||
| 4f1c66e838 | |||
| 76555d27a4 | |||
| 9a219093a0 | |||
| 3dd2a6f734 | |||
| 54e4e9c2a1 | |||
| 5c751400cb | |||
| 051052a75f | |||
| 6bbcec3411 | |||
| b2bc0651ec | |||
| b0d3fa1ecf | |||
| 3f748ba05b | |||
| 9faac87716 | |||
| f82e4a7bb3 | |||
| 011e19e531 | |||
| df21df0fff | |||
| d10f15a34a | |||
| f982d05a54 | |||
| b6776f93fd | |||
| e6806a2366 | |||
| cca7d57569 | |||
| 1c50d7ce0e | |||
| b00d7fb34d | |||
| 7818949863 | |||
| 5d7ecb1f13 | |||
| 9fef1e5b0d | |||
| c09b7b5769 | |||
| cf80fd251e | |||
| 46e3696d85 | |||
| 9e5950490a | |||
| 26bc727758 | |||
| 04db81b55a | |||
| 4ab5967abe | |||
| 63af3ed7b4 | |||
| b2c005e22c | |||
| 4cf2f56749 | |||
| b0c3660f16 | |||
| b47e479b95 | |||
| eb509fb846 | |||
| 9870335263 | |||
| 7cc781c0b9 | |||
| 8eaf1ed628 | |||
| 7b1c5b0a50 | |||
| 4316ac1636 | |||
| a4f511cb45 | |||
| dd9002a61b | |||
| e142436ed3 | |||
| 38e70189b8 | |||
| 39d023d50b | |||
| 05b624120d | |||
| 7a83c54165 | |||
| c495c26320 | |||
| 3982a97dce | |||
| 8f89dbe429 | |||
| 98b74ae77d | |||
| bdc5a9d55c | |||
| 8900cf3228 | |||
| 4cc6b7e9d8 | |||
| 73ea28eab6 | |||
| ea0b091c8a | |||
| c53abdb678 | |||
| 2b4a36c1ff | |||
| 03e7b28167 | |||
| a25b444c01 | |||
| d54afa7b2e | |||
| 01dfe8011d | |||
| 5f692a4708 | |||
| b98abb94cc | |||
| deeb9dbd5c | |||
| 36fb1653d3 | |||
| 0bdaa800f6 | |||
| ebe6566b87 | |||
| b653d69e77 | |||
| 6720bfd450 | |||
| 726b6e7adb | |||
| 093d57a619 | |||
| d468d0efb4 |
4
.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
**node_modules
|
||||
**to_reform
|
||||
.vscode
|
||||
current_site/dist
|
||||
6692
current_site/package-lock.json
generated
Normal file
30
current_site/package.json
Normal file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "template_pug",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"build": "webpack --mode production",
|
||||
"serve": "webpack serve --open --mode development",
|
||||
"dev": "webpack --mode development",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"devDependencies": {
|
||||
"chokidar": "^4.0.3",
|
||||
"css-loader": "^6.8.1",
|
||||
"filemanager-webpack-plugin": "^8.0.0",
|
||||
"glob": "^11.0.3",
|
||||
"html-webpack-plugin": "^5.5.3",
|
||||
"pug": "^2.0.4",
|
||||
"pug-loader": "^2.4.0",
|
||||
"style-loader": "^3.3.3",
|
||||
"stylus": "^0.61.0",
|
||||
"stylus-loader": "^7.1.3",
|
||||
"webpack": "^5.89.0",
|
||||
"webpack-cli": "^5.1.4",
|
||||
"webpack-dev-server": "^4.15.1"
|
||||
}
|
||||
}
|
||||
83
current_site/src/components/data.pug
Normal file
@@ -0,0 +1,83 @@
|
||||
block variables
|
||||
-
|
||||
var navbarItems = {
|
||||
Home: './index.html',
|
||||
Embedded: './embeded_details.html',
|
||||
OpenCV: './opencv_details.html',
|
||||
Photography: './photography-details.html',
|
||||
Table: './table.html',
|
||||
Institute: './images/institute.png'
|
||||
};
|
||||
|
||||
var smallCards = [
|
||||
{
|
||||
header: 'Заголовок',
|
||||
text: '3D printers are versatile tools used for creating prototypes, custom parts, and artistic designs. They work by layering materials.',
|
||||
image: require('../images/16x10/3d-printer.jpeg'),
|
||||
imageAlt: '3D Printer',
|
||||
link: '#',
|
||||
},
|
||||
{
|
||||
header: 'BLHeli ESCs',
|
||||
text: 'BLHeli ESCs are electronic speed controllers designed for drones, offering smooth and precise motor control.',
|
||||
image: require('../images/16x10/blheli-esc.jpeg'),
|
||||
imageAlt: 'BLHeli ESC',
|
||||
link: '#',
|
||||
},
|
||||
{
|
||||
header: 'Raspberry Pi Nano',
|
||||
text: 'Raspberry Pi Nano is a compact computer ideal for learning, prototyping, and IoT projects. It is highly energy-efficient.',
|
||||
image: require('../images/16x10/rpi-nano.jpeg'),
|
||||
imageAlt: 'Raspberry Pi Nano',
|
||||
link: '#',
|
||||
},
|
||||
{
|
||||
header: 'Smart Thermostats',
|
||||
text: 'Smart thermostats help regulate home temperatures efficiently, saving energy and enhancing comfort with automation.',
|
||||
image: require('../images/16x10/thermostat.jpeg'),
|
||||
imageAlt: 'Smart Thermostat',
|
||||
link: '#',
|
||||
}
|
||||
];
|
||||
|
||||
var galleryImages= [
|
||||
{ src: require('../images/sqarucos.png'), alt: 'ESP32'},
|
||||
{ src: require('../images/sqstm32.png'), alt: 'Arduino'},
|
||||
{ src: require('../images/sqesp32.png'), alt: 'STM32'}
|
||||
];
|
||||
|
||||
var locationFilters = [
|
||||
{ id: 'loc_kitchen', value: 'Kitchen', label: 'Kitchen' },
|
||||
{ id: 'loc_living', value: 'Living Room', label: 'Living Room' },
|
||||
{ id: 'loc_balcony', value: 'Balcony', label: 'Balcony' },
|
||||
{ id: 'loc_bedroom', value: 'Bedroom', label: 'Bedroom' }
|
||||
];
|
||||
|
||||
var sensorTypeFilters = [
|
||||
{ id: 'type_xiaomi', value: 'Xiaomi', label: 'Xiaomi' },
|
||||
{ id: 'type_bmp220', value: 'Bmp220', label: 'Bmp220' },
|
||||
{ id: 'type_scd30', value: 'Scd30(Internal)', label: 'Scd30(Internal)' },
|
||||
{ id: 'type_bmp280', value: 'Bmp280', label: 'Bmp280' }
|
||||
];
|
||||
|
||||
var sortOptions = [
|
||||
{ value: '', label: '-- None --' },
|
||||
{ value: 'SensorID', label: 'SensorID' },
|
||||
{ value: 'Timestamp', label: 'Time' },
|
||||
{ value: 'BatteryLevel', label: 'BatteryLevel' },
|
||||
{ value: 'Temperature', label: 'Temperature' },
|
||||
{ value: 'Humidity', label: 'Humidity' }
|
||||
];
|
||||
|
||||
var axisOptions = [
|
||||
{ id: 'x_time', value: 'Time', label: 'Time', checked: true },
|
||||
{ id: 'x_battery', value: 'BatteryLevel', label: 'BatteryLevel', checked: false },
|
||||
{ id: 'x_temperature', value: 'Temperature', label: 'Temperature', checked: false },
|
||||
{ id: 'x_humidity', value: 'Humidity', label: 'Humidity', checked: false }
|
||||
];
|
||||
|
||||
var valueOptions = [
|
||||
{ id: 'val_temperature', value: 'AverageTemperature', label: 'Average Temperature', checked: true },
|
||||
{ id: 'val_humidity', value: 'Humidity', label: 'Average Humidity', checked: false },
|
||||
{ id: 'val_battery', value: 'BatteryLevel', label: 'Average BatteryLevel', checked: false }
|
||||
]
|
||||
24
current_site/src/components/details-template.pug
Normal file
@@ -0,0 +1,24 @@
|
||||
include mixins.pug
|
||||
|
||||
html
|
||||
head
|
||||
meta(charset="UTF-8")
|
||||
block title
|
||||
title Details Page
|
||||
body
|
||||
block navbar
|
||||
+navbarMixin("")
|
||||
|
||||
.details
|
||||
header.details__header
|
||||
block header
|
||||
h1 Default Header
|
||||
|
||||
.details__content
|
||||
.details__text
|
||||
block text
|
||||
p Default text content
|
||||
|
||||
.details__gallery
|
||||
block gallery
|
||||
p No images available
|
||||
112
current_site/src/components/mixins.pug
Normal file
@@ -0,0 +1,112 @@
|
||||
include data.pug
|
||||
|
||||
mixin navbarMixin(selectedItem)
|
||||
.navbar
|
||||
each navbarUrl,navbarName in navbarItems
|
||||
if navbarName == selectedItem
|
||||
a.navbar__link-wrapper(href=navbarUrl)
|
||||
.navbar__item.navbar__item_selected #{navbarName}
|
||||
else
|
||||
a.navbar__link-wrapper(href=navbarUrl)
|
||||
.navbar__item #{navbarName}
|
||||
|
||||
mixin infoCardsMinxin()
|
||||
each cardData in smallCards
|
||||
.small-card
|
||||
.small-card__content
|
||||
h3.small-card__header #{cardData.header}
|
||||
p.small-card__text #{cardData.text}
|
||||
a.small-card__link(href=cardData.link) Подробнее»
|
||||
.small-card__image
|
||||
img(src=cardData.image alt=cardData.imageAlt)
|
||||
|
||||
mixin galleryMixin()
|
||||
each img in galleryImages
|
||||
img.gallery__image(src=img.src alt=img.alt)
|
||||
|
||||
mixin filtersMixin()
|
||||
details.filters
|
||||
summary.filters__summary Filters
|
||||
form(id='filters').filters__form
|
||||
p
|
||||
label(for='type') Type:
|
||||
input(type='text' id='type')
|
||||
p
|
||||
label(for='name') Name:
|
||||
input(type='text' id='name')
|
||||
p
|
||||
label(for='manufacturer') Manufacturer name:
|
||||
input(type='text' id='manufacturer')
|
||||
p
|
||||
label(for='sizeFrom') Size:
|
||||
| from
|
||||
input(type='number' id='sizeFrom')
|
||||
| to
|
||||
input(type='number' id='sizeTo')
|
||||
p
|
||||
label(for='releaseDateFrom') Release Date:
|
||||
| from
|
||||
input(type='number' id='releaseDateFrom')
|
||||
| to
|
||||
input(type='number' id='releaseDateTo')
|
||||
p
|
||||
label(for='priceFrom') Release Date:
|
||||
| from
|
||||
input(type='number' id='priceFrom')
|
||||
| to
|
||||
input(type='number' id='priceTo')
|
||||
input.filter-group__button--apply(type='button' id='applyFiltersButton' value="Apply Filters")
|
||||
input.filter-group__button--reset(type='button' id='clearFiltersButton' value="Reset Filters")
|
||||
|
||||
mixin sortLevel(level)
|
||||
p
|
||||
select.sort-level__select(id=`sort_${level}`)
|
||||
| ascending?
|
||||
input(type="checkbox", id=`sort_${level}Desc`)
|
||||
mixin sortingMixin()
|
||||
- const sortLevels = ['1', '2', '3'];
|
||||
details.sorting
|
||||
summary.sorting__summary Sort
|
||||
form(id='sorting')
|
||||
each level in sortLevels
|
||||
+sortLevel(level)
|
||||
input.sort-group__button--apply(type='button' id='applySortButton' value="Apply Sort")
|
||||
input.sort-group__button--reset(type='button' id='resetSortButton' value="Reset Sort")
|
||||
|
||||
|
||||
mixin graphXOption(option)
|
||||
if option.checked
|
||||
input.axis-group__radio(type="radio" id=option.id name="x_axis" value=option.value checked)
|
||||
else
|
||||
input.axis-group__radio(type="radio" id=option.id name="x_axis" value=option.value)
|
||||
label.axis-group__option-label(for=option.id) #{option.label}
|
||||
br
|
||||
|
||||
mixin graphYOption(option)
|
||||
if option.checked
|
||||
input.values-group__checkbox(type="checkbox" id=option.id name="values" value=option.value checked)
|
||||
else
|
||||
input.values-group__checkbox(type="checkbox" id=option.id name="values" value=option.value)
|
||||
label.values-group__option-label(for=option.id) #{option.label}
|
||||
br
|
||||
|
||||
mixin graphMixin()
|
||||
details.graph
|
||||
summary.graph__summary Graph
|
||||
form.graph__form
|
||||
fieldset.graph__fieldset
|
||||
.axis-group
|
||||
i.axis-group__label
|
||||
b X axis
|
||||
br
|
||||
.axis-group__options
|
||||
each option in axisOptions
|
||||
+graphXOption(option)
|
||||
.values-group
|
||||
i.values-group__label
|
||||
b Values
|
||||
br
|
||||
.values-group__options
|
||||
each option in valueOptions
|
||||
+graphYOption(option)
|
||||
button.values-group__button(type="submit" id="build_graph" name="build_graph") Build
|
||||
|
Before Width: | Height: | Size: 198 KiB After Width: | Height: | Size: 198 KiB |
|
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 159 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 229 KiB After Width: | Height: | Size: 229 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 347 KiB After Width: | Height: | Size: 347 KiB |
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 2.3 MiB After Width: | Height: | Size: 2.3 MiB |
|
Before Width: | Height: | Size: 5.2 MiB After Width: | Height: | Size: 5.2 MiB |
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 3.9 MiB After Width: | Height: | Size: 3.9 MiB |
|
Before Width: | Height: | Size: 4.4 MiB After Width: | Height: | Size: 4.4 MiB |
|
Before Width: | Height: | Size: 1.9 MiB After Width: | Height: | Size: 1.9 MiB |
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 99 KiB |
3
current_site/src/index.js
Normal file
@@ -0,0 +1,3 @@
|
||||
import './styles/index.styl'
|
||||
import './styles/details.styl'
|
||||
import './styles/table.styl'
|
||||
51
current_site/src/pages/index.pug
Normal file
@@ -0,0 +1,51 @@
|
||||
include ../components/mixins.pug
|
||||
|
||||
-
|
||||
const infoBlockA = {
|
||||
header: "Embedded Systems",
|
||||
text: "Had a serval projects with different MCUs and wrote firmware for them. My main stack consists of Platformio+EspIdf or Arduino, also tried STM32 asdadas",
|
||||
description: "I love embeded development beceuse of autonomity of produced devices, the redices are not dependant on any other hardware and can work autunomously",
|
||||
img: require('../images/AQ_monitor.png'),
|
||||
imgAlt: "ESP32"
|
||||
}
|
||||
const infoBlockB = {
|
||||
header: "Embedded Systems",
|
||||
text: "Had a serval projects with different MCUs and wrote firmware for them. My main stack consists of Platformio+EspIdf or Arduino, also tried STM32",
|
||||
description: "I love embeded development device because of autonomity of produced devices, the devices are not dependant on any other hardware and can work autunomously or off the grid",
|
||||
img: require('../images/remote.jpeg'),
|
||||
imgAlt: "ESP32"
|
||||
}
|
||||
|
||||
html(lang="en")
|
||||
head
|
||||
meta(charset="UTF-8")
|
||||
title Portfolio
|
||||
|
||||
body
|
||||
+navbarMixin("Home")
|
||||
|
||||
.gallery
|
||||
+galleryMixin()
|
||||
|
||||
.main-container
|
||||
.main-container__content
|
||||
article.info-block
|
||||
h2.info-block__header #{infoBlockA.header}
|
||||
.info-block__container.info-block__container_layout-a
|
||||
p.info-block__text #{infoBlockA.text}
|
||||
.info-block__details
|
||||
p.info-block__description #{infoBlockA.description}
|
||||
a.info-block__link(href="#") More info
|
||||
img.info-block__image(src=infoBlockA.img alt=infoBlockA.imgAlt)
|
||||
|
||||
article.info-block
|
||||
h2.info-block__header #{infoBlockB.header}
|
||||
.info-block__container.info-block__container_layout-b
|
||||
p.info-block__text #{infoBlockB.text}
|
||||
img.info-block__image(src=infoBlockB.img alt=infoBlockB.imgAlt)
|
||||
.info-block__details
|
||||
p.info-block__description #{infoBlockB.description}
|
||||
a.info-block__link(href="./photography-details.html") More info
|
||||
|
||||
.sidebar
|
||||
+infoCardsMinxin()
|
||||
22
current_site/src/pages/photography-details.pug
Normal file
@@ -0,0 +1,22 @@
|
||||
extends ../components/details-template.pug
|
||||
|
||||
block title
|
||||
title Photography Portfolio - Details
|
||||
|
||||
block navbar
|
||||
+navbarMixin("Photography")
|
||||
|
||||
block header
|
||||
h1.details__title Photography
|
||||
p.details__description I prefer landscape photography.
|
||||
|
||||
block text
|
||||
p.details__text-content D3100 -> SLT A58.
|
||||
|
||||
block gallery
|
||||
.details__gallery-item
|
||||
img.details__gallery-image(src=require('../images/photos/image0.png') alt="Photography 1")
|
||||
.details__gallery-item
|
||||
img.details__gallery-image(src=require('../images/photos/image1.png') alt="Photography 2")
|
||||
.details__gallery-item
|
||||
img.details__gallery-image(src=require('../images/photos/image2.png') alt="Photography 3")
|
||||
19
current_site/src/pages/table.pug
Normal file
@@ -0,0 +1,19 @@
|
||||
include ../components/mixins.pug
|
||||
|
||||
head
|
||||
title table
|
||||
script(src='./table/data.js')
|
||||
script(src='./table/filter.js')
|
||||
script(src='./table/main.js')
|
||||
script(src='./table/sort.js')
|
||||
script(src='./table/table.js')
|
||||
|
||||
body
|
||||
+navbarMixin("Table")
|
||||
|
||||
.table-controls
|
||||
+filtersMixin()
|
||||
+sortingMixin()
|
||||
+graphMixin()
|
||||
|
||||
table(id='list')
|
||||
68
current_site/src/pages/table/data.js
Normal file
@@ -0,0 +1,68 @@
|
||||
let ram_sticks = [
|
||||
{ "type": "DDR3", "name": "DDR3-1600-4GB-A1", "size": 4, "maker": "Kingston", "release": "2014-03", "price": 18, },
|
||||
{ "type": "DDR3", "name": "DDR3-1600-8GB-A2", "size": 8, "maker": "Corsair", "release": "2015-06", "price": 26, },
|
||||
{ "type": "DDR3", "name": "DDR3-1866-8GB-A3", "size": 8, "maker": "G.Skill", "release": "2016-02", "price": 29, },
|
||||
{ "type": "DDR4", "name": "DDR4-2133-8GB-B1", "size": 8, "maker": "Crucial", "release": "2017-01", "price": 24, },
|
||||
{ "type": "DDR4", "name": "DDR4-2400-8GB-B2", "size": 8, "maker": "Kingston", "release": "2017-09", "price": 27, },
|
||||
{ "type": "DDR4", "name": "DDR4-2666-16GB-B3", "size": 16, "maker": "Corsair", "release": "2018-04", "price": 48, },
|
||||
{ "type": "DDR4", "name": "DDR4-3000-16GB-B4", "size": 16, "maker": "G.Skill", "release": "2018-11", "price": 52, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-16GB-B5", "size": 16, "maker": "HyperX", "release": "2019-03", "price": 55, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-32GB-B6", "size": 32, "maker": "Crucial", "release": "2019-08", "price": 92, },
|
||||
{ "type": "DDR4", "name": "DDR4-3600-32GB-B7", "size": 32, "maker": "Corsair", "release": "2020-02", "price": 99, },
|
||||
{ "type": "DDR5", "name": "DDR5-4800-16GB-C1", "size": 16, "maker": "Kingston", "release": "2021-01", "price": 78, },
|
||||
{ "type": "DDR5", "name": "DDR5-5200-16GB-C2", "size": 16, "maker": "Corsair", "release": "2021-06", "price": 84, },
|
||||
{ "type": "DDR5", "name": "DDR5-5600-32GB-C3", "size": 32, "maker": "G.Skill", "release": "2022-02", "price": 145, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-32GB-C4", "size": 32, "maker": "Crucial", "release": "2022-07", "price": 158, },
|
||||
{ "type": "DDR5", "name": "DDR5-6400-32GB-C5", "size": 32, "maker": "Corsair", "release": "2023-01", "price": 172, },
|
||||
{ "type": "DDR5", "name": "DDR5-6600-64GB-C6", "size": 64, "maker": "Kingston", "release": "2023-05", "price": 310, },
|
||||
{ "type": "DDR5", "name": "DDR5-6800-64GB-C7", "size": 64, "maker": "G.Skill", "release": "2023-09", "price": 329, },
|
||||
{ "type": "DDR5", "name": "DDR5-7200-64GB-C8", "size": 64, "maker": "Corsair", "release": "2024-02", "price": 355, },
|
||||
{ "type": "DDR5", "name": "DDR5-7600-96GB-C9", "size": 96, "maker": "Crucial", "release": "2024-06", "price": 520, },
|
||||
{ "type": "DDR5", "name": "DDR5-8000-96GB-C10", "size": 96, "maker": "Kingston", "release": "2024-10", "price": 560, },
|
||||
{ "type": "LPDDR4", "name": "LP4-3200-8GB-D1", "size": 8, "maker": "Samsung", "release": "2019-01", "price": 34, },
|
||||
{ "type": "LPDDR4", "name": "LP4-4266-8GB-D2", "size": 8, "maker": "Micron", "release": "2019-07", "price": 39, },
|
||||
{ "type": "LPDDR5", "name": "LP5-5500-12GB-D3", "size": 12, "maker": "Samsung", "release": "2020-03", "price": 58, },
|
||||
{ "type": "LPDDR5", "name": "LP5-6400-16GB-D4", "size": 16, "maker": "SKHynix", "release": "2021-01", "price": 74, },
|
||||
{ "type": "LPDDR5X", "name": "LP5X-7500-24GB-D5", "size": 24, "maker": "Micron", "release": "2022-05", "price": 118, },
|
||||
{ "type": "DDR4", "name": "DDR4-2666-8GB-E1", "size": 8, "maker": "Patriot", "release": "2018-05", "price": 25, },
|
||||
{ "type": "DDR4", "name": "DDR4-3000-8GB-E2", "size": 8, "maker": "ADATA", "release": "2018-09", "price": 28, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-8GB-E3", "size": 8, "maker": "TeamGroup", "release": "2019-04", "price": 30, },
|
||||
{ "type": "DDR4", "name": "DDR4-3600-16GB-E4", "size": 16, "maker": "ADATA", "release": "2020-01", "price": 53, },
|
||||
{ "type": "DDR4", "name": "DDR4-4000-16GB-E5", "size": 16, "maker": "Patriot", "release": "2020-06", "price": 61, },
|
||||
{ "type": "DDR5", "name": "DDR5-5200-8GB-F1", "size": 8, "maker": "TeamGroup", "release": "2021-03", "price": 52, },
|
||||
{ "type": "DDR5", "name": "DDR5-5600-16GB-F2", "size": 16, "maker": "ADATA", "release": "2021-10", "price": 88, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-16GB-F3", "size": 16, "maker": "Patriot", "release": "2022-03", "price": 95, },
|
||||
{ "type": "DDR5", "name": "DDR5-6400-32GB-F4", "size": 32, "maker": "TeamGroup", "release": "2022-09", "price": 168, },
|
||||
{ "type": "DDR5", "name": "DDR5-7200-32GB-F5", "size": 32, "maker": "ADATA", "release": "2023-04", "price": 185, },
|
||||
{ "type": "DDR3", "name": "DDR3-1333-4GB-G1", "size": 4, "maker": "Samsung", "release": "2013-02", "price": 15, },
|
||||
{ "type": "DDR3", "name": "DDR3-1600-4GB-G2", "size": 4, "maker": "Micron", "release": "2014-08", "price": 17, },
|
||||
{ "type": "DDR3", "name": "DDR3-1866-8GB-G3", "size": 8, "maker": "Samsung", "release": "2015-11", "price": 28, },
|
||||
{ "type": "DDR5", "name": "DDR5-8400-128GB-H1", "size": 128, "maker": "Corsair", "release": "2025-01", "price": 890, },
|
||||
{ "type": "DDR5", "name": "DDR5-8800-128GB-H2", "size": 128, "maker": "G.Skill", "release": "2025-03", "price": 940, },
|
||||
{ "type": "DDR5", "name": "DDR5-9200-128GB-H3", "size": 128, "maker": "Kingston", "release": "2025-06", "price": 990, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X1", "size": 48, "maker": "Corsair", "release": "2024-01", "price": 210, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X2", "size": 48, "maker": "Kingston", "release": "2024-02", "price": 215, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X3", "size": 48, "maker": "G.Skill", "release": "2024-03", "price": 218, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X4", "size": 48, "maker": "ADATA", "release": "2024-04", "price": 222, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X5", "size": 48, "maker": "Patriot", "release": "2024-05", "price": 225, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X6", "size": 48, "maker": "TeamGroup", "release": "2024-06", "price": 228, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X7", "size": 48, "maker": "Crucial", "release": "2024-07", "price": 230, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X8", "size": 48, "maker": "Samsung", "release": "2024-08", "price": 235, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X9", "size": 48, "maker": "Micron", "release": "2024-09", "price": 238, },
|
||||
{ "type": "DDR5", "name": "DDR5-6000-48GB-X10", "size": 48, "maker": "SKHynix", "release": "2024-10", "price": 240, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y1", "size": 64, "maker": "Corsair", "release": "2021-01", "price": 180, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y2", "size": 64, "maker": "Kingston", "release": "2021-02", "price": 182, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y3", "size": 64, "maker": "G.Skill", "release": "2021-03", "price": 185, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y4", "size": 64, "maker": "ADATA", "release": "2021-04", "price": 188, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y5", "size": 64, "maker": "Patriot", "release": "2021-05", "price": 190, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y6", "size": 64, "maker": "TeamGroup", "release": "2021-06", "price": 192, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y7", "size": 64, "maker": "Crucial", "release": "2021-07", "price": 195, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y8", "size": 64, "maker": "Samsung", "release": "2021-08", "price": 198, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y9", "size": 64, "maker": "Micron", "release": "2021-09", "price": 200, },
|
||||
{ "type": "DDR4", "name": "DDR4-3200-64GB-Y10", "size": 64, "maker": "SKHynix", "release": "2021-10", "price": 205, }
|
||||
|
||||
]
|
||||
ram_sticks = ram_sticks.map((x) => ({
|
||||
...x,
|
||||
release: Number(x.release.split("-")[0]),
|
||||
}))
|
||||
92
current_site/src/pages/table/filter.js
Normal file
@@ -0,0 +1,92 @@
|
||||
const correspond = {
|
||||
"type": "type",
|
||||
"name": "name",
|
||||
"maker": "manufacturer",
|
||||
"size": ["sizeFrom", "sizeTo"],
|
||||
"release": ["releaseDateFrom", "releaseDateTo"],
|
||||
"price": ["priceFrom", "priceTo"]
|
||||
}
|
||||
|
||||
|
||||
/* Структура возвращаемого ассоциативного массива:
|
||||
{
|
||||
input_id: input_value,
|
||||
...
|
||||
}
|
||||
*/
|
||||
const dataFilter = (dataForm) => {
|
||||
let dictFilter = {};
|
||||
|
||||
// перебираем все элементы формы с фильтрами
|
||||
for (const item of dataForm.elements) {
|
||||
|
||||
// получаем значение элемента
|
||||
let valInput = item.value;
|
||||
|
||||
// если поле типа text - приводим его значение к нижнему регистру
|
||||
if (item.type === "text") {
|
||||
valInput = valInput.toLowerCase();
|
||||
}
|
||||
|
||||
if (item.type === "number") {
|
||||
if (valInput === "") {
|
||||
if (item.id.includes("From")) {
|
||||
valInput = -Infinity;
|
||||
}
|
||||
else {
|
||||
valInput = Infinity;
|
||||
}
|
||||
}
|
||||
else {
|
||||
valInput = Number(valInput);
|
||||
}
|
||||
}
|
||||
|
||||
// формируем очередной элемент ассоциативного массива
|
||||
dictFilter[item.id] = valInput;
|
||||
}
|
||||
return dictFilter;
|
||||
}
|
||||
|
||||
|
||||
// фильтрация таблицы
|
||||
const filterTable = (data, idTable, dataForm) => {
|
||||
|
||||
// получаем данные из полей формы
|
||||
const datafilter = dataFilter(dataForm);
|
||||
|
||||
// выбираем данные соответствующие фильтру и формируем таблицу из них
|
||||
let tableFilter = data.filter(item => {
|
||||
|
||||
/* в этой переменной будут "накапливаться" результаты сравнения данных
|
||||
с параметрами фильтра */
|
||||
let result = true;
|
||||
|
||||
// строка соответствует фильтру, если сравнение всех значения из input
|
||||
// со значением ячейки очередной строки - истина
|
||||
Object.entries(item).map(([key, val]) => {
|
||||
|
||||
// текстовые поля проверяем на вхождение
|
||||
if (typeof val == 'string') {
|
||||
result &&= val.toLowerCase().includes(datafilter[correspond[key]])
|
||||
}
|
||||
|
||||
// САМОСТОЯТЕЛЬНО проверить числовые поля на принадлежность интервалу
|
||||
if (typeof val == 'number') {
|
||||
result &&= datafilter[correspond[key][0]] <= Number(val) && datafilter[correspond[key][1]] >= Number(val)
|
||||
}
|
||||
// console.log(result, key, )
|
||||
});
|
||||
|
||||
return result;
|
||||
});
|
||||
|
||||
// САМОСТОЯТЕЛЬНО вызвать функцию, которая удаляет все строки таблицы с id=idTable
|
||||
clearTable(idTable);
|
||||
// показать на странице таблицу с отфильтрованными строками
|
||||
createTable(tableFilter, idTable);
|
||||
}
|
||||
|
||||
const clearFilters = (form) => {
|
||||
form.querySelectorAll(`& input[type="text"],& input[type="number"]`).forEach((elem) => elem.value = null)
|
||||
}
|
||||
122
current_site/src/pages/table/main.js
Normal file
@@ -0,0 +1,122 @@
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
doInit()
|
||||
})
|
||||
|
||||
function doInit() {
|
||||
createTable(ram_sticks, 'list');
|
||||
const clearFiltersButton = document.getElementById("clearFiltersButton");
|
||||
clearFiltersButton.addEventListener("click", (event) => {
|
||||
clearFilters(filters);
|
||||
createTable(ram_sticks, 'list');
|
||||
sortTable('list', sorting)
|
||||
})
|
||||
|
||||
const applyFiltersButton = document.getElementById("applyFiltersButton");
|
||||
applyFiltersButton.addEventListener("click", (event) => {
|
||||
filterTable(ram_sticks, 'list', filters)
|
||||
sortTable('list', sorting)
|
||||
})
|
||||
|
||||
setSortSelects(ram_sticks[0], sorting)
|
||||
|
||||
let i = 0;
|
||||
for (const elem of sorting.querySelectorAll(`& select`)) {
|
||||
const counter = i;
|
||||
elem.addEventListener("change", () => {
|
||||
updateOptions(counter, sorting)
|
||||
})
|
||||
i+=1;
|
||||
}
|
||||
|
||||
sorting.applySortButton.addEventListener("click", () => {
|
||||
clearTable('list');
|
||||
filterTable(ram_sticks, 'list', filters)
|
||||
sortTable('list', sorting)
|
||||
});
|
||||
sorting.resetSortButton.addEventListener("click", () => {
|
||||
resetSort(sorting);
|
||||
clearTable('list');
|
||||
filterTable(ram_sticks, 'list', filters)
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
const createOption = (str, val) => {
|
||||
let item = document.createElement('option');
|
||||
item.text = str;
|
||||
item.value = val;
|
||||
return item;
|
||||
}
|
||||
const resetSortSelect = (sortSelect) => {
|
||||
sortSelect.querySelectorAll(`& option`).forEach((elem) => {
|
||||
elem.parentElement.removeChild(elem)
|
||||
})
|
||||
}
|
||||
const all_fields = Object.keys(ram_sticks[0]);
|
||||
|
||||
const setSortSelect = (arr, sortSelect) => {
|
||||
|
||||
// создаем OPTION Нет и добавляем ее в SELECT
|
||||
sortSelect.append(createOption('none', 0));
|
||||
// перебираем массив со значениями опций
|
||||
arr.forEach((item, index) => {
|
||||
sortSelect.append(createOption(item, all_fields.indexOf(item) + 1));
|
||||
});
|
||||
}
|
||||
const updateOptions = (current_index, sort_form) => {
|
||||
const elem_collection = sort_form.querySelectorAll(`& select`);
|
||||
let used_options_list = []
|
||||
let i = 0;
|
||||
for (let elem_ of elem_collection) {
|
||||
if (i++ < current_index) {
|
||||
used_options_list.push(all_fields[elem_.value-1])
|
||||
}
|
||||
}
|
||||
if (current_index >= elem_collection.length) {
|
||||
return;
|
||||
}
|
||||
const elem = elem_collection[current_index]
|
||||
const available_options = all_fields.filter((x) => !used_options_list.includes(x));
|
||||
elem.disabled = available_options.length == 0;
|
||||
if(current_index>0){
|
||||
elem.disabled |= elem_collection[current_index-1].value==0;
|
||||
}
|
||||
|
||||
if(elem.disabled){
|
||||
elem.value = 0;
|
||||
}
|
||||
|
||||
save_val = 0;
|
||||
if (!used_options_list.includes(all_fields[elem.value - 1])) {
|
||||
save_val = elem.value;
|
||||
}
|
||||
resetSortSelect(elem)
|
||||
setSortSelect(available_options, elem)
|
||||
|
||||
elem.value = save_val;
|
||||
|
||||
|
||||
updateOptions(current_index + 1, sort_form)
|
||||
|
||||
}
|
||||
// формируем поля со списком для многоуровневой сортировки
|
||||
const setSortSelects = (data, dataForm) => {
|
||||
const head = Object.keys(data);
|
||||
const allSelect = dataForm.getElementsByTagName('select');
|
||||
|
||||
for (const item of dataForm.elements) {
|
||||
setSortSelect(head, item);
|
||||
}
|
||||
let skipped = false
|
||||
for (const elem of allSelect) {
|
||||
if (!skipped) {
|
||||
skipped = true;
|
||||
continue;
|
||||
}
|
||||
elem.disabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
const resetSort = (form) => {
|
||||
form.querySelectorAll(`& select`).forEach((curSelect, index) => { if (index != 0) { curSelect.disabled = true } curSelect.value = 0 })
|
||||
}
|
||||
87
current_site/src/pages/table/sort.js
Normal file
@@ -0,0 +1,87 @@
|
||||
/*формируем массив для сортировки по двум уровням вида
|
||||
[
|
||||
{column: номер столбца, по которому осуществляется сортировка,
|
||||
direction: порядок сортировки (true по убыванию, false по возрастанию)
|
||||
},
|
||||
...
|
||||
]
|
||||
*/
|
||||
const createSortArr = (data) => {
|
||||
let sortArr = [];
|
||||
|
||||
const sortSelects = data.getElementsByTagName('select');
|
||||
|
||||
for (const item of sortSelects) {
|
||||
// получаем номер выбранной опции
|
||||
const keySort = item.value;
|
||||
// в случае, если выбрана опция Нет, заканчиваем формировать массив
|
||||
if (keySort == 0) {
|
||||
break;
|
||||
}
|
||||
// получаем порядок сортировки очередного уровня
|
||||
// имя флажка сформировано как имя поля SELECT и слова Desc
|
||||
const desc = document.getElementById(item.id + 'Desc').checked;
|
||||
// очередной элемент массива - по какому столбцу и в каком порядке сортировать
|
||||
sortArr.push(
|
||||
{
|
||||
column: keySort - 1,
|
||||
direction: desc
|
||||
}
|
||||
);
|
||||
}
|
||||
return sortArr;
|
||||
};
|
||||
|
||||
const numberColumns = [2, 4, 5]
|
||||
|
||||
const sortTable = (idTable, formData) => {
|
||||
|
||||
// формируем управляющий массив для сортировки
|
||||
const sortArr = createSortArr(formData);
|
||||
|
||||
// сортировать таблицу не нужно, во всех полях выбрана опция Нет
|
||||
if (sortArr.length === 0) {
|
||||
// clearTable(idTable)
|
||||
return false;
|
||||
|
||||
}
|
||||
//находим нужную таблицу
|
||||
let table = document.getElementById(idTable);
|
||||
|
||||
// преобразуем строки таблицы в массив
|
||||
let rowData = Array.from(table.rows);
|
||||
|
||||
// удаляем элемент с заголовками таблицы
|
||||
const headerRow = rowData.shift();
|
||||
|
||||
//сортируем данные по всем уровням сортировки
|
||||
rowData.sort((first, second) => {
|
||||
for (let { column, direction } of sortArr) {
|
||||
const firstCell = first.cells[column].innerHTML;
|
||||
const secondCell = second.cells[column].innerHTML;
|
||||
|
||||
// используем localeCompare для корректного сравнения
|
||||
let comparison = null;
|
||||
if (numberColumns.includes(column)) {
|
||||
comparison = Number(firstCell) - Number(secondCell);
|
||||
}
|
||||
else {
|
||||
comparison = firstCell.localeCompare(secondCell);
|
||||
}
|
||||
// учитываем направление сортировки
|
||||
if (comparison !== 0) {
|
||||
return (direction ? -comparison : comparison);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
clearTable(idTable)
|
||||
//выводим отсортированную таблицу на страницу
|
||||
|
||||
let tbody = document.createElement('tbody');
|
||||
rowData.forEach(item => {
|
||||
tbody.append(item);
|
||||
});
|
||||
table.append(tbody);
|
||||
return true;
|
||||
}
|
||||
51
current_site/src/pages/table/table.js
Normal file
@@ -0,0 +1,51 @@
|
||||
const createTable = (data, idTable) => {
|
||||
const table = document.getElementById(idTable);
|
||||
if (data.length == 0) {
|
||||
return;
|
||||
}
|
||||
const header = Object.keys(data[0]);
|
||||
|
||||
/* создание шапки таблицы */
|
||||
if (!table.firstElementChild) {
|
||||
const headerRow = createHeaderRow(header);
|
||||
table.append(headerRow);
|
||||
}
|
||||
|
||||
/* создание тела таблицы */
|
||||
const bodyRows = createBodyRows(data);
|
||||
table.append(bodyRows);
|
||||
};
|
||||
|
||||
const clearTable = (idTable) => {
|
||||
const table = document.getElementById(idTable);
|
||||
if (table.children.length > 1) {
|
||||
table.removeChild(table.children[1]);
|
||||
}
|
||||
}
|
||||
|
||||
const createHeaderRow = (headers) => {
|
||||
const tr = document.createElement('tr');
|
||||
headers.forEach(header => {
|
||||
const th = document.createElement('th');
|
||||
|
||||
th.innerHTML = header.slice(0,1).toUpperCase()+header.slice(1);
|
||||
tr.append(th);
|
||||
});
|
||||
const thead = document.createElement('thead')
|
||||
thead.appendChild(tr)
|
||||
return thead;
|
||||
};
|
||||
|
||||
const createBodyRows = (rows) => {
|
||||
const body = document.createElement('tbody');
|
||||
rows.forEach(row => {
|
||||
const rowElement = document.createElement('tr');
|
||||
for (let key in row) {
|
||||
const td = document.createElement('td');
|
||||
td.innerHTML = row[key];
|
||||
rowElement.appendChild(td);
|
||||
}
|
||||
body.appendChild(rowElement);
|
||||
})
|
||||
return body;
|
||||
}
|
||||
58
current_site/src/styles/details.styl
Normal file
@@ -0,0 +1,58 @@
|
||||
.details
|
||||
margin 0 auto
|
||||
padding 20px
|
||||
|
||||
.details__header
|
||||
margin-bottom 20px
|
||||
text-align center
|
||||
|
||||
.details__title
|
||||
margin-bottom 5px
|
||||
|
||||
.details__description
|
||||
margin auto
|
||||
|
||||
.details__content
|
||||
display flex
|
||||
gap 40px
|
||||
align-items flex-start
|
||||
|
||||
.details__text
|
||||
flex 1
|
||||
text-align justify
|
||||
|
||||
.details__text-content
|
||||
margin auto 30px
|
||||
|
||||
.details__gallery
|
||||
display flex
|
||||
flex-direction column
|
||||
gap 20px
|
||||
margin auto
|
||||
|
||||
.details__gallery-item
|
||||
overflow hidden
|
||||
border-radius 8px
|
||||
box-shadow 0 4px 12px rgba(0, 0, 0, 0.1)
|
||||
transition transform 0.3s ease, box-shadow 0.3s ease
|
||||
|
||||
&:hover
|
||||
transform translateY(-5px)
|
||||
box-shadow 0 8px 20px rgba(0, 0, 0, 0.15)
|
||||
|
||||
.details__gallery-image
|
||||
width 100%
|
||||
height 250px
|
||||
object-fit cover
|
||||
display block
|
||||
|
||||
@media screen and (max-width: 700px)
|
||||
.details__content
|
||||
flex-direction column
|
||||
|
||||
.details__gallery
|
||||
order -1 // Move gallery above text
|
||||
|
||||
.details__gallery-image
|
||||
height 300px
|
||||
|
||||
166
current_site/src/styles/index.styl
Normal file
@@ -0,0 +1,166 @@
|
||||
item_h=3em;
|
||||
|
||||
double-border()
|
||||
border-top double thick silver
|
||||
border-bottom double thick silver
|
||||
|
||||
flex-center()
|
||||
display flex
|
||||
align-items center
|
||||
justify-content center
|
||||
|
||||
text-center-bold()
|
||||
text-align center
|
||||
font-weight bold
|
||||
display block
|
||||
|
||||
grid-responsive(columns)
|
||||
display grid
|
||||
grid-template-columns columns
|
||||
grid-template-rows 1fr
|
||||
|
||||
.navbar
|
||||
double-border()
|
||||
font-size 0
|
||||
grid-responsive(repeat(7, min-content))
|
||||
justify-items start
|
||||
|
||||
&__link-wrapper
|
||||
color black
|
||||
text-decoration none
|
||||
|
||||
&__item
|
||||
display inline-block
|
||||
width max-content
|
||||
height item_h
|
||||
line-height item_h
|
||||
text-align center
|
||||
vertical-align middle
|
||||
padding 0 10px
|
||||
margin @padding
|
||||
overflow hidden
|
||||
text-overflow ellipsis
|
||||
font-size medium
|
||||
|
||||
&_selected
|
||||
color green
|
||||
font-weight bold
|
||||
border-left double thin silver
|
||||
border-right double thin silver
|
||||
|
||||
.gallery
|
||||
display flex
|
||||
flex-direction row
|
||||
width 90%
|
||||
margin auto
|
||||
|
||||
&__image
|
||||
margin auto
|
||||
width 100%
|
||||
border thin solid black
|
||||
|
||||
&:nth-child(2n+1)
|
||||
margin-top 10px
|
||||
|
||||
.main-container
|
||||
grid-responsive(3fr 1fr)
|
||||
|
||||
|
||||
.info-block
|
||||
border solid thin black
|
||||
padding 2vw
|
||||
margin 1vw 0
|
||||
|
||||
&__header
|
||||
text-center-bold()
|
||||
|
||||
&__container
|
||||
&_layout-a
|
||||
grid-responsive(3fr 3fr 2fr)
|
||||
|
||||
&_layout-b
|
||||
grid-responsive(4fr 7fr 4fr)
|
||||
|
||||
& > *
|
||||
margin 2vw
|
||||
|
||||
&__text, &__description
|
||||
text-align justify
|
||||
|
||||
&__image
|
||||
margin auto
|
||||
width 100%
|
||||
|
||||
&__link
|
||||
color inherit
|
||||
|
||||
|
||||
|
||||
|
||||
.sidebar
|
||||
border-left thin solid black
|
||||
margin 30px 0 0 50px
|
||||
|
||||
.small-card
|
||||
margin 20px 10px 0
|
||||
grid-responsive(1fr 1fr)
|
||||
|
||||
&__content
|
||||
text-align justify
|
||||
|
||||
&__header
|
||||
text-center-bold()
|
||||
text-align right
|
||||
|
||||
&__link
|
||||
display block
|
||||
text-align right
|
||||
color inherit
|
||||
|
||||
&__image
|
||||
& img
|
||||
width 100%
|
||||
margin-left:10px
|
||||
|
||||
@media screen and (max-width: 1000px)
|
||||
.small-card
|
||||
display flex
|
||||
flex-direction column
|
||||
.sidebar
|
||||
margin 0
|
||||
width:100%
|
||||
|
||||
|
||||
@media screen and (max-width: 800px)
|
||||
.navbar
|
||||
grid-responsive(1fr 1fr)
|
||||
grid-template-rows 1fr 1fr 1fr
|
||||
justify-items center
|
||||
|
||||
&__item
|
||||
&_selected
|
||||
border-bottom double thick silver
|
||||
border-left none
|
||||
border-right none
|
||||
|
||||
.gallery
|
||||
display inline-flex
|
||||
flex-direction column
|
||||
width 100%
|
||||
|
||||
&__image
|
||||
width 100%
|
||||
height 100%
|
||||
|
||||
&:nth-child(2n+1)
|
||||
margin-top 0px
|
||||
|
||||
.main-container
|
||||
display flex
|
||||
flex-direction column
|
||||
|
||||
.info-block
|
||||
&__container
|
||||
&_layout-a, &_layout-b
|
||||
display flex
|
||||
flex-direction column
|
||||
6
current_site/src/styles/table.styl
Normal file
@@ -0,0 +1,6 @@
|
||||
.table, .table-content *, .table-content
|
||||
border: 1px solid black;
|
||||
border-collapse: collapse;
|
||||
|
||||
.table-content__table-row:nth-child(2n)
|
||||
background: #F0FFF0;
|
||||
82
current_site/webpack.config.js
Normal file
@@ -0,0 +1,82 @@
|
||||
const HtmlWebpackPlugin = require("html-webpack-plugin");
|
||||
const FileManagerPlugin = require("filemanager-webpack-plugin");
|
||||
const path = require("path");
|
||||
const fs = require("fs");
|
||||
|
||||
const pagesDir = path.join(__dirname, "src", "pages");
|
||||
const pages = fs.readdirSync(pagesDir).filter(file => file.endsWith(".pug"));
|
||||
|
||||
module.exports = {
|
||||
output: {
|
||||
path: path.join(__dirname, "dist"),
|
||||
filename: "index.[contenthash].js",
|
||||
assetModuleFilename: path.join("images", "[name].[contenthash][ext]"),
|
||||
},
|
||||
entry: path.join(__dirname, "src", "index.js"),
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.pug$/,
|
||||
loader: "pug-loader",
|
||||
},
|
||||
{
|
||||
test: /\.(png|jpg|jpeg|gif)$/i,
|
||||
type: "asset/resource",
|
||||
},
|
||||
{
|
||||
test: /\.svg$/,
|
||||
type: "asset/resource",
|
||||
generator: {
|
||||
filename: path.join("icons", "[name].[contenthash][ext]"),
|
||||
},
|
||||
},
|
||||
{
|
||||
test: /\.styl$/,
|
||||
use: [
|
||||
{
|
||||
loader: "style-loader",
|
||||
},
|
||||
{
|
||||
loader: "css-loader",
|
||||
},
|
||||
{
|
||||
loader: "stylus-loader",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
plugins: [
|
||||
...pages.map(
|
||||
(page) =>
|
||||
new HtmlWebpackPlugin({
|
||||
template: path.join(pagesDir, page),
|
||||
filename: page.replace(".pug", ".html"),
|
||||
})
|
||||
),
|
||||
new FileManagerPlugin({
|
||||
events: {
|
||||
onStart: {
|
||||
delete: ["dist"],
|
||||
},
|
||||
onEnd: {
|
||||
copy: [
|
||||
{
|
||||
source: path.join(__dirname, "src", "pages", "table", "*.js"),
|
||||
destination: path.join(__dirname, "dist", "table"),
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
}),
|
||||
],
|
||||
devServer: {
|
||||
watchFiles: path.join(__dirname, "src"),
|
||||
port: 9000,
|
||||
static: {
|
||||
directory: path.join(__dirname, "src", "pages"),
|
||||
publicPath: "/",
|
||||
watch: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -1,104 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>
|
||||
Embedded Details
|
||||
</title>
|
||||
</head>
|
||||
|
||||
<body bgcolor="#F0F8FF">
|
||||
<details>
|
||||
<summary>Menu</summary>
|
||||
<ul>
|
||||
<li><a href="./index.html">Home</a></li>
|
||||
<li><a href="./embeded_details.html"><h4>Embeded Details</h4></a></li>
|
||||
<li><a href="./opencv_details.html">OpenCV Details</a></li>
|
||||
<li><a href="./photography_details.html">Photography Details</a></li>
|
||||
<li><a href="./table.html">Table with filters (not working yet)</a></li>
|
||||
<li><a href="./images/institute.png">Institute</a></li>
|
||||
</ul>
|
||||
</details>
|
||||
<h2 align="center">Embedded Details</h2>
|
||||
<hr width="800" align="center">
|
||||
<p align="center">
|
||||
<img src="./images/esp32.png" alt="ESP32" height="150">
|
||||
<img src="./images/arduino.png" alt="Arduino" height="150">
|
||||
<img src="./images/stm32.png" alt="STM32" height="150">
|
||||
</p>
|
||||
<p align="justify">My programming path started with embeded systems,
|
||||
i love all the low level things that Mcu could do with just a little bit of code,
|
||||
sometimes build or flashing progress could take some time to get a hand of , but after that everething usualy
|
||||
goes smooth</p>
|
||||
|
||||
<p align="justify">The first MCU i tried was a ATmega328P,
|
||||
after some time i was surprised with the debug capabilities on the Stm32
|
||||
and now i'm working with esp32-s3 , that's a good chip, has internal JTAG and all the shiny wireless interfaces
|
||||
but feels faulty
|
||||
for some reason <i> regular segfaults with CDC</i></p>
|
||||
|
||||
|
||||
<h3 align="center">Microcontroller Comparison Table</h3>
|
||||
<table border="1" align="center" cellpadding="6" cellspacing="0">
|
||||
<tr>
|
||||
<th>Board/MCU</th>
|
||||
<th>UART Count</th>
|
||||
<th>Dynamic UART Assignment</th>
|
||||
<th>ADC Channels</th>
|
||||
<th>Debug Support</th>
|
||||
<th>Flash Size</th>
|
||||
<th>Wireless Connectivity</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>ESP32</td>
|
||||
<td>3</td>
|
||||
<td>Yes (via IO MUX)</td>
|
||||
<td>18</td>
|
||||
<td>JTAG, Serial</td>
|
||||
<td>4MB (typical)</td>
|
||||
<td>Wi-Fi, Bluetooth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>ESP32-S3</td>
|
||||
<td>3</td>
|
||||
<td>Yes (via IO MUX)</td>
|
||||
<td>20</td>
|
||||
<td>JTAG, Serial</td>
|
||||
<td>8MB (typical)</td>
|
||||
<td>Wi-Fi, Bluetooth LE</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>ESP-01</td>
|
||||
<td>1</td>
|
||||
<td>No</td>
|
||||
<td>1</td>
|
||||
<td>Serial only</td>
|
||||
<td>512KB/1MB</td>
|
||||
<td>Wi-Fi</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Arduino Uno (ATmega328P)</td>
|
||||
<td>1</td>
|
||||
<td>No</td>
|
||||
<td>6</td>
|
||||
<td>Serial, DebugWire</td>
|
||||
<td>32KB</td>
|
||||
<td>None</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Blue Pill (STM32F103C8T6)</td>
|
||||
<td>3</td>
|
||||
<td>Yes (remappable)</td>
|
||||
<td>10</td>
|
||||
<td>SWD, Serial</td>
|
||||
<td>64KB/128KB</td>
|
||||
<td>None</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p align="right"> no rpi pico here , the build system has won over my temper</p>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
229
index.html
@@ -1,229 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<link href="https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/3.10.2/mdb.min.css" rel="stylesheet">
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/3.10.2/mdb.min.js"></script>
|
||||
<link href="labs/lab4/css/bootstrap.min.css" rel="stylesheet">
|
||||
<script src="labs/lab4/js/bootstrap.bundle.min.js"></script>
|
||||
|
||||
<title>Portfolio</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<!-- Navigation -->
|
||||
<nav class="navbar navbar-expand-md bg-light navbar-light">
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="navbarNav">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link selected-menu px-3" href="./index.html">Home</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link px-3" href="./embeded_details.html">Embedded</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link px-3" href="./opencv_details.html">OpenCV</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link px-3" href="./photography_details.html">Photography</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link px-3" href="./table.html">Table</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link px-3" href="./images/institute.png">Institute</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<!-- Image Gallery -->
|
||||
<div class="container-fluid my-4 text-center">
|
||||
<div class="row g-2">
|
||||
<div class="col-lg-4 col-md-12">
|
||||
<div class="hover-overlay">
|
||||
<img src="./images/sqarucos.png" class="img-fluid border border-dark hover-shadow w-100 mt-0 mt-lg-2" alt="Arduino">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-12">
|
||||
<div class="hover-overlay">
|
||||
<img src="./images/sqstm32.png" class="img-fluid border border-dark hover-shadow w-100" alt="STM32">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-12">
|
||||
<div class="hover-overlay">
|
||||
<img src="./images/sqesp32.png" class="img-fluid border border-dark hover-shadow w-100 mt-0 mt-lg-2" alt="ESP32">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Main Content -->
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<!-- Main Content Area -->
|
||||
<div class="col-lg-9 col-md-12">
|
||||
<!-- First Block -->
|
||||
<div class="card mb-4">
|
||||
<div class="card-header text-center">
|
||||
<h5 class="fw-bold mb-0">Embedded Systems</h5>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row align-items-center">
|
||||
<div class="col-lg-4 col-md-12 mb-3">
|
||||
<p class="text-justify">
|
||||
Had several projects with different MCUs and wrote firmware for them.
|
||||
My main stack consists of Platformio+EspIdf or Arduino, also tried STM32
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-12 mb-3">
|
||||
<p class="text-justify">
|
||||
I love embedded development because of autonomy of produced devices, the devices are
|
||||
not
|
||||
dependent on any other hardware and can work autonomously
|
||||
</p>
|
||||
<a href="#" class="text-decoration-none small d-block text-end">More info»</a>
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-12 mb-3">
|
||||
<img src="./images/AQ_monitor.png" class="img-fluid" alt="ESP32">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Second Block -->
|
||||
<div class="card mb-4">
|
||||
<div class="card-header text-center">
|
||||
<h5 class="fw-bold mb-0">Embedded Systems</h5>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row align-items-center">
|
||||
<div class="col-lg-3 col-md-12 mb-3">
|
||||
<p class="text-justify">
|
||||
Had several projects with different MCUs and wrote firmware for them.
|
||||
My main stack consists of Platformio+EspIdf or Arduino, also tried STM32
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-lg-6 col-md-12 mb-3 text-center">
|
||||
<img src="./images/remote.jpeg" class="img-fluid" alt="Remote">
|
||||
</div>
|
||||
<div class="col-lg-3 col-md-12 mb-3">
|
||||
<p class="text-justify">
|
||||
I love embedded development because of autonomy of produced devices, the devices
|
||||
are not dependent on any other hardware and can work autonomously or off the grid
|
||||
</p>
|
||||
<a href="#" class="text-decoration-none small d-block text-end">More info»</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Sidebar -->
|
||||
<div class="col-lg-3 col-md-12 border-start">
|
||||
<!-- Small Info Block 1 -->
|
||||
<div class="card mb-3 mt-lg-0 mt-3">
|
||||
<div class="row g-0">
|
||||
<div class="col-md-8 col-lg-12 col-xl-8">
|
||||
<div class="card-body p-3">
|
||||
<h6 class="card-title fw-bold text-end">3D Printer</h6>
|
||||
<p class="card-text small text-justify">
|
||||
3D printers are versatile tools used for creating prototypes,
|
||||
custom parts, and artistic designs. They work by layering materials.
|
||||
</p>
|
||||
<a href="#" class="text-decoration-none small d-block text-end">More Info»</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-lg-12 col-xl-4">
|
||||
<div class="hover-overlay">
|
||||
<img src="images/16x10/3d-printer.jpeg" class="img-fluid hover-zoom" alt="3D Printer">
|
||||
<div class="mask" style="background-color: rgba(63, 107, 69, 0.2);"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Small Info Block 2 -->
|
||||
<div class="card mb-3">
|
||||
<div class="row g-0">
|
||||
<div class="col-md-8 col-lg-12 col-xl-8">
|
||||
<div class="card-body p-3">
|
||||
<h6 class="card-title fw-bold text-end">BLHeli ESCs</h6>
|
||||
<p class="card-text small text-justify">
|
||||
BLHeli ESCs are electronic speed controllers designed
|
||||
for drones, offering smooth and precise motor control.
|
||||
</p>
|
||||
<a href="#" class="text-decoration-none small d-block text-end">More Info»</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-lg-12 col-xl-4">
|
||||
<div class="hover-overlay">
|
||||
<img src="images/16x10/blheli-esc.jpeg" class="img-fluid hover-zoom" alt="BLHeli ESC">
|
||||
<div class="mask" style="background-color: rgba(57, 192, 237, 0.2);"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Small Info Block 3 -->
|
||||
<div class="card mb-3">
|
||||
<div class="row g-0">
|
||||
<div class="col-md-8 col-lg-12 col-xl-8">
|
||||
<div class="card-body p-3">
|
||||
<h6 class="card-title fw-bold text-end">Raspberry Pi Nano</h6>
|
||||
<p class="card-text small text-justify">
|
||||
Raspberry Pi Nano is a compact computer ideal for learning,
|
||||
prototyping, and IoT projects. It is highly energy-efficient.
|
||||
</p>
|
||||
<a href="#" class="text-decoration-none small d-block text-end">More Info»</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-lg-12 col-xl-4">
|
||||
<div class="hover-overlay">
|
||||
<img src="images/16x10/rpi-nano.jpeg" class="img-fluid hover-zoom"
|
||||
alt="Raspberry Pi Nano">
|
||||
<div class="mask" style="background-color: rgba(57, 192, 237, 0.2);"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Small Info Block 4 -->
|
||||
<div class="card mb-3">
|
||||
<div class="row g-0">
|
||||
<div class="col-md-8 col-lg-12 col-xl-8">
|
||||
<div class="card-body p-3">
|
||||
<h6 class="card-title fw-bold text-end">Smart Thermostats</h6>
|
||||
<p class="card-text small text-justify">
|
||||
Smart thermostats help regulate home temperatures efficiently,
|
||||
saving energy and enhancing comfort with automation.
|
||||
</p>
|
||||
<a href="#" class="text-decoration-none small d-block text-end">More Info»</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-lg-12 col-xl-4">
|
||||
<div class="hover-overlay">
|
||||
<img src="images/16x10/thermostat.jpeg" class="img-fluid hover-zoom"
|
||||
alt="Smart Thermostat">
|
||||
<div class="mask" style="background-color: rgba(57, 192, 237, 0.2);"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container-fluid bg-light">
|
||||
<span class="lead p-4 ">Kulesh A.</span>
|
||||
<span class="lead p-4 "> Б9123-09.03.04</span>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
14
labs/lab1/CSS/style.css
Normal file
@@ -0,0 +1,14 @@
|
||||
th{
|
||||
padding: 5px;
|
||||
background-color: gray;
|
||||
}
|
||||
|
||||
td{
|
||||
padding: 5px;
|
||||
background-color: lightgray;
|
||||
}
|
||||
|
||||
th, td ,table{
|
||||
border: solid black thin;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
514
labs/lab1/JavaScript/data.js
Normal file
@@ -0,0 +1,514 @@
|
||||
buildings= [
|
||||
{
|
||||
"Название": "Бурдж-Халифа",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "ОАЭ",
|
||||
"Город": "Дубай",
|
||||
"Год": 2010,
|
||||
"Высота": 828
|
||||
},
|
||||
{
|
||||
"Название": "Варшавская радиомачта",
|
||||
"Тип": "Антенная мачта",
|
||||
"Страна": "Польша",
|
||||
"Город": "Константинов",
|
||||
"Год": 1974,
|
||||
"Высота": 646.38
|
||||
},
|
||||
{
|
||||
"Название": "Tokyo Skytree",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Япония",
|
||||
"Город": "Токио",
|
||||
"Год": 2012,
|
||||
"Высота": 634
|
||||
},
|
||||
{
|
||||
"Название": "Шанхайская башня",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шанхай",
|
||||
"Год": 2013,
|
||||
"Высота": 632
|
||||
},
|
||||
{
|
||||
"Название": "Телерадиомачта KVLY-TV",
|
||||
"Тип": "Радиомачта",
|
||||
"Страна": "США",
|
||||
"Город": "Бланчард",
|
||||
"Год": 1963,
|
||||
"Высота": 629
|
||||
},
|
||||
{
|
||||
"Название": "Телебашня Гуанчжоу",
|
||||
"Тип": "Гиперболоидная башня",
|
||||
"Страна": "КНР",
|
||||
"Город": "Гуанчжоу",
|
||||
"Год": 2009,
|
||||
"Высота": 600
|
||||
},
|
||||
{
|
||||
"Название": "Международный финансовый центр Пинань",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шэньчжэнь",
|
||||
"Год": 2017,
|
||||
"Высота": 600
|
||||
},
|
||||
{
|
||||
"Название": "Lotte World Tower",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Южная Корея",
|
||||
"Город": "Сеул",
|
||||
"Год": 2017,
|
||||
"Высота": 555
|
||||
},
|
||||
{
|
||||
"Название": "Си-Эн Тауэр",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Канада",
|
||||
"Город": "Торонто",
|
||||
"Год": 1976,
|
||||
"Высота": 553
|
||||
},
|
||||
{
|
||||
"Название": "Останкинская башня",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Россия",
|
||||
"Город": "Москва",
|
||||
"Год": 1967,
|
||||
"Высота": 540.1
|
||||
},
|
||||
{
|
||||
"Название": "Уиллис-тауэр",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "США",
|
||||
"Город": "Чикаго",
|
||||
"Год": 1974,
|
||||
"Высота": 527.3
|
||||
},
|
||||
{
|
||||
"Название": "Тайбэй 101",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Тайвань",
|
||||
"Город": "Тайбэй",
|
||||
"Год": 2004,
|
||||
"Высота": 509.2
|
||||
},
|
||||
{
|
||||
"Название": "Шанхайский всемирный финансовый центр",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шанхай",
|
||||
"Год": 2008,
|
||||
"Высота": 492
|
||||
},
|
||||
{
|
||||
"Название": "Международный коммерческий центр",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Гонконг",
|
||||
"Город": "Гонконг",
|
||||
"Год": 2009,
|
||||
"Высота": 484
|
||||
},
|
||||
{
|
||||
"Название": "Восточная жемчужина",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шанхай",
|
||||
"Год": 1994,
|
||||
"Высота": 467.9
|
||||
},
|
||||
{
|
||||
"Название": "Лахта-центр",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Россия",
|
||||
"Город": "Санкт-Петербург",
|
||||
"Год": 2018,
|
||||
"Высота": 462
|
||||
},
|
||||
{
|
||||
"Название": "Landmark 81",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Вьетнам",
|
||||
"Город": "Хошимин",
|
||||
"Год": 2018,
|
||||
"Высота": 461.2
|
||||
},
|
||||
{
|
||||
"Название": "875 Норт-Мичиган-авеню",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "США",
|
||||
"Город": "Чикаго",
|
||||
"Год": 1969,
|
||||
"Высота": 457.2
|
||||
},
|
||||
{
|
||||
"Название": "Петронас. башня 1 и 2",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Малайзия",
|
||||
"Город": "Куала-Лумпур",
|
||||
"Год": 1998,
|
||||
"Высота": 452
|
||||
},
|
||||
{
|
||||
"Название": "Финансовый центр Наньцзин-Гринлэнд",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Нанкин",
|
||||
"Год": 2009,
|
||||
"Высота": 450
|
||||
},
|
||||
{
|
||||
"Название": "Эмпайр-стейт-билдинг",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "США",
|
||||
"Город": "Нью-Йорк",
|
||||
"Год": 1931,
|
||||
"Высота": 448.7
|
||||
},
|
||||
{
|
||||
"Название": "Международный финансовый центр. башня зап.",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Гуанчжоу",
|
||||
"Год": 2010,
|
||||
"Высота": 437.5
|
||||
},
|
||||
{
|
||||
"Название": "Kingkey 100",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шэньчжэнь",
|
||||
"Год": 2011,
|
||||
"Высота": 439.8
|
||||
},
|
||||
{
|
||||
"Название": "Бордже Милад",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Иран",
|
||||
"Город": "Тегеран",
|
||||
"Год": 2003,
|
||||
"Высота": 435
|
||||
},
|
||||
{
|
||||
"Название": "Парк-авеню. 432",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "США",
|
||||
"Город": "Нью-Йорк",
|
||||
"Год": 2015,
|
||||
"Высота": 425.5
|
||||
},
|
||||
{
|
||||
"Название": "Международная гостиница и башня Трампа",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "США",
|
||||
"Город": "Чикаго",
|
||||
"Год": 2009,
|
||||
"Высота": 423.4
|
||||
},
|
||||
{
|
||||
"Название": "Менара Куала-Лумпур",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Малайзия",
|
||||
"Город": "Куала-Лумпур",
|
||||
"Год": 1995,
|
||||
"Высота": 421
|
||||
},
|
||||
{
|
||||
"Название": "Цзинь Мао",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шанхай",
|
||||
"Год": 1999,
|
||||
"Высота": 420.5
|
||||
},
|
||||
{
|
||||
"Название": "Экибастузская ГРЭС-2",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "Казахстан",
|
||||
"Город": "Экибастуз",
|
||||
"Год": 1987,
|
||||
"Высота": 419.7
|
||||
},
|
||||
{
|
||||
"Название": "Международный финансовый центр",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Гонконг",
|
||||
"Город": "Гонконг",
|
||||
"Год": 2003,
|
||||
"Высота": 415.8
|
||||
},
|
||||
{
|
||||
"Название": "Тяньцзиньская телебашня",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "КНР",
|
||||
"Город": "Тяньцзинь",
|
||||
"Год": 1991,
|
||||
"Высота": 415.2
|
||||
},
|
||||
{
|
||||
"Название": "Башня Аль-Хамра",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Кувейт",
|
||||
"Город": "Кувейт",
|
||||
"Год": 2010,
|
||||
"Высота": 412
|
||||
},
|
||||
{
|
||||
"Название": "Пекинская телебашня",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "КНР",
|
||||
"Город": "Пекин",
|
||||
"Год": 1992,
|
||||
"Высота": 405
|
||||
},
|
||||
{
|
||||
"Название": "Башня CITIC",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Гуанчжоу",
|
||||
"Год": 1997,
|
||||
"Высота": 391.1
|
||||
},
|
||||
{
|
||||
"Название": "Киевская телебашня",
|
||||
"Тип": "Решётчатая мачта",
|
||||
"Страна": "Украина",
|
||||
"Город": "Киев",
|
||||
"Год": 1973,
|
||||
"Высота": 385
|
||||
},
|
||||
{
|
||||
"Название": "Башня Сёньхин",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шэньчжэнь",
|
||||
"Год": 1996,
|
||||
"Высота": 384
|
||||
},
|
||||
{
|
||||
"Название": "Абу-Даби Плаза",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Казахстан",
|
||||
"Город": "Астана",
|
||||
"Год": 2015,
|
||||
"Высота": 382
|
||||
},
|
||||
{
|
||||
"Название": "Бурдж-Мохаммед-бин-Рашид",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "ОАЭ",
|
||||
"Город": "Абу-Даби",
|
||||
"Год": 2014,
|
||||
"Высота": 381
|
||||
},
|
||||
{
|
||||
"Название": "Inco Superstack",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "Канада",
|
||||
"Город": "Copper Cliff",
|
||||
"Год": 1971,
|
||||
"Высота": 380
|
||||
},
|
||||
{
|
||||
"Название": "Тантекс-Скай-Тауэр",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Тайвань",
|
||||
"Город": "Гаосюн",
|
||||
"Год": 1997,
|
||||
"Высота": 378
|
||||
},
|
||||
{
|
||||
"Название": "JW Marriott Marquis Dubai. 1 и 2",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "ОАЭ",
|
||||
"Город": "Дубай",
|
||||
"Год": 2010,
|
||||
"Высота": 376
|
||||
},
|
||||
{
|
||||
"Название": "Ташкентская телебашня",
|
||||
"Тип": "Башня",
|
||||
"Страна": "Узбекистан",
|
||||
"Город": "Ташкент",
|
||||
"Год": 1985,
|
||||
"Высота": 374.9
|
||||
},
|
||||
{
|
||||
"Название": "Башня Федерация «Восток»",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Россия",
|
||||
"Город": "Москва",
|
||||
"Год": 2016,
|
||||
"Высота": 374
|
||||
},
|
||||
{
|
||||
"Название": "Сентрал-плаза",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Гонконг",
|
||||
"Город": "Гонконг",
|
||||
"Год": 1992,
|
||||
"Высота": 374
|
||||
},
|
||||
{
|
||||
"Название": "Башня Освобождения",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Кувейт",
|
||||
"Город": "Кувейт",
|
||||
"Год": 1996,
|
||||
"Высота": 372
|
||||
},
|
||||
{
|
||||
"Название": "Телебашня «Коктобе»",
|
||||
"Тип": "Башня",
|
||||
"Страна": "Казахстан",
|
||||
"Город": "Алматы",
|
||||
"Год": 1983,
|
||||
"Высота": 371.5
|
||||
},
|
||||
{
|
||||
"Название": "Дымовая труба электростанции",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "США",
|
||||
"Город": "Homer City",
|
||||
"Год": 1977,
|
||||
"Высота": 371
|
||||
},
|
||||
{
|
||||
"Название": "Дымовая труба Берёзовской ГРЭС",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "Россия",
|
||||
"Город": "Шарыпово",
|
||||
"Год": 1985,
|
||||
"Высота": 370
|
||||
},
|
||||
{
|
||||
"Название": "Рижская телебашня",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Латвия",
|
||||
"Город": "Рига",
|
||||
"Год": 1987,
|
||||
"Высота": 368.5
|
||||
},
|
||||
{
|
||||
"Название": "Берлинская телебашня",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "Германия",
|
||||
"Город": "Берлин",
|
||||
"Год": 1969,
|
||||
"Высота": 368
|
||||
},
|
||||
{
|
||||
"Название": "Дымовая труба электростанции.",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "США",
|
||||
"Город": "Маундсвилл",
|
||||
"Год": 1968,
|
||||
"Высота": 367.6
|
||||
},
|
||||
{
|
||||
"Название": "Башня Банка Китая",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Гонконг",
|
||||
"Город": "Гонконг",
|
||||
"Год": 1990,
|
||||
"Высота": 367.4
|
||||
},
|
||||
{
|
||||
"Название": "Башня Банка Америки",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "США",
|
||||
"Город": "Нью-Йорк",
|
||||
"Год": 2008,
|
||||
"Высота": 366
|
||||
},
|
||||
{
|
||||
"Название": "Башня Алмас",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "ОАЭ",
|
||||
"Город": "Дубай",
|
||||
"Год": 2008,
|
||||
"Высота": 363
|
||||
},
|
||||
{
|
||||
"Название": "Дымовая труба электростанции в Трбовле",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "Словения",
|
||||
"Город": "Трбовле",
|
||||
"Год": 1976,
|
||||
"Высота": 360
|
||||
},
|
||||
{
|
||||
"Название": "Endesa Termic ",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "Испания",
|
||||
"Город": "Ферроль",
|
||||
"Год": 1974,
|
||||
"Высота": 356
|
||||
},
|
||||
{
|
||||
"Название": "SEG Plaza",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "КНР",
|
||||
"Город": "Шэньчжэнь",
|
||||
"Год": 2000,
|
||||
"Высота": 355.8
|
||||
},
|
||||
{
|
||||
"Название": "First Canadian Place",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Канада",
|
||||
"Город": "Торонто",
|
||||
"Год": 1976,
|
||||
"Высота": 355
|
||||
},
|
||||
{
|
||||
"Название": "Эмиратская офисная башня",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "ОАЭ",
|
||||
"Город": "Дубай",
|
||||
"Год": 2000,
|
||||
"Высота": 354.6
|
||||
},
|
||||
{
|
||||
"Название": "ОКО Южная башня",
|
||||
"Тип": "Небоскрёб",
|
||||
"Страна": "Россия",
|
||||
"Город": "Москва",
|
||||
"Год": 2015,
|
||||
"Высота": 354
|
||||
},
|
||||
{
|
||||
"Название": "Виннцкая телемачта",
|
||||
"Тип": "Радиомачта",
|
||||
"Страна": "Украина",
|
||||
"Город": "Винница",
|
||||
"Год": 1961,
|
||||
"Высота": 354
|
||||
},
|
||||
{
|
||||
"Название": "Медеплавильный завод",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "Румыния",
|
||||
"Город": "Бая-Маре",
|
||||
"Год": 1995,
|
||||
"Высота": 351.5
|
||||
},
|
||||
{
|
||||
"Название": "Стратосфера Лас-Вегас",
|
||||
"Тип": "Бетонная башня",
|
||||
"Страна": "США",
|
||||
"Город": "Лас-Вегас",
|
||||
"Год": 1996,
|
||||
"Высота": 350.2
|
||||
},
|
||||
{
|
||||
"Название": "Дымовая труба Сырдарьинской электростанции",
|
||||
"Тип": "Дымовая труба",
|
||||
"Страна": "Узбекистан",
|
||||
"Город": "Сырдарья",
|
||||
"Год": 1980,
|
||||
"Высота": 350
|
||||
}
|
||||
]
|
||||
91
labs/lab1/JavaScript/filter.js
Normal file
@@ -0,0 +1,91 @@
|
||||
const correspond = {
|
||||
"Название": "structure",
|
||||
"Тип": "category",
|
||||
"Страна": "country",
|
||||
"Город": "city",
|
||||
"Год": ["yearFrom", "yearTo"],
|
||||
"Высота": ["heightFrom", "heightTo"]
|
||||
}
|
||||
|
||||
|
||||
/* Структура возвращаемого ассоциативного массива:
|
||||
{
|
||||
input_id: input_value,
|
||||
...
|
||||
}
|
||||
*/
|
||||
const dataFilter = (dataForm) => {
|
||||
let dictFilter = {};
|
||||
|
||||
// перебираем все элементы формы с фильтрами
|
||||
for (const item of dataForm.elements) {
|
||||
|
||||
// получаем значение элемента
|
||||
let valInput = item.value;
|
||||
|
||||
// если поле типа text - приводим его значение к нижнему регистру
|
||||
if (item.type === "text") {
|
||||
valInput = valInput.toLowerCase();
|
||||
}
|
||||
|
||||
if (item.type === "number") {
|
||||
if (valInput === "") {
|
||||
if (item.id.includes("From")) {
|
||||
valInput = -Infinity;
|
||||
}
|
||||
else {
|
||||
valInput = Infinity;
|
||||
}
|
||||
}
|
||||
else {
|
||||
valInput = Number(valInput);
|
||||
}
|
||||
}
|
||||
// формируем очередной элемент ассоциативного массива
|
||||
dictFilter[item.id] = valInput;
|
||||
}
|
||||
return dictFilter;
|
||||
}
|
||||
|
||||
|
||||
// фильтрация таблицы
|
||||
const filterTable = (data, idTable, dataForm) => {
|
||||
|
||||
// получаем данные из полей формы
|
||||
const datafilter = dataFilter(dataForm);
|
||||
|
||||
// выбираем данные соответствующие фильтру и формируем таблицу из них
|
||||
let tableFilter = data.filter(item => {
|
||||
|
||||
/* в этой переменной будут "накапливаться" результаты сравнения данных
|
||||
с параметрами фильтра */
|
||||
let result = true;
|
||||
|
||||
// строка соответствует фильтру, если сравнение всех значения из input
|
||||
// со значением ячейки очередной строки - истина
|
||||
Object.entries(item).map(([key, val]) => {
|
||||
|
||||
// текстовые поля проверяем на вхождение
|
||||
if (typeof val == 'string') {
|
||||
result &&= val.toLowerCase().includes(datafilter[correspond[key]])
|
||||
}
|
||||
|
||||
// САМОСТОЯТЕЛЬНО проверить числовые поля на принадлежность интервалу
|
||||
if (typeof val == 'number') {
|
||||
result &&= datafilter[correspond[key][0]] <= Number(val) && datafilter[correspond[key][1]] >= Number(val)
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
return result;
|
||||
});
|
||||
|
||||
// САМОСТОЯТЕЛЬНО вызвать функцию, которая удаляет все строки таблицы с id=idTable
|
||||
clearTable(idTable);
|
||||
// показать на странице таблицу с отфильтрованными строками
|
||||
createTable(tableFilter, idTable);
|
||||
}
|
||||
|
||||
const clearFilters = (form) => {
|
||||
form.querySelectorAll(`& input[type="text"],& input[type="number"]`).forEach((elem) => elem.value = null)
|
||||
}
|
||||
106
labs/lab1/JavaScript/main.js
Normal file
@@ -0,0 +1,106 @@
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
doInit()
|
||||
})
|
||||
|
||||
function doInit() {
|
||||
createTable(buildings, 'list');
|
||||
const clearFiltersButton = document.getElementById("clearFiltersButton");
|
||||
clearFiltersButton.addEventListener("click", (event) => {
|
||||
clearFilters(filter);
|
||||
filterTable(buildings,'list',filter)
|
||||
resetSort(sort);
|
||||
})
|
||||
|
||||
const applyFiltersButton = document.getElementById("applyFiltersButton");
|
||||
applyFiltersButton.addEventListener("click", (event) => {
|
||||
filterTable(buildings,'list',filter)
|
||||
resetSort(sort);
|
||||
})
|
||||
|
||||
setSortSelects(buildings[0], sort)
|
||||
|
||||
|
||||
sort.fieldsFirst.addEventListener("change",()=>{
|
||||
changeNextSelect(sort.fieldsFirst,sort.fieldsSecond.id)
|
||||
})
|
||||
|
||||
sort.doSortButton.addEventListener("click", ()=>{if (!sortTable('list',sort)){
|
||||
clearTable('list');
|
||||
createTable(buildings, 'list');
|
||||
}});
|
||||
sort.resetSortButton.addEventListener("click", ()=>{resetSort(sort);
|
||||
clearTable('list');
|
||||
createTable(buildings, 'list');
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
// формирование полей элемента списка с заданным текстом и значением
|
||||
|
||||
const createOption = (str, val) => {
|
||||
let item = document.createElement('option');
|
||||
item.text = str;
|
||||
item.value = val;
|
||||
return item;
|
||||
}
|
||||
|
||||
// формирование поля со списком
|
||||
// параметры – массив со значениями элементов списка и элемент select
|
||||
|
||||
const setSortSelect = (arr, sortSelect) => {
|
||||
|
||||
// создаем OPTION Нет и добавляем ее в SELECT
|
||||
sortSelect.append(createOption('Нет', 0));
|
||||
// перебираем массив со значениями опций
|
||||
arr.forEach((item, index) => {
|
||||
// создаем OPTION из очередного ключа и добавляем в SELECT
|
||||
// значение атрибута VALUE увеличиваем на 1, так как значение 0 имеет опция Нет
|
||||
sortSelect.append(createOption(item, index + 1));
|
||||
});
|
||||
}
|
||||
// формируем поля со списком для многоуровневой сортировки
|
||||
const setSortSelects = (data, dataForm) => {
|
||||
|
||||
// выделяем ключи словаря в массив
|
||||
const head = Object.keys(data);
|
||||
|
||||
// находим все SELECT в форме
|
||||
const allSelect = dataForm.getElementsByTagName('select');
|
||||
|
||||
for(const item of dataForm.elements){
|
||||
// формируем очередной SELECT
|
||||
setSortSelect(head, item);
|
||||
|
||||
// САМОСТОЯТЕЛЬНО все SELECT, кроме первого, сделать неизменяемым
|
||||
}
|
||||
let skipped = false
|
||||
for(const elem of allSelect){
|
||||
if(!skipped){
|
||||
skipped = true;
|
||||
continue;
|
||||
}
|
||||
elem.disabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
const changeNextSelect = (curSelect, nextSelectId) => {
|
||||
|
||||
let nextSelect = document.getElementById(nextSelectId);
|
||||
|
||||
nextSelect.disabled = false;
|
||||
|
||||
// в следующем SELECT выводим те же option, что и в текущем
|
||||
nextSelect.innerHTML = curSelect.innerHTML;
|
||||
|
||||
// удаляем в следующем SELECT уже выбранную в текущем опцию
|
||||
// если это не первая опция - отсутствие сортировки
|
||||
if (curSelect.value != 0) {
|
||||
nextSelect.remove(curSelect.value);
|
||||
} else {
|
||||
nextSelect.disabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
const resetSort = (form)=>{
|
||||
form.querySelectorAll(`& select`).forEach((curSelect,index) => {if(index!=0){curSelect.disabled = true} curSelect.value = 0})
|
||||
}
|
||||
87
labs/lab1/JavaScript/sort.js
Normal file
@@ -0,0 +1,87 @@
|
||||
/*формируем массив для сортировки по двум уровням вида
|
||||
[
|
||||
{column: номер столбца, по которому осуществляется сортировка,
|
||||
direction: порядок сортировки (true по убыванию, false по возрастанию)
|
||||
},
|
||||
...
|
||||
]
|
||||
*/
|
||||
const createSortArr = (data) => {
|
||||
let sortArr = [];
|
||||
|
||||
const sortSelects = data.getElementsByTagName('select');
|
||||
|
||||
for (const item of sortSelects) {
|
||||
// получаем номер выбранной опции
|
||||
const keySort = item.value;
|
||||
// в случае, если выбрана опция Нет, заканчиваем формировать массив
|
||||
if (keySort == 0) {
|
||||
break;
|
||||
}
|
||||
// получаем порядок сортировки очередного уровня
|
||||
// имя флажка сформировано как имя поля SELECT и слова Desc
|
||||
const desc = document.getElementById(item.id + 'Desc').checked;
|
||||
// очередной элемент массива - по какому столбцу и в каком порядке сортировать
|
||||
sortArr.push(
|
||||
{
|
||||
column: keySort - 1,
|
||||
direction: desc
|
||||
}
|
||||
);
|
||||
}
|
||||
return sortArr;
|
||||
};
|
||||
|
||||
const numberColumns = [4, 5]
|
||||
|
||||
const sortTable = (idTable, formData) => {
|
||||
|
||||
// формируем управляющий массив для сортировки
|
||||
const sortArr = createSortArr(formData);
|
||||
|
||||
// сортировать таблицу не нужно, во всех полях выбрана опция Нет
|
||||
if (sortArr.length === 0) {
|
||||
clearTable(idTable)
|
||||
return false;
|
||||
|
||||
}
|
||||
//находим нужную таблицу
|
||||
let table = document.getElementById(idTable);
|
||||
|
||||
// преобразуем строки таблицы в массив
|
||||
let rowData = Array.from(table.rows);
|
||||
|
||||
// удаляем элемент с заголовками таблицы
|
||||
const headerRow = rowData.shift();
|
||||
|
||||
//сортируем данные по всем уровням сортировки
|
||||
rowData.sort((first, second) => {
|
||||
for (let { column, direction } of sortArr) {
|
||||
const firstCell = first.cells[column].innerHTML;
|
||||
const secondCell = second.cells[column].innerHTML;
|
||||
|
||||
// используем localeCompare для корректного сравнения
|
||||
let comparison = null;
|
||||
if (numberColumns.includes(column)) {
|
||||
comparison = Number(firstCell) - Number(secondCell);
|
||||
}
|
||||
else {
|
||||
comparison = firstCell.localeCompare(secondCell);
|
||||
}
|
||||
// учитываем направление сортировки
|
||||
if (comparison !== 0) {
|
||||
return (direction ? -comparison : comparison);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
clearTable(idTable)
|
||||
//выводим отсортированную таблицу на страницу
|
||||
|
||||
let tbody = document.createElement('tbody');
|
||||
rowData.forEach(item => {
|
||||
tbody.append(item);
|
||||
});
|
||||
table.append(tbody);
|
||||
return true;
|
||||
}
|
||||
50
labs/lab1/JavaScript/table.js
Normal file
@@ -0,0 +1,50 @@
|
||||
const createTable = (data, idTable) => {
|
||||
const table = document.getElementById(idTable);
|
||||
if (data.length == 0) {
|
||||
return;
|
||||
}
|
||||
const header = Object.keys(data[0]);
|
||||
|
||||
/* создание шапки таблицы */
|
||||
if (!table.firstElementChild) {
|
||||
const headerRow = createHeaderRow(header);
|
||||
table.append(headerRow);
|
||||
}
|
||||
|
||||
/* создание тела таблицы */
|
||||
const bodyRows = createBodyRows(data);
|
||||
table.append(bodyRows);
|
||||
};
|
||||
|
||||
const clearTable = (idTable) => {
|
||||
const table = document.getElementById(idTable);
|
||||
if (table.children.length > 1) {
|
||||
table.removeChild(table.children[1]);
|
||||
}
|
||||
}
|
||||
|
||||
const createHeaderRow = (headers) => {
|
||||
const tr = document.createElement('tr');
|
||||
headers.forEach(header => {
|
||||
const th = document.createElement('th');
|
||||
th.innerHTML = header;
|
||||
tr.append(th);
|
||||
});
|
||||
const thead = document.createElement('thead')
|
||||
thead.appendChild(tr)
|
||||
return thead;
|
||||
};
|
||||
|
||||
const createBodyRows = (rows) => {
|
||||
const body = document.createElement('tbody');
|
||||
rows.forEach(row => {
|
||||
const rowElement = document.createElement('tr');
|
||||
for (let key in row) {
|
||||
const td = document.createElement('td');
|
||||
td.innerHTML = row[key];
|
||||
rowElement.appendChild(td);
|
||||
}
|
||||
body.appendChild(rowElement);
|
||||
})
|
||||
return body;
|
||||
}
|
||||
76
labs/lab1/index.html
Normal file
@@ -0,0 +1,76 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Фильтры и сортировка</title>
|
||||
<link rel="stylesheet" href="CSS/style.css">
|
||||
<script src="JavaScript/data.js"></script>
|
||||
<script src="JavaScript/main.js"></script>
|
||||
<script src="JavaScript/table.js"></script>
|
||||
<script src="JavaScript/filter.js"></script>
|
||||
<script src="JavaScript/sort.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div>
|
||||
<h3>Фильтр</h3>
|
||||
<form id="filter" name="filter">
|
||||
<p>
|
||||
<label for="structure">Название:</label>
|
||||
<input type="text" id="structure">
|
||||
</p>
|
||||
<p>
|
||||
<label for="category">Тип:</label>
|
||||
<input type="text" id="category">
|
||||
</p>
|
||||
<p>
|
||||
<label for="country">Страна:</label>
|
||||
<input type="text" id="country">
|
||||
</p>
|
||||
<p>
|
||||
<label for="city">Город:</label>
|
||||
<input type="text" id="city">
|
||||
</p>
|
||||
<p>
|
||||
<label for="yearFrom">Год: </label>
|
||||
от <input type="number" id="yearFrom">
|
||||
до <input type="number" id="yearTo">
|
||||
</p>
|
||||
<p>
|
||||
<label for="heightFrom">Высота:</label>
|
||||
от <input type="number" id="heightFrom">
|
||||
до <input type="number" id="heightTo">
|
||||
</p>
|
||||
<input id="applyFiltersButton" type="button" value="Найти">
|
||||
<input id="clearFiltersButton" type="button" value="Очистить фильтры">
|
||||
</form>
|
||||
</div>
|
||||
<div>
|
||||
<h3>Сортировка</h3>
|
||||
|
||||
|
||||
<form id="sort">
|
||||
<p> Сортировать по</p>
|
||||
<p>
|
||||
<select id="fieldsFirst">
|
||||
</select>
|
||||
по убыванию? <input type="checkbox" id="fieldsFirstDesc">
|
||||
</p>
|
||||
<p>
|
||||
<select id="fieldsSecond">
|
||||
</select>
|
||||
по убыванию? <input type="checkbox" id="fieldsSecondDesc">
|
||||
</p>
|
||||
<input type="button" value="Сортировать" id="doSortButton">
|
||||
<input type="button" value="Сбросить сортировку" id="resetSortButton">
|
||||
</form>
|
||||
<br>
|
||||
</div>
|
||||
|
||||
<table id="list">
|
||||
</table>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
Before Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 37 KiB |
@@ -1,69 +0,0 @@
|
||||
ol#list(type="I")
|
||||
li Препроцессоры HTML
|
||||
ul(type="disc")
|
||||
li.first
|
||||
a(href="#") Haml
|
||||
li Pug
|
||||
li Препроцессоры CSS
|
||||
ul(type="circle")
|
||||
li.first SAAS
|
||||
li Stylus
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
- var tag = 'h'
|
||||
- var i = 1
|
||||
|
||||
#{tag+i} Уровень #{i}
|
||||
- i++
|
||||
#{tag+i} Уровень #{i}
|
||||
- i++
|
||||
#{tag+i} Уровень #{i}
|
||||
- i++
|
||||
#{tag+i} Уровень #{i}
|
||||
|
||||
|
||||
|
||||
|
||||
- var products ={"Товар":"Цена","ручка":30.5, "карандаш":50, "альбом":156, "тетрадь":21.5, "ластик":10.2}
|
||||
table
|
||||
each name,price in products
|
||||
tr
|
||||
td #{name}
|
||||
td #{price}
|
||||
|
||||
|
||||
|
||||
table
|
||||
- for(var i=0;i<10;i++)
|
||||
tr
|
||||
- for(var j=0;j<10;j++)
|
||||
- if((i + j) % 2 == 0)
|
||||
td.white
|
||||
- else
|
||||
td.black
|
||||
|
||||
|
||||
|
||||
mixin createList(listType, items, tag)
|
||||
- var dispListType = "ul"
|
||||
- if (listType == "ol")
|
||||
- dispListType = "ol"
|
||||
|
||||
#{dispListType}.list
|
||||
each item in items
|
||||
li
|
||||
#{tag} #{item}
|
||||
|
||||
// Вызов миксина
|
||||
+createList('ul', ['Python', 'JavaScript', 'Java'], 'strong')
|
||||
|
||||
|
||||
size=1%
|
||||
section
|
||||
box-shadow: size size (2*size) rgba(0,0,0,0.5)
|
||||
padding:size*2
|
||||
margin:size*4
|
||||
112
old/hw/hw6/hw6.js
Normal file
@@ -0,0 +1,112 @@
|
||||
let templates = [
|
||||
[
|
||||
"X--X----",
|
||||
"-XXX-X--",
|
||||
"----X---",
|
||||
"----X---",
|
||||
"------XX",
|
||||
"----XX--",
|
||||
"X-------",
|
||||
"-XX--X--"
|
||||
],
|
||||
[
|
||||
"---XX---",
|
||||
"----X-X-",
|
||||
"---XX---",
|
||||
"---X----",
|
||||
"-X------",
|
||||
"X----X-X",
|
||||
"--X--X--",
|
||||
"-X----XX"
|
||||
],
|
||||
[
|
||||
"-X-X----",
|
||||
"---X-X--",
|
||||
"X-XX--X-",
|
||||
"--X-X---",
|
||||
"------X",
|
||||
"--------",
|
||||
"X-----X-",
|
||||
"-X-X---X"
|
||||
],
|
||||
[
|
||||
"-XX-X---",
|
||||
"-----X--",
|
||||
"----X---",
|
||||
"-----X-X",
|
||||
"-X-X--X-",
|
||||
"-XX----X",
|
||||
"-X------",
|
||||
"XX------"
|
||||
], [
|
||||
"----XX-X",
|
||||
"X-------",
|
||||
"--------",
|
||||
"-----XX-",
|
||||
"---X-X--",
|
||||
"-X---XX-",
|
||||
"-X-X----",
|
||||
"----XXX-"
|
||||
], [
|
||||
"XX------",
|
||||
"-----X--",
|
||||
"-------X",
|
||||
"-X-X----",
|
||||
"X-X----X",
|
||||
"-X-X-X-X",
|
||||
"----X-X-",
|
||||
"-X------"
|
||||
],
|
||||
];
|
||||
const squareSize = templates[0].length;
|
||||
|
||||
//convert to arrays for mutability
|
||||
let temp = []
|
||||
for (let n = 0; n < templates.length; n++) {
|
||||
temp.push([])
|
||||
for (let i = 0; i < squareSize; i++) {
|
||||
temp[n].push([]);
|
||||
for (let j = 0; j < squareSize; j++) {
|
||||
temp[n][i].push(templates[n][i][j] == "X" ? 1 : 0);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
templates = temp;
|
||||
|
||||
const encodedMsg = "Р_НАЙА_СЛЗДЕ_ЛОСЖСТОИКНОЛЬЛЬТКУЮО__КЗАЕ_ДВАОКАЧОЖЗ_УЧАСМОДУ_ТЮЖЕ";
|
||||
|
||||
|
||||
function rotateTemplate(template) {
|
||||
for (let i = 0; i < squareSize; i++) {
|
||||
for (let j = 0; j < i; j++) {
|
||||
let temp = template[i][j];
|
||||
template[i][j] = template[j][i];
|
||||
template[j][i] = temp;
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < squareSize; i++) {
|
||||
for (let j = 0; j < squareSize / 2; j++) {
|
||||
let temp = template[i][j];
|
||||
template[i][j] = template[i][(squareSize - 1) - j];
|
||||
template[i][(squareSize - 1) - j] = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (let n = 0; n < templates.length; n++) {
|
||||
let out = ""
|
||||
for (let rot = 0; rot < 4; rot++) {
|
||||
for (let i = 0; i < squareSize; i++) {
|
||||
for (let j = 0; j < squareSize; j++) {
|
||||
if (templates[n][i][j]) {
|
||||
out += encodedMsg[i * squareSize + j];
|
||||
}
|
||||
}
|
||||
}
|
||||
rotateTemplate(templates[n]);
|
||||
}
|
||||
console.log(out);
|
||||
console.log("=======");
|
||||
|
||||
}
|
||||
BIN
old/hw/hw7/favicon.ico
Normal file
|
After Width: | Height: | Size: 31 KiB |
108
old/hw/hw7/hw7.css
Normal file
@@ -0,0 +1,108 @@
|
||||
.desctription-heading{
|
||||
font-size: medium;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.main-container {
|
||||
display: flex;
|
||||
gap: 20px;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.scheme-image{
|
||||
flex: 1;
|
||||
max-width: 400px;
|
||||
height: auto;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.controls-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
flex: 1;
|
||||
min-width: 300px;
|
||||
max-width: 400px;
|
||||
}
|
||||
|
||||
.inputs{
|
||||
min-width: 300px;
|
||||
}
|
||||
.outputs{
|
||||
min-width: 300px;
|
||||
}
|
||||
.radio-label{
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
p{
|
||||
line-height: 0;
|
||||
}
|
||||
.max-w{
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.bad-input-tooltip {
|
||||
display: block;
|
||||
background: #ffffff;
|
||||
color: #721c24;
|
||||
border: 1px solid #8f0c19;
|
||||
padding: 4px 8px;
|
||||
max-width: 220px;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.bad-input-highlight {
|
||||
outline: 2px solid #990917;
|
||||
}
|
||||
|
||||
.hidden{
|
||||
display: none;
|
||||
}
|
||||
body{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
}
|
||||
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
margin: 16px 0;
|
||||
}
|
||||
|
||||
th, td {
|
||||
border: 1px solid #ccc;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
th {
|
||||
background-color: #f5f5f5;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
tr:nth-child(even) {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
@media (max-width: 800px) {
|
||||
.main-container {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.scheme-image {
|
||||
max-width: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.controls-container {
|
||||
width: 100%;
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.inputs, .outputs {
|
||||
min-width: unset;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
71
old/hw/hw7/hw7.html
Normal file
@@ -0,0 +1,71 @@
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<title>калькулятор равнобедренного треугольника</title>
|
||||
<link rel="stylesheet" href="./hw7.css">
|
||||
<link rel="icon" href="favicon.ico">
|
||||
<link rel="stylesheet" href="https://unpkg.com/xp.css/dist/98.css"
|
||||
>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h3 class="desctription-heading">калькулятор равнобедренного треугольника</h3>
|
||||
|
||||
<div class="main-container">
|
||||
<div class="image-container">
|
||||
<img src="./imgs/type1.png" class="scheme-image" id="schemeImageA">
|
||||
<img src="./imgs/type2.png" class="scheme-image hidden" id="schemeImageB">
|
||||
</div>
|
||||
|
||||
<div class="controls-container">
|
||||
<div class="inputs" id="inputsForm">
|
||||
<p>Выберете варинат входных данных:</p>
|
||||
<input type="radio" name="input-type" id="radioButtonA" checked>
|
||||
<label class="radio-label" for="radioButtonA">
|
||||
<span>боковая сторона и угол при основании</span>
|
||||
</label><br>
|
||||
<input type="radio" name="input-type" id="radioButtonB">
|
||||
<label class="radio-label" for="radioButtonB">
|
||||
<span>основание и прилежащий к нему угол</span>
|
||||
</label>
|
||||
<form>
|
||||
<fieldset id="inputTypeFieldsetA">
|
||||
<legend>входные данные</legend>
|
||||
<label for="equalSideLength">Длина боковой стороны B:<span class="bad-input-tooltip hidden" id="equalSideLengthErr"></span></label><br>
|
||||
<input class="max-w" type="number" min="0" id="equalSideLength">
|
||||
<br>
|
||||
<label for="baseAngle">Угол при основании α (в градусах):<span class="bad-input-tooltip hidden" id="baseAngleErr"></span></label><br>
|
||||
<input class="max-w" type="number" min="0" max="180" id="baseAngle">
|
||||
</fieldset>
|
||||
<fieldset id="inputTypeFieldsetB" class="hidden">
|
||||
<legend>входные данные</legend>
|
||||
<label for="baseSideLength">Длина основания A:<span class="bad-input-tooltip hidden" id="baseSideLengthErr"></span></label><br>
|
||||
<input class="max-w" type="number" min="0" id="baseSideLength">
|
||||
<br>
|
||||
<label for="baseAdjacentAngle">Угол прилежащий основанию β:<span class="bad-input-tooltip hidden" id="baseAdjacentAngleErr"></span></label><br>
|
||||
<input class="max-w" type="number" min="0" max="180" id="baseAdjacentAngle">
|
||||
</fieldset>
|
||||
<fieldset id="outputsFieldset">
|
||||
<legend>что вычислить</legend>
|
||||
<span class="bad-input-tooltip hidden" id="outputValuesErr"><br></span>
|
||||
<input type="checkbox" name="output-valuesR" id="outputValuesR" checked>
|
||||
<label for="outputValuesR">радиус вписанной окружности</label><br>
|
||||
<input type="checkbox" name="output-valuesH" id="outputValuesH" checked>
|
||||
<label for="outputValuesH">высоты треугольника</label><br>
|
||||
<input type="checkbox" name="output-valuesL" id="outputValuesL" checked>
|
||||
<label for="outputValuesL">длины сторон треугольника</label><br>
|
||||
</fieldset>
|
||||
<button id="calculateButton" disabled>Вычислить</button>
|
||||
<button id="clearButton">Отчислить</button>
|
||||
</form>
|
||||
</div>
|
||||
<table class="outputs hidden" id="outputsTable">
|
||||
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<script src="./hw7.js">
|
||||
</script>
|
||||
|
||||
</html>
|
||||
357
old/hw/hw7/hw7.js
Normal file
@@ -0,0 +1,357 @@
|
||||
let elements = {
|
||||
radioA: document.getElementById('radioButtonA'),
|
||||
radioB: document.getElementById('radioButtonB'),
|
||||
fieldsetA: document.getElementById('inputTypeFieldsetA'),
|
||||
fieldsetB: document.getElementById('inputTypeFieldsetB'),
|
||||
imageA: document.getElementById('schemeImageA'),
|
||||
imageB: document.getElementById('schemeImageB'),
|
||||
|
||||
inputsForm: document.getElementById('inputsForm'),
|
||||
|
||||
equalSideLength: document.getElementById('equalSideLength'),
|
||||
equalSideLengthErr: document.getElementById('equalSideLengthErr'),
|
||||
baseAngle: document.getElementById('baseAngle'),
|
||||
baseAngleErr: document.getElementById('baseAngleErr'),
|
||||
baseSideLength: document.getElementById('baseSideLength'),
|
||||
baseSideLengthErr: document.getElementById('baseSideLengthErr'),
|
||||
baseAdjacentAngle: document.getElementById('baseAdjacentAngle'),
|
||||
baseAdjacentAngleErr: document.getElementById('baseAdjacentAngleErr'),
|
||||
|
||||
outputsFieldset: document.getElementById('outputsFieldset'),
|
||||
outputValuesErr: document.getElementById('outputValuesErr'),
|
||||
outputR: document.getElementById('outputValuesR'),
|
||||
outputH: document.getElementById('outputValuesH'),
|
||||
outputL: document.getElementById('outputValuesL'),
|
||||
calculateButton: document.getElementById('calculateButton'),
|
||||
clearButton: document.getElementById('clearButton'),
|
||||
outputsTable: document.getElementById('outputsTable')
|
||||
}
|
||||
console.log("loaded js!");
|
||||
|
||||
let currentModeIsA = true;
|
||||
let outputFields = {};
|
||||
|
||||
let inputsA = {
|
||||
l: null,
|
||||
angle: null
|
||||
};
|
||||
|
||||
let inputsB = {
|
||||
l: null,
|
||||
angle: null
|
||||
};
|
||||
|
||||
function highlightErrorElement(errorFieldIndex, add = true) {
|
||||
let fields = [
|
||||
elements.equalSideLength,
|
||||
elements.baseAngle,
|
||||
elements.baseSideLength,
|
||||
elements.baseAdjacentAngle,
|
||||
outputsFieldset
|
||||
];
|
||||
if (fields[errorFieldIndex]) {
|
||||
if (add) {
|
||||
fields[errorFieldIndex].classList.add("bad-input-highlight");
|
||||
}
|
||||
else {
|
||||
fields[errorFieldIndex].classList.remove("bad-input-highlight");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function setErrTooltip(errorFieldIndex, tooltip) {
|
||||
let errElem = [
|
||||
elements.equalSideLengthErr,
|
||||
elements.baseAngleErr,
|
||||
elements.baseSideLengthErr,
|
||||
elements.baseAdjacentAngleErr,
|
||||
elements.outputValuesErr
|
||||
][errorFieldIndex];
|
||||
if (errElem) {
|
||||
highlightErrorElement(errorFieldIndex, tooltip !== "");
|
||||
|
||||
if (tooltip !== "") {
|
||||
errElem.classList.remove("hidden");;
|
||||
}
|
||||
else {
|
||||
errElem.classList.add("hidden");;
|
||||
}
|
||||
if (errorFieldIndex == 4) {
|
||||
tooltip += "<br>"
|
||||
}
|
||||
errElem.innerHTML = tooltip;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function deg2rad(degrees) {
|
||||
return degrees * (Math.PI / 180);
|
||||
}
|
||||
|
||||
function getCalculations() {
|
||||
let heights = [];//base related, side realted
|
||||
let lengths = [];// base side
|
||||
let radius = 0;
|
||||
let baseAngle = 0;
|
||||
let sideAngle = 0;
|
||||
if (currentModeIsA) {
|
||||
lengths[0] = 2 * Math.sin(deg2rad(inputsA.angle) / 2) * inputsA.l;
|
||||
lengths[1] = inputsA.l;
|
||||
baseAngle = inputsA.angle;
|
||||
sideAngle = (180 - baseAngle) / 2;
|
||||
}
|
||||
else {
|
||||
lengths[0] = inputsB.l;
|
||||
lengths[1] = inputsB.l / (2 * Math.cos(deg2rad(inputsB.angle)));
|
||||
sideAngle = inputsB.angle;
|
||||
baseAngle = 180 - 2 * sideAngle;
|
||||
}
|
||||
|
||||
|
||||
let a = lengths[0];
|
||||
let b = lengths[1];
|
||||
let p = (a + b + b) / 2;
|
||||
radius = Math.sqrt((p - a) * (p - b) * (p - b) / p);
|
||||
|
||||
heights[0] = lengths[1] * Math.sin(deg2rad(sideAngle));
|
||||
heights[1] = lengths[0] * Math.sin(deg2rad(baseAngle));
|
||||
return {
|
||||
radius: radius,
|
||||
heights: heights,
|
||||
lengths: lengths
|
||||
};
|
||||
}
|
||||
|
||||
function updateCheckboxes() {
|
||||
outputFields["radius"] = elements.outputR.checked;
|
||||
outputFields["heights"] = elements.outputH.checked;
|
||||
outputFields["lengths"] = elements.outputL.checked;
|
||||
let ret = !outputFields.radius && !outputFields.heights && !outputFields.lengths;
|
||||
if (ret) {
|
||||
setErrTooltip(4, "Выберите хотя бы один параметр для вывода.");
|
||||
} else {
|
||||
setErrTooltip(4, "");
|
||||
}
|
||||
updateCalculateButton();
|
||||
}
|
||||
|
||||
function updateCalculateButton() {
|
||||
let ret = false;
|
||||
if (currentModeIsA) {
|
||||
ret = inputsA["l"] !== null && inputsA["angle"] !== null
|
||||
}
|
||||
else {
|
||||
ret = inputsB["l"] !== null && inputsB["angle"] !== null
|
||||
}
|
||||
ret &= elements.outputR.checked || elements.outputH.checked || elements.outputL.checked;
|
||||
|
||||
elements.calculateButton.disabled = !ret;
|
||||
}
|
||||
|
||||
function switchInputs(selectA) {
|
||||
if (selectA) {
|
||||
elements.imageA.classList.remove("hidden");
|
||||
elements.imageB.classList.add("hidden");
|
||||
elements.fieldsetA.classList.remove("hidden");
|
||||
elements.fieldsetB.classList.add("hidden");
|
||||
}
|
||||
else {
|
||||
elements.imageA.classList.add("hidden");
|
||||
elements.imageB.classList.remove("hidden");
|
||||
elements.fieldsetA.classList.add("hidden");
|
||||
elements.fieldsetB.classList.remove("hidden");
|
||||
}
|
||||
updateCalculateButton();
|
||||
}
|
||||
|
||||
function displayTable(calcResults) {
|
||||
let table = elements.outputsTable;
|
||||
table.innerHTML = ""; // Clear previous content
|
||||
|
||||
let header = "<tr><th>Параметр</th><th>Значение</th></tr>";
|
||||
let rows = "";
|
||||
|
||||
if (outputFields.radius) {
|
||||
rows += `<tr><td>R</td><td>${calcResults.radius.toFixed(3)}</td></tr>`;
|
||||
}
|
||||
if (outputFields.heights) {
|
||||
rows += `<tr><td>h1</td><td>${calcResults.heights[0].toFixed(3)}</td></tr>`;
|
||||
rows += `<tr><td>h2</td><td>${calcResults.heights[1].toFixed(3)}</td></tr>`;
|
||||
}
|
||||
if (outputFields.lengths) {
|
||||
rows += `<tr><td>A</td><td>${calcResults.lengths[0].toFixed(3)}</td></tr>`;
|
||||
rows += `<tr><td>B</td><td>${calcResults.lengths[1].toFixed(3)}</td></tr>`;
|
||||
}
|
||||
table.innerHTML = header + rows;
|
||||
|
||||
if (rows === "") {
|
||||
table.innerHTML = `<h3>Выберите параметры для вычислений, сейчас таблица пустая</h3>`;
|
||||
}
|
||||
|
||||
table.classList.remove("hidden");
|
||||
|
||||
}
|
||||
|
||||
function clearCurrentInputs() {
|
||||
if (currentModeIsA) {
|
||||
elements.equalSideLength.value = null;
|
||||
elements.baseAngle.value = null;
|
||||
setErrTooltip(0, "");
|
||||
setErrTooltip(1, "");
|
||||
inputsA = {
|
||||
l: null,
|
||||
angle: null
|
||||
};
|
||||
}
|
||||
else {
|
||||
inputsB = {
|
||||
l: null,
|
||||
angle: null
|
||||
};
|
||||
setErrTooltip(2, "");
|
||||
setErrTooltip(3, "");
|
||||
elements.baseSideLength.value = null;
|
||||
elements.baseAdjacentAngle.value = null;
|
||||
}
|
||||
elements.outputsTable.classList.add("hidden");
|
||||
updateCalculateButton()
|
||||
}
|
||||
|
||||
function check180Angle(angleString) {
|
||||
let angle = parseFloat(angleString);
|
||||
if (isNaN(angle)) {
|
||||
return "Введите корректное число";
|
||||
}
|
||||
if (angle <= 0) {
|
||||
return "Угол должен быть больше 0";
|
||||
}
|
||||
if (angle >= 180) {
|
||||
return "Угол должен быть меньше 180";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
function check90Angle(angleString) {
|
||||
let angle = parseFloat(angleString);
|
||||
if (isNaN(angle)) {
|
||||
return "Введите корректное число";
|
||||
}
|
||||
if (angle <= 0) {
|
||||
return "Угол должен быть больше 0";
|
||||
}
|
||||
if (angle >= 90) {
|
||||
return "Угол должен быть меньше 90";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
function checkLength(lengthString) {
|
||||
let length = parseFloat(lengthString);
|
||||
if (!isFinite(length)) {
|
||||
return "Введите корректное число";
|
||||
}
|
||||
if (length <= 0) {
|
||||
return "Длина должна быть больше 0";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
function handleSwitchInputs(event) {
|
||||
if (event.target.id[event.target.id.length - 1].toLowerCase() == "a") {
|
||||
currentModeIsA = true;
|
||||
switchInputs(true);
|
||||
console.log("Switching inputs to A");
|
||||
}
|
||||
else {
|
||||
currentModeIsA = false;
|
||||
switchInputs(false);
|
||||
console.log("Switching inputs to B");
|
||||
}
|
||||
}
|
||||
|
||||
function handleInputsUpdate(event) {
|
||||
switch (event.target.id) {
|
||||
case "equalSideLength":
|
||||
{
|
||||
const err = checkLength(event.target.value);
|
||||
setErrTooltip(0, err);
|
||||
if (err === "") {
|
||||
inputsA.l = parseFloat(event.target.value);
|
||||
} else {
|
||||
inputsA.l = null;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "baseAngle":
|
||||
{
|
||||
const err = check180Angle(event.target.value);
|
||||
setErrTooltip(1, err);
|
||||
if (err === "") {
|
||||
inputsA.angle = parseFloat(event.target.value);
|
||||
} else {
|
||||
inputsA.angle = null;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "baseSideLength":
|
||||
{
|
||||
const err = checkLength(event.target.value);
|
||||
setErrTooltip(2, err);
|
||||
if (err === "") {
|
||||
inputsB.l = parseFloat(event.target.value);
|
||||
} else {
|
||||
inputsB.l = null;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "baseAdjacentAngle":
|
||||
{
|
||||
const err = check90Angle(event.target.value);
|
||||
setErrTooltip(3, err);
|
||||
if (err === "") {
|
||||
inputsB.angle = parseFloat(event.target.value);
|
||||
} else {
|
||||
inputsB.angle = null;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
console.log(event.target.id)
|
||||
break;
|
||||
}
|
||||
updateCalculateButton();
|
||||
|
||||
}
|
||||
|
||||
function handleFieldsetEvent(event) {
|
||||
if (event.target.type === 'radio') {
|
||||
handleSwitchInputs(event);
|
||||
} else if (event.target.type === 'number') {
|
||||
handleInputsUpdate(event);
|
||||
}
|
||||
}
|
||||
elements.inputsForm.addEventListener('change', handleFieldsetEvent);
|
||||
elements.inputsForm.addEventListener('input', handleFieldsetEvent);
|
||||
|
||||
elements.outputsFieldset.addEventListener('change', (event) => {
|
||||
if (event.target.type === 'checkbox') {
|
||||
updateCheckboxes();
|
||||
}
|
||||
});
|
||||
|
||||
elements.clearButton.addEventListener('click', (event) => {
|
||||
event.preventDefault();
|
||||
clearCurrentInputs()
|
||||
});
|
||||
|
||||
elements.calculateButton.addEventListener('click', (event) => {
|
||||
event.preventDefault();
|
||||
displayTable(getCalculations());
|
||||
});
|
||||
|
||||
|
||||
// чтобы не сконфузило
|
||||
updateCheckboxes();
|
||||
switchInputs(elements.radioA.checked);
|
||||
BIN
old/hw/hw7/imgs/type1.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
old/hw/hw7/imgs/type2.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
1
old/labs/fake-lab5/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
node_modules
|
||||
6695
old/labs/fake-lab5/package-lock.json
generated
Normal file
30
old/labs/fake-lab5/package.json
Normal file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "template_pug",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"build": "webpack --mode production",
|
||||
"serve": "webpack serve --open --mode development",
|
||||
"dev": "webpack --mode development",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"devDependencies": {
|
||||
"chokidar": "^4.0.3",
|
||||
"css-loader": "^6.8.1",
|
||||
"filemanager-webpack-plugin": "^8.0.0",
|
||||
"glob": "^11.0.3",
|
||||
"html-webpack-plugin": "^5.5.3",
|
||||
"pug": "^2.0.4",
|
||||
"pug-loader": "^2.4.0",
|
||||
"style-loader": "^3.3.3",
|
||||
"stylus": "^0.61.0",
|
||||
"stylus-loader": "^7.1.3",
|
||||
"webpack": "^5.89.0",
|
||||
"webpack-cli": "^5.1.4",
|
||||
"webpack-dev-server": "^4.15.1"
|
||||
}
|
||||
}
|
||||
36
old/labs/fake-lab5/src/components/data.pug
Normal file
@@ -0,0 +1,36 @@
|
||||
block variables
|
||||
- var title = 'Самые высокие здания и сооружения'
|
||||
-
|
||||
var dictMenu = {'Главная': 'index.html',
|
||||
'Небоскребы' : "#",
|
||||
'Башни': "#",
|
||||
'Список': "#"
|
||||
}
|
||||
|
||||
- var listImages = ['image1.jpg', 'image2.jpg', 'image3.jpg', 'image4.jpg', 'image5.jpg']
|
||||
|
||||
-
|
||||
var listSections = [
|
||||
{'header' : 'Бурдж-Халифа в Дубае, ОАЭ',
|
||||
'image' : 'image7.jpg',
|
||||
'text' : 'Небоскрёб высотой 828 метров, самое высокое сооружение в мире. Форма здания напоминает сталагмит.'
|
||||
},
|
||||
{'header' : 'Токийское небесное дерево, Япония',
|
||||
'image' : 'image6.jpg',
|
||||
'text' : 'Телевизионная башня в районе Сумида самая высокая среди телебашен мира. Высота телебашни вместе с антенной составляет 634 метра.'
|
||||
},
|
||||
{'header' : 'CN Tower, Канада',
|
||||
'image' : 'image8.jpg',
|
||||
'text' : 'Си-Эн Тауэр — самое высокое свободно стоящее сооружение в мире с 1976 по 2007 год. Его высота составляет 553,33 метра.'
|
||||
}
|
||||
]
|
||||
-
|
||||
var structures = [
|
||||
{
|
||||
menuItem: "Ворота Запада, США",
|
||||
pict: "image1_big.jpg",
|
||||
firstP: `Арка в Сент-Луисе, также известная под именем «Врата на запад» — мемориал, являющийся частью Джефферсоновского национального экспансиального мемориала, а также визитной карточкой Сент-Луиса, штат Миссури, США.`,
|
||||
secondP: `Арка была спроектирована финско-американским архитектором Ээро Саариненом в 1947 году. Её высота 192 метра в самой высокой точке, ширина её основания также 192 метра.
|
||||
Таким образом арка является самым высоким памятником на территории США. Её строительство началось 12 февраля 1963 года и было закончено 28 октября 1965 года. Памятник открылся для посетителей 24 июля 1967 года.`
|
||||
}
|
||||
]
|
||||
20
old/labs/fake-lab5/src/components/mixin.pug
Normal file
@@ -0,0 +1,20 @@
|
||||
include ../components/data.pug
|
||||
|
||||
mixin createMenu(menu, active)
|
||||
each value, key in menu
|
||||
if active == key
|
||||
a.active(href= value)= key
|
||||
else
|
||||
a(href= value)= key
|
||||
|
||||
mixin createMenuBuild(menu, active)
|
||||
each value, key in menu
|
||||
a(href= value)= key
|
||||
a.active(href= "")= active
|
||||
mixin createSection()
|
||||
each item in listSections
|
||||
section
|
||||
h3= item.header
|
||||
img(src= require("../images/" + item.image))
|
||||
p= item.text
|
||||
a(href="#") …
|
||||
BIN
old/labs/fake-lab5/src/images/image1.jpg
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
old/labs/fake-lab5/src/images/image1_big.jpg
Normal file
|
After Width: | Height: | Size: 162 KiB |
BIN
old/labs/fake-lab5/src/images/image2.jpg
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
old/labs/fake-lab5/src/images/image3.jpg
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
old/labs/fake-lab5/src/images/image4.jpg
Normal file
|
After Width: | Height: | Size: 35 KiB |
BIN
old/labs/fake-lab5/src/images/image5.jpg
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
old/labs/fake-lab5/src/images/image6.jpg
Normal file
|
After Width: | Height: | Size: 27 KiB |
BIN
old/labs/fake-lab5/src/images/image7.jpg
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
old/labs/fake-lab5/src/images/image8.jpg
Normal file
|
After Width: | Height: | Size: 28 KiB |