diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index bc0204c6..1d181ab6 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc index 8db97a3f..dedfcb25 100644 Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc index 19f13efb..e3fd9f9e 100644 Binary files a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index dba2f518..f01a2e8a 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc new file mode 100644 index 00000000..3770d72a Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc new file mode 100644 index 00000000..e1648bde Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc new file mode 100644 index 00000000..1a9bcdae Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc new file mode 100644 index 00000000..2fa53aa2 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc new file mode 100644 index 00000000..c15ca8a8 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc differ diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index d375bccd..66fa26a5 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -148,6 +148,19 @@ def add_status_modal(request, *args, **kwargs): } return render(request, 'addstatus-modal.html', context) +def add_file_modal(request, *args, **kwargs): + context = { + + } + return render(request, 'addfile-modal.html', context) + +def add_credentials_modal(request, *args, **kwargs): + context = { + + } + return render(request, 'addcredentials-modal.html', context) + + def add_point_modal(request, *args, **kwargs): context = { @@ -202,6 +215,6 @@ def save_note(request): note.save() - return redirect('home') # Redirect to a success page or another view + # return redirect('home') # Redirect to a success page or another view return render(request, 'addnote-modal.html') \ No newline at end of file diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 0cb661db..e4a855a7 100644 Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index ffeb6ec4..1b8cabfd 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -33,8 +33,10 @@ urlpatterns = [ path('createtaskepic/', views.createtask_epic, name='createtaskepic'), path('addstatus/', views.add_status_modal, name='addstatus'), - path('updatestatus/', views.update_status_modal, name='updatestatus'), path('addnote/', views.add_note_modal, name='addnote'), + path('addfile/', views.add_file_modal, name='addfile'), + path('addcredentials/', views.add_credentials_modal, name='addcredentials'), + path('updatestatus/', views.update_status_modal, name='updatestatus'), path('save_note/', views.save_note, name='save_note'), path('addpoint/', views.add_point_modal, name='addpoint'), diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index a724cd5c..ad45f071 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -795,6 +795,10 @@ video { height: 45px; } +.h-\[48px\] { + height: 48px; +} + .h-\[500px\] { height: 500px; } @@ -924,6 +928,10 @@ video { width: 45px; } +.w-\[48px\] { + width: 48px; +} + .w-\[5\%\] { width: 5%; } @@ -948,10 +956,6 @@ video { width: 60px; } -.w-\[70\%\] { - width: 70%; -} - .w-\[70px\] { width: 70px; } diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index e0d0c0db..2efbf722 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -81,6 +81,33 @@ document.addEventListener("DOMContentLoaded", function () { iframe.style.width = "400px" }); + //ADD FILE MODAL (in the inner project page) + const addFileButton = document.getElementById("addFileButton"); + + addFileButton.addEventListener("click", () => { + const modalUrl = addFileButton.getAttribute("data-modal-url"); + + openModal(modalUrl); + + const iframe = document.getElementById("popupModalFrame"); + iframe.style.height = "320px" + iframe.style.width = "500px" + }); + + + //ADD CREDENTIALS MODAL (in the inner project page) + const addCredentialsButton = document.getElementById("addCredentialsButton"); + + addCredentialsButton.addEventListener("click", () => { + const modalUrl = addCredentialsButton.getAttribute("data-modal-url"); + + openModal(modalUrl); + + const iframe = document.getElementById("popupModalFrame"); + iframe.style.height = "300px" + iframe.style.width = "500px" + }); + //SHOW TASK MODALS //Show the update status modal diff --git a/osinaweb/templates/addcredentials-modal.html b/osinaweb/templates/addcredentials-modal.html new file mode 100644 index 00000000..63cd6b20 --- /dev/null +++ b/osinaweb/templates/addcredentials-modal.html @@ -0,0 +1,40 @@ +{% load static %} + + + + + + + + Osina + + + + + + + + +
+

Add Credential

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + + \ No newline at end of file diff --git a/osinaweb/templates/addfile-modal.html b/osinaweb/templates/addfile-modal.html new file mode 100644 index 00000000..31d42b89 --- /dev/null +++ b/osinaweb/templates/addfile-modal.html @@ -0,0 +1,91 @@ +{% load static %} + + + + + + + + Osina + + + + + + + + +
+

Add File

+ +
+ + +
+ +
+ + + +
+
+ + Upload + Document(s) + +
+
+ +
+ +
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/osinaweb/templates/create-project.html b/osinaweb/templates/create-project.html index b030a794..739a4996 100644 --- a/osinaweb/templates/create-project.html +++ b/osinaweb/templates/create-project.html @@ -49,14 +49,23 @@ + class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md"> - +
+ + +
+ + -
@@ -70,7 +79,7 @@ class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
-
+ - -->
+ +
+
+

Project Details:

+
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Deserunt repellendus temporibus et + voluptas! Mollitia error suscipit sint voluptatum perferendis earum nesciunt fuga + laudantium, sapiente ex deleniti velit, quod odio corporis? + Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem perspiciatis + molestias inventore delectus atque praesentium voluptatem itaque, aspernatur et nesciunt + dolorum omnis dolor. Aliquid natus ab laudantium pariatur porro. Consectetur! +

+
+
+
+ - +

Requirements:

@@ -222,6 +241,10 @@
{%endfor%}
+
+ +
@@ -263,6 +286,13 @@ {% endfor %} + +
+ +
+