dummy pr 6 (#124)

voodoohop · web-flow · commit 06bea05edfa4 · 2025-01-15T09:41:03.000+01:00
* Update package.json

* remove defunct app

* Update deploy-apps.yml

* put main deployment under main in gh pages

* Update deploy-apps.yml
diff --git a/.github/workflows/deploy-apps.yml b/.github/workflows/deploy-apps.yml
@@ -1,12 +1,11 @@
 name: Deploy Apps
 
 on:
-  push:
-    branches: [ main ]
-    paths:
-      - '*/package.json'
-      - '*/index.html'
-      - '*/**'
+  workflow_run:
+    workflows: ["Test Apps"]
+    types:
+      - completed
+    branches: [main]
   pull_request:
     types: [opened, synchronize, reopened, closed]
     paths:
@@ -16,14 +15,18 @@ on:
 
 jobs:
   build-and-deploy:
-    if: github.event.action != 'closed'
+    if: |
+      (github.event_name == 'pull_request' && github.event.action != 'closed') ||
+      (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
       
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.workflow_run.head_sha }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -33,20 +36,76 @@ jobs:
       - name: Install root dependencies
         run: npm install
 
+      - name: Show initial directory structure
+        run: |
+          echo "Current directory structure:"
+          tree -L 3 || (apt-get update && apt-get install -y tree && tree -L 3)
+
       - name: Build all apps
         run: |
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
             npm run build pr-preview ${{ github.event.pull_request.number }}
+            echo "PR Preview build output structure:"
+            tree pr-preview -L 3
           else
             npm run build _site
+            echo "_site build output structure:"
+            tree _site -L 3
           fi
 
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ${{ github.event_name == 'pull_request' && './pr-preview' || './_site' }}
-          destination_dir: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || '.' }}
+          destination_dir: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || 'main' }}
+          keep_files: true
+          enable_jekyll: false
+
+      - name: Create and deploy root index.html
+        if: github.event_name != 'pull_request'
+        run: |
+          mkdir -p root
+          cat > root/index.html << 'EOL'
+          <!DOCTYPE html>
+          <html>
+          <head>
+              <title>Pollinations Hive</title>
+              <meta http-equiv="refresh" content="0; url=./main/" />
+              <style>
+                  body {
+                      font-family: system-ui, -apple-system, sans-serif;
+                      max-width: 800px;
+                      margin: 2rem auto;
+                      padding: 0 1rem;
+                      line-height: 1.5;
+                  }
+                  a {
+                      color: #0366d6;
+                      text-decoration: none;
+                  }
+                  a:hover {
+                      text-decoration: underline;
+                  }
+              </style>
+          </head>
+          <body>
+              <h1>Pollinations Hive</h1>
+              <p>Redirecting to <a href="./main/">main deployment</a>...</p>
+              <script>
+                  window.location.href = './main/';
+              </script>
+          </body>
+          </html>
+          EOL
+
+      - name: Deploy root index
+        if: github.event_name != 'pull_request'
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./root
+          destination_dir: .
           keep_files: true
           enable_jekyll: false
 
@@ -73,11 +132,21 @@ jobs:
         with:
           ref: gh-pages
           
+      - name: Show directory before cleanup
+        run: |
+          echo "Directory structure before cleanup:"
+          tree -L 3 || (apt-get update && apt-get install -y tree && tree -L 3)
+          
       - name: Remove PR Preview
         run: |
           rm -rf pr-${{ github.event.pull_request.number }}
           git config user.name github-actions
           git config user.email github-actions@github.com
           git add .
           git commit -m "Remove PR preview for #${{ github.event.pull_request.number }}" || echo "No changes to commit"
-          git push
+          git push
+          
+      - name: Show directory after cleanup
+        run: |
+          echo "Directory structure after cleanup:"
+          tree -L 3 || (apt-get update && apt-get install -y tree && tree -L 3)
diff --git a/.github/workflows/update-apps-list.yml b/.github/workflows/update-apps-list.yml
@@ -30,20 +30,18 @@ jobs:
             # Get the app directory name
             app_dir=$(dirname "$app_path")
             app_name=$(basename "$app_dir")
+            last_updated=$(git log -1 --format="%as" "$app_dir")
             
             # Skip if it's the root directory
             if [ "$app_dir" = "." ]; then
               continue
             fi
             
-            # Get the last update date
-            last_update=$(git log -1 --format="%ad" --date=short -- "$app_dir")
-            
             # Create the deployment URL (using GitHub Pages format)
-            deploy_url="https://pollinations.github.io/hive/$app_name/"
+            deploy_url="https://pollinations.github.io/hive/main/$app_name/"
             
             # Add the app to the list
-            echo "| [$app_name]($deploy_url) | [$app_dir]($app_dir) | $last_update |" >> apps_section.md
+            echo "| [$app_name]($deploy_url) | [$app_dir]($app_dir) | $last_updated |" >> apps_section.md
           done
           
           # Update README.md using awk for more precise section replacement
diff --git a/README.md b/README.md
@@ -7,13 +7,13 @@ Welcome to Pollinations Hive - a revolutionary repository where AI meets collabo
 
 | App | Source | Last Updated |
 |-----|--------|--------------|
-| [llm-feedback](https://pollinations.github.io/hive/llm-feedback/) | [./llm-feedback](./llm-feedback) | 2025-01-14 |
-| [tarot-reader](https://pollinations.github.io/hive/tarot-reader/) | [./tarot-reader](./tarot-reader) | 2025-01-14 |
-| [pollinations-image-show](https://pollinations.github.io/hive/pollinations-image-show/) | [./pollinations-image-show](./pollinations-image-show) | 2025-01-14 |
-| [image-prompt](https://pollinations.github.io/hive/image-prompt/) | [./image-prompt](./image-prompt) | 2025-01-15 |
-| [graphics-editor](https://pollinations.github.io/hive/graphics-editor/) | [./graphics-editor](./graphics-editor) | 2025-01-15 |
-| [placeholder-generator](https://pollinations.github.io/hive/placeholder-generator/) | [./placeholder-generator](./placeholder-generator) | 2025-01-14 |
-| [ai-chat](https://pollinations.github.io/hive/ai-chat/) | [./ai-chat](./ai-chat) | 2025-01-15 |
+| [llm-feedback](https://pollinations.github.io/hive/main/llm-feedback/) | [./llm-feedback](./llm-feedback) | 2025-01-14 |
+| [tarot-reader](https://pollinations.github.io/hive/main/tarot-reader/) | [./tarot-reader](./tarot-reader) | 2025-01-14 |
+| [pollinations-image-show](https://pollinations.github.io/hive/main/pollinations-image-show/) | [./pollinations-image-show](./pollinations-image-show) | 2025-01-14 |
+| [image-prompt](https://pollinations.github.io/hive/main/image-prompt/) | [./image-prompt](./image-prompt) | 2025-01-15 |
+| [graphics-editor](https://pollinations.github.io/hive/main/graphics-editor/) | [./graphics-editor](./graphics-editor) | 2025-01-15 |
+| [placeholder-generator](https://pollinations.github.io/hive/main/placeholder-generator/) | [./placeholder-generator](./placeholder-generator) | 2025-01-14 |
+| [ai-chat](https://pollinations.github.io/hive/main/ai-chat/) | [./ai-chat](./ai-chat) | 2025-01-15 |
 ## 📚 Documentation
 
 ### 🔍 Pull Request Previews
diff --git a/image-prompt/index.html b/image-prompt/index.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hive",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Collection of Pollinations apps",
   "scripts": {
     "test": "node scripts/test-apps.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hive",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"description": "Collection of Pollinations apps",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "node scripts/test-apps.js",`