浏览代码

Updated login ui design

Toby Chui 1 年之前
父节点
当前提交
4b48c1bc52
共有 8 个文件被更改,包括 69 次插入16 次删除
  1. 1 1
      system/neuralnet/yolo.bat
  2. 11 3
      web/SystemAO/info/gomod-license.csv
  3. 二进制
      web/img/public/auth_bg.jpg
  4. 二进制
      web/img/public/auth_bg.psd
  5. 二进制
      web/img/public/auth_icon.png
  6. 二进制
      web/img/public/auth_icon.psd
  7. 二进制
      web/img/system/network-samba.png
  8. 57 12
      web/login.system

+ 1 - 1
system/neuralnet/yolo.bat

@@ -1 +1 @@
-darknet_windows_amd64.exe detect cfg/yolov3.cfg yolov3.weights a.jpg -out out.jpg
+darknet_windows_amd64.exe detect cfg/yolov3.cfg yolov3.weights a.jpg -out out.jpg

+ 11 - 3
web/SystemAO/info/gomod-license.csv

@@ -42,6 +42,8 @@ github.com/klauspost/compress/zstd/internal/xxhash,https://github.com/klauspost/
 github.com/klauspost/pgzip,https://github.com/klauspost/pgzip/blob/v1.2.6/LICENSE,MIT
 github.com/koron/go-ssdp,https://github.com/koron/go-ssdp/blob/v0.0.4/LICENSE,MIT
 github.com/kr/fs,https://github.com/kr/fs/blob/v0.1.0/LICENSE,BSD-3-Clause
+github.com/mattn/go-colorable,https://github.com/mattn/go-colorable/blob/v0.1.13/LICENSE,MIT
+github.com/mattn/go-isatty,https://github.com/mattn/go-isatty/blob/v0.0.20/LICENSE,MIT
 github.com/mholt/archiver/v3,https://github.com/mholt/archiver/blob/v3.5.1/LICENSE,MIT
 github.com/miekg/dns,https://github.com/miekg/dns/blob/v1.1.57/LICENSE,BSD-3-Clause
 github.com/nfnt/resize,https://github.com/nfnt/resize/blob/83c6a9932646/LICENSE,ISC
@@ -52,9 +54,11 @@ github.com/pierrec/lz4/v4,https://github.com/pierrec/lz4/blob/v4.1.19/LICENSE,BS
 github.com/pjbgf/sha1cd,https://github.com/pjbgf/sha1cd/blob/v0.3.0/LICENSE,Apache-2.0
 github.com/pkg/sftp,https://github.com/pkg/sftp/blob/v1.13.6/LICENSE,BSD-2-Clause
 github.com/robertkrimen/otto,https://github.com/robertkrimen/otto/blob/v0.3.0/LICENSE,MIT
+github.com/rs/zerolog,https://github.com/rs/zerolog/blob/v1.32.0/LICENSE,MIT
 github.com/satori/go.uuid,https://github.com/satori/go.uuid/blob/v1.2.0/LICENSE,MIT
 github.com/sergi/go-diff/diffmatchpatch,https://github.com/sergi/go-diff/blob/v1.3.1/LICENSE,MIT
 github.com/skeema/knownhosts,https://github.com/skeema/knownhosts/blob/v1.2.1/LICENSE,Apache-2.0
+github.com/smallfz/libnfs-go,https://github.com/smallfz/libnfs-go/blob/v0.0.5/LICENSE,MIT
 github.com/spf13/afero,https://github.com/spf13/afero/blob/v1.11.0/LICENSE.txt,Apache-2.0
 github.com/studio-b12/gowebdav,https://github.com/studio-b12/gowebdav/blob/v0.9.0/LICENSE,BSD-3-Clause
 github.com/ulikunitz/xz,https://github.com/ulikunitz/xz/blob/v0.5.11/LICENSE,BSD-3-Clause
@@ -63,12 +67,12 @@ github.com/xi2/xz,Unknown,Unknown
 gitlab.com/NebulousLabs/fastrand,https://gitlab.com/NebulousLabs/fastrand/blob/603482d69e40/LICENSE,MIT
 gitlab.com/NebulousLabs/go-upnp,https://gitlab.com/NebulousLabs/go-upnp/blob/11da932010b6/LICENSE,MIT
 gitlab.com/NebulousLabs/go-upnp/goupnp,https://gitlab.com/NebulousLabs/go-upnp/blob/11da932010b6/goupnp\LICENSE,BSD-2-Clause
-golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.17.0:LICENSE,BSD-3-Clause
+golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.21.0:LICENSE,BSD-3-Clause
 golang.org/x/image,https://cs.opensource.google/go/x/image/+/v0.15.0:LICENSE,BSD-3-Clause
-golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.19.0:LICENSE,BSD-3-Clause
+golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.23.0:LICENSE,BSD-3-Clause
 golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.15.0:LICENSE,BSD-3-Clause
 golang.org/x/sync/syncmap,https://cs.opensource.google/go/x/sync/+/v0.6.0:LICENSE,BSD-3-Clause
-golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.16.0:LICENSE,BSD-3-Clause
+golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.20.0:LICENSE,BSD-3-Clause
 golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.14.0:LICENSE,BSD-3-Clause
 gopkg.in/asn1-ber.v1,https://github.com/go-asn1-ber/asn1-ber/blob/f715ec2f112d/LICENSE,MIT
 gopkg.in/sourcemap.v1,https://github.com/go-sourcemap/sourcemap/blob/v1.0.5/LICENSE,BSD-2-Clause
@@ -96,13 +100,17 @@ imuslab.com/arozos/mod/console,Unknown,Unknown
 imuslab.com/arozos/mod/database,Unknown,Unknown
 imuslab.com/arozos/mod/disk/diskcapacity,Unknown,Unknown
 imuslab.com/arozos/mod/disk/diskcapacity/dftool,Unknown,Unknown
+imuslab.com/arozos/mod/disk/diskfs,Unknown,Unknown
 imuslab.com/arozos/mod/disk/diskmg,Unknown,Unknown
 imuslab.com/arozos/mod/disk/diskspace,Unknown,Unknown
+imuslab.com/arozos/mod/disk/raid,Unknown,Unknown
 imuslab.com/arozos/mod/disk/smart,Unknown,Unknown
 imuslab.com/arozos/mod/disk/sortfile,Unknown,Unknown
 imuslab.com/arozos/mod/fileservers,Unknown,Unknown
 imuslab.com/arozos/mod/fileservers/servers/dirserv,Unknown,Unknown
 imuslab.com/arozos/mod/fileservers/servers/ftpserv,Unknown,Unknown
+imuslab.com/arozos/mod/fileservers/servers/nfsserv,Unknown,Unknown
+imuslab.com/arozos/mod/fileservers/servers/samba,Unknown,Unknown
 imuslab.com/arozos/mod/fileservers/servers/sftpserv,Unknown,Unknown
 imuslab.com/arozos/mod/fileservers/servers/webdavserv,Unknown,Unknown
 imuslab.com/arozos/mod/filesystem,Unknown,Unknown

二进制
web/img/public/auth_bg.jpg


二进制
web/img/public/auth_bg.psd


二进制
web/img/public/auth_icon.png


二进制
web/img/public/auth_icon.psd


二进制
web/img/system/network-samba.png


+ 57 - 12
web/login.system

@@ -18,6 +18,13 @@
         }
     }
 
+    :root{
+        --main_theme_color: #5baf6d;
+        --secondary_theme_color: #4b7952;
+        --dimmer_theme_color: #125e1b;
+        --inverse_theme_color: #e0f1b3;
+    }
+
     .leftPictureFrame{
         position:fixed;
         top:0px;
@@ -40,12 +47,35 @@
         right:0;
         height:100%;
         width:500px;
-        background-color:white;
+        background:white;
         z-index:100%;
         padding-left: 30px;
         padding-right: 20px;
     }
 
+    @media (max-width: 600px) {
+        .rightLoginFrame{
+            width: 100%;
+        }
+    }
+    
+    @media (min-width: 600px) {
+        @supports (backdrop-filter: blur(10px)) {
+        /* This browser support backdrop filter */
+            .rightLoginFrame {
+                margin-top: 2em;
+                margin-right: 5em;
+                margin-left: 5em;
+                height:calc(100% - 4em);
+                border-radius: 1em;
+            }
+
+            .leftPictureFrame{
+                min-width:calc(100%);
+            }
+        }
+    }
+
     .fullHeightImage{
         height:100% !important;
         position:relative;
@@ -72,21 +102,31 @@
     }
 
     .themecolor{
-        background-color: #6eacfc !important;
+        background-color: var(--main_theme_color) !important;
         transition: background-color 0.1s;
     }
 
     .themecolor:hover{
-        background-color: #63a7ff !important;
+        background-color: var(--secondary_theme_color) !important;
     }
 
     .subthemecolor{
-        background-color: #6eacfc !important;
+        background-color: var(--secondary_theme_color) !important;
         transition: background-color 0.1s;
     }
 
     .subthemecolor:hover{
-        background-color: #61a6ff !important;
+        background-color: var(--dimmer_theme_color) !important;
+    }
+
+    .inversehighlight{
+        padding: 0.4em;
+        padding-top: 0.2em;
+        padding-bottom: 0.3em;
+        background-color: var(--dimmer_theme_color);
+        color: white;
+        border-radius: 0.4em;
+        margin-top: 0.4em;
     }
 
     .loginbtn{
@@ -124,7 +164,7 @@
             <img class="ui medium image" src="data:image/png;base64, {{service_logo}}">
 
             <div class="ui borderless basic segment">
-                <p><i class="key icon"></i> Sign in <span class="hostname">ArozOS</span> with your username and password</p>
+                <p>Sign in to <span class="hostname">ArozOS</span> with your username and password</p>
                 
                
                 
@@ -177,7 +217,7 @@
            
             <div class="bottombar">
                 © <a href="https://arozos.com">ArozOS</a> 2017 - <span class="thisyear"></span><br>
-                <small style="font-size: 80%">Request Time: <span id="requestTime"></span></small>
+                <small class="inversehighlight" style="font-size: 80%">Request Timestamp: <span id="requestTime"></span> | <span id="requestHostCommonName"></span></small>
             </div>
         </div>
         
@@ -210,14 +250,19 @@
         $(".oauthonly").hide();
         
         $(document).ready(function(){
+            function zeroPad(num) {
+                return num < 10 ? '0' + num : num;
+            }
+
             var currentdate = new Date(); 
-            var datetime = currentdate.getDate() + "/"
-                + (currentdate.getMonth()+1)  + "/" 
+            var datetime = zeroPad(currentdate.getDate()) + "/"
+                + zeroPad(currentdate.getMonth() + 1) + "/" 
                 + currentdate.getFullYear() + " "  
-                + currentdate.getHours() + ":"  
-                + currentdate.getMinutes() + ":" 
-                + currentdate.getSeconds();
+                + zeroPad(currentdate.getHours()) + ":"  
+                + zeroPad(currentdate.getMinutes()) + ":" 
+                + zeroPad(currentdate.getSeconds());
             $("#requestTime").text(datetime);
+            $("#requestHostCommonName").text(location.hostname);
             $(".ui.checkbox").checkbox();
             //Check if the user already logged in
             $.get("system/auth/checkLogin",function(data){