Skip to content

Commit

Permalink
Merge pull request #8 from mr-culver/mitch-cards
Browse files Browse the repository at this point in the history
Cleaned up a few things
  • Loading branch information
mr-culver authored Apr 30, 2021
2 parents 5d27367 + a45f956 commit ac97d4c
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 176 deletions.
21 changes: 0 additions & 21 deletions BHConsole_v2/Administration/Administrator.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,5 @@
</div>
</div>
</div>
<div class="row">
<div class="col">
<%--Tabs--%>
<%--<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#home">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#profile">Profile</a>
</li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade show active" id="home">
<p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
</div>
<div class="tab-pane fade" id="profile">
<p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit.</p>
</div>
</div>--%>
</div>
</div>
</div>
</asp:Content>
5 changes: 0 additions & 5 deletions BHConsole_v2/Administration/ShopperVisitOverview.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -364,10 +364,5 @@
</div>
</div>
</div>





</div>
</asp:Content>
133 changes: 0 additions & 133 deletions BHConsole_v2/Data/ShopperVisits.csv

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions BHConsole_v2/Data/VolunteerTimepunches.csv

This file was deleted.

8 changes: 7 additions & 1 deletion BHConsole_v2/Default.aspx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ public partial class Default : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{

if (Session["Permission"] == null || Session["Permission"].Equals("0"))
{
}
else if (Session["Permission"].Equals("9"))
{
Response.Redirect("~/Administration/Administrator.aspx");
}
}
}
}
7 changes: 0 additions & 7 deletions BHConsole_v2/Models/Connection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ public static SqlConnection GetConnection()
{
SqlConnection conn = new SqlConnection(ConfigurationManager.ConnectionStrings["BHDBConnectionString"].ConnectionString);
return conn;
//Connection sessionObject = (Connection)HttpContext.Current.Session["SQLConnection"];

//if(sessionObject == null)
//{
// HttpContext.Current.Session["SQLConnection"] = new Connection();
//}
//return (Connection)HttpContext.Current.Session["SQLConnection"];
}
}
}
2 changes: 2 additions & 0 deletions BHConsole_v2/Models/ShopperVisit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class ShopperVisit

public ShopperVisit
(
// Constructor arguments
string name,
string email,
string phone,
Expand All @@ -24,6 +25,7 @@ public ShopperVisit
string relationOtherDescription
)
{
// build object that will be inserted into the database
this.shopper = new Shopper();
this.shopper.Name = name;
this.shopper.Email = email;
Expand Down

0 comments on commit ac97d4c

Please sign in to comment.