Browse Source

1st update

ganahrhr 3 năm trước cách đây
mục cha
commit
72db3d4106
7 tập tin đã thay đổi với 83 bổ sung236 xóa
  1. 4 3
      Pages/Desktop.razor
  2. 17 0
      Pages/Desktop.razor.cs
  3. 21 21
      Pages/Index.razor
  4. 0 44
      Pages/Verifying.razor
  5. 0 30
      Pages/Verifying.razor.cs
  6. 4 5
      Shared/MainLayout.razor
  7. 37 133
      Shared/Sidebar.razor

+ 4 - 3
Pages/Desktop.razor

@@ -219,9 +219,10 @@
         </div>
         <div class="third-block__info">
             <ul class="third-block__info__ul">
-                <li class="third-block__info__li">№3943 | Название материала | Dh001</li>
-                <li class="third-block__info__li">№3943 | Название материала | Dh001</li>
-                <li class="third-block__info__li">№3943 | Название материала | Dh001</li>
+                @foreach (var articleModel in AppData.Articles)
+                {
+                <li class="third-block__info__li">@(counter++) | <a href="@($"/docedit/{articleModel.Key}")">@articleModel.Value.Name</a></li>
+                }
             </ul>
         </div>
     </div>

+ 17 - 0
Pages/Desktop.razor.cs

@@ -1,13 +1,30 @@
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace HyperCube.Pages
 {
     public partial class Desktop : ComponentBase
     {
+        private int counter = 1;
 
+        protected override async Task OnInitializedAsync()
+        {
+            /// refreshing articles
+            await AppData.LoadArticles();
+        }
+
+        private static string GetDisplayName(Enum enumValue)
+        {
+            return enumValue.GetType()
+                            .GetMember(enumValue.ToString())
+                            .First()
+                            .GetCustomAttribute<DisplayAttribute>()
+                            .GetName();
+        }
     }
 }

+ 21 - 21
Pages/Index.razor

@@ -2,33 +2,33 @@
 @page "/"
 
 @inject NavigationManager NavigationManager
-
-<AuthorizeView>
-    <Authorized>
-        <a href="desktop" class="nav__link">Рабочий стол</a>
-    </Authorized>
-    <NotAuthorized>
-        <a href="Identity/Account/Login" class="nav__link">Логин</a>        
-    </NotAuthorized>
-</AuthorizeView>
+@using Microsoft.AspNetCore.Identity;
+@inject AuthenticationStateProvider AuthenticationStateProvider
+@inject UserManager<IdentityUser> UserManager
+
+@*<AuthorizeView>
+        <Authorized>
+            <div class="blocks">
+                <a href="desktop" class="nav__link">Рабочий стол</a>
+            </div>
+        </Authorized>
+        <NotAuthorized>
+            <a href="Identity/Account/Login" class="nav__link">Логин</a>
+        </NotAuthorized>
+    </AuthorizeView>*@
 
 
 @code{
 
-    //string email, pass;
-
-    async Task Login()
+    protected override async Task OnInitializedAsync()
     {
-        /// redirecting to asp login page
-        NavigationManager.NavigateTo("Identity/Account/Login", true);
-
-        //var result = await SignInManager.PasswordSignInAsync(email, pass, false, lockoutOnFailure: false);
-        //if (result.Succeeded)
-        //{
-        //    Console.WriteLine("User logged in.");
 
-        //    /// redirecting to asp login page
-        //    NavigationManager.NavigateTo("Identity/Account/Login", true);
+        var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+        var user = authState.User;
 
+        if (user.Identity.IsAuthenticated)
+            NavigationManager.NavigateTo("desktop");
+        else
+            NavigationManager.NavigateTo("Identity/Account/Login", true);
     }
 }

+ 0 - 44
Pages/Verifying.razor

@@ -1,44 +0,0 @@
-@page "/verifying"
-
-@attribute [Authorize]
-
-<div class="tabs__content">
-    <div class="tabs__controls">
-        <a href="DocEdit" class="tabs__btn">Загрузка материалов</a>
-        <a href="Verifying" class="tabs__btn tabs__btn_active">Верификация</a>
-        <a class="tabs__btn">Библиотеки</a>
-        <a class="tabs__btn">Заказы</a>
-    </div>
-    <div class="upload">
-        <h2 class="upload__title">Аккаунт - Квалификация</h2>
-    </div>
-    <table class="table">
-        <thead>
-            <tr>
-                <th>№</th>
-                @*<th>Файл</th>*@
-                <th>Название</th>
-                <th>Дата издания</th>
-                @*<th>Авторы</th>*@
-                <th>Инициатор</th>
-                <th>Верификатор</th>
-                <th>Статус</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var articleModel in AppData.Articles)
-            {
-                <tr>
-                    <td>@(counter++)</td>
-                    @*<td>@articleModel.Value.Filename</td>*@
-                    <td><a href="@($"/docedit/{articleModel.Key}")">@articleModel.Value.Name</a></td>
-                    <td>@articleModel.Value.PublishDate.ToString("d")</td>
-                    @*<td>@articleModel.Value.Authors</td>*@
-                    <td><center> - </center></td>
-                    <td><center> - </center></td>
-                    <td>@GetDisplayName(articleModel.Value.Status)</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-</div>

+ 0 - 30
Pages/Verifying.razor.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-
-namespace HyperCube.Pages
-{
-    public partial class Verifying : ComponentBase
-    {
-        private int counter = 1;
-
-        protected override async Task OnInitializedAsync()
-        {
-            /// refreshing articles
-            await AppData.LoadArticles();
-        }
-
-        private static string GetDisplayName(Enum enumValue)
-        {
-            return enumValue.GetType()
-                            .GetMember(enumValue.ToString())
-                            .First()
-                            .GetCustomAttribute<DisplayAttribute>()
-                            .GetName();
-        }
-    }
-}

+ 4 - 5
Shared/MainLayout.razor

@@ -1,16 +1,15 @@
 @inherits LayoutComponentBase
-
 <AuthorizeView>
     <Authorized>
         <div class="wrap">
             <Sidebar />
             <div class="main-content">
                 @Body
-            </div>
-            @*<Footer />*@
-        </div>        
+                <Footer />
+            </div>    
+        </div>
     </Authorized>
     <NotAuthorized>
         @Body
     </NotAuthorized>
-</AuthorizeView>
+</AuthorizeView>

+ 37 - 133
Shared/Sidebar.razor

@@ -1,137 +1,41 @@
 @attribute [Authorize]
 
-<sidebar class="profile-info">
-    <AuthorizeView>
-        <Authorized>
-            <nav class="nav">
-                <div class="top-href">
-                    <div class="top-href__logo">
-                        <img src="img/logo.svg" alt="">
-                    </div>
-                    <a href="" title="Личные данные" class='js-open-modal' data-modal="profile-modal">
-                        <img src="img/user.svg" alt="">
-                    </a>
-                </div>
-                <div class="middle-href">
-                    <a href="" title="Файлы" class='js-open-modal' data-modal="files-modal">
-                        <img src="img/files.svg" alt="">
-                    </a>
-                    <a href="" title="Компетенции" class='js-open-modal' data-modal="competence-modal">
-                        <img src="img/competence.svg" alt="">
-                    </a>
-                    <a href="" title="Рейтинги" class='js-open-modal' data-modal="raiting-modal">
-                        <img src="img/raiting.svg" alt="">
-                    </a>
-                    <a href="" title="Правила системы" class='js-open-modal' data-modal="rules-modal">
-                        <img src="img/rules.svg" alt="">
-                    </a>
-                    <a href="" title="Цифровые активы" class='js-open-modal' data-modal="activites-modal">
-                        <img src="img/packet.svg" alt="">
-                    </a>
-                </div>
-                <div class="bottom-href">
-                    <a href="" title="Настройки" class='js-open-modal' data-modal="qual-modal">
-                        <img src="img/options.svg" alt="">
-                    </a>
-                    <a href="" title="Выйти" class='js-open-modal' data-modal="404-modal">
-                        <img src="img/enter.svg" alt="">
-                    </a>
-                </div>
-            </nav>
-            <footer>
-                <img src="img/logo_footer.svg" alt="" class="footer__logo">
-            </footer>
-
-            <div class="modal" data-modal="activites-modal">
-                <div class="modal-container">
-                    <div class="modal__body">
-                        <div class="modal__body__header">
-                            <div class="modal__body__header__info">
-                                <img src="img/packet.svg" alt="">
-                                <p>Цифровые активы</p>
-                            </div>
-                            <div class="modal__body__header__href">
-                                <a href="">Balans</a>
-                                <a href="">Swap</a>
-                                <a href="">Liquidity</a>
-                            </div>
-                        </div>
-                        <div class="modal__body__container">
-                            <div class="modal__body__container__left">
-                                <div class="modal__body__calc__balance__header">
-                                    <p>БАЛАНС</p>
-                                    <button class="btn_orange">История</button>
-                                </div>
-                                <div class="modal__body__calc__balance__numbers">
-                                    <div class="modal__body__calc__balance__numbers__name">
-                                        <p>Системы</p>
-                                    </div>
-                                    <div class="modal__body__calc__balance__numbers__value">
-                                        <div class="modal__body__calc__balance__numbers__value__item">
-                                            <p>100.890110</p>
-                                            <p>ETH</p>
-
-                                        </div>
-                                        <div class="modal__body__calc__balance__numbers__value__item">
-                                            <p>1000.89011</p>
-                                            <p>2DH</p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="modal__body__calc__balance__numbers">
-                                    <div class="modal__body__calc__balance__numbers__name">
-                                        <p>Ваше</p>
-                                    </div>
-                                    <div class="modal__body__calc__balance__numbers__value">
-                                        <div class="modal__body__calc__balance__numbers__value__item">
-                                            <p>100.890110</p>
-                                            <p>ETH</p>
-
-                                        </div>
-                                        <div class="modal__body__calc__balance__numbers__value__item">
-                                            <p>1000.89011</p>
-                                            <p>2DH</p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="modal__body__calc__balance__button">
-                                    <button class="btn_orange btn_center">Депозиты</button>
-                                    <button class="btn_orange btn_center">Вывод</button>
-                                </div>
-                            </div>
-                            <div class="modal__body__container__right">
-                                <p class="modal__body__calc__change__header">Обмен</p>
-                                <p class="modal__body__calc__change__desc">Trade tokens in an istant</p>
-                                <div class="modal__input__box" place="From" balanc='0.00000410' currency='ETH'>
-                                    <input type="text" class="modal__input">
-                                    <select type="select" class="modal__select">
-                                        <option>ETH</option>
-                                        <option>2DH</option>
-                                    </select>
-                                </div>
-                                <div class="modal__input__box" place="To" balanc='0.00000410' currency='2DH'>
-                                    <input type="text" class="modal__input">
-                                    <select type="select" class="modal__select">
-                                        <option>2DH</option>
-                                        <option>ETH</option>
-                                    </select>
-                                </div>
-                                <div class="modal__input__total">
-                                    <p>Price</p>
-                                    <div class="modal_input_total_value">
-                                        <p>1.000000050</p>
-                                        <p>2DH</p>
-                                    </div>
-                                </div>
-                                <div class="modal__input__button">
-                                    <button class="btn_orange btn_center">ОК</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <a class="modal_close" href="#">&#10006;</a>
+<AuthorizeView>
+    <Authorized>
+        <nav class="nav">
+            <div class="top-href">
+                <div class="top-href__logo">
+                    <img src="img/logo.svg" alt="">
                 </div>
+                <a href="" title="Личные данные" class='js-open-modal' data-modal="profile-modal">
+                    <img src="img/user.svg" alt="">
+                </a>
+            </div>
+            <div class="middle-href">
+                <a href="" title="Файлы" class='js-open-modal' data-modal="files-modal">
+                    <img src="img/files.svg" alt="">
+                </a>
+                <a href="" title="Компетенции" class='js-open-modal' data-modal="competence-modal">
+                    <img src="img/competence.svg" alt="">
+                </a>
+                <a href="" title="Рейтинги" class='js-open-modal' data-modal="raiting-modal">
+                    <img src="img/raiting.svg" alt="">
+                </a>
+                <a href="" title="Правила системы" class='js-open-modal' data-modal="rules-modal">
+                    <img src="img/rules.svg" alt="">
+                </a>
+                <a href="" title="Цифровые активы" class='js-open-modal' data-modal="activites-modal">
+                    <img src="img/packet.svg" alt="">
+                </a>
+            </div>
+            <div class="bottom-href">
+                <a href="" title="Настройки" class='js-open-modal' data-modal="qual-modal">
+                    <img src="img/options.svg" alt="">
+                </a>
+                <a href="" title="Выйти" class='js-open-modal' data-modal="404-modal">
+                    <img src="img/enter.svg" alt="">
+                </a>
             </div>
-        </Authorized>
-    </AuthorizeView>
-</sidebar>
+        </nav>
+    </Authorized>
+</AuthorizeView>