Niekompletna

Trunk/Server/Forum/Forum/Content/Site.css

@@ -302,75 +302,85 @@ textarea {
     background-color: #f2f2f2;
 }
 
+.delete-category__span{
+    font-size:2rem;
+    font-weight:400;
+    margin-bottom:10rem;
+}
 
-
+.delete-category__dl {
-
+    height: 3rem;
-@media (min-width: 768px) {
+    margin-bottom: 3rem;
-
-
-
-    .navbar > .container {
-        height: 10rem;
-    }
-
-    .navbar-header {
-        height: 100%;
-        display: flex;
-        align-items: center;
-    }
-
-    .navbar-brand {
-        font-size: 3.5rem;
-    }
-
-    .navbar-nav {
-        height: 100px;
-        display: flex;
-        align-items: center;
-    }
-
-        .navbar-nav > li {
-            height: 50%;
-        }
-
-
-
-            .navbar-nav > li > a {
-                height: 100%;
-                border-radius: 0.8rem;
-            }
-
-    .nav > li > a:hover, .nav > li > a:focus {
-        transition: background-color .1s ease;
-    }
-
-    .category-list {
-        grid-template-columns: 1fr 1fr;
-        grid-column-gap: 2rem;
-    }
-
-    .single-category-wrapper {
-        width: 65%;
-        margin: 0 auto;
-    }
-
-    .form-AddQuestion__btn {
-    flex-direction: row;
-    margin-top: 1rem;
-        }
-    .form-personal-data{
-        flex-direction: row;
-    }
-
-        .form-personal-data .form-group {
-            width: 49%;
-        }
-
-    .form-AddQuestion input[type=submit] {
-        margin-top:0;
-    }
-
 }
 
 
 
+    @media (min-width: 768px) {
+
+
+
+        .navbar > .container {
+            height: 10rem;
+        }
+
+        .navbar-header {
+            height: 100%;
+            display: flex;
+            align-items: center;
+        }
+
+        .navbar-brand {
+            font-size: 3.5rem;
+        }
+
+        .navbar-nav {
+            height: 100px;
+            display: flex;
+            align-items: center;
+        }
+
+            .navbar-nav > li {
+                height: 50%;
+            }
+
+
+
+                .navbar-nav > li > a {
+                    height: 100%;
+                    border-radius: 0.8rem;
+                }
+
+        .nav > li > a:hover, .nav > li > a:focus {
+            transition: background-color .1s ease;
+        }
+
+        .category-list {
+            grid-template-columns: 1fr 1fr;
+            grid-column-gap: 2rem;
+        }
+
+        .single-category-wrapper {
+            width: 65%;
+            margin: 0 auto;
+        }
+
+        .form-AddQuestion__btn {
+            flex-direction: row;
+            margin-top: 1rem;
+        }
+
+        .form-personal-data {
+            flex-direction: row;
+        }
+
+            .form-personal-data .form-group {
+                width: 49%;
+            }
+
+        .form-AddQuestion input[type=submit] {
+            margin-top: 0;
+        }
+    }
+
+
+

Trunk/Server/Forum/Forum/Controllers/AccountController.cs

@@ -136,7 +136,7 @@ namespace Forum.Controllers
 
         //
         // GET: /Account/Register
-        [AllowAnonymous]
+        [Authorize]
         public ActionResult Register()
         {
             return View();
@@ -145,7 +145,7 @@ namespace Forum.Controllers
         //
         // POST: /Account/Register
         [HttpPost]
-        [AllowAnonymous]
+        [Authorize]
         [ValidateAntiForgeryToken]
         public async Task<ActionResult> Register(RegisterViewModel model)
         {

Trunk/Server/Forum/Forum/Controllers/HomeController.cs

@@ -133,6 +133,25 @@ namespace Forum.Controllers
             return RedirectToAction("Question", new {id = model.QuestionId});
         }
 
+        [Authorize]
+        [System.Web.Mvc.Route("Home/DeleteAnswer/{id}")]
+        public ActionResult DeleteAnswer(int? id)
+        {            
+            var answer = _dbContext.Answers.Find(id);
+            var question = _dbContext.Questions.FirstOrDefault(x => x.Answers.Any(y => y.Id == id));
+
+            if (answer != null)
+            {
+                _dbContext.Answers.Remove(answer);
+                _dbContext.SaveChanges();
+            }
+
+            if (question != null)
+                return RedirectToAction("Question", new {id = question.Id});
+
+            return HttpNotFound();
+        }
+
 
     }
 }

Trunk/Server/Forum/Forum/Forum.csproj

@@ -222,6 +222,8 @@
     <Content Include="Content\bootstrap.css.map" />
     <Content Include="Content\bootstrap-theme.min.css.map" />
     <Content Include="Content\bootstrap-theme.css.map" />
+    <None Include="Properties\PublishProfiles\forum-inzynieria1 - FTP.pubxml" />
+    <None Include="Properties\PublishProfiles\forum-inzynieria1 - Web Deploy.pubxml" />
     <None Include="Scripts\jquery-3.3.1.intellisense.js" />
     <Content Include="Scripts\jquery-3.3.1.js" />
     <Content Include="Scripts\jquery-3.3.1.min.js" />

Trunk/Server/Forum/Forum/Views/Account/Login.cshtml

@@ -41,7 +41,7 @@
                     </div>
                 </div>
                 <p>
-                    @Html.ActionLink("Utwórz nowego użytkownika", "Register")
+                    @*@Html.ActionLink("Utwórz nowego użytkownika", "Register")*@
                 </p>
                 @* Enable this once you have account confirmation enabled for password reset functionality
                     <p>

Trunk/Server/Forum/Forum/Views/Categories/Delete.cshtml

@@ -4,29 +4,31 @@
     ViewBag.Title = "Delete";
 }
 
-<h2>Delete</h2>
+<div class="single-category-wrapper">
+    <h2>Usuwanie ketegorii</h2>
+    <hr style="border-top: 1px solid #d3d3d3;" />
     
-<h3>Are you sure you want to delete this?</h3>
+    <span class="delete-category__span">Jesteś pewien, że chcesz usunąć kategorię?</span>
-<div>
+    <div style="margin-top: 3rem;">
-    <h4>Category</h4>
-    <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.CategoryName)
-        </dt>
    
-        <dd>
+        <dl class="dl-horizontal delete-category__dl">
-            @Html.DisplayFor(model => model.CategoryName)
+            <dt style="text-align:left">
-        </dd>
+                @Html.DisplayNameFor(model => model.CategoryName)
+            </dt>
+            <dd style="margin-left:0;">
+                @Html.DisplayFor(model => model.CategoryName)
+            </dd>
+        </dl>
        
-    </dl>
+        @using (Html.BeginForm())
+        {
+            @Html.AntiForgeryToken()
 
-    @using (Html.BeginForm()) {
+            <div class="form-actions no-color">
-        @Html.AntiForgeryToken()
+                <input type="submit" value="Usuń" class="answer-list__add-btn" style="height:4rem; width:17rem; background-color:#af4f4f; margin-bottom: 3rem;" /> 
-
+            </div>
-        <div class="form-actions no-color">
+            <div>@Html.ActionLink("Powrót do listy kategorii", "Index")
-            <input type="submit" value="Delete" class="btn btn-default" /> |
+            </div>
-            @Html.ActionLink("Back to List", "Index")
+        }
-        </div>
+    </div>
-    }
+    </div>
-</div>

Trunk/Server/Forum/Forum/Views/Categories/Edit.cshtml

@@ -4,39 +4,39 @@
     ViewBag.Title = "Edit";
 }
 
-<h2>Edit</h2>
+<div class="single-category-wrapper">
+
+    <h2>Edytuj nazwię kategorii</h2>
+    <hr style="border-top: 1px solid #d3d3d3; margin-bottom: 3rem;" />
 
 
-@using (Html.BeginForm())
-{
-    @Html.AntiForgeryToken()
 
-    <div class="form-horizontal">
+    @using (Html.BeginForm())
-        <h4>Category</h4>
+    {
-        <hr />
+        @Html.AntiForgeryToken()
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        @Html.HiddenFor(model => model.Id)
 
-        <div class="form-group">
+        <div class="form-horizontal">
-            @Html.LabelFor(model => model.CategoryName, htmlAttributes: new { @class = "control-label col-md-2" })
+         
-            <div class="col-md-10">
+            @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-                @Html.EditorFor(model => model.CategoryName, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.HiddenFor(model => model.Id)
-                @Html.ValidationMessageFor(model => model.CategoryName, "", new { @class = "text-danger" })
+            <div class="form-group">
-            </div>
+                @Html.LabelFor(model => model.CategoryName, htmlAttributes: new { @class = "control-label col-md-2" })
-        </div>
+                <div class="col-md-10">
-
+                    @Html.EditorFor(model => model.CategoryName, new { htmlAttributes = new { @class = "form-control" } })
-        <div class="form-group">
+                    @Html.ValidationMessageFor(model => model.CategoryName, "", new { @class = "text-danger" })
-            <div class="col-md-offset-2 col-md-10">
+                </div>
-                <input type="submit" value="Save" class="btn btn-default" />
+            </div>
+            <div class="form-group">
+                <div class="col-md-offset-2 col-md-10">
+                    <input type="submit" value="Zapisz" class="answer-list__add-btn" style="height:4rem; width:17rem" />
+                </div>
             </div>
         </div>
+    }
+    <div>
+        @Html.ActionLink("Powrót do listy kategorii", "Index")
     </div>
-}
+    </div>
-
+    @section Scripts {
-<div>
+        @Scripts.Render("~/bundles/jqueryval")
-    @Html.ActionLink("Back to List", "Index")
+    }
-</div>
-
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-}

Trunk/Server/Forum/Forum/Views/Categories/Index.cshtml

@@ -12,7 +12,7 @@
     <table class="table">
         <tr>
             <th>
-                @Html.DisplayNameFor(model => model.CategoryName)
+                Nazwa kategorii
             </th>
             <th></th>
         </tr>

Trunk/Server/Forum/Forum/Views/Home/Question.cshtml

@@ -30,7 +30,7 @@
         foreach (var answer in Model.Answers)
         {
             <li class="answer-list__single-answer">
-                <div class="answer-list__answer__info" @{if(answer.Professional!=null){<text>style="background-color: #7ecc2a"</text>}}>
+                <div class="answer-list__answer__info" @{if (answer.Professional != null) { <text> style="background-color: #7ecc2a" </text> }}>
                     @{
                         if (answer.Professional != null)
                         {
@@ -41,6 +41,12 @@
                             <span class="username">@answer.Nick napisał(a)</span>
                         }
                     }
+                    @{
+                        if (User.Identity.IsAuthenticated)
+                        {
+                            @Html.ActionLink("Usuń odpowiedź", "DeleteAnswer", new {id = answer.Id},new{@style="color:#fff;"});
+                        }
+                    }
                     @answer.Date
                 </div>
                  <div class="answer-list__content">

Trunk/Server/Forum/Forum/Views/Shared/_LoginPartial.cshtml

@@ -9,7 +9,7 @@
         <li>
             @Html.ActionLink("Witaj " + User.Identity.GetUserName() + "!", "Index", "Manage", routeValues: null, htmlAttributes: new { title = "Manage" })
         </li>
-        <li>@Html.ActionLink("Zarejestruj się", "Register", "Account", routeValues: null, htmlAttributes: new { id = "registerLink" })</li>
+        <li>@Html.ActionLink("Dodaj profesjonalistę", "Register", "Account", routeValues: null, htmlAttributes: new { id = "registerLink" })</li>
         <li><a href="javascript:document.getElementById('logoutForm').submit()">Wyloguj się</a></li>
     </ul>
     }

Trunk/Server/Forum/Forum/Web.config

@@ -12,7 +12,7 @@
     <add name="DefaultConnection" connectionString="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\ForumInzyneria1.mdf;Initial Catalog=ForumInzyneria1;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
-    <add key="MailSenderAddress" value="http://localhost:51829/Home/Index" />
+    <add key="MailSenderAddress" value="http://mailsender-inzynieria1.azurewebsites.net/Home/Index" />
     <add key="webpages:Version" value="3.0.0.0" />
     <add key="webpages:Enabled" value="false" />
     <add key="ClientValidationEnabled" value="true" />

Trunk/Server/Forum/MailSender/Content/Site.css

@@ -301,6 +301,11 @@ textarea {
     height: 200px;
 }
 
+.w100 {
+    width: 100% !important;
+    max-width: 100% !important;
+}
+
 .form-emailsend
 {
     color: black;

Trunk/Server/Forum/MailSender/Controllers/HomeController.cs

@@ -4,23 +4,36 @@ using System.Web.Mvc;
 using System.Web.ModelBinding;
 using System;
 using Newtonsoft.Json;
+using System.Configuration;
 
 namespace MailSender.Controllers
 {
+    [RoutePrefix("")]
     public class HomeController : Controller
     { 
         [HttpPost]
         public ActionResult Index([System.Web.Http.FromBody]MailDTO.MailDTO mail)
         {
-            var model = new Models.MailModel(mail);
+           var model = new Models.MailModel(mail);
-            return View(model);
+            TempData.Add("mailMod", model);
+           return View(model);
+        }
+
+        [HttpGet]
+        public ActionResult Index()
+        {
+            if(TempData["mailMod"] != null)
+            {
+                return View(TempData["mailMod"]);
+            }
+            return View(new Models.MailModel());
         }
 
         [System.Web.Http.HttpGet]
         public ActionResult Error(string errMsg)
         {
-            ViewData.Add("errMsg", errMsg);
+            TempData.Add("errMsg", errMsg);
-            return View();
+            return RedirectToAction("Index");
         }
 
         [System.Web.Mvc.HttpPost]
@@ -28,16 +41,19 @@ namespace MailSender.Controllers
         {
             if (ModelState.IsValid)
             {
-                var smtpClient = new SmtpClient(Settings.smtpServer, Settings.smtpPort)
+                var smtpClient = new SmtpClient(ConfigurationManager.AppSettings["smtp-server"],
+                    Int32.Parse(ConfigurationManager.AppSettings["smtp-port"]))
                 {
-                    Credentials = new NetworkCredential(Settings.user, Settings.pass),
+                    Credentials = new NetworkCredential(
+                        ConfigurationManager.AppSettings["user-mail"],
+                        ConfigurationManager.AppSettings["pass-mail"]),
                     EnableSsl = true
                 };
-                smtpClient.Send(Settings.user, model.EMailTo, model.Subject, model.Content);
+                smtpClient.Send(ConfigurationManager.AppSettings["user-mail"], model.EMailTo, model.Subject, model.Content);
-                return RedirectToAction("Index");
+                return Redirect(ConfigurationManager.AppSettings["forum-address"]);
             }
             else
-                return RedirectToAction("Error", new { errMsg = "Error nie umiesz pisac maila menelu" });
+                return RedirectToAction("Error", new { errMsg = "Błąd wysyłania wiadomości e-mail." });
         }
     }
 }

Trunk/Server/Forum/MailSender/MailSender.csproj

@@ -175,7 +175,6 @@
     </Compile>
     <Compile Include="Models\MailModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\bootstrap-theme.css" />
@@ -191,6 +190,8 @@
     <Content Include="ApplicationInsights.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Properties\PublishProfiles\mailsender-inzynieria1 - FTP.pubxml" />
+    <None Include="Properties\PublishProfiles\mailsender-inzynieria1 - Web Deploy.pubxml" />
     <None Include="Scripts\jquery-3.3.1.intellisense.js" />
     <Content Include="Scripts\jquery-3.3.1.js" />
     <Content Include="Scripts\jquery-3.3.1.min.js" />

Trunk/Server/Forum/MailSender/Models/MailModel.cs

@@ -30,6 +30,10 @@ namespace MailSender.Models
         [StringLength(500, ErrorMessage = "Message has to have between 1 and 500 chars", MinimumLength = 1)]
          public string Content { get; set; }
 
+        public MailModel()
+        {
+            Content = EMailTo = Subject = string.Empty;
+        }
 
         public MailModel(MailDTO.MailDTO DTO)
         {

Trunk/Server/Forum/MailSender/Settings.cs

@@ -1,10 +0,0 @@
-namespace MailSender
-{
-    public class Settings
-    {
-        public static string smtpServer = "smtp.gmail.com";
-        public static int smtpPort = 587;
-        public static string user = "ttestowy504@gmail.com";
-        public static string pass = "ChyzySoftware";
-    }
-}

Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml

@@ -4,28 +4,30 @@
 }
 
 
-@if (ViewData.ContainsKey("mailErr"))
+@if (TempData["mailErr"] != null)
 {
-    <h3>Error: @ViewData["mailErr"]</h3>
+    string errStr = TempData["mailErr"] as string;
+    <h3>Error: @TempData["mailErr"]</h3>
+    TempData["mailErr"] = null;
 }
 
 @using (Html.BeginForm("Send", "Home", FormMethod.Post))
 {
     <div class="form-group">
         @Html.LabelFor(i => i.Subject, new { @class = "label-form" })
-        @Html.EditorFor(i => i.Subject, new { htmlAttributes = new { @value = Model.Subject, @class = "form-control form-emailsend", @placeholder = "Temat" } })
+        @Html.EditorFor(i => i.Subject, new { htmlAttributes = new { @value = Model.Subject, @class = "form-control form-emailsend w100", @placeholder = "Temat" } })
         @Html.ValidationMessageFor(i => i.Subject)
     </div>
 
     <div class="form-group">
         @Html.LabelFor(i => i.EMailTo, new { @class = "label-form" })
-        @Html.EditorFor(i => i.EMailTo, new { htmlAttributes = new { @value = Model.EMailTo, @class = "form-control form-emailsend", @placeholder = "Do" } })
+        @Html.EditorFor(i => i.EMailTo, new { htmlAttributes = new { @value = Model.EMailTo, @class = "form-control form-emailsend w100", @placeholder = "Do" } })
         @Html.ValidationMessageFor(i => i.EMailTo)
     </div>
 
     <div class="form-group" >
         @Html.LabelFor(i => i.Content, new { @class = "label-form" })
-        @Html.EditorFor(i => i.Content, new { htmlAttributes = new { @value = Model.Content, @class = "form-control", @id = "exampleFormControlTextarea3", @rows=9, @placeholder = "Odpowiedź" } })
+        @Html.EditorFor(i => i.Content, new { htmlAttributes = new { @value = Model.Content, @class = "form-control w100", @id = "exampleFormControlTextarea3", @rows=9, @placeholder = "Odpowiedź" } })
         @Html.ValidationMessageFor(i => i.Content)
     </div>
 

Trunk/Server/Forum/MailSender/Views/Shared/_Layout.cshtml

@@ -20,10 +20,8 @@
                 @Html.ActionLink("E-mail", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
             </div>
             <div class="navbar-collapse collapse">
-                <ul class="nav navbar-nav">
+                <ul class="nav navbar-nar">
-                    <li>@Html.ActionLink("Strona Główna", "Index", "Home")</li>
+                    
-                    <li>@Html.ActionLink("O mnie", "About", "Home")</li>
-                    <li>@Html.ActionLink("Kontakt", "Contact", "Home")</li>
                 </ul>
             </div>
         </div>

Trunk/Server/Forum/MailSender/Web.config

@@ -10,6 +10,11 @@
   </configSections>
   <appSettings>
     <add key="webpages:Version" value="3.0.0.0" />
+    <add key="user-mail" value="ttestowy504@gmail.com" />
+    <add key="pass-mail" value="ChyzySoftware" />
+    <add key="smtp-port" value="587" />
+    <add key="smtp-server" value="smtp.gmail.com" />
+    <add key="forum-address" value="http://forum-inzynieria1.azurewebsites.net/home/index"/>
     <add key="webpages:Enabled" value="false" />
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />