diff options
| -rw-r--r-- | Project-Unite/Controllers/DeveloperController.cs | 12 | ||||
| -rw-r--r-- | Project-Unite/Project-Unite.csproj | 4 | ||||
| -rw-r--r-- | Project-Unite/Views/Developer/index.cshtml | 74 | ||||
| -rw-r--r-- | Project-Unite/packages.config | 1 |
4 files changed, 37 insertions, 54 deletions
diff --git a/Project-Unite/Controllers/DeveloperController.cs b/Project-Unite/Controllers/DeveloperController.cs index cbe1436..b635a21 100644 --- a/Project-Unite/Controllers/DeveloperController.cs +++ b/Project-Unite/Controllers/DeveloperController.cs @@ -14,9 +14,9 @@ namespace Project_Unite.Controllers public class DeveloperController : Controller { // GET: Developer - public ActionResult Index() + public ActionResult Index(string id = "home") { - ViewBag.Developer = true; + ViewBag.Page = id; return View(); } @@ -51,8 +51,7 @@ namespace Project_Unite.Controllers public ActionResult Releases() { - var db = new ApplicationDbContext(); - return View(db.Downloads); + return RedirectToAction("Index", new { id = "releases" }); } public ActionResult AddRelease() @@ -154,10 +153,7 @@ namespace Project_Unite.Controllers [Authorize] public ActionResult Wiki() { - ViewBag.Developer = true; - var db = new ApplicationDbContext(); - var cats = db.WikiCategories; - return View(cats); + return RedirectToAction("Index", new { id = "wiki" }); } public ActionResult AddWikiCategory() diff --git a/Project-Unite/Project-Unite.csproj b/Project-Unite/Project-Unite.csproj index d2c2ee8..4d71663 100644 --- a/Project-Unite/Project-Unite.csproj +++ b/Project-Unite/Project-Unite.csproj @@ -130,6 +130,10 @@ <HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="Octokit, Version=0.24.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Octokit.0.24.1-alpha0001\lib\net45\Octokit.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="Reachmail, Version=2.0.0.87, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\reachmail.2.0.0.87\lib\Reachmail.dll</HintPath> <Private>True</Private> diff --git a/Project-Unite/Views/Developer/index.cshtml b/Project-Unite/Views/Developer/index.cshtml index f371d32..8c5daee 100644 --- a/Project-Unite/Views/Developer/index.cshtml +++ b/Project-Unite/Views/Developer/index.cshtml @@ -1,57 +1,39 @@ @{ ViewBag.Title = "Dev Control Panel"; + string homeclass = (ViewBag.Page == "home") ? "active" : ""; + string releasesclass = (ViewBag.Page == "releases") ? "active" : ""; + string wikiclass = (ViewBag.Page == "wiki") ? "active" : ""; var db = new Project_Unite.Models.ApplicationDbContext(); - int fixedbugs = db.Bugs.Where(x => x.Open == false).Count(); - int notfixedbugs = db.Bugs.Where(x => x.Open == true).Count(); - + var releases = db.Downloads; + var cats = db.WikiCategories; } -<h2>Welcome!</h2> +<h2>Developer Control Panel</h2> -<p>Here, have a bunch of charts that tell you what you already know!</p> +<p>A place that only the best of the best ShiftOS developers can access.</p> <div class="row"> - <div class="col-lg-6"> - <h3>Bugs</h3> - <p>Here's a pie chart that tells you how many bugs have been fixed.</p> - <div id="c_bugs"></div> - </div> -</div> - -<style> - #c_bugs{ - width:100%; - height:900px; - } -</style> + <div class="col-xs-4"> + <h4>Places</h4> -<!-- Resources --> -<script src="https://www.amcharts.com/lib/3/amcharts.js"></script> -<script src="https://www.amcharts.com/lib/3/pie.js"></script> -<script src="https://www.amcharts.com/lib/3/plugins/export/export.min.js"></script> -<link rel="stylesheet" href="https://www.amcharts.com/lib/3/plugins/export/export.css" type="text/css" media="all" /> -<script src="https://www.amcharts.com/lib/3/themes/light.js"></script> + <ul class="nav-pills nav-stacked nav" id="tabs" data-tabs="tabs"> + <li class="@homeclass"><a data-toggle="tab" href="#d_home"><span class="glyphicon glyphicon-home"></span> Home</a></li> + <li class="@releasesclass"><a data-toggle="tab" href="#d_releases"><span class="glyphicon glyphicon-download"></span> Releases</a></li> + <li class="@wikiclass"><a data-toggle="tab" href="#d_wiki"><span class="glyphicon glyphicon-book"></span> Wiki</a></li> + </ul> + </div> + <div class="col-xs-8 tab-content"> + <div class="tab-pane fade in @homeclass" id="d_home"> + <h3>Not yet implemented.</h3> -<!-- Chart code --> -<script> -var chart = AmCharts.makeChart( "c_bugs", { - "type": "pie", - "theme": "dark", - "dataProvider": [{ - "status": "Fixed", - "amount": @fixedbugs - }, { - "status": "Needs attention", - "amount": @notfixedbugs - }], - "valueField": "amount", - "titleField": "status", - "balloon":{ - "fixedPosition":true - }, - "export": { - "enabled": false - } -} ); -</script>
\ No newline at end of file + <p>Please suggest things to put in here.</p> + </div> + <div class="tab-pane fade in @releasesclass" id="d_releases"> + @Html.Partial("~/Views/Developer/Releases.cshtml", releases); + </div> + <div class="tab-pane fade in @wikiclass" id="d_wiki"> + @Html.Partial("~/Views/Developer/Wiki.cshtml", cats); + </div> + </div> +</div>
\ No newline at end of file diff --git a/Project-Unite/packages.config b/Project-Unite/packages.config index 321930e..64a692e 100644 --- a/Project-Unite/packages.config +++ b/Project-Unite/packages.config @@ -42,6 +42,7 @@ <package id="NAudio" version="1.7.3" targetFramework="net452" /> <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" /> <package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" /> + <package id="Octokit" version="0.24.1-alpha0001" targetFramework="net452" /> <package id="Owin" version="1.0" targetFramework="net452" /> <package id="reachmail" version="2.0.0.87" targetFramework="net452" /> <package id="Respond" version="1.2.0" targetFramework="net452" /> |