Skip to content

Commit 42eb678

Browse files
codyw9524codyw9524
authored
Merge pull request #108 from kylemarienthal/master
belt review registration start
2 parents 40428b9 + ec2cd93 commit 42eb678

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+986
-0
lines changed

‎Kyle_Marienthal/Django/belt_review/apps/__init__.py

Whitespace-only changes.

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/__init__.py

Whitespace-only changes.

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/admin.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.contrib import admin
5+
6+
# Register your models here.

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/apps.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.apps import AppConfig
5+
6+
7+
class ReviewerConfig(AppConfig):
8+
name = 'reviewer'

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/migrations/0001_initial.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.4 on 2017-08-22 20:28
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
initial = True
11+
12+
dependencies = [
13+
]
14+
15+
operations = [
16+
migrations.CreateModel(
17+
name='User',
18+
fields=[
19+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
20+
('name', models.CharField(max_length=255)),
21+
('alias', models.CharField(max_length=255)),
22+
('email', models.CharField(max_length=255)),
23+
('password', models.CharField(max_length=255)),
24+
('created_at', models.DateTimeField(auto_now_add=True)),
25+
('updated_at', models.DateTimeField(auto_now=True)),
26+
],
27+
),
28+
]

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/migrations/__init__.py

Whitespace-only changes.

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/models.py

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models
5+
6+
import bcrypt
7+
8+
# Create your models here.
9+
10+
class UserManager(models.Manager):
11+
def validate_registration(self, post):
12+
errors=[]
13+
if post['name'] == '':
14+
errors.append('fill out your damn name')
15+
if post['alias'] == '':
16+
errors.append('gimme dat code name')
17+
if len(post['email']) < 5:
18+
errors.append('email por favor')
19+
if len(post['password']) < 3:
20+
errors.append('keep it secret, keep it safe')
21+
if post['password'] != post['confpass']:
22+
errors.append('get your shit together')
23+
if not errors:
24+
user=User.objects.create(
25+
name = post['name'],
26+
alias = post['alias'],
27+
email = post['email'],
28+
password = bcrypt.hashpw(post['password'].encode(),bcrypt.gensalt(5))
29+
)
30+
return {'status':True, 'user':user}
31+
else:
32+
return {'status':False, 'errors':errors}
33+
34+
def login():
35+
pass
36+
37+
class User(models.Model):
38+
name=models.CharField(max_length=255)
39+
alias=models.CharField(max_length=255)
40+
email=models.CharField(max_length=255)
41+
password=models.CharField(max_length=255)
42+
created_at = models.DateTimeField(auto_now_add=True)
43+
updated_at = models.DateTimeField(auto_now=True)
44+
objects = UserManager()

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/static/css/style.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
*{
2+
color: green;
3+
}
4+
5+
6+
.info_stuff{
7+
display: inline-block;
8+
vertical-align: top;
9+
}

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/templates/users/books.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<title></title>
5+
<meta charset="UTF-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<link href="css/style.css" rel="stylesheet">
8+
</head>
9+
<body>
10+
<div>
11+
<h1>Recent Book Reviews</h1>
12+
<p>chunks of info about the books</p>
13+
</div>
14+
<div>
15+
<h1>Other Books With Reviews</h1>
16+
<p>in a scroll box</p>
17+
</div>
18+
</body>
19+
</html>

‎Kyle_Marienthal/Django/belt_review/apps/reviewer/templates/users/index.html

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<title></title>
5+
<meta charset="UTF-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
{% load static %}
8+
<link href="{%static 'css/style.css' %}" rel="stylesheet">
9+
</head>
10+
<body>
11+
<h1>Welcome</h1>
12+
<div class = 'info_stuff'>
13+
<h2>Register</h2>
14+
<form action = "users/register" method = "post">
15+
{% csrf_token %}
16+
<div>
17+
<label>Name:</label>
18+
</div>
19+
<input type = "text" name = "name">
20+
<div>
21+
<label>Alias:</label>
22+
</div>
23+
<input type = "text" name = "alias">
24+
<div>
25+
<label>Email:</label>
26+
</div>
27+
<input type = "text" name = "email">
28+
<div>
29+
<label>Password:</label>
30+
</div>
31+
<input type = "password" name = "password">
32+
<div>
33+
<label>Confirm PW:</label>
34+
</div>
35+
<input type = "password" name = "confpass">
36+
<div>
37+
<input type = "submit" value = "Register">
38+
</div>
39+
40+
</form>
41+
</div>
42+
43+
<div class = 'info_stuff'>
44+
<h2>Login</h2>
45+
<form class = 'info_stuff' action = "/users/login" method = "post">
46+
{% csrf_token %}
47+
<div>
48+
<label>Email:</label>
49+
</div>
50+
<input type = "text" name = "email">
51+
<div>
52+
<label>Password:</label>
53+
</div>
54+
<input type = "password" name = "password">
55+
<div>
56+
<input type = "submit" value = "Login">
57+
</div>
58+
</form>
59+
</div>
60+
{% if messages %}
61+
{% for error in messages %}
62+
<div>
63+
{{error}}
64+
</div>
65+
{% endfor %}
66+
{% endif %}
67+
</body>
68+
</html>

0 commit comments

Comments
 (0)