Successfully created a second form for text submission, including a new model and table for text submission(only redirects to a different page with submitted text).

omerert · omerert · commit 31c9a7d54fa2 · 2024-04-09T22:37:13.000-05:00
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/nobiasapp/forms.py b/nobiasapp/forms.py
@@ -1,10 +1,17 @@
 from django import forms
-from .models import Link
+from .models import Link, Text
 
 class SubmitLinkForm(forms.ModelForm):
     class Meta:
         model = Link
         fields = ['link']
         widgets = {
             'link': forms.URLInput(attrs={'style': 'width: 100%; padding: 10px; margin-bottom: 10px; border: 1px solid #ccc; border-radius: 5px; box-sizing: border-box;'}),
+        }
+class SubmitTextBoxForm(forms.ModelForm):
+    class Meta:
+        model = Text
+        fields = ['text']
+        widgets = {
+            'text': forms.TextInput(attrs={'style': 'width: 100%; padding: 10px; margin-bottom: 10px; border: 1px solid #ccc; border-radius: 5px; box-sizing: border-box;'}),
         }
diff --git a/nobiasapp/migrations/0003_text.py b/nobiasapp/migrations/0003_text.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0 on 2024-04-10 03:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nobiasapp', '0002_rename_submittedlink_link'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Text',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.CharField(max_length=1000)),
+            ],
+        ),
+    ]
diff --git a/nobiasapp/models.py b/nobiasapp/models.py
@@ -3,6 +3,9 @@
 # Create your models here.
 class Link(models.Model):
     link = models.URLField()
-
     def __str__(self):
-        return self.link
+        return self.link
+class Text(models.Model):
+    text = models.CharField(max_length=1000)
+    def __str__(self):
+        return self.text
diff --git a/nobiasapp/templates/newPage.html b/nobiasapp/templates/newPage.html
@@ -186,7 +186,30 @@
             margin-top: 20px;
             color: #777; /
         }
+        .submitBox{
+            background-color: #007bff;
+            color: #fff;
+            width: 100%;
+            padding: 10px; 
+            margin-bottom: 10px; 
+            border: 1px solid #ccc; 
+            border-radius: 5px; 
+            box-sizing: border-box;
+        }
     </style>
+    <script>
+        function toggleForm() {
+            var linkForm = document.getElementById("link-form");
+            var textBoxForm = document.getElementById("text-box-form");
+            if (linkForm.style.display === "none") {
+                linkForm.style.display = "block";
+                textBoxForm.style.display = "none";
+            } else {
+                linkForm.style.display = "none";
+                textBoxForm.style.display = "block";
+            }
+        }
+    </script>
 </head>
 
 <body>
@@ -228,20 +251,26 @@ <h1>NoBias</h1>
             <p>NoBias is a program that will detect bias in a news article. We will detect bias by analyzing the tone,
                 sentiment, and diction of a news article.</p>
         </div>
-        <form method="post" action="{% url 'home' %}" onsubmit="showLoader()"
-            style="display: flex; flex-direction: column; align-items: center; padding: 20px; margin-top: 70px;">
-            
-            {% csrf_token %}
-            <div class="linkbox" style="display: flex; flex-direction: column; width: 70%; align-items: center; ">
-                {{ form.link }}
-                <button type="submit"
-                    style="width: 100%; padding: 10px; background-color: #007bff; color: #fff; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-search"></i>Submit</button>
-            </div>
-        </form>
-            <!-- <div class="search-bar">
-                <input type="text" placeholder="Search...">
-                <button type="submit"><i class="fas fa-search"></i></button>
-            </div>   -->
+        <button onclick="toggleForm()">Toggle Submit Box</button>
+
+        <div id="link-form">
+            <form method="post">
+                {% csrf_token %}
+                {{ link_form }}
+                <button type="submit" class="submitBox">Submit Link</button>
+            </form>
+        </div>
+
+        <div id="text-box-form" style="display: none;">
+            <form method="post">
+                {% csrf_token %}
+                {{ text_form }}
+                <button type="submit" class="submitBox">Submit Text</button>
+            </form>
+        </div>
+
+        
+           
             <div class="feature">
                 <div class="feature-item">
                     <h3>Detect and Measure Bias</h3>
diff --git a/nobiasapp/templates/textPage.html b/nobiasapp/templates/textPage.html
@@ -0,0 +1,12 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+   <h1> {{ thisVar }}</h1>
+</body>
+</html>
diff --git a/nobiasapp/views.py b/nobiasapp/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render
 from nlpFiles.getTextFromWeb import polarityRating, highRatedSent, getTitle, webScrape
-from .forms import SubmitLinkForm
+from .forms import SubmitLinkForm, SubmitTextBoxForm
 
 # def submitLink(request):
 #     if request.method == 'POST':
@@ -23,21 +23,29 @@ def aboutus(request):
     return render(request, 'aboutus.html')
 def tech(request):
     return render(request, 'tech.html')
+
 def home(request):
     if request.method == 'POST':
-        form = SubmitLinkForm(request.POST)
-        if form.is_valid():
-            link_object = form.save()  # This saves the link to the database
-            weblink = link_object.link  # Access the link and store it in thisVar
-            # You can now use thisVar for other Python code
+        link_form = SubmitLinkForm(request.POST)
+        text_form = SubmitTextBoxForm(request.POST)
+        
+        if link_form.is_valid():
+            link_object = link_form.save()
+            weblink = link_object.link
             paragraph = []
             pageSource = webScrape(weblink)
             title = getTitle(pageSource)
             polarityRating(paragraph, pageSource)
             highValuedList = highRatedSent(paragraph)
-            # Redirect or render a success page
             return render(request, 'successPage.html', {'thisVar': paragraph, "highValuedList": highValuedList, 'title': title})
+        
+        elif text_form.is_valid():
+            text_object = text_form.save()
+            # Do something with the text form submission
+            return render(request, 'textPage.html', {'thisVar': text_object})  # Render a success page for text form submission
+        
     else:
-        form = SubmitLinkForm()
+        link_form = SubmitLinkForm()
+        text_form = SubmitTextBoxForm()
 
-    return render(request, './newPage.html', {'form': form})
+    return render(request, './newPage.html', {'link_form': link_form, 'text_form': text_form})
