From 2deb49bca5e93dc68203650780fba0e490c7ecac Mon Sep 17 00:00:00 2001 From: vigdorov Date: Sat, 26 Dec 2020 09:02:38 +0300 Subject: [PATCH] deploy gh-pages --- .github/workflows/deploy.yml | 37 +++++++ .github/workflows/main.yml | 4 +- package.json | 125 +++++++++++----------- src/pages/queues/components/page/Page.tsx | 2 +- 4 files changed, 102 insertions(+), 66 deletions(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..2ebddcc --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,37 @@ +# This is a basic workflow to help you get started with Actions + +name: Deploy to pages + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ master ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built. + run: | + npm install + npm run build + + - name: Deploy 🚀 + uses: JamesIves/github-pages-deploy-action@3.7.1 + with: + ACCESS_TOKEN: ${{ secrets.GIT_TOKEN_V1 }} + BRANCH: gh-pages # The branch the action should deploy to. + FOLDER: build # The folder the action should deploy. + CLEAN: true # Automatically remove deleted files from the deploy branch diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b80326..a8d0ab4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,12 +1,10 @@ # This is a basic workflow to help you get started with Actions -name: CI +name: Lint pull request # Controls when the action will run. on: # Triggers the workflow on push or pull request events but only for the master branch - push: - branches: [ master ] pull_request: branches: [ master ] diff --git a/package.json b/package.json index f6adb00..29f4ab1 100644 --- a/package.json +++ b/package.json @@ -1,64 +1,65 @@ { - "name": "tracker", - "version": "0.1.0", - "private": true, - "dependencies": { - "@devexperts/remote-data-ts": "^2.0.4", - "@material-ui/core": "^4.11.0", - "@material-ui/icons": "^4.9.1", - "@most/adapter": "^1.0.0", - "@most/core": "^1.6.1", - "@most/scheduler": "^1.3.0", - "@most/types": "^1.1.0", - "@types/uuid": "^8.3.0", - "axios": "^0.21.0", - "date-fns": "^2.16.1", - "file-loader": "^6.2.0", - "fp-ts": "^2.8.5", - "lodash": "^4.17.20", - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0", - "react-scripts": "4.0.0", - "ts-loader": "^8.0.7", - "typescript": "^4.0.3" - }, - "scripts": { - "start": "webpack serve", - "dev": "webpack serve --open false", - "build": "webpack --mode=production", - "eslint": "eslint -c .eslintrc.json src --fix", - "tsc": "tsc --p ./tsconfig.json", - "lint": "npm run eslint && npm run tsc", - "test": "jest" - }, - "devDependencies": { - "@babel/core": "^7.12.3", - "@babel/preset-env": "^7.12.1", - "@babel/preset-typescript": "^7.12.1", - "@types/jest": "^26.0.15", - "@types/lodash": "^4.14.165", - "@types/node": "^12.19.1", - "@types/react": "^16.9.53", - "@types/react-dom": "^16.9.8", - "@types/react-router-dom": "^5.1.6", - "@typescript-eslint/eslint-plugin": "^4.6.0", - "@typescript-eslint/parser": "^4.6.0", - "babel-jest": "^26.6.1", - "clean-webpack-plugin": "^3.0.0", - "css-loader": "^5.0.0", - "eslint": "^7.12.1", - "eslint-config-prettier": "^6.15.0", - "eslint-plugin-prettier": "^3.1.4", - "eslint-plugin-react": "^7.21.5", - "eslint-plugin-react-hooks": "^4.2.0", - "html-webpack-plugin": "^4.5.0", - "mini-css-extract-plugin": "^1.2.1", - "prettier": "^2.1.2", - "sass": "^1.28.0", - "sass-loader": "^10.0.4", - "webpack": "^5.3.2", - "webpack-cli": "^4.1.0", - "webpack-dev-server": "^3.11.0" - } + "name": "tracker", + "version": "0.1.0", + "private": true, + "dependencies": { + "@devexperts/remote-data-ts": "^2.0.4", + "@material-ui/core": "^4.11.0", + "@material-ui/icons": "^4.9.1", + "@most/adapter": "^1.0.0", + "@most/core": "^1.6.1", + "@most/scheduler": "^1.3.0", + "@most/types": "^1.1.0", + "@types/uuid": "^8.3.0", + "axios": "^0.21.0", + "date-fns": "^2.16.1", + "file-loader": "^6.2.0", + "fp-ts": "^2.8.5", + "lodash": "^4.17.20", + "react": "^17.0.1", + "react-dom": "^17.0.1", + "react-router-dom": "^5.2.0", + "react-scripts": "4.0.0", + "ts-loader": "^8.0.7", + "typescript": "^4.0.3" + }, + "scripts": { + "start": "webpack serve", + "dev": "webpack serve --open false", + "build": "webpack --mode=production", + "eslint": "eslint -c .eslintrc.json src --fix", + "tsc": "tsc --p ./tsconfig.json", + "lint": "npm run eslint && npm run tsc", + "test": "jest" + }, + "devDependencies": { + "@babel/core": "^7.12.3", + "@babel/preset-env": "^7.12.1", + "@babel/preset-typescript": "^7.12.1", + "@types/jest": "^26.0.15", + "@types/lodash": "^4.14.165", + "@types/node": "^12.19.1", + "@types/react": "^16.9.53", + "@types/react-dom": "^16.9.8", + "@types/react-router-dom": "^5.1.6", + "@typescript-eslint/eslint-plugin": "^4.6.0", + "@typescript-eslint/parser": "^4.6.0", + "babel-jest": "^26.6.1", + "clean-webpack-plugin": "^3.0.0", + "css-loader": "^5.0.0", + "eslint": "^7.12.1", + "eslint-config-prettier": "^6.15.0", + "eslint-plugin-prettier": "^3.1.4", + "eslint-plugin-react": "^7.21.5", + "eslint-plugin-react-hooks": "^4.2.0", + "gh-pages": "^3.1.0", + "html-webpack-plugin": "^4.5.0", + "mini-css-extract-plugin": "^1.2.1", + "prettier": "^2.1.2", + "sass": "^1.28.0", + "sass-loader": "^10.0.4", + "webpack": "^5.3.2", + "webpack-cli": "^4.1.0", + "webpack-dev-server": "^3.11.0" + } } diff --git a/src/pages/queues/components/page/Page.tsx b/src/pages/queues/components/page/Page.tsx index 0e0e599..721039a 100644 --- a/src/pages/queues/components/page/Page.tsx +++ b/src/pages/queues/components/page/Page.tsx @@ -4,7 +4,7 @@ import QueueTable from '../queue-table/QueueTable'; const QueuesPage: React.FC = () => { return (
-
Queues Page
+
Queues Page (d)
);