Merge branch 'Frooodle:main' into main

src/main/resources/messages_ja_JP.properties

@@ -43,11 +43,11 @@ green=緑
 blue=青
 custom=カスタム...
 
-changedCredsMessage=Credentials changed!
+changedCredsMessage=資格情報が変更されました！
-notAuthenticatedMessage=User not authenticated.
+notAuthenticatedMessage=ユーザーが認証されていません。
-userNotFoundMessage=User not found.
+userNotFoundMessage=ユーザーが見つかりません。
-incorrectPasswordMessage=Current password is incorrect.
+incorrectPasswordMessage=現在のパスワードが正しくありません。
-usernameExistsMessage=New Username already exists.
+usernameExistsMessage=新しいユーザー名はすでに存在します。
 
 
 
@@ -77,14 +77,14 @@ settings.accountSettings=アカウント設定
 
 
 
-changeCreds.title=Change Credentials
+changeCreds.title=資格情報の変更
-changeCreds.header=Update Your Account Details
+changeCreds.header=アカウントの詳細を更新する
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changeUserAndPassword=デフォルトのログイン認証情報を使用しています。新しいパスワード (必要に応じてユーザー名も) を入力してください
-changeCreds.newUsername=New Username
+changeCreds.newUsername=新しいユーザー名
-changeCreds.oldPassword=Current Password
+changeCreds.oldPassword=現在のパスワード
-changeCreds.newPassword=New Password
+changeCreds.newPassword=新しいパスワード
-changeCreds.confirmNewPassword=Confirm New Password
+changeCreds.confirmNewPassword=新しいパスワードの確認
-changeCreds.submit=Submit Changes
+changeCreds.submit=変更を送信
 
 
 
@@ -119,18 +119,18 @@ adminUserSettings.role=役割
 adminUserSettings.actions=アクション
 adminUserSettings.apiUser=限定されたAPIユーザー
 adminUserSettings.webOnlyUser=ウェブ専用ユーザー
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.forceChange=ログイン時にユーザー名/パスワードを強制的に変更する
 adminUserSettings.submit=ユーザーの保存
 
 #############
 # HOME-PAGE #
 #############
 home.desc=PDFのあらゆるニーズに対応するローカルホスティングされた総合窓口です。
-home.searchBar=Search for features...
+home.searchBar=機能検索...
 
 
 home.viewPdf.title=View PDF
-home.viewPdf.desc=View, annotate, add text or images
+home.viewPdf.desc=表示、注釈、テキストや画像の追加
 viewPdf.tags=view,read,annotate,text,image
 
 home.multiTool.title=PDFマルチツール
@@ -497,7 +497,7 @@ scalePages.submit=送信
 
 #certSign
 certSign.title=証明書による署名
-certSign.header=証明書を使用してPDFに署名します。 (進行中)
+certSign.header=証明書を使用してPDFに署名します。 (制作中)
 certSign.selectPDF=署名するPDFファイルを選択:
 certSign.selectKey=秘密キーファイルを選択 (PKCS#8形式、.pemまたは.der) :
 certSign.selectCert=証明書ファイルを選択 (X.509形式、.pemまたは.der) :
@@ -622,8 +622,8 @@ addImage.submit=画像の追加
 #merge
 merge.title=結合
 merge.header=複数のPDFを結合 (2ファイル以上)
-merge.sortByName=Sort by name
+merge.sortByName=名前で並べ替え
-merge.sortByDate=Sort by date
+merge.sortByDate=日付で並べ替え
 merge.submit=結合
 
 
@@ -674,10 +674,10 @@ split.submit=分割
 imageToPDF.title=画像をPDFに変換
 imageToPDF.header=画像をPDFに変換
 imageToPDF.submit=変換
-imageToPDF.selectLabel=Image Fit Options
+imageToPDF.selectLabel=画像フィットオプション
-imageToPDF.fillPage=Fill Page
+imageToPDF.fillPage=フルページ
-imageToPDF.fitDocumentToImage=Fit Page to Image
+imageToPDF.fitDocumentToImage=ページを画像に合わせる
-imageToPDF.maintainAspectRatio=Maintain Aspect Ratios
+imageToPDF.maintainAspectRatio=アスペクト比を維持する
 imageToPDF.selectText.2=PDFの自動回転
 imageToPDF.selectText.3=マルチファイルの処理 (複数の画像を操作する場合に有効になります)
 imageToPDF.selectText.4=1つのPDFに結合

src/main/resources/static/css/home.css

@@ -1,15 +1,22 @@
-#searchBar { 
+#searchBar {
-	background-image: url('/images/search.svg'); 
+	background-image: url('/images/search.svg');
-	background-position: 16px 16px; 
+	background-position: 16px 16px;
-	background-repeat: no-repeat; 
+	background-repeat: no-repeat;
-	width: 100%; 
+	width: 100%;
-	font-size: 16px; 
+	font-size: 16px;
 	margin-bottom: 12px;
-	padding: 12px 20px 12px 40px; 
+	padding: 12px 20px 12px 40px;
 	border: 1px solid #ddd;
-	
+
-	
+
 }
+.dark-mode-search {
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' hei… 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z'/%3E%3C/svg%3E") !important;
+    color: #f8f9fa !important;
+    background-color: #212529 !important;
+    border-color: #343a40 !important;
+  }
+
 
 
 .features-container {
@@ -25,10 +32,10 @@
     display: flex;
     flex-direction: column;
     align-items: flex-start;
-    background: rgba(13, 110, 253, 0.05); 
+    background: rgba(13, 110, 253, 0.05);
     transition: transform 0.3s, border 0.3s;
     transform-origin: center center;
-    outline: 2px solid transparent; 
+    outline: 2px solid transparent;
 }
 
 .feature-card a {

src/main/resources/static/js/darkmode.js

@@ -1,90 +1,98 @@
-var toggleCount = 0;
+var toggleCount = 0
-var lastToggleTime = Date.now();
+var lastToggleTime = Date.now()
 
 var elements = {
-	lightModeStyles: null,
+  lightModeStyles: null,
-	darkModeStyles: null,
+  darkModeStyles: null,
-	rainbowModeStyles: null,
+  rainbowModeStyles: null,
-	darkModeIcon: null
+  darkModeIcon: null,
-};
+}
 
 function getElements() {
-	elements.lightModeStyles = document.getElementById("light-mode-styles");
+  elements.lightModeStyles = document.getElementById("light-mode-styles")
-	elements.darkModeStyles = document.getElementById("dark-mode-styles");
+  elements.darkModeStyles = document.getElementById("dark-mode-styles")
-	elements.rainbowModeStyles = document.getElementById("rainbow-mode-styles");
+  elements.rainbowModeStyles = document.getElementById("rainbow-mode-styles")
-	elements.darkModeIcon = document.getElementById("dark-mode-icon");
+  elements.darkModeIcon = document.getElementById("dark-mode-icon")
+  elements.searchBar = document.getElementById("searchBar")
+  elements.formControls = document.querySelectorAll(".form-control")
 }
 
 function setMode(mode) {
-	var event = new CustomEvent('modeChanged', { detail: mode });
+  var event = new CustomEvent("modeChanged", { detail: mode })
-    document.dispatchEvent(event);
+  document.dispatchEvent(event)
-	elements.lightModeStyles.disabled = mode !== "off";
+  elements.lightModeStyles.disabled = mode !== "off"
-	elements.darkModeStyles.disabled = mode !== "on";
+  elements.darkModeStyles.disabled = mode !== "on"
-	elements.rainbowModeStyles.disabled = mode !== "rainbow";
+  elements.rainbowModeStyles.disabled = mode !== "rainbow"
-	var jumbotron = document.getElementById('jumbotron');
+  var jumbotron = document.getElementById("jumbotron")
-	if (mode === "on") {
+  if (mode === "on") {
-        elements.darkModeIcon.src = "moon.svg";
+    elements.darkModeIcon.src = "moon.svg"
-        // Add the table-dark class to tables for dark mode
+    // Dark mode improvement
-        var tables = document.querySelectorAll('.table');
+    elements.searchBar.classList.add("dark-mode-search")
-        tables.forEach(table => {
+    elements.formControls.forEach(input => input.classList.add("bg-dark", "text-white"))
-            table.classList.add('table-dark');
+    // Add the table-dark class to tables for dark mode
-        });
+    var tables = document.querySelectorAll(".table")
-        if(jumbotron) {
+    tables.forEach(table => {
-        	jumbotron.classList.add('bg-dark');
+      table.classList.add("table-dark")
-        	jumbotron.classList.remove('bg-light');
+    })
-    	}
+    if (jumbotron) {
-    } else if (mode === "off") {
+      jumbotron.classList.add("bg-dark")
-        elements.darkModeIcon.src = "sun.svg";
+      jumbotron.classList.remove("bg-light")
-        // Remove the table-dark class for light mode
+    }
-        var tables = document.querySelectorAll('.table-dark');
+  } else if (mode === "off") {
-        tables.forEach(table => {
+    elements.darkModeIcon.src = "sun.svg"
-            table.classList.remove('table-dark');
+    // Dark Mode Improvement
-        });
+    elements.searchBar.classList.remove("dark-mode-search")
-        if(jumbotron){
+    elements.formControls.forEach(input => input.classList.remove("bg-dark", "text-white"))
-			console.log(mode)
+    // Remove the table-dark class for light mode
-         	jumbotron.classList.remove('bg-dark');
+    var tables = document.querySelectorAll(".table-dark")
-         	jumbotron.classList.add('bg-light');
+    tables.forEach(table => {
-     	}
+      table.classList.remove("table-dark")
-    } else if (mode === "rainbow") {
+    })
-		elements.darkModeIcon.src = "rainbow.svg";
+    if (jumbotron) {
-	}
+      console.log(mode)
+      jumbotron.classList.remove("bg-dark")
+      jumbotron.classList.add("bg-light")
+    }
+  } else if (mode === "rainbow") {
+    elements.darkModeIcon.src = "rainbow.svg"
+  }
 }
 
 function toggleDarkMode() {
-	var currentTime = Date.now();
+  var currentTime = Date.now()
-	if (currentTime - lastToggleTime < 1000) {
+  if (currentTime - lastToggleTime < 1000) {
-		toggleCount++;
+    toggleCount++
-	} else {
+  } else {
-		toggleCount = 1;
+    toggleCount = 1
-	}
+  }
-	lastToggleTime = currentTime;
+  lastToggleTime = currentTime
 
-	if (toggleCount >= 18) {
+  if (toggleCount >= 18) {
-		localStorage.setItem("dark-mode", "rainbow");
+    localStorage.setItem("dark-mode", "rainbow")
-		setMode("rainbow");
+    setMode("rainbow")
-	} else if (localStorage.getItem("dark-mode") == "on") {
+  } else if (localStorage.getItem("dark-mode") == "on") {
-		localStorage.setItem("dark-mode", "off");
+    localStorage.setItem("dark-mode", "off")
-		setMode("off");
+    setMode("off")
-	} else {
+  } else {
-		localStorage.setItem("dark-mode", "on");
+    localStorage.setItem("dark-mode", "on")
-		setMode("on");
+    setMode("on")
-	}
+  }
 }
 
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
-	getElements();
+  getElements()
 
-	var currentMode = localStorage.getItem("dark-mode");
+  var currentMode = localStorage.getItem("dark-mode")
-	if (currentMode === "on" || currentMode === "off" || currentMode === "rainbow") {
+  if (currentMode === "on" || currentMode === "off" || currentMode === "rainbow") {
-		setMode(currentMode);
+    setMode(currentMode)
-	} else if (window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches) {
+  } else if (window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches) {
-		setMode("on");
+    setMode("on")
-	} else {
+  } else {
-		setMode("off");
+    setMode("off")
-	}
+  }
-	
+
-	document.getElementById("dark-mode-toggle").addEventListener("click", function(event) {
+  document.getElementById("dark-mode-toggle").addEventListener("click", function (event) {
-		event.preventDefault();
+    event.preventDefault()
-		toggleDarkMode();
+    toggleDarkMode()
-	});
+  })
-});
+})