Browse Source

Cancellation of recent changes & removed Windows installation script

TonyKurts 1 year ago
parent
commit
3a0151d6fa
4 changed files with 4 additions and 61 deletions
  1. 2 7
      README.md
  2. 0 54
      bin/install.bat
  3. 1 0
      core/settings.py
  4. 1 0
      requirements.txt

+ 2 - 7
README.md

@@ -4,12 +4,7 @@ The base Django project of a service web application to which other modules are
 
 
 ## Installation
 ## Installation
 
 
-Download or clone repository.
-
-For the initial configuration, run:
-
-- *bin/install.sh* - on Unix.
-- *bin/install.bat* - on Windows.
+Download or clone repository. For the initial configuration, run *bin/install.sh*.
 
 
 ## Configuration
 ## Configuration
 
 
@@ -61,4 +56,4 @@ print(auth_api.token)
 
 
 ## Launch 
 ## Launch 
 
 
-To start the web application on Unix, run *bin/start.sh*.
+To start the web application, run *bin/start.sh*.

+ 0 - 54
bin/install.bat

@@ -1,54 +0,0 @@
-@echo off
-
-REM Update repositories
-call :update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git" "tickets" "master"
-call :update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-backend.git" "metaservicesynced" "metasynced_module"
-call :update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-config.git" "conf" "master"
-call :update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-webapp-design-template.git" "design_template" "unstable"
-call :update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-webservice-running.git" "webservice_running" "unstable"
-call :update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-landing.git" "landing" "landing_module"
-git pull
-
-REM Create a Python virtual environment and activate it
-python -m venv venv
-call venv\Scripts\activate
-
-REM Upgrade pip and install requirements
-python -m pip install --upgrade pip
-python -m pip install -r requirements.txt
-
-REM Checking for core/settings_vars.py
-if exist core\settings_vars.py (
-    echo File settings_vars.py already exists
-) else (
-    copy core\_settings_vars.py core\settings_vars.py
-    echo File settings_vars.py was successfully created
-)
-
-REM Run Django migrations and other commands
-python -m manage.py makemigrations SharixAdmin metaservicesynced tickets webservice_running landing
-python -m manage.py migrate
-python -m manage.py collectstatic --clear --no-input
-
-goto :eof
-
-REM Function to check if a repository exists and perform git pull or git clone
-:update_repository
-setlocal
-set "repo_url=%~1"
-set "repo_dir=%~2"
-set "repo_branch=%~3"
-
-if exist "%repo_dir%" (
-    rem If the directory exists, then do a git pull
-    echo Updating %repo_dir%...
-    cd "%repo_dir%" || exit /b
-    git pull
-    cd ..
-) else (
-    rem If the directory does not exist, then do a git clone
-    echo Cloning %repo_url% into %repo_dir%...
-    git clone -b %repo_branch% %repo_url% %repo_dir%
-)
-endlocal
-goto :eof

+ 1 - 0
core/settings.py

@@ -41,6 +41,7 @@ INSTALLED_APPS = [
     'metaservicesynced.apps.MetaservicesyncedConfig',
     'metaservicesynced.apps.MetaservicesyncedConfig',
     'webservice_running.apps.WebserviceRunningConfig',
     'webservice_running.apps.WebserviceRunningConfig',
     'django_tables2',
     'django_tables2',
+    'schema_graph',
     "django.contrib.sites",
     "django.contrib.sites",
     "django.contrib.flatpages",
     "django.contrib.flatpages",
     "django_extensions",
     "django_extensions",

+ 1 - 0
requirements.txt

@@ -9,6 +9,7 @@ coreapi==2.3.3
 coreschema==0.0.4
 coreschema==0.0.4
 cryptography==39.0.0
 cryptography==39.0.0
 defusedxml==0.7.1
 defusedxml==0.7.1
+django-schema-graph==2.2.1
 Django==4.1.3
 Django==4.1.3
 django-debug-toolbar==4.1.0
 django-debug-toolbar==4.1.0
 django-extensions==3.2.1
 django-extensions==3.2.1