From b73641004475a95faef8de226368f9961b607488 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Sat, 31 Mar 2018 12:53:31 +0200
Subject: [PATCH 1/3] Finished edit functionality

---
 gui/mainwindow.cpp                |  3 +-
 gui/newrecipedialog.ui            | 25 ++++------
 gui/openrecipedialog.cpp          |  8 ++++
 gui/openrecipedialog.h            |  2 +
 gui/openrecipedialog.ui           |  8 +---
 model/database/database.cpp       | 17 +++++--
 model/database/database.h         |  4 ++
 model/database/recipedatabase.cpp | 79 ++++++++++++++++++++++++++++++-
 model/database/recipedatabase.h   | 21 +++++---
 model/database/resulttable.cpp    |  5 ++
 model/database/resulttable.h      |  2 +
 11 files changed, 141 insertions(+), 33 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index d2de990..bc09378 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -95,11 +95,12 @@ void MainWindow::on_exitButton_clicked(){
 
 void MainWindow::on_editButton_clicked(){
 	NewRecipeDialog d(this->recipeDB, this->currentRecipe, this);
+	string originalName = this->currentRecipe.getName();
 	d.show();
 	d.exec();
 	if (d.isAccepted()){
 		Recipe r = d.getRecipe();
-		if (!this->recipeDB->storeRecipe(r)){
+		if (!this->recipeDB->updateRecipe(r, originalName)){
 			QMessageBox::critical(this, QString("Unable to Save Recipe"), QString("The program was not able to successfully save the recipe. Make sure to give the recipe a name, instructions, and some ingredients!"));
 		} else {
 			this->loadFromRecipe(r);
diff --git a/gui/newrecipedialog.ui b/gui/newrecipedialog.ui
index 937ee33..a42a7a2 100644
--- a/gui/newrecipedialog.ui
+++ b/gui/newrecipedialog.ui
@@ -100,7 +100,6 @@
                 <widget class="QLineEdit" name="recipeNameEdit">
                  <property name="font">
                   <font>
-                   <pointsize>16</pointsize>
                    <weight>3</weight>
                    <italic>false</italic>
                    <bold>false</bold>
@@ -142,7 +141,7 @@
                       <second>0</second>
                       <year>1999</year>
                       <month>12</month>
-                      <day>24</day>
+                      <day>23</day>
                      </datetime>
                     </property>
                     <property name="currentSection">
@@ -352,6 +351,9 @@
               <property name="selectionMode">
                <enum>QAbstractItemView::MultiSelection</enum>
               </property>
+              <property name="verticalScrollMode">
+               <enum>QAbstractItemView::ScrollPerPixel</enum>
+              </property>
              </widget>
             </item>
            </layout>
@@ -667,6 +669,9 @@
                  <property name="selectionMode">
                   <enum>QAbstractItemView::MultiSelection</enum>
                  </property>
+                 <property name="verticalScrollMode">
+                  <enum>QAbstractItemView::ScrollPerPixel</enum>
+                 </property>
                  <property name="batchSize">
                   <number>100</number>
                  </property>
@@ -746,16 +751,6 @@
          <string notr="true">background-color: rgb(250, 250, 255);</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_8">
-         <item>
-          <widget class="QLabel" name="instructionsLabel">
-           <property name="text">
-            <string>Instructions</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
          <item alignment="Qt::AlignLeft|Qt::AlignTop">
           <widget class="QWidget" name="textControlPanel" native="true">
            <layout class="QHBoxLayout" name="horizontalLayout_5">
@@ -769,7 +764,7 @@
                </font>
               </property>
               <property name="text">
-               <string>I</string>
+               <string>Italic</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
@@ -789,7 +784,7 @@
                </font>
               </property>
               <property name="text">
-               <string>B</string>
+               <string>Bold</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
@@ -827,7 +822,7 @@
          <enum>Qt::LeftToRight</enum>
         </property>
         <property name="autoFillBackground">
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
         <property name="styleSheet">
          <string notr="true">background-color: rgb(255, 255, 255);</string>
diff --git a/gui/openrecipedialog.cpp b/gui/openrecipedialog.cpp
index 184ea18..c0458b8 100644
--- a/gui/openrecipedialog.cpp
+++ b/gui/openrecipedialog.cpp
@@ -127,3 +127,11 @@ void OpenRecipeDialog::on_foodGroupsListWidget_itemSelectionChanged(){
 	}
 	this->populateRecipesTable(this->recipeDB->retrieveRecipesWithFoodGroups(groups));
 }
+
+void OpenRecipeDialog::on_clearSearchButton_clicked(){
+	ui->nameEdit->clear();
+	ui->foodGroupsListWidget->selectionModel()->clearSelection();
+	ui->tagsListView->selectionModel()->clearSelection();
+	ui->ingredientsListView->selectionModel()->clearSelection();
+	this->populateRecipesTable(this->recipeDB->retrieveAllRecipes());
+}
diff --git a/gui/openrecipedialog.h b/gui/openrecipedialog.h
index 8e63496..f0989da 100644
--- a/gui/openrecipedialog.h
+++ b/gui/openrecipedialog.h
@@ -38,6 +38,8 @@ class OpenRecipeDialog : public QDialog
 
 		void on_foodGroupsListWidget_itemSelectionChanged();
 
+		void on_clearSearchButton_clicked();
+
 	private:
 		Ui::OpenRecipeDialog *ui;
 		RecipeDatabase *recipeDB;
diff --git a/gui/openrecipedialog.ui b/gui/openrecipedialog.ui
index 93cb94b..460e738 100644
--- a/gui/openrecipedialog.ui
+++ b/gui/openrecipedialog.ui
@@ -147,13 +147,9 @@
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="searchButton">
+       <widget class="QPushButton" name="clearSearchButton">
         <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/images/search_icon.png</normaloff>:/images/images/search_icon.png</iconset>
+         <string>Clear search criteria</string>
         </property>
        </widget>
       </item>
diff --git a/model/database/database.cpp b/model/database/database.cpp
index db53c3f..6e914b0 100644
--- a/model/database/database.cpp
+++ b/model/database/database.cpp
@@ -14,12 +14,11 @@ ResultTable Database::executeSQL(string statement){
 	sqlite3_stmt* stmt;
 	this->sql = statement;
 	this->returnCode = sqlite3_prepare_v2(this->db, statement.c_str(), -1, &stmt, NULL);
-	ResultTable t(statement);
 	if (this->returnCode != SQLITE_OK){
 		fprintf(stderr, "Unable to successfully prepare SQL statement. Error code: %d\n\tError Message: %s\n", this->returnCode, sqlite3_errmsg(this->db));
-		return t;
+		return ResultTable(this->returnCode);
 	}
-
+	ResultTable t(statement);
 	t.extractData(stmt);
 
 	this->returnCode = sqlite3_finalize(stmt);
@@ -78,6 +77,18 @@ void Database::closeConnection(){
 	this->dbIsOpen = false;
 }
 
+void Database::beginTransaction(){
+	this->executeSQL("BEGIN;");
+}
+
+void Database::commitTransaction(){
+	this->executeSQL("COMMIT;");
+}
+
+void Database::rollbackTransaction(){
+	this->executeSQL("ROLLBACK;");
+}
+
 string Database::combineVector(std::vector<string> strings, string mid){
 	if (strings.empty()){
 		return "";
diff --git a/model/database/database.h b/model/database/database.h
index d0bd435..0ccc9fd 100644
--- a/model/database/database.h
+++ b/model/database/database.h
@@ -35,6 +35,10 @@ public:
 
 	void closeConnection();
 
+	void beginTransaction();
+	void commitTransaction();
+	void rollbackTransaction();
+
 protected:
 	string surroundString(string s, string surround);
 
diff --git a/model/database/recipedatabase.cpp b/model/database/recipedatabase.cpp
index 1a9f83a..0ebd528 100644
--- a/model/database/recipedatabase.cpp
+++ b/model/database/recipedatabase.cpp
@@ -253,6 +253,18 @@ vector<RecipeIngredient> RecipeDatabase::retrieveRecipeIngredients(int recipeId)
 	return ings;
 }
 
+int RecipeDatabase::retrieveIngredientId(string ingredientName){
+	return std::stoi(this->selectFrom("ingredient", "ingredientId", "WHERE name = '"+ingredientName+"'").at(0, 0));
+}
+
+bool RecipeDatabase::deleteRecipeTags(int recipeId){
+	return this->deleteFrom("recipeTag", "WHERE recipeId = "+std::to_string(recipeId));
+}
+
+bool RecipeDatabase::deleteRecipeIngredients(int recipeId){
+	return this->deleteFrom("recipeIngredient", "WHERE recipeId = "+std::to_string(recipeId));
+}
+
 vector<Ingredient> RecipeDatabase::retrieveAllIngredients(){
 	ResultTable t = this->selectFrom("ingredient", "name, foodGroup", "ORDER BY name");
 	vector<Ingredient> ings;
@@ -356,8 +368,71 @@ bool RecipeDatabase::deleteTag(RecipeTag tag){
 	return this->deleteFrom("recipeTag", "WHERE tagName='"+tag.getValue()+"'");
 }
 
-bool RecipeDatabase::updateRecipe(Recipe recipe){
-
+bool RecipeDatabase::updateRecipe(Recipe recipe, string originalName) {
+	string idS = this->selectFrom("recipe", "recipeId", "WHERE name="+surroundString(originalName, "'")).at(0, 0);
+	int id = std::stoi(idS);
+	this->beginTransaction();
+	ResultTable t = this->executeSQL("UPDATE recipe "
+									 "SET name = '"+recipe.getName()+"', "
+									 "createdDate = '"+recipe.getCreatedDate().toString().toStdString()+"', "
+									 "prepTime = '"+recipe.getPrepTime().toString().toStdString()+"', "
+									 "cookTime = '"+recipe.getCookTime().toString().toStdString()+"', "
+									 "servingCount = "+std::to_string(recipe.getServings())+" "
+									 "WHERE recipeId = "+idS+";");
+	bool recipeSuccess = t.getReturnCode() == SQLITE_DONE;
+	if (!recipeSuccess){
+		this->rollbackTransaction();
+		return false;
+	}
+	bool tagsSuccess = this->deleteRecipeTags(id);
+	for (RecipeTag tag : recipe.getTags()){
+		tagsSuccess = tagsSuccess && this->insertInto(
+					"recipeTag",
+					  vector<string>({
+										 "recipeId",
+										 "tagName"
+									 }),
+					  vector<string>({
+										 idS,
+										 tag.getValue()
+									 }));
+	}
+	if (!tagsSuccess){
+		this->rollbackTransaction();
+		return false;
+	}
+	bool ingredientsSuccess = this->deleteRecipeIngredients(id);
+	for (RecipeIngredient ri : recipe.getIngredients()){
+		ingredientsSuccess = ingredientsSuccess && this->insertInto(
+					"recipeIngredient",
+					vector<string>({
+									   "recipeId",
+									   "ingredientId",
+									   "unitName",
+									   "quantity",
+									   "comment"
+								   }),
+					vector<string>({
+									   idS,
+									   std::to_string(this->retrieveIngredientId(ri.getName())),
+									   ri.getUnit().getName(),
+									   std::to_string(ri.getQuantity()),
+									   ri.getComment()
+								   }));
+	}
+	if (!ingredientsSuccess){
+		this->rollbackTransaction();
+		return false;
+	}
+	bool instructionSuccess = FileUtils::saveInstruction(id, recipe.getInstruction());
+	bool imageSuccess = FileUtils::saveImage(id, recipe.getImage());
+	if (!(instructionSuccess && imageSuccess)){
+		this->rollbackTransaction();
+		return false;
+	} else {
+		this->commitTransaction();
+		return true;
+	}
 }
 
 void RecipeDatabase::ensureTablesExist(){
diff --git a/model/database/recipedatabase.h b/model/database/recipedatabase.h
index c68b0c9..2b80d95 100644
--- a/model/database/recipedatabase.h
+++ b/model/database/recipedatabase.h
@@ -26,9 +26,6 @@ class RecipeDatabase : public Database
 		bool storeRecipeIngredient(RecipeIngredient ri, int recipeId);
 		int storeIngredient(Ingredient ingredient);
 		bool storeUnitOfMeasure(UnitOfMeasure u);
-		bool storeInstruction(Instruction instruction, int recipeId);
-		bool storeImage(QImage image, int recipeId);
-		bool storeTags(vector<RecipeTag> tags, int recipeId);
 
 		//Retrieval.
 		Recipe retrieveRecipe(string name);
@@ -39,10 +36,8 @@ class RecipeDatabase : public Database
 		vector<Recipe> retrieveRecipesWithSubstring(string s);
 		vector<Recipe> retrieveRecipesWithFoodGroups(vector<string> groups);
 		vector<string> retrieveAllFoodGroups();
-		vector<RecipeIngredient> retrieveRecipeIngredients(int recipeId);
 		vector<Ingredient> retrieveAllIngredients();
 		vector<UnitOfMeasure> retrieveAllUnitsOfMeasure();
-		vector<RecipeTag> retrieveTags(int recipeId);
 		vector<RecipeTag> retrieveAllTags();
 
 		//Deletion.
@@ -53,7 +48,7 @@ class RecipeDatabase : public Database
 		bool deleteTag(RecipeTag tag);
 
 		//Updating.
-		bool updateRecipe(Recipe recipe);
+		bool updateRecipe(Recipe recipe, string originalName);
 	private:
 
 		//Utility methods.
@@ -61,6 +56,20 @@ class RecipeDatabase : public Database
 		//Read a recipe from a row of a result table.
 		Recipe readFromResultTable(ResultTable t, int row=0);
 		vector<Recipe> readRecipesFromTable(ResultTable t);
+
+		//Storage
+		bool storeInstruction(Instruction instruction, int recipeId);
+		bool storeImage(QImage image, int recipeId);
+		bool storeTags(vector<RecipeTag> tags, int recipeId);
+
+		//Retrieval
+		vector<RecipeTag> retrieveTags(int recipeId);
+		vector<RecipeIngredient> retrieveRecipeIngredients(int recipeId);
+		int retrieveIngredientId(string ingredientName);
+
+		//Deletion
+		bool deleteRecipeTags(int recipeId);
+		bool deleteRecipeIngredients(int recipeId);
 };
 
 #endif // RECIPEDATABASE_H
diff --git a/model/database/resulttable.cpp b/model/database/resulttable.cpp
index ac96d7b..a8a3ac0 100644
--- a/model/database/resulttable.cpp
+++ b/model/database/resulttable.cpp
@@ -8,6 +8,10 @@ ResultTable::ResultTable(string query){
 	this->originalQuery = query;
 }
 
+ResultTable::ResultTable(int resultCode){
+	this->queryCode = resultCode;
+}
+
 void ResultTable::extractData(sqlite3_stmt *stmt){
 	this->values.clear();
 	int res = sqlite3_step(stmt);
@@ -30,6 +34,7 @@ void ResultTable::processRow(sqlite3_stmt *stmt){
 }
 
 void ResultTable::printData(){
+	printf("--> Result Code: [%d] <--\n", this->getReturnCode());
 	if (this->isEmpty()){
 		printf("Result table is empty.\n");
 		return;
diff --git a/model/database/resulttable.h b/model/database/resulttable.h
index a4dcd84..361f75c 100644
--- a/model/database/resulttable.h
+++ b/model/database/resulttable.h
@@ -21,6 +21,8 @@ class ResultTable
 		ResultTable();
 		//Constructs a table with the original query saved.
 		ResultTable(string query);
+		//Constructs an empty table with a result code.
+		ResultTable(int resultCode);
 
 		//Gets all the data from the result set and stores it internally as strings.
 		void extractData(sqlite3_stmt* stmt);

From 9e3c59e415f1858826c6ce7d4135285716963b73 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Sat, 31 Mar 2018 14:01:57 +0200
Subject: [PATCH 2/3] Added icons for search criteria, fixed deleting image bug
 when editing.

---
 gui/newrecipedialog.cpp           |   3 +-
 gui/newrecipedialog.h             |   1 -
 gui/openrecipedialog.cpp          |   6 +-
 gui/openrecipedialog.h            |   2 +
 gui/openrecipedialog.ui           | 257 +++++++++++++++++++++++++++---
 images.qrc                        |   3 +
 images/foodPyramid.png            | Bin 0 -> 7405 bytes
 images/ingredients.png            | Bin 0 -> 18033 bytes
 images/tag.png                    | Bin 0 -> 1408 bytes
 main.cpp                          |  17 +-
 model/database/recipedatabase.cpp |   2 +-
 model/recipe/recipe.cpp           |   2 +-
 12 files changed, 249 insertions(+), 44 deletions(-)
 create mode 100644 images/foodPyramid.png
 create mode 100644 images/ingredients.png
 create mode 100644 images/tag.png

diff --git a/gui/newrecipedialog.cpp b/gui/newrecipedialog.cpp
index 3825ad1..ac3258c 100644
--- a/gui/newrecipedialog.cpp
+++ b/gui/newrecipedialog.cpp
@@ -40,7 +40,7 @@ Recipe NewRecipeDialog::getRecipe(){
 	Recipe r(ui->recipeNameEdit->text().toStdString(),
 			 this->ingredientListModel.getIngredients(),
 			 ui->instructionsTextEdit->toHtml().toStdString(),
-			 this->img,//Image
+			 ui->imageDisplayLabel->pixmap()->toImage(),//Image
 			 this->tagsListModel.getTags(),//Tags
 			 QDate::currentDate(),
 			 ui->prepTimeEdit->time(),
@@ -126,7 +126,6 @@ void NewRecipeDialog::on_deleteTagButton_clicked(){
 void NewRecipeDialog::on_selectImageButton_clicked(){
 	QString filename = QFileDialog::getOpenFileName(this, "Open Image", QString(), "Image Files (*.png *.jpg *.bmp)");
 	if (!filename.isEmpty()){
-		this->img = QImage(filename);
 		ui->imageDisplayLabel->setPixmap(QPixmap(filename));
 	}
 }
diff --git a/gui/newrecipedialog.h b/gui/newrecipedialog.h
index 105cd37..5198dd9 100644
--- a/gui/newrecipedialog.h
+++ b/gui/newrecipedialog.h
@@ -70,7 +70,6 @@ class NewRecipeDialog : public QDialog
 		vector<RecipeTag> tags;
 		RecipeIngredientListModel ingredientListModel;
 		TagListModel tagsListModel;
-		QImage img;
 		bool accepted = false;
 
 		//Helper functions to fill fields.
diff --git a/gui/openrecipedialog.cpp b/gui/openrecipedialog.cpp
index c0458b8..8f936da 100644
--- a/gui/openrecipedialog.cpp
+++ b/gui/openrecipedialog.cpp
@@ -72,7 +72,7 @@ void OpenRecipeDialog::on_deleteRecipeButton_clicked(){
 	}
 	string recipePlural = (rows.size() == 1) ? "recipe" : "recipes";
 	QString title = QString::fromStdString("Delete " + recipePlural);
-	QString content = QString::fromStdString("Are you sure you wish to delete the selected "+recipePlural+"?");
+	QString content = QString::fromStdString("Are you sure you wish to delete the selected "+recipePlural+"?\nAll deleted recipes are permanently deleted.");
 	QMessageBox::StandardButton reply = QMessageBox::question(this, title, content);
 	if (reply == QMessageBox::Yes){
 		for (int row : rows){
@@ -135,3 +135,7 @@ void OpenRecipeDialog::on_clearSearchButton_clicked(){
 	ui->ingredientsListView->selectionModel()->clearSelection();
 	this->populateRecipesTable(this->recipeDB->retrieveAllRecipes());
 }
+
+void OpenRecipeDialog::on_exitButton_clicked(){
+	this->close();
+}
diff --git a/gui/openrecipedialog.h b/gui/openrecipedialog.h
index f0989da..c6cf23c 100644
--- a/gui/openrecipedialog.h
+++ b/gui/openrecipedialog.h
@@ -40,6 +40,8 @@ class OpenRecipeDialog : public QDialog
 
 		void on_clearSearchButton_clicked();
 
+		void on_exitButton_clicked();
+
 	private:
 		Ui::OpenRecipeDialog *ui;
 		RecipeDatabase *recipeDB;
diff --git a/gui/openrecipedialog.ui b/gui/openrecipedialog.ui
index 460e738..06db1f0 100644
--- a/gui/openrecipedialog.ui
+++ b/gui/openrecipedialog.ui
@@ -17,13 +17,37 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
   </property>
+  <property name="styleSheet">
+   <string notr="true">font: 25 &quot;Noto Sans CJK KR Light&quot;;</string>
+  </property>
   <property name="modal">
    <bool>true</bool>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_6">
-   <item alignment="Qt::AlignLeft|Qt::AlignTop">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item alignment="Qt::AlignLeft">
     <widget class="QWidget" name="searchPanel" native="true">
+     <property name="styleSheet">
+      <string notr="true">background-color: rgb(245, 245, 255);</string>
+     </property>
      <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
       <item alignment="Qt::AlignLeft">
        <widget class="QTabWidget" name="tabWidget">
         <property name="minimumSize">
@@ -39,13 +63,35 @@
          <enum>QTabWidget::Rounded</enum>
         </property>
         <property name="currentIndex">
-         <number>2</number>
+         <number>1</number>
         </property>
-        <widget class="QWidget" name="tagsTab">
+        <widget class="QWidget" name="Tags">
+         <attribute name="icon">
+          <iconset resource="../images.qrc">
+           <normaloff>:/images/images/tag.png</normaloff>:/images/images/tag.png</iconset>
+         </attribute>
          <attribute name="title">
+          <string/>
+         </attribute>
+         <attribute name="toolTip">
           <string>Tags</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_5">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QListView" name="tagsListView">
             <property name="sizePolicy">
@@ -74,10 +120,32 @@
          </layout>
         </widget>
         <widget class="QWidget" name="ingredientsTab">
+         <attribute name="icon">
+          <iconset resource="../images.qrc">
+           <normaloff>:/images/images/ingredients.png</normaloff>:/images/images/ingredients.png</iconset>
+         </attribute>
          <attribute name="title">
+          <string/>
+         </attribute>
+         <attribute name="toolTip">
           <string>Ingredients</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_6">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QListView" name="ingredientsListView">
             <property name="sizePolicy">
@@ -105,11 +173,33 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab">
+        <widget class="QWidget" name="foodGroups">
+         <attribute name="icon">
+          <iconset resource="../images.qrc">
+           <normaloff>:/images/images/foodPyramid.png</normaloff>:/images/images/foodPyramid.png</iconset>
+         </attribute>
          <attribute name="title">
+          <string/>
+         </attribute>
+         <attribute name="toolTip">
           <string>Food Groups</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QListWidget" name="foodGroupsListWidget">
             <property name="frameShape">
@@ -132,6 +222,9 @@
       </item>
       <item>
        <widget class="QWidget" name="nameSearchPanel" native="true">
+        <property name="styleSheet">
+         <string notr="true">background-color: rgb(240, 240, 255);</string>
+        </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QLabel" name="nameLabel">
@@ -141,16 +234,115 @@
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="nameEdit"/>
+          <widget class="QLineEdit" name="nameEdit">
+           <property name="font">
+            <font>
+             <pointsize>12</pointsize>
+             <weight>3</weight>
+             <italic>false</italic>
+             <bold>false</bold>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background-color: rgb(255, 255, 255);</string>
+           </property>
+           <property name="frame">
+            <bool>false</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="placeholderText">
+            <string>Recipe Name</string>
+           </property>
+          </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="clearSearchButton">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>40</height>
+         </size>
+        </property>
+        <property name="autoFillBackground">
+         <bool>false</bool>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">QPushButton#clearSearchButton {
+	background-color: rgb(235, 235, 255);
+	border: 0px;
+}
+QPushButton#clearSearchButton:hover{
+	background-color: rgb(245, 245, 255);
+}
+QPushButton#clearSearchButton:pressed{
+	background-color: rgb(255, 255, 255);
+}</string>
+        </property>
         <property name="text">
          <string>Clear search criteria</string>
         </property>
+        <property name="flat">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="deleteRecipeButton">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>40</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">QPushButton#deleteRecipeButton {
+	background-color: rgb(225, 225, 255);
+	border: 0px;
+}
+QPushButton#deleteRecipeButton:hover{
+	background-color: rgb(235, 235, 255);
+}
+QPushButton#deleteRecipeButton:pressed{
+	background-color: rgb(245, 245, 255);
+}</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../images.qrc">
+          <normaloff>:/images/images/trash.png</normaloff>:/images/images/trash.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="exitButton">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>40</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">QPushButton#exitButton {
+	background-color: rgb(215, 215, 255);
+	border: 0px;
+}
+QPushButton#exitButton:hover{
+	background-color: rgb(225, 225, 255);
+}
+QPushButton#exitButton:pressed{
+	background-color: rgb(235, 235, 255);
+}</string>
+        </property>
+        <property name="text">
+         <string>Close</string>
+        </property>
        </widget>
       </item>
      </layout>
@@ -159,34 +351,55 @@
    <item>
     <widget class="QWidget" name="contentPanel" native="true">
      <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item alignment="Qt::AlignLeft">
-       <widget class="QWidget" name="interactionPanel" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QPushButton" name="deleteRecipeButton">
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/images/trash.png</normaloff>:/images/images/trash.png</iconset>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QTableView" name="recipeTableView">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>3</weight>
+          <italic>false</italic>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">background-color: rgb(250, 250, 255);</string>
+        </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
         <property name="selectionBehavior">
          <enum>QAbstractItemView::SelectRows</enum>
         </property>
+        <property name="verticalScrollMode">
+         <enum>QAbstractItemView::ScrollPerPixel</enum>
+        </property>
+        <property name="gridStyle">
+         <enum>Qt::NoPen</enum>
+        </property>
         <property name="sortingEnabled">
          <bool>true</bool>
         </property>
+        <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+         <bool>false</bool>
+        </attribute>
         <attribute name="verticalHeaderVisible">
          <bool>false</bool>
         </attribute>
diff --git a/images.qrc b/images.qrc
index a5261a4..de44dca 100644
--- a/images.qrc
+++ b/images.qrc
@@ -6,5 +6,8 @@
         <file>images/minus_icon.png</file>
         <file>images/search_icon.png</file>
         <file>images/trash.png</file>
+        <file>images/tag.png</file>
+        <file>images/foodPyramid.png</file>
+        <file>images/ingredients.png</file>
     </qresource>
 </RCC>
diff --git a/images/foodPyramid.png b/images/foodPyramid.png
new file mode 100644
index 0000000000000000000000000000000000000000..10ecfa6f08448d12d41ab8e262c0c97f5865fbda
GIT binary patch
literal 7405
zcmbt(XCRwx+y6xr)mlZVUE0zXF>0?4vo+d?R;{2_MC~nB>#kW8wO4CIMNzx9YN<U+
zjM%kDVuje=EBE`n|1bZKPrgLtNUk&Ic^toWg+JEQq^IMg0|0<tTT2ZF02JV#6aXzX
z_+;w(<rVlu<#t~iP76N#XkUf_0C%po+C8{;I)2jMw8!g=X0ul}L$5j?7V%J^<D+)%
z6D?BsSaHhdFQy??rI8o7=31=FyIz%t*4eWsw!AkR_ZZXi(tPJgTl4&7*u*1NHoc5q
z`6kuly(5RcgQt2+e!Zk4<&veqo#I{;m(%q4$oMZRa1H;(qe74=Ozl$m=Q;p@aLlXP
z^oBh_1lTRB06~(Wj*X3W8_GW01f_&dtizD-0}|v==#D$2nE{PXOx$|WbfhPe`0yO%
zXK_g}<;m{uwzhu%Hv!=nCxLGd)VddY92>H;15Rwh)o#Qa%PE)_O;z`O01GUEpzvya
z7|eNj`t0<$MA3s!X@6>R?l+%Gy?Y0f|C`hE;5Tq2cK3Fz_2kA2^>lwN(%${uQ|+|T
zN!&FQUR|>zQ6Gj10)jU#X<wT&@9QWnUBO1K*mr}4MMaYn80g88>KznBK^%BLy15B$
z++06eE#&df2+k?l2tG<kpx-q#ymLtD>r7{n>r3)kNRTKYOxjxsEDvqG$=6?7ZS3HX
z+gyo9k%*IA{lVacURvW9WeB_J+@+%}+2zwOkVw0m<vZK8#I8)`!*%-Q7C>C`{%0el
zMQm0;S^36v7QD&TXT$u>UEw=P3UW$_a`1mmTLTHVNo&2C*uea|5MC-t$v0QK5_g?>
zRMO%0ufG<=F6E*ZmvVD$@7!WrvDZ-hYGPxJU&Ty|y}5i55d6E!%goGF;Vn^setJ8h
z=152vCd|o6n7AccBzHPylUow6^|GuzxyVEjg$G9IA<bG^qUq^Y8XFTgnP|h$`eG7A
z%zT$TpO2NC`F(Xi*rp)`o~95h3B0AHkds&4{m)A7GExUUVWQ2Rladk@H8a)1u1VL_
z^qoab52GK?+Xx92Vjo^#LAA7ud@ZfqB@Ss;lRv<`$yaM}4;u4b4u<cTtMl3^%hxk3
zJoD}iEUC)Qu7ADo@DC{^)%dx3o5OgUyBftrP#vJOw0?<|xZaN-hMtXZMj89h{2no{
zLujfD$x28_q)1EMX#43#w0%^_tDIRfHcDK@;{J?!lX}mx6o6_A-<@PNf%w)Nen&-*
zZIKT#S;A-Y@oOXV+j{{a5A)!Q<dx!B>0ruo>p3y&cz-|l0cd|HMe_@036rYP(LI7L
zX0p-H)YQDz&&MX9H~46&Hz7gf`F%`yE6fh=rxEg4__Eh$Lvf~yK;|~j$Hd|4>HV$T
z)ca2mSzi1SPx1s1GlKH|u6W$IYz+5RY^@><HN*Mi8HfYw+|M7t%vJKxSk7hz>J=mJ
z(75I6+WWcVagoP5mBx8-OK9}1gr1(<!~U7PM?4wk0SB#h=N_~GGgk}@9(8>$MeT*P
z!fqA>psh|0S0ABB$enUN8Pi5nSKHb9Fx_jCQjrl|-K^o=-4zF8791Ral9Z&?i7z_R
z)uWP)?RscOV36Y4k`%(<qu~ZL2EMkqyu{A&r)G_=nE|Z*i;quUmJ*jvfZIDbAUiu!
z<w~PwkpVV#caXb3>Q@F$jCobAVMD3JOqap)8A|8_e8mCp`>&Q3*m!sQ0wuAL^LBRh
zyX?@_zvZc%B?wj6ep1s1B;^||R<@*+4tF}r^|utw5P?{=OG)2QvIfP|2c1OXg(WY-
z(1J~7Nq75~M&eJ#+|-PQYA>x(jA8AuQa|HGfR~nMYb8H=^5jIj^6(IY`FYN5ae2-y
za(<(Jhq!Wbl#Am(lXvs2eHXem=XTFa9FXfR-}vqld~DNq0}FScQzx8;vzVB4R1<1f
zx4;gJoOf!{#hj<QZwY_xt1$TF{5J?S5c>RiU5$DhI$x?GEil)1s=gLw)4N<A`l!i|
zG}(Hg&MO`%Q`LY9jW#XU$jV|g3#Mp(0?spc+Bf^8nwkdX0(1YBP`=*Gsfut7sQPwA
z#UeUQR=e^|fYd8*BCm3)2H)miaAmigN4FQ0eM8>GBBP?DrNQIZ&&NjIALxH9oFyGu
zpmOWg&a3d644$HZPdi|FdylfDB){{301RI}V15TxYupfc25y==tfv!W(-+IUHZr(Q
zqd)@*dXWp${JlJ&=qY~A<s)0*{;X3@gRKHg&dbq2@PG&6l=VvuofO~f41TE^KNH;x
zjg8SCtay*28$wG%=g~<)#FD&)0YM)^h24!Cob&~}yp?wGLoFTQo`~j)ke~<0p<+fe
z1ZJ*B7-b)r$?ZOE-RtV80rxrFk6;@;htazj?Y!t{=7BWXLBjcDOThV`@<-0j&cgCp
z`Z-SucgilY@X1csJg9@l{SoBz+x+&X9yUQfqbU__?Ftm7<VAqt1Bgze5@wNm+1g`=
z`=#|63j%_I!$sv~t7Gw=h)qonfSZZA+&VHUDwL*RPXOEva7bY=m-J(%55FdQ#RM*Q
zsgDAXpaq49z0RIgr33YBa08y!z8)jvd9E>tK;Pd4I5nu(3GFLi1TK?%UsmZj655Wn
z88Fw48YvmXV|H*j)`(;7#RY-Sf+Jro=|s<g3}MtcH1tQ(vzss}P+B8Tp1ny02XJ?5
zy-4#NbDFBB$#5yD@~Y_Y>C)hea$va`uqcR)<&vr3!|$FRRiOS1hri$p^efr>bspA}
zXJacoIR5@qAO|2akB|R2zXN+nSAZ_Gg{CSPi(R@@g-ih3Ul!j8{uGZ)b(BO?Ykn8_
zChvr*7s0mUPhM`Skw}6@tM$tnc#sPCJ642og&5ay88c1rJXYt~5fdPG>0spRsAw3^
zuNzxQ)XV*E)!Ji<>b?XlGT~und|WnMB|ry56Cz@=*xxgf<cVklPx<=AD|q$6pCMgI
zDV{7K<!iei@8ONa?lbn*7&Uj|u)7JW);5v4q9R(m56+d_Ad04%vOE!o+n%`5(q84a
zZ(o)*`e&6qH&#$gOQxlgbz;5DnJxPwSW|*tN0>Ddk@ncA{UhPU`=QmUs*NUk`l1FC
zbH`=#eTIC1`Z7n^>no?5XPF?jYPQ<Ew5SO?on>tfGMy9@5U{Fx%}l!q>)ru-T+_hd
zLL`}YLJ05r#DR-y$k}<~>VCbFloS`&15(S=Nwc?a9jAnESw&n4F8+Bl=pHTAz*b6%
z&Vc#8$;K6sZ{J6ZSM>}Hb$0eQY_d@YQS38js5T{OnsOKH&2LTC9gKB!RG_SGo0#bL
zeRCFJA7D>M!4}DUbofh9Q)@*9<fD^0#?sQk#;!hDHKz>2GoFJHyz0nl^&qm~LG`cs
z&W9Hs*(|9(l}_ag42$_48%vm_4H5t)PNc4_DlQTqxWBt_lFvwBpYKb)S4>A0D`8Uo
z@S5b6$>M!RNKp3X7u~dEN^!!Jyyw??_f|Tba%soVs=unCq2ss)285~F=rE(|Xit5=
zP>Q=9&G*V*?XIcXT`E979vZRPK+Q$vSr-*m99gCPRCimF%;VnW6St1AnSO@In`Ftd
z1RnSI4D>mv?c*xvSIccnnmWh0z(dbY)MR8_JUQso=~CBF58O?FuP$rVK^t3u{&I$#
z25`j17r6Go7Q2H_Rm!p}FMX#@BH$OUH%I;eE66xh&4u@{{XvOScDc7QOPaPZ7W+fy
zMV)+uO)GJL*xq&2BkNC%M#mu^TD!Rs-gLw#eRLJVMWS0ffA<{7cXWVPZpo2xC@b^y
z$eU!Jwg8sHL49{y;8oXUw6A4=F)n@m0=w<rFKH>Kq=Za`d(rAiAY?pwg761Nx)EGP
zFu2fO>z6v+qou)~2vhfpmn(k`X_k6pk-VAb&qELNvh?bNRQ^-Q(0C+<&-{)I$Ee3<
z_0*eQ6FJ`LOBqJr`z;Q*cju6n2k`2s1#8{R`tQj{AlT$#GnHKaf~1t2nvxQwOI+qr
zq@uhU0JWz$8*p#$#Px_O1RQyy^O7_p7JE>r=>mg_qrbsqbogFemHigJHXtR^?Ia$J
zsdz*2Ns#i*V-B9I6gx2wXMSuU^knmAmdxB~WmO_3p~#0OE-pDS@*f6718&N)8Nm6w
z@K6UuQ_-80wvZ(@tY~WhTS(*PQi>^jHS#P&^{IyWJF!b?X_{>TC(?<L^&A%g9%ql3
zFj`vU`ee94VM6D`SM7KexrzR}bx;+IT;r>rjPX1WNI;DKcJ^4wXjecSsMP`oiB-yX
zNe><Q*t+#mV)q1!D2#91Uv=U%Oj8oNo~L^-f4+eC&g%nL5%v|Oi$P*cwEwgu@8ic)
zvKxxA^Yd`-vvnz)|JEdmK1nQ*`>K;>K$Yn=srZ|26akEoPZ$1w3NiE4DMC*sNywp)
za~kM>_%-u?1VbLQM{3QI#DR+W^-J8`+_kRP3(x~!us+Yj!!OVgCO%Ill^VUuegY0p
z`WOy3s)b=ZZ(7k_fVvCd8^2RS?q0YQu5(!t9c)_?*tJk`Bq_7QS%T%hnXZ@wXQ6BT
zyS(46gC6-dd*vb^s`l&kSPOA~1#i;Yx{x<-V)zN=1V;y&xm~{<2`~5J5a+)}%!#oj
z{kqNpKy7C}Jug4p<5JCp8-NDGt^9_*xv@roBM&i$f1{|HHR8}0hF`eqwq&)-DRnW3
zz5hu?l9G@#+kiQ-C(v(c?{n}*{R51$iCA2$C1?(`>!4!Iz;Z6wv$uwe(rVX!^VyNk
z_36}pI~wm|KRa=P^*kNU*I(9}h`#;<tlP_OAb>6S+%?$`!MS`huIXeiUZ}D%H+2JC
z)`YLR<{%*)FAgYt&ao}2hlGcR?Mc?Z)880jn{U{?Tyu*_t<_=thD3FF&Ny40CE)%E
zEPH#LBE^hv<uxcIoxnZBq~hUZvUQW2ljffLhoV0^I=i9w89HCTbAOQw=YQ{rfxVH$
zJLt-sl@u3$<lS(pfX^JIgM8xQQAhEJB};{R>i3u0bg85D!P&pWTj`Pm#}#qm8%Jp&
zL2qoPUFL9+d!3W2E&|yNqxQJU<NB<=4+g=drt@c(0F%*w)K@h-ez*5j%Ep#-4vL=d
ze|s*5_vy2Er2kRFmPXSli_jlJxPv&5DaabpT6(_DGbL?&JbpE7?{732MYhvFvPOj*
zYb>_6M{%W?FUVZx0Q$~zSNX{g=H!s&7Fd{A?a0O_?;q#4Fg-Cb)!3k@)CNFiWG5yB
z1tFB|q5{|<WS*p#YIei-FJE7F#DVzH7ymDQK&bW7H0p$^nt^=;?1E7K-u6P4Iw~Py
zfN-JKQ9JGLO8J6-gG27&<`er7<8k7udL2}z84w5kiUc!lwpG(<>Wbf{udXAZfW>~e
zpFrm>RJ8YND}Eu%?>;6aWo%Tf(rq9KWHcR+^nJXeuYkQ0;J2h_zBg15sQ7RSc46X)
zd6ld6r1G}a<!7WY+NK}#vUCUC%QQjdj~+kP;*h^{pDeW)u3Z-uxz=PsIZ*~Ldfn5f
zr}wnL*jQ_~f41;h*Lr=uEy-F-Lm9YsDMdu)bB1lni^8WT2h%i+e+U<dOOr>cS;}o6
zMz6_KehZ7}Y8OW@2!O?80xm7ZPo}}^{CC=8x69aW+mfgbpSc{D_YtP9ZXlgkBwi<<
z^&jlmkzNXGC<1;od3h4*s7la(ZkOfj+^b+$J<-iUb}4@Nm<x~NTVUX<vU*o4!Y<KC
z@h=;B@3SL56mseY=soPLKThSu=u#L4`WX4weBJ-as4X3<B@iABt|kOrjV!=~Ki8yS
zP#SQun_8~~>nW{kI_tOC4w_-f;Q~O+#$uns`Egy|B2oiiE{s1Hy98R|QUlV}2eu^j
z_$SKyGYiU=_a~B-Q5Pp^oHhOZ4Y35C(^HI0fJWn$9y~)zM$*XWNLiVhK=`lz2Ea=T
z)U}{tah)>`X#9*CpvmC?z?YH){jo8bs(A+$0PjLz=JuOQHJzGpp9=v?q;tMgGbvc@
zBGI<cplDhu0cJ!}<mM^uC$Fq$=2s+;c;gp-0}%J$rmHg+H%coTJa?NZ9+0vh)$;;R
zhaDZ~PCsUdg8MJ-4sG_I%m`&@aI4GBB_{(R1oda$N7dP&L~4@x{O!Zd$))Yqji$a+
zyQ^E;cV*(V_;7vROEDM3O<3va&r%&?tl1TYY`P0euD?Ip2-L1bx2=tMIgobj9ejvk
zpl)j(w+F}pLnS-Dwf<g6Msnsu1N-)??4KG|Pf%y5+2d%Q+|<gbI>nv0Mugb~z}YS4
z{l$Md<wzP=sBZbYz!v)XvB-^+TH|*lHsY-Fk97GSU0J6%qzc5q07bf@nCPj0*jz`^
zpJH25S8Xp3UdNm2Qyb7v)0z@Wj~8VR51XnV1NQ;sC9^p!@PCAIz=3a70-WhSK}TF&
z-EQ?cPU&Et8!0G;YPzcOW<G;hI5!_3kaLM#T*-hrrw3F|10|73IYWE5BqDOLFYuQ$
zcDf7ILIvHBoz9(%7u$LT$boVg#Fm6Wi_VYvF{1KZ_;-T9Pur848tu&Z)XoaiYf7$j
z8lY~o!TGPyL8+TTX=GLhB37*nJ|f){QTq>AUUOa5Z`r*y2@!`}gwcd*F+ka8TY<3m
zleGyFxV5J)5`5VW&dmMaqAx?A!w?8Vbqsls=g5xQQ@^(PfMP~bSTxFRx{e$bq)Gdf
z885UQs9qC@O}Vl%;==WT!Fpj(XnXx5E83u#d6o<#-|Gemg@tm;0BCCB!1PB(HUhLM
z4^^q;&WV4oQ(yS4mv}bE2TGD(!!nYKYb7;%z2|Lcf(i=qtjR5&oYOE|(&T$!Go^-_
zWewtq<}<4)BTTIf=BApId=Z{b8vJ8R8e&W50R#nQUw`{Ima0Q|?Y-_`4gjqOg6fwU
zkc#WAteWT1(s}uimX2#{%*NDMtfhlu=Kpz@VH|GgV}sMNcfy~An+sLMh%HVa8u)^G
z?0RZ?Fwk_C0cS}wHc}&7Yvu4xnRMIj>etr(M<JRH6YX#)naF+~Rz==HW#8j(W(LyI
zMGy^#dqsb(U`3jJ-@g5z2t2us&#d@SK*0}Yd0Q{`)+MCMORr)JZ&f=SE%=?^5)~_E
z33sLs(j78H8s3{Ct~fa8hij((_<Z}Bt7Q#sKK0$@Fnv|)h&@b62}S`fj*`J=+FGhm
zg5dn|@DD=lBU}8m0$cdCxG&#{?r3}2*FRDyW@b}9h_`1Q)0kqxXbV(<UtfC&6#M>#
zT%BVE^e8T_=(N^)R6DY=#Uk}4A(WJFM;lE4VS#`q=|4IU^_8px3k&_#CXRa91<>O`
z-c0SEz!fGadEqLChtW4+{<fQ;d}Z<<5_chYL3{Lq#S<?nTU{-Lg(8kmkFxZaoKGve
zqi5uSJzw|r)r7bQ^HDALKNr}!o4&eXLVEHo0H9(pX-vO~E38>*i)sPM97JE*?tFj)
zc>UPNvn!D^<d;RLBZP*U{>9Rf@K;{Ikq{e8@h0+eED~7>OKEUwp=vc4rvWt*)m2AG
zS?c0j4YOp~7aEb-Z#blvRNYVgl6ZfH3=j$hzw!WnQG0(bM+2iJE5C};Lg^N}uVMqt
z#9FGte4jD^Dw-&}3nRey*_J>r!k0$1Xx5}LAD?%if=%_*$6GD{Gj0`0Rms#rbY2uj
z`HxlXhX?aLJaSW~XS}9dK&AR=l7(fMK8Vo!Ae1_^*i;(>CQcp!AoH0<gI67dT<2Ur
zXOSVqMna~L^guu7l9B?dJdNtxl27RYva#Yin)K3vHm1u}A+b@ZNb_Pl0`1&Qunmn0
ze9vM~fdz+)Twr8^!%CB7z8y)e1w+AfrOu-;ir(j)EF!z1qSc!&$R7CW@x@|qeR0vG
zTC0)*lCQh7siXC2a&X5;3V44V_sHaZKJcBs-8f>9e)n7rUW7e-tnA$ig{-lW1n~YQ
z`2PKnL4kzY$^=hnzmK%M{8)lbN5PN8L@_Zz!4!l;{*M_*^Z#WDZI|$QqSq*0o^^aa
z*x}+cYj}tOeVmKcbbwR+y}EqF6+htpd!weQsj1(g@WR5PFT(Qm&R0RnMcZ|+rf}i4
zK@QkSciI*No}|e<H*(+5tAnzzKp264lOCmAu*J~nU&C1p9hAey?At<C1o#~xu0MN@
zvs<Lt)`nw|FuQ8Uob0n*C{8&gnZp@q2gN~4&gp?Z+Ba57G%9Am9M=+jcjDR8dT*Bp
zCr~iQ%k=*pwc~SBKE+d?`U;r^$thlSN=l`4!KnzY&|L`BdKY6T-LlHIS6F=XT+1|a
z1XNlT{DzVc#-O|#SnuG6@Voz7#kO&RKYg8gK2-7D@90dCGok@ZS0J`S;6;^VUXAHL
zhrs5tvM-T8aGT4ZjR`E}rr6Z<8QWeUN8{JA6UtUrel$I)>V@nW2wBIHeeSk0xclJI
z@Hs3Qo6Li5@)p~{mFWK1tN`TgwZTvg=n!@DnL0|Fhg)m6i@oWraob&NPW|4C-$Z_<
zXyE(G)a+n>G~e|m;wvQ5nvJc_fh%f3V2JvzMSGbw7#&2#6q{QIpy+gTHn{=543V?n
zs>qGRq<EyVX((f$Py0m8A>mCY@V~B0U@0F=!mS;LbG1e36s<m9QVO;Qj&l^I(I0K{
zbHzp3&!0b87DR<oK!{_(Q#3(f%y#n?u{Q&+iJDZzY^Z#X_5o%%fh1+&B89*T?~Y4g
zuqz`Q6W!N6wB*X%zyPSBRu~*1+aoIx(58BiolQ$v59oiInL;c~&HC4XyA?@<83F#l
zg2Ew8uzW$mLu;w6Jui#)KY7u5!8B`g<-0OKy4l;{2Q4axVemoQq19uE0h;3lIHLbh
z#)c8s<j&26hW;*wv$I#0n_e?l?NTR7{;L>0yQ`-qGpaMmfjZYnar^GpnBTj|pyOvg
zo;!==P$oC^fh=PBlVw-Z+M(30B%ttq?-ur?iFVpjUii#T%yx)o2d(d9=d=F-P6BTW
zym5>9z+@JH?xnel8ZZ})2nnf&Xlu7|gJ-_jb61XXCLTQ}>%=YQy`c=#<!1^f->k3$
z4=As&Z*T=z7RKFH1&!%S>^F_1EISd77+{m1X#;*@gIY}JLXqN-RaKdpS1tJhzZUlW
z83UH(aQ2f5YA8F#5#ar!d#Bwg-CgQa{v%{lZRQu<Ypz(4u)89)SNT;$5#{7$cA^9D
zlW)5m$PD(CR8|%g+*S?sw%6t&uM^{T<;v6H;^Ike8u~xjzH>pUaau1W3*P0-VORZ+
zYPa2pmz2bhO6IxUf&L=@Gi|LeHNG=JRntzJa0{T{{8>_@1pqiF=NZQElBu_U???gw
v<cbkz+VS=ELOSB^eE-D_yZ`#57Q|B;7KWW(X2)^@`OCD`_0)>*TfF@r_MClx

literal 0
HcmV?d00001

diff --git a/images/ingredients.png b/images/ingredients.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d8e207ba482506901d4820fe009212a3cd0fc4d
GIT binary patch
literal 18033
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

literal 0
HcmV?d00001

diff --git a/images/tag.png b/images/tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..544ec9a7daaa21cbfe40d6678b06416a7852dff4
GIT binary patch
literal 1408
zcmc&!e@s<X9RHrfeeWH3Jl=gg!)Jh89%(tV_uTA3#pFWwp$s823v+DTiUnI(2$gKm
z>+rLOI&JbtnkL{FwmIQdo3Ihwt1su)+8WaUOY}WWvkB|QVtd(DI(JroIHNziclUhn
z_w)UH&-r|}@Aq_WF5O^DcsKz7Y(*QTEdYr9A|PgF%IiLTof-41#Tz78Fy5Zg<6R7i
zuif}^J%H6|d<Z^1;$ooX?V=LD<!W4pbs4`!ZafKKvK2}BTN}Qgoo+7q(Ypl3bH2-b
z-jh7N#s&rI)9>CGHSe?D?RqO|_!>*U|9N8FfF8bbIm6!F^2_Mh-sq~@6X0sf7hKTl
zF>`UU)=sM-QE~A$8eNKyA+PSHAaED39J?1Gq5bExsvXrwPobQ0AF6>Vjt7Z;^N{*V
zUAk(fC4fW&S<KK?`s1Kn{mH_z%^@^XF9dE+)D7>zxV8)QdAhrq5VgN`uG{hgkwow<
z`>-m#(7`v4Je6KxDHlwtwg;FXznUUIM+L_yJaX{xY>*JZk6;$!5dwzPxZMH>7)MU-
zVWA)e%1l!R%H*L<<T!AMkd|UB+rM@GEqmJx&FMQjXi&x3+MI)gW^?P$;mywoNqvOS
z)?k(L<U)2&-0%v;UI6{e`Bo1efbkc{wUMML@GVs8H+DqnMUIQ~hvzQ#uGN@?iM5hC
z3F;(Q1IyQ+LaD554w!61!(xVqkm(=YK~)O8<7+xLXZ6<rA2<{bZCQ~7h^}t7!5Pm`
zG(UfrGlayL=~3YKsT%EROgCKrJy-tAZO_hKa`R2>1ET!aVZqZSsu`k7uV~($k@zVP
z^tr>y^y|U0mg!BYn<k;$GSTQLy+b8%Y+H@b=eZmrH_@rC$OsYvzad3Fw-<1H^R28%
zH_FtL)8;L3y+rP84Dte=l;lH$g}cG+&BMia4)?Ky`mE5UT`M~o<iW*({bL5?4$atq
z4uV_L$&u?y?u9jZm8`2!6b$T35_?ImHHA##PHWCBJJdkxXYsO?yl+!if<gHzPQbjK
z5-}It@auyB{nD)E>`>CRvnffG$g$VTpbUr56sO@Y*s7Xkr&@es6tQlHGW1vlDmQ5d
zlEEP;z1!RURGZ(*n){|^rG#G|Ks-7V_JCV#h?zu=*cEnQlqEWZTpbIz?Sl$N*8W%W
zxt(dppBoAneiW{93Tc&w;vWvO&OdFh2y-Hrs0<<jcT})}VTA;ZswGvkf?JN6z~R*~
zC9VLQghYjn&EmAX^RZ882kT`YI_><IUB>=%mj@qqAk!Pe;yObC=};q9=ykao?!U^I
aPY2(FKW>Yce;-mtjc}2_R2nFdTmA%q&$m(l

literal 0
HcmV?d00001

diff --git a/main.cpp b/main.cpp
index 940cd9d..42982af 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
     w.show();
 
 	//TESTING CODE
-	test(&recipeDB);
+	//test(&recipeDB);
 
 	//END TESTING CODE.
 
@@ -24,7 +24,6 @@ int main(int argc, char *argv[])
 
 	a.exec();
 	recipeDB.closeConnection();
-	printf("Total queries: %lu\n", recipeDB.getQueryCount());
 
 	return 0;
 }
@@ -48,18 +47,4 @@ void test(RecipeDatabase *recipeDB){
 	bool success = recipeDB->storeRecipe(rec);
 	printf("Storage successful: %d\n", success);
 
-//	vector<string> foodGroups = recipeDB->retrieveAllFoodGroups();
-//	printf("Food Groups:\n");
-//	for (string s : foodGroups){
-//		printf("\t%s\n", s.c_str());
-//	}
-
-	//Get food groups from recipe.
-//	Recipe r = recipeDB->retrieveRecipe("Pannenkoeken");
-//	vector<string> foodGroupsR = r.getFoodGroups();
-//	printf("Pannenkoeken Food Groups:\n");
-//	for (string s : foodGroupsR){
-//		printf("\t%s\n", s.c_str());
-//	}
-
 }
diff --git a/model/database/recipedatabase.cpp b/model/database/recipedatabase.cpp
index 0ebd528..42bf4ff 100644
--- a/model/database/recipedatabase.cpp
+++ b/model/database/recipedatabase.cpp
@@ -204,7 +204,7 @@ vector<Recipe> RecipeDatabase::retrieveRecipesWithTags(vector<RecipeTag> tags){
 }
 
 vector<Recipe> RecipeDatabase::retrieveRecipesWithSubstring(string s){
-	ResultTable t = this->executeSQL("SELECT * FROM recipe WHERE name LIKE '%"+s+"%' COLLATE NOCASE;");
+	ResultTable t = this->executeSQL("SELECT * FROM recipe WHERE name LIKE '%"+s+"%' COLLATE NOCASE ORDER BY name;");
 	return this->readRecipesFromTable(t);
 }
 
diff --git a/model/recipe/recipe.cpp b/model/recipe/recipe.cpp
index a899c1f..fb1e545 100644
--- a/model/recipe/recipe.cpp
+++ b/model/recipe/recipe.cpp
@@ -12,7 +12,7 @@ Recipe::Recipe(string name, vector<RecipeIngredient> ingredients, Instruction in
     setServings(servings);
 }
 
-Recipe::Recipe() : Recipe::Recipe("", vector<RecipeIngredient>(), Instruction(), QImage(), vector<RecipeTag>(), QDate::currentDate(), QTime(1, 0), QTime(0, 30), 10.0f){
+Recipe::Recipe() : Recipe::Recipe("", vector<RecipeIngredient>(), Instruction(), QImage(), vector<RecipeTag>(), QDate::currentDate(), QTime(), QTime(), 1.0f){
     //Set default values when none are specified.
 }
 

From c84370be1180f97d8bf45d5803171530d03d52e7 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Sat, 31 Mar 2018 15:02:35 +0200
Subject: [PATCH 3/3] Updated UI, added default ingredients.

---
 gui/mainwindow.cpp                |  31 +++---
 gui/mainwindow.h                  |   1 +
 gui/mainwindow.ui                 |   2 +-
 gui/newrecipedialog.cpp           |   2 +
 gui/newrecipedialog.ui            | 150 +++++++++++++++++++++++++++++-
 main.cpp                          |  24 +++--
 model/database/recipedatabase.cpp |  79 +++++++++++++---
 model/database/recipedatabase.h   |   4 +
 model/recipe/recipe.cpp           |  20 +++-
 model/recipe/recipe.h             |   5 +-
 10 files changed, 272 insertions(+), 46 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index bc09378..c552432 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -19,19 +19,24 @@ MainWindow::~MainWindow(){
 }
 
 void MainWindow::loadFromRecipe(Recipe recipe){
-    setRecipeName(recipe.getName());
-    setInstruction(recipe.getInstruction());
-    setIngredients(recipe.getIngredients());
-	if (recipe.getImage().isNull()){
-		setImage(QImage(QString(":/images/images/no_image.png")));
+	if (recipe.isEmpty()){
+		setRecipeName("No recipes found.");
+		setAuthorName("Click 'New' to get started.");
 	} else {
-		setImage(recipe.getImage());
+		setRecipeName(recipe.getName());
+		setInstruction(recipe.getInstruction());
+		setIngredients(recipe.getIngredients());
+		if (recipe.getImage().isNull()){
+			setImage(QImage(QString(":/images/images/no_image.png")));
+		} else {
+			setImage(recipe.getImage());
+		}
+		setPrepTime(recipe.getPrepTime());
+		setCookTime(recipe.getCookTime());
+		setServings(recipe.getServings());
+		setTags(recipe.getTags());
+		this->currentRecipe = recipe;
 	}
-	setPrepTime(recipe.getPrepTime());
-	setCookTime(recipe.getCookTime());
-	setServings(recipe.getServings());
-	setTags(recipe.getTags());
-	this->currentRecipe = recipe;
 }
 
 void MainWindow::setRecipeName(string name){
@@ -66,6 +71,10 @@ void MainWindow::setTags(vector<RecipeTag> tags){
 	this->tagsListModel.setTags(tags);
 }
 
+void MainWindow::setAuthorName(string name){
+	ui->authorLabel->setText(QString::fromStdString(name));
+}
+
 void MainWindow::on_newButton_clicked(){
 	NewRecipeDialog d(this->recipeDB, this);
 	d.show();
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 3ce5cf4..70ab7be 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -54,6 +54,7 @@ public:
 	void setCookTime(QTime cookTime);
 	void setServings(float servings);
 	void setTags(vector<RecipeTag> tags);
+	void setAuthorName(string name);
 };
 
 #endif // MAINWINDOW_H
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index 23922da..69bddb9 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -364,7 +364,7 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
           <item alignment="Qt::AlignLeft|Qt::AlignBottom">
            <widget class="QLabel" name="authorLabel">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
diff --git a/gui/newrecipedialog.cpp b/gui/newrecipedialog.cpp
index ac3258c..fc8657f 100644
--- a/gui/newrecipedialog.cpp
+++ b/gui/newrecipedialog.cpp
@@ -23,6 +23,7 @@ NewRecipeDialog::NewRecipeDialog(RecipeDatabase *db, QWidget *parent) : NewRecip
 
 NewRecipeDialog::NewRecipeDialog(RecipeDatabase *db, Recipe recipe, QWidget *parent) : NewRecipeDialog(db, parent){
 	ui->recipeNameEdit->setText(QString::fromStdString(recipe.getName()));
+	ui->authorNameEdit->setText(QString::fromStdString(recipe.getAuthor()));
 	ui->prepTimeEdit->setTime(recipe.getPrepTime());
 	ui->cookTimeEdit->setTime(recipe.getCookTime());
 	ui->servingsSpinBox->setValue((double)recipe.getServings());
@@ -38,6 +39,7 @@ NewRecipeDialog::~NewRecipeDialog(){
 
 Recipe NewRecipeDialog::getRecipe(){
 	Recipe r(ui->recipeNameEdit->text().toStdString(),
+			 ui->authorNameEdit->text().toStdString(),
 			 this->ingredientListModel.getIngredients(),
 			 ui->instructionsTextEdit->toHtml().toStdString(),
 			 ui->imageDisplayLabel->pixmap()->toImage(),//Image
diff --git a/gui/newrecipedialog.ui b/gui/newrecipedialog.ui
index a42a7a2..50bee64 100644
--- a/gui/newrecipedialog.ui
+++ b/gui/newrecipedialog.ui
@@ -96,15 +96,25 @@
             <item>
              <widget class="QWidget" name="recipeNamePanel" native="true">
               <layout class="QVBoxLayout" name="verticalLayout_9">
+               <property name="spacing">
+                <number>0</number>
+               </property>
                <item>
                 <widget class="QLineEdit" name="recipeNameEdit">
                  <property name="font">
                   <font>
+                   <pointsize>14</pointsize>
                    <weight>3</weight>
                    <italic>false</italic>
                    <bold>false</bold>
                   </font>
                  </property>
+                 <property name="styleSheet">
+                  <string notr="true">background-color: rgb(255, 255, 255);</string>
+                 </property>
+                 <property name="frame">
+                  <bool>false</bool>
+                 </property>
                  <property name="alignment">
                   <set>Qt::AlignCenter</set>
                  </property>
@@ -113,6 +123,30 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QLineEdit" name="authorNameEdit">
+                 <property name="font">
+                  <font>
+                   <pointsize>12</pointsize>
+                   <weight>3</weight>
+                   <italic>false</italic>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">background-color: rgb(245, 245, 255);</string>
+                 </property>
+                 <property name="frame">
+                  <bool>false</bool>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                 <property name="placeholderText">
+                  <string>Author</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </widget>
             </item>
@@ -141,7 +175,7 @@
                       <second>0</second>
                       <year>1999</year>
                       <month>12</month>
-                      <day>23</day>
+                      <day>22</day>
                      </datetime>
                     </property>
                     <property name="currentSection">
@@ -252,6 +286,9 @@
             <item alignment="Qt::AlignTop">
              <widget class="QWidget" name="newTagBoxPanel" native="true">
               <layout class="QHBoxLayout" name="horizontalLayout_7">
+               <property name="spacing">
+                <number>2</number>
+               </property>
                <property name="leftMargin">
                 <number>0</number>
                </property>
@@ -285,6 +322,9 @@
                  <property name="toolTip">
                   <string>Create a new tag</string>
                  </property>
+                 <property name="styleSheet">
+                  <string notr="true">background-color: rgb(255, 255, 255);</string>
+                 </property>
                  <property name="icon">
                   <iconset resource="../images.qrc">
                    <normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
@@ -296,6 +336,9 @@
                  <property name="toolTip">
                   <string>Permanently delete this tag</string>
                  </property>
+                 <property name="styleSheet">
+                  <string notr="true">background-color: rgb(255, 255, 255);</string>
+                 </property>
                  <property name="icon">
                   <iconset resource="../images.qrc">
                    <normaloff>:/images/images/minus_icon.png</normaloff>:/images/images/minus_icon.png</iconset>
@@ -308,6 +351,9 @@
             <item>
              <widget class="QWidget" name="tagsListControlPanel" native="true">
               <layout class="QHBoxLayout" name="horizontalLayout_8">
+               <property name="spacing">
+                <number>0</number>
+               </property>
                <property name="leftMargin">
                 <number>0</number>
                </property>
@@ -322,6 +368,27 @@
                </property>
                <item>
                 <widget class="QPushButton" name="addTagButton">
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Add the above tag to the recipe</string>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">QPushButton#addTagButton {
+	background-color: rgb(235, 235, 255);
+	border: 0px;
+}
+QPushButton#addTagButton:hover{
+	background-color: rgb(245, 245, 255);
+}
+QPushButton#addTagButton:pressed{
+	background-color: rgb(255, 255, 255);
+}</string>
+                 </property>
                  <property name="text">
                   <string>Add</string>
                  </property>
@@ -329,8 +396,29 @@
                </item>
                <item>
                 <widget class="QPushButton" name="deleteTagButton">
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Remove this tag from the recipe</string>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">QPushButton#deleteTagButton {
+	background-color: rgb(225, 225, 255);
+	border: 0px;
+}
+QPushButton#deleteTagButton:hover{
+	background-color: rgb(235, 235, 255);
+}
+QPushButton#deleteTagButton:pressed{
+	background-color: rgb(245, 245, 255);
+}</string>
+                 </property>
                  <property name="text">
-                  <string>Delete</string>
+                  <string>Remove</string>
                  </property>
                 </widget>
                </item>
@@ -434,7 +522,7 @@
                   <item>
                    <widget class="QLabel" name="addIngredientLabel">
                     <property name="text">
-                     <string>Add Ingredient</string>
+                     <string>Ingredients</string>
                     </property>
                     <property name="alignment">
                      <set>Qt::AlignCenter</set>
@@ -497,6 +585,9 @@
                      </item>
                      <item>
                       <widget class="QPushButton" name="deleteIngredientButton">
+                       <property name="toolTip">
+                        <string>Delete this ingredient</string>
+                       </property>
                        <property name="text">
                         <string/>
                        </property>
@@ -581,6 +672,9 @@
                      </item>
                      <item alignment="Qt::AlignRight">
                       <widget class="QPushButton" name="newUnitButton">
+                       <property name="toolTip">
+                        <string>Create a new unit of measure</string>
+                       </property>
                        <property name="icon">
                         <iconset resource="../images.qrc">
                          <normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
@@ -589,6 +683,9 @@
                      </item>
                      <item>
                       <widget class="QPushButton" name="deleteUnitButton">
+                       <property name="toolTip">
+                        <string>Delete this unit of measure</string>
+                       </property>
                        <property name="text">
                         <string/>
                        </property>
@@ -626,6 +723,9 @@
                   <item>
                    <widget class="QWidget" name="ingredientsListControlPanel" native="true">
                     <layout class="QHBoxLayout" name="horizontalLayout_9">
+                     <property name="spacing">
+                      <number>0</number>
+                     </property>
                      <property name="leftMargin">
                       <number>0</number>
                      </property>
@@ -640,6 +740,27 @@
                      </property>
                      <item>
                       <widget class="QPushButton" name="addIngredientButton">
+                       <property name="minimumSize">
+                        <size>
+                         <width>0</width>
+                         <height>30</height>
+                        </size>
+                       </property>
+                       <property name="toolTip">
+                        <string>Add the above ingredient to the recipe</string>
+                       </property>
+                       <property name="styleSheet">
+                        <string notr="true">QPushButton#addIngredientButton {
+	background-color: rgb(235, 235, 255);
+	border: 0px;
+}
+QPushButton#addIngredientButton:hover{
+	background-color: rgb(245, 245, 255);
+}
+QPushButton#addIngredientButton:pressed{
+	background-color: rgb(255, 255, 255);
+}</string>
+                       </property>
                        <property name="text">
                         <string>Add</string>
                        </property>
@@ -647,8 +768,29 @@
                      </item>
                      <item>
                       <widget class="QPushButton" name="removeIngredientButton">
+                       <property name="minimumSize">
+                        <size>
+                         <width>0</width>
+                         <height>30</height>
+                        </size>
+                       </property>
+                       <property name="toolTip">
+                        <string>Remove this ingredient from the recipe</string>
+                       </property>
+                       <property name="styleSheet">
+                        <string notr="true">QPushButton#removeIngredientButton {
+	background-color: rgb(225, 225, 255);
+	border: 0px;
+}
+QPushButton#removeIngredientButton:hover{
+	background-color: rgb(235, 235, 255);
+}
+QPushButton#removeIngredientButton:pressed{
+	background-color: rgb(245, 245, 255);
+}</string>
+                       </property>
                        <property name="text">
-                        <string>Delete</string>
+                        <string>Remove</string>
                        </property>
                       </widget>
                      </item>
diff --git a/main.cpp b/main.cpp
index 42982af..cdd2938 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,19 +8,24 @@
 
 void test(RecipeDatabase *recipeDB);
 
+Recipe checkForFirstRun(RecipeDatabase *recipeDB){
+	Recipe r = recipeDB->retrieveRandomRecipe();
+	if (r.isEmpty()){//There are no recipes in the database.
+		//Add some basic units to the units, and some basic ingredients.
+		recipeDB->addBasicUnits();
+		recipeDB->addBasicIngredients();
+	}
+	return r;
+}
+
 int main(int argc, char *argv[])
 {
 	RecipeDatabase recipeDB(QString(FileUtils::appDataPath+"recipes.db").toStdString());
-    QApplication a(argc, argv);
+
+	QApplication a(argc, argv);
 	MainWindow w(&recipeDB);
-    w.show();
-
-	//TESTING CODE
-	//test(&recipeDB);
-
-	//END TESTING CODE.
-
-	w.loadFromRecipe(recipeDB.retrieveRandomRecipe());
+	w.loadFromRecipe(checkForFirstRun(&recipeDB));
+	w.show();
 
 	a.exec();
 	recipeDB.closeConnection();
@@ -34,6 +39,7 @@ void test(RecipeDatabase *recipeDB){
 	ri.push_back(RecipeIngredient("baking powder", "additives", 1.0f, UnitOfMeasure("teaspoon", "teaspoons", "tsp", UnitOfMeasure::VOLUME, 1.0), ""));
 
 	Recipe rec("Example",
+			   "Andrew Lalis",
 			   ri,
 			   Instruction("Placeholder Text"),
 			   QImage(),
diff --git a/model/database/recipedatabase.cpp b/model/database/recipedatabase.cpp
index 42bf4ff..bae0eae 100644
--- a/model/database/recipedatabase.cpp
+++ b/model/database/recipedatabase.cpp
@@ -12,7 +12,7 @@ bool RecipeDatabase::storeRecipe(Recipe recipe){
 		return false;
 	}
 	//Store a recipe, if it doesn't already exist. This first tries to create the recipe entry, then all subsequent supporting table entries.
-	this->executeSQL("BEGIN;");
+	this->beginTransaction();
 	ResultTable t = this->selectFrom("recipe", "*", "WHERE name="+surroundString(recipe.getName(), "'"));
 	if (!t.isEmpty()){
 		fprintf(stderr, "Error storing recipe: Recipe with name %s already exists.\n", recipe.getName().c_str());
@@ -20,6 +20,7 @@ bool RecipeDatabase::storeRecipe(Recipe recipe){
 		bool success = this->insertInto("recipe",
 						 vector<string>({
 											"name",
+											"authorName",
 											"createdDate",
 											"cookTime",
 											"prepTime",
@@ -27,6 +28,7 @@ bool RecipeDatabase::storeRecipe(Recipe recipe){
 										}),
 						 vector<string>({
 											recipe.getName(),
+											recipe.getAuthor(),
 											recipe.getCreatedDate().toString().toStdString(),
 											recipe.getCookTime().toString().toStdString(),
 											recipe.getPrepTime().toString().toStdString(),
@@ -46,12 +48,12 @@ bool RecipeDatabase::storeRecipe(Recipe recipe){
 					this->storeInstruction(recipe.getInstruction(), recipeId) &&
 					this->storeImage(recipe.getImage(), recipeId) &&
 					this->storeTags(recipe.getTags(), recipeId)){
-				this->executeSQL("COMMIT;");
+				this->commitTransaction();
 				return true;
 			}
 		}
 	}
-	this->executeSQL("ROLLBACK;");
+	this->rollbackTransaction();
 	return false;
 }
 
@@ -158,7 +160,7 @@ Recipe RecipeDatabase::retrieveRandomRecipe(){
 	}
 	return this->readFromResultTable(t);
 }
-//TODO: Change this to be more efficient! One query per recipe is not good!
+
 vector<Recipe> RecipeDatabase::retrieveAllRecipes(){
 	ResultTable t = this->executeSQL("SELECT * FROM recipe ORDER BY name;");
 	return this->readRecipesFromTable(t);
@@ -326,7 +328,7 @@ bool RecipeDatabase::deleteRecipe(int recipeId){
 		printf("Cannot delete. No recipe with ID %d exists.\n", recipeId);
 		return false;
 	}
-	this->executeSQL("BEGIN;");
+	this->beginTransaction();
 	bool tagsDeleted = this->deleteFrom("recipeTag", "WHERE recipeId="+idString);
 	bool recipeIngredientDeleted = this->deleteFrom("recipeIngredient", "WHERE recipeId="+idString);
 	bool recipeDeleted = this->deleteFrom("recipe", "WHERE recipeId="+idString);
@@ -335,10 +337,10 @@ bool RecipeDatabase::deleteRecipe(int recipeId){
 	Q_UNUSED(instructionDeleted);
 	Q_UNUSED(imageDeleted);
 	if (tagsDeleted && recipeIngredientDeleted && recipeDeleted){
-		this->executeSQL("COMMIT;");
+		this->commitTransaction();
 		return true;
 	} else {
-		this->executeSQL("ROLLBACK;");
+		this->rollbackTransaction();
 		return false;
 	}
 }
@@ -374,6 +376,7 @@ bool RecipeDatabase::updateRecipe(Recipe recipe, string originalName) {
 	this->beginTransaction();
 	ResultTable t = this->executeSQL("UPDATE recipe "
 									 "SET name = '"+recipe.getName()+"', "
+									 "authorName = '"+recipe.getAuthor()+"', "
 									 "createdDate = '"+recipe.getCreatedDate().toString().toStdString()+"', "
 									 "prepTime = '"+recipe.getPrepTime().toString().toStdString()+"', "
 									 "cookTime = '"+recipe.getCookTime().toString().toStdString()+"', "
@@ -435,11 +438,55 @@ bool RecipeDatabase::updateRecipe(Recipe recipe, string originalName) {
 	}
 }
 
+bool RecipeDatabase::addBasicUnits(){
+	this->beginTransaction();
+	//Volume
+	this->storeUnitOfMeasure(UnitOfMeasure("Teaspoon", "Teaspoons", "tsp", UnitOfMeasure::VOLUME, 5.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Tablespoon", "Tablespoons", "tbsp", UnitOfMeasure::VOLUME, 15.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Fluid Ounce", "Fluid Ounces", "fl oz", UnitOfMeasure::VOLUME, 30.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Cup", "Cups", "c", UnitOfMeasure::VOLUME, 250.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Milliliter", "Milliliters", "mL", UnitOfMeasure::VOLUME, 1.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Liter", "Liters", "L", UnitOfMeasure::VOLUME, 1000.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Gallon", "Gallons", "gal", UnitOfMeasure::VOLUME, 3800.0));
+	//Mass/Weight
+	this->storeUnitOfMeasure(UnitOfMeasure("Ounce", "Ounces", "oz", UnitOfMeasure::MASS, 28.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Pound", "Pounds", "lb", UnitOfMeasure::MASS, 454.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Gram", "Grams", "g", UnitOfMeasure::MASS, 1.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Milligram", "Milligrams", "mg", UnitOfMeasure::MASS, 0.001));
+	this->storeUnitOfMeasure(UnitOfMeasure("Kilogram", "Kilograms", "kg", UnitOfMeasure::MASS, 1000.0));
+	//Length
+	this->storeUnitOfMeasure(UnitOfMeasure("Inch", "Inches", "in", UnitOfMeasure::LENGTH, 2.54));
+	this->storeUnitOfMeasure(UnitOfMeasure("Centimeter", "Centimeters", "cm", UnitOfMeasure::LENGTH, 1.0));
+	//MISC
+	this->storeUnitOfMeasure(UnitOfMeasure("Piece", "Pieces", "pc", UnitOfMeasure::MISC, 1.0));
+	this->storeUnitOfMeasure(UnitOfMeasure("Item", "Items", "", UnitOfMeasure::MISC, 1.0));
+	this->commitTransaction();
+	return true;
+}
+
+bool RecipeDatabase::addBasicIngredients(){
+	this->beginTransaction();
+	this->storeIngredient(Ingredient("Flour", "grains"));
+	this->storeIngredient(Ingredient("Eggs", "eggs"));
+	this->storeIngredient(Ingredient("Milk", "dairy"));
+	this->storeIngredient(Ingredient("Cheese", "dairy"));
+	this->storeIngredient(Ingredient("Salt", "spices"));
+	this->storeIngredient(Ingredient("Sugar", "sugars"));
+	this->storeIngredient(Ingredient("Vegetable Oil", "oils"));
+	this->storeIngredient(Ingredient("Olive Oil", "oils"));
+	this->storeIngredient(Ingredient("Water", "water"));
+	this->storeIngredient(Ingredient("Bell Pepper", "vegetables"));
+	this->storeIngredient(Ingredient("Onion", "vegetables"));
+	this->storeIngredient(Ingredient("Garlic", "spices"));
+	this->commitTransaction();
+	return true;
+}
+
 void RecipeDatabase::ensureTablesExist(){
 	//Make sure that foreign keys are enabled.
 	this->executeSQL("PRAGMA foreign_keys = ON;");
 
-	this->executeSQL("BEGIN;");
+	this->beginTransaction();
 	//Ingredients table.
 	this->executeSQL("CREATE TABLE IF NOT EXISTS ingredient("
 					 "ingredientId INTEGER PRIMARY KEY,"
@@ -456,6 +503,7 @@ void RecipeDatabase::ensureTablesExist(){
 	this->executeSQL("CREATE TABLE IF NOT EXISTS recipe("
 					 "recipeId INTEGER PRIMARY KEY,"
 					 "name varchar UNIQUE,"
+					 "authorName varchar,"
 					 "createdDate date,"
 					 "prepTime time,"
 					 "cookTime time,"
@@ -475,18 +523,19 @@ void RecipeDatabase::ensureTablesExist(){
 					 "FOREIGN KEY (ingredientId) REFERENCES ingredient(ingredientId),"
 					 "FOREIGN KEY (recipeId) REFERENCES recipe(recipeId),"
 					 "FOREIGN KEY (unitName) REFERENCES unitOfMeasure(name));");
-	this->executeSQL("COMMIT;");
+	this->commitTransaction();
 }
 
 Recipe RecipeDatabase::readFromResultTable(ResultTable t, int tRow){
 	Recipe r;
 	TableRow row = t.rows().at(tRow);
-	int id = std::stoi(row.at(0));
-	r.setName(row.at(1));
-	r.setCreatedDate(QDate::fromString(QString::fromStdString(row.at(2))));
-	r.setPrepTime(QTime::fromString(QString::fromStdString(row.at(3))));
-	r.setCookTime(QTime::fromString(QString::fromStdString(row.at(4))));
-	r.setServings(std::stof(row.at(5)));
+	int id = std::stoi(row.at(0));											//id
+	r.setName(row.at(1));													//Name
+	r.setAuthor(row.at(2));													//author
+	r.setCreatedDate(QDate::fromString(QString::fromStdString(row.at(3))));	//createdDate
+	r.setPrepTime(QTime::fromString(QString::fromStdString(row.at(4))));	//prepTime
+	r.setCookTime(QTime::fromString(QString::fromStdString(row.at(5))));	//cookTime
+	r.setServings(std::stof(row.at(6)));									//servings
 	r.setInstruction(FileUtils::loadInstruction(id));
 	r.setImage(FileUtils::loadImage(id));
 	r.setIngredients(this->retrieveRecipeIngredients(id));
diff --git a/model/database/recipedatabase.h b/model/database/recipedatabase.h
index 2b80d95..2452e42 100644
--- a/model/database/recipedatabase.h
+++ b/model/database/recipedatabase.h
@@ -49,6 +49,10 @@ class RecipeDatabase : public Database
 
 		//Updating.
 		bool updateRecipe(Recipe recipe, string originalName);
+
+		//Adding basic information at start.
+		bool addBasicUnits();
+		bool addBasicIngredients();
 	private:
 
 		//Utility methods.
diff --git a/model/recipe/recipe.cpp b/model/recipe/recipe.cpp
index fb1e545..8d123e7 100644
--- a/model/recipe/recipe.cpp
+++ b/model/recipe/recipe.cpp
@@ -1,7 +1,8 @@
 #include "model/recipe/recipe.h"
 
-Recipe::Recipe(string name, vector<RecipeIngredient> ingredients, Instruction instruction, QImage image, vector<RecipeTag> tags, QDate createdDate, QTime prepTime, QTime cookTime, float servings){
+Recipe::Recipe(string name, string author, vector<RecipeIngredient> ingredients, Instruction instruction, QImage image, vector<RecipeTag> tags, QDate createdDate, QTime prepTime, QTime cookTime, float servings){
     setName(name);
+	setAuthor(author);
     setIngredients(ingredients);
     setInstruction(instruction);
     setImage(image);
@@ -12,12 +13,16 @@ Recipe::Recipe(string name, vector<RecipeIngredient> ingredients, Instruction in
     setServings(servings);
 }
 
-Recipe::Recipe() : Recipe::Recipe("", vector<RecipeIngredient>(), Instruction(), QImage(), vector<RecipeTag>(), QDate::currentDate(), QTime(), QTime(), 1.0f){
+Recipe::Recipe() : Recipe::Recipe("", "", vector<RecipeIngredient>(), Instruction(), QImage(), vector<RecipeTag>(), QDate::currentDate(), QTime(), QTime(), 1.0f){
     //Set default values when none are specified.
 }
 
 string Recipe::getName() const{
-    return this->name;
+	return this->name;
+}
+
+string Recipe::getAuthor() const{
+	return this->authorName;
 }
 
 vector<RecipeIngredient> Recipe::getIngredients() const{
@@ -71,7 +76,11 @@ bool Recipe::isEmpty() const{
 }
 
 void Recipe::setName(string newName){
-    this->name = newName;
+	this->name = newName;
+}
+
+void Recipe::setAuthor(string newName){
+	this->authorName = newName;
 }
 
 void Recipe::setIngredients(vector<RecipeIngredient> ingredients){
@@ -111,8 +120,9 @@ void Recipe::setServings(float newServingsCount){
 }
 
 void Recipe::print(){
-	printf("Recipe: %s, Created on: %s, Prep time: %s, Cook time: %s, Serves: %f\n",
+	printf("Recipe: %s, Created on: %s, by %s, Prep time: %s, Cook time: %s, Serves: %f\n",
 		   this->name.c_str(),
+		   this->authorName.c_str(),
 		   this->createdDate.toString().toStdString().c_str(),
 		   this->prepTime.toString().toStdString().c_str(),
 		   this->cookTime.toString().toStdString().c_str(),
diff --git a/model/recipe/recipe.h b/model/recipe/recipe.h
index 3bdb92d..4d8dca3 100644
--- a/model/recipe/recipe.h
+++ b/model/recipe/recipe.h
@@ -32,12 +32,13 @@ class Recipe
 {
 public:
     //Full constructor
-    Recipe(string name, vector<RecipeIngredient> ingredients, Instruction instruction, QImage image, vector<RecipeTag> tags, QDate createdDate, QTime prepTime, QTime cookTime, float servings);
+	Recipe(string name, string author, vector<RecipeIngredient> ingredients, Instruction instruction, QImage image, vector<RecipeTag> tags, QDate createdDate, QTime prepTime, QTime cookTime, float servings);
     //Constructor with default values.
     Recipe();
 
     //Getters
     string getName() const;
+	string getAuthor() const;
     vector<RecipeIngredient> getIngredients() const;
 	vector<string> getFoodGroups() const;
     Instruction getInstruction() const;
@@ -52,6 +53,7 @@ public:
 
     //Setters
     void setName(string newName);
+	void setAuthor(string newName);
     void setIngredients(vector<RecipeIngredient> ingredients);
     void setTags(vector<RecipeTag> tags);
     void addIngredient(RecipeIngredient newIngredient);
@@ -66,6 +68,7 @@ public:
 private:
     //Main information.
     string name;                                //The name of the recipe.
+	string authorName;							//The name of the author of this recipe.
     vector<RecipeIngredient> ingredients;       //The list of ingredients in the recipe.
     Instruction instruction;                    //The instruction HTML document.
     QImage image;                               //An image displayed alongside the recipe.