diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (25).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (25).png
new file mode 100644
index 0000000..3bcda89
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (25).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (26).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (26).png
new file mode 100644
index 0000000..cf0c6fb
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (26).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (27).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (27).png
new file mode 100644
index 0000000..4d98c63
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (27).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (28).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (28).png
new file mode 100644
index 0000000..45dd9e6
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (28).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (29).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (29).png
new file mode 100644
index 0000000..dfa9577
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (29).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (30).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (30).png
new file mode 100644
index 0000000..0e1ac8a
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (30).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (31).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (31).png
new file mode 100644
index 0000000..c4eeb44
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (31).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (32).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (32).png
new file mode 100644
index 0000000..5d7d704
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (32).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (33).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (33).png
new file mode 100644
index 0000000..ca98de0
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (33).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (34).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (34).png
new file mode 100644
index 0000000..5304df2
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (34).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (35).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (35).png
new file mode 100644
index 0000000..8f0525a
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (35).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (36).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (36).png
new file mode 100644
index 0000000..8ba3fd2
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (36).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (37).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (37).png
new file mode 100644
index 0000000..4045ae7
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (37).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (38).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (38).png
new file mode 100644
index 0000000..5256a44
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (38).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (39).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (39).png
new file mode 100644
index 0000000..759727c
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (39).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (40).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (40).png
new file mode 100644
index 0000000..e76b125
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (40).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (41).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (41).png
new file mode 100644
index 0000000..be69f7a
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (41).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (42).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (42).png
new file mode 100644
index 0000000..c6a167f
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (42).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (43).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (43).png
new file mode 100644
index 0000000..0a0daf8
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (43).png differ
diff --git a/Samarth_1710991710_6G-02/Screenshots/Screenshot (44).png b/Samarth_1710991710_6G-02/Screenshots/Screenshot (44).png
new file mode 100644
index 0000000..a30b1e6
Binary files /dev/null and b/Samarth_1710991710_6G-02/Screenshots/Screenshot (44).png differ
diff --git a/Samarth_1710991710_6G-02/dispatcher-servlet.xml b/Samarth_1710991710_6G-02/dispatcher-servlet.xml
new file mode 100644
index 0000000..78e1720
--- /dev/null
+++ b/Samarth_1710991710_6G-02/dispatcher-servlet.xml
@@ -0,0 +1,34 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:c="http://www.springframework.org/schema/c"
+	xmlns:cache="http://www.springframework.org/schema/cache" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	xmlns:jee="http://www.springframework.org/schema/jee" xmlns:lang="http://www.springframework.org/schema/lang"
+	xmlns:p="http://www.springframework.org/schema/p" xmlns:security="http://www.springframework.org/schema/security"
+	xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
+		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.3.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd
+		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd
+		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.3.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-4.3.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
+
+	 
+	<context:component-scan base-package="com.newshunt"></context:component-scan>
+			<mvc:annotation-driven />
+			<bean id="tt" class=" org.springframework.web.servlet.view.InternalResourceViewResolver">
+			<property name="prefix" value="/WEB-INF/views/"/>
+			<property name="suffix" value=".jsp"/>
+			</bean>
+			
+<mvc:resources mapping="/resources/**" location="/resources/"
+    cache-period="31556926"/>
+ 
+    <mvc:annotation-driven />
+</beans>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/hibernate.cfg.xml b/Samarth_1710991710_6G-02/hibernate.cfg.xml
new file mode 100644
index 0000000..0c73400
--- /dev/null
+++ b/Samarth_1710991710_6G-02/hibernate.cfg.xml
@@ -0,0 +1,38 @@
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+	
+	
+	<hibernate-configuration>
+   <session-factory>
+   
+      <property name = "hibernate.dialect">
+           org.hibernate.dialect.MySQLDialect
+      </property>
+      
+      <property name = "hibernate.connection.driver_class">
+        	com.mysql.jdbc.Driver
+      </property>
+      
+      <!-- Assume test is the database name -->
+      
+      <property name = "hibernate.connection.url">
+         jdbc:mysql://localhost:3306/news_hunt
+      </property>
+      
+      <property name = "hibernate.connection.username">
+         root
+      </property>
+      
+      <property name = "hibernate.connection.password">
+         rootroot
+      </property>
+      <property name="hibrenate.hbm2ddl.auto">update</property>
+      <!-- List of XML mapping files -->
+      <mapping class = "com.newshunt.daomodel.signup"/>
+      <mapping class = "com.newshunt.daomodel.MenuDao"/>
+      <mapping class = "com.newshunt.daomodel.ChannelListDao"/>
+      <mapping class = "com.newshunt.daomodel.FeedbackDao"/>
+      <mapping class = "com.newshunt.daomodel.AdminMenuDao"/>
+   </session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/accountmanagement/controller/AccountInfo.java b/Samarth_1710991710_6G-02/newshunt/accountmanagement/controller/AccountInfo.java
new file mode 100644
index 0000000..07a7a7f
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/accountmanagement/controller/AccountInfo.java
@@ -0,0 +1,70 @@
+package com.newshunt.accountmanagement.controller;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.signup;
+@Controller
+
+public class AccountInfo 
+{
+	@RequestMapping("/accountInfo")
+	public String accountInfo()
+	{
+		return "accountPage";
+	}
+	
+	@RequestMapping(value="/updateAccountInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public byte updateAccountInfo(@RequestBody signup rec, HttpSession hs)
+	{		
+		byte flag = 0;
+		try
+		{
+			String un = hs.getAttribute("un").toString();
+			Configuration cfg= new Configuration();
+		    cfg.configure("hibernate.cfg.xml");
+		    SessionFactory sf = cfg.buildSessionFactory();
+		    Session ss = sf.openSession();
+		    Criteria cr = ss.createCriteria(signup.class);
+		    cr.add(Restrictions.eq("email", un));
+		    signup r = (signup)cr.uniqueResult();
+		    r.setName(rec.getName());
+		    r.setPassword(rec.getPassword());
+		    r.setPhone(rec.getPhone());
+		    ss.beginTransaction().commit();
+		    flag = 1; 
+		}
+		catch(Exception e) 
+		{			  
+			e.printStackTrace();		  
+		}
+		return flag;
+	}
+	
+	@RequestMapping(value="/fetchAccountInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public signup fetchinfo(HttpSession hs)
+	{
+		String un = hs.getAttribute("un").toString();
+		Configuration cfg= new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(signup.class);
+		cr.add(Restrictions.eq("email", un));
+		signup r = (signup)cr.uniqueResult();
+		return r;		  		  
+	}
+	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminChannelManagement.java b/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminChannelManagement.java
new file mode 100644
index 0000000..2ee72f4
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminChannelManagement.java
@@ -0,0 +1,136 @@
+package com.newshunt.admin.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.ChannelListDao;
+import com.newshunt.daomodel.MenuDao;
+import com.newshunt.daomodel.signup;
+
+@Controller
+public class AdminChannelManagement 
+{
+	@RequestMapping("/AddUserChannel")
+	public String AddUserChannel()
+	{
+		return "admin/addUserChannel";
+	}
+	
+	@RequestMapping(value="/ChannelAddOn", method = RequestMethod.POST)
+	@ResponseBody
+	public byte ChannelAddOn(@RequestBody ChannelListDao r)
+	{
+		byte a=0;
+    	try
+    	{
+    		ChannelListDao p = new ChannelListDao();
+    		p.setId(r.getId());
+    		p.setTitle(r.getTitle());
+    		p.setDescription(r.getDescription());
+    		p.setImage(r.getImage());
+    		p.setUrl(r.getUrl());
+		   Configuration cfg= new Configuration();
+	       cfg.configure("hibernate.cfg.xml");
+	       SessionFactory sf = cfg.buildSessionFactory();
+	       Session ss = sf.openSession();
+	       ss.save(p);
+	       ss.beginTransaction().commit();
+    	   a=1; 
+    	}
+    	catch(Exception e)
+    	{
+    		e.printStackTrace();
+    	}
+	   return a;
+   }
+	
+	@RequestMapping("/ChannelList")
+	public String ChannelList()
+	{
+		return "admin/channelList";
+	}
+	
+	@RequestMapping(value = "/ShowChannelList" , method = RequestMethod.POST)
+    @ResponseBody
+	public List<ChannelListDao>ShowChannelList()
+	{
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(ChannelListDao.class);
+		List<ChannelListDao>p=cr.list();
+		if(p.isEmpty()!=true)
+			return p;  
+		
+		return null;  
+   }
+	
+	@RequestMapping(value="/updateChannelInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public byte updateChannelInfo(@RequestBody ChannelListDao rec, HttpSession hs)
+	{		
+		byte flag = 0;
+		try
+		{
+			Configuration cfg= new Configuration();
+		    cfg.configure("hibernate.cfg.xml");
+		    SessionFactory sf = cfg.buildSessionFactory();
+		    Session ss = sf.openSession();
+		    ss.update(rec);
+		    ss.beginTransaction().commit();
+		    flag = 1; 
+		}
+		catch(Exception e) 
+		{			  
+			e.printStackTrace();		  
+		}
+		return flag;
+	}
+	
+	@RequestMapping(value="/deleteChannelInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public int del1(@RequestBody ChannelListDao rec)
+	{
+		int flag=0;
+	Configuration cfg= new Configuration();
+	cfg.configure("hibernate.cfg.xml");
+	SessionFactory sf = cfg.buildSessionFactory();
+	Session ss = sf.openSession();	    
+	Criteria criteria = ss.createCriteria(signup.class);
+	List<signup>info =criteria.list();
+	for(signup w : info) {
+		String updateChannel="";
+		if(w.getMychannel().contains(rec.getId()+""));
+		{
+	       String m[] = w.getMychannel().split(",");		
+	       for(String v: m) {
+	    	   if(v.equals(rec.getId()+"")){
+	    		    continue;
+	    	   }
+	    	   else {
+	    		   updateChannel = updateChannel + v +",";    
+	    	   }
+	       }
+	       w.setMychannel(updateChannel);
+	       ss.update(w);     
+	       flag=1;
+		}
+	}
+	ss.delete(rec);
+	ss.beginTransaction().commit();
+	return flag;
+	}
+	
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminHome.java b/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminHome.java
new file mode 100644
index 0000000..a4c46e0
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminHome.java
@@ -0,0 +1,105 @@
+package com.newshunt.admin.controller;
+
+import java.util.HashSet;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.AdminMenuDao;
+import com.newshunt.daomodel.ChannelListDao;
+import com.newshunt.daomodel.signup;
+
+@Controller
+public class AdminHome 
+{
+	@RequestMapping("/AdminHome")
+	public String adminhome()
+	{
+		return "admin/adminHome";
+	}
+	
+	@RequestMapping(value = "/AdminMenuList" , method = RequestMethod.POST)
+    @ResponseBody
+	public List<AdminMenuDao>adminMenuList()
+	{
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(AdminMenuDao.class);
+		List<AdminMenuDao>p=cr.list();
+		if(p.isEmpty()!=true)
+			return p;  
+		
+		return null;  
+   }
+	
+	@RequestMapping(value = "/userListCount" , method = RequestMethod.POST)
+    @ResponseBody
+	public int userListCount()
+	{
+		int count=0;
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(signup.class);
+		List<signup>p=cr.list();
+		for(signup x:p)
+        {
+        	count++;
+        }  
+		return count;  
+   }
+	
+	@RequestMapping(value = "/ChannelListCount" , method = RequestMethod.POST)
+    @ResponseBody
+	public int ChannelListCount()
+	{
+		int count=0;
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(ChannelListDao.class);
+		List<ChannelListDao>p=cr.list();
+		for(ChannelListDao x:p)
+        {
+        	count++;
+        }  
+		
+		return count;  
+   }
+	
+	@RequestMapping(value="/SuscribedListCount", method=RequestMethod.POST)
+	@ResponseBody
+	public int SuscribedListCount()
+	{
+		int flag=0;
+		HashSet<String> hs=new HashSet();
+		Configuration cfg= new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();	    
+		Criteria criteria = ss.createCriteria(signup.class);
+		List<signup>info =criteria.list();
+		for(signup w : info) 
+		{
+			String m[] = w.getMychannel().split(",");		
+			for(String v: m) 
+			{
+				hs.add(v);
+		    }
+		}
+		flag=hs.size();
+		return flag;
+	}
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminMenuManagement.java b/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminMenuManagement.java
new file mode 100644
index 0000000..687742d
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/admin/controller/AdminMenuManagement.java
@@ -0,0 +1,121 @@
+package com.newshunt.admin.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.MenuDao;
+
+@Controller
+public class AdminMenuManagement 
+{
+	
+	
+	@RequestMapping("/AddMenu")
+	public String AddMenu()
+	{
+		return "admin/addMenu";
+	}
+	
+	@RequestMapping(value="/AddUserMenu", method = RequestMethod.POST)
+	@ResponseBody
+	public byte AddMenu(@RequestBody MenuDao r)
+	{
+		byte a=0;
+    	try
+    	{
+    		MenuDao p = new MenuDao();
+    		p.setId(r.getId());
+    		p.setName(r.getName());
+    		p.setUrl(r.getUrl());
+		   Configuration cfg= new Configuration();
+	       cfg.configure("hibernate.cfg.xml");
+	       SessionFactory sf = cfg.buildSessionFactory();
+	       Session ss = sf.openSession();
+	       ss.save(p);
+	       ss.beginTransaction().commit();
+    	   a=1; 
+    	}
+    	catch(Exception e)
+    	{
+    		e.printStackTrace();
+    	}
+	   return a;
+   }
+	
+	@RequestMapping("/MenuList")
+	public String MenuList()
+	{
+		return "admin/menuList";
+	}
+	
+	@RequestMapping(value = "/ShowMenuList" , method = RequestMethod.POST)
+    @ResponseBody
+	public List<MenuDao>ShowMenuList()
+	{
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(MenuDao.class);
+		List<MenuDao>p=cr.list();
+		if(p.isEmpty()!=true)
+			return p;  
+		
+		return null;  
+   }
+	
+	@RequestMapping(value="/updateMenuInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public byte updateMenuInfo(@RequestBody MenuDao rec, HttpSession hs)
+	{		
+		byte flag = 0;
+		try
+		{
+			Configuration cfg= new Configuration();
+		    cfg.configure("hibernate.cfg.xml");
+		    SessionFactory sf = cfg.buildSessionFactory();
+		    Session ss = sf.openSession();
+		    ss.update(rec);
+		    ss.beginTransaction().commit();
+		    flag = 1; 
+		}
+		catch(Exception e) 
+		{			  
+			e.printStackTrace();		  
+		}
+		return flag;
+	}
+	
+	@RequestMapping(value="/deleteMenuInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public byte deleteMenuInfo(@RequestBody MenuDao rec, HttpSession hs)
+	{		
+		byte flag = 0;
+		try
+		{
+			Configuration cfg= new Configuration();
+		    cfg.configure("hibernate.cfg.xml");
+		    SessionFactory sf = cfg.buildSessionFactory();
+		    Session ss = sf.openSession();
+		    ss.delete(rec);
+		    ss.beginTransaction().commit();
+		    flag = 1; 
+		}
+		catch(Exception e) 
+		{			  
+			e.printStackTrace();		  
+		}
+		return flag;
+	}
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/admin/controller/FeedbackList.java b/Samarth_1710991710_6G-02/newshunt/admin/controller/FeedbackList.java
new file mode 100644
index 0000000..e50678f
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/admin/controller/FeedbackList.java
@@ -0,0 +1,66 @@
+package com.newshunt.admin.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.FeedbackDao;
+import com.newshunt.daomodel.MenuDao;
+
+@Controller
+public class FeedbackList 
+{
+	@RequestMapping("/userfeedback")
+	public String userfeedback()
+	{
+		return "admin/userfeedback";
+	}
+	
+	@RequestMapping(value = "/feedbackList" , method = RequestMethod.POST)
+    @ResponseBody
+	public List<FeedbackDao>feedbackList()
+	{
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(FeedbackDao.class);
+		List<FeedbackDao>p=cr.list();
+		if(p.isEmpty()!=true)
+			return p;  
+		
+		return null;  
+   }
+	
+	@RequestMapping(value="/deleteFeedbackInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public byte deleteFeedbackInfo(@RequestBody FeedbackDao rec, HttpSession hs)
+	{		
+		byte flag = 0;
+		try
+		{
+			Configuration cfg= new Configuration();
+		    cfg.configure("hibernate.cfg.xml");
+		    SessionFactory sf = cfg.buildSessionFactory();
+		    Session ss = sf.openSession();
+		    ss.delete(rec);
+		    ss.beginTransaction().commit();
+		    flag = 1; 
+		}
+		catch(Exception e) 
+		{			  
+			e.printStackTrace();		  
+		}
+		return flag;
+	}
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/admin/controller/UserList.java b/Samarth_1710991710_6G-02/newshunt/admin/controller/UserList.java
new file mode 100644
index 0000000..a8c4730
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/admin/controller/UserList.java
@@ -0,0 +1,88 @@
+package com.newshunt.admin.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.MenuDao;
+import com.newshunt.daomodel.signup;
+
+@Controller
+public class UserList 
+{
+	@RequestMapping("/userManagement")
+	public String userlist()
+	{
+		return "admin/userlist";
+	}
+	
+	@RequestMapping(value = "/userList" , method = RequestMethod.POST)
+    @ResponseBody
+	public List<signup>userList()
+	{
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(signup.class);
+		List<signup>p=cr.list();
+		if(p.isEmpty()!=true)
+			return p;  
+		
+		return null;  
+   }
+	
+	@RequestMapping(value="/updateUserInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public byte updateUserInfo(@RequestBody signup rec, HttpSession hs)
+	{		
+		byte flag = 0;
+		try
+		{
+			Configuration cfg= new Configuration();
+		    cfg.configure("hibernate.cfg.xml");
+		    SessionFactory sf = cfg.buildSessionFactory();
+		    Session ss = sf.openSession();
+		    ss.update(rec);
+		    ss.beginTransaction().commit();
+		    flag = 1; 
+		}
+		catch(Exception e) 
+		{			  
+			e.printStackTrace();		  
+		}
+		return flag;
+	}
+	
+	@RequestMapping(value="/deleteUserInfo", method=RequestMethod.POST)
+	@ResponseBody
+	public byte deleteUserInfo(@RequestBody signup rec, HttpSession hs)
+	{		
+		byte flag = 0;
+		try
+		{
+			Configuration cfg= new Configuration();
+		    cfg.configure("hibernate.cfg.xml");
+		    SessionFactory sf = cfg.buildSessionFactory();
+		    Session ss = sf.openSession();
+		    ss.delete(rec);
+		    ss.beginTransaction().commit();
+		    flag = 1; 
+		}
+		catch(Exception e) 
+		{			  
+			e.printStackTrace();		  
+		}
+		return flag;
+	}
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/ChannelList.java b/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/ChannelList.java
new file mode 100644
index 0000000..4cc217b
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/ChannelList.java
@@ -0,0 +1,108 @@
+package com.newshunt.channelmanagement.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.ChannelListDao;
+import com.newshunt.daomodel.signup;
+@Controller
+public class ChannelList
+{
+	
+	@RequestMapping("/addChannel")
+	public String addChannel() 
+	{
+		return "addChannels";
+	}
+	
+	@ResponseBody
+	@RequestMapping(value= "/channellist", method=RequestMethod.POST)
+	public List<ChannelListDao> channel(HttpSession hs)
+	{
+		String un = hs.getAttribute("un").toString();
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(signup.class);
+		cr.add(Restrictions.eq("email", un));
+		signup rec = (signup)cr.uniqueResult();
+		String z = rec.getMychannel();
+		if(z!=null)
+		{
+			String m[] = z.split(",");
+			ArrayList<String> al = new ArrayList<String>();
+			for(String p:m)
+			{
+				al.add(p);
+			}
+			Criteria criteria = ss.createCriteria(ChannelListDao.class);
+			criteria.add(Restrictions.not(Restrictions.in("id", al)));
+			List<ChannelListDao>p=criteria.list();
+  		   	if(p.isEmpty()!=true)
+  		   		return p;  
+  		   	else
+  		   		return null;
+		}
+		else
+		{
+			cr = ss.createCriteria(ChannelListDao.class);
+			List<ChannelListDao>p=cr.list();
+			if(p.isEmpty()!=true) 
+				return p;  
+    		else
+    		    return null;   
+	    }	      
+	}
+		
+	@RequestMapping(value="/subscribe", method = RequestMethod.POST)
+	@ResponseBody
+	public byte suscribe(@RequestBody signup r , HttpSession session)
+	{
+		try
+    	{
+			String un = session.getAttribute("un").toString();
+	    	Configuration cfg= new Configuration();
+	    	cfg.configure("hibernate.cfg.xml");
+	    	SessionFactory sf = cfg.buildSessionFactory();
+	    	Session ss = sf.openSession();
+	    	Criteria criteria = ss.createCriteria(signup.class);
+	    	criteria.add(Restrictions.eq("email", un));
+	    	signup rec = (signup)criteria.uniqueResult();	 
+	    	String z = rec.getMychannel();
+	    	if(z!=null)
+	    	{
+	    		String x = r.getMychannel();
+	    		String n = z.concat(x);
+	    		rec.setMychannel(n);
+	    	}
+	    	else
+	    	{
+	    		rec.setMychannel(r.getMychannel());
+	    	}
+	    	ss.update(rec);
+	    	ss.beginTransaction().commit();
+	    	return 1; 
+    	}
+    	catch(Exception e)
+    	{
+    		e.printStackTrace();
+    	}
+		return 0;
+	}	
+	
+	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/FavChannels.java b/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/FavChannels.java
new file mode 100644
index 0000000..c43df41
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/FavChannels.java
@@ -0,0 +1,124 @@
+package com.newshunt.channelmanagement.controller;
+
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.ChannelListDao;
+import com.newshunt.daomodel.signup;
+import com.newshunt.dto.ChannelNews;
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.XmlReader;
+
+@Controller
+public class FavChannels 
+{
+	@RequestMapping("/favChannel")
+	public String mychannel() 
+	{
+		return "favChannel";
+	}
+	
+	@RequestMapping(value="/fav", method = RequestMethod.POST)
+	@ResponseBody
+	public byte fav(@RequestBody signup r , HttpSession session)
+	{
+		byte a=0;
+		try
+    	{
+    		String un = session.getAttribute("un").toString();
+    		Configuration cfg= new Configuration();
+    		cfg.configure("hibernate.cfg.xml");
+    		SessionFactory sf = cfg.buildSessionFactory();
+    		Session ss = sf.openSession();
+    		Criteria criteria = ss.createCriteria(signup.class);
+    		criteria.add(Restrictions.eq("email", un));
+    		signup rec = (signup)criteria.uniqueResult();
+    		rec.setFavchannel(r.getFavchannel());
+    		ss.update(rec);
+    		ss.beginTransaction().commit();
+    		a=1;
+    	}
+    	catch(Exception e)
+    	{
+    		e.printStackTrace();
+    	}
+		return a;
+	}
+	
+	@RequestMapping(value = "/myfav" , method = RequestMethod.POST)
+	@ResponseBody
+	public List<ChannelNews> my(HttpSession session) 
+	{	  
+		try
+		{
+			String email=session.getAttribute("un").toString();
+			Configuration cfg = new Configuration();
+			cfg.configure("hibernate.cfg.xml");
+			SessionFactory ss = cfg.buildSessionFactory();
+	        Session s = ss.openSession();
+	        Criteria cr=s.createCriteria(signup.class);
+	        cr.add(Restrictions.eq("email", email));
+	        signup rec = (signup)cr.uniqueResult();	        
+			String channel=rec.getFavchannel();
+			String m[]=channel.split(",");
+			ArrayList <String> al=new ArrayList<String>();
+			for(String z:m)
+			{
+				al.add(z);
+			}
+			cr=s.createCriteria(ChannelListDao.class);
+			cr.add(Restrictions.in("id", al));
+			List<ChannelListDao> ls=cr.list();			
+			LinkedList<ChannelNews> cn = new LinkedList<ChannelNews>(); 
+			for(ChannelListDao ch : ls)
+			{
+				URL url = new URL(ch.getUrl());
+				SyndFeedInput sf = new SyndFeedInput();
+				SyndFeed ff = sf.build(new XmlReader(url));
+				List list = ff.getEntries();
+				for(int j=0;j<2;j++)
+				{
+					ChannelNews sc = new ChannelNews(); 
+					String title = ((SyndEntry) list.get(j)).getTitle();
+					sc.setTitle(title);
+					String link = ((SyndEntry) list.get(j)).getLink();
+					sc.setLink(link);
+					Date D = ((SyndEntry) list.get(j)).getPublishedDate();
+					Date date = Calendar.getInstance().getTime();  
+					DateFormat dateFormat = new SimpleDateFormat("dd-MMMM-yyyy");  
+					String strDate = dateFormat.format(date);  
+					sc.setDate(strDate);
+					sc.setChannelName(ch.getTitle());
+					cn.add(sc);
+				}				  
+			}
+			return cn;
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+		}
+		return null; 
+	}	
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/Mychannels.java b/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/Mychannels.java
new file mode 100644
index 0000000..eb01380
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/channelmanagement/controller/Mychannels.java
@@ -0,0 +1,85 @@
+package com.newshunt.channelmanagement.controller;
+
+import com.newshunt.daomodel.ChannelListDao;
+import com.newshunt.daomodel.signup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+@Controller
+public class Mychannels
+{
+
+	@RequestMapping("/myChannel")
+	public String mychannel() 
+	{
+		return "myChannel";
+	}
+	
+	@ResponseBody
+	@RequestMapping(value= "/myChannelList", method=RequestMethod.POST)
+	public List<ChannelListDao>myChannelList(HttpSession hs)
+	{
+		String un = hs.getAttribute("un").toString();
+		Configuration cfg= new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cc = ss.createCriteria(signup.class);
+		cc.add(Restrictions.eq("email", un));
+		signup rec = (signup)cc.uniqueResult();	
+		String ch = rec.getMychannel();
+		String m[] = ch.split(",");
+		ArrayList<String>al = new ArrayList();   
+		for(String z:m)
+		{
+			al.add(z);
+		}   
+		Criteria c = ss.createCriteria(ChannelListDao.class);
+		c.add(Restrictions.in("id", al));
+		List<ChannelListDao>subscribedlist = c.list();
+		if(subscribedlist.isEmpty()!=true) 
+			return subscribedlist;  
+		else
+			return null;		
+	}	
+	
+
+	@RequestMapping(value="/unsubscribe", method = RequestMethod.POST)
+	@ResponseBody
+	public byte subscribe(@RequestBody signup r , HttpSession hs)
+	{
+    	try
+    	{
+    		String un = hs.getAttribute("un").toString();
+    		Configuration cfg= new Configuration();
+    		cfg.configure("hibernate.cfg.xml");
+    		SessionFactory sf = cfg.buildSessionFactory();
+    		Session ss = sf.openSession();
+    		Criteria criteria = ss.createCriteria(signup.class);
+    		criteria.add(Restrictions.eq("email", un));
+    		signup rec = (signup)criteria.uniqueResult();	       
+    		rec.setMychannel(r.getMychannel());
+    		ss.update(rec);
+    		ss.beginTransaction().commit();
+    		return 1; 
+    	}
+    	catch(Exception e)
+    	{
+    		e.printStackTrace();
+    	}
+    	return 0;
+	}
+		
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/daomodel/AdminMenuDao.java b/Samarth_1710991710_6G-02/newshunt/daomodel/AdminMenuDao.java
new file mode 100644
index 0000000..43c0c8b
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/daomodel/AdminMenuDao.java
@@ -0,0 +1,42 @@
+package com.newshunt.daomodel;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "admin_menu")
+public class AdminMenuDao
+{
+	@Id
+	int id;
+    String name;
+	String url;
+	
+    public int getId()
+    {
+		return id;
+	}
+	public void setId(int id) 
+	{
+		this.id = id;
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+
+	public String getUrl() 
+	{
+		return url;
+	}
+	public void setUrl(String url)
+	{
+		this.url = url;
+	}
+}
diff --git a/Samarth_1710991710_6G-02/newshunt/daomodel/ChannelListDao.java b/Samarth_1710991710_6G-02/newshunt/daomodel/ChannelListDao.java
new file mode 100644
index 0000000..de7876c
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/daomodel/ChannelListDao.java
@@ -0,0 +1,63 @@
+package com.newshunt.daomodel;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="channel_list")
+public class ChannelListDao
+{
+	@Id
+	String id;
+	String title;
+	String url;
+	String description;
+	String image; 
+	
+	public String getId()
+	{
+		return id;
+	}
+	public void setId(String id) 
+	{
+		this.id = id;
+	}
+	
+	public String getUrl() 
+	{
+		return url;
+	}
+	public void setUrl(String url) 
+	{
+		this.url = url;
+	}
+	
+	public String getTitle()
+	{
+		return title;
+	}
+	public void setTitle(String title)
+	{
+		this.title = title;
+	}
+	
+	public String getDescription()
+	{
+		return description;
+	}
+	public void setDescription(String description)
+	{
+		this.description = description;
+	}
+	
+	public String getImage()
+	{
+		return image;
+	}
+	public void setImage(String image)
+	{
+		this.image = image;
+	}
+	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/daomodel/FeedbackDao.java b/Samarth_1710991710_6G-02/newshunt/daomodel/FeedbackDao.java
new file mode 100644
index 0000000..1dce38b
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/daomodel/FeedbackDao.java
@@ -0,0 +1,42 @@
+package com.newshunt.daomodel;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="feedback")
+public class FeedbackDao
+{
+	@Id
+	String email;
+	String subject;
+	String message;
+	
+	public String getEmail() 
+	{
+		return email;
+	}
+	public void setEmail(String email) 
+	{
+		this.email = email;
+	}
+	
+	public String getSubject() 
+	{
+		return subject;
+	}
+	public void setSubject(String subject)
+	{
+		this.subject = subject;
+	}
+	
+	public String getMessage() 
+	{
+		return message;
+	}
+	public void setMessage(String message) 
+	{
+		this.message = message;
+	}	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/daomodel/MenuDao.java b/Samarth_1710991710_6G-02/newshunt/daomodel/MenuDao.java
new file mode 100644
index 0000000..7a4860b
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/daomodel/MenuDao.java
@@ -0,0 +1,41 @@
+package com.newshunt.daomodel;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+@Entity
+@Table(name = "menu")
+public class MenuDao
+{
+    @Id
+	int id;
+    String name;
+	String url;
+	
+    public int getId()
+    {
+		return id;
+	}
+	public void setId(int id) 
+	{
+		this.id = id;
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+
+	public String getUrl() 
+	{
+		return url;
+	}
+	public void setUrl(String url)
+	{
+		this.url = url;
+	}	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/daomodel/signup.java b/Samarth_1710991710_6G-02/newshunt/daomodel/signup.java
new file mode 100644
index 0000000..3d04265
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/daomodel/signup.java
@@ -0,0 +1,87 @@
+package com.newshunt.daomodel;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="user_account")
+public class signup 
+{
+	@Id
+	@Column(name="email_id")
+    String email;
+	String name;
+    String password;
+    @Column(name="confirm_password")
+    String confirmPassword;
+    @Column(name="phone_no")
+    String phone;
+    String mychannel;
+    String favchannel;
+    
+	public String getMychannel() 
+	{
+		return mychannel;
+	}
+	public void setMychannel(String mychannel)
+	{
+		this.mychannel = mychannel;
+	}
+	
+	public String getEmail()
+	{
+		return email;
+	}
+	public void setEmail(String email)
+	{
+		this.email = email;
+	}
+	
+	public String getName()
+	{
+		return name;
+	}
+	public void setName(String name) 
+	{
+		this.name = name;
+	}
+	
+	public String getPassword() 
+	{
+		return password;
+	}
+	public void setPassword(String password)
+	{
+		this.password = password;
+	}
+	
+	public String getConfirmPassword() 
+	{
+		return confirmPassword;
+	}
+	public void setConfirmPassword(String confirmPassword) 
+	{
+		this.confirmPassword = confirmPassword;
+	}
+	
+	public String getPhone()
+	{
+		return phone;
+	}
+	public void setPhone(String phone) 
+	{
+		this.phone = phone;
+	}
+	
+	public String getFavchannel() 
+	{
+		return favchannel;
+	}
+	public void setFavchannel(String favchannel) 
+	{
+		this.favchannel = favchannel;
+	}	
+	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/dto/ChannelNews.java b/Samarth_1710991710_6G-02/newshunt/dto/ChannelNews.java
new file mode 100644
index 0000000..2d74f6b
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/dto/ChannelNews.java
@@ -0,0 +1,45 @@
+package com.newshunt.dto;
+
+public class ChannelNews
+{
+	String title;
+	String link;
+	String date;
+	String channelName;
+	
+	public String getTitle()
+	{
+		return title;
+	}
+	public void setTitle(String title) 
+	{
+		this.title = title;
+	}
+	
+	public String getLink() 
+	{
+		return link;
+	}
+	public void setLink(String link)
+	{
+		this.link = link;
+	}
+	
+	public String getDate() 
+	{
+		return date;
+	}
+	public void setDate(String date)
+	{
+		this.date = date;
+	}
+	
+	public String getChannelName()
+	{
+		return channelName;
+	}
+	public void setChannelName(String channelName)
+	{
+		this.channelName = channelName;
+	}	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/feedback/controller/Feedbackform.java b/Samarth_1710991710_6G-02/newshunt/feedback/controller/Feedbackform.java
new file mode 100644
index 0000000..102d575
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/feedback/controller/Feedbackform.java
@@ -0,0 +1,44 @@
+package com.newshunt.feedback.controller;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.FeedbackDao;
+import com.newshunt.daomodel.signup;
+
+@Controller
+public class Feedbackform
+{
+	@RequestMapping("/submitFeedback")
+	public String submitFeedback()
+	{
+		return "feedbackPage";
+	}
+	
+	@RequestMapping(value="/feedbackform" , method=RequestMethod.POST)
+	@ResponseBody
+	public  byte feedbackform(@RequestBody FeedbackDao rec) 
+	{
+		try
+		{
+			Configuration cfg= new Configuration();
+			cfg.configure("hibernate.cfg.xml");
+			SessionFactory sf = cfg.buildSessionFactory();
+			Session ss = sf.openSession();
+			ss.save(rec);
+			ss.beginTransaction().commit();
+			return 1; 
+		}
+		catch(Exception e)
+		{			  
+			e.printStackTrace();  
+		}
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/livenews/controller/News.java b/Samarth_1710991710_6G-02/newshunt/livenews/controller/News.java
new file mode 100644
index 0000000..099a216
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/livenews/controller/News.java
@@ -0,0 +1,92 @@
+package com.newshunt.livenews.controller;
+
+import java.net.URI;
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.ChannelListDao;
+import com.newshunt.daomodel.signup;
+import com.newshunt.dto.ChannelNews;
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.XmlReader;
+
+@Controller
+public class News
+{
+	@RequestMapping(value = "/news" , method = RequestMethod.POST)
+	@ResponseBody
+	public List<ChannelNews> news(HttpSession session) 
+	{	  
+		try
+		{
+			String email=session.getAttribute("un").toString();
+			Configuration cfg = new Configuration();
+			cfg.configure("hibernate.cfg.xml");
+			SessionFactory ss = cfg.buildSessionFactory();
+	        Session s = ss.openSession();
+	        Criteria cr=s.createCriteria(signup.class);
+	        cr.add(Restrictions.eq("email", email));
+	        signup rec = (signup)cr.uniqueResult();	        
+			String channel=rec.getMychannel();
+			String m[]=channel.split(",");
+			ArrayList <String> al=new ArrayList<String>();
+			for(String z:m)
+			{
+				al.add(z);
+			}
+			cr=s.createCriteria(ChannelListDao.class);
+			cr.add(Restrictions.in("id", al));
+			List<ChannelListDao> ls=cr.list();			
+			LinkedList<ChannelNews> cn = new LinkedList<ChannelNews>(); 
+			for(ChannelListDao ch : ls)
+			{
+				URL url = new URL(ch.getUrl());
+				SyndFeedInput sf = new SyndFeedInput();
+				SyndFeed ff = sf.build(new XmlReader(url));
+				List list = ff.getEntries();
+				for(int j=0;j<2;j++)
+				{
+					ChannelNews sc = new ChannelNews(); 
+					String title = ((SyndEntry) list.get(j)).getTitle();
+					sc.setTitle(title);
+					String link = ((SyndEntry) list.get(j)).getLink();
+					sc.setLink(link);
+					Date D = ((SyndEntry) list.get(j)).getPublishedDate();
+					Date date = Calendar.getInstance().getTime();  
+					DateFormat dateFormat = new SimpleDateFormat("dd-MMMM-yyyy");  
+					String strDate = dateFormat.format(date);  
+					sc.setDate(strDate);
+					sc.setChannelName(ch.getTitle());
+					cn.add(sc);
+				}				  
+			}
+			return cn;
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+		}
+		return null; 
+	}	
+	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/loginsignup/controller/LoginSignup.java b/Samarth_1710991710_6G-02/newshunt/loginsignup/controller/LoginSignup.java
new file mode 100644
index 0000000..5e36f26
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/loginsignup/controller/LoginSignup.java
@@ -0,0 +1,116 @@
+package com.newshunt.loginsignup.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.signup;
+
+@Controller
+public class LoginSignup
+{
+	
+	@RequestMapping("/")
+	public String login() 
+	{
+		return "login";
+	}
+
+	@RequestMapping("/signup")
+	public String signup() 
+	{
+		return "signup";
+	}
+	
+	@RequestMapping(value="/saveUserInfo" , method=RequestMethod.POST)
+	@ResponseBody
+	public int saveUserInfo(@RequestBody signup rec)
+	{		
+		int a=0;
+		try
+		{
+			if(rec.getName().equals("") || rec.getEmail().equals("") || rec.getPhone().equals("") || rec.getPassword().equals("") || rec.getConfirmPassword().equals(""))
+			{
+				a=1;
+			}
+			else
+			{
+				Configuration cfg= new Configuration();
+				cfg.configure("hibernate.cfg.xml");
+				SessionFactory sf = cfg.buildSessionFactory();
+				Session ss = sf.openSession();
+				Criteria cr = ss.createCriteria(signup.class);
+				List<signup>z=cr.list();
+				for(signup m:z)
+				{
+					if(rec.getEmail().equals(m.getEmail()))
+					{
+						a=2;
+				    }
+				}
+				if(rec.getPassword().equals(rec.getConfirmPassword()) && a!=2)
+				{
+					a=3; 				
+					ss.save(rec);
+					ss.beginTransaction().commit();   	   
+				}
+			}
+		}
+		catch(Exception e) 
+		{	  
+			a=1;
+			e.printStackTrace();  
+		}
+		return a;
+	}
+	
+	@ResponseBody
+	@RequestMapping(value="/checkInfo", method=RequestMethod.POST)
+	public int checkInfo(@RequestBody signup r, HttpSession session)
+	{
+		String un="";
+		int flag=0;
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+        Session ss = sf.openSession();
+        Criteria cr = ss.createCriteria(signup.class);
+        List<signup>p=cr.list();
+        for(signup x:p)
+        {
+        	if(r.getEmail().equals(x.getEmail()) && r.getPassword().equals(x.getPassword()))
+        	{
+        		flag=1;
+        		un = r.getEmail();
+        		session.setAttribute("un",un);
+        	}
+        	else if(r.getEmail().equals("admin") && r.getPassword().equals("admin"))
+        	{
+        		flag=2;
+        	}
+        }
+        return flag;
+	}
+	
+	@RequestMapping(value="/username", method = RequestMethod.POST)
+	@ResponseBody
+	public ArrayList username(HttpSession session)
+	{
+		String uname = session.getAttribute("un").toString();
+		ArrayList<String>al=new ArrayList();
+		al.add(uname);
+	    return al;
+	}
+	
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/newshunt/menu/controller/MenuManagement.java b/Samarth_1710991710_6G-02/newshunt/menu/controller/MenuManagement.java
new file mode 100644
index 0000000..80e6962
--- /dev/null
+++ b/Samarth_1710991710_6G-02/newshunt/menu/controller/MenuManagement.java
@@ -0,0 +1,42 @@
+package com.newshunt.menu.controller;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.newshunt.daomodel.MenuDao;
+import com.newshunt.daomodel.signup;
+
+@Controller
+public class MenuManagement
+{	
+	@RequestMapping("/home")
+	public String home()
+	{
+		return "home";
+	}
+	
+	@RequestMapping(value = "/userMenuList" , method = RequestMethod.POST)
+    @ResponseBody
+	public List<MenuDao>userMenuList()
+	{
+		Configuration cfg = new Configuration();
+		cfg.configure("hibernate.cfg.xml");
+		SessionFactory sf = cfg.buildSessionFactory();
+		Session ss = sf.openSession();
+		Criteria cr = ss.createCriteria(MenuDao.class);
+		List<MenuDao>p=cr.list();
+		if(p.isEmpty()!=true)
+			return p;  
+		
+		return null;  
+   }		
+
+}
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/pom.xml b/Samarth_1710991710_6G-02/pom.xml
new file mode 100644
index 0000000..46667c0
--- /dev/null
+++ b/Samarth_1710991710_6G-02/pom.xml
@@ -0,0 +1,129 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com</groupId>
+	<artifactId>newshunt</artifactId>
+	<packaging>war</packaging>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>newshunt Maven Webapp</name>
+	<url>http://maven.apache.org</url>
+	<dependencies>
+		<dependency>
+			<groupId>it.sauronsoftware.cron4j</groupId>
+			<artifactId>cron4j</artifactId>
+			<version>2.2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>net.java.dev.rome</groupId>
+			<artifactId>rome</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>net.java.dev.rome</groupId>
+			<artifactId>rome</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>it.sauronsoftware.cron4j</groupId>
+			<artifactId>cron4j</artifactId>
+			<version>2.2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>4.3.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>4.3.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>4.3.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>4.3.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>4.3.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>4.3.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.47</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-taglibs</artifactId>
+			<version>4.2.6.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>4.2.6.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>4.2.6.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.3.1.Final</version>
+		</dependency>
+		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> 
+			<version>4.3.0.Final</version> </dependency> -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>4.3.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.1.0.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.8</version>
+		</dependency>
+		<dependency>
+			<groupId>jstl</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>newshunt</finalName>
+	</build>
+</project>
diff --git a/Samarth_1710991710_6G-02/views/accountPage.jsp b/Samarth_1710991710_6G-02/views/accountPage.jsp
new file mode 100644
index 0000000..dd840a3
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/accountPage.jsp
@@ -0,0 +1,183 @@
+<html>
+	<head>
+		<meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m = angular.module("newshunt",[]);
+	 		m.controller("accountinfo",function($scope,$http)
+	 		{
+	 			$scope.updateInfo = function(info)
+				{
+			 		$http.post("updateAccountInfo",info).then(function(resp)
+			 		{
+	 					if(resp.data==1)
+	 					{
+	 						alert("Details changed");
+	 					}
+	 				});
+		 		}
+		 		$scope.menubar = function()
+		 		{
+			 		$http.post("userMenuList").then(function(resp)
+			 		{
+ 						$scope.menuData = resp.data;
+ 					}); 
+			 		
+					$http.post("fetchAccountInfo").then(function(resp)
+					{
+	 					$scope.userData=resp.data;
+	 				});
+			
+					$http({
+		   				url:"username",
+		     			method:"post",
+		      			}).then(function(res){
+		  					$scope.username = res.data;
+		  				});
+		 		}
+			});
+		</script>
+		<style>
+				
+			.box 
+			{
+			  border: 2px solid #ccc;
+			  background-color: #eee;
+			  border-radius: 5px;
+			  padding: 16px;
+			  margin-top: 70px;
+			  margin-left:280px; 
+			  margin-right:280px; 
+			}
+			
+			.box::after
+			{
+			  content: "";
+			  clear: both;
+			  display: table;
+			}
+			
+			.box img 
+			{
+			  float: left;
+			  margin-right: 20px;
+			  border-radius: 50%;
+			}
+			
+			.box span 
+			{
+			  font-size: 20px;
+			  margin-right: 15px;
+			}
+			
+			@media (max-width: 20000px) 
+			{
+			  .box 
+			  {
+			      text-align: center;
+			  }
+			
+			  .box img 
+			  {
+			      margin: auto;
+			      float: none;
+			      display: block;
+			  }
+			  
+			  .sidenav 
+			  {
+			 	height: 100%;
+			    width: 200px;
+			    position: fixed;
+			    z-index: 1;
+			    top: 0;
+			    left: 0;
+			    background-color: khaki;
+			    overflow-x: hidden;
+			    padding-top: 80px;
+			  }
+			
+			  .sidenav a
+			  {
+			  	padding: 6px 8px 6px 16px;
+			  	text-decoration: none;
+			  	font-size: 16px;
+			  	color: #818181;
+			  	display: block;
+			  }
+			
+			  .sidenav a:hover
+			  {
+			  	color: black;
+			  }
+			  
+			  .button
+			  {
+			  	margin-top: 500px;
+			  }
+			  
+			  .main 
+			  {
+			  	margin-top:70px;
+			  	margin-left: 210px; 
+			  	font-size: 28px; 
+			  	padding: 0px 10px;
+			  }
+			}
+		</style>
+	</head>
+	<body ng-app="newshunt">
+		<div ng-controller="accountinfo" ng-init="menubar()">
+		
+			<nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="home">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li ng-repeat = "a in username" style="padding-right : 16px;"><a href="#">{{a}}</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in menuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	<form>
+	        	<h3>
+	        		EMAIL ID : &nbsp;
+	        		<input type="text" ng-model = "userData.email" disabled>
+	        		<br>
+	        		<br>
+	        		NAME : &nbsp;
+	        		<input type="text" ng-model="userData.name">
+	        		<br>
+	        		<br>
+	        		PASSWORD : &nbsp;
+	        		<input type="text" ng-model="userData.password">
+	        		<br>
+	        		<br>
+	        		PHONE NO : &nbsp;
+	        		<input type="text" ng-model="userData.phone">
+	        		<br>
+	        		<br>
+	        		<button type="button" class="btn btn-success" ng-click="updateInfo(userData)">UPDATE</button>
+	        	</h3>
+	        	</form>
+	        </div>
+	        
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/addChannels.jsp b/Samarth_1710991710_6G-02/views/addChannels.jsp
new file mode 100644
index 0000000..8af9d4f
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/addChannels.jsp
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Add Channels</title>
+		<meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+		
+		<script>
+	 		var m = angular.module("newshunt",[]);
+	 		m.controller("channelcontroller",function($scope,$http)
+	 		{		
+		 		$scope.channelData = function()
+		 		{
+			 		$http.post("channellist").then(function(response)
+			 		{
+						$scope.channeldata = response.data;
+					});
+			 		
+			 		$http.post("userMenuList").then(function(resp)
+			 		{
+ 						$scope.menuData = resp.data;
+ 					}); 
+			 	
+			 		$http({
+   						url:"username",
+     					method:"post",
+      				}).then(function(res){
+  						$scope.username = res.data;
+  					});
+		 		}
+		 		
+		 		$scope.subscribe = function()
+		 		{			 
+			 		var i;
+             		var m = "";
+		      		for(i=0 ; i<$scope.channeldata.length;i++)
+		      		{
+		    	    	if($scope.channeldata[i].selected==true)
+		    	    	{
+		    	      		m=m+$scope.channeldata[i].id+","; 	
+		    	    	}
+		      		}
+		      		console.log(m);
+			  		rec = {mychannel:m}
+					$http({
+						url:"subscribe",
+						method:"post",
+						data:rec
+					}).then(function(res){
+			     		alert("channels are subscribed");
+			 		});				
+		 		}		 
+	 		});
+		</script>
+		<style>
+			.box 
+			{
+				border: 2px solid #ccc;
+				background-color: #eee;
+			  	border-radius: 5px;
+			  	padding: 16px;
+				margin-top: 70px;
+				margin-left:280px; 
+				margin-right:280px; 
+			}
+			
+			.box::after
+			{
+				content: "";
+				clear: both;
+			  	display: table;
+			}
+					
+			.box img
+			{
+				float: left;
+				margin-right: 20px;
+				border-radius: 50%;
+			}
+					
+			.box span
+			{
+				font-size: 20px;
+				margin-right: 15px;
+			}
+					
+			@media (max-width: 20000px)
+			{
+				.box
+				{
+					text-align: center;
+				}
+					
+				.box img
+				{
+					margin: auto;
+					float: none;
+					display: block;
+				}
+				.sidenav
+				{
+					height: 100%;
+					width: 200px;
+					position: fixed;
+					z-index: 1;
+					top: 0;
+					left: 0;
+					background-color: khaki;
+					overflow-x: hidden;
+					padding-top: 80px;
+				}
+					
+				.sidenav a
+				{
+					padding: 6px 8px 6px 16px;
+					text-decoration: none;
+					font-size: 16px;
+					color: #818181;
+					display: block;
+				}
+					
+				.sidenav a:hover
+				{
+					color: black;
+				}
+				
+				.button
+				{
+					margin-top: 500px;
+				}
+			}
+		</style>
+	</head>
+	<body ng-app="newshunt">
+		<div ng-controller="channelcontroller" ng-init="channelData()">
+		
+			<nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+            	<div class="container_fluid">
+                	<div class="navbar-header">
+	                    <a class="navbar-brand" href="home">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li ng-repeat = "a in username" style="padding-right : 16px;"><a href="accountInfo">{{a}}</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in menuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+				<form>
+	        		<div class="container_fluid">
+			    		<div class="box" ng-repeat="x in channeldata">
+			        		<p><span>{{x.title}}</span></p>
+			        		<p>{{x.description}}</p>
+			        		<div class="checkbox">
+			          		<label><input type="checkbox" ng-model="x.selected">Subscribe</label>
+			     	   		</div>
+			    		</div>
+			    		<br>
+			    		<br>
+			        	<center>
+			        		<button type="button" class="btn btn-success" ng-click="subscribe()">subscribe</button>
+			        	</center>
+			    	</div>
+				</form>
+			</div>
+			
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/admin/addMenu.jsp b/Samarth_1710991710_6G-02/views/admin/addMenu.jsp
new file mode 100644
index 0000000..de67091
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/admin/addMenu.jsp
@@ -0,0 +1,130 @@
+<html>
+    <head>
+        <title>Feedback List</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("AdminMenuList").then(function(resp)
+        			{
+        				$scope.adminMenuData = resp.data;
+        			}); 
+        		}
+        		$scope.display=function()
+        		{
+       				rec = {id:$scope.id , name:$scope.name , url:$scope.url}
+       				$http({
+       					url:"AddUserMenu",
+       					method:"post",
+       					data:rec
+       					}).then(function(res){
+       						if(res.data==0)
+       							alert("Id already present");
+       						else
+       			 				alert("Data has been saved");
+       			 		});
+	        	}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+            
+            table, th , td 
+            {
+                border: 2px solid grey;
+                border-collapse: collapse;
+                padding: 5px;
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="AdminHome">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li style="padding-right : 16px;"><a href="#">Admin</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in adminMenuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	Id : <input type="text" ng-model="id"><br>
+      			Name : <input type="text" ng-model="name"><br>
+      			Url : <input type="text" ng-model="url"><br>
+      			<button ng-click="display()" >Submit</button>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/admin/addUserChannel.jsp b/Samarth_1710991710_6G-02/views/admin/addUserChannel.jsp
new file mode 100644
index 0000000..a7253b9
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/admin/addUserChannel.jsp
@@ -0,0 +1,132 @@
+<html>
+    <head>
+        <title>Feedback List</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("AdminMenuList").then(function(resp)
+        			{
+        				$scope.adminMenuData = resp.data;
+        			}); 
+        		}
+        		$scope.display=function()
+        		{
+       				rec = {id:$scope.id , title:$scope.title , description:$scope.description , url:$scope.url , image:$scope.image}
+       				$http({
+       					url:"ChannelAddOn",
+       					method:"post",
+       					data:rec
+       					}).then(function(res){
+       						if(res.data==0)
+       							alert("Id already present");
+       						else
+       			 				alert("Data has been saved");
+       			 		});
+	        	}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+            
+            table, th , td 
+            {
+                border: 2px solid grey;
+                border-collapse: collapse;
+                padding: 5px;
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="AdminHome">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li style="padding-right : 16px;"><a href="#">Admin</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in adminMenuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	Id : <input type="text" ng-model="id"><br>
+	        	Title : <input type="text" ng-model="title"><br>
+	        	Description : <input type="text" ng-model="description"><br>
+      			Url : <input type="text" ng-model="url"><br>
+      			Image : <input type="text" ng-model="image"><br>
+      			<button ng-click="display()" >Submit</button>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/admin/adminHome.jsp b/Samarth_1710991710_6G-02/views/admin/adminHome.jsp
new file mode 100644
index 0000000..26ca6f2
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/admin/adminHome.jsp
@@ -0,0 +1,147 @@
+<html>
+    <head>
+        <title>Feedback List</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("AdminMenuList").then(function(resp)
+        			{
+        				$scope.adminMenuData = resp.data;
+        			}); 
+        			
+        			$http.post("userListCount").then(function(resp)
+                	{
+                		$scope.userListCount = resp.data;
+                	});
+        			
+        			$http.post("ChannelListCount").then(function(resp)
+                    {
+                        $scope.ChannelListCount = resp.data;
+                    });
+        			
+        			$http.post("SuscribedListCount").then(function(resp)
+                    {
+                    	$scope.SuscribedListCount = resp.data;
+                    });
+	        	}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+            
+            table, th , td 
+            {
+                border: 2px solid grey;
+                border-collapse: collapse;
+                padding: 5px;
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="#">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li style="padding-right : 16px;"><a href="#">Admin</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in adminMenuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	<h1>
+	        	<table border="">
+	        	<thead>
+	        	<tr>
+	        	<th>No of users</th>
+	        	<th>No of channels</th>
+	        	<th>No of suscribed channels</th>
+	        	<th>No of unsuscribed channels</th>
+	        	</tr>
+	        	</thead>
+	        	<tbody>
+	        	<tr>
+	        	<td>{{userListCount}}</td>
+	        	<td>{{ChannelListCount}}</td>
+	        	<td>{{SuscribedListCount}}</td>
+	        	<td>{{ChannelListCount-SuscribedListCount}}</td>
+	        	</tr>
+	        	</tbody>
+	        	</table>
+	            </h1>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/admin/channelList.jsp b/Samarth_1710991710_6G-02/views/admin/channelList.jsp
new file mode 100644
index 0000000..05564a9
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/admin/channelList.jsp
@@ -0,0 +1,206 @@
+<html>
+    <head>
+        <title>Feedback List</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("AdminMenuList").then(function(resp)
+                	{
+                		$scope.adminMenuData = resp.data;
+                	}); 
+        			 
+					$http.post("ShowChannelList").then(function(resp)
+					{
+		        		$scope.ShowChannelList = resp.data;
+	        		}); 
+	        	}
+        		
+        		$scope.del = function(rec)
+        		{
+        			$http.post("deleteChannelInfo",rec).then(function(resp)
+        			 		{
+        	 					if(resp.data==1)
+        	 					{
+        	 						alert("Details deleted");
+        	 					}
+        	 				});
+        		}
+        		
+        		$scope.update = function(selectRecord)
+        		{
+        			$scope.rec = selectRecord;
+        			$('#myModal').modal('show');
+        			 
+         		}
+        		$scope.SaveUpdateInfo=function(rec){
+        			$http.post("updateChannelInfo",rec).then(function(resp)
+        			 		{
+        	 					if(resp.data==1)
+        	 					{
+        	 						alert("Details changed");
+        	 					}
+        	 				});
+        			
+        			
+        		}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+            
+            table, th , td 
+            {
+                border: 2px solid grey;
+                border-collapse: collapse;
+                padding: 5px;
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="AdminHome">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li style="padding-right : 16px;"><a href="#">Admin</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in adminMenuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	<h1>
+	        	<table border="">
+	        	<thead>
+	        	<tr>
+	        	<th>id</th>
+	        	<th>title</th>
+	        	<th>description</th>
+	        	<th>url</th>
+	        	<th>image</th>
+	        	<th></th>
+	        	</tr>
+	        	</thead>
+	        	<tbody>
+	        	<tr ng-repeat="x in ShowChannelList">
+	        	<td>{{x.id}}</td>
+	        	<td>{{x.title}}</td>
+	        	<td>{{x.description}}</td>
+	        	<td>{{x.url}}</td>
+	        	<td>{{x.image}}</td>
+	        	<td>
+	        	<button ng-click="update(x)">update</button>
+	        	<button ng-click="del(x)">delete</button>
+	        	
+	        	
+	        	  				<!-- The Modal -->
+					  <div class="modal" id="myModal">
+					    <div class="modal-dialog">
+					      <div class="modal-content">
+					      
+					        <!-- Modal Header -->
+					        <div class="modal-header">
+					          <h4 class="modal-title">Update Record</h4>
+					          <button type="button" class="close" data-dismiss="modal">&times;</button>
+					        </div>
+					        
+					        <!-- Modal body -->
+					        <div class="modal-body">
+					          title <input type = "text" ng-model="rec.title"/>
+					          url <input type = "text" ng-model="rec.url"/>
+					          description <input type = "text" ng-model="rec.description"/>
+					          image <input type = "text" ng-model="rec.image"/>
+					        </div>
+					        
+					        <!-- Modal footer -->
+					        <div class="modal-footer">
+					        <button type="button" class="btn btn-danger" ng-click="SaveUpdateInfo(rec)">update</button>
+					          <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+					        </div>
+					        
+					      </div>
+					    </div>
+					  </div>
+					  
+					  
+					  
+	        	</td>
+	        	</tr>
+	        	</tbody>
+	        	</table><br>
+	            </h1>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/admin/menuList.jsp b/Samarth_1710991710_6G-02/views/admin/menuList.jsp
new file mode 100644
index 0000000..a3673c7
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/admin/menuList.jsp
@@ -0,0 +1,205 @@
+<html>
+    <head>
+        <title>Feedback List</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("AdminMenuList").then(function(resp)
+                	{
+                		$scope.adminMenuData = resp.data;
+                	}); 
+        			 
+					$http.post("ShowMenuList").then(function(resp)
+					{
+		        		$scope.ShowMenuList = resp.data;
+	        		}); 
+	        	}
+        		
+        		$scope.del = function(rec)
+        		{
+        			$http.post("deleteMenuInfo",rec).then(function(resp)
+        			 		{
+        	 					if(resp.data==1)
+        	 					{
+        	 						alert("Details deleted");
+        	 					}
+        	 				});
+        		}
+        		
+        		$scope.update = function(selectRecord)
+        		{
+        			$scope.rec = selectRecord;
+        			$('#myModal').modal('show');
+        			 
+         		}
+        		$scope.saveUpdateInfo=function(rec){
+        			$http.post("updateMenuInfo",rec).then(function(resp)
+        			 		{
+        	 					if(resp.data==1)
+        	 					{
+        	 						alert("Details changed");
+        	 					}
+        	 				});
+        			
+        			
+        		}
+        		
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+            
+            table, th , td 
+            {
+                border: 2px solid grey;
+                border-collapse: collapse;
+                padding: 5px;
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="AdminHome">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li style="padding-right : 16px;"><a href="#">Admin</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in adminMenuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	<h1>
+	        	<table border="">
+	        	<thead>
+	        	<tr>
+	        	<th>id</th>
+	        	<th>name</th>
+	        	<th>url</th>
+	        	<th></th>
+	        	</tr>
+	        	</thead>
+	        	<tbody>
+	        	<tr ng-repeat="x in ShowMenuList">
+	        	<td>{{x.id}}</td>
+	        	<td>{{x.name}}</td>
+	        	<td>{{x.url}}</td>
+	        	<td>
+	        	<button type="button" class="btn btn-primary" ng-click="update(x)">
+    				update
+  				</button>
+  				<button type="button" class="btn btn-primary" ng-click="del(x)">
+    				delete
+  				</button>
+  				
+					  				
+					  				<!-- The Modal -->
+					  <div class="modal" id="myModal">
+					    <div class="modal-dialog">
+					      <div class="modal-content">
+					      
+					        <!-- Modal Header -->
+					        <div class="modal-header">
+					          <h4 class="modal-title">Update Record</h4>
+					          <button type="button" class="close" data-dismiss="modal">&times;</button>
+					        </div>
+					        
+					        <!-- Modal body -->
+					        <div class="modal-body">
+					          name <input type = "text" ng-model="rec.name"/>
+					          url <input type = "text" ng-model="rec.url"/>
+					        </div>
+					        
+					        <!-- Modal footer -->
+					        <div class="modal-footer">
+					        <button type="button" class="btn btn-danger" ng-click="saveUpdateInfo(rec)">update</button>
+					          <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+					        </div>
+					        
+					      </div>
+					    </div>
+					  </div>
+  
+  
+  
+  				</td>
+	        	</tr>
+	        	</tbody>
+	        	</table><br>
+	            </h1>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/admin/userfeedback.jsp b/Samarth_1710991710_6G-02/views/admin/userfeedback.jsp
new file mode 100644
index 0000000..468a172
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/admin/userfeedback.jsp
@@ -0,0 +1,149 @@
+<html>
+    <head>
+        <title>Feedback List</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("AdminMenuList").then(function(resp)
+                	{
+                		$scope.adminMenuData = resp.data;
+                	}); 
+        			 
+					$http.post("feedbackList").then(function(resp)
+					{
+		        		$scope.feedbackList = resp.data;
+	        		}); 
+	        	}
+        		
+        		$scope.del = function(rec)
+        		{
+        			$http.post("deleteFeedbackInfo",rec).then(function(resp)
+        			 		{
+        	 					if(resp.data==1)
+        	 					{
+        	 						alert("Details deleted");
+        	 					}
+        	 				});
+        		}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+            
+            table, th , td 
+            {
+                border: 2px solid grey;
+                border-collapse: collapse;
+                padding: 5px;
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="AdminHome">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li style="padding-right : 16px;"><a href="#">Admin</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in adminMenuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	<h1>
+	        	<table border="">
+	        	<thead>
+	        	<tr>
+	        	<th>email</th>
+	        	<th>subject</th>
+	        	<th>message</th>
+	        	<th></th>
+	        	</tr>
+	        	</thead>
+	        	<tbody>
+	        	<tr ng-repeat="x in feedbackList">
+	        	<td>{{x.email}}</td>
+	        	<td>{{x.subject}}</td>
+	        	<td>{{x.message}}</td>
+	        	<td><button ng-click="del(x)">delete</button></td>
+	        	</tr>
+	        	</tbody>
+	        	</table>
+	        	
+	            </h1>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/admin/userlist.jsp b/Samarth_1710991710_6G-02/views/admin/userlist.jsp
new file mode 100644
index 0000000..e1b5681
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/admin/userlist.jsp
@@ -0,0 +1,214 @@
+<html>
+    <head>
+        <title>Feedback List</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("AdminMenuList").then(function(resp)
+                    {
+                        $scope.adminMenuData = resp.data;
+                    }); 
+        			 
+					$http.post("userList").then(function(resp)
+					{
+		        		$scope.userList = resp.data;
+	        		}); 
+	        	}
+        		
+        		$scope.del = function(rec)
+        		{
+        			$http.post("deleteUserInfo",rec).then(function(resp)
+        			 		{
+        	 					if(resp.data==1)
+        	 					{
+        	 						alert("User blocked");
+        	 					}
+        	 				});
+        		}
+        		
+        		$scope.update = function(selectRecord)
+        		{
+        			$scope.rec = selectRecord;
+        			$('#myModal').modal('show');
+        			 
+         		}
+        		$scope.saveUpdateInfo=function(rec){
+        			$http.post("updateUserInfo",rec).then(function(resp)
+        			 		{
+        	 					if(resp.data==1)
+        	 					{
+        	 						alert("Details changed");
+        	 					}
+        	 				});
+        			
+        			
+        		}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+            
+            table, th , td 
+            {
+                border: 2px solid grey;
+                border-collapse: collapse;
+                padding: 5px;
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="AdminHome">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li style="padding-right : 16px;"><a href="#">Admin</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in adminMenuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	<h1>
+	        	<table border="">
+	        	<thead>
+	        	<tr>
+	        	<th>email id</th>
+	        	<th>name</th>
+	        	<th>phone num</th>
+	        	<th>password</th>
+	        	<th>mychannel</th>
+	        	<th>favchannel</th>
+	        	<th></th>
+	        	</tr>
+	        	</thead>
+	        	<tbody>
+	        	<tr ng-repeat="x in userList">
+	        	<td>{{x.email}}</td>
+	        	<td>{{x.name}}</td>
+	        	<td>{{x.phone}}</td>
+	        	<td>{{x.password}}</td>
+	        	<td>{{x.mychannel}}</td>
+	        	<td>{{x.favchannel}}</td>
+	        	<td>
+	        	<button type="button" class="btn btn-primary" ng-click="update(x)">
+    				update
+  				</button>
+  				<button type="button" class="btn btn-primary" ng-click="del(x)">
+    				Block
+  				</button>
+  				
+					  				
+					  				<!-- The Modal -->
+					  <div class="modal" id="myModal">
+					    <div class="modal-dialog">
+					      <div class="modal-content">
+					      
+					        <!-- Modal Header -->
+					        <div class="modal-header">
+					          <h4 class="modal-title">Update Record</h4>
+					          <button type="button" class="close" data-dismiss="modal">&times;</button>
+					        </div>
+					        
+					        <!-- Modal body -->
+					        <div class="modal-body">
+					          name <input type = "text" ng-model="rec.name"/>
+					          phone num <input type = "text" ng-model="rec.phone"/>
+					          password <input type = "text" ng-model="rec.password"/>
+					          mychannel <input type = "text" ng-model="rec.mychannel"/>
+					          favchannel <input type = "text" ng-model="rec.favchannel"/>
+					        </div>
+					        
+					        <!-- Modal footer -->
+					        <div class="modal-footer">
+					        <button type="button" class="btn btn-danger" ng-click="saveUpdateInfo(rec)">update</button>
+					          <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+					        </div>
+					        
+					      </div>
+					    </div>
+					  </div>
+	        	
+	        	
+	        	
+	        	
+	        	</td>
+	        	</tr>
+	        	</tbody>
+	        	</table>
+	            </h1>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/favChannel.jsp b/Samarth_1710991710_6G-02/views/favChannel.jsp
new file mode 100644
index 0000000..2bcd948
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/favChannel.jsp
@@ -0,0 +1,123 @@
+<html>
+    <head>
+        <title>Feedback</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("userMenuList").then(function(resp)
+        			{
+        				$scope.menuData = resp.data;
+        			});  
+					
+					$http({
+		   				url:"username",
+		     			method:"post",
+		      			}).then(function(res){
+		  					$scope.username = res.data;
+		  				});
+					
+					$http({
+           				url:"myfav",
+             			method:"post",
+              			}).then(function(res){
+          					$scope.myfav = res.data;
+          				});
+	        	}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="home">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li ng-repeat = "a in username" style="padding-right : 16px;"><a href="accountInfo">{{a}}</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in menuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main" ng-repeat="x in myfav">
+	        	<div class="newsbox">
+	            	Channel : {{x.channelName}}<br>
+	            	Date : {{x.date}} <br>
+	            	<a href = {{x.link}}>{{x.title}}</a>
+	            </div>
+        	</div>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/feedbackPage.jsp b/Samarth_1710991710_6G-02/views/feedbackPage.jsp
new file mode 100644
index 0000000..7b0b606
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/feedbackPage.jsp
@@ -0,0 +1,136 @@
+<html>
+    <head>
+        <title>Feedback</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("userMenuList").then(function(resp)
+        			{
+        				$scope.menuData = resp.data;
+        			});  
+					
+					$http({
+		   				url:"username",
+		     			method:"post",
+		      			}).then(function(res){
+		  					$scope.username = res.data;
+		  				});
+	        	}
+        		$scope.feedback = function()
+      			{      		
+      				data = {email:$scope.email, subject:$scope.subject ,message:$scope.message};
+      	    		$http.post("feedbackform",data).then(function(response)
+      	    		{
+      	    			if(response.data==1)
+      	    			{      	    		
+      	    	  			alert("Thankyou !");
+      	    			}
+      	    		});	
+      			}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="home">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li ng-repeat = "a in username" style="padding-right : 16px;"><a href="accountInfo">{{a}}</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in menuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+	        	<h2>FEEDBACK FORM</h2><br>
+	        		<form><h4>
+						<label>Email: <br> <input type="text" ng-model="email"></label>
+						<br>
+						<br> 
+						<label>Subject: <br> <input type="text" ng-model="subject"></label>
+						<br>
+						<br>
+						<label> Message: <br> <textarea  rows="5"  name="message" ng-model="message"></textarea></label>
+						<br>
+						<br>
+						<br>
+						<button type="button" class="btn btn-success" ng-click="feedback()">SUBMIT</button>
+					</h4></form>
+        	</div>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/home.jsp b/Samarth_1710991710_6G-02/views/home.jsp
new file mode 100644
index 0000000..9cc8d23
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/home.jsp
@@ -0,0 +1,122 @@
+<html>
+    <head>
+        <title>Home page</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m =angular.module("newshunt",[]);
+        	m.controller("homecontroller",function($scope,$http)
+        	{
+        		$scope.home = function()
+        		{
+        			$http.post("userMenuList").then(function(resp)
+        			{
+        				$scope.menuData = resp.data;
+        			}); 
+        			 
+					$http.post("news").then(function(resp)
+					{
+		        		$scope.news = resp.data;
+	        		}); 
+					
+					$http({
+		   				url:"username",
+		     			method:"post",
+		      			}).then(function(res){
+		  					$scope.username = res.data;
+		  				});
+	        	}
+        	});	
+       </script>
+       <style>
+            body
+            {
+            	font-family: "Lato", sans-serif;
+            }
+
+            .sidenav 
+            {
+	            height: 100%;
+	            width: 200px;
+	            position: fixed;
+	            z-index: 1;
+	            top: 0;
+	            left: 0;
+	            background-color: khaki;
+	            overflow-x: hidden;
+	            padding-top: 80px;
+            }
+
+            .sidenav a
+            {
+	            padding: 6px 8px 6px 16px;
+	            text-decoration: none;
+	            font-size: 16px;
+	            color: #818181;
+	            display: block;
+            }
+
+            .sidenav a:hover 
+            {
+            	color: black;
+            }
+
+            .main
+            {
+	            margin-top:70px;
+	            margin-left: 210px; 
+	            font-size: 28px; 
+	            padding: 0px 10px;
+            }
+            
+            .newsbox
+            {
+            	border: 2px solid #ccc;
+			  	background-color: #eee;
+				border-radius: 5px;
+				padding: 16px;
+				margin-top: 70px;
+				margin-left:80px; 
+				margin-right:80px; 
+            }
+       </style>
+    </head>
+    <body ng-app = "newshunt">
+        <div ng-controller="homecontroller" ng-init="home()">
+        
+	        <nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="home">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li ng-repeat = "a in username" style="padding-right : 16px;"><a href="accountInfo">{{a}}</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in menuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main" ng-repeat="x in news">
+	        	<div class="newsbox">
+	            	Channel : {{x.channelName}}<br>
+	            	Date : {{x.date}} <br>
+	            	<a href = {{x.link}}>{{x.title}}</a>
+	            </div>
+        	</div>
+        	
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/login.jsp b/Samarth_1710991710_6G-02/views/login.jsp
new file mode 100644
index 0000000..5d5bd98
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/login.jsp
@@ -0,0 +1,124 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+<title>Login</title>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="stylesheet"
+	href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+<script
+	src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+<script
+	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+<script
+	src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+<script
+	src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+<script>
+	var m = angular.module("newshunt", []);
+	m.controller("login", function($scope, $http, $window) {
+		$scope.check = 1;
+		$scope.login = function() {
+			$scope.check = 0;
+			data = {
+				email : $scope.email,
+				password : $scope.password
+			};
+			$http.post("checkInfo", data).then(function(response) {
+				$scope.check = 1;
+				if (response.data == 1) {
+					$window.location.href = "home";
+				} else if (response.data == 2) {
+					$window.location.href = "AdminHome";
+				} else if (response.data == 0) {
+					alert("invalid info");
+				}
+			});
+		}
+	});
+</script>
+<style>
+.card {
+	background-color: floralwhite !important;
+	width: 400px;
+	height: 370px;
+	margin-top: 100px;
+	margin-left: 25%;
+	position: absolute;
+}
+
+.container {
+	align-content: center;
+}
+
+.card-header {
+	position: relative;
+	align-content: center;
+	text-align: center;
+	color: black;
+	font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+	margin-top: 20px;
+	font-size: 30px;
+}
+
+.card-footer {
+	position: relative;
+	text-align: center;
+	color: ablack;
+}
+
+input {
+	position: relative;
+	height: 37px;
+	width: 70%;
+	background-color: lightgrey;
+	margin-left: 15%;
+	border: 2px solid lightslategray;
+	border-radius: 3px;
+	padding: 10px;
+}
+
+button {
+	position: relative;
+	align-content: center;
+	margin-left: 38%;
+	width: 25%;
+}
+
+button:hover {
+	background-color: #45a049;
+}
+</style>
+</head>
+<body ng-app="newshunt">
+	<div class="container" ng-controller="login">
+
+		<div class="card">
+			<div class="card-header">
+				<p>
+					<strong>Login</strong> to get going !
+				</p>
+			</div>
+			<br> <br>
+			<div class="card-body">
+				<form>
+					<input type="text" placeholder="Enter Email ID" ng-model="email">
+					<br> <br> <input type="password"
+						placeholder="Enter password" ng-model="password"> <br>
+					<br>
+					<button type="button" class="btn btn-success" ng-click="login()">LOGIN</button>
+				</form>
+			</div>
+			<div class="card-footer">
+				<br>
+				<p>Don't have an account?</p>
+				<a href="signup" target="_self">Sign up</a>
+			</div>
+		</div>
+		<div ng-if="check==0">
+			<img src="${pageContext.request.contextPath}/resources/pc.gif">
+
+		</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/myChannel.jsp b/Samarth_1710991710_6G-02/views/myChannel.jsp
new file mode 100644
index 0000000..79298af
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/myChannel.jsp
@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+		<script>
+			var m = angular.module("newshunt",[]);
+			m.controller("mychannelcontroller",function($scope,$http)
+			{				
+				$scope.subcribedChannnels = function()
+				{
+					$http.post("myChannelList").then(function(response)
+					{
+						$scope.myChannelData = response.data;
+						console.log(myChannelData);
+					});
+					 
+					$http.post("userMenuList").then(function(resp)
+					{
+						$scope.menuData = resp.data;
+					}); 
+					 
+					$http({
+			   			url:"username",
+			     		method:"post",
+			      		}).then(function(res){
+			  				$scope.username = res.data;
+			  			});
+				}
+				
+				$scope.unsubscribe = function()
+				{
+					var i;
+		            var m = "";
+				    for(i=0 ; i<$scope.myChannelData.length;i++)
+				    {
+				    	if($scope.myChannelData[i].selected!=true)
+				    	{
+				    		m=m+$scope.myChannelData[i].id+","; 	
+				    	}
+				    }
+				    console.log(m);
+					rec = {mychannel:m}
+					$http({
+						url:"unsubscribe",
+						method:"post",
+						data:rec
+						}).then(function(res){
+					    	alert("channels are unsubscribed");
+					 	});
+				 }
+				$scope.fav=function()
+       		 	{
+       		 	 	var i;
+       		 	 	var m = "";
+       		     	for(i=0 ; i<$scope.myChannelData.length;i++)
+       		     	{
+       		    	 	if($scope.myChannelData[i].select==true)
+       		    	 	{
+       		    		 	m=m+$scope.myChannelData[i].id+","; 	
+       		    	 	}
+       		     	}
+       		     	rec = {favchannel:m}
+       		     	$http({
+       		    	 	url:"fav",
+       				 	method:"post",
+       				 	data:rec
+       				  	}).then(function(res){
+       			     			alert("saved");
+       			 	   });
+       		 	}
+			 });
+		</script>
+		<style>
+			.box
+			{
+		  		border: 2px solid #ccc;
+			  	background-color: #eee;
+			  	border-radius: 5px;
+			  	padding: 16px;
+			  	margin-top: 70px;
+			  	margin-left:280px; 
+			  	margin-right:280px; 
+			}
+		
+			.box::after 
+			{
+			  content: "";
+			  clear: both;
+			  display: table;
+			}
+			
+			.box img 
+			{
+			  float: left;
+			  margin-right: 20px;
+			  border-radius: 50%;
+			}
+			
+			.box span 
+			{
+			  font-size: 20px;
+			  margin-right: 15px;
+			}
+			
+			@media (max-width: 20000px) 
+			{
+			  .box 
+			  {
+			      text-align: center;
+			  }
+			
+			  .box img 
+			  {
+			      margin: auto;
+			      float: none;
+			      display: block;
+			  }
+			  
+			 .sidenav
+			 {
+			 	height: 100%;
+			    width: 200px;
+			    position: fixed;
+			    z-index: 1;
+			    top: 0;
+			  	left: 0;
+			    background-color: khaki;
+			    overflow-x: hidden;
+			    padding-top: 80px;
+			 }
+			
+			 .sidenav a 
+			 {
+			 	padding: 6px 8px 6px 16px;
+			 	text-decoration: none;
+			 	font-size: 16px;
+			 	color: #818181;
+			 	display: block;
+			 }
+			
+			  .sidenav a:hover 
+			  {
+			  	 color: black;
+			  }
+			  
+			  .button
+			  {
+			  	 margin-top: 500px;
+			  }
+			}
+		</style>
+	</head>
+	<body ng-app="newshunt">
+		<div ng-controller="mychannelcontroller" ng-init="subcribedChannnels()">
+		
+			<nav class="navbar navbar-light navbar-fixed-top" style="background-color: #e3f2fd;">
+	            <div class="container_fluid">
+	                <div class="navbar-header">
+	                    <a class="navbar-brand" href="home">NewsHunt</a>
+	                </div>
+	                <ul class="nav navbar-nav">
+	                    <li></li>
+	                </ul>
+	                <ul class="nav navbar-nav navbar-right">
+	                    <li ng-repeat = "a in username" style="padding-right : 16px;"><a href="accountInfo">{{a}}</a></li>
+	                </ul>
+	            </div>
+	        </nav>
+	        
+	        <div class="sidenav" >
+	            <div ng-repeat = "x in menuData">
+	            	<a href="{{x.url}}">{{x.name}}</a>
+	            </div>
+	        </div>
+	        
+	        <div class="main">
+				<form>
+	        		<div class="container_fluid">
+			    		<div class="box" ng-repeat="x in myChannelData">
+			        		<p><span>{{x.title}}</span></p>
+			        		<p>{{x.description}}</p>
+			        		<div class="checkbox">
+			          			<label><input type="checkbox" ng-model="x.selected">Unsubscribe</label><br>
+			          			<label><input type="checkbox" ng-model="x.select">Fav Channel</label>
+			        		</div>
+			    		</div>
+			    		<br>
+			    		<br>
+			        	<center>
+			        	<button type="button" class="btn btn-success" ng-click="unsubscribe()">unsubscribe</button>
+			        	<button type="button" class="btn btn-success" ng-click="fav()">Fav Channel</button>
+			        	</center>
+			    	</div>
+				</form>
+			</div>
+			
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/views/signup.jsp b/Samarth_1710991710_6G-02/views/signup.jsp
new file mode 100644
index 0000000..5d911a4
--- /dev/null
+++ b/Samarth_1710991710_6G-02/views/signup.jsp
@@ -0,0 +1,140 @@
+<html>
+    <head>
+        <title>Sign up</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
+        <script>
+        	var m = angular.module("newshunt",[]);
+            m.controller("signup",function($scope , $http)
+            {
+            	$scope.saveInfo = function()
+            	{
+            		data = {name:$scope.name , email:$scope.email , password:$scope.password , confirmPassword:$scope.cpassword ,phone:$scope.phno};
+            	    $http.post("saveUserInfo",data).then(function(res)
+            	    {
+            	    	if(res.data==0)
+   							alert("Password missmatch");
+   						else if(res.data==1)
+   							alert("Fill out mandatory fields");
+   						else if(res.data==2)
+       						alert("Username is already present");
+   						else if(res.data==3)
+   							alert("Data is saved");
+            	    });	
+            	}
+            });  
+        </script>
+        <style>
+            .card
+            {
+                background-color: floralwhite !important;
+                width: 400px;
+                height: 570px;
+                margin-top: 100px;
+                margin-left: 25%;
+                position: absolute;
+            }
+            
+            .container
+            {
+                align-content:center;
+            }
+            
+            .card-header
+            {
+                position: relative;
+                align-content: center;
+                text-align: center;
+                color: black;
+                font-family:'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+                margin-top: 20px;
+                font-size: 30px;
+            }
+            
+            .card-footer
+            {
+                position: relative;
+                text-align: center;
+                color: black;
+
+            }
+            
+            input
+            {
+                position: relative;
+                height: 37px;
+                width: 70%;
+                background-color: lightgrey;
+                margin-left: 15%;
+                border: 2px solid lightslategray;
+                border-radius: 3px;
+                padding: 10px;
+            }
+            
+            input[type=checkbox]
+            {
+                height: 15px;
+                width: 15px;
+                margin-left: 15%;
+                position: relative; 
+            }
+            
+            button
+            {
+                position: relative;
+                align-content: center;
+                margin-left: 38%;
+                width: 25%;
+            }
+            
+            button:hover
+            {
+                background-color: #45a049;
+            }
+        </style>
+    </head>
+    <body ng-app="newshunt">
+        <div class="container" ng-controller="signup">  
+          
+            <div class="card">
+                <div class="card-header">
+                    <p><strong>Sign up</strong> for free !</p>
+                </div>
+                <br>
+                <br>
+                <div class="card-body">
+                    <form>
+                    	<input type="text" placeholder="Enter Email ID" ng-model="email">
+                        <br>
+                        <br>
+                        <input type="text" placeholder="Enter Name" ng-model="name">
+                        <br>
+                        <br>
+                        <input type="text" placeholder="Enter phone number" ng-model = "phno">
+                        <br>
+                        <br>
+                        <input type="password" placeholder="Enter password" ng-model="password">
+                        <br>
+                        <br>
+                        <input type="password" placeholder="Confirm password" ng-model="cpassword">
+                        <input type="checkbox" checked> I agree to all terms and conditions
+                        <br>
+                        <br>
+                        <button type="button" class="btn btn-success" ng-click="saveInfo()">SIGN UP</button>
+                    </form>
+                </div>
+                <div class="card-footer">
+                    <br>
+                    <p>Have an account?</p>
+                    <a href="http://localhost:8080/news_hunt/" target="_self">Login</a>
+                </div>
+            </div>
+            
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Samarth_1710991710_6G-02/web.xml b/Samarth_1710991710_6G-02/web.xml
new file mode 100644
index 0000000..9a84fc3
--- /dev/null
+++ b/Samarth_1710991710_6G-02/web.xml
@@ -0,0 +1,18 @@
+<web-app>
+  	<servlet>
+		 <servlet-name>
+		 		dispatcher-servlet
+		 </servlet-name>
+		 <servlet-class>
+		 		org.springframework.web.servlet.DispatcherServlet
+		 </servlet-class>
+ 		 <init-param>
+				 <param-name>contextConfigLocation</param-name>
+				 <param-value>/WEB-INF/dispatcher-servlet.xml</param-value>
+		  </init-param>
+   	</servlet>
+  	<servlet-mapping>
+  			<servlet-name>dispatcher-servlet</servlet-name>
+  			<url-pattern>/</url-pattern>
+ 	 </servlet-mapping> 
+ </web-app>
\ No newline at end of file