eggman20339/CNSA-216-FP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	FWA_MAIN/bin/FWA_MAIN.dll
#	FWA_MAIN/bin/FWA_MAIN.pdb
#	FWA_MAIN/obj/Debug/FWA_MAIN.dll
#	FWA_MAIN/obj/Debug/FWA_MAIN.pdb
This commit is contained in:
netnobody19
2024-04-03 19:25:07 -04:00
parent 0c31e87b73 be2d0534f4
commit 47d13f3841
25 changed files with 431 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
FWA_MAIN/obj/Debug/Package/PackageTmp/Default.aspx
View File

@@ -4,12 +4,41 @@
<head>
<link href="main.css" rel="stylesheet" type="text/css" />
<style>
.parent {
position: relative;
height: 100%;
}
.child {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
h1{
text-align: center;
}
</style>
</head>
<body runat="server">
<div class="standardcontentpage">
<div class="parent">
<h1>Hello</h1>
<div class="child">
<h1>Welcome to Louis' Pharmacy!</h1>
<br/><br/>
<h1>Use the pane on the left to navigate</h1>
<h1>Make a selection and right click for more options</h1>
</div>
</div></body>

2
FWA_MAIN/obj/Debug/Package/PackageTmp/Web.config
View File

@@ -14,7 +14,7 @@
</defaultDocument>
</system.webServer>
<connectionStrings>
<add name="ConnString" connectionString="Server=sql.eggtech.net;Database=FinalProjectOfficialPharmacy;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;" providerName="System.Data.SqlClient" />
<add name="ConnString" connectionString="Server=10.1.1.250;Database=FinalProjectOfficialPharmacy;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<add key="webpages:Version" value="3.0.0.0" />

BIN
FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.dll
View File

Binary file not shown.

BIN
FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.pdb
View File

Binary file not shown.

2
FWA_MAIN/obj/Debug/TransformWebConfig/original/Web.config
View File

@@ -14,7 +14,7 @@
</defaultDocument>
</system.webServer>
<connectionStrings>
<add name="ConnString" connectionString="Server=sql.eggtech.net;Database=FinalProjectOfficialPharmacy;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;" providerName="System.Data.SqlClient"/>
<add name="ConnString" connectionString="Server=10.1.1.250;Database=FinalProjectOfficialPharmacy;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<appSettings>
<add key="webpages:Version" value="3.0.0.0"/>

2
FWA_MAIN/obj/Debug/TransformWebConfig/transformed/Web.config
View File

@@ -14,7 +14,7 @@
</defaultDocument>
</system.webServer>
<connectionStrings>
<add name="ConnString" connectionString="Server=sql.eggtech.net;Database=FinalProjectOfficialPharmacy;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;" providerName="System.Data.SqlClient" />
<add name="ConnString" connectionString="Server=10.1.1.250;Database=FinalProjectOfficialPharmacy;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<add key="webpages:Version" value="3.0.0.0" />