Merge branch 'main' into resolve-conflict

fish-404 · Aug 4, 2024 · b151853 · b151853
2 parents d64c9c6 + c643a8d
commit b151853
Show file tree

Hide file tree

Showing 47 changed files with 3,237 additions and 1,866 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -29,8 +29,17 @@ jobs:
     - name: Install dependencies
       run: pnpm install
 
+    - name: Set IS_FORK environment variable
+      run: |
+        if [ "${{ github.repository_owner }}" = "girlspowertech" ]; then
+          echo "IS_FORK=0" >> $GITHUB_ENV
+        else
+          echo "IS_FORK=1" >> $GITHUB_ENV
+        fi
+
     - name: Build project
-      run: GITHUB_ACTIONS=1 pnpm build
+      run: |
+        GITHUB_ACTIONS=1 IS_FORK=${{ env.IS_FORK }} pnpm build
 
     - name: Deploy to GitHub Pages
       uses: JamesIves/github-pages-deploy-action@v4

diff --git a/.github/workflows/update_crossinfo.yml b/.github/workflows/update_crossinfo.yml
@@ -27,7 +27,19 @@ jobs:
       - name: update cross info
         run: Rscript cross.r
 
-      - name: "Commit"
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: update cross info
+      - name: commit by Github Actions
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add .
+          # Check if there are any changes to commit
+          if git diff --staged --quiet; then
+            echo "No changes to commit"
+          else
+            git commit -m "update cross info"
+            git pull origin ${{ github.ref }} --rebase
+            git push origin ${{ github.ref }}
+            gh workflow run deploy.yml
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -6,20 +6,18 @@
   - 安装 node.js 和 npm
   - 安装 pnpm `npm i -g pnpm`
 <details>
-  <summary>Windows 环境下</summary
-                        
+  <summary>Windows 环境下</summary>
 可以使用PowerShell用以下命令：
 
 ```sh
 iwr https://get.pnpm.io/install.ps1 -useb | iex
 ```
-    
+
    安装成功后 `pnpm`已经被加入环境变量，但可能在 VS Code 会有以下提示：
-   
+
   > pnpm : 无法加载文件 C:\Users\fishm\AppData\Roaming\npm\pnpm.ps1。未对文件 C:\Users\fishm\AppData\Roaming\npm\pnpm.ps1 进行数字签名。无法在当前系统上运行该脚本。有关运行脚本和设置执行策略的详细信息，请参阅 https:/go.microsoft.com/fwlink/?LinkID=135170 中的 about_Execution_Policies。所在位置 行:1 字符: 1
-  
+
   需要以管理员身份运行 PowerShell, 输入以下命令：
-
 ```sh
 set-ExecutionPolicy RemoteSigned
 ```

diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8" name="format-detection" content="telephone=no" />
-    <meta name="viewport" content="width=device-width, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, user-scalable=no,target-densitydpi=device-dpi" />
     <meta name="title" content="Girls Power Tech" />
     <meta name="description" content="Girls Power Tech" />
     <title>Girls Power Tech</title>
@@ -12,6 +12,7 @@
 
 <body data-theme="dark">
     <div id="root"></div>
+    <div id="portal"></div>
     <script type="module" src="./src/index.tsx"></script>
 </body>
 

diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "girlspowertech",
   "description": "The homepage for our program",
+  "homepage": "https://girlspower.tech/",
   "version": "1.0.0",
   "license": "MIT",
   "scripts": {
@@ -18,6 +19,7 @@
     "react": "18.2.0",
     "react-crossword": "git+https://github.com/anig1scur/react-crossword.git",
     "react-dom": "18.2.0",
+    "react-responsive": "^10.0.0",
     "react-router-dom": "6.4.3",
     "yaml": "^2.4.5"
   },