close #30

mixcore · Nov 4, 2018 · b9f2399 · b9f2399
1 parent efb85a5
commit b9f2399
Show file tree

Hide file tree

Showing 26 changed files with 10,615 additions and 10,595 deletions.
diff --git a/dotnet-build-run.bat b/dotnet-build-run.bat
@@ -0,0 +1,5 @@
+cd src\Mix.Cms.Web\
+dotnet build
+gulp build
+dotnet run
+pause
diff --git a/src/Mix.Cms.Web/App_Start/Startup.Auth.cs b/src/Mix.Cms.Web/App_Start/Startup.Auth.cs
@@ -1,5 +1,5 @@
-// Licensed to the Mix I/O Foundation under one or more agreements.
-// The Mix I/O Foundation licenses this file to you under the GNU General Public License v3.0 license.
+// Licensed to the mixcore Foundation under one or more agreements.
+// The mixcore Foundation licenses this file to you under the GNU General Public License v3.0 license.
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Authentication.Cookies;

diff --git a/src/Mix.Cms.Web/App_Start/Startup.Route.cs b/src/Mix.Cms.Web/App_Start/Startup.Route.cs
@@ -1,5 +1,5 @@
-// Licensed to the Mix I/O Foundation under one or more agreements.
-// The Mix I/O Foundation licenses this file to you under the GNU General Public License v3.0 license.
+// Licensed to the mixcore Foundation under one or more agreements.
+// The mixcore Foundation licenses this file to you under the GNU General Public License v3.0 license.
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Builder;

diff --git a/src/Mix.Cms.Web/App_Start/Startup.SignalR.cs b/src/Mix.Cms.Web/App_Start/Startup.SignalR.cs
@@ -1,5 +1,5 @@
-// Licensed to the Mix I/O Foundation under one or more agreements.
-// The Mix I/O Foundation licenses this file to you under the GNU General Public License v3.0 license.
+// Licensed to the mixcore Foundation under one or more agreements.
+// The mixcore Foundation licenses this file to you under the GNU General Public License v3.0 license.
 // See the LICENSE file in the project root for more information.
 
 //using Messenger.Lib.SignalR.Hubs;

diff --git a/src/Mix.Cms.Web/Views/Home/Index.cshtml b/src/Mix.Cms.Web/Views/Home/Index.cshtml
@@ -70,15 +70,15 @@
     <script>window.jQuery || document.write('<script src="/js/jquery.min.js"><\/script>')</script>
 
      <script src="~/js/framework.min.js"></script>
-    <script src="~/js/bootstrap.min.js"></script>
-    <script src="~/js/shared.min.js"></script>
+    <!-- <script src="~/js/bootstrap.min.js"></script> -->
+    <!-- <script src="~/js/shared.min.js"></script> -->
 
     @Html.Raw(Model.View?.Scripts)
 
     <script src="~/js/app-client.min.js"></script>
     <script src="~/js/app-shared.min.js"></script>
 
-    <script src="~/app-client/shared/controllers/app-client-controller.js"></script>
+    <!-- <script src="~/app-client/shared/controllers/app-client-controller.js"></script> -->
 
     <!--     Fonts and icons     -->
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200|Open+Sans+Condensed:700" rel="stylesheet">

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default/Layouts/_Footer.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default/Layouts/_Footer.cshtml
@@ -39,7 +39,7 @@
             <script>
                 document.write(new Date().getFullYear())
             </script>, Build with love by
-            <a href="https://www.swastika.io" target="_blank">Mix I/O</a>.
+            <a href="https://www.swastika.io" target="_blank">mixcore</a>.
         </div>
     </div>
 </footer>
diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default/Layouts/_Top_Nav.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default/Layouts/_Top_Nav.cshtml
@@ -13,7 +13,7 @@
                 <span class="navbar-toggler-bar bar2"></span>
                 <span class="navbar-toggler-bar bar3"></span>
             </button>
-            <a class="navbar-brand" href="/@ViewBag.culture" title="Mix I/O">
+            <a class="navbar-brand" href="/@ViewBag.culture" title="mixcore">
                 <img class="logo-white" src="@(MixService.GetConfig<string>("Logo", ViewBag.culture))" width="32" 
                      title="@(MixService.GetConfig<string>("SiteName", ViewBag.culture as string))" 
                      alt="@(MixService.GetConfig<string>("SiteName", ViewBag.culture as string))" />

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/Home_Agentina.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/Home_Agentina.cshtml
@@ -11,8 +11,8 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-md-7 ml-auto text-right">
-                                <h1 class="title">Mix I/O Agentina</h1>
-                                <h4 class="description">Mix I/O is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
+                                <h1 class="title">mixcore Agentina</h1>
+                                <h4 class="description">mixcore is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
                                 <br />
 
                                 <div class="buttons">

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/Home_En_Us.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/Home_En_Us.cshtml
@@ -11,8 +11,8 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-md-7 ml-auto text-right">
-                                <h1 class="title">Mix I/O En Us</h1>
-                                <h4 class="description">Mix I/O is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
+                                <h1 class="title">mixcore En Us</h1>
+                                <h4 class="description">mixcore is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
                                 <br />
 
                                 <div class="buttons">

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/_Default.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/_Default.cshtml
@@ -20,7 +20,7 @@
                 <div class="row">
                     <div class="col-md-7 ml-auto text-right">
                         <h1 class="title" ng-bind="translate('fe_site_name')"></h1>
-                        <h4 class="description">Mix I/O is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
+                        <h4 class="description">mixcore is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
                         <br />
 
                         <div class="buttons">

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/_Home.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default/Pages/_Home.cshtml
@@ -12,7 +12,7 @@
                         <div class="row">
                             <div class="col-md-7 ml-auto text-right">
                                 <h1 class="title">Mix @(MixService.Translate<string>("input_output", ViewBag.culture as string))</string></h1>
-                                <h4 class="description">Mix I/O is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
+                                <h4 class="description">mixcore is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
                                 <br />
 
                                 <div class="buttons">

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Layouts/_Footer.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Layouts/_Footer.cshtml
@@ -39,7 +39,7 @@
             <script>
                 document.write(new Date().getFullYear())
             </script>, Build with love by
-            <a href="https://www.swastika.io" target="_blank">Mix I/O</a>.
+            <a href="https://www.swastika.io" target="_blank">mixcore</a>.
         </div>
     </div>
 </footer>
diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Layouts/_Top_Nav.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Layouts/_Top_Nav.cshtml
@@ -13,7 +13,7 @@
                 <span class="navbar-toggler-bar bar2"></span>
                 <span class="navbar-toggler-bar bar3"></span>
             </button>
-            <a class="navbar-brand" href="https://www.swastika.io" title="Mix I/O">
+            <a class="navbar-brand" href="https://www.swastika.io" title="mixcore">
                 <img class="logo-white" src="@(MixService.GetConfig<string>("Logo", ViewBag.culture as string))" width="32" 
                      title="@(MixService.GetConfig<string>("SiteName", ViewBag.culture as string))" 
                      alt="@(MixService.GetConfig<string>("SiteName", ViewBag.culture as string))" />

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Modules/Header_1.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Modules/Header_1.cshtml
@@ -7,8 +7,8 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-7 ml-auto text-right">
-                        <h1 class="title">Hello Mix I/O</h1>
-                        <h4 class="description">Mix I/O is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
+                        <h1 class="title">Hello mixcore</h1>
+                        <h4 class="description">mixcore is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
                         <br />
 
                         <div class="buttons">

diff --git a/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Pages/_Home.cshtml b/src/Mix.Cms.Web/Views/Shared/Templates/Default_Blank/Pages/_Home.cshtml
@@ -13,8 +13,8 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-md-7 ml-auto text-right">
-                                <h1 class="title">Mix I/O</h1>
-                                <h4 class="description">Mix I/O is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
+                                <h1 class="title">mixcore</h1>
+                                <h4 class="description">mixcore is a free, open source, community-focused Content Management System (CMS) built on the ASP.NET Core | Dotnet Core platform software you can use to create a beautiful website, blog, forum, or app.</h4>
                                 <br />
 
                                 <div class="buttons">

diff --git a/src/Mix.Cms.Web/Views/Shared/_LayoutInit_Angular.cshtml b/src/Mix.Cms.Web/Views/Shared/_LayoutInit_Angular.cshtml
@@ -8,7 +8,7 @@
     <link rel="apple-touch-icon" sizes="76x76" href="~/lib/now-ui-kit-pro-v1.2.2/assets/img/apple-icon.png">
     <link rel="icon" type="image/png" href="/css/portal/img/mixcore-logo-blue.png">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>@ViewData["Title"] - Mix I/O</title>
+    <title>@ViewData["Title"] - mixcore</title>
     <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />
     <!--     Fonts and icons     -->
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet" />
@@ -40,7 +40,7 @@
                     <script>
                         document.write(new Date().getFullYear())
                     </script>
-                    <a href="http://www.swastika.io" target="_blank">Mix I/O</a>.
+                    <a href="http://www.mixcore.org" target="_blank">mixcore</a>.
                 </div>
             </div>
         </footer>

diff --git a/src/Mix.Cms.Web/Views/Shared/_LayoutPortal_Angular.cshtml b/src/Mix.Cms.Web/Views/Shared/_LayoutPortal_Angular.cshtml
@@ -6,7 +6,7 @@
 <head>
     <base href="/portal">
 
-    <title>@ViewData["Title"] - Angular Mix I/O</title>
+    <title>@ViewData["Title"] - Angular mixcore</title>
     <!-- Required meta tags -->
     <meta charset="utf-8">
     <meta name="viewport" content="width=1920">

diff --git a/src/Mix.Cms.Web/bundleconfig.json b/src/Mix.Cms.Web/bundleconfig.json
@@ -2,7 +2,6 @@
   {
     "outputFileName": "wwwroot/js/framework.min.js",
     "inputFiles": [
-      "wwwroot/js/jquery/jquery.min.js",
       "wwwroot/js/angularjs/angular.min.js",
       "wwwroot/js/angularjs/angular-route.min.js",
       "wwwroot/js/angularjs/angular-animate.min.js",

diff --git a/src/Mix.Cms.Web/mixCmsSettings.json b/src/Mix.Cms.Web/mixCmsSettings.json
@@ -1,20 +1,39 @@
 {
   "ConnectionStrings": {
-    "MixAccountConnection": null,
-    "MixCmsConnection": null,
+    "MixAccountConnection": "Server=mi3-wsq2.a2hosting.com;Database=smilewa1_mixcore_test;UID=smilewa1_singuyen;Pwd=P@ssw0rd;MultipleActiveResultSets=true;",
+    "MixCmsConnection": "Server=mi3-wsq2.a2hosting.com;Database=smilewa1_mixcore_test;UID=smilewa1_singuyen;Pwd=P@ssw0rd;MultipleActiveResultSets=true;",
     "DefaultConnection": null
   },
   "Authentication": {
-    "ClockSkew": 10,
-    "CookieExpiration": 10,
-    "RefreshTokenExpiration": 1200,
+    "CookieExpiration": 100,
+    "RefreshTokenExpiration": 100,
     "TokenType": "Bearer",
     "Audience": "mix-core",
     "SecretKey": "mixcore-secret-key",
     "Issuer": "mix-core"
   },
   "Translator": {
-
+    "en-us": {
+      "fe_site_name": "Site name",
+      "language": "Languages",
+      "portal_articles": "Articles",
+      "portal_create": "Create",
+      "portal_cultures": "Cultures",
+      "portal_dashboard": "Dashboard",
+      "portal_file": "File",
+      "portal_import": "Import",
+      "portal_list": "List",
+      "portal_media": "Media",
+      "portal_modules": "Modules",
+      "portal_orders": "Orders",
+      "portal_pages": "Pages",
+      "portal_permissions": "Permissions",
+      "portal_products": "Products",
+      "portal_settings": "Settings",
+      "portal_themes": "Themes",
+      "portal_users": "Users",
+      "read_more": "Read more"
+    }
   },
   "LocalSettings": {
     "en-us": {
@@ -33,7 +52,7 @@
     }
   },
   "GlobalSettings": {
-    "IsInit": false,
+    "IsInit": "True",
     "DefaultCulture": "en-us",
     "DefaultTemplate": "_Default",
     "DefaultTheme": "Default",

diff --git a/src/Mix.Cms.Web/wwwroot/app-shared/components/header-nav/headerNav.html b/src/Mix.Cms.Web/wwwroot/app-shared/components/header-nav/headerNav.html
@@ -1,6 +1,6 @@
 <header class="navbar navbar-expand flex-column flex-md-row sw-navbar" ng-init="$ctrl.loadSettings()">
-    <a class="navbar-brand mr-0 mr-md-2" href="/{{$ctrl.settings.lang}}" target="_blank" aria-label="Mix I/O">
-        <img src="/css/portal/img/mixcore-logo-blue.png" alt="Mix I/O" width="35">
+    <a class="navbar-brand mr-0 mr-md-2" href="/{{$ctrl.settings.lang}}" target="_blank" aria-label="mixcore">
+        <img src="/css/portal/img/mixcore-logo-blue.png" alt="mixcore" width="35">
     </a>
 
     <span class="navbar-brand" ng-bind="$ctrl.getConfiguration('SiteName',false,'Mix')"></span>

diff --git a/src/Mix.Cms.Web/wwwroot/app/app-portal/components/main-side-bar/main-side-bar.html b/src/Mix.Cms.Web/wwwroot/app/app-portal/components/main-side-bar/main-side-bar.html
@@ -1,21 +1,21 @@
-<div id="sidebar" class="sw-sidebar" ng-init="$ctrl.init()">
-    <!--<portal-search />-->
-    <ul class="sw-links" id="sw-docs-nav" data-children=".sw-toc-item" style="">
-        <!-- DASHBOARD -->
-        <!--<li class="sw-toc-item mt-1 mb-1">
-            <a asp-area="Portal" asp-controller="Dashboard" asp-action="Index" class="sw-toc-link">
-                <i class="mi mi-Tiles mi-lg mi-fw"></i>
-                <span class="text">Dashboard</span>
-            </a>
-        </li>-->
-
-        <!-- ARTICLE -->
-        <li ng-repeat="item in $ctrl.items">
-            <main-side-bar-item item="item"></main-side-bar-item>
-        </li>
-        <li class="sw-toc-item mt-1 mb-1"></li>
-        <li class="sw-toc-item mt-1 mb-1"></li>
-    </ul>
-    <div class="sidebar-background" style=""></div>
-
+<div id="sidebar" class="sw-sidebar" ng-init="$ctrl.init()">
+    <!--<portal-search />-->
+    <ul class="sw-links" id="sw-docs-nav" data-children=".sw-toc-item" style="">
+        <!-- DASHBOARD -->
+        <!--<li class="sw-toc-item mt-1 mb-1">
+            <a asp-area="Portal" asp-controller="Dashboard" asp-action="Index" class="sw-toc-link">
+                <i class="mi mi-Tiles mi-lg mi-fw"></i>
+                <span class="text">Dashboard</span>
+            </a>
+        </li>-->
+
+        <!-- ARTICLE -->
+        <li ng-repeat="item in $ctrl.items">
+            <main-side-bar-item item="item"></main-side-bar-item>
+        </li>
+        <li class="sw-toc-item mt-1 mb-1"></li>
+        <li class="sw-toc-item mt-1 mb-1"></li>
+    </ul>
+    <div class="sidebar-background"></div>
+
 </div>