reworking project layout

Dockerfile

@@ -16,6 +16,8 @@ RUN apk add --update --no-cache build-base make git bzr python3-dev libffi-dev o
     pip3 install --upgrade --no-cache-dir bzr+lp:scaffold/trunk#egg=scaffold && \
     apk del build-base make git bzr python3-dev libffi-dev openssl-dev libxml2-dev libxslt-dev
 
+RUN mkdir -p /data/sockets && chown www-data:uwsgi /data/sockets
+
 # RUN pip3 install --no-cache-dir dateutils requests requests-oauthlib gocardless paypalrestsdk pytz nose2 oauthlib flask flask-login pymysql misaka
 # RUN pip3 install --no-cache-dir bzr+lp:scaffold/trunk#egg=scaffold
 

docker-compose.yml

@@ -2,6 +2,7 @@ version: '2'
 
 services:
     mhackspace_uwsgi:
+        container_name: mhackspace_uwsgi
         image: olymk2/mhackspace
         restart: unless-stopped
         network_mode: bridge
@@ -11,10 +12,11 @@ services:
             - mhackspace_mail:mail_server
         volumes:
             - sockets:/data/sockets
-            - ./website/:/var/www
+            - ./:/var/www
             - ./config/uwsgi/maidstone-hackspace.org.uk.ini:/etc/uwsgi/apps-enabled/maidstone-hackspace.org.uk.ini 
 
     mhackspace_web:
+        container_name: mhackspace_web
         image: olymk2/nginx
         restart: unless-stopped
         network_mode: bridge
@@ -29,6 +31,7 @@ services:
         restart: always
 
     mariadb:
+      container_name: mhackspace_db
       image: olymk2/mariadb
       network_mode: bridge
 #      ports:
@@ -41,6 +44,7 @@ services:
       restart: unless-stopped
 
     mhackspace_mail:
+        container_name: mhackspace_mail
         image: mailhog/mailhog
         network_mode: bridge
         restart: unless-stopped

tests/test_email.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os, sys
+from mock import patch, call
+import unittest
+import random
+from collections import defaultdict
+from werkzeug.security import generate_password_hash, check_password_hash
+
+from scaffold.core.data.sql import query
+from scaffold.core.data.database import db
+
+from website.config import settings
+from website.data import site_user
+
+class TestEmail(unittest.TestCase):
+    pass

website/config/settings.py

@@ -5,7 +5,7 @@ from scaffold.core.data.database import db
 from scaffold.core.data.sql import query_builder
 from scaffold import web
 
-#from website import constants
+#from website from website import constants
 #from website.libs import mail
 
 

website/data/migrate/clean.sql

@@ -1,24 +1,2 @@
 SET FOREIGN_KEY_CHECKS = 0;
-TRUNCATE badges;
-ALTER TABLE badges AUTO_INCREMENT = 1;
-TRUNCATE members;
-ALTER TABLE members AUTO_INCREMENT = 1;
-TRUNCATE pledges;
-ALTER TABLE pledges AUTO_INCREMENT = 1;
-TRUNCATE pledge_amounts;
-ALTER TABLE pledge_amounts AUTO_INCREMENT = 1;
-TRUNCATE requests;
-ALTER TABLE requests AUTO_INCREMENT = 1;
-TRUNCATE users;
-ALTER TABLE users AUTO_INCREMENT = 1;
-TRUNCATE user_badges;
-ALTER TABLE user_badges AUTO_INCREMENT = 1;
-TRUNCATE user_detail;
-ALTER TABLE user_detail AUTO_INCREMENT = 1;
-TRUNCATE user_detail_lists;
-ALTER TABLE user_detail_lists AUTO_INCREMENT = 1;
-TRUNCATE user_membership;
-ALTER TABLE user_membership AUTO_INCREMENT = 1;
-TRUNCATE user_oauth;
-ALTER TABLE user_oauth AUTO_INCREMENT = 1;
 SET FOREIGN_KEY_CHECKS = 1;

website/data/migrate/generated_column_indexes.sql

@@ -1,52 +1 @@
 table_name, column_name, column_type, default
-#badges
-ALTER TABLE badges ADD INDEX id_UNIQUE (id ASC);
-ALTER TABLE badges ADD UNIQUE INDEX name_UNIQUE (name ASC);
-
-
-#members
-ALTER TABLE members ADD INDEX id_UNIQUE (id ASC);
-
-
-#pledges
-ALTER TABLE pledges ADD INDEX id_UNIQUE (id ASC);
-
-
-#pledge_amounts
-ALTER TABLE pledge_amounts ADD INDEX id_UNIQUE (id ASC);
-ALTER TABLE pledge_amounts ADD UNIQUE INDEX reference_UNIQUE (reference ASC);
-
-
-#requests
-ALTER TABLE requests ADD INDEX id_UNIQUE (id ASC);
-
-
-#users
-ALTER TABLE users ADD INDEX id_UNIQUE (id ASC);
-ALTER TABLE users ADD UNIQUE INDEX member_reference_UNIQUE (member_reference ASC);
-ALTER TABLE users ADD UNIQUE INDEX email_UNIQUE (email ASC);
-
-
-#user_badges
-ALTER TABLE user_badges ADD INDEX id_UNIQUE (id ASC);
-
-
-#user_detail
-ALTER TABLE user_detail ADD INDEX id_UNIQUE (id ASC);
-ALTER TABLE user_detail ADD UNIQUE INDEX user_id_UNIQUE (user_id ASC);
-ALTER TABLE user_detail ADD UNIQUE INDEX member_id_UNIQUE (member_id ASC);
-
-
-#user_detail_lists
-ALTER TABLE user_detail_lists ADD INDEX id_UNIQUE (id ASC);
-
-
-#user_membership
-ALTER TABLE user_membership ADD INDEX id_UNIQUE (id ASC);
-ALTER TABLE user_membership ADD UNIQUE INDEX subscription_id_UNIQUE (subscription_reference ASC);
-
-
-#user_oauth
-ALTER TABLE user_oauth ADD INDEX id_UNIQUE (id ASC);
-
-

website/data/migrate/generated_columns.sql

@@ -1,162 +1 @@
 table_name, column_name, column_type, default
-#badges
-ALTER TABLE badges ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE badges CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE badges ADD COLUMN name varchar(25) NULL ;
-ALTER TABLE badges CHANGE COLUMN name name varchar(25) NULL ;
-
-
-#members
-ALTER TABLE members ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE members CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE members ADD COLUMN user_id varchar(45) NULL ;
-ALTER TABLE members CHANGE COLUMN user_id user_id varchar(45) NULL ;
-
-
-#pledges
-ALTER TABLE pledges ADD COLUMN expired tinyint(1) NULL DEFAULT 0;
-ALTER TABLE pledges CHANGE COLUMN expired expired tinyint(1) NULL DEFAULT 0;
-ALTER TABLE pledges ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE pledges CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE pledges ADD COLUMN name varchar(255) NULL ;
-ALTER TABLE pledges CHANGE COLUMN name name varchar(255) NULL ;
-ALTER TABLE pledges ADD COLUMN target decimal(10,2) unsigned NULL DEFAULT 0.00;
-ALTER TABLE pledges CHANGE COLUMN target target decimal(10,2) unsigned NULL DEFAULT 0.00;
-ALTER TABLE pledges ADD COLUMN total decimal(10,2) NULL DEFAULT 0.00;
-ALTER TABLE pledges CHANGE COLUMN total total decimal(10,2) NULL DEFAULT 0.00;
-
-
-#pledge_amounts
-ALTER TABLE pledge_amounts ADD COLUMN amount decimal(10,2) NULL ;
-ALTER TABLE pledge_amounts CHANGE COLUMN amount amount decimal(10,2) NULL ;
-ALTER TABLE pledge_amounts ADD COLUMN environment tinyint(1) NULL DEFAULT 0;
-ALTER TABLE pledge_amounts CHANGE COLUMN environment environment tinyint(1) NULL DEFAULT 0;
-ALTER TABLE pledge_amounts ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE pledge_amounts CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE pledge_amounts ADD COLUMN pledge_id int(10) NULL ;
-ALTER TABLE pledge_amounts CHANGE COLUMN pledge_id pledge_id int(10) NULL ;
-ALTER TABLE pledge_amounts ADD COLUMN provider_id tinyint(4) NULL ;
-ALTER TABLE pledge_amounts CHANGE COLUMN provider_id provider_id tinyint(4) NULL ;
-ALTER TABLE pledge_amounts ADD COLUMN reference varchar(255) NULL ;
-ALTER TABLE pledge_amounts CHANGE COLUMN reference reference varchar(255) NULL ;
-ALTER TABLE pledge_amounts ADD COLUMN type int(11) NULL DEFAULT 1;
-ALTER TABLE pledge_amounts CHANGE COLUMN type type int(11) NULL DEFAULT 1;
-ALTER TABLE pledge_amounts ADD COLUMN user_id int(11) NULL ;
-ALTER TABLE pledge_amounts CHANGE COLUMN user_id user_id int(11) NULL ;
-
-
-#requests
-ALTER TABLE requests ADD COLUMN description varchar(255) NULL ;
-ALTER TABLE requests CHANGE COLUMN description description varchar(255) NULL ;
-ALTER TABLE requests ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE requests CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE requests ADD COLUMN name varchar(45) NULL ;
-ALTER TABLE requests CHANGE COLUMN name name varchar(45) NULL ;
-ALTER TABLE requests ADD COLUMN price decimal(10,2) NULL ;
-ALTER TABLE requests CHANGE COLUMN price price decimal(10,2) NULL ;
-ALTER TABLE requests ADD COLUMN quantity int(11) NULL DEFAULT 1;
-ALTER TABLE requests CHANGE COLUMN quantity quantity int(11) NULL DEFAULT 1;
-ALTER TABLE requests ADD COLUMN url varchar(255) NULL ;
-ALTER TABLE requests CHANGE COLUMN url url varchar(255) NULL ;
-ALTER TABLE requests ADD COLUMN user_id int(10) unsigned NULL ;
-ALTER TABLE requests CHANGE COLUMN user_id user_id int(10) unsigned NULL ;
-
-
-#users
-ALTER TABLE users ADD COLUMN created timestamp NULL ;
-ALTER TABLE users CHANGE COLUMN created created timestamp NULL ;
-ALTER TABLE users ADD COLUMN email varchar(255) NULL ;
-ALTER TABLE users CHANGE COLUMN email email varchar(255) NULL ;
-ALTER TABLE users ADD COLUMN first_name varchar(45) NULL ;
-ALTER TABLE users CHANGE COLUMN first_name first_name varchar(45) NULL ;
-ALTER TABLE users ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE users CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE users ADD COLUMN last_login varchar(45) NULL ;
-ALTER TABLE users CHANGE COLUMN last_login last_login varchar(45) NULL ;
-ALTER TABLE users ADD COLUMN last_name varchar(45) NULL ;
-ALTER TABLE users CHANGE COLUMN last_name last_name varchar(45) NULL ;
-ALTER TABLE users ADD COLUMN memberid varchar(45) NULL ;
-ALTER TABLE users CHANGE COLUMN memberid memberid varchar(45) NULL ;
-ALTER TABLE users ADD COLUMN member_reference int(5) unsigned zerofill NULL ;
-ALTER TABLE users CHANGE COLUMN member_reference member_reference int(5) unsigned zerofill NULL ;
-ALTER TABLE users ADD COLUMN password varchar(160) NULL ;
-ALTER TABLE users CHANGE COLUMN password password varchar(160) NULL ;
-ALTER TABLE users ADD COLUMN profile_image varchar(255) NULL ;
-ALTER TABLE users CHANGE COLUMN profile_image profile_image varchar(255) NULL ;
-ALTER TABLE users ADD COLUMN status tinyint(2) NULL DEFAULT 0;
-ALTER TABLE users CHANGE COLUMN status status tinyint(2) NULL DEFAULT 0;
-ALTER TABLE users ADD COLUMN username varchar(25) NULL ;
-ALTER TABLE users CHANGE COLUMN username username varchar(25) NULL ;
-
-
-#user_badges
-ALTER TABLE user_badges ADD COLUMN badge_id int(10) unsigned NULL ;
-ALTER TABLE user_badges CHANGE COLUMN badge_id badge_id int(10) unsigned NULL ;
-ALTER TABLE user_badges ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_badges CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_badges ADD COLUMN user_id int(10) unsigned NULL ;
-ALTER TABLE user_badges CHANGE COLUMN user_id user_id int(10) unsigned NULL ;
-
-
-#user_detail
-ALTER TABLE user_detail ADD COLUMN description text NULL ;
-ALTER TABLE user_detail CHANGE COLUMN description description text NULL ;
-ALTER TABLE user_detail ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_detail CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_detail ADD COLUMN image varchar(45) NULL ;
-ALTER TABLE user_detail CHANGE COLUMN image image varchar(45) NULL ;
-ALTER TABLE user_detail ADD COLUMN member_id int(5) unsigned zerofill NULL ;
-ALTER TABLE user_detail CHANGE COLUMN member_id member_id int(5) unsigned zerofill NULL ;
-ALTER TABLE user_detail ADD COLUMN profile_image varchar(255) NULL ;
-ALTER TABLE user_detail CHANGE COLUMN profile_image profile_image varchar(255) NULL ;
-ALTER TABLE user_detail ADD COLUMN skills varchar(255) NULL ;
-ALTER TABLE user_detail CHANGE COLUMN skills skills varchar(255) NULL ;
-ALTER TABLE user_detail ADD COLUMN user_id int(11) unsigned NULL ;
-ALTER TABLE user_detail CHANGE COLUMN user_id user_id int(11) unsigned NULL ;
-
-
-#user_detail_lists
-ALTER TABLE user_detail_lists ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_detail_lists CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_detail_lists ADD COLUMN text text NULL ;
-ALTER TABLE user_detail_lists CHANGE COLUMN text text text NULL ;
-ALTER TABLE user_detail_lists ADD COLUMN type varchar(10) NULL ;
-ALTER TABLE user_detail_lists CHANGE COLUMN type type varchar(10) NULL ;
-ALTER TABLE user_detail_lists ADD COLUMN user_id int(10) unsigned NULL ;
-ALTER TABLE user_detail_lists CHANGE COLUMN user_id user_id int(10) unsigned NULL ;
-
-
-#user_membership
-ALTER TABLE user_membership ADD COLUMN amount decimal(10,2) NULL DEFAULT 0.00;
-ALTER TABLE user_membership CHANGE COLUMN amount amount decimal(10,2) NULL DEFAULT 0.00;
-ALTER TABLE user_membership ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_membership CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_membership ADD COLUMN join_date datetime NULL ;
-ALTER TABLE user_membership CHANGE COLUMN join_date join_date datetime NULL ;
-ALTER TABLE user_membership ADD COLUMN provider_id tinyint(1) NULL ;
-ALTER TABLE user_membership CHANGE COLUMN provider_id provider_id tinyint(1) NULL ;
-ALTER TABLE user_membership ADD COLUMN status tinyint(1) NULL ;
-ALTER TABLE user_membership CHANGE COLUMN status status tinyint(1) NULL ;
-ALTER TABLE user_membership ADD COLUMN subscription_reference varchar(45) NULL ;
-ALTER TABLE user_membership CHANGE COLUMN subscription_reference subscription_reference varchar(45) NULL ;
-ALTER TABLE user_membership ADD COLUMN user_id int(10) unsigned NULL ;
-ALTER TABLE user_membership CHANGE COLUMN user_id user_id int(10) unsigned NULL ;
-
-
-#user_oauth
-ALTER TABLE user_oauth ADD COLUMN email varchar(255) NULL ;
-ALTER TABLE user_oauth CHANGE COLUMN email email varchar(255) NULL ;
-ALTER TABLE user_oauth ADD COLUMN id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_oauth CHANGE COLUMN id id int(10) unsigned  PRIMARY KEY (`id`) AUTO_INCREMENT ;
-ALTER TABLE user_oauth ADD COLUMN last_login datetime NULL ;
-ALTER TABLE user_oauth CHANGE COLUMN last_login last_login datetime NULL ;
-ALTER TABLE user_oauth ADD COLUMN provider tinyint(1) unsigned NULL ;
-ALTER TABLE user_oauth CHANGE COLUMN provider provider tinyint(1) unsigned NULL ;
-ALTER TABLE user_oauth ADD COLUMN registered datetime NULL ;
-ALTER TABLE user_oauth CHANGE COLUMN registered registered datetime NULL ;
-ALTER TABLE user_oauth ADD COLUMN username varchar(255) NULL ;
-ALTER TABLE user_oauth CHANGE COLUMN username username varchar(255) NULL ;
-ALTER TABLE user_oauth ADD COLUMN user_id int(10) unsigned NULL ;
-ALTER TABLE user_oauth CHANGE COLUMN user_id user_id int(10) unsigned NULL ;
-
-

website/data/migrate/generated_tables.sql

@@ -1,11 +0,0 @@
-CREATE TABLE IF NOT EXISTS badges;
-CREATE TABLE IF NOT EXISTS members;
-CREATE TABLE IF NOT EXISTS pledges;
-CREATE TABLE IF NOT EXISTS pledge_amounts;
-CREATE TABLE IF NOT EXISTS requests;
-CREATE TABLE IF NOT EXISTS users;
-CREATE TABLE IF NOT EXISTS user_badges;
-CREATE TABLE IF NOT EXISTS user_detail;
-CREATE TABLE IF NOT EXISTS user_detail_lists;
-CREATE TABLE IF NOT EXISTS user_membership;
-CREATE TABLE IF NOT EXISTS user_oauth;

website/generate.py

@@ -4,12 +4,12 @@ import codecs
 import argparse
 
 from scaffold import web
-web.load_widgets('widgets')
+web.load_widgets('website/widgets')
 
-from pages import web
+from website.pages import web
-from pages import header, footer
+from website.pages import header, footer
 
-from config.settings import *
+from website.config.settings import *
 
 
 def examples():

website/index.py

@@ -1,25 +1,25 @@
 import os
 import sys
-from flask import Flask, send_from_directory
+from flask import Flask
 from flask import make_response
 
 sys.path.append(os.path.abspath('../../../scaffold/'))
-sys.path.insert(0,os.path.abspath('../../../scaffold/'))
+sys.path.insert(0, os.path.abspath('../../../scaffold/'))
 
-from config import settings
+from website.config import settings
-import generate
+from website import generate
-from pages import homepage
+from website.pages import homepage
-from pages import chat
+from website.pages import chat
-from pages import blog
+from website.pages import blog
-from pages import members
+from website.pages import members
-from pages.contact import contact_page, submit_contact_page
+from website.pages.contact import contact_page, submit_contact_page
 
-from pages.core.login_pages import login_pages
+from website.pages.core.login_pages import login_pages
-from pages.core.authorize import authorize_pages, login_manager
+from website.pages.core.authorize import authorize_pages, login_manager
-from pages.donate import donate_pages
+from website.pages.donate import donate_pages
-from pages.google_groups import google_groups_pages
+from website.pages.google_groups import google_groups_pages
-from pages.equipment import equipment_pages
+from website.pages.equipment import equipment_pages
-from pages.profile import profile_pages
+from website.pages.profile import profile_pages
 
 
 web_app = Flask(__name__, static_folder='static')
@@ -42,7 +42,7 @@ web_app.register_blueprint(donate_pages)
     #~ print path + 'css/'
     #~ return send_from_directory(path + 'css/', 'default.css')
 
-# local testing server, add your pages here
+# local testing server, add your website.pages here
 @web_app.route("/examples/", methods=['GET'])
 def examples():
     """temporary for testing / examples"""

website/libs/mail.py

@@ -24,6 +24,7 @@ class sendmail:
             message = Message(
                 From=from_address,
                 To=to_address,
+                reply-to=from_address,
                 charset=self.charset
             )
 

website/pages/__init__.py

@@ -1,15 +1,13 @@
 import os
 
-
-from scaffold.web import webpage as html
-
-import constants as site
-
 from flask.ext.login import current_user
 
+from scaffold.web import webpage as html
+import website.constants as site
+
 web = html()
 
-web.load_widgets('widgets')
+web.load_widgets('website/widgets')
 web.template.create('Maidstone Hackspace', 'Hackspace for Maidstone, kent. for collaberation and discussion for artists, designers, makers, hackers, programmers, tinkerer, professionals and hobbyists.')
 web.template.append('<link rel="icon" type="image/png" href="/static/images/icon.png">')
 

website/pages/blog.py

@@ -1,9 +1,9 @@
-import constants as site
+from website import constants as site
 
 from scaffold.readers.rss_reader import feed_reader
 
-from pages import web
+from website.pages import web
-from pages import header, footer
+from website.pages import header, footer
 
 
 def index():

website/pages/chat.py

@@ -1,5 +1,5 @@
-from pages import web
+from website.pages import web
-from pages import header, footer
+from website.pages import header, footer
 
 
 def index():

website/pages/core/authorize.py

@@ -18,9 +18,9 @@ from libs.mail import sendmail
 from pages import header, footer
 from data import site_user
 from config.settings import *
-from constants import *
+from website.constants import *
 
-web.load_widgets('widgets')
+# web.load_widgets('widgets')
 
 authorize_pages = Blueprint('authorize_pages', __name__, template_folder='templates')
 

website/pages/core/login_pages.py

@@ -16,7 +16,7 @@ from pages import header, footer
 from pages.core.authorize import User
 from data import site_user
 from config.settings import *
-from constants import *
+from website.constants import *
 
 
 login_pages = Blueprint('login_pages', __name__, template_folder='templates')

website/pages/homepage.py

@@ -1,10 +1,11 @@
-import constants as site
-from libs.image_fetcher import save_remote_image
-from config.settings import google_calendar_id, google_calendar_api_key, app_domain
-
 from scaffold.readers.rss_reader import feed_reader
 from scaffold import web
-from pages import header, footer
+
+from website import constants as site
+from website.libs.image_fetcher import save_remote_image
+from website.config.settings import google_calendar_id, google_calendar_api_key, app_domain
+
+from website.pages import header, footer
 
 
 def index():

website/pages/members.py

@@ -4,7 +4,7 @@ from pages import web
 from pages import header, footer
 from data import members
 from data import badges
-from constants import badge_lookup
+from website.constants import badge_lookup
 
 b = {'1':'test', '2': 'abc'}
 

website/pages/profile.py

@@ -3,7 +3,7 @@ from flask import request
 from flask import redirect
 from flask.ext.login import current_user, login_required
 
-from constants import badge_lookup
+from website.constants import badge_lookup
 
 from pages.core.authorize import oauth_lookup_name
 from pages import web

website/tools/get_blog_images.py

@@ -6,7 +6,7 @@ from StringIO import StringIO
 from PIL import Image
 import requests
 from libs.rss_fetcher import feed_reader
-import constants as site
+from website import constants as site
 
 
 feed = feed_reader(site.rss_feeds)

website/widgets/banner_slider.py

@@ -8,7 +8,7 @@ class control(base_widget):
     content = []
     count = 0
 
-    with open(os.path.abspath('./widgets/banner_slider.js')) as fp:
+    with open(os.path.abspath('./website/widgets/banner_slider.js')) as fp:
         script = [fp.read()]
     
     def create(self):

website/widgets/contact_form.py

@@ -1,6 +1,7 @@
 import requests
 from scaffold.core.widget import base_widget_extended
-from libs.recapture import verify_captcha
+
+from website.libs.recapture import verify_captcha
 #~ from widgets import recaptcha
 
 

website/widgets/example.py

@@ -6,7 +6,7 @@ class control(base_widget):
     buttons = []
     count = 0
     
-    with open(os.path.abspath('./widgets/banner_slider.js')) as fp:
+    with open(os.path.abspath('./website/widgets/banner_slider.js')) as fp:
         js = [fp.read()]
     
     def create(self):

website/widgets/register_form.py

@@ -2,7 +2,7 @@ from scaffold.loaders import load_resource
 from scaffold.core.widget import base_widget
 
 class control(base_widget):
-    html = load_resource('./widgets/register_form.htm')
+    html = load_resource('./website/widgets/register_form.htm')
 
     def __init__(self):
         self.defaults = {

wsgi.py

@@ -1,4 +1,4 @@
-from index import web_app as application
+from website.index import web_app as application
 
 if __name__ == "__main__":
     application.run(debug=True)