final renamings and databasefixes

.gitignore

@@ -12,7 +12,7 @@ __pycache__/
 
 # Apps
 tickets/
-metaservicesynced/
+dbsynce/
 conf/
 design_template/
 webservice_running/

SharixAdmin/forms.py

@@ -1,9 +1,9 @@
 from django.contrib.auth.forms import AuthenticationForm
 
-from metaservicesynced.models import *
+from dbsynce.models import *
 from .models import SharixUser
 from django import forms
-from metaservicesynced.models import ServiceType, Service
+from dbsynce.models import ServiceType, Service
 from .models import SharixUser
 from django import forms
 

SharixAdmin/tables.py

@@ -1,8 +1,8 @@
 import django_tables2 as tables
-from metaservicesynced.models import *
+from dbsynce.models import *
 from .models import *
 from django.utils.html import format_html
-from metaservicesynced.models import *
+from dbsynce.models import *
 from django.utils.translation import gettext_lazy as _
 
 class TransactionsWalletTable(tables.Table):

SharixAdmin/views/partner_info.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render
 from SharixAdmin.forms import PartnerInformationCreateForm, PartnerInformationUpdateForm
 from SharixAdmin.groups import group_required
-from metaservicesynced.models import Company
+from dbsynce.models import Company
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.views.generic.edit import UpdateView, CreateView
 from SharixAdmin.views.context import get_context

SharixAdmin/views/partners.py

@@ -3,7 +3,7 @@ from django.contrib.auth.mixins import UserPassesTestMixin
 from SharixAdmin.groups import group_required
 from SharixAdmin.tables import PartnersTable
 from django.contrib.auth.decorators import login_required
-from metaservicesynced.models import Company
+from dbsynce.models import Company
 from SharixAdmin.views.context import get_context
 from django.http import JsonResponse
 from django.utils.translation import gettext as _

SharixAdmin/views/provider.py

@@ -1,7 +1,7 @@
 from django_tables2 import SingleTableView
 from SharixAdmin.groups import group_required
 from SharixAdmin.tables import ProviderTable
-from metaservicesynced.models import Provider
+from dbsynce.models import Provider
 from django.contrib.auth.decorators import login_required
 from SharixAdmin.views.context import get_context
 from django.http import JsonResponse

SharixAdmin/views/resource.py

@@ -3,7 +3,7 @@ from django.contrib.auth.mixins import UserPassesTestMixin
 from SharixAdmin.groups import group_required
 from SharixAdmin.tables import ResourceTable
 from django.contrib.auth.decorators import login_required
-from metaservicesynced.models import Resource
+from dbsynce.models import Resource
 from SharixAdmin.views.context import get_context
 from django.http import JsonResponse
 from django.utils.translation import gettext as _

SharixAdmin/views/service.py

@@ -1,7 +1,7 @@
 from django_tables2 import SingleTableView
 from SharixAdmin.groups import group_required
 from SharixAdmin.tables import ServiceTable
-from metaservicesynced.models import Service
+from dbsynce.models import Service
 from django.contrib.auth.decorators import login_required
 from SharixAdmin.views.context import get_context
 from django.contrib.auth.mixins import UserPassesTestMixin

SharixAdmin/views/service_info.py

@@ -1,7 +1,7 @@
 from SharixAdmin.forms import ServiceInformationCreateForm, ServiceInformationUpdateForm
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.views.generic.edit import CreateView, UpdateView
-from metaservicesynced.models import Service
+from dbsynce.models import Service
 from SharixAdmin.views.context import get_context
 from django.urls import reverse
 from django.utils.translation import gettext as _

SharixAdmin/views/service_tariff.py

@@ -3,7 +3,7 @@ from django.contrib.auth.mixins import UserPassesTestMixin
 from django.views.generic.edit import UpdateView, CreateView
 from SharixAdmin.tables import ServiceTariffTable
 from SharixAdmin.forms import ServiceTariffCreateForm, ServiceTariffUpdateForm
-from metaservicesynced.models import Service
+from dbsynce.models import Service
 from django.urls import reverse
 from SharixAdmin.views.context import get_context
 from django.utils.translation import gettext as _

SharixAdmin/views/service_type.py

@@ -3,7 +3,7 @@ from django.views.generic.edit import UpdateView, CreateView, DeleteView
 from SharixAdmin.tables import ServiceTypeTable
 from django.contrib.auth.mixins import UserPassesTestMixin
 from SharixAdmin.forms import ServiceTypeCreateForm, ServiceTypeUpdateForm
-from metaservicesynced.models import ServiceType
+from dbsynce.models import ServiceType
 from django.urls import reverse
 from SharixAdmin.views.context import get_context
 from django.utils.translation import gettext as _

bin/install.bat

@@ -22,7 +22,7 @@ endlocal
 
 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-backend.git" "dbsynce" "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"
@@ -46,6 +46,6 @@ if exist core\settings_vars.py (
 )
 
 REM Run Django migrations and other commands
-python manage.py makemigrations SharixAdmin metaservicesynced tickets webservice_running landing
+python manage.py makemigrations SharixAdmin dbsynce tickets webservice_running landing
 python manage.py migrate
 python manage.py collectstatic --clear --no-input

bin/install.sh

@@ -21,7 +21,7 @@ update_repository() {
 
 # Update repositories
 update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git" "tickets" "master"
-update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-backend.git" "metaservicesynced" "metasynced_module"
+update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-backend.git" "dbsynce" "metasynced_module"
 update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-settings.git" "conf" "master"
 update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-webapp-design-template.git" "design_template" "unstable"
 update_repository "https://git.sharix-app.org/ShariX_Open/sharix-open-webservice-running.git" "webservice_running" "unstable"
@@ -45,7 +45,7 @@ else
 fi
 
 # Run Django migrations and other commands
-python manage.py makemigrations SharixAdmin metaservicesynced tickets webservice_running landing
+python manage.py makemigrations SharixAdmin dbsynce tickets webservice_running landing
 python manage.py migrate
 python manage.py collectstatic -l --no-input
 

core/_settings_vars.py

@@ -1,49 +0,0 @@
-########
-#
-# Django
-#
-########
-
-DEBUG = True
-SECRET_KEY = 'django-insecure-$eodx2ilnb*djkahfguiwegbwelgbnajl*u$qkt7j-b)7t1iq'
-CSRF_TRUSTED_ORIGINS = []
-ALLOWED_HOSTS = ["127.0.0.1"]
-INTERNAL_IPS = ["127.0.0.1"]
-NAME_SYSTEM = "ShariX"
-API_URL = 'http://127.0.0.1:8000'
-
-########
-#
-# Database
-#
-########
-
-DB_NAME = None
-DB_USER = None
-DB_PASSWORD = None
-DB_HOST = None
-DB_PORT = 5432
-
-########
-#
-# Gunicorn
-#
-########
-
-BIND = "127.0.0.1:8000"
-
-########
-#
-# ejabber
-#
-########
-
-EJ_PROTOCOL = "http"
-EJ_IP = "10.0.20.9"
-EJ_PORT = "5280"
-EJ_URL = EJ_PROTOCOL + "://" + EJ_IP + ":" + EJ_PORT + "/" + "api/"
-EJ_SERVICE = "chat.ej.sharix-app.org"
-EJ_HOST = "ej.sharix-app.org"
-
-# Service name that is used in generating ejabber rooms
-WEBSERVICE_NAME = "open" 

core/config.py

@@ -28,7 +28,7 @@ class ConfigDjango:
         'django.contrib.staticfiles',
         'SharixAdmin.apps.SharixadminConfig',
         'tickets.apps.TicketsConfig',
-        'metaservicesynced.apps.MetaservicesyncedConfig',
+        'dbsynce.apps.MetaservicesyncedConfig',
         'django_tables2',
         "django.contrib.sites",
         "django.contrib.flatpages",
@@ -349,7 +349,7 @@ class ConfigAPI:
     SPAGHETTI_SAUCE = {
         'apps': ['auth', 'SharixAdmin', 
                 'tickets', 'admin', 
-                'flatpages', 'sessions', 'sites', 'metaservicesynced'],
+                'flatpages', 'sessions', 'sites', 'dbsynce'],
         'show_fields': False,
         'show_proxy':True,
     }

core/settings.py

@@ -38,7 +38,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'SharixAdmin.apps.SharixadminConfig',
     'tickets.apps.TicketsConfig',
-    'metaservicesynced.apps.MetaservicesyncedConfig',
+    'dbsynce.apps.MetaservicesyncedConfig',
     'webservice_running.apps.WebserviceRunningConfig',
     'django_tables2',
     "django.contrib.sites",
@@ -391,7 +391,7 @@ REST_FRAMEWORK = {
 SPAGHETTI_SAUCE = {
     'apps': ['auth', 'SharixAdmin', 
                 'tickets', 'admin', 
-                'flatpages', 'sessions', 'sites', 'metaservicesynced'],
+                'flatpages', 'sessions', 'sites', 'dbsynce'],
     'show_fields': False,
     'show_proxy':True,
 }

core/urls.py

@@ -13,7 +13,7 @@ urlpatterns = [
         path('', include('SharixAdmin.urls')),
         path('tickets/', include('tickets.urls', namespace='tickets'), name='tickets'),
         path('design/', include("design_template.urls"), name='design'),
-        path('metaservicesynced/', include("metaservicesynced.urls"), name="metaservicesynced"),
+        path('dbsynce/', include("dbsynce.urls"), name="dbsynce"),
         path('webservice/', include("webservice_running.urls"), name='webservice_running'),
         path('landing/', include("landing.urls"), name="landing"),
         prefix_default_language=False,