Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
15c08b4
CSS folder and files
koalaboy808 Feb 3, 2016
1a1d0b5
hw2 stuff
koalaboy808 Feb 3, 2016
56944c0
CSS folder and files
koalaboy808 Feb 3, 2016
3db56af
hw2 stuff
koalaboy808 Feb 3, 2016
0d90cac
responsive edits
koalaboy808 Feb 4, 2016
d8263c6
responsive edits round2
koalaboy808 Feb 4, 2016
e7af5d4
gergeter into branch 2 for hw branch 'master' into hw-2-branch
koalaboy808 Feb 4, 2016
e1d3eda
resolved hw2/index.html conflict
koalaboy808 Feb 4, 2016
c464348
merge with master after conflict so everything up to date branch 'mas…
koalaboy808 Feb 4, 2016
c82dd93
first commit
koalaboy808 Apr 7, 2016
311f6d9
rename files so Landing is index.html
koalaboy808 Apr 7, 2016
d979865
Trying to create flask app
Apr 9, 2016
583ef7e
Created Flask App
Apr 10, 2016
58900c1
Created Flask App
Apr 10, 2016
fcb805a
create README with instructions on tracking a branch
koalaboy808 Apr 10, 2016
54bdfc6
Working database with flask integration for sign up form
Apr 10, 2016
ba98ff4
implemented basic relationships employer and job request
Apr 13, 2016
8d67bdf
Merge branch 'temp_9april'
Apr 16, 2016
8778c2b
new database code for relational database and employer and request
Apr 16, 2016
2004472
implemetning login
Apr 16, 2016
d0eb229
database persistance
Apr 16, 2016
a6549b3
adding new databases
Apr 20, 2016
6c0c40a
add .gitignore
koalaboy808 Apr 21, 2016
c566066
adding a database view script
Apr 21, 2016
fbdf634
Merge branch 'master' of https://github.com/koalaboy808/Labor2Day_2.0
Apr 21, 2016
34d2b3a
Merge remote-tracking branch 'Labor2Day_submission/master' into Labor…
koalaboy808 Apr 21, 2016
916f12c
cloned repo of labor2day plus cleanup of branch
koalaboy808 Apr 21, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pyc
7 changes: 7 additions & 0 deletions README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Labor2Day

- when creating branches, in order to track the branch use this function:
- git checkout -b <branch name> --track origin/<branch name>
- for example, if the branch is beforeFlask, then use:
git checkout -b beforeFlask --track origin/beforeFlask
- in order to to see all remotes use: git branch -a
Binary file added app.db
Binary file not shown.
25 changes: 25 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
from flask import Flask
from flask_sqlalchemy import SQLAlchemy
from flask_bcrypt import Bcrypt
from flask_login import LoginManager

app = Flask(__name__, static_url_path='/static')

app.secret_key = 'carloparvlove'

app.config.from_object('config')
login_manager = LoginManager()
db = SQLAlchemy(app)
bcrypt = Bcrypt(app)
login_manager.init_app(app)


from app import views, models

from models import Employers

login_manager.login_view = "login"

@login_manager.user_loader
def load_user(user_id):
return models.Employers.query.filter(models.Employers.employer_id == int(user_id)).first()
Binary file added app/__init__.pyc
Binary file not shown.
58 changes: 58 additions & 0 deletions app/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
from app import db, bcrypt

class Employers(db.Model):
employer_id = db.Column(db.Integer, primary_key=True)
fname = db.Column(db.String(60), unique=False)
mname = db.Column(db.String(60), unique=False)
lname = db.Column(db.String(60), unique=False)
street1 = db.Column(db.String(60), unique=False)
street2 = db.Column(db.String(60), unique=False)
city = db.Column(db.String(120), unique=False)
state = db.Column(db.String(60), unique=False)
zipcode = db.Column(db.Integer, unique=False)
email = db.Column(db.String(120), unique=False)
username = db.Column(db.String(60), unique=False)
bestmethod = db.Column(db.String(60), unique=False)
_password = db.Column(db.String(60), unique=False)
phone = db.Column(db.String(20), unique=False)
requests = db.relationship('employer_request', backref='employers',lazy='dynamic')

def is_authenticated(self):
return True

def is_active(self):
return True

def is_anonymous(self):
return False

def get_id(self):
try:
return unicode(self.employer_id) # python 2
except NameError:
return str(self.employer_id) # python 3

class employer_request(db.Model):
request_id = db.Column(db.Integer, primary_key=True)
request_title = db.Column(db.String(120))
request_description = db.Column(db.String(120))
request_time = db.Column(db.String(120))
request_num_ppl = db.Column(db.Integer)
emp_id = db.Column(db.Integer, db.ForeignKey('employers.employer_id'))

class fulfillment(db.Model):
fulfillment_id = db.Column(db.Integer, primary_key=True)
fulfillment_req_id = db.Column(db.Integer)
laborers = db.relationship('laborer', backref='fulfillment',lazy='dynamic')


class laborer(db.Model):
laborer_id = db.Column(db.Integer, primary_key=True)
laborer_first_name = db.Column(db.String(120))
laborer_last_name = db.Column(db.String(100))
laborer_skills = db.Column(db.String(50))
laborer_phone_num = db.Column(db.Integer)
fulfl_id = db.Column(db.Integer, db.ForeignKey('fulfillment.fulfillment_id'))

# def __repr__():
# return request_title
Binary file added app/models.pyc
Binary file not shown.
4 changes: 4 additions & 0 deletions app/static/assets/css/font-awesome.min.css

Large diffs are not rendered by default.

Loading