Skip to content

Aidantest #4

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.

Sign up for GitHub

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

Open
wants to merge 42 commits into
base: main
Choose a base branch
from
Open

Aidantest #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f822877
created model for message, ghost route and html as well
AidanFarhi Jul 18, 2021
1c5696c
added front end and route to see all messages
AidanFarhi Jul 18, 2021
723c89e
see all messages now showing messages and senders
AidanFarhi Jul 18, 2021
97b522b
made progress on send message form
AidanFarhi Jul 18, 2021
3524b0a
users are now able to send and receive private messages
AidanFarhi Jul 18, 2021
2132da0
added some comments
AidanFarhi Jul 18, 2021
3e3a5e8
Added 3 emojis and like button
Jul 20, 2021
ee0f1bc
Added 3 emojis and like button
Jul 20, 2021
8c55aeb
3 emojis added
Jul 23, 2021
af5a57b
first commit
Jul 23, 2021
725401b
user info
Jul 23, 2021
88e28d8
Merge branch 'main' of https://github.com/DataFam/CircusCircus into main
Jul 23, 2021
7a0f529
aidan commit
AidanFarhi Jul 23, 2021
6d5193c
Merge branch 'main' into aidan
AidanFarhi Jul 23, 2021
e6253f9
Merge pull request #1 from DataFam/aidan
AidanFarhi Jul 23, 2021
89671dd
first upload
Jul 23, 2021
0615745
second
Jul 23, 2021
c507343
labeling
Jul 23, 2021
a06e5e4
Merge branch 'main' of https://github.com/DataFam/CircusCircus into main
Jul 23, 2021
58712d8
aidan added Message Class
AidanFarhi Jul 23, 2021
67092c4
fixed logout bug
Jul 23, 2021
501676d
third
Jul 23, 2021
4458943
commit after demo
Jul 23, 2021
68d0d5a
first commit after demo
Jul 23, 2021
e9f078e
first commit sunday
Jul 25, 2021
49395a9
second sunday
Jul 25, 2021
101781a
fourth sunday
Jul 25, 2021
8c8ca68
user info up to date
Jul 25, 2021
36a1983
changed site theme
AidanFarhi Jul 25, 2021
40dc29d
Merge pull request #2 from DataFam/aidan2
AidanFarhi Jul 25, 2021
d892dd9
added react buttons
Jul 25, 2021
91be9f6
Wes most recent
Jul 25, 2021
112b0f4
Merge pull request #3 from DataFam/Chuck
chuck-kelly Jul 25, 2021
bf8ffe9
had to fix button function
Jul 25, 2021
c24dfc8
Merge branch 'Sean' into main
AidanFarhi Jul 25, 2021
071b97c
fixed function
nikkiwojo Jul 25, 2021
781c3cf
added comment
nikkiwojo Jul 25, 2021
d0b8780
merge Nikki to main
nikkiwojo Jul 25, 2021
7bd6943
Wes new commit
Jul 25, 2021
88d42a7
Wes merge
Jul 25, 2021
86925cd
sean merge
Jul 25, 2021
17ee5a8
fixed parent comment
AidanFarhi Jul 25, 2021
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
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.
venv/
.vscode

Expand Down
Binary file added forum/.DS_Store
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion forum/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
SECRET_KEY=b'kristofer',
SITE_NAME = "Schooner",
SITE_DESCRIPTION = "a schooner forum",
SQLALCHEMY_DATABASE_URI='sqlite:////tmp/database.db'
SQLALCHEMY_DATABASE_URI='sqlite:////tmp/database.db' #relative pass to physical db location (this has 4 /)
)


Loading