meet-projects · yotam18-meet · Jul 31, 2018 · Jul 31, 2018 · Jul 31, 2018 · Jul 31, 2018
diff --git a/.requirements.txt.swp b/.requirements.txt.swp
diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: gunicorn project:app
diff --git a/cities_db.py b/cities_db.py
@@ -0,0 +1,25 @@
+from project.models import *
+import geonamescache
+
+gc = geonamescache.GeonamesCache()
+cities_dict = gc.get_cities()
+
+if len(City.query.all())==0:
+	our_cities = []
+	for i in cities_dict:
+		if cities_dict[i]['countrycode'] == "IL" or cities_dict[i]['countrycode'] == "PS":
+			our_cities.append((cities_dict[i]['name'],cities_dict[i]['countrycode']))
+	our_cities.sort()
+	for c in our_cities:
+		city = City()
+		city.city = c[0]
+		print(c[0])
+		city.country = c[1]
+		db.session.add(city)
+		db.session.commit()
+		print("successful")
+		print(len(City.query.all()))
+	print("Done!")
+else:
+	print(len(City.query.all()))
+	print("Built already!")
diff --git a/initialize.sh b/initialize.sh
@@ -2,6 +2,7 @@
 
 if [[ -e y3-venv ]]; then
     source y3-venv/bin/activate
+    pip install -r requirements.txt
 else
     sudo pip install virtualenv
     virtualenv -p $(which python3) y3-venv
@@ -12,3 +13,5 @@ fi
 export FLASK_APP='project'
 export FLASK_ENV='development'
 export FLASK_DEBUG=1
+
+python3 cities_db.py
diff --git a/instance/flask.cfg b/instance/flask.cfg
@@ -5,7 +5,8 @@ BASEDIR = os.path.abspath(os.path.dirname(__file__))
 TOP_LEVEL_DIR = os.path.abspath(os.curdir)
 PROJECT_DIR = os.path.join(TOP_LEVEL_DIR, 'project')
 
-SQLALCHEMY_DATABASE_URI = "sqlite:///%s" % os.path.join(PROJECT_DIR, 'project.db')
+SQLALCHEMY_DATABASE_URI = "sqlite:///%s" % os.path.join(PROJECT_DIR, 'project.db') if os.environ['FLASK_ENV'] == 'development' else os.environ['DATABASE_URL']
+SQLALCHEMY_TRACK_MODIFICATIONS = False
 
 # Update later by using a random number generator and moving
 # the actual key outside of the source code under version control

diff --git a/migrations/README b/migrations/README
@@ -0,0 +1 @@
+Generic single-database configuration.
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
@@ -0,0 +1,45 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/migrations/script.py.mako b/migrations/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/project/JHFG.html b/project/JHFG.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title></title>
+		<link rel="stylesheet" type="text/css" href="static/css/fonts/fonts.css">
+</head>
+<body>
+	<p style="font-family: helveticaneuelight">U<p>
+</body>
+</html>
diff --git a/project/__init__.py b/project/__init__.py
@@ -1,6 +1,7 @@
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 from flask_login import LoginManager
+from flask_migrate import Migrate
 
 import os
 
@@ -9,6 +10,7 @@
 app.config.from_pyfile('flask.cfg')
 
 db = SQLAlchemy(app)
+migrate = Migrate(app, db)
 
 login_manager = LoginManager(app)
 login_manager.login_view = 'users.login'

diff --git a/project/categories.py b/project/categories.py
diff --git a/project/forms.py b/project/forms.py
@@ -1,15 +1,15 @@
 from flask_wtf import Form
 from wtforms import StringField, PasswordField
-from wtforms.validators import DataRequired, Length, EqualTo
+from wtforms.validators import DataRequired, Length, EqualTo, Email
 
 
 class RegisterForm(Form):
-    username = StringField('Username', validators=[DataRequired(), Length(max=40)])
+    username = StringField('Username', validators=[DataRequired(), Email()])
     password = PasswordField('Password', validators=[DataRequired(), Length(max=40)])
     confirm = PasswordField('Confirm Password', validators=[DataRequired(), EqualTo('password')])
 
 
 class LoginForm(Form):
-    username = StringField('Username', validators=[DataRequired(), Length(max=40)])
+    username = StringField('Username', validators=[DataRequired(),Email()])
     password = PasswordField('Password', validators=[DataRequired(), Length(max=40)])
 
diff --git a/project/models.py b/project/models.py
@@ -2,19 +2,26 @@
 
 from flask_login import UserMixin
 from werkzeug.security import check_password_hash, generate_password_hash
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import relationship
+import geonamescache
+
+gc = geonamescache.GeonamesCache()
 
 
 class User(UserMixin, db.Model):
 
     __tablename__ = "users"
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    username = db.Column(db.String, unique=True, nullable=False)
+    email = db.Column(db.String, unique=True, nullable=False)
     password_hash = db.Column(db.String, nullable=False)
+    account_type = db.Column(db.String,  nullable=False)
 
-    def __init__(self, username, password):
-        self.username = username
+    def __init__(self, email, password,account_type):
+        self.email = email
         self.set_password(password)
+        self.account_type=account_type
 
     def set_password(self, password):
         self.password_hash = generate_password_hash(password)
@@ -23,7 +30,7 @@ def check_password(self, password):
         return check_password_hash(self.password_hash, password)
 
     def __repr__(self):
-        return 'User %d %s' % (self.id, self.username)
+        return 'User %d %s' % (self.id, self.email)
 
 
 # TODO: Create your other models here
@@ -34,3 +41,105 @@ class YourModel(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
 
     # fill in the rest of your fields and methods!
+
+class Teacher(db.Model):
+
+    __tablename__ = "teachers"
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    user_id = db.Column(db.Integer, ForeignKey('users.id'))
+    fname = db.Column(db.String) 
+    lname = db.Column(db.String) 
+    city = db.Column(db.String)
+    description = db.Column(db.String)
+    cost = db.Column(db.Float)
+    phone_num = db.Column(db.String)
+    languages = db.Column(db.String)
+    profile_picture = db.Column(db.String)
+    gearbox= db.Column(db.String)
+
+    '''def set_city(self, city):
+        if  in list:
+            self.city=city'''
+
+    def __init__(self,
+        user_id, 
+        fname,lname,
+        city,
+        description,
+        cost,
+        phone_num,
+        languages,
+        profile_picture,
+        gearbox):
+        self.user_id = user_id
+        self.fname=fname
+        self.lname=lname
+        self.city=city
+        self.description=description
+        self.cost=cost
+        self.phone_num=phone_num
+        self.languages=languages
+        self.profile_picture=profile_picture
+        self.gearbox=gearbox
+
+    def __repr__(self):
+        return 'Teacher %d %s %s' % (self.id, self.fname, self.lname)
+
+class Request(db.Model):
+
+    __tablename__ = "requests"
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    student_id= db.Column(db.Integer,ForeignKey('students.id'))
+    student_fname = db.Column(db.String)
+    teacher_id = db.Column(db.Integer, ForeignKey('teachers.id'))
+    done = db.Column(db.Boolean)
+
+    def __init__(self,student_id,student_fname,teacher_id,done):
+        self.student_id=student_id
+        self.student_fname=student_fname
+        self.teacher_id = teacher_id
+        self.done = done
+
+
+class Student(db.Model):
+
+    __tablename__="students"
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    user_id=db.Column(db.Integer, ForeignKey('users.id'))
+    fname = db.Column(db.String)
+    lname = db.Column(db.String)
+    phone_num = db.Column(db.String)
+    gearbox=db.Column(db.String)
+    city=db.Column(db.String)
+    min_price =db.Column(db.Integer)
+    max_price=db.Column(db.Integer)
+    languages=db.Column(db.String)
+
+
+    def __init__(self, user_id,fname,lname,phone_num,gearbox,city,min_price,max_price,languages):
+        self.user_id=user_id
+        self.fname=fname
+        self.lname=lname
+
+        self.phone_num=phone_num
+        self.gearbox=gearbox
+        self.city=city
+        self.min_price=min_price
+        self.max_price=max_price
+        self.languages=languages
+        self.profile_picture="https://static.thenounproject.com/png/214280-200.png"
+
+
+class City(db.Model):
+
+    __tablename__ = "cities"
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    city = db.Column(db.String)
+    country = db.Column(db.String)
+
+    def __repr__(self):
+        return 'City %d %s' % (self.id, self.city)
diff --git a/project/static/css/HelveticaNeue.ttf b/project/static/css/HelveticaNeue.ttf
diff --git a/project/static/css/feed.css b/project/static/css/feed.css
@@ -0,0 +1,26 @@
+#navbar-logo{
+    background-color: #d7dee5;
+}
+
+.navbar-item{
+    color: white;
+    font-family: helveticaneuelight;
+    font-size: 18px;
+    float: left;
+}
+
+.navbar-item:hover{
+    color: white;
+    background-color: #188fc4;
+}
+
+.icons{
+    min-width: 50px;
+    min-height: 50px;
+    margin: 25px;
+    color: black;
+}
+
+.icons:hover{
+    color: #0073a8;
+}