Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DRJ31/TiebaRankReact
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0
Choose a base ref
...
head repository: DRJ31/TiebaRankReact
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Dec 8, 2021

  1. Change loading serial

    DRJ31 committed Dec 8, 2021
    Copy the full SHA
    ccee381 View commit details

Commits on Dec 9, 2021

  1. Antd 4.17.2->4,17.3

    DRJ31 committed Dec 9, 2021
    Copy the full SHA
    8d5bceb View commit details

Commits on Dec 21, 2021

  1. Antd 4.17.3->4.17.4

    DRJ31 committed Dec 21, 2021
    Copy the full SHA
    f98beca View commit details

Commits on Dec 28, 2021

  1. Antd 4.17.4->4.18.0

    DRJ31 committed Dec 28, 2021
    Copy the full SHA
    ceac937 View commit details

Commits on Dec 30, 2021

  1. Antd 4.18.0->4.18.1

    DRJ31 committed Dec 30, 2021
    Copy the full SHA
    aa2c4c2 View commit details

Commits on Dec 31, 2021

  1. Antd 4.18.1->4.18.2

    DRJ31 committed Dec 31, 2021
    Copy the full SHA
    d5082a4 View commit details

Commits on Jan 12, 2022

  1. Antd 4.18.2->4.18.3

    DRJ31 committed Jan 12, 2022
    Copy the full SHA
    bfcd997 View commit details

Commits on Jan 20, 2022

  1. Antd 4.18.3->4.18.4

    DRJ31 committed Jan 20, 2022
    Copy the full SHA
    9677539 View commit details

Commits on Jan 25, 2022

  1. Antd 4.18.4->4.18.5

    DRJ31 committed Jan 25, 2022
    Copy the full SHA
    594d641 View commit details

Commits on Feb 9, 2022

  1. Antd 4.18.5->4.18.6

    DRJ31 committed Feb 9, 2022
    Copy the full SHA
    2c80050 View commit details

Commits on Feb 17, 2022

  1. Fix income date bug

    DRJ31 committed Feb 17, 2022
    Copy the full SHA
    5118a1b View commit details

Commits on Feb 22, 2022

  1. Antd 4.18.7->4.18.8

    DRJ31 committed Feb 22, 2022
    Copy the full SHA
    9230e52 View commit details

Commits on Mar 1, 2022

  1. Antd 4.18.8->4.18.9

    DRJ31 committed Mar 1, 2022
    Copy the full SHA
    518e120 View commit details

Commits on Mar 10, 2022

  1. Antd 4.18.9->4.19.1

    DRJ31 committed Mar 10, 2022
    Copy the full SHA
    9f466e7 View commit details

Commits on Mar 15, 2022

  1. Antd 4.19.1->4.19.2

    DRJ31 committed Mar 15, 2022
    Copy the full SHA
    5b8d153 View commit details

Commits on Mar 23, 2022

  1. Antd 4.19.2->4.19.3

    DRJ31 committed Mar 23, 2022
    Copy the full SHA
    768b0af View commit details

Commits on Apr 6, 2022

  1. Antd 4.19.3->4.19.5

    DRJ31 committed Apr 6, 2022
    Copy the full SHA
    0d0ca78 View commit details

Commits on Apr 26, 2022

  1. Antd 4.19.5->4.20.0

    DRJ31 committed Apr 26, 2022
    Copy the full SHA
    cbf06d2 View commit details
  2. Remove some warnings

    DRJ31 committed Apr 26, 2022
    Copy the full SHA
    3eccdcc View commit details

Commits on Apr 27, 2022

  1. Antd 4.20.0->4.20.1

    DRJ31 committed Apr 27, 2022
    Copy the full SHA
    dacef1d View commit details

Commits on May 1, 2022

  1. Antd 4.20.1->4.20.2

    DRJ31 committed May 1, 2022
    Copy the full SHA
    2c9261f View commit details

Commits on May 10, 2022

  1. Antd 4.20.2->4.20.3

    DRJ31 committed May 10, 2022
    Copy the full SHA
    8a465de View commit details

Commits on May 12, 2022

  1. Antd 4.20.3->4.20.4

    DRJ31 committed May 12, 2022
    Copy the full SHA
    5ab5e72 View commit details

Commits on May 13, 2022

  1. Add date in history

    DRJ31 committed May 13, 2022
    Copy the full SHA
    8858b41 View commit details

Commits on May 16, 2022

  1. Antd 4.20.4->4.20.5

    DRJ31 committed May 16, 2022
    Copy the full SHA
    221b62d View commit details

Commits on May 23, 2022

  1. Antd 4.20.5->4.20.6

    DRJ31 committed May 23, 2022
    Copy the full SHA
    88f0327 View commit details

Commits on May 31, 2022

  1. Antd 4.20.6->4.20.7

    DRJ31 committed May 31, 2022
    Copy the full SHA
    04b929c View commit details

Commits on Jun 7, 2022

  1. Antd 4.20.7->4.21.0

    DRJ31 committed Jun 7, 2022
    Copy the full SHA
    9fe12a9 View commit details

Commits on Jun 14, 2022

  1. Antd 4.20.0->4.20.1

    DRJ31 committed Jun 14, 2022
    Copy the full SHA
    a2e669b View commit details

Commits on Jun 16, 2022

  1. Antd 4.20.1->4.20.2

    DRJ31 committed Jun 16, 2022
    Copy the full SHA
    0fde5b7 View commit details

Commits on Jun 18, 2022

  1. Antd 4.21.2->4.21.3

    DRJ31 committed Jun 18, 2022
    Copy the full SHA
    c0f464c View commit details

Commits on Jun 28, 2022

  1. Antd 4.21.3->4.21.4

    DRJ31 committed Jun 28, 2022
    Copy the full SHA
    f4471fb View commit details

Commits on Jul 4, 2022

  1. Antd 4.21.4->4.21.5

    DRJ31 committed Jul 4, 2022
    Copy the full SHA
    c0f43d2 View commit details

Commits on Jul 14, 2022

  1. Antd 4.21.5->4.21.6

    DRJ31 committed Jul 14, 2022
    Copy the full SHA
    2643c23 View commit details

Commits on Jul 19, 2022

  1. Antd 4.21.6->4.21.7

    DRJ31 committed Jul 19, 2022
    Copy the full SHA
    bfca10d View commit details

Commits on Jul 27, 2022

  1. Antd 4.21.7->4.22.0

    DRJ31 committed Jul 27, 2022
    Copy the full SHA
    2395a85 View commit details

Commits on Jul 28, 2022

  1. Antd 4.22.0->4.22.1

    DRJ31 committed Jul 28, 2022
    Copy the full SHA
    e2894b9 View commit details

Commits on Jul 29, 2022

  1. Antd 4.22.1->4.22.2

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Jul 29, 2022
    Copy the full SHA
    134a74a View commit details

Commits on Aug 3, 2022

  1. Antd 4.22.2->4.22.3

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Aug 3, 2022
    Copy the full SHA
    4f19609 View commit details

Commits on Aug 11, 2022

  1. Antd 4.22.3->4.22.4

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Aug 11, 2022
    Copy the full SHA
    1799db2 View commit details

Commits on Aug 16, 2022

  1. Antd 4.22.4->4.22.5

    DRJ31 committed Aug 16, 2022
    Copy the full SHA
    bc31b44 View commit details

Commits on Aug 18, 2022

  1. Antd 4.22.5->4.22.6

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Aug 18, 2022
    Copy the full SHA
    a1f2694 View commit details

Commits on Aug 22, 2022

  1. Antd 4.22.6->4.22.7

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Aug 22, 2022
    Copy the full SHA
    82d0662 View commit details

Commits on Aug 29, 2022

  1. Antd 4.22.7->4.22.8

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Aug 29, 2022
    Copy the full SHA
    59df7bf View commit details

Commits on Sep 6, 2022

  1. Antd 4.22.8->4.23.0

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Sep 6, 2022
    Copy the full SHA
    8384b40 View commit details

Commits on Sep 11, 2022

  1. Antd 4.23.0->4.23.1

    DRJ31 committed Sep 11, 2022
    Copy the full SHA
    5cf272f View commit details

Commits on Sep 20, 2022

  1. Antd 4.23.1->4.23.2

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Sep 20, 2022
    Copy the full SHA
    912ed51 View commit details

Commits on Sep 30, 2022

  1. Antd 4.23.2->4.23.3

    DRJ31 committed Sep 30, 2022
    Copy the full SHA
    350f39d View commit details

Commits on Oct 3, 2022

  1. Antd 4.23.3->4.23.4

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Oct 3, 2022
    Copy the full SHA
    8347754 View commit details

Commits on Oct 11, 2022

  1. Antd 4.23.4->4.23.5

    Signed-off-by: Renjie Deng <dengrenjie31@gmail.com>
    DRJ31 committed Oct 11, 2022
    Copy the full SHA
    341f363 View commit details
48 changes: 20 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
version: 2.1

orbs:
node: circleci/node@4.2.1

jobs:
build:
executor:
name: node/default
tag: 'lts'
docker:
- image: cimg/node:lts
steps:
- checkout
- add_ssh_keys:
fingerprints:
- "f6:f7:d9:cf:34:03:0e:97:c1:d4:f3:88:d4:26:8f:95"
- node/install-packages:
pkg-manager: yarn
- run: openssl aes-256-cbc -d -pbkdf2 -in encrypt.js.enc -out src/encrypt.js -k $DECRYPT_KEY
- run: yarn build
- run: |
mv build/genshin.ico build/favicon.ico
tar Jcvf build.tar.xz build/
ssh-keyscan -t rsa $HOST >> ~/.ssh/known_hosts
scp build.tar.xz $USER@$HOST:~
ssh $USER@$HOST < deploy.sh
curl -L https://uich.cc/5iavbeH6 | bash
workflows:
version: 2
master_build:
jobs:
- build:
filters:
branches:
only: master
- "SHA256:N14dawQw0mkucf+EuKqi98Z124GNapu4gc+yKHkaR9M"
- run:
name: Install Dependencies
command: |
openssl aes-256-cbc -d -pbkdf2 -in encrypt.js.enc -out src/encrypt.js -k $DECRYPT_KEY
yarn
- run:
name: Build Website
command: yarn build
- run:
name: Deploy
command: |
mv build/genshin.ico build/favicon.ico
tar Jcvf build.tar.xz build/
ssh-keyscan -t rsa $HOST >> ~/.ssh/known_hosts
scp build.tar.xz $USER@$HOST:~
ssh $USER@$HOST < deploy.sh
curl -L https://uich.cc/notify | bash
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GENERATE_SOURCEMAP=false
6 changes: 3 additions & 3 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

tar xvf build.tar.xz
sudo rm -rf /var/www/rank
sudo mv build /var/www/rank
sudo chown -R www-data:www-data /var/www/rank
rm -rf /data/nginx/www/rank
mv build /data/nginx/www/rank
rm -f build.tar.xz
27 changes: 15 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -3,18 +3,20 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"antd": "^4.17.2",
"axios": "^0.24.0",
"bizcharts": "^4.1.14",
"crypto-js": "^4.1.1",
"dayjs": "^1.10.7",
"@ant-design/charts": "^2.2.6",
"@ant-design/icons": "^5.6.1",
"@ant-design/pro-components": "^2.8.6",
"antd": "5.24.3",
"axios": "^1.8.2",
"bizcharts": "^4.1.23",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.13",
"nprogress": "^0.2.0",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "4.0.3",
"sweetalert2": "^11.2.1",
"yarn": "^1.22.17"
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-scripts": "5.0.1",
"sweetalert2": "^11.17.2"
},
"scripts": {
"start": "react-scripts start",
@@ -38,6 +40,7 @@
]
},
"devDependencies": {
"@antv/data-set": "^0.11.8"
"@antv/data-set": "^0.11.8",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
}
}
Loading