diff --git a/README.MD b/README.MD index 07bd2a4..facb535 100755 --- a/README.MD +++ b/README.MD @@ -8,9 +8,9 @@ source virtualenv/bin/activate #### Install django python3 -m pip install django ## Start the project -django-admin startproject demo +django-admin startproject pyapp ## install an app -python3 manage.py startapp migration +python3 manage.py startapp pyapp python3 manage.py createsuperuser python3 manage.py migrate diff --git a/app/pyapp/__pycache__/settings.cpython-311.pyc b/app/pyapp/__pycache__/settings.cpython-311.pyc index 004d702..28894ec 100644 Binary files a/app/pyapp/__pycache__/settings.cpython-311.pyc and b/app/pyapp/__pycache__/settings.cpython-311.pyc differ diff --git a/app/pyapp/apps.py b/app/pyapp/apps.py index e12ac35..227ed08 100755 --- a/app/pyapp/apps.py +++ b/app/pyapp/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class MigrationConfig(AppConfig): +class PyappConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'pyapp' diff --git a/app/pyapp/settings.py b/app/pyapp/settings.py index 5e86220..6c24e75 100755 --- a/app/pyapp/settings.py +++ b/app/pyapp/settings.py @@ -37,7 +37,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'migration', + 'pyapp', ] MIDDLEWARE = [ diff --git a/artemis/artemis-data/bindings/activemq-bindings-1.bindings b/artemis/artemis-data/bindings/activemq-bindings-1.bindings deleted file mode 100755 index 7d0bb24..0000000 Binary files a/artemis/artemis-data/bindings/activemq-bindings-1.bindings and /dev/null differ diff --git a/artemis/artemis-data/bindings/activemq-bindings-2.bindings b/artemis/artemis-data/bindings/activemq-bindings-2.bindings deleted file mode 100755 index e0902c4..0000000 Binary files a/artemis/artemis-data/bindings/activemq-bindings-2.bindings and /dev/null differ diff --git a/artemis/artemis-data/journal/activemq-data-1.amq b/artemis/artemis-data/journal/activemq-data-1.amq deleted file mode 100755 index a70473e..0000000 Binary files a/artemis/artemis-data/journal/activemq-data-1.amq and /dev/null differ diff --git a/artemis/artemis-data/journal/activemq-data-2.amq b/artemis/artemis-data/journal/activemq-data-2.amq deleted file mode 100755 index a4df784..0000000 Binary files a/artemis/artemis-data/journal/activemq-data-2.amq and /dev/null differ diff --git a/artemis/artemis-data/journal/server.lock b/artemis/artemis-data/journal/server.lock deleted file mode 100755 index f47b63a..0000000 Binary files a/artemis/artemis-data/journal/server.lock and /dev/null differ diff --git a/artemis/artemis-data/journal/serverlock.1 b/artemis/artemis-data/journal/serverlock.1 deleted file mode 100755 index e69de29..0000000 diff --git a/artemis/artemis-data/journal/serverlock.2 b/artemis/artemis-data/journal/serverlock.2 deleted file mode 100755 index e69de29..0000000 diff --git a/artemis/docker-compose-amq.yml b/artemis/docker-compose-amq.yml deleted file mode 100755 index 14de2f7..0000000 --- a/artemis/docker-compose-amq.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: "2.4" - -services: - artemis: - image: docker.kotyczka.ch/artemis-adoptopenjdk-11 ##apache/activemq-artemis - platform: linux/amd64 - container_name: amq-arte - restart: unless-stopped - environment: - - ARTEMIS_USER=smx - - ARTEMIS_PASSWORD=smx - - ARTEMIS_MIN_MEMORY=1512M - - ARTEMIS_MAX_MEMORY=3024M - volumes: - - "./artemis-data:/var/lib/artemis-instance/data:rw" - ports: - - 8161:8161 - - 61613:61616 - - 5672:5672 - mem_limit: 512m - mem_reservation: 256m - networks: - - ametiq -volumes: - artemis-data: -networks: - ametiq: - external: true \ No newline at end of file diff --git a/demo/demo/settings.py b/demo/demo/settings.py index 3db5cda..1c1ce73 100755 --- a/demo/demo/settings.py +++ b/demo/demo/settings.py @@ -37,7 +37,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'migration', + 'pyapp', ] MIDDLEWARE = [ diff --git a/demo/demo/urls.py b/demo/demo/urls.py index ef3987f..3b55f59 100755 --- a/demo/demo/urls.py +++ b/demo/demo/urls.py @@ -16,12 +16,12 @@ Including another URLconf """ from django.contrib import admin from django.urls import path,include -from migration.views import migration_home -from migration.views import api_home +from pyapp.views import pyapp_home +from pyapp.views import api_home urlpatterns = [ path('admin/', admin.site.urls), - path('', include("migration.urls")), - path('migration/', migration_home), + path('', include("pyapp.urls")), + path('pyapp/', pyapp_home), path('api/', api_home), ] diff --git a/demo/migration/admin.py b/demo/migration/admin.py index 4c5c7f1..edba562 100755 --- a/demo/migration/admin.py +++ b/demo/migration/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from migration.models import ShoppingItem +from pyapp.models import ShoppingItem # Register your models here. admin.site.register(ShoppingItem) diff --git a/demo/migration/apps.py b/demo/migration/apps.py index 0a607f7..227ed08 100755 --- a/demo/migration/apps.py +++ b/demo/migration/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class MigrationConfig(AppConfig): +class PyappConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'migration' + name = 'pyapp' diff --git a/demo/migration/templates/migration.html b/demo/migration/templates/migration.html deleted file mode 100755 index 15ab06f..0000000 --- a/demo/migration/templates/migration.html +++ /dev/null @@ -1,60 +0,0 @@ - - - Migration - - - - - - -
-

Migration Apis

-
- {% for item in all_items %} -
- {{item.name}} -
- {% endfor %} - - - - diff --git a/demo/migration/urls.py b/demo/migration/urls.py index 2ca75e4..b29de25 100755 --- a/demo/migration/urls.py +++ b/demo/migration/urls.py @@ -1,8 +1,8 @@ from django.urls import path -from migration import views +from pyapp import views urlpatterns = [ path("", views.index, name= "index"), -path("", views.migration_home, name= "migration"), +path("", views.pyapp_home, name= "pyapp"), path("", views.api_home, name= "api"), ] \ No newline at end of file diff --git a/demo/migration/views.py b/demo/migration/views.py index badfc84..a7f8204 100755 --- a/demo/migration/views.py +++ b/demo/migration/views.py @@ -1,22 +1,22 @@ from django.shortcuts import render from django.http import HttpResponse, JsonResponse -from migration.models import ShoppingItem +from pyapp.models import ShoppingItem from rest_framework import viewsets -from migration.serializers import ShoppingItemSerializer +from pyapp.serializers import ShoppingItemSerializer class ShoppingItemViewSet(viewsets.ModelViewSet): queryset = ShoppingItem.objects.all() serializer_class = ShoppingItemSerializer def index(response): - return HttpResponse("Welcome to siMed Migration") + return HttpResponse("Welcome to PyApp") -def migration_home(request): +def pyapp_home(request): if request.method == 'POST': print('Received Data',request.POST['itemName']) ShoppingItem.objects.create(name= request.POST['itemName']) all_items = ShoppingItem.objects.all() - return render(request,'migration.html',{'all_items': all_items}) + return render(request,'pyapp.html',{'all_items': all_items}) def api_home(request,endpoint, params={"message": "Your JSON Repsonse"}): body = request.body diff --git a/docker-compose-queue.yml b/docker-compose-queue.yml index 2204164..43921b3 100755 --- a/docker-compose-queue.yml +++ b/docker-compose-queue.yml @@ -13,8 +13,8 @@ services: # HTTP management UI - '15672:15672' volumes: - - ./demo/migration/queue/data/:/var/lib/rabbitmq/ - - ./demo/migration/queue/log/:/var/log/rabbitmq/ + - ./demo/pyapp/queue/data/:/var/lib/rabbitmq/ + - ./demo/pyapp/queue/log/:/var/log/rabbitmq/ networks: - ametiq networks: