move 2 brojs #28
							
								
								
									
										2
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							| @ -1,7 +1,7 @@ | |||||||
| pipeline { | pipeline { | ||||||
|   agent { |   agent { | ||||||
|     docker { |     docker { | ||||||
|       image 'node:18' |       image 'node:20' | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -19,7 +19,7 @@ npm install | |||||||
| пропишите в hosts строку | пропишите в hosts строку | ||||||
| 
 | 
 | ||||||
| ``` | ``` | ||||||
| 127.0.0.1 ift-b1.kc.inno-js.test | 127.0.0.1 journal.test | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| ## Запуск | ## Запуск | ||||||
| @ -28,4 +28,4 @@ npm install | |||||||
| npm start | npm start | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| откройте в браузере [проект](http://ift-b1.kc.inno-js.test) | откройте в браузере [проект](http://journal.test) | ||||||
							
								
								
									
										4734
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										4734
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										21
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								package.json
									
									
									
									
									
								
							| @ -1,31 +1,31 @@ | |||||||
| { | { | ||||||
|     "name": "journal.pl", |     "name": "journal.pl", | ||||||
|     "version": "2.4.5", |     "version": "2.4.5", | ||||||
|     "description": "inno-js platform journal ui repo", |     "description": "bro-js platform journal ui repo", | ||||||
|     "main": "./src/index.tsx", |     "main": "./src/index.tsx", | ||||||
|     "scripts": { |     "scripts": { | ||||||
|         "start": "start chrome http://ift-b1.kc.inno-js.test/journal.pl & ijl-cli server --port=80", |         "start": "brojs server --port=8099 --with-open-browser", | ||||||
|         "build": "npm run clean && ijl-cli build --dev", |         "build": "npm run clean && brojs build --dev", | ||||||
|         "build:prod": "npm run clean && ijl-cli build", |         "build:prod": "npm run clean && brojs build", | ||||||
|         "clean": "rimraf dist", |         "clean": "rimraf dist", | ||||||
|         "test": "echo ok", |         "test": "echo ok", | ||||||
|         "eslint": "npx eslint ." |         "eslint": "npx eslint ." | ||||||
|     }, |     }, | ||||||
|     "repository": { |     "repository": { | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "ssh://git@85.143.175.152:10022/omni-tech/journal.pl.git" |         "url": "ssh://git@85.143.175.152:222/bro-js/journal.pl.git" | ||||||
|     }, |     }, | ||||||
|     "keywords": [], |     "keywords": [], | ||||||
|     "author": "", |     "author": "", | ||||||
|     "license": "MIT", |     "license": "MIT", | ||||||
|     "devDependencies": { |     "devDependencies": { | ||||||
|         "@ijl/cli": "^5.0.3", |  | ||||||
|         "@typescript-eslint/eslint-plugin": "^7.4.0", |         "@typescript-eslint/eslint-plugin": "^7.4.0", | ||||||
|         "@typescript-eslint/parser": "^7.4.0", |         "@typescript-eslint/parser": "^7.4.0", | ||||||
|         "eslint": "^8.57.0", |         "eslint": "^8.57.0", | ||||||
|         "eslint-plugin-react": "^7.34.1" |         "eslint-plugin-react": "^7.34.1" | ||||||
|     }, |     }, | ||||||
|     "dependencies": { |     "dependencies": { | ||||||
|  |         "@brojs/cli": "^0.0.4-alpha.9", | ||||||
|         "@chakra-ui/icons": "^2.1.1", |         "@chakra-ui/icons": "^2.1.1", | ||||||
|         "@chakra-ui/react": "^2.8.2", |         "@chakra-ui/react": "^2.8.2", | ||||||
|         "@emotion/react": "^11.11.4", |         "@emotion/react": "^11.11.4", | ||||||
| @ -35,18 +35,19 @@ | |||||||
|         "@types/react": "^18.2.60", |         "@types/react": "^18.2.60", | ||||||
|         "@types/react-dom": "^18.2.19", |         "@types/react-dom": "^18.2.19", | ||||||
|         "dayjs": "^1.11.10", |         "dayjs": "^1.11.10", | ||||||
|         "express": "^4.18.2", |         "express": "^4.19.2", | ||||||
|         "js-sha256": "^0.11.0", |         "js-sha256": "^0.11.0", | ||||||
|         "keycloak-js": "^23.0.7", |         "keycloak-js": "^23.0.7", | ||||||
|         "prettier": "^3.2.5", |         "prettier": "^3.2.5", | ||||||
|         "qrcode": "^1.5.3", |         "qrcode": "^1.5.3", | ||||||
|         "react": "^18.2.0", |         "react": "^18.3.1", | ||||||
|         "react-dom": "^18.2.0", |         "react-dom": "^18.3.1", | ||||||
|         "react-helmet": "^6.1.0", |         "react-helmet": "^6.1.0", | ||||||
|         "react-hook-form": "^7.51.2", |         "react-hook-form": "^7.51.2", | ||||||
|         "react-redux": "^9.1.0", |         "react-redux": "^9.1.0", | ||||||
|         "react-router-dom": "^6.22.1", |         "react-router-dom": "^6.22.1", | ||||||
|         "redux": "^5.0.1", |         "redux": "^5.0.1", | ||||||
|         "typescript": "^5.3.3" |         "typescript": "^5.3.3", | ||||||
|  |         "webpack-hot-middleware": "^2.26.1" | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,5 +1,5 @@ | |||||||
| import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react' | import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react' | ||||||
| import { getConfigValue } from '@ijl/cli' | import { getConfigValue } from '@brojs/cli' | ||||||
| 
 | 
 | ||||||
| import { keycloak } from '../kc' | import { keycloak } from '../kc' | ||||||
| import { | import { | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| import React, { useEffect, Suspense } from 'react' | import React, { useEffect, Suspense } from 'react' | ||||||
| import { Routes, Route, useNavigate } from 'react-router-dom' | import { Routes, Route, useNavigate } from 'react-router-dom' | ||||||
| import { Provider } from 'react-redux' | import { Provider } from 'react-redux' | ||||||
| import { getNavigationsValue } from '@ijl/cli' | import { getNavigationsValue } from '@brojs/cli' | ||||||
| import { Box, Container, Spinner, VStack } from '@chakra-ui/react' | import { Box, Container, Spinner, VStack } from '@chakra-ui/react' | ||||||
| 
 | 
 | ||||||
| import { | import { | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| import React, { useCallback, useEffect, useRef, useState } from 'react' | import React, { useCallback, useEffect, useRef, useState } from 'react' | ||||||
| import dayjs from 'dayjs' | import dayjs from 'dayjs' | ||||||
| import { Link as ConnectedLink } from 'react-router-dom' | import { Link as ConnectedLink } from 'react-router-dom' | ||||||
| import { getNavigationsValue } from '@ijl/cli' | import { getNavigationsValue } from '@brojs/cli' | ||||||
| import { | import { | ||||||
|   Box, |   Box, | ||||||
|   CardHeader, |   CardHeader, | ||||||
|  | |||||||
| @ -3,7 +3,7 @@ import { useParams, Link } from 'react-router-dom' | |||||||
| import dayjs from 'dayjs' | import dayjs from 'dayjs' | ||||||
| import QRCode from 'qrcode' | import QRCode from 'qrcode' | ||||||
| import { sha256 } from 'js-sha256' | import { sha256 } from 'js-sha256' | ||||||
| import { getConfigValue, getNavigationsValue } from '@ijl/cli' | import { getConfigValue, getNavigationsValue } from '@brojs/cli' | ||||||
| import { | import { | ||||||
|   Box, |   Box, | ||||||
|   Breadcrumb, |   Breadcrumb, | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ import React, { | |||||||
| import { ResponsiveBar } from '@nivo/bar' | import { ResponsiveBar } from '@nivo/bar' | ||||||
| import dayjs from 'dayjs' | import dayjs from 'dayjs' | ||||||
| import { Link, useParams } from 'react-router-dom' | import { Link, useParams } from 'react-router-dom' | ||||||
| import { getNavigationsValue, getFeatures } from '@ijl/cli' | import { getNavigationsValue, getFeatures } from '@brojs/cli' | ||||||
| import { useForm, Controller } from 'react-hook-form' | import { useForm, Controller } from 'react-hook-form' | ||||||
| import { | import { | ||||||
|   Breadcrumb, |   Breadcrumb, | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user