From 6e71393ed5f29234071da2b43192fc12d9bdbbd7 Mon Sep 17 00:00:00 2001 From: Nikhil Rao Date: Wed, 1 Nov 2023 15:59:34 -0700 Subject: [PATCH] Use blank template as default (#2109) --- reflex/.templates/apps/{base => sidebar}/README.md | 0 .../apps/{base => sidebar}/assets/favicon.ico | Bin .../apps/{base => sidebar}/assets/github.svg | 0 .../apps/{base => sidebar}/assets/icon.svg | 0 .../apps/{base => sidebar}/assets/logo.svg | 0 .../apps/{base => sidebar}/assets/paneleft.svg | 0 .../apps/{base => sidebar}/code/__init__.py | 0 .../{base => sidebar}/code/components/__init__.py | 0 .../{base => sidebar}/code/components/sidebar.py | 0 .../apps/{base => sidebar}/code/pages/__init__.py | 0 .../apps/{base => sidebar}/code/pages/dashboard.py | 0 .../apps/{base => sidebar}/code/pages/index.py | 0 .../apps/{base => sidebar}/code/pages/settings.py | 0 .../{base/code/base.py => sidebar/code/sidebar.py} | 0 .../.templates/apps/{base => sidebar}/code/state.py | 0 .../apps/{base => sidebar}/code/styles.py | 0 .../{base => sidebar}/code/templates/__init__.py | 0 .../{base => sidebar}/code/templates/template.py | 0 reflex/reflex.py | 2 +- reflex/utils/prerequisites.py | 2 +- 20 files changed, 2 insertions(+), 2 deletions(-) rename reflex/.templates/apps/{base => sidebar}/README.md (100%) rename reflex/.templates/apps/{base => sidebar}/assets/favicon.ico (100%) rename reflex/.templates/apps/{base => sidebar}/assets/github.svg (100%) rename reflex/.templates/apps/{base => sidebar}/assets/icon.svg (100%) rename reflex/.templates/apps/{base => sidebar}/assets/logo.svg (100%) rename reflex/.templates/apps/{base => sidebar}/assets/paneleft.svg (100%) rename reflex/.templates/apps/{base => sidebar}/code/__init__.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/components/__init__.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/components/sidebar.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/pages/__init__.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/pages/dashboard.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/pages/index.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/pages/settings.py (100%) rename reflex/.templates/apps/{base/code/base.py => sidebar/code/sidebar.py} (100%) rename reflex/.templates/apps/{base => sidebar}/code/state.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/styles.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/templates/__init__.py (100%) rename reflex/.templates/apps/{base => sidebar}/code/templates/template.py (100%) diff --git a/reflex/.templates/apps/base/README.md b/reflex/.templates/apps/sidebar/README.md similarity index 100% rename from reflex/.templates/apps/base/README.md rename to reflex/.templates/apps/sidebar/README.md diff --git a/reflex/.templates/apps/base/assets/favicon.ico b/reflex/.templates/apps/sidebar/assets/favicon.ico similarity index 100% rename from reflex/.templates/apps/base/assets/favicon.ico rename to reflex/.templates/apps/sidebar/assets/favicon.ico diff --git a/reflex/.templates/apps/base/assets/github.svg b/reflex/.templates/apps/sidebar/assets/github.svg similarity index 100% rename from reflex/.templates/apps/base/assets/github.svg rename to reflex/.templates/apps/sidebar/assets/github.svg diff --git a/reflex/.templates/apps/base/assets/icon.svg b/reflex/.templates/apps/sidebar/assets/icon.svg similarity index 100% rename from reflex/.templates/apps/base/assets/icon.svg rename to reflex/.templates/apps/sidebar/assets/icon.svg diff --git a/reflex/.templates/apps/base/assets/logo.svg b/reflex/.templates/apps/sidebar/assets/logo.svg similarity index 100% rename from reflex/.templates/apps/base/assets/logo.svg rename to reflex/.templates/apps/sidebar/assets/logo.svg diff --git a/reflex/.templates/apps/base/assets/paneleft.svg b/reflex/.templates/apps/sidebar/assets/paneleft.svg similarity index 100% rename from reflex/.templates/apps/base/assets/paneleft.svg rename to reflex/.templates/apps/sidebar/assets/paneleft.svg diff --git a/reflex/.templates/apps/base/code/__init__.py b/reflex/.templates/apps/sidebar/code/__init__.py similarity index 100% rename from reflex/.templates/apps/base/code/__init__.py rename to reflex/.templates/apps/sidebar/code/__init__.py diff --git a/reflex/.templates/apps/base/code/components/__init__.py b/reflex/.templates/apps/sidebar/code/components/__init__.py similarity index 100% rename from reflex/.templates/apps/base/code/components/__init__.py rename to reflex/.templates/apps/sidebar/code/components/__init__.py diff --git a/reflex/.templates/apps/base/code/components/sidebar.py b/reflex/.templates/apps/sidebar/code/components/sidebar.py similarity index 100% rename from reflex/.templates/apps/base/code/components/sidebar.py rename to reflex/.templates/apps/sidebar/code/components/sidebar.py diff --git a/reflex/.templates/apps/base/code/pages/__init__.py b/reflex/.templates/apps/sidebar/code/pages/__init__.py similarity index 100% rename from reflex/.templates/apps/base/code/pages/__init__.py rename to reflex/.templates/apps/sidebar/code/pages/__init__.py diff --git a/reflex/.templates/apps/base/code/pages/dashboard.py b/reflex/.templates/apps/sidebar/code/pages/dashboard.py similarity index 100% rename from reflex/.templates/apps/base/code/pages/dashboard.py rename to reflex/.templates/apps/sidebar/code/pages/dashboard.py diff --git a/reflex/.templates/apps/base/code/pages/index.py b/reflex/.templates/apps/sidebar/code/pages/index.py similarity index 100% rename from reflex/.templates/apps/base/code/pages/index.py rename to reflex/.templates/apps/sidebar/code/pages/index.py diff --git a/reflex/.templates/apps/base/code/pages/settings.py b/reflex/.templates/apps/sidebar/code/pages/settings.py similarity index 100% rename from reflex/.templates/apps/base/code/pages/settings.py rename to reflex/.templates/apps/sidebar/code/pages/settings.py diff --git a/reflex/.templates/apps/base/code/base.py b/reflex/.templates/apps/sidebar/code/sidebar.py similarity index 100% rename from reflex/.templates/apps/base/code/base.py rename to reflex/.templates/apps/sidebar/code/sidebar.py diff --git a/reflex/.templates/apps/base/code/state.py b/reflex/.templates/apps/sidebar/code/state.py similarity index 100% rename from reflex/.templates/apps/base/code/state.py rename to reflex/.templates/apps/sidebar/code/state.py diff --git a/reflex/.templates/apps/base/code/styles.py b/reflex/.templates/apps/sidebar/code/styles.py similarity index 100% rename from reflex/.templates/apps/base/code/styles.py rename to reflex/.templates/apps/sidebar/code/styles.py diff --git a/reflex/.templates/apps/base/code/templates/__init__.py b/reflex/.templates/apps/sidebar/code/templates/__init__.py similarity index 100% rename from reflex/.templates/apps/base/code/templates/__init__.py rename to reflex/.templates/apps/sidebar/code/templates/__init__.py diff --git a/reflex/.templates/apps/base/code/templates/template.py b/reflex/.templates/apps/sidebar/code/templates/template.py similarity index 100% rename from reflex/.templates/apps/base/code/templates/template.py rename to reflex/.templates/apps/sidebar/code/templates/template.py diff --git a/reflex/reflex.py b/reflex/reflex.py index 1c4877bf1..55f1fae65 100644 --- a/reflex/reflex.py +++ b/reflex/reflex.py @@ -116,7 +116,7 @@ def init( None, metavar="APP_NAME", help="The name of the app to initialize." ), template: constants.Templates.Kind = typer.Option( - constants.Templates.Kind.BASE.value, + constants.Templates.Kind.BLANK.value, help="The template to initialize the app with.", ), loglevel: constants.LogLevel = typer.Option( diff --git a/reflex/utils/prerequisites.py b/reflex/utils/prerequisites.py index 7aad162e5..ed9f9c0ce 100644 --- a/reflex/utils/prerequisites.py +++ b/reflex/utils/prerequisites.py @@ -266,7 +266,7 @@ def initialize_app_directory(app_name: str, template: constants.Templates.Kind): # Rename the template app to the app name. path_ops.mv(constants.Templates.Dirs.CODE, app_name) path_ops.mv( - os.path.join(app_name, template.value + constants.Ext.PY), + os.path.join(app_name, template_dir.name + constants.Ext.PY), os.path.join(app_name, app_name + constants.Ext.PY), )