diff --git a/MyProfiles/Index/__pycache__/models.cpython-38.pyc b/MyProfiles/Index/__pycache__/models.cpython-38.pyc index a1ceee7..3afe138 100644 Binary files a/MyProfiles/Index/__pycache__/models.cpython-38.pyc and b/MyProfiles/Index/__pycache__/models.cpython-38.pyc differ diff --git a/MyProfiles/Index/__pycache__/views.cpython-38.pyc b/MyProfiles/Index/__pycache__/views.cpython-38.pyc index 320cdd2..0309fd8 100644 Binary files a/MyProfiles/Index/__pycache__/views.cpython-38.pyc and b/MyProfiles/Index/__pycache__/views.cpython-38.pyc differ 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 cde7a84..ab40dfd 100644 Binary files a/MyProfiles/MyProfiles/__pycache__/urls.cpython-38.pyc and b/MyProfiles/MyProfiles/__pycache__/urls.cpython-38.pyc differ 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%; } @@ -21,6 +21,7 @@ This page is maintaiend and handled by FreeWare lovers.
Go through our GitHub page for any information.
GitHub + \ 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 @@
-
- {% csrf_token %} -
-
- - - We'll never share your user name with anyone. -
-
- - -
-
- -




-
-
+ {% block body_block %} + {% endblock %}
-
-

Contact

-

🔒 Privacy

-

Terms

+
+

Contact

+

🔒 Privacy

+

Terms

© Copyrights

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 %} - -
- This page is maintaiend and handled by FreeWare lovers.
- Go through our GitHub page for any information.
- GitHub -
- - \ 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 %}
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 %}
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 %}

You have succesfully registered a new social media site!!!

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 @@ - - - - - - - Document - - - -
- This page is maintaiend and handled by FreeWare lovers.
- Go through our GitHub page for any information.
- GitHub -
- - \ No newline at end of file