Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #6

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ea27c61
test
CKogut Nov 21, 2023
bd2a269
test
CKogut Nov 21, 2023
afd4793
massive refactor
CKogut Nov 21, 2023
0b9b022
refactor done
CKogut Nov 21, 2023
460924f
Merge pull request #1 from CircusData/corrine
imirransom7 Nov 22, 2023
0e37066
adding changes to dev
Nov 22, 2023
6f4e7d3
clean up
CKogut Nov 22, 2023
b30cea5
update gitignore
Nov 23, 2023
acf75c0
user settings view and html
Nov 23, 2023
7143927
user settings in header and email change
Nov 23, 2023
3182cfc
fixed header dupe name display
Nov 23, 2023
25777b0
get user for login only where login init
Nov 24, 2023
a0cba8e
grab current package versions reqs.txt
Nov 24, 2023
7cbc212
user settings views working
Nov 24, 2023
17beea7
recovered version hopefully
Nov 24, 2023
658a4c0
user settings working
Nov 25, 2023
459b182
profile pages
Nov 25, 2023
d19246e
switched to mysql
CKogut Nov 25, 2023
590ac81
switched to mysql, full site now loading
CKogut Nov 25, 2023
78241e0
profile page wrapping user settings
Nov 25, 2023
19c4d6c
post and comment counts
Nov 25, 2023
33e9fb2
go to profile populates data now
Nov 25, 2023
4d7748f
created config file
CKogut Nov 25, 2023
2386e69
added logo and footer; footer has copyright and about writing
Nov 25, 2023
904de8a
no chnages really added, need to commit to switch branches
Nov 25, 2023
c2c2174
added messages to model, migrate, view profiles
Nov 25, 2023
994b6fe
DM routing setup from profile pages
Nov 25, 2023
66885f6
viewing messages working with sender name
Nov 25, 2023
cde5dfa
profile styled, view own profile redirects properly
Nov 26, 2023
699e403
tidy up
CKogut Nov 26, 2023
63f0457
added like/dislike buttons, and emojis
Nov 26, 2023
d6a35f1
Merge pull request #3 from CircusData/corinne
imirransom7 Nov 26, 2023
c9e31ba
Merge branch 'dev' into imir
imirransom7 Nov 26, 2023
2bed16b
Merge pull request #4 from CircusData/imir
imirransom7 Nov 26, 2023
bb681b9
Merge branch 'dev' into mike
imirransom7 Nov 26, 2023
d497e64
Merge pull request #5 from CircusData/mike
imirransom7 Nov 26, 2023
7761d0a
removed pagination for now
CKogut Nov 27, 2023
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
Binary file added .DS_Store
Binary file not shown.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.idea


venv/
.vscode

Expand Down Expand Up @@ -138,4 +141,7 @@ dmypy.json
.pytype/

# Cython debug symbols
cython_debug/
cython_debug/

# Config
config.py
2 changes: 1 addition & 1 deletion .idea/CircusCircus.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added forum/.DS_Store
Binary file not shown.
45 changes: 42 additions & 3 deletions forum/app.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,49 @@
from flask import Flask
from flask_login import LoginManager
from flask_sqlalchemy import SQLAlchemy

from flask_migrate import Migrate

from forum.config import path

# from forum.post import post_views

app = Flask(__name__)
app.config.update(
TESTING=True,
SECRET_KEY=b'kristofer',
SITE_NAME = "Schooner",
SITE_DESCRIPTION = "a schooner forum",
SQLALCHEMY_DATABASE_URI='sqlite:////tmp/database.db'
SITE_NAME="Spoon O Fork",
SITE_DESCRIPTION="a spooner forum",
SQLALCHEMY_DATABASE_URI=path,
DEBUG=True,
FLASK_DEBUG=1,
FOOTER_SIGNATURE="some spoon",
COPYRIGHT="©Copyright: All rights reserved. No part of this forum may be reproduced in any form or by any electronic "
" or mechanical means, including information storage and retrival systems, without permission in"
" writing from the publisher, except owner of the forum.\n",
NEW_LINE="\n",
ABOUT_SITE="The Spooner Forum first began on November 21, 2023. It was started by four data students of Zip Code "
"\nWilmington. This tasked was imposed on them by their fearless leader, Instructor Kris. It was demanded "
"of them to be finished with a week, with whatever theme they chose of. They decided to do a forum on "
"spoons. Specifically, a forum about which utensil is better; spoons or forks. This is a battle that will "
"go down in history! Stay tuned to see which utensil will conquer! This is a job for the only data students ",
SPOON="Spoon",
FORK="Fork"
)

import os

# if os.getenv("DATABASE_URL"):
# app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE_URL')
# print("setting db url for postgres")
# else:
# print("DATABASE_URL is not set, using sqlite")


db = SQLAlchemy(app)
migrate = Migrate(app, db)

login_manager = LoginManager()
login_manager.init_app(app)

# post_views(app)
Loading