From dc2a3dad55826968b1b50d844d07bfeb8a6b7906 Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 6 Oct 2015 23:31:52 -0500
Subject: [PATCH] Update and rename user.h to User.h

---
 user.h => User.h | 54 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 13 deletions(-)
 rename user.h => User.h (69%)

diff --git a/user.h b/User.h
similarity index 69%
rename from user.h
rename to User.h
index 1651e3b..5023b7d 100755
--- a/user.h
+++ b/User.h
@@ -53,11 +53,28 @@ public:
 	vector<string> getInfo();
  };
  
+class Article {
+	string author;
+	string text;
+	string timestamp;
+	string length;
+	
+public:
+	Article();
+	Article(string a, string text, string time);
+	string getAuthor();
+	string getText();
+	string getTimestamp();
+	string getLength();
+	vector<string> getInfo();
+};
+ 
 class Board {
 	string name;
 	string description;
 	bool lockedForGroup;
 	string group;
+	vector<Article> articles;
 	
 public:
 	Board();
@@ -68,6 +85,8 @@ public:
 	bool checkIfLocked();
 	string getGroup();
 	vector<string> getInfo();
+	vector<Article> getArticles();
+	void addArticle(Article article);
 };
 
 class Group {
@@ -85,17 +104,26 @@ public:
 	vector<string> getInfo();
 };
 
-class Article {
-	string author;
-	string timestamp;
-	int length;
-	
-public:
-	Article();
-	Article(string a, string t, int l);
-	string getAuthor();
-	string getTimestamp();
-	string getLength();
-	vector<string> getInfo();
-};
 
+
+
+/*
+void mainMenu()
+{
+	cout<<"\n\n***************"<<endl;
+	cout<<"** Main Menu **"<<endl;
+	cout<<"***************\n"<<endl;
+	cout<<"\n5. Account Settings"<<endl;
+	cout<<"4. Articles"<<endl;	
+	cout<<"3. Boards"<<endl;	
+	cout<<"2. View Messages"<<endl;
+	cout<<"1. Groups\n"<<endl;
+	if (currentUser.confirmAdmin() == true)
+	{
+		cout<<"9. View pending account requests\n"<<endl;
+		cout<<"10. View current users\n"<<endl;
+	}
+	cout<<"8. Logout\n"<<endl;
+	cout<<"Enter choice: ";
+}
+*/