1

ZeroCatDev · Oct 28, 2023 · 0e7ac8d · 0e7ac8d
1 parent 056d7dc
commit 0e7ac8d
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 38 deletions.
diff --git a/.env.example b/.env.example
@@ -60,4 +60,8 @@ txcid=''
 txckey=''
 
 #前端静态文件地址，无法全部修改，请使用替换
-staticurl='https://registry.npmmirror.com/ourworldstaticfile/latest/files'
+staticurl='https://registry.npmmirror.com/ourworldstaticfile/latest/files'
+
+#附加代码
+#可以添加任何代码，如需要添加统计代码，请在此处添加
+includecode='<!-- 统计代码 -->'
diff --git a/build/ejs/404.ejs b/build/ejs/404.ejs
@@ -12,7 +12,7 @@
   <meta name="keyword" content="<%= process.env.slogan %>">
   <% include linkfile.ejs %>
 
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
  <% include hand.ejs %>

diff --git a/build/ejs/about.ejs b/build/ejs/about.ejs
@@ -12,7 +12,7 @@
 	<link rel="stylesheet" href="<%= process.env.staticurl %>/css/waline.css" />
 
 	<% include linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include hand.ejs %> <!-- Vertical Navbar --> <!-- Main content --> <!-- Header --> <!-- Main -->

diff --git a/build/ejs/admin/admin_index.ejs b/build/ejs/admin/admin_index.ejs
@@ -18,7 +18,7 @@
 
   <link rel="stylesheet" href="<%= process.env.staticurl %>/layui/css/layui.css">	
   <link id="layui_theme_css" rel="stylesheet" href="<%= process.env.staticurl %>/css/layui-theme-dark.css">
-</head>
+<%= process.env.includecode %></head>
 <body class="layui-layout-body">
 <div class="layui-layout layui-layout-admin">
   <!-- 头部区域 -->

diff --git a/build/ejs/asdm.ejs b/build/ejs/asdm.ejs
@@ -11,7 +11,7 @@
     <meta name="keyword" content="<%= process.env.slogan %>">
 
     <% include linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
     <% include hand.ejs %> <!-- Vertical Navbar --> <!-- Main content --> <!-- Header --> <!-- Main -->

diff --git a/build/ejs/comparer.ejs b/build/ejs/comparer.ejs
@@ -386,7 +386,7 @@
 		<meta name="viewport"
 			content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
 
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include hand.ejs %> <!-- Vertical Navbar --> <!-- Main content --> <!-- Header --> <!-- Main -->

diff --git a/build/ejs/error.ejs b/build/ejs/error.ejs
@@ -12,7 +12,7 @@
 	<link rel="stylesheet" href="<%= process.env.staticurl %>/css/waline.css" />
 
 	<% include linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include hand.ejs %> <!-- Vertical Navbar --> <!-- Main content --> <!-- Header --> <!-- Main -->

diff --git a/build/ejs/fankui.ejs b/build/ejs/fankui.ejs
@@ -12,7 +12,7 @@
 	<link rel="stylesheet" href="<%= process.env.staticurl %>/css/waline.css" />
 
 	<% include linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include hand.ejs %> <!-- Vertical Navbar --> <!-- Main content --> <!-- Header --> <!-- Main -->

diff --git a/build/ejs/home.ejs b/build/ejs/home.ejs
@@ -6,7 +6,7 @@
     <title>
         <%= process.env.siteneme %>分享页面
     </title> <link href="https://unpkg.com/@webpixels/[email protected]/dist/index.css" rel="stylesheet">
-</head>
+<%= process.env.includecode %></head>
 
 <body>
     <div>

diff --git a/build/ejs/index.ejs b/build/ejs/index.ejs
@@ -18,7 +18,7 @@
 	<link rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css">
 	<% include linkfile.ejs %>
 
-</head>
+<%= process.env.includecode %></head>
 
 
 

diff --git a/build/ejs/linkfile.ejs b/build/ejs/linkfile.ejs
@@ -1,7 +1,7 @@
 <link rel="stylesheet" href="https://npm.elemecdn.com/[email protected]/dist/css/mdui.min.css"/>
 <script src="https://npm.elemecdn.com/[email protected]/dist/js/mdui.min.js"></script>
 <script src="https://npm.elemecdn.com/[email protected]/dist/jquery.min.js"></script>
-<script async src="https://umami.192325.xyz/script.js" data-website-id="be8c7cd8-d471-4a0b-b5a7-819a6af35613"></script>
+
 <script> function automsg(msg) {
     mdui.snackbar({
  

diff --git a/build/ejs/login_or_register.ejs b/build/ejs/login_or_register.ejs
@@ -17,7 +17,7 @@
       <link rel="stylesheet" href="<%= process.env.staticurl %>/layui/css/layui.css">
       <link rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css">
       <% include linkfile.ejs %>
-    </head>
+    <%= process.env.includecode %></head>
 
     <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
       <% include hand.ejs %>

diff --git a/build/ejs/my_info.ejs b/build/ejs/my_info.ejs
@@ -6,12 +6,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	<title>个人中心 - <%= process.env.siteneme %>
 	</title>
-	<link rel="shortcut icon" href="<%= process.env.staticurl %>/img/icon.ico">
+	<link rel="shortcut icon" href="<%= process.env.staticurl %>/img/ownew.svg">
 	<meta name="description" content="<%= process.env.slogan %>">
 	<meta name="keyword" content="<%= process.env.slogan %>">
 	<link rel="stylesheet" type="text/css" href="<%= process.env.staticurl %>/layui/css/layui.css">
 	<% include linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include hand.ejs %>

diff --git a/build/ejs/python/my_python_projects.ejs b/build/ejs/python/my_python_projects.ejs
@@ -14,7 +14,7 @@
 	<link type="text/css" rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css" />
 
 	<% include ../linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include ../hand.ejs %>

diff --git a/build/ejs/python/python_edit.ejs b/build/ejs/python/python_edit.ejs
@@ -6,15 +6,15 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Python编程 - <%= process.env.siteneme %>
   </title>
-  <link rel="shortcut icon" href='<%= process.env.staticurl %>/img/icon.ico'>
+  <link rel="shortcut icon" href='<%= process.env.staticurl %>/img/ownew.svg'>
   <link rel="stylesheet" href="<%= process.env.staticurl %>/pythonstatic/bootstrap/css/bootstrap.min.css" />
   <link rel="stylesheet" href="<%= process.env.staticurl %>/layui/css/layui.css">
   <link rel="stylesheet" href="<%= process.env.staticurl %>/pythonstatic/css/CodeMirror.css" />
   <link rel="stylesheet" href='<%= process.env.staticurl %>/pythonstatic/css/style.css' />
   <link rel="stylesheet" href="<%= process.env.staticurl %>/pythonstatic/css/solarized.css" />
   <link type="text/css" rel="stylesheet" href="<%= process.env.staticurl %>/pythonstatic/showWorks.css" />
   <% include ../linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue">
   <script>
@@ -27,8 +27,7 @@
         (delete localStorage.darkTheme)
     );
   </script>
-  <script async src="https://umami.192325.xyz/script.js"
-    data-website-id="be8c7cd8-d471-4a0b-b5a7-819a6af35613"></script>
+
   <div>
     <div class="mdui-toolbar">
       <a class="mdui-btn mdui-btn-icon" id="toggle" href="/"><i class="mdui-icon material-icons">home</i></a>

diff --git a/build/ejs/python/python_play.ejs b/build/ejs/python/python_play.ejs
@@ -6,11 +6,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Python编程 - <%= process.env.siteneme %>
 	</title>
-	<link rel="shortcut icon" href='<%= process.env.staticurl %>/img/icon.ico'>
+	<link rel="shortcut icon" href='<%= process.env.staticurl %>/img/ownew.svg'>
 
 	<% include ../linkfile.ejs %>
 
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 
@@ -22,8 +22,7 @@
 
 
 
-		<script async src="https://umami.192325.xyz/script.js"
-			data-website-id="be8c7cd8-d471-4a0b-b5a7-819a6af35613"></script>
+
 
 		<div class="mdui-container" style="margin:40px auto">
 			<div>

diff --git a/build/ejs/python/python_projects.ejs b/build/ejs/python/python_projects.ejs
@@ -18,7 +18,7 @@
 	<link rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css">
 	<% include ../linkfile.ejs %>
 
-</head>
+<%= process.env.includecode %></head>
 
 
 
@@ -74,7 +74,7 @@
 		laypage.render({
 			elem: 'python_change_page'
 			, count: <%= python_count %>
-	, limit: 8
+	, limit: 16
 			, theme: '#448aff'
 			, jump: function (obj, first) {
 				$.ajax({
@@ -86,10 +86,15 @@
 							$("#python_projects").html("");
 							for (var i = 0; i < d.length; i++) {
 								tzzt=''
+								
 								if (d[i].state == 2) {
 
 									tzzt = '<i class="mdui-icon material-icons">stars</i>'
 								}
+								if (d[i].description == "") {
+
+									d[i].description = '暂无简介'
+}
 								$("#python_projects").append(`
 								<div class="mdui-col-md-3 mdui-col-sm-6 mdui-col-xs-12" style="margin:5px 0px 5px 0px;">
 <div class="">
@@ -99,7 +104,7 @@
             <div class="mdui-card-primary-title substr">${tzzt}${d[i].title}</div>
             <div class="mdui-card-primary-subtitle substr">${d[i].description}</div>
         </div>
-            <div class="mdui-card-header mdui-ripple" onclick='window.open('/user?id=${d[i].authorid},'_self')'>
+            <div class="mdui-card-header mdui-ripple" onclick='window.open("/user?id=${d[i].authorid}","_self")'>
                 <img class="mdui-card-header-avatar" src="<%= process.env.qiniuurl%>/user/${d[i].authorid}.png" />
                 <div class="mdui-card-header-title">${d[i].nickname}</div>
                 <div class="mdui-card-header-subtitle">${d[i].motto}</div>
@@ -142,6 +147,10 @@
 
 							tzzt = '<i class="mdui-icon material-icons">stars</i>'
 						}
+						if (d[i].description == "") {
+
+d[i].description = '暂无简介'
+}
 						$("#python_projects").append(`
 						<div class="mdui-col-md-3 mdui-col-sm-6 mdui-col-xs-12" style="margin:5px 0px 5px 0px;">
 <div class="">
@@ -151,7 +160,7 @@
             <div class="mdui-card-primary-title substr">${tzzt}${d[i].title}</div>
             <div class="mdui-card-primary-subtitle substr">${d[i].description}</div>
         </div>
-            <div class="mdui-card-header mdui-ripple" onclick='window.open('/user?id=${d[i].authorid},'_self')'>
+            <div class="mdui-card-header mdui-ripple" onclick='window.open("/user?id=${d[i].authorid}","_self")'>
                 <img class="mdui-card-header-avatar" src="<%= process.env.qiniuurl%>/user/${d[i].authorid}.png" />
                 <div class="mdui-card-header-title">${d[i].nickname}</div>
                 <div class="mdui-card-header-subtitle">${d[i].motto}</div>

diff --git a/build/ejs/repw.ejs b/build/ejs/repw.ejs
@@ -17,7 +17,7 @@
       <link rel="stylesheet" href="<%= process.env.staticurl %>/layui/css/layui.css">
       <link rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css">
       <% include linkfile.ejs %>
-    </head>
+    <%= process.env.includecode %></head>
 
     <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
       <% include hand.ejs %>

diff --git a/build/ejs/scratch/my_scratch_projects.ejs b/build/ejs/scratch/my_scratch_projects.ejs
@@ -14,7 +14,7 @@
 	<link type="text/css" rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css" />
 
 	<% include ../linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include ../hand.ejs %>

diff --git a/build/ejs/scratch/scratch_edit.ejs b/build/ejs/scratch/scratch_edit.ejs
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Scratch编程 - <%= process.env.siteneme %></title>
     <link rel="shortcut icon" href="<%= process.env.staticurl %>/img/ownew.svg"><% include ../linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body>
 

diff --git a/build/ejs/scratch/scratch_play.ejs b/build/ejs/scratch/scratch_play.ejs
@@ -21,7 +21,7 @@
 		integrity="sha512-ygEyjMC6rqnzJqWGjRTJUPYMEs9JUOm3i7OWUS9CgQ4XkBUvMsgCS1I8JqavidQ2ClHcREB7IbA2mN08+r9Elg=="
 		crossorigin="anonymous" referrerpolicy="no-referrer" />
 	<% include ../linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include ../hand.ejs %>
@@ -51,9 +51,9 @@
 						</div>
 					</div>
 					<div class="layui-row scratch-player-bottom">
-						<button id="greenFlag" class="mdui-btn mdui-color-theme-accent mdui-ripple"
+						<button id="greenFlag" class="mdui-btn mdui-color-theme-accent mdui-ripple md3botton"
 							onclick="greenFlag()" style="display: none;">开始</button>
-						<button id="stopAll" class="mdui-btn mdui-color-red mdui-ripple" onclick="stopAll()"
+						<button id="stopAll" class="mdui-btn mdui-color-red mdui-ripple md3botton" onclick="stopAll()"
 							style="display: none;">停止</button>
 					</div>
 				</div>

diff --git a/build/ejs/scratch/scratch_projects.ejs b/build/ejs/scratch/scratch_projects.ejs
@@ -18,7 +18,7 @@
 	<link rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css">
 	<% include ../linkfile.ejs %>
 
-</head>
+<%= process.env.includecode %></head>
 
 
 

diff --git a/build/ejs/share.ejs b/build/ejs/share.ejs
@@ -6,7 +6,7 @@
     <title>
         <%= process.env.siteneme %>分享页面
     </title>
-</head>
+<%= process.env.includecode %></head>
 
 <body><a href="https://owscr.link">
         <article class="movie-card"> <img src="<%= process.env.staticurl %>/img/owshare.png" alt="wallpaper" />

diff --git a/build/ejs/user.ejs b/build/ejs/user.ejs
@@ -15,7 +15,7 @@
 	<link type="text/css" rel="stylesheet" href="<%= process.env.staticurl %>/css/main.css" />
 	<link rel="stylesheet" href="<%= process.env.staticurl %>/css/waline.css" />
 	<% include linkfile.ejs %>
-</head>
+<%= process.env.includecode %></head>
 
 <body class="mdui-theme-primary-blue mdui-theme-accent-blue mdui-loaded mdui-appbar-with-toolbar">
 	<% include hand.ejs %>

diff --git a/build/ejs/waline_login.ejs b/build/ejs/waline_login.ejs
@@ -4,7 +4,7 @@
 <head>
      <title>登录认证 - <%= process.env.siteneme %>
      </title>
-</head>
+<%= process.env.includecode %></head>
 
 <body>
      <script> window.location.replace('/user/walinelogin') </script>

diff --git a/build/ejs/分组 4 (7).svg b/build/ejs/分组 4 (7).svg
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 <head>
     <link href="https://unpkg.com/@webpixels/[email protected]/dist/index.css" rel="stylesheet">
     <title>OurWorld</title>
-</head>
+<%= process.env.includecode %></head>
 
 <body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
         <title>
             <%= process.env.siteneme %>分享页面
         </title> <link href="https://unpkg.com/@webpixels/[email protected]/dist/index.css" rel="stylesheet">
-    </head>
+    <%= process.env.includecode %></head>
     <body>
         <div>
@@ Expand Down @@