nextpy-framework 3.7.3__tar.gz → 3.9.0__tar.gz

{nextpy_framework-3.7.3 → nextpy_framework-3.9.0}/.nextpy_framework/nextpy/__init__.py

@@ -3,7 +3,7 @@ NextPy - The Python Web Framdwork
 File-based routing, SSR, SSG, and more with FastAPI + PSX (True JSX)
 """
 
-__version__ = "3.7.2"
+__version__ = "3.9.0"
 
 from nextpy.core.router import Router, Route, DynamicRoute
 from nextpy.core.renderer import Renderer

{nextpy_framework-3.7.3 → nextpy_framework-3.9.0}/.nextpy_framework/nextpy/cli.py

@@ -243,7 +243,7 @@ def cli():
 
 
 @cli.command()
-@click.option("--port", "-p", default=5000, help="Port to run the server on")
+@click.option("--port", "-p", default=8000, help="Port to run the server on")
 @click.option("--host", "-h", default="0.0.0.0", help="Host to bind to")
 @click.option("--reload/--no-reload", default=True, help="Enable hot reload")
 @click.option("--debug/--no-debug", default=True, help="Enable debug mode")
@@ -322,6 +322,7 @@ def dev(port: int, host: str, reload: bool, debug: bool):
         # Enhanced reload patterns for JSX files
         reload_includes = [
             "*.py",
+            "*.psx",
             "*.py.jsx",
             "*.jsx",
             "*.html",
@@ -993,7 +994,10 @@ def _generate_page(name: str):
     page_path.parent.mkdir(parents=True, exist_ok=True)
 
     content = f'''"""Generated {name} page"""
+    
+from nextpy.psx import interactive_component as component
 
+@component
 def {name.title()}(props = None):
     """{name.title()} page component"""
     props = props or {{}}
@@ -1160,6 +1164,37 @@ def _create_project_structure(
 </body>
 </html>""")
     click.echo("  Created: templates/_404.html")
+    
+    try:
+        from importlib.resources import files, as_file
+        import shutil
+
+        images_dir = project_dir / "public" / "images"
+        images_dir.mkdir(parents=True, exist_ok=True)
+
+        logo_source = files("nextpy.public").joinpath("logo.png")
+
+        with as_file(logo_source) as logo_path:
+            shutil.copy2(
+                logo_path,
+                images_dir / "logo.png"
+            )
+        click.echo("  Copied: logo.png to public/images/")
+    except Exception as e:
+        click.echo(click.style(f"  ⚠️  Failed to copy logo.png: {str(e)}", fg="yellow"))
+    
+    #create minimal stylesheet
+    (project_dir / "public" / "css"/ "styles.css").write_text("""/* NextPy Styles */
+body{
+    margin: 0;
+    padding: 0;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+}
+""")
+    
+    click.echo("  Created: public/css/styles.css")
+   
+
 
     # Create styles.css with Tailwind directives
     (project_dir / "styles" / "styles.css").write_text("""/* NextPy Styles */
@@ -1329,7 +1364,7 @@ module.exports = {
 
     (project_dir / "pages" / "index.py").write_text('''"""Interactive Homepage """
 
-from nextpy.psx import component
+from nextpy.psx import interactive_component as component
 
 
 @component
@@ -1337,204 +1372,143 @@ def Home(props=None):
     props = props or {}
     title = props.get("title", "Welcome to NextPy!")
     message = props.get("message", "Build amazing web apps with Python and True JSX")
-    
-    return (
-        <div class="min-h-screen bg-gradient-to-br from-blue-600 via-purple-600 to-pink-600">
-            <div class="bg-white border-b border-white bg-opacity-10 backdrop-blur-md border-opacity-20">
-                <div class="px-4 mx-auto max-w-7xl sm:px-6 lg:px-8">
-                    <div class="flex items-center justify-between h-16">
-                        <div class="flex items-center">
-                            <h1 class="text-xl font-bold text-white">NextPy</h1>
-                        </div>
-                        <div class="flex space-x-4">
-                            <a href="/about" class="px-3 py-2 text-sm font-medium text-white transition-colors rounded-md hover:text-blue-200">
-                                About
-                            </a>
-                            <a href="/features" class="px-3 py-2 text-sm font-medium text-white transition-colors rounded-md hover:text-blue-200">
-                                Features
-                            </a>
-                            <a href="/docs" class="px-3 py-2 text-sm font-medium text-white transition-colors rounded-md hover:text-blue-200">
-                                Docs
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>   
-            </div>
-            
-            
-            
-        </div>
-    )
-
-def getServerSideProps(context):
-    return {
-        "props": {
-            "title": "Welcome to NextPy!",
-            "message": "Build amazing web apps with Python and True JSX"
-        }
-    }
 
-default = Home
-''')
-    click.echo("  Created: pages/index.py ")
+    return (
+        <div class="flex flex-col items-center justify-between min-h-screen p-8 font-sans antialiased text-black bg-white selection:bg-gray-200">
+            <head>
+            {/* optionally load a stylesheet from public/css <link rel="stylesheet" href="static/css/styles.css" /> */}
+            </head>
+            {/* Top spacer to perfectly center the main content vertically */}
+            <div class=""></div>
+
+            {/* Main Centered Content */}
+            <div class="flex flex-col items-center max-w-xl gap-8 text-center">
+                {/* Logo Section */}
+                <h1 class="text-[56px] font-extrabold tracking-tighter leading-none select-none font-mono flex items-baseline">
+                    <img src="static/images/logo.png" alt="NextPy Logo" class="w-auto h-16" />
 
-    # Create enhanced about page with interactive features
-    (project_dir / "pages" / "about.py").write_text(
-        '''"""Enhanced About page with True JSX"""
+                </h1>
 
-from nextpy.psx import component
+                {/* Step-by-Step Instructions */}
+                <ol class="list-decimal list-inside text-left text-[16px] font-mono text-gray-800 space-y-2.5">
+                    <li>
+                        Get started by editing
+                        <code class="bg-black/[0.05] px-1.5 py-0.5 rounded font-bold text-black text-[13px]">
+                            pages/index.py
+                        </code>
+                        .
+                    </li>
+                    <li>Save and see your changes instantly.</li>
+                </ol>
+
+                {/* Call To Action Buttons */}
+                <div class="flex flex-col items-center gap-4 mt-2 sm:flex-row">
+                
+                    <a
+                        href="https://nextpy-framework.onrender.com/deploy"
+                        class="flex items-center gap-2 bg-black text-white px-6 py-3 rounded-full text-[14px] font-medium transition-colors hover:bg-[#2c2c2c] shadow-sm"
+                        
+                    >
+                        <svg
+                            class="w-6 h-6"
+                            fill="none"
+                            stroke="currentColor"
+                            stroke-width="2"
+                            viewBox="0 0 24 24"
+                        >
+                            <path
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                d="M7 18a4 4 0 010-8 5 5 0 019.7-1.2A3.5 3.5 0 0117.5 18H7z"
+                            />
+                            <path
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                d="M12 14V8m0 0l-3 3m3-3l3 3"
+                            />
+                        </svg>
+                        
+                        Deploy now
+                    </a>
+                    
+                    <a
+                        href="https://nextpy-framework.onrender.com/"
+                        class="flex items-center justify-center border border-black/[0.08] bg-white text-black px-6 py-3 rounded-full text-[14px] font-medium transition-colors hover:bg-gray-50 hover:border-black/[0.15] min-w-[140px]"
+                        
+                    >
+                        Read our docs
+                    </a>
+                </div>
+                
+                <div class="flex flex-wrap items-center justify-center gap-x-8 text-[14px] font-medium text-gray-600 w-full max-w-2xl py-4 border-t border-gray-100 sm:border-none">
+                    <a
+                    href="https://nextpy-framework.onrender.com/learn"
+                    class="flex items-center gap-2 transition-colors hover:underline hover:text-black"
+                    
+                >
+                    {/* Document Icon */}
+                    <svg class="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
+                    </svg>
+                    Learn
+                </a>
 
+                <a
+                    href="https://nextpy-framework.onrender.com/templates"
+                    class="flex items-center gap-2 transition-colors hover:underline hover:text-black"
+                    
+                >
+                    {/* Window Layout Icon */}
+                    <svg class="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zm0 7a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zm10 0a1 1 0 011-1h4a1 1 0 011 1v6a1 1 0 01-1 1h-4a1 1 0 01-1-1v-6z"/>
+                    </svg>
+                    Examples
+                </a>
 
-@component
-def About(props=None):
-    """About page component with interactive features"""
-    props = props or {}
-    
-    title = props.get("title", "About NextPy")
-    description = props.get("description", "The Python web framework that brings React-like development to Python")
-    
-    return (
-        <div class="min-h-screen bg-gray-50">
-                        <div class="text-white bg-gradient-to-r from-blue-600 to-purple-600">
-                <div class="px-4 py-16 mx-auto max-w-7xl sm:py-24 sm:px-6 lg:px-8">
-                    <div class="text-center">
-                        <h1 class="text-4xl font-extrabold tracking-tight sm:text-5xl lg:text-6xl">
-                            {title}
-                        </h1>
-                        <p class="max-w-2xl mx-auto mt-6 text-xl text-blue-100">
-                            {description}
-                        </p>
-                        <div class="flex justify-center mt-10 space-x-4">
-                            <a href="/features" class="inline-flex items-center justify-center px-8 py-3 text-base font-medium text-blue-600 bg-white border border-transparent rounded-md hover:bg-blue-50 md:py-4 md:text-lg md:px-10">
-                                Explore Features
-                            </a>
-                            <a href="/getting-started" class="inline-flex items-center justify-center px-8 py-3 text-base font-medium text-white bg-blue-500 border border-transparent rounded-md hover:bg-blue-600 md:py-4 md:text-lg md:px-10">
-                                Get Started
-                            </a>
-                        </div>
-                    </div>
+                <a
+                    href="https://nextpy-framework.onrender.com/"
+                    class="flex items-center gap-1.5 hover:underline hover:text-black transition-colors"
+                    
+                >
+                    {/* Globe Icon */}
+                    <svg class="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M21 12a9 9 0 01-9 9m9-9a9 9 0 00-9-9m9 9H3m9 9a9 9 0 01-9-9m9 9c1.657 0 3-4.03 3-9s-1.343-9-3-9m0 18c-1.657 0-3-4.03-3-9s1.343-9 3-9m-9 9a9 9 0 019-9"/>
+                    </svg>
+                    Go to nextpy.org →
+                </a>
                 </div>
+
             </div>
             
-            
+            <footer class="flex flex-wrap items-center justify-center text-[14px] font-medium text-gray-600 w-full max-w-2xl py-4 border-t border-gray-100 sm:border-none">
+               The Python Web Framework for Everyone
+            </footer>
         </div>
     )
 
+
 def getServerSideProps(context):
     return {
         "props": {
-            "title": "About NextPy",
-            "description": "The Python web framework that brings React-like development to Python"
+            "title": "Welcome to NextPy!",
+            "message": "Build amazing web apps with Python and True JSX"
         }
     }
 
-default = About
-'''
-    )
-    click.echo("  Created: pages/about.py (enhanced interactive page)")
-
-    # Create interactive demo pages
-    (project_dir / "pages" / "interactive.py").write_text('''"""Interactive Demo Page"""
-
-from nextpy.psx import component
-
 
-@component
-def InteractiveDemo(props=None):
-    """Interactive demo showcasing NextPy capabilities"""
-    return (
-        <div class="min-h-screen py-12 bg-gradient-to-br from-indigo-50 to-purple-100">
-            <div class="px-4 mx-auto max-w-7xl sm:px-6 lg:px-8">
-                <h1 class="mb-12 text-4xl font-extrabold text-center text-gray-900">
-                    Interactive NextPy Demos
-                </h1>
-                
-                <div class="grid grid-cols-1 gap-8 md:grid-cols-2 lg:grid-cols-3">
-                    
-                    <div class="p-6 bg-white shadow-lg rounded-xl">
-                        <h2 class="mb-4 text-2xl font-bold text-gray-900">Live Counter</h2>
-                        <div class="text-center">
-                            <div class="mb-4 text-6xl font-bold text-blue-600" id="counter">0</div>
-                            <div class="space-x-4">
-                                <button onclick="updateCounter(-1)" class="px-6 py-3 text-white transition-colors bg-red-500 rounded-lg hover:bg-red-600">
-                                    -
-                                </button>
-                                <button onclick="updateCounter(1)" class="px-6 py-3 text-white transition-colors bg-green-500 rounded-lg hover:bg-green-600">
-                                    +
-                                </button>
-                                <button onclick="resetCounter()" class="px-6 py-3 text-white transition-colors bg-gray-500 rounded-lg hover:bg-gray-600">
-                                    Reset
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                    
-                    
-                    <div class="p-6 bg-white shadow-lg rounded-xl">
-                        <h2 class="mb-4 text-2xl font-bold text-gray-900">Todo List</h2>
-                        <div class="space-y-4">
-                            <div class="flex space-x-2">
-                                <input type="text" id="todoInput" placeholder="Add a new todo..." class="flex-1 px-4 py-2 border border-gray-300 rounded-lg" />
-                                <button onclick="addTodo()" class="px-6 py-2 text-white transition-colors bg-blue-500 rounded-lg hover:bg-blue-600">
-                                    Add
-                                </button>
-                            </div>
-                            <ul id="todoList" class="space-y-2">
-                                
-                            </ul>
-                        </div>
-                    </div>
-                    
-                    
-                    <div class="p-6 bg-white shadow-lg rounded-xl">
-                        <h2 class="mb-4 text-2xl font-bold text-gray-900">Color Picker</h2>
-                        <div class="space-y-4">
-                            <input type="color" id="colorPicker" class="w-full h-20 rounded-lg cursor-pointer" />
-                            <div id="colorDisplay" class="p-4 font-mono text-lg text-center bg-gray-100 rounded-lg">
-                                Selected: #3B82F6
-                            </div>
-                        </div>
-                    </div>
-                    
-                    
-                    <div class="p-6 bg-white shadow-lg rounded-xl">
-                        <h2 class="mb-4 text-2xl font-bold text-gray-900">Form Validation</h2>
-                        <form onsubmit="validateForm(event)" class="space-y-4">
-                            <div>
-                                <label class="block mb-2 text-sm font-medium text-gray-700">Email</label>
-                                <input type="email" id="email" required class="w-full px-4 py-2 border border-gray-300 rounded-lg" placeholder="you@example.com" />
-                            </div>
-                            <div>
-                                <label class="block mb-2 text-sm font-medium text-gray-700">Password</label>
-                                <input type="password" id="password" required minlength="6" class="w-full px-4 py-2 border border-gray-300 rounded-lg" placeholder="•••••••••" />
-                            </div>
-                            <button type="submit" class="w-full px-6 py-3 text-white transition-colors bg-blue-500 rounded-lg hover:bg-blue-600">
-                                Validate & Submit
-                            </button>
-                        </form>
-                        <div id="validationResult" class="hidden p-4 mt-4 rounded-lg">
-                            
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    )
+default = Home
 
-def getServerSideProps(context):
-    return {"props": {}}
 
-default = InteractiveDemo
 ''')
-    click.echo("  Created: pages/interactive.py (interactive demos)")
+    click.echo("  Created: pages/index.py ")
+
 
     (project_dir / "components" / "ui" / "Button.py").write_text(
         '''"""Button component"""
-from nextpy.psx import component
+from nextpy.psx import psx
+
 
 
-@component
 def Button(props = None):
     """Reusable Button component"""
     props = props or {}
@@ -1556,14 +1530,14 @@ def Button(props = None):
     
     class_attr = f"px-6 py-3 rounded-lg font-medium transition-all duration-200 transform hover:scale-105 {variant_class} {className}"
     
-    return (
+    return psx(f"
         <button class={class_attr} 
                 id={props.get("id")}
                 disabled={props.get("disabled", False)}
                 onclick={props.get("onClick", "")}>
             {children}
         </button>
-    )
+    ")
 
 default = Button
 '''
@@ -1613,119 +1587,7 @@ default = Layout
     )
     click.echo("  Created: components/layout/Layout.py")
 
-    # Create VS Code configuration for PSX support
-    (project_dir / ".vscode").mkdir(exist_ok=True)
-    (project_dir / ".vscode" / "settings.json").write_text("""{
-  "files.associations": {
-    "*.py": "python",
-    "*.py.jsx": "python",
-    "*.jsx": "javascriptreact"
-  },
-  "emmet.includeLanguages": {
-    "python": "html",
-    "javascriptreact": "html",
-    "typescriptreact": "html"
-  },
-  "emmet.triggerExpansionOnTab": true,
-  "typescript.preferences.includePackageJsonAutoImports": "on",
-  "editor.quickSuggestions": {
-    "strings": true
-  },
-  "editor.suggestSelection": "first",
-  "editor.wordBasedSuggestions": true,
-  "editor.snippetSuggestions": "top",
-  "editor.parameterHints": {
-    "enabled": true
-  },
-  "editor.snippetSuggestions": "top",
-  "html.autoClosingTags": true,
-  "css.autoClosingTags": true,
-  "javascript.autoClosingTags": true,
-  "typescript.autoClosingTags": true,
-  "editor.autoClosingBrackets": "always",
-  "editor.autoClosingQuotes": "always",
-  "editor.formatOnSave": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": true
-  },
-  "emmet.preferences": {
-    "css.property.endWithSemicolon": true,
-    "css.value.unit": "rem"
-  },
-  "files.exclude": {
-    "*}__pycache__": true,
-    "*}*.pyc": true,
-    "*}node_modules": true,
-    "*}out": true,
-    "*}.next": true,
-    "*}.pytest_cache": true,
-    "*}.mypy_cache": true
-  },
-  "search.exclude": {
-    "*}node_modules": true,
-    "*}out": true,
-    "*}.next": true,
-    "*}__pycache__": true,
-    "*}.pytest_cache": true,
-    "*}.mypy_cache": true
-  },
-  "python.linting.enabled": true,
-  "python.linting.pylintEnabled": false,
-  "python.linting.flake8Enabled": false,
-  "python.linting.pylintArgs": [
-    "--disable=C0114,C0115,C0116,E1132,E1131,E1130"
-  ],
-  "python.formatting.provider": "black",
-  "[python]": {
-    "editor.defaultFormatter": "ms-python.black-formatter",
-    "editor.formatOnSave": true,
-    "editor.rulers": [88],
-    "editor.tabSize": 4,
-    "editor.insertSpaces": true
-  }
-}""")
-    click.echo("  Created: .vscode/settings.json")
-
-    (project_dir / ".vscode" / "extensions.json").write_text("""{
-  "recommendations": [
-    "ms-python.python",
-    "ms-python.vscode-pylance",
-    "bradlc.vscode-tailwindcss",
-    "esbenp.prettier-vscode",
-    "ms-vscode.vscode-json",
-    "formulahendry.auto-rename-tag",
-    "christian-kohler.path-intellisense",
-    "ms-vscode.vscode-html-css-class-completion",
-    "ms-vscode.vscode-emmet",
-    "ms-vscode.vscode-eslint",
-    "dbaeumer.vscode-eslint",
-    "ms-vscode.vscode-typescript-next",
-    "ritwickdey.liveserver",
-    "ms-vscode.vscode-jest",
-    "esbenp.prettier-vscode",
-    "streetsidesoftware.code-spell-checker",
-    "gruntfuggly.todo-tree",
-    "ms-vscode.vscode-git-graph",
-    "eamodio.gitlens",
-    "ms-vscode.vscode-docker",
-    "ms-vscode.remote-explorer",
-    "ms-vscode-remote.remote-containers",
-    "ms-vscode.vscode-remote-wsl",
-    "redhat.vscode-yaml",
-    "ms-vscode.vscode-markdown",
-    "yzhang.markdown-all-in-one",
-    "shd101wyy.markdown-preview-enhanced",
-    "ms-vscode.vscode-python",
-    "kevinrose.vsc-python-indent",
-    "ms-python.black-formatter",
-    "ms-python.isort",
-    "ms-python.flake8",
-    "ms-python.mypy-type-checker"
-  ]
-}""")
-    click.echo("  Created: .vscode/extensions.json")
-
+    
     # Create comprehensive API examples
     (project_dir / "pages" / "api" / "hello.py").write_text(
         '''"""API example - Hello endpoint"""
@@ -2208,77 +2070,6 @@ Thumbs.db
 ''')
     click.echo("  Created: .gitignore")
 
-    # Create main.py with Tailwind compilation (for pip-installed NextPy)
-    (project_dir / "main.py").write_text('''"""NextPy ASGI Application Entry Point"""
-
-import os
-import sys
-import subprocess
-from pathlib import Path
-
-try:
-    print("Compiling Tailwind CSS...")
-    proj_root = Path.cwd()
-    framework_dir = Path(__file__).parent
-    # If the project root doesn't have a styles.css yet, warn the user and create a minimal one.
-    styles_file = proj_root / "styles.css"
-    if not styles_file.exists():
-        print("Warning: styles.css not found, creating a minimal file.")
-        styles_file.write_text("@tailwind base;\n@tailwind components;\n@tailwind utilities;\n")
-
-    import shutil
-    npm_bin = shutil.which("npm")
-    if not npm_bin:
-        raise FileNotFoundError("npm not found on PATH")
-
-    lockfile = framework_dir / "package-lock.json"
-    node_modules = framework_dir / "node_modules"
-    if not node_modules.exists():
-        if lockfile.exists():
-            subprocess.run([npm_bin, "ci"], cwd=str(framework_dir), check=True)
-        else:
-            subprocess.run([npm_bin, "install"], cwd=str(framework_dir), check=True)
-
-    subprocess.run([npm_bin, "run", "build:tailwind"], cwd=str(framework_dir), check=True)
-    print("Tailwind CSS compiled successfully.")
-except subprocess.CalledProcessError as e:
-    print(f"Error compiling Tailwind CSS: {e}")
-    print("You can also run `cd .nextpy_framework/nextpy && npm ci && npm run build:tailwind` manually.")
-except FileNotFoundError:
-    print("Error: npm not found. Make sure Node.js is installed and available on PATH.")
-    print("See https://nodejs.org/ for installation instructions.")
-
-# Import NextPy modules (works when installed via pip)
-from nextpy.server.app import create_app
-from nextpy.db import init_db
-from nextpy.config import settings
-
-# Initialize database
-try:
-    init_db(settings["database_url"])
-    print("Database initialized successfully.")
-except Exception as e:
-    print(f"Warning: Database initialization failed: {e}")
-
-# Create NextPy app with file-based routing
-app = create_app(
-    pages_dir="pages",
-    templates_dir="templates", 
-    public_dir="public",
-    out_dir="out",
-    debug=settings["debug"],
-)
-
-# Note: Routes are automatically loaded from pages/ directory
-# - / -> pages/index.py
-# - /about -> pages/about.py  
-# - /api/* -> pages/api/*.py
-
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True)
-''')
-    click.echo("  Created: main.py (pip-compatible)")
 
     # Create .env file for development
     (project_dir / ".env").write_text("""# NextPy Development Environment