Skip to content

Commit

Permalink
Updated repo.
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Matte committed Jan 13, 2018
1 parent 88ae296 commit 04dc799
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
31 changes: 0 additions & 31 deletions Backend/api/endless/main/controllers.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,6 @@
from endless.main import main
from endless.flask import app



@main.route('/', methods=['GET'])
def index():
return redirect(url_for('main.portfolio'))


@main.route('/portfolio', methods=['GET'])
def portfolio():
root = app.config["PROJECT_ROOT"]
data = json.load(codecs.open(root + '/static/portfolio/data.json', 'r', 'utf-8-sig'))

for i in range(len(data['pictures'])):
data['pictures'][i]["url"] = "/static/portfolio/pictures/" + data['pictures'][i]["filename"]
data['pictures'][i]["thumbnail"] = "/static/portfolio/pictures/thumbnails/" + data['pictures'][i]["filename"]

for i in range(len(data['projects'])):
data['projects'][i]['id'] = 'project-' + str(i)
img_path = data['projects'][i].get('images_path')
if img_path:
data['projects'][i]['images'] = [img_path+f for f in listdir(root + img_path) if isfile(join(root +img_path, f))]

return render_template('portfolio.html',
title="Eric Matte - Portfolio",
description="This is my personal portfolio. It contains everything that I am very proud to share from what I\'ve done so far.",
image='/static/portfolio/my-icon.png',
data=data,
color='#034b7b',
now=datetime.utcnow())


@main.route('/login', methods=['GET'])
def login():
return render_template('login.html', title='Login to Budgeto')
2 changes: 0 additions & 2 deletions Backend/api/endless/main/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ def update_user(google_user_info):
db_session.commit()
return user

"""END OF NEW CODE"""


def login_required(f):
@wraps(f)
Expand Down
24 changes: 24 additions & 0 deletions Backend/deployment_config/budgeto/config_template.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# Configuration File Template
#
#

#
# Domain Address
HOSTNAME = 'example.com'
ORIGIN_URI = 'http://example.com'

UPLOAD_FOLDER = 'files/uploads'

#
# Google Sign in
CLIENT_ID = 'google_client_id'
CLIENT_SECRET = 'google_client_secret'

#
# Admin email
ADMIN_EMAIL = '[email protected]'

#
# DATABASE
DB_CONNECTION_STRING = 'mysql+pymysql://DB_USERNAME:DB_PASSWORD@localhost:3306/DB_NAME?charset=utf8'
Binary file removed Backend/doc/Documentation template.docx
Binary file not shown.
Binary file removed Backend/doc/server/Introduction to Linux.lnk
Binary file not shown.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
# Endless-Budgeto
# Budgeto
![Budgeto](https://ericmatte.me/assets/portfolio/projects/budgeto.png)

Budgeto is a simple webapp that easily help you manage your money.

It let you quickly have an idea of what you mostly spend during the year. You can also set and track limits on every category available.

**Backend**: Made in Python using Flask and Jinja2.

**Frontend**: Made with Angular4.

0 comments on commit 04dc799

Please sign in to comment.