Name: {{request.session.name}}
+Location: {{request.session.location}}
+Language: {{request.session.language}}
+ + \ No newline at end of file diff --git a/richardN/django/courses/apps/courses_app/tests.py b/richardN/django/courses/apps/courses_app/tests.py new file mode 100644 index 0000000..5982e6b --- /dev/null +++ b/richardN/django/courses/apps/courses_app/tests.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.test import TestCase + +# Create your tests here. diff --git a/richardN/django/courses/apps/courses_app/urls.py b/richardN/django/courses/apps/courses_app/urls.py new file mode 100644 index 0000000..d4d7047 --- /dev/null +++ b/richardN/django/courses/apps/courses_app/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls import url +from . import views +urlpatterns = [ + url(r'^$', views.index), + url(r'^courses/process$', views.process), + url(r'^results', views.result), +] \ No newline at end of file diff --git a/richardN/django/courses/apps/courses_app/views.py b/richardN/django/courses/apps/courses_app/views.py new file mode 100644 index 0000000..3728ce7 --- /dev/null +++ b/richardN/django/courses/apps/courses_app/views.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.shortcuts import render, redirect + +# Create your views here. +def index(request): + return render(request, 'courses_app/index.html') + +def process(request): + if request.method == 'POST': + form_data = request.POST + request.session['name'] = form_data['name'] + request.session['location'] = form_data['location'] + request.session['language'] = form_data['language'] + + return redirect('/results') + +def result(request): + return render(request, 'courses_app/results.html') \ No newline at end of file diff --git a/richardN/django/courses/courses/__init__.py b/richardN/django/courses/courses/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/richardN/django/courses/courses/settings.py b/richardN/django/courses/courses/settings.py new file mode 100644 index 0000000..f26ccb6 --- /dev/null +++ b/richardN/django/courses/courses/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for courses project. + +Generated by 'django-admin startproject' using Django 1.11.7. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '(q*6puo-_9*5#2k4@&&4&#*3q&yjm8m0uk9%dem)c$4=x$jkiv' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.courses_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'courses.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'courses.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/richardN/django/courses/courses/urls.py b/richardN/django/courses/courses/urls.py new file mode 100644 index 0000000..ec1e0c5 --- /dev/null +++ b/richardN/django/courses/courses/urls.py @@ -0,0 +1,22 @@ +"""courses URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.courses_app.urls')), + url(r'^admin/', admin.site.urls), +] diff --git a/richardN/django/courses/courses/wsgi.py b/richardN/django/courses/courses/wsgi.py new file mode 100644 index 0000000..d29b7c7 --- /dev/null +++ b/richardN/django/courses/courses/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for courses project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "courses.settings") + +application = get_wsgi_application() diff --git a/richardN/django/courses/db.sqlite3 b/richardN/django/courses/db.sqlite3 new file mode 100644 index 0000000..561349d Binary files /dev/null and b/richardN/django/courses/db.sqlite3 differ diff --git a/richardN/django/courses/manage.py b/richardN/django/courses/manage.py new file mode 100644 index 0000000..7594c9c --- /dev/null +++ b/richardN/django/courses/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "courses.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/richardN/django/main/apps/__init__.py b/richardN/django/main/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/richardN/django/main/apps/blogs_app/__init__.py b/richardN/django/main/apps/blogs_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/richardN/django/main/apps/blogs_app/admin.py b/richardN/django/main/apps/blogs_app/admin.py new file mode 100644 index 0000000..13be29d --- /dev/null +++ b/richardN/django/main/apps/blogs_app/admin.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.contrib import admin + +# Register your models here. diff --git a/richardN/django/main/apps/blogs_app/apps.py b/richardN/django/main/apps/blogs_app/apps.py new file mode 100644 index 0000000..779e01b --- /dev/null +++ b/richardN/django/main/apps/blogs_app/apps.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class BlogsAppConfig(AppConfig): + name = 'blogs_app' diff --git a/richardN/django/main/apps/blogs_app/migrations/__init__.py b/richardN/django/main/apps/blogs_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/richardN/django/main/apps/blogs_app/models.py b/richardN/django/main/apps/blogs_app/models.py new file mode 100644 index 0000000..f937be2 --- /dev/null +++ b/richardN/django/main/apps/blogs_app/models.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models + +# Create your models here. +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.shortcuts import HttpResponse, redirect + +def index(request): + return HttpResponse("placeholder to later display all the list of blogs") + +def new(request): + return HttpResponse("placeholder to display a new form to create a new blog") + +def create(request): + return redirect('/') + +def show(request, blog_id): + print blog_id + return HttpResponse("placeholder to display blog {}".format(blog_id)) + +def edit(request, blog_id): + return HttpResponse("placeholder to edit blog {}".format(blog_id)) + +def delete(request, blog_id): + return redirect('/') \ No newline at end of file diff --git a/richardN/django/main/apps/blogs_app/tests.py b/richardN/django/main/apps/blogs_app/tests.py new file mode 100644 index 0000000..5982e6b --- /dev/null +++ b/richardN/django/main/apps/blogs_app/tests.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.test import TestCase + +# Create your tests here. diff --git a/richardN/django/main/apps/blogs_app/urls.py b/richardN/django/main/apps/blogs_app/urls.py new file mode 100644 index 0000000..ec613f9 --- /dev/null +++ b/richardN/django/main/apps/blogs_app/urls.py @@ -0,0 +1,5 @@ +from django.conf.urls import url +from . import views +urlpatterns = [ + url(r'^$',views.index) +] diff --git a/richardN/django/main/apps/blogs_app/views.py b/richardN/django/main/apps/blogs_app/views.py new file mode 100644 index 0000000..0b5c746 --- /dev/null +++ b/richardN/django/main/apps/blogs_app/views.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.shortcuts import render + +# Create your views here. +from django.shortcuts import render, HttpResponse, redirect + +def index(request): + response = "FML GET TO WORK OR FAIL" + return HttpResponse(response) diff --git a/richardN/django/main/apps/first_app/__init__.py b/richardN/django/main/apps/first_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/richardN/django/main/apps/first_app/admin.py b/richardN/django/main/apps/first_app/admin.py new file mode 100644 index 0000000..13be29d --- /dev/null +++ b/richardN/django/main/apps/first_app/admin.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.contrib import admin + +# Register your models here. diff --git a/richardN/django/main/apps/first_app/apps.py b/richardN/django/main/apps/first_app/apps.py new file mode 100644 index 0000000..70b2f8d --- /dev/null +++ b/richardN/django/main/apps/first_app/apps.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class FirstAppConfig(AppConfig): + name = 'first_app' diff --git a/richardN/django/main/apps/first_app/migrations/__init__.py b/richardN/django/main/apps/first_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/richardN/django/main/apps/first_app/models.py b/richardN/django/main/apps/first_app/models.py new file mode 100644 index 0000000..1dfab76 --- /dev/null +++ b/richardN/django/main/apps/first_app/models.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models + +# Create your models here. diff --git a/richardN/django/main/apps/first_app/tests.py b/richardN/django/main/apps/first_app/tests.py new file mode 100644 index 0000000..5982e6b --- /dev/null +++ b/richardN/django/main/apps/first_app/tests.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.test import TestCase + +# Create your tests here. diff --git a/richardN/django/main/apps/first_app/urls.py b/richardN/django/main/apps/first_app/urls.py new file mode 100644 index 0000000..ec613f9 --- /dev/null +++ b/richardN/django/main/apps/first_app/urls.py @@ -0,0 +1,5 @@ +from django.conf.urls import url +from . import views +urlpatterns = [ + url(r'^$',views.index) +] diff --git a/richardN/django/main/apps/first_app/views.py b/richardN/django/main/apps/first_app/views.py new file mode 100644 index 0000000..adffb9e --- /dev/null +++ b/richardN/django/main/apps/first_app/views.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.shortcuts import render + +# Create your views here. +from django.shortcuts import render, HttpResponse, redirect + +def index(request): + response = "Oh where oh where can my baby be?" + return HttpResponse(response) diff --git a/richardN/django/main/db.sqlite3 b/richardN/django/main/db.sqlite3 new file mode 100644 index 0000000..e3d7819 Binary files /dev/null and b/richardN/django/main/db.sqlite3 differ diff --git a/richardN/django/main/main/__init__.py b/richardN/django/main/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/richardN/django/main/main/settings.py b/richardN/django/main/main/settings.py new file mode 100644 index 0000000..7ecf185 --- /dev/null +++ b/richardN/django/main/main/settings.py @@ -0,0 +1,122 @@ +""" +Django settings for main project. + +Generated by 'django-admin startproject' using Django 1.11.7. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'f6whr6cb9=!xh-j)28b=eb$idrb5x^kw4p@i2#58+$aj4w096q' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.blogs_app', + 'apps.first_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'main.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'main.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/richardN/django/main/main/urls.py b/richardN/django/main/main/urls.py new file mode 100644 index 0000000..789b033 --- /dev/null +++ b/richardN/django/main/main/urls.py @@ -0,0 +1,23 @@ +"""main URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^',include('apps.blogs_app.urls')), + url(r'^',include('apps.first_app.urls')), + url(r'^admin/', admin.site.urls), +] diff --git a/richardN/django/main/main/wsgi.py b/richardN/django/main/main/wsgi.py new file mode 100644 index 0000000..424f219 --- /dev/null +++ b/richardN/django/main/main/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for main project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + +application = get_wsgi_application() diff --git a/richardN/django/main/manage.py b/richardN/django/main/manage.py new file mode 100644 index 0000000..ad5d3e7 --- /dev/null +++ b/richardN/django/main/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/richardN/django/main/templates/page1.html b/richardN/django/main/templates/page1.html new file mode 100644 index 0000000..35c4ff1 --- /dev/null +++ b/richardN/django/main/templates/page1.html @@ -0,0 +1,17 @@ + + + + +| Word | +Time Added | +
| {{word.word}} | +{{word.time}} | +
First Name: Jay
+Last Name: Patel
+Occupation: Instructor
+First Name: Jimmy
+Last Name: Jun
+Occupation: Instructor
+| Name | +Age | +Friend Since | ++ |
|---|---|---|---|
| {{friend.first_name}} {{friend.last_name}} | +{{friend.age}} | +{{friend.since}} | +
{{message}}
+ {% endfor %} + {% endif %} + {% endwith %} + + + + diff --git a/richardN/sqlFlask/logNreg/templates/show.html b/richardN/sqlFlask/logNreg/templates/show.html new file mode 100644 index 0000000..b62b31a --- /dev/null +++ b/richardN/sqlFlask/logNreg/templates/show.html @@ -0,0 +1,16 @@ + + + + + + +First name: {{user['first_name']}}
+Last name: {{user['last_name']}}
+Email: {{user['email']}}
+Password: {{user['password']}}
+ + diff --git a/richardN/sqlFlask/server.py b/richardN/sqlFlask/server.py new file mode 100644 index 0000000..8c47b81 --- /dev/null +++ b/richardN/sqlFlask/server.py @@ -0,0 +1,149 @@ +from flask import Flask, flash, redirect, render_template, request, session +from mysqlconnection import MySQLConnector +import re + +EMAIL_REGEX = re.compile(r'^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9._-]+\.[a-zA-Z]+$') +app = Flask(__name__) +app.secret_key = "thisMustBeTrumpsWallCuzItSucks" +mysql = MySQLConnector(app, 'wall') + +@app.route('/', methods=['get']) +def index(): + return render_template('index.html') + if id not in session: + session['id'] = id + +@app.route('/register', methods = ['post']) +def register(): + valid = True + newData = { + 'email': request.form['email'], + 'password': request.form['password'], + 'cPassword': request.form['cPassword'], + 'first_name': request.form['first_name'], + 'last_name': request.form['last_name'] + } + email = request.form['email'] + password = request.form['password'] + cPassword = request.form['cPassword'] + first_name = request.form['first_name'] + last_name = request.form['last_name'] + + if first_name < 0: + flash("First name must be greater than 2 characters") + valid = False + elif not first_name.isalpha(): + flash("First name must contain only letters") + valid = False + + if last_name < 0: + flash("Last name must be greater than 2 characters") + valid = False + elif not last_name.isalpha(): + flash("Last name must contain only letters") + valid = False + + if len(email) < 0 or len(password) < 0 or len(cPassword) < 0 : + flash("Email and password required") + valid = False + elif len(password) < 8: + flash("Password too short must be 8 characters") + valid = False + elif password != cPassword: + flash("Passwords dont match") + valid = False + elif not EMAIL_REGEX.match(email): + flash("Not a valid email") + valid = False + + if valid: + query = "SELECT email FROM users WHERE email = :email" + emails = mysql.query_db(query, {'email':email}) + if emails: + flash("Email already taken") + else: + query = "INSERT INTO users (first_name, last_name, email, password, created_at, updated_at) VALUES (:first_name, :last_name, :email, :password, NOW(), NOW())" + session['user_id'] = mysql.query_db(query, newData) + print session['user_id'] + print "registered!" + return redirect('/wall') + + return redirect('/') + +@app.route('/login', methods = ['POST']) +def login(): + valid = True + userData = { + 'user_email': request.form['user_email'], + 'user_password': request.form['user_password'], + } + if request.form['user_email'] < 2 : + valid = False + flash("Invalid Email") + elif request.form['user_password'] < 2: + valid = False + flash("Invalid Password") + if valid: + query = "SELECT * FROM users WHERE email = :email" + users = mysql.query_db(query, {'email':userData['user_email']}) + if len(users) > 0: + user = users[0] + session['user_id'] = user['id'] + return redirect('/wall') + else: + flash("Login failed") + return redirect ('/') + else: + flash("User not found") + return redirect ('/') + +@app.route('/logoff') +def logoff(): + session.pop('user_id') + return redirect('/') + +@app.route('/wall') +def wall(): + if 'user_id' not in session: + return redirect('/') + + query = "SELECT messages.id, messages.message, users.first_name AS user FROM messages JOIN users on users.id = messages.user_id ORDER BY 'created_at' DESC" + messages = mysql.query_db(query) + + query = "SELECT comments.id, comment, message_id, first_name AS user FROM comments JOIN users on users.id = comments.user_id ORDER BY 'created_at' DESC" + comments = mysql.query_db(query) + + mysql.query_db(query) + return render_template('wall.html', messages=messages, comments=comments) + +@app.route('/messages', methods=["post"]) +def newMessage(): + message = request.form['message'] + if message =="": + return redirect('/wall') + + query = "INSERT INTO messages (message, user_id, created_at) VALUES (:message, :user_id, NOW())" + data = {'message':message, 'user_id': session['user_id']} + + mysql.query_db(query, data) + return redirect('/wall') + +@app.route('/comments', methods=["post"]) +def newComment(): + message_id = request.form['message_id'] + comment = request.form['comment'] + + if comment =="": + return redirect('/wall') + + query = "INSERT INTO comments (comment, created_at, message_id, user_id) VALUES (:comment, NOW(), :message_id, :user_id)" + data = {'comment':comment, 'message_id':message_id, 'user_id': session['user_id']} + + mysql.query_db(query, data) + return redirect('/wall') + + + + + +app.run(debug=True) diff --git a/richardN/sqlFlask/wall/dumpWall.sql b/richardN/sqlFlask/wall/dumpWall.sql new file mode 100644 index 0000000..a771636 --- /dev/null +++ b/richardN/sqlFlask/wall/dumpWall.sql @@ -0,0 +1,73 @@ +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; + +-- ----------------------------------------------------- +-- Schema wall +-- ----------------------------------------------------- +CREATE SCHEMA IF NOT EXISTS `wall` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ; +USE `wall` ; + +-- ----------------------------------------------------- +-- Table `wall`.`users` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `wall`.`users` ( + `id` INT NOT NULL, + `first_name` VARCHAR(255) NULL, + `last_name` VARCHAR(255) NULL, + `email` VARCHAR(255) NULL, + `password` VARCHAR(255) NULL, + `created_at` VARCHAR(255) NULL, + `updated_at` VARCHAR(255) NULL, + PRIMARY KEY (`id`)) +ENGINE = InnoDB; + + +-- ----------------------------------------------------- +-- Table `wall`.`messages` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `wall`.`messages` ( + `id` INT NOT NULL AUTO_INCREMENT, + `users_id` INT NOT NULL, + `message` TEXT NULL, + `created_at` VARCHAR(255) NULL, + `updated_at` VARCHAR(255) NULL, + PRIMARY KEY (`id`), + INDEX `fk_messages_users1_idx` (`users_id` ASC), + CONSTRAINT `fk_messages_users1` + FOREIGN KEY (`users_id`) + REFERENCES `wall`.`users` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +ENGINE = InnoDB; + + +-- ----------------------------------------------------- +-- Table `wall`.`comments` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `wall`.`comments` ( + `id` INT NOT NULL AUTO_INCREMENT, + `users_id` INT NOT NULL, + `messages_id` INT NOT NULL, + `comment` TEXT NULL, + `created_at` VARCHAR(255) NULL, + `updated_at` VARCHAR(255) NULL, + PRIMARY KEY (`id`), + INDEX `fk_comments_users_idx` (`users_id` ASC), + INDEX `fk_comments_messages1_idx` (`messages_id` ASC), + CONSTRAINT `fk_comments_users` + FOREIGN KEY (`users_id`) + REFERENCES `wall`.`users` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION, + CONSTRAINT `fk_comments_messages1` + FOREIGN KEY (`messages_id`) + REFERENCES `wall`.`messages` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +ENGINE = InnoDB; + + +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; diff --git a/richardN/sqlFlask/wall/dumpWall1.mwb b/richardN/sqlFlask/wall/dumpWall1.mwb new file mode 100644 index 0000000..8c6862f Binary files /dev/null and b/richardN/sqlFlask/wall/dumpWall1.mwb differ diff --git a/richardN/sqlFlask/wall/mysqlconnection.py b/richardN/sqlFlask/wall/mysqlconnection.py new file mode 100644 index 0000000..a12daeb --- /dev/null +++ b/richardN/sqlFlask/wall/mysqlconnection.py @@ -0,0 +1,40 @@ +""" import the necessary modules """ +from flask_sqlalchemy import SQLAlchemy +from sqlalchemy.sql import text +# Create a class that will give us an object that we can use to connect to a database +class MySQLConnection(object): + def __init__(self, app, db): + config = { + 'host': 'localhost', + 'database': db, # we got db as an argument + 'user': 'root', + 'password': 'root', + 'port': '3306' # change the port to match the port your SQL server is running on + } + # this will use the above values to generate the path to connect to your sql database + DATABASE_URI = "mysql://{}:{}@127.0.0.1:{}/{}".format(config['user'], config['password'], config['port'], config['database']) + app.config['SQLALCHEMY_DATABASE_URI'] = DATABASE_URI + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True + # establish the connection to database + self.db = SQLAlchemy(app) + # this is the method we will use to query the database + def query_db(self, query, data=None): + result = self.db.session.execute(text(query), data) + if query[0:6].lower() == 'select': + # if the query was a select + # convert the result to a list of dictionaries + list_result = [dict(r) for r in result] + # return the results as a list of dictionaries + return list_result + elif query[0:6].lower() == 'insert': + # if the query was an insert, return the id of the + # commit changes + self.db.session.commit() + # row that was inserted + return result.lastrowid + else: + # if the query was an update or delete, return nothing and commit changes + self.db.session.commit() +# This is the module method to be called by the user in server.py. Make sure to provide the db name! +def MySQLConnector(app, db): + return MySQLConnection(app, db) diff --git a/richardN/sqlFlask/wall/server.py b/richardN/sqlFlask/wall/server.py new file mode 100644 index 0000000..f928e5c --- /dev/null +++ b/richardN/sqlFlask/wall/server.py @@ -0,0 +1,124 @@ +from flask import Flask, flash, redirect, render_template, request, session +from mysqlconnection import MySQLConnector +import re + +EMAIL_REGEX = re.compile(r'^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9._-]+\.[a-zA-Z]+$') +app = Flask(__name__) +app.secret_key = "imBuildingThisWallForMeNotTRUMP!" + +mysql = MySQLConnector(app, "wall") + +@app.route('/', methods=['GET']) +def index(): + return render_template('root.html') + if id not in session: + session["id"] = id + +@app.route('/register', methods=['POST']) +def register(): + error = True + newUser = { + 'email': request.form['email'], + 'password': request.form['password'], + 'cPassword': request.form['cPassword'], + 'first_name': request.form['first_name'], + 'last_name': request.form['last_name'] + } + email = request.form['email'] + password = request.form['password'] + cPassword = request.form['cPassword'] + first_name = request.form['first_name'] + last_name = request.form['last_name'] + + if first_name < 0: + flash("First name field empty") + error = False + if last_name < 0: + flash("Last name field empty") + error = False + if len(email) < 0 or len(password) < 0 or len(cPassword) < 0: + flash("email and password is missing") + elif len(password) < 8: + flash("password not long enough") + error = False + elif password != cPassword: + flash("passwords don't match") + error = False + elif EMAIL_REGEX.match(email): + flash("Email not valid") + error = False + if error: + query = "SELECT email FROM users WHERE email = :email" + emails = mysql.query_db(query,{'email':email}) + if emails: + flash("email not available") + else: + query = "INSERT INTO users(first_name, last_name, email, password, created_at, updated_at) VALUES (:first_name, :last_name, :email, :password, NOW(), NOW())" + session ['user_id'] = mysql.query_db(Users) + print session["user_id"] + print "You're registered" + return redirect('/wall') + return redirect ('/') + +@app.route('/login', methods = ['POST']) +def login(): + error = True + newUser = { + 'user_email': request.form['user_email'], + 'user_password': request.form['user_password'] + } + if request.form['user_email'] < 0: + error = False + flash("Invalid Email") + if request.form['user_password'] < 0: + error = False + flash("Invalid Password") + if error: + query = "SELECT * FROM users WHERE email = :email" + users = mysql.query_db(query, {'email':request.form['user_email']}) + if len(users) > 0: + user = users[0] + session['user_id'] = user['id'] + return redirect('/wall') + else: + flash("Login failed") + return redirect ('/') + else: + flash("User not found") + return redirect ('/') + +@app.route('/logoff') +def logoff(): + session.pop ('user_id') + return redirect ('/') + +@app.route('/wall') +def wall(): + if 'user_id' not in session: + return redirect ('/') + query = "SELECT messages.id, messages.message, users.first_name, messages.created_at FROM messages JOIN users ON users.id= messages.users_id ORDER BY messages.created_at DESC" + mysql.query_db(query) + return render_template('wall.html') + +@app.route('/messages', methods=["POST"]) +def newMessage(): + message = request.form['message'] + if message =="": + return redirect('/wall') + query = "INSERT INTO messages (message, user_id, created_at) VALUES (:message, :user_id, NOW())" + data = {'message':message, 'user_id': session['user_id']} + mysql.query_db(query, data) + return redirect('/wall') + +@app.route('/comments', methods=["POST"]) +def newComment(): + message_id = request.form['message_id'] + comment = request.form['comment'] + if comment =="": + return redirect('/wall') + query = "INSERT INTO comments (comment, created_at, message_id, user_id) VALUES (:comment, NOW(), :message_id, :user_id)" + data = {'comment':comment, 'message_id':message_id, 'user_id': session['user_id']} + mysql.query_db(query, data) + return redirect('/wall') + +app.run(debug=True) \ No newline at end of file diff --git a/richardN/sqlFlask/wall/static/style.css b/richardN/sqlFlask/wall/static/style.css new file mode 100644 index 0000000..e69de29 diff --git a/richardN/sqlFlask/wall/templates/root.html b/richardN/sqlFlask/wall/templates/root.html new file mode 100644 index 0000000..c60f9d6 --- /dev/null +++ b/richardN/sqlFlask/wall/templates/root.html @@ -0,0 +1,84 @@ + + + + + + + + + + +{{message}}
+ {% endfor %} + {% endif %} + {% endwith %} +