Skip to content

Assignment4 #1

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
jhill4 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Assignment4 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e6d2a8
Almost done
jhill4 Feb 19, 2021
5b6fcd1
screenshot of db uploaded
jhill4 Feb 19, 2021
056bdd9
Update comment
jhill4 Feb 19, 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 Screenshot.PNG
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 30 additions & 74 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,83 +4,68 @@
from os import path as os_path, mkdir as os_mkdir, remove as os_remove
from datetime import datetime
import sys, getopt
import boto3
from botocore.config import Config
import pprint

#Ran into some last minute problems with get_item in view note that i could not figure out so code breaks
#after creating a note. I think delete note works but edit would have the same issue with get_item

app = Flask("Champagne")
Markdown(app)

noteList = []

noteDir = "notes"

# create note directory if it doesn't exist
if not os_path.exists(noteDir):
os_mkdir(noteDir)

noteListFileName = os_path.join(noteDir, "notes.pkl")

# check for existing file with note metadata
if os_path.exists(noteListFileName):
with open(noteListFileName, 'rb') as notesFile:
noteList = pickle.load(notesFile)
dynamodb = boto3.client('dynamodb', config=Config(region_name='us-east-1'))
pp = pprint.PrettyPrinter(indent=4)


@app.route("/")
def home():
return render_template("home.html", notes=noteList)
scan = dynamodb.scan(TableName='NotesApp')
allNotes = scan['Items']

return render_template("home.html", NotesApp=allNotes)

@app.route("/addNote")
def addNote():
return render_template("noteForm.html", headerLabel="New Note", submitAction="createNote", cancelUrl=url_for('home'))

@app.route("/createNote", methods=["post"])
def createNote():
# get next note id
if len(noteList):
idList = [ int(i['id']) for i in noteList ]
noteId = str(max(idList)+1)
else:
noteId = "1"

noteFileName = os_path.join(noteDir, noteId+".pkl")
noteId = 1
scan = dynamodb.scan(TableName='NotesApp')['Items']
for i in scan:
noteId = noteId + 1

noteId = str(noteId)
lastModifiedDate = datetime.now()
lastModifiedDate = lastModifiedDate.strftime("%d-%b-%Y %H:%M:%S")

noteTitle = request.form['noteTitle']
noteMessage = request.form['noteMessage']

note = {'id': noteId, 'title': noteTitle, 'lastModifiedDate': lastModifiedDate, 'message': noteMessage}
dynamodb.put_item(TableName='NotesApp', Item={'noteid': {'S' : noteId},'noteTitle': {'S': noteTitle}, 'lastModifiedDate': {'S': lastModifiedDate}, 'message': {'S': noteMessage}})


# save the note
with open(noteFileName, 'wb') as noteFile:
pickle.dump(note, noteFile)

# add metadata to list of notes for display on home page
noteList.append({'id': noteId, 'title': noteTitle, 'lastModifiedDate': lastModifiedDate})

# save changes to the file containing the list of note metadata
with open(noteListFileName, 'wb') as notesFile:
pickle.dump(noteList, notesFile)

return redirect(url_for('viewNote', noteId=noteId))

@app.route("/viewNote/<int:noteId>")
def viewNote(noteId):
noteId = str(noteId)
noteFileName = os_path.join(noteDir, noteId+".pkl")
with open(noteFileName, 'rb') as noteFile:
note = pickle.load(noteFile)
note = dynamodb.get_item(TableName='NotesApp', Key = {'noteid': {'S': noteId}})['Item']
pp.pprint(note)

return render_template("viewNote.html", note=note, submitAction="/saveNote")

@app.route("/editNote/<int:noteId>")
def editNote(noteId):
noteId = str(noteId)
noteFileName = os_path.join(noteDir, noteId+".pkl")
with open(noteFileName, 'rb') as noteFile:
note = pickle.load(noteFile)
note = dynamodb.get_item(TableName='NotesApp', Key = {'noteid': {'S': noteId}})

note = note['Item']
cancelUrl = url_for('viewNote', noteId=noteId)

return render_template("noteForm.html", headerLabel="Edit Note", note=note, submitAction="/saveNote", cancelUrl=cancelUrl)

@app.route("/saveNote", methods=["post"])
Expand All @@ -92,43 +77,14 @@ def saveNote():
noteTitle = request.form['noteTitle']
noteMessage = request.form['noteMessage']

noteFileName = os_path.join(noteDir, noteId+".pkl")

note = {'id': noteId, 'title': noteTitle, 'lastModifiedDate': lastModifiedDate, 'message': noteMessage}

# save the note
with open(noteFileName, 'wb') as noteFile:
pickle.dump(note, noteFile)

# remove the old version of the note from the list of note metadata and add the new version
global noteList
newNoteList = [ i for i in noteList if not (i['id'] == noteId) ]
noteList = newNoteList

# add metadata to list of notes for display on home page
noteList.append({'id': noteId, 'title': noteTitle, 'lastModifiedDate': lastModifiedDate})

# save changes to the file containing the list of note metadata
with open(noteListFileName, 'wb') as notesFile:
pickle.dump(noteList, notesFile)

dynamodb.put_item(TableName='NotesApp', Item={'noteid': {'S' : noteId},'noteTitle': {'S': noteTitle}, 'lastModifiedDate': {'S': lastModifiedDate}, 'message': {'S': noteMessage}})

return redirect(url_for('viewNote', noteId=noteId))

@app.route("/deleteNote/<int:noteId>")
def deleteNote(noteId):
# delete the note file
noteFileName = os_path.join(noteDir, noteId+".pkl")
os_remove(noteFileName)

# remove the note from the list of note metadata
global noteList
newNoteList = [ i for i in noteList if not (i['id'] == noteId) ]
noteList = newNoteList

# save changes to the file containing the list of note metadata
with open(noteListFileName, 'wb') as notesFile:
pickle.dump(noteList, notesFile)

noteId = str(noteId)
note = dynamodb.delete_item(TableName='NotesApp', Key = {'noteid': {'S': noteId}})
return redirect("/")

if __name__ == "__main__":
Expand All @@ -137,10 +93,10 @@ def deleteNote(noteId):
try:
opts, args = getopt.getopt(sys.argv[1:], "h:p:", ["debug"])
except getopt.GetoptError:
print('usage: main.py [-h 0.0.0.0] [-p 5000] [--debug]')
print('usage: main.py [-h 0.0.0.0] [-p 4996] [--debug]')
sys.exit(2)

port = "5000"
port = "4996"
host = "0.0.0.0"
print(opts)
for opt, arg in opts:
Expand Down
10 changes: 5 additions & 5 deletions templates/viewNote.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

{% block header %}
<div class="col">
<h1 class="mb-0">{{ note['title'] }}</h1>
<small class="fs-6 text-muted">(last modified: {{ note['lastModifiedDate'] }})</small>
<h1 class="mb-0">{{ note['title']['S'] }}</h1>
<small class="fs-6 text-muted">(last modified: {{ note['notedate']['S'] }})</small>
</div>
{% endblock %}

{% block content %}
<div class="row mt-4">
<div class="col-xs-12 col-md-6 mx-auto">
<a class="btn btn-primary" role="button" href="/">Home</a>
<a class="btn btn-outline-primary" role="button" href="{{ url_for('editNote', noteId=note['id']) }}">Edit</a>
<a class="btn btn-outline-danger" role="button" href="{{ url_for('deleteNote', noteId=note['id']) }}">Delete</a>
<a class="btn btn-outline-primary" role="button" href="{{ url_for('editNote', noteId=note['id']['N']) }}">Edit</a>
<a class="btn btn-outline-danger" role="button" href="{{ url_for('deleteNote', noteId=note['id']['N']) }}">Delete</a>
</div>
</div>
<div class="row mt-4">
<div class="col-xs-12 col-md-6 mx-auto">
<h6>Message</h6>
<div id="noteMessage" >
{{ note['message']|markdown }}
{{ note['content']['S']|markdown }}
</div>
</div>
</div>
Expand Down