[ref] Refactor code

islam-kamel · Jul 10, 2022 · 324856b · 324856b
1 parent ed53564
commit 324856b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 41 deletions.
diff --git a/src/django_start/app/manager.py b/src/django_start/app/manager.py
@@ -7,9 +7,9 @@ def __init__(self, *args, **kwargs):
         self.__workdir = kwargs.get('workdir', None) + fr'\{self.app_name}'
         self.__views = self.workdir + r'\views.py'
         self.__urls = self.workdir + r'\urls.py'
+        self.__templates = self.workdir + r'\templates'
         self.__line_list = []
 
-
     @property
     def app_name(self):
         return self.__app_name
@@ -83,3 +83,21 @@ def create_urls(self):
             ]
             f.write(''.join(content))
             f.close()
+
+    def create_templates(self):
+        os.mkdir(self.__templates)
+        with open(fr'{self.__templates}\index.html', 'w') as f:
+            content = [
+                '<!DOCTYPE html>\n',
+                '<html lang="en">\n',
+                '<head>\n',
+                '\t<meta charset="UTF-8">\n',
+                '\t<title>Hello, Django-Start</title>\n',
+                '</head>\n',
+                '<body>\n',
+                '\t<h1 style="text-align: center"> Hello, Django-Start</h1>\n',
+                '\t<a href="https://github.com/islam-kamel/django-start"><h1 style="text-align: center">Project</h1></a>\n',
+                '</body>\n</html>'
+            ]
+            f.write(''.join(content))
+            f.close()
diff --git a/src/django_start/django_start.py b/src/django_start/django_start.py
@@ -13,58 +13,23 @@ def __init__(self, *args, **kwargs):
     def core_name(self):
         return self.__core_name
 
-    @core_name.setter
-    def core_name(self, name):
-        self.__core_name = name
-        return self.core_name
-
     @property
     def app_name(self):
         return self.__app_name
 
-    @app_name.setter
-    def app_name(self, name):
-        self.__app_name = name
-        return self.app_name
-
     @property
     def workdir(self):
         return self.__workdir
 
-    @workdir.setter
-    def workdir(self, workdir):
-        self.__workdir = workdir
-        return self.workdir
-
-    def change_dir(self):
-        os.chdir(self.workdir)
-
     def create_env(self):
-        self.change_dir()
+        os.chdir(self.workdir)
         self.env.create_env()
 
     def install_dep(self):
         os.system('pip install django')
 
     def create_project(self):
         os.system(f'django-admin startproject {self.core_name} {self.workdir}')
-        os.system(f'python manage.py startapp {self.app_name}')
-
-    def create_templates(self):
-        os.mkdir(fr'{self.workdir}\{self.app_name}\templates')
-        with open(fr'{self.workdir}\{self.app_name}\templates\index.html', 'w') as f:
-            content = [
-                '<!DOCTYPE html>\n',
-                '<html lang="en">\n',
-                '<head>\n',
-                '\t<meta charset="UTF-8">\n',
-                '\t<title>Hello, Django-Start</title>\n',
-                '</head>\n',
-                '<body>\n',
-                '\t<h1 style="text-align: center"> Hello, Django-Start</h1>\n',
-                '\t<a href="https://github.com/islam-kamel/django-start"><h1 style="text-align: center">Project</h1></a>\n',
-                '</body>\n</html>'
-            ]
-            f.write(''.join(content))
-            f.close()
 
+    def create_app(self):
+        os.system(f'python manage.py startapp {self.app_name}')
diff --git a/src/django_start/main.py b/src/django_start/main.py
@@ -31,6 +31,9 @@ def run():
     print('✨ Create Project')
     app.create_project()
     time.sleep(0.3)
+    print('✨ Create App')
+    app.create_app()
+    time.sleep(0.3)
 
     print('🔧 Update Settings')
     filemanager.update_settings()
@@ -41,7 +44,7 @@ def run():
     time.sleep(0.3)
 
     print('📝 Create Templates')
-    app.create_templates()
+    filemanager.create_templates()
     time.sleep(0.3)
 
     print('📦 Update App View')

diff --git a/src/django_start/update_files.py b/src/django_start/update_files.py
@@ -11,7 +11,6 @@ def __init__(self, *args, **kwargs):
         self.workdir = kwargs.get('workdir', None)
         os.chdir(self.workdir)
 
-
     def update_settings(self):
         return self.project.update_settings(self.app_name)
 
@@ -23,3 +22,6 @@ def create_view(self):
 
     def create_urls(self):
         self.app.create_urls()
+
+    def create_templates(self):
+        self.app.create_templates()