Alex 1 жил өмнө
parent
commit
b0a45b882e
5 өөрчлөгдсөн 14 нэмэгдсэн , 1 устгасан
  1. 1 0
      .gitignore
  2. 3 0
      core/settings.py
  3. 1 0
      core/urls.py
  4. 5 1
      install_unix.sh
  5. 4 0
      install_win.bat

+ 1 - 0
.gitignore

@@ -5,6 +5,7 @@ venv/
 webservice_running/
 design_template/
 tickets/
+landing/
 metaservicesynced/
 sharix-open-config/
 openlocal/

+ 3 - 0
core/settings.py

@@ -43,6 +43,9 @@ INSTALLED_APPS = [
     'schema_graph',
     'drf_yasg',
     'django_spaghetti',
+    'ckeditor',
+    'captcha',
+    'landing.apps.LandingConfig',
 ]
 
 MIDDLEWARE = [

+ 1 - 0
core/urls.py

@@ -18,6 +18,7 @@ urlpatterns = (
         path('design/', include("design_template.urls"), name='design'),
         #metaservice
         path('metaservicesynced/', include("metaservicesynced.urls"), name="metaservicesynced"),
+        path('landing/', include("landing.urls"), name="landing"),
         path('webservice/', include("webservice_running.urls"), name='webservice_running'), prefix_default_language=False,
     )
 

+ 5 - 1
install_unix.sh

@@ -19,11 +19,15 @@ git clone https://git.sharix-app.org/ShariX_Open/sharix-open-webservice-running.
 cd webservice_running
 git checkout unstable
 cd .. 
+git clone https://git.sharix-app.org/ShariX_Open/sharix-open-landing.git landing
+cd landing/
+git checkout landing_module
+cd ..
 python3 -m venv env
 source env/bin/activate
 pip3 install --upgrade pip
 pip3 install -r requirements.txt
-python3 manage.py makemigrations SharixAdmin design-template metaservicesynced sharix-open-config tickets webservice_running
+python3 manage.py makemigrations SharixAdmin design-template metaservicesynced sharix-open-config tickets webservice_running landing
 python3 manage.py migrate
 python3 manage.py collectstatic
 #python3 manage.py createsuperuser

+ 4 - 0
install_win.bat

@@ -19,5 +19,9 @@ git clone https://git.sharix-app.org/ShariX_Open/sharix-open-webservice-running.
 cd webservice_running/
 git checkout unstable
 cd ..
+git clone https://git.sharix-app.org/ShariX_Open/sharix-open-landing.git landing
+cd landing/
+git checkout landing_module
+cd ..
 python -m venv env
 .\env\Scripts\activate && pip install -r requirements.txt && python manage.py makemigrations && python manage.py migrate && python manage.py createsuperuser && python manage.py runserver