From 8b57298e6708af957f53941cccd51115797c461a Mon Sep 17 00:00:00 2001
From: Thejas B K <50453786+ThejasBK@users.noreply.github.com>
Date: Thu, 13 Oct 2022 19:06:25 -0600
Subject: [PATCH] =?UTF-8?q?Revert=20"Site=20to=20add=20new=20user=20inform?=
 =?UTF-8?q?ation=20has=20been=20created.=20Need=20to=20build=20the=20?=
 =?UTF-8?q?=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Index/__pycache__/models.cpython-38.pyc   | Bin 1027 -> 827 bytes
 .../Index/__pycache__/views.cpython-38.pyc    | Bin 1974 -> 1597 bytes
 MyProfiles/Index/models.py                    |  16 +++--
 MyProfiles/Index/views.py                     |  28 ++++----
 .../__pycache__/urls.cpython-38.pyc           | Bin 1335 -> 1198 bytes
 MyProfiles/MyProfiles/urls.py                 |   7 +-
 MyProfiles/templates/Index/contact.html       |   5 +-
 .../Index/{add_account.html => index.html}    |  29 ++------
 MyProfiles/templates/Index/list.html          |   2 +-
 MyProfiles/templates/Index/login.html         |  66 +++++-------------
 MyProfiles/templates/Index/privacy.html       |  26 -------
 MyProfiles/templates/Index/register.html      |   2 +-
 MyProfiles/templates/Index/remove.html        |   2 +-
 MyProfiles/templates/Index/success.html       |   2 +-
 MyProfiles/templates/Index/terms.html         |  26 -------
 15 files changed, 61 insertions(+), 150 deletions(-)
 rename MyProfiles/templates/Index/{add_account.html => index.html} (64%)
 delete mode 100644 MyProfiles/templates/Index/privacy.html
 delete mode 100644 MyProfiles/templates/Index/terms.html

diff --git a/MyProfiles/Index/__pycache__/models.cpython-38.pyc b/MyProfiles/Index/__pycache__/models.cpython-38.pyc
index a1ceee793ab7a353fc389b912658f8cb94d78042..3afe138487b7ad66325367410e3efb8018e19614 100644
GIT binary patch
delta 277
zcmZqX*v-Zl%FD~e00h7I?UI)>Pvnzfw3?`G$(F(v%%I6WvBquk9mdU4nH-D^3?Z6K
zx43c>E8=rf^U_N)Zn5N*=HyJC#bm>>lA(xeau%Z_*Ddz=_~MeH_;}vQ@0sK#OE9X`
zgM?D@ljGxyn1Ht2;&jePEON_C%}I&kDb7#MOw5VTO-;#6jN&XUPA!VhOUzBZ#Zi!0
zTwI=Clv2b4)KUa;9umO~;<5q>HXtqrNpdi<F!3=0Arn~KPm|*oXG&ILUV6S>%H%F)
eHytb{+~Tmw%}*)KNwov|jG-8077rs3G6MjlLqpjB

delta 458
zcmZuty-EW?5Z>Kf?)LI)B1i%v79s{Ajg=4tF+>YVqp`SVId7LF$Nk7&f;M6iTZ`i=
zA0eG$DL#R3uy2sJaP|yV?l2$o&3rRE%%{1awNbTNLh$<U7v3vLYuorTJv?rmBW`l*
z8F5Qs-&_<N%IOvA*r`9bIRLpp4(7-qqTm}GbHWQR#3|;?STmCsp~F<hC=qf+F+zhS
zQKis*V1bCnvxzdIc@V62Vcf7|W&32WD+v%~pG{mjn2LZadk)Pkazml$otq^0vE)l6
z8z7U7><gc^WD#QRi2*=y4d)pzZM4(3kFqo&do3-%>=F0c>sFw$37{;-l9^<zo>8*%
zB+I%`(NJAidF(Nk?<H%Haw<veP2GTnf=^vp*U}9QTN-}%`it}raudJ?PxPHBHef?A
rlIMpVTiM)qqjB8jw=(-C{UfdaZ;+zBFy`|>oWLnjLIElmj5LiO-)Ugr

diff --git a/MyProfiles/Index/__pycache__/views.cpython-38.pyc b/MyProfiles/Index/__pycache__/views.cpython-38.pyc
index 320cdd2a8852ab1dd1246488d4ae3fb1ba415d21..0309fd80dfb162b57611fc04ca30fb29a0c22eba 100644
GIT binary patch
delta 330
zcmdnSzn6zEl$V!_0SFA(U6VODC-TWKx=hq|WeH}`<eS*z#xLxdmy%kcUzD1jSzMA@
zH1SE4Fl#1Ahz+Qxm<gnlv50f>9>)LNAY+QSK?Kj_V@y7ZoIqx=7?5CKWC21xMlnV%
zMh+n40YW~;BGJjl%-6WV8o*k4CX28rF^W$%XHjG1pB%@c%?1_jXOUqPo4kfao>5`)
z8I~F~keQmCMN&YjNE}2+g9sTAAqyf{Km`BfJXQ%&c@Pt1OcX~!VsUYPc~J_`b+cKe
z7!AM%Doyrh)St}CW-4q8R0Q*nGLY@3$vIh@-9SJTWP$>SPy!LkldIU(1bBc<9wr`U
M4rUHs4k->^0Au_(`v3p{

delta 496
zcmYk3K}!Nb7>1o)XV=wTHI+?CTTNY9JSYT0w=PLRL=ashC~=k$bXP{Rf{tAcWKR8v
z4ncJ59Q}bP|4e<~rr{1e^Ugaj-#0V+roSfQr-l&?!T0#G-~Co+@jN-3)%Nl%ejjRU
zEWwg6N7))n!5m}hlaP~{jaw=6z+>)By~Egfr`z?fyz%U#9hPA&98wS$)Y6lGk-mS~
z^Td=|X&OiknvEoENqAH=$xkc>n(GKd>`I437gNb1rg)M*V}Tt64Dlduk*s)@ZITpU
za!py-S~yQ~qCqWE60Pu^w+@vYjc;JVEFzC6AT|+UL=rGpnA>;9E|+29P_E!c5rLK4
zkzr>v@~=7L272m0BB169cL)B&wS&fGaZH)94gT_G6>ysBkoP8??k(KDm|5uNN~j8<
z`tqIN9D@<QQ;r65XC-KZK5}&NP8$~fEp8%8h%%yrs3L5kDz=#dsY|*X!C?dg)Gz2M
BWyAmg

diff --git a/MyProfiles/Index/models.py b/MyProfiles/Index/models.py
index d19b247..e1267f5 100644
--- a/MyProfiles/Index/models.py
+++ b/MyProfiles/Index/models.py
@@ -2,15 +2,21 @@
 from MyProfiles import settings
 from django.contrib.auth.hashers import make_password
 
-class User(models.Model):
-    user_name = models.CharField(max_length = 264, null = False)
-    password = models.CharField(max_length = 32, null = False)
-
+# Create your models here.
 class Profile(models.Model):
     '''Profile data table handles the username and passwords of other websites for each respective user'''
+    # user_id = models.ForeignKey(models.LogIn, on_delete = models.CASCADE)
     social_media = models.CharField(max_length = 264, null = True)
     user_name = models.CharField(max_length = 264, null = True)
     password = models.CharField(max_length = 1000, null = True)
 
     def __str__(self):
-        return self.name
\ No newline at end of file
+        return self.name
+
+# class LogIn(models.Model):
+#     '''LogIn data table consists of user name and password to login to the MyProfiles portal'''
+#     user_name = models.CharField(max_length = 264, unique = True)
+#     password = models.CharField(max_length = 1000, null = True) 
+
+#     def __str__(self):
+#         return self.name
\ No newline at end of file
diff --git a/MyProfiles/Index/views.py b/MyProfiles/Index/views.py
index 24f79a4..cffbfc9 100644
--- a/MyProfiles/Index/views.py
+++ b/MyProfiles/Index/views.py
@@ -3,11 +3,8 @@
 from Index.models import Profile
 
 # Create your views here.
-def add(request):
-    return render(request, 'Index/add_account.html')
-
-def login(request):
-    return render(request, 'Index/login.html')
+def index(request):
+    return render(request, 'Index/register.html')
 
 def list_sites(request):
     sites_list = {}
@@ -35,6 +32,19 @@ def register(request):
         )
     return render(request, 'Index/success.html')
 
+# def login(request):
+#     if request.method == 'POST':
+#         user_name = request.POST.get('inputUserName')
+#         password = request.POST.get('inputPassword')
+#         try:
+#             password_check = LogIn(user_name = user_name)
+#         except:
+#             print('No such user')
+#         if password_check == pbkdf2_sha256.encrypt(password, rounds = 12000, salt_size = 32):
+#             return render(request, 'Index/list.html')
+#         else:
+#             print('Password Incorrect')
+
 def remove(request):
     if request.method == 'POST':
         social_media_site = request.POST.get('inputSocialMedia')
@@ -49,10 +59,4 @@ def remove(request):
     return render(request, 'Index/success.html')
 
 def contact(request):
-    return render(request, 'Index/contact.html')
-
-def privacy(request):
-    return render(request, 'Index/privacy.html')
-
-def terms(request):
-    return render(request, 'Index/terms.html')
\ No newline at end of file
+    return render(request, 'Index/contact.html')
\ No newline at end of file
diff --git a/MyProfiles/MyProfiles/__pycache__/urls.cpython-38.pyc b/MyProfiles/MyProfiles/__pycache__/urls.cpython-38.pyc
index cde7a8444beb04326a11a413e5b6f3a08b64c978..ab40dfd3ab61cb557654a3a8b1ffd668e8a562b3 100644
GIT binary patch
delta 159
zcmdnawT@Fel$V!_0SK<Mxh7Y$Ffcp@agYH>)&Yo%+a_w;FtSX{aN$a4i{eia3}(<2
z+W2k-li)3eTdbLRDXA5jjJH_w5_3~0?`HO6_R|!YY{cTn$UeD^MNaG%cWF^hL1IZs
mYEfSCN`@j~povAolaH_jONaoOEc`r-0*pM&JdAuW_zM7zb0U}k

delta 296
zcmZ3-xt&Wpl$V!_0SE-PdL(PGGB7*_agYHYkmCTv#rq~|+c2_D%y4l^Wla%GWzXVI
z5lZ3cWd`zufjof}5hza-$P-KvgYr0mJnj@O5HFo8N+?A<m_buw<F*w{s#UCUi76>6
zx0r#XCgUxZyu{qpDvr3E{PfH`eU)3RV8-NpW<Sj;uDF7t%(BGfN}xD9lnGQ?l3J8o
z3{nba_-P7HKEUk9#s+k45yxbH7CD6?UJx7Pg<IUEML7kDB|w#V#VZ+#L_rdwlbu<D
W6=Z-+7JeQ^0Y)BX9!5TN_zeI6WJSsV

diff --git a/MyProfiles/MyProfiles/urls.py b/MyProfiles/MyProfiles/urls.py
index 351e8d1..3a3be61 100644
--- a/MyProfiles/MyProfiles/urls.py
+++ b/MyProfiles/MyProfiles/urls.py
@@ -19,13 +19,10 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    re_path(r'^add$', views.add, name = "add"),
-    re_path(r'^login/$', views.login, name = "login"),
+    path('', views.index, name = "index"),
     re_path(r'^register/$', views.register, name = "register"),
     re_path(r'^list/$', views.list_sites, name = "list"),
     re_path(r'^remove/$', views.remove, name='remove'),
     re_path(r'^contact/$', views.contact, name='contact'),
-    re_path(r'^privacy/$', views.privacy, name='privacy'),
-    re_path(r'^terms/$', views.terms, name='terms'),
-    re_path(r'^login/$', views.login, name='login')
+    # re_path(r'^login/$', views.login, name='login')
 ]
diff --git a/MyProfiles/templates/Index/contact.html b/MyProfiles/templates/Index/contact.html
index 79b9f2a..8b85c15 100644
--- a/MyProfiles/templates/Index/contact.html
+++ b/MyProfiles/templates/Index/contact.html
@@ -11,8 +11,8 @@
         background-color: antiquewhite;
         font-size: larger;
         text-align: center;
-        width: 858w;
-        height: 78vh;
+        width: 100vw;
+        height: 100vh;
         padding: 5%;
     }
 </style>
@@ -21,6 +21,7 @@
         This page is maintaiend and handled by FreeWare lovers. <br>
         Go through our GitHub page for any information. <br>
         <a href="https://github.com/freewarelovers">GitHub</a>
+        
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/MyProfiles/templates/Index/add_account.html b/MyProfiles/templates/Index/index.html
similarity index 64%
rename from MyProfiles/templates/Index/add_account.html
rename to MyProfiles/templates/Index/index.html
index 949d73d..679cb7d 100644
--- a/MyProfiles/templates/Index/add_account.html
+++ b/MyProfiles/templates/Index/index.html
@@ -16,7 +16,7 @@
 <body style="background-color: rgb(207, 207, 207);">
     <div>
         <nav class="navbar navbar-expand-lg navbar-light bg-light">
-            <a class="navbar-brand" href="/">My Profiles</a>
+            <a class="navbar-brand" href="#">My Profiles</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
               <span class="navbar-toggler-icon"></span>
             </button>
@@ -36,28 +36,13 @@
           </nav>
     </div>
     <div>
-      <form action="/" method="post">
-        {% csrf_token %}
-        <div class="jumbotron jumbotron-fluid" style="padding: 5% 20% 5% 20%;">
-          <div class="form-group">
-            <label for="inputUserName">User Name of Scial media site</label>              
-            <input type="text" class="form-control" id="inputUserName" name="inputUserName" placeholder="Enter User Name">
-            <small class="form-text text-muted">We'll never share your user name with anyone.</small>
-          </div>
-          <div class="form-group">
-            <label for="inputPassowrd">Password</label>              
-            <input type="password" class="form-control" id="inputPassowrd" name="inputPassowrd" placeholder="Enter Password">
-          </div>
-          <br>
-          <button type="submit" class="btn btn-primary btn-lg" style="position: absolute; left: 45%;">Submit</button>
-          <br><br><br><br><br>
-        </div>
-      </form>
+        {% block body_block %}
+        {% endblock %}
     </div>
-    <div style="position: absolute; bottom: 0%; padding-left: 5%; padding-bottom: 1.5%;">
-      <p> &#9742; <a href="/contact">Contact</a></p>
-      <p>	&#x1f512; <a href="/privacy">Privacy</a></p>
-      <p>	&#9989; <a href="/terms">Terms</a></p>
+    <div style="position: absolute; bottom: 0%; padding: 5%">
+      <p> &#9742; <a href="/contact" target="_blank" rel="noopener noreferrer">Contact</a></p>
+      <p>	&#x1f512; <a href="" target="_blank" rel="noopener noreferrer">Privacy</a></p>
+      <p>	&#9989; <a href="" target="_blank" rel="noopener noreferrer">Terms</a></p>
       <p> &copy Copyrights</p>
     </div>
 </body>
diff --git a/MyProfiles/templates/Index/list.html b/MyProfiles/templates/Index/list.html
index 07ee5ed..eeac544 100644
--- a/MyProfiles/templates/Index/list.html
+++ b/MyProfiles/templates/Index/list.html
@@ -1,4 +1,4 @@
-{% extends "Index/home.html" %}
+{% extends "Index/index.html" %}
 {% block body_block %}
 <style>
     table, th, td {
diff --git a/MyProfiles/templates/Index/login.html b/MyProfiles/templates/Index/login.html
index 99d5c78..737311e 100644
--- a/MyProfiles/templates/Index/login.html
+++ b/MyProfiles/templates/Index/login.html
@@ -1,49 +1,19 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>My Profiles</title>
-
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
-
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-  </head>
-<body style="background-color: rgb(207, 207, 207);">
-    <div>
-        <nav class="navbar navbar-expand-lg navbar-light bg-light">
-            <a class="navbar-brand" href="/">My Profiles</a>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-              <span class="navbar-toggler-icon"></span>
-            </button>
-          </nav>
-    </div>
-    <form action="add" method="post">
-      {% csrf_token %}
-      <div class="jumbotron jumbotron-fluid" style="padding: 5% 20% 5% 20%;">
-        <div class="form-group">
-          <label for="inputUserName">User Name</label>              
-          <input type="text" class="form-control" id="inputUserName" name="inputUserName" placeholder="Enter User Name">
-          <small class="form-text text-muted">We'll never share your user name with anyone.</small>
-        </div>
-        <div class="form-group">
-          <label for="inputPassowrd">Password</label>              
-          <input type="password" class="form-control" id="inputPassowrd" name="inputPassowrd" placeholder="Enter Password">
-        </div>
-        <br>
-        <button type="submit" class="btn btn-primary btn-lg" style="position: absolute; left: 45%;">Submit</button>
-        <br><br><br><br><br>
+{% extends "Index/index.html" %}
+{% block body_block %}
+<div>
+    <div class="jumbotron jumbotron-fluid" style="padding: 5% 20% 5% 20%;">
+        <form action="{% url 'register' %}" method = "POST">
+            {% csrf_token %}
+            <div class="form-group">
+              <label for="inputUserName">User Name</label>              
+              <input type="text" class="form-control" id="inputUserName" name="inputUserName" placeholder="Enter User Name">
+            </div>
+            <div class="form-group">
+              <label for="inputPassowrd">Password</label>              
+              <input type="password" class="form-control" id="inputPassowrd" name="inputPassowrd" placeholder="Enter Password">
+            </div>
+            <button type="submit" class="btn btn-primary btn-lg">Submit</button>
+          </form>
       </div>
-    </form>
-    <div style="position: absolute; bottom: 0%; padding-left: 5%; padding-bottom: 1.5%;">
-      <p> &#9742; <a href="/contact">Contact</a></p>
-      <p>	&#x1f512; <a href="/privacy">Privacy</a></p>
-      <p>	&#9989; <a href="/terms">Terms</a></p>
-      <p> &copy Copyrights</p>
-    </div>
-</body>
-</html>
\ No newline at end of file
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/MyProfiles/templates/Index/privacy.html b/MyProfiles/templates/Index/privacy.html
deleted file mode 100644
index 79b9f2a..0000000
--- a/MyProfiles/templates/Index/privacy.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
-</head>
-<style>
-    .main_body {
-        background-color: antiquewhite;
-        font-size: larger;
-        text-align: center;
-        width: 858w;
-        height: 78vh;
-        padding: 5%;
-    }
-</style>
-<body>
-    <div class="main_body">
-        This page is maintaiend and handled by FreeWare lovers. <br>
-        Go through our GitHub page for any information. <br>
-        <a href="https://github.com/freewarelovers">GitHub</a>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/MyProfiles/templates/Index/register.html b/MyProfiles/templates/Index/register.html
index 5ef09b4..a1b2302 100644
--- a/MyProfiles/templates/Index/register.html
+++ b/MyProfiles/templates/Index/register.html
@@ -1,4 +1,4 @@
-{% extends "Index/home.html" %}
+{% extends "Index/index.html" %}
 {% block body_block %}
 <div>
     <div class="jumbotron jumbotron-fluid" style="padding: 5% 20% 5% 20%;">
diff --git a/MyProfiles/templates/Index/remove.html b/MyProfiles/templates/Index/remove.html
index ca0e6a5..9577570 100644
--- a/MyProfiles/templates/Index/remove.html
+++ b/MyProfiles/templates/Index/remove.html
@@ -1,4 +1,4 @@
-{% extends "Index/home.html" %}
+{% extends "Index/index.html" %}
 
 {% block body_block %}
 <div>
diff --git a/MyProfiles/templates/Index/success.html b/MyProfiles/templates/Index/success.html
index 3c2ac1d..a4b4224 100644
--- a/MyProfiles/templates/Index/success.html
+++ b/MyProfiles/templates/Index/success.html
@@ -1,4 +1,4 @@
-{% extends "Index/home.html" %}
+{% extends "Index/index.html" %}
 {% block body_block %}
 <div class="jumbotron jumbotron-fluid" style="padding: 5% 20% 5% 20%;">
     <p>You have succesfully registered a new social media site!!!</p>
diff --git a/MyProfiles/templates/Index/terms.html b/MyProfiles/templates/Index/terms.html
deleted file mode 100644
index 79b9f2a..0000000
--- a/MyProfiles/templates/Index/terms.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
-</head>
-<style>
-    .main_body {
-        background-color: antiquewhite;
-        font-size: larger;
-        text-align: center;
-        width: 858w;
-        height: 78vh;
-        padding: 5%;
-    }
-</style>
-<body>
-    <div class="main_body">
-        This page is maintaiend and handled by FreeWare lovers. <br>
-        Go through our GitHub page for any information. <br>
-        <a href="https://github.com/freewarelovers">GitHub</a>
-    </div>
-</body>
-</html>
\ No newline at end of file