added machinery start app

anurag6569201 · Jul 26, 2024 · f3f4ce0 · f3f4ce0
1 parent 86626f8
commit f3f4ce0
Show file tree

Hide file tree

Showing 32 changed files with 72 additions and 7 deletions.
diff --git a/blinklog/__pycache__/settings.cpython-312.pyc b/blinklog/__pycache__/settings.cpython-312.pyc
diff --git a/blinklog/__pycache__/urls.cpython-312.pyc b/blinklog/__pycache__/urls.cpython-312.pyc
diff --git a/blinklog/settings.py b/blinklog/settings.py
@@ -42,6 +42,9 @@
     # custom apps
     'userauths',
     'core',
+
+    # custom apps
+    'machinery',
 ]
 
 MIDDLEWARE = [

diff --git a/blinklog/urls.py b/blinklog/urls.py
@@ -25,6 +25,9 @@
     # authentication
     path('',include('core.urls')),
     path('user/',include('userauths.urls')),
+
+    # custom apps
+    path('machinery/',include('machinery.urls')),
 ]
 
 urlpatterns += static(settings.STATIC_URL,document_root=settings.STATIC_ROOT)

diff --git a/core/templates/core/app/welcome.html b/core/templates/core/app/welcome.html
@@ -14,7 +14,7 @@ <h1 class="feature-main-text">IMC <span>Inventory</span></h1>
     <div class="col-md-6 row features-section">
       <div class="row col-md-5" style="flex-direction: column;">
         <div class="feature col-md-12">
-          <a href="">
+          <a href="{% url 'machinery:machinery' %}">
             <div class="feature-content feature-content1">
               <div class="main-text-li" style="display: flex;align-items: left;justify-content: left;flex-direction: column;">
                 <span class="text-features">Machinery</span>

diff --git a/core/templates/core/elements/main-script.html b/core/templates/core/elements/main-script.html
@@ -3,4 +3,7 @@
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
 
 <!-- global js -->
-<script src="{% static 'core/js/background.js' %}"></script>
+<script src="{% static 'core/js/background.js' %}"></script>
+
+<!-- welcome js -->
+<script src="{% static 'core/js/welcome.js' %}"></script>
diff --git a/core/templates/core/elements/main-style.html b/core/templates/core/elements/main-style.html
@@ -12,3 +12,6 @@
 
 <!-- global css -->
 <link rel="stylesheet" href="{% static 'core/css/background.css' %}">
+
+<!-- welcome css -->
+<link rel="stylesheet" href="{% static 'core/css/welcome.css' %}">
diff --git a/core/templates/core/elements/script.html b/core/templates/core/elements/script.html
@@ -1,3 +1 @@
 {% load static %}
-<!-- welcome js -->
-<script src="{% static 'core/js/welcome.js' %}"></script>
diff --git a/core/templates/core/elements/style.html b/core/templates/core/elements/style.html
@@ -1,3 +1 @@
 {% load static %}
-<!-- welcome css -->
-<link rel="stylesheet" href="{% static 'core/css/welcome.css' %}">
diff --git a/core/templates/core/partial/base.html b/core/templates/core/partial/base.html
@@ -6,7 +6,6 @@
 {% endblock appstyling %}
 
 {% block mainapp %}
-  {% include 'core/elements/navbar.html' %}
   {% block index %}
   {% endblock index %}
 {% endblock mainapp %}

diff --git a/core/templates/core/partial/main-base.html b/core/templates/core/partial/main-base.html
@@ -9,6 +9,7 @@
 </head>
 
 <body>
+{% include 'core/elements/navbar.html' %}
 {% block mainapp %}
 {% endblock mainapp %}
 

diff --git a/machinery/__init__.py b/machinery/__init__.py
diff --git a/machinery/__pycache__/__init__.cpython-312.pyc b/machinery/__pycache__/__init__.cpython-312.pyc
diff --git a/machinery/__pycache__/admin.cpython-312.pyc b/machinery/__pycache__/admin.cpython-312.pyc
diff --git a/machinery/__pycache__/apps.cpython-312.pyc b/machinery/__pycache__/apps.cpython-312.pyc
diff --git a/machinery/__pycache__/models.cpython-312.pyc b/machinery/__pycache__/models.cpython-312.pyc
diff --git a/machinery/__pycache__/urls.cpython-312.pyc b/machinery/__pycache__/urls.cpython-312.pyc
diff --git a/machinery/__pycache__/views.cpython-312.pyc b/machinery/__pycache__/views.cpython-312.pyc
diff --git a/machinery/admin.py b/machinery/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/machinery/apps.py b/machinery/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MachineryConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'machinery'
diff --git a/machinery/migrations/__init__.py b/machinery/migrations/__init__.py
diff --git a/machinery/migrations/__pycache__/__init__.cpython-312.pyc b/machinery/migrations/__pycache__/__init__.cpython-312.pyc
diff --git a/machinery/models.py b/machinery/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/machinery/static/machinery/css/machinery.css b/machinery/static/machinery/css/machinery.css
diff --git a/machinery/static/machinery/js/machinery.js b/machinery/static/machinery/js/machinery.js
diff --git a/machinery/templates/machinery/app/machinery.html b/machinery/templates/machinery/app/machinery.html
@@ -0,0 +1,6 @@
+{% extends 'machinery/partial/base.html' %}
+{% load static %}
+
+{% block index %}
+machinery
+{% endblock index %}
diff --git a/machinery/templates/machinery/elements/script.html b/machinery/templates/machinery/elements/script.html
@@ -0,0 +1,3 @@
+{% load static %}
+<!-- machinery js -->
+<script src="{% static 'machinery/js/machinery.js' %}"></script>
diff --git a/machinery/templates/machinery/elements/style.html b/machinery/templates/machinery/elements/style.html
@@ -0,0 +1,3 @@
+{% load static %}
+<!-- machinery css -->
+<link rel="stylesheet" href="{% static 'machinery/css/machinery.css' %}">
diff --git a/machinery/templates/machinery/partial/base.html b/machinery/templates/machinery/partial/base.html
@@ -0,0 +1,15 @@
+{% extends 'core/partial/main-base.html' %}
+{% load static %}
+
+{% block appstyling %}
+{% include 'machinery/elements/style.html' %}
+{% endblock appstyling %}
+
+{% block mainapp %}
+  {% block index %}
+  {% endblock index %}
+{% endblock mainapp %}
+
+{% block appscripting %}
+{% include 'machinery/elements/script.html' %}
+{% endblock appscripting %}
diff --git a/machinery/tests.py b/machinery/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/machinery/urls.py b/machinery/urls.py
@@ -0,0 +1,8 @@
+from django.urls import path
+from machinery import views
+
+app_name='machinery'
+
+urlpatterns=[
+    path('',views.machinery,name='machinery'),
+]
diff --git a/machinery/views.py b/machinery/views.py
@@ -0,0 +1,7 @@
+from django.shortcuts import render
+
+def machinery(request):
+    context={
+
+    }
+    return render(request,'machinery/app/machinery.html',context)
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     </head>
     <body>
+    {% include 'core/elements/navbar.html' %}
     {% block mainapp %}
     {% endblock mainapp %}
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.contrib import admin

		# Register your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.db import models

		# Create your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.test import TestCase

		# Create your tests here.