diff --git a/.prettierrc.json b/.prettierrc.json index 0e1b252..bc79b5e 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -5,7 +5,7 @@ "singleQuote": true, "bracketSpacing": true, "bracketSameLine": false, - "printWidth": 90, + "printWidth": 100, "arrowParens": "always", "endOfLine": "lf" } diff --git a/readme.md b/readme.md index f03312d..8602b66 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,13 @@ -## WEBPACK +## Задание #1 -- npm init | npm init -y // Инициализаця проекта, начальные установки package.json -- npm install webpack webpack-cli --save-dev -- создать конфигурационный файл - webpack.config.js +### Переведите свой проект, выполненный в модуле Webpack, на TypeScript. + +- Примечание: для работы картинок и аудио нужно будет создать специальный файл (подробнее в документации) \* + +Как сдавать задание: + +Выполните задание и прикрепите ссылку на git-репозиторий в форме отправки ответа. + +В текстовом поле — опишите свои действия по выполнению задания в несколько предложений, раскрывая основные действия и логику. + +Оцените время на выполнение данного задания, и далее проследите за временем, которое вы потратите на разработку. Укажите в ответе свое итоговое время на выполнение. diff --git a/src/index.js b/src/index.js deleted file mode 100644 index 792f651..0000000 --- a/src/index.js +++ /dev/null @@ -1,98 +0,0 @@ -import './index.scss'; - -import summerBg from './assets/summer-bg.jpg'; -import rainyBg from './assets/rainy-bg.jpg'; -import winterBg from './assets/winter-bg.jpg'; -import urlSunIcon from './assets/icons/sun.svg'; -import urlRainIcon from './assets/icons/cloud-rain.svg'; -import urlSnowIcon from './assets/icons/cloud-snow.svg'; -import urlPauseIcon from './assets/icons/pause.svg'; -import urlSunAudio from './assets/sounds/summer.mp3'; -import urlRainAudio from './assets/sounds/rain.mp3'; -import urlSnowAudio from './assets/sounds/winter.mp3'; - -let isPlay = false; -let isChooseSun = false; -let isChooseRain = false; -let isChooseSnow = false; -const body = document.body; -const main = body.querySelector('main'); -const background = main.querySelector('.background'); -const content = main.querySelector('.content'); -const buttons = content.querySelector('.buttons'); -const summerButton = buttons.querySelector('.summer'); -const sunIcon = summerButton.querySelector('.sun'); -const rainyButton = buttons.querySelector('.rainy'); -const rainIcon = rainyButton.querySelector('.rain'); -const winterButton = buttons.querySelector('.winter'); -const snowIcon = winterButton.querySelector('.snow'); -const volumeControl = content.querySelector('.volume_control'); - -const audio = new Audio(); - -changeBackground([summerBg, rainyBg, winterBg][Math.round(Math.random() * 2)]); - -function returnIcon() { - sunIcon.style.backgroundImage = `url(${urlSunIcon})`; - rainIcon.style.backgroundImage = `url(${urlRainIcon})`; - snowIcon.style.backgroundImage = `url(${urlSnowIcon})`; -} -function isChooseReset() { - isChooseSun = false; - isChooseRain = false; - isChooseSnow = false; -} - -function changeBackground(image) { - background.style.backgroundImage = `url(${image})`; - returnIcon(); -} - -const audioPlayerControl = (urlSound, isChoose, icon, urlIcon) => { - audio.src = urlSound; - if (isChoose) { - if (isPlay) { - iconChange(icon, urlIcon); - audio.pause(); - isPlay = false; - } else { - iconChange(icon, urlPauseIcon); - audio.play(); - isPlay = true; - } - } else { - returnIcon(); - iconChange(icon, urlPauseIcon); - audio.play(); - isPlay = true; - } -}; - -function iconChange(icon, urlIcon) { - icon.style.backgroundImage = `url(${urlIcon})`; -} - -summerButton.addEventListener('click', () => { - changeBackground(summerBg); - audioPlayerControl(urlSunAudio, isChooseSun, sunIcon, urlSunIcon); - isChooseReset(); - isChooseSun = true; -}); - -rainyButton.addEventListener('click', () => { - changeBackground(rainyBg); - audioPlayerControl(urlRainAudio, isChooseRain, rainIcon, urlRainIcon); - isChooseReset(); - isChooseRain = true; -}); - -winterButton.addEventListener('click', () => { - changeBackground(winterBg); - audioPlayerControl(urlSnowAudio, isChooseSnow, snowIcon, urlSnowIcon); - isChooseReset(); - isChooseSnow = true; -}); - -volumeControl.addEventListener('input', () => { - audio.volume = volumeControl.value; -}); diff --git a/src/index.ts b/src/index.ts new file mode 100644 index 0000000..23a0297 --- /dev/null +++ b/src/index.ts @@ -0,0 +1,105 @@ +require('./index.scss'); + +const summerBg: URL = require('./assets/summer-bg.jpg'); +const rainyBg: URL = require('./assets/rainy-bg.jpg'); +const winterBg: URL = require('./assets/winter-bg.jpg'); +const urlSunIcon: URL = require('./assets/icons/sun.svg'); +const urlRainIcon: URL = require('./assets/icons/cloud-rain.svg'); +const urlSnowIcon: URL = require('./assets/icons/cloud-snow.svg'); +const urlPauseIcon: URL = require('./assets/icons/pause.svg'); +const urlSunAudio: URL = require('./assets/sounds/summer.mp3'); +const urlRainAudio: URL = require('./assets/sounds/rain.mp3'); +const urlSnowAudio: URL = require('./assets/sounds/winter.mp3'); + +let isPlay: boolean = false; +let isChooseSun: boolean = false; +let isChooseRain: boolean = false; +let isChooseSnow: boolean = false; +const body = document.body as HTMLElement; // один из вариантов определения типа для: const body +const main: HTMLElement = body.querySelector('main')!; +const background: HTMLElement | null = main.querySelector('.background')!; +const content: HTMLElement | null = main.querySelector('.content'); +const buttons: HTMLElement | null = main.querySelector('.buttons'); +const summerButton: HTMLElement | null = main.querySelector('.summer'); +const sunIcon: HTMLElement | null = main!.querySelector('.sun'); +const rainyButton: HTMLElement | null = main.querySelector('.rainy'); +const rainIcon: HTMLElement | null = main.querySelector('.rain'); +const winterButton: HTMLElement | null = main.querySelector('.winter'); +const snowIcon: HTMLElement | null = main.querySelector('.snow'); +const volumeControl = main.querySelector('.volume_control') as HTMLInputElement; + +const audio: HTMLAudioElement = new Audio(); + +changeBackground([summerBg, rainyBg, winterBg][Math.round(Math.random() * 2)]); + +function returnIcon(): void { + sunIcon!.style.backgroundImage = `url(${urlSunIcon})`; + rainIcon!.style.backgroundImage = `url(${urlRainIcon})`; + snowIcon!.style.backgroundImage = `url(${urlSnowIcon})`; +} +function isChooseReset(): void { + isChooseSun = false; + isChooseRain = false; + isChooseSnow = false; +} + +function changeBackground(image: URL): void { + background!.style.backgroundImage = `url(${image})`; + returnIcon(); +} + +function audioPlayerControl( + urlSound: URL, + isChoose: boolean, + icon: HTMLElement, + urlIcon: URL, +): void { + if (audio) { + audio.src = `${urlSound}`; + } + if (isChoose) { + if (isPlay) { + iconChange(icon, urlIcon); + audio.pause(); + isPlay = false; + } else { + iconChange(icon, urlPauseIcon); + audio.play(); + isPlay = true; + } + } else { + returnIcon(); + iconChange(icon, urlPauseIcon); + audio.play(); + isPlay = true; + } +} + +function iconChange(icon: HTMLElement, urlIcon: URL): void { + icon.style.backgroundImage = `url(${urlIcon})`; +} + +summerButton?.addEventListener('click', () => { + changeBackground(summerBg); + audioPlayerControl(urlSunAudio, isChooseSun, sunIcon!, urlSunIcon); + isChooseReset(); + isChooseSun = true; +}); + +rainyButton?.addEventListener('click', () => { + changeBackground(rainyBg); + audioPlayerControl(urlRainAudio, isChooseRain, rainIcon!, urlRainIcon); + isChooseReset(); + isChooseRain = true; +}); + +winterButton?.addEventListener('click', () => { + changeBackground(winterBg); + audioPlayerControl(urlSnowAudio, isChooseSnow, snowIcon!, urlSnowIcon); + isChooseReset(); + isChooseSnow = true; +}); + +volumeControl.addEventListener('input', () => { + audio!.volume = Number(volumeControl.value); +}); diff --git a/tsconfig.json b/tsconfig.json index 6a7de3f..2b7e0b7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,113 @@ { "compilerOptions": { - "outDir": "./dist/", - "noImplicitAny": true, - "module": "es6", - "target": "es5", - "jsx": "react", - "allowJs": true, - "moduleResolution": "node" + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2022" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "commonjs" /* Specify what module code is generated. */, + // "rootDir": "./src", /* Specify the root folder within your source files. */ + "moduleResolution": "node10" /* Specify how TypeScript looks up a file from a given module specifier. */, + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + "resolveJsonModule": true /* Enable importing .json files. */, + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + "sourceMap": true /* Create source map files for emitted JavaScript files. */, + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "./dist" /* Specify an output folder for all emitted files. */, + "removeComments": true /* Disable emitting comments. */, + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, + + /* Type Checking */ + "strict": true /* Enable all strict type-checking options. */, + "noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */, + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + "noImplicitOverride": true /* Ensure overriding members in derived classes are marked with an override modifier. */, + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ } -} \ No newline at end of file + // "files": ["src/index.ts"], + // "include": ["./src/**/*.ts"] + // "exclude": ["./tech/**/*.ts"], + // "extends": "./path/to/base/tsconfig.json" +} diff --git a/webpack.config.common.js b/webpack.config.common.js index 5a491a7..6e715a2 100644 --- a/webpack.config.common.js +++ b/webpack.config.common.js @@ -5,7 +5,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); module.exports = { context: path.resolve(__dirname, 'src'), - entry: './index.js', + entry: './index.ts', output: { filename: '[name].[contenthash].bundle.js', path: path.resolve(__dirname, 'dist'),