From dd645cb5cd77c2738424e445587407b4bf97250c Mon Sep 17 00:00:00 2001 From: Błażej Kardyś Date: Tue, 7 Apr 2020 22:36:16 +0200 Subject: Moving search-component inside core project --- core/build.gradle.kts | 4 +- core/search-component/.gitignore | 3 + core/search-component/build.gradle.kts | 18 +++++ core/search-component/package.json | 80 ++++++++++++++++++++++ core/search-component/postcss.config.js | 17 +++++ .../src/main/js/search/app-root.js | 13 ++++ core/search-component/src/main/js/search/app.css | 21 ++++++ core/search-component/src/main/js/search/app.js | 41 +++++++++++ core/search-component/src/main/js/search/search.js | 52 ++++++++++++++ core/search-component/stylelint.config.js | 4 ++ core/search-component/webpack.config.js | 62 +++++++++++++++++ 11 files changed, 313 insertions(+), 2 deletions(-) create mode 100644 core/search-component/.gitignore create mode 100644 core/search-component/build.gradle.kts create mode 100644 core/search-component/package.json create mode 100644 core/search-component/postcss.config.js create mode 100644 core/search-component/src/main/js/search/app-root.js create mode 100644 core/search-component/src/main/js/search/app.css create mode 100644 core/search-component/src/main/js/search/app.js create mode 100644 core/search-component/src/main/js/search/search.js create mode 100644 core/search-component/stylelint.config.js create mode 100644 core/search-component/webpack.config.js (limited to 'core') diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 2ea57e09..bcc74480 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -25,9 +25,9 @@ val sourceJar by tasks.registering(Jar::class) { } task("copy_search", Copy::class) { - from(File(project(":search-component").projectDir, "dist/")) + from(File(project(":core:search-component").projectDir, "dist/")) destinationDir = File(sourceSets.main.get().resources.sourceDirectories.singleFile, "dokka/scripts") -}.dependsOn(":search-component:generateSearchFiles") +}.dependsOn(":core:search-component:generateSearchFiles") tasks { processResources { diff --git a/core/search-component/.gitignore b/core/search-component/.gitignore new file mode 100644 index 00000000..9220c11f --- /dev/null +++ b/core/search-component/.gitignore @@ -0,0 +1,3 @@ +/dist/ +/node_modules/ +/package-lock.json diff --git a/core/search-component/build.gradle.kts b/core/search-component/build.gradle.kts new file mode 100644 index 00000000..ce747c5e --- /dev/null +++ b/core/search-component/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("com.moowork.node") version "1.3.1" +} + +task("generateSearchFiles") { + dependsOn("npm_install", "npm_run_build") +} + +tasks { + "npm_run_build" { + inputs.dir("$projectDir/src/main/js/search/") + inputs.files("$projectDir/package.json", "$projectDir/webpack.config.js") + outputs.dir("$projectDir/dist/") + } + clean { + delete = setOf("$projectDir/node_modules", "$projectDir/dist/", "$projectDir/package-lock.json") + } +} \ No newline at end of file diff --git a/core/search-component/package.json b/core/search-component/package.json new file mode 100644 index 00000000..fa997c44 --- /dev/null +++ b/core/search-component/package.json @@ -0,0 +1,80 @@ +{ + "name": "search", + "version": "1.0.0", + "private": true, + "config": { + "components": "./src/main/js/search", + "dist": "./dist" + }, + "scripts": { + "create-component": "yo @jetbrains/ring-ui:react --path $npm_package_config_components", + "build": "webpack --mode=production --devtool sourcemap", + "test": "karma start", + "lint": "eslint . && npm run stylelint", + "stylelint": "stylelint --ignore-path .gitignore **/*.css", + "ci-test": "npm run lint && xvfb-maybe karma start --teamcity", + "start": "webpack-dev-server -d --history-api-fallback --inline --hot --colors --port 9010" + }, + "babel": { + "presets": [ + [ + "@jetbrains/jetbrains", + { + "useBuiltIns": "usage" + } + ] + ] + }, + "dependencies": { + "@babel/core": "^7.8.3", + "@jetbrains/babel-preset-jetbrains": "^2.1.4", + "@jetbrains/icons": "3.6.0", + "@jetbrains/logos": "1.1.5", + "@jetbrains/ring-ui": "2.1.16", + "babel-loader": "^8.0.6", + "copy-webpack-plugin": "^5.1.1", + "css-loader": "^3.4.2", + "json-loader": "^0.5.7", + "postcss-import": "^12.0.1", + "postcss-loader": "^3.0.0", + "postcss-preset-env": "^6.7.0", + "prop-types": "^15.7.2", + "react": "^16.12.0", + "react-dom": "^16.12.0", + "redbox-react": "^1.6.0", + "webpack": "^4.41.5", + "webpack-cli": "^3.3.10", + "webpack-dev-server": "^3.10.1" + }, + "devDependencies": { + "@jetbrains/generator-ring-ui": "2.0.53", + "@jetbrains/eslint-config": "^4.0.6", + "@jetbrains/stylelint-config": "^2.0.0", + "babel-eslint": "^10.0.3", + "chai": "^4.2.0", + "chai-as-promised": "^7.1.1", + "chai-dom": "^1.8.1", + "chai-enzyme": "1.0.0-beta.1", + "electron": "^7.1.9", + "enzyme": "^3.11.0", + "enzyme-adapter-react-16": "^1.15.2", + "eslint": "^6.8.0", + "karma": "^4.4.1", + "karma-chai-plugins": "^0.9.0", + "karma-electron": "^6.3.0", + "karma-mocha": "^1.3.0", + "karma-sourcemap-loader": "^0.3.7", + "karma-teamcity-reporter": "^1.1.0", + "karma-webpack": "^4.0.2", + "mocha": "^6.2.2", + "react-test-renderer": "^16.12.0", + "sinon": "^8.0.4", + "sinon-chai": "^3.4.0", + "stylelint": "^12.0.1", + "xvfb-maybe": "^0.2.1", + "yo": "^3.1.1" + }, + "engines": { + "node": ">=8.0.0" + } +} diff --git a/core/search-component/postcss.config.js b/core/search-component/postcss.config.js new file mode 100644 index 00000000..ce65774e --- /dev/null +++ b/core/search-component/postcss.config.js @@ -0,0 +1,17 @@ +module.exports = () => ({ + plugins: [ + require('postcss-import'), + require('postcss-preset-env')({ + features: { + stage: 3, // See https://cssdb.org/#staging-process + importFrom: require.resolve('@jetbrains/ring-ui/components/global/variables.css'), + features: { + 'nesting-rules': true, + 'custom-properties': { + preserve: true + } + } + } + }) + ] +}); diff --git a/core/search-component/src/main/js/search/app-root.js b/core/search-component/src/main/js/search/app-root.js new file mode 100644 index 00000000..25a374a5 --- /dev/null +++ b/core/search-component/src/main/js/search/app-root.js @@ -0,0 +1,13 @@ +import React, {Component} from 'react'; +import {WithFuzzySearchFilter} from './search'; +import './app.css'; + +export default class AppRoot extends Component { + render() { + return ( +
+ +
+ ); + } +} \ No newline at end of file diff --git a/core/search-component/src/main/js/search/app.css b/core/search-component/src/main/js/search/app.css new file mode 100644 index 00000000..933237e0 --- /dev/null +++ b/core/search-component/src/main/js/search/app.css @@ -0,0 +1,21 @@ +@import "@jetbrains/ring-ui/components/global/variables.css"; + +html, +.app-root { + height: 100%; +} + +.search-root { + margin: 0; + padding: 0; + + background: var(--ring-content-background-color); + + font-family: var(--ring-font-family); + font-size: var(--ring-font-size); + line-height: var(--ring-line-height); +} + +.search-content { + margin: calc(var(--ring-unit) * 4); +} diff --git a/core/search-component/src/main/js/search/app.js b/core/search-component/src/main/js/search/app.js new file mode 100644 index 00000000..64091607 --- /dev/null +++ b/core/search-component/src/main/js/search/app.js @@ -0,0 +1,41 @@ +import React from 'react'; +import {render} from 'react-dom'; +import RedBox from 'redbox-react'; + +import AppRoot from './app-root'; +import './app.css'; + +const appEl = document.getElementById('searchBar'); +const rootEl = document.createElement('div'); + +let renderApp = () => { + render( + , + rootEl + ); +}; + +if (module.hot) { + const renderAppHot = renderApp; + const renderError = error => { + render( + , + rootEl + ); + }; + + renderApp = () => { + try { + renderAppHot(); + } catch (error) { + renderError(error); + } + }; + + module.hot.accept('./app-root', () => { + setTimeout(renderApp); + }); +} + +renderApp(); +appEl.appendChild(rootEl); diff --git a/core/search-component/src/main/js/search/search.js b/core/search-component/src/main/js/search/search.js new file mode 100644 index 00000000..a742f11d --- /dev/null +++ b/core/search-component/src/main/js/search/search.js @@ -0,0 +1,52 @@ +import React, {Component} from 'react'; +import Select from '@jetbrains/ring-ui/components/select/select'; +import '@jetbrains/ring-ui/components/input-size/input-size.scss'; + +class WithFuzzySearchFilterComponent extends Component { + constructor(props) { + super(props); + this.state = {selected: props.data[0]}; + } + + clearSelection = () => { + this.setState({selected: null}); + }; + + onSelect = option => { + window.location.href = `${window.pathToRoot}${option.location}?query${option.name}`; + this.setState({selected: option}); + debugger + }; + + render() { + return ( +
+
+