Merge pull request #26 from CodeforcesContestHelper/dev

Optimize fetcher & Bug fix
CodeforcesContestHelper · Nov 7, 2021 · fa836aa · fa836aa
2 parents f922dbb + b6cf5ea
commit fa836aa
Show file tree

Hide file tree

Showing 15 changed files with 936 additions and 173 deletions.
diff --git a/css/client.css b/css/client.css
@@ -820,16 +820,25 @@ pre{
 	cursor: pointer;
 }
 
-
-
-
-
-
-
-
-
-
-
+/* MULTI */
+.multiInfoDisplayer{
+	width: 100%;
+	height: 100%;
+	flex: 1;
+	position: relative;
+	overflow: auto;
+}
+.multiSettingsBar{
+	height: 100px;
+	width: 100%;
+}
+.multiInfoTable{
+	width: 100%;
+	max-height: 100%;
+}
+.multiInfoThead{
+	display: table-header-group;
+}
 
 /* SETTINGS */
 .settingPage{
@@ -843,7 +852,7 @@ pre{
 	font-weight: bold;
 	font-size: 28px;
 	margin-bottom: 15px;
-	margin-top: 5px;
+	margin-top: 30px;
 }
 .settingsUI{
 	margin: 20px 0px !important;
@@ -974,7 +983,7 @@ pre{
 }
 
 
-
+/* SEARCH */
 
 .searchPage{
 	padding: 10px 0px;
@@ -1059,6 +1068,9 @@ pre{
 	margin: 3px 10px 3px 0px;
 	font-size: 18px;
 }
+
+/* CONTEST */
+
 .contestInfoCard{
 	display: flex;
 	flex-direction: column;
@@ -1116,6 +1128,7 @@ pre{
 	font-size: 16px;
 }
 .contestCardTime{
+	margin-top: 5px;
 	font-size: 16px;
 }
 .contestCardTimeRunningType{

diff --git a/css/dark.css b/css/dark.css
@@ -135,7 +135,9 @@ body{
 .highlightedContestList{
     background: #444;
 }
-
+.multiSettingsBar{
+    background: rgb(46, 51, 56);
+}
 
 
 

diff --git a/css/default.css b/css/default.css
@@ -138,7 +138,9 @@ body{
 .highlightedContestList{
     background: #ccc;
 }
-
+.multiSettingsBar{
+    background: #ccc;
+}
 
 
 

diff --git a/css/problem/client.css b/css/problem/client.css
@@ -221,9 +221,9 @@ body{
 }
 .bigButton{
 	cursor: pointer;
-	width: calc(100% - 20px);
-	margin: 10px;
-	height: 30px;
+	width: 100%;
+	margin: 10px 0px;
+	height: 40px;
 	border-radius: 5px;
 	font-size: 16px;
 	font-family: var(--font-family);
@@ -240,7 +240,7 @@ body{
 	border-radius: 5px;
 }
 .submitInterfaceTitle{
-	font-size: 18px;
+	font-size: 16px;
 }
 .closeSubmitPage{
 	position: absolute;
@@ -273,6 +273,7 @@ select{
     margin-right: 10px;
 }
 .addProblemInterface{
+	user-select: none;
 	border-radius: 5px;
 }
 .inputButtonSplitter{
@@ -318,7 +319,9 @@ select{
 	outline: 0;
 }
 
-
+.problemTag{
+	user-select: none;
+}
 .problemTag > i{
 	margin-right: 10px;
 }
@@ -487,6 +490,7 @@ ul, ol{
 	display: inline-block;
 }
 .watchDisplayer{
+	user-select: none;
 	z-index: 98;
 	width: 370px !important;
 	position: absolute;
@@ -495,6 +499,7 @@ ul, ol{
 	text-align: center;
 }
 .singleWatchContent{
+	user-select: none;
 	transition: 0.2s;
 	padding: 0px 10px;
 	margin: 10px 0px;
@@ -506,6 +511,7 @@ ul, ol{
 	flex-direction: column;
 }
 .singleWatchTitle{
+	user-select: none;
 	font-size: 16px;
 	text-align: center;
 }

diff --git a/index.html b/index.html
@@ -9,6 +9,7 @@
 		<link class="ThemeTypeIf" rel="stylesheet" href="./css/default.css">
 		<link rel="stylesheet" href="./css/all.min.css">
 		<script src="./js/highlight.min.js"></script>
+		<script src="./js/sha512.js"></script>
 		<script src="./js/highlightjs-line-numbers.js"></script>
 		<script src="./KaTeX/katex.min.js"></script>
 		<script src="./KaTeX/auto-render.min.js"></script>
@@ -346,8 +347,22 @@
 						</div>
 					</div>
 					<div class="contentWrapper multiContent">
-						<div class="contentRowInfo">
-
+						<div class="contentRowInfo"><div class="contentPage">
+							<div style="width: 100%; height: 100%; display: flex; flex-direction: column; overflow: hidden">
+								<div class="multiInfoDisplayer">
+									<table class="multiInfoTable">
+										<thead class="multiInfoThead">
+
+										</thead>
+										<tbody class="multiInfoTbody">
+
+										</tbody>
+									</table>
+								</div>
+								<div class="multiSettingsBar">
+
+								</div>
+							</div></div>
 						</div>
 					</div>
 					<div class="contentWrapper contestContent">
@@ -483,7 +498,7 @@
 							<div class="contentPage">
 								<div class="settingPage"> <div style="margin: 20px 0px">
 									<div class="settingsHeader" info="settingsAccount"></div>
-									<div class="settingsSelectInfoAddition settingsLoginType">...</div>
+									<div class="settingsSelectInfoAddition" style="position: relative"><span class="settingsLoginType"></span><span info="redirectVerification" style="float: right; cursor: pointer" onclick="openCodeforcesPage()"></span></div>
 									<div class="settingsUI settingsInput" for="accountHandleOrEmail">
 										<div class="settingsInputInfo">
 											<div class="settingsInputInfoMain">Radio Name</div>
@@ -503,6 +518,34 @@
 										</div>
 									</div>
 									<div class="settingsSelectInfoAddition settingsLoginButton"><span info='settingsLoginButton' onclick="submitLogin()"></span></div>
+									<div class="settingsUI settingsRadio" for="useApiKeys">
+										<div class="settingsRadioInfo">
+											<div class="settingsRadioInfoMain">Radio Name</div>
+											<div class="settingsRadioInfoAddition">Radio Addition</div>
+										</div>
+										<div class="settingsRadioButton">
+											<i class="far fa-square"></i>
+											<i class="fas fa-check-square"></i>
+										</div>
+									</div>
+									<div class="settingsUI settingsInput" for="apiKey">
+										<div class="settingsInputInfo">
+											<div class="settingsInputInfoMain">Radio Name</div>
+											<div class="settingsInputInfoAddition">Radio Addition</div>
+										</div>
+										<div class="settingsInputPart">
+											<input class="settingsInputPartContent" type="password"></input>
+										</div>
+									</div>
+									<div class="settingsUI settingsInput" for="apiSecret">
+										<div class="settingsInputInfo">
+											<div class="settingsInputInfoMain">Radio Name</div>
+											<div class="settingsInputInfoAddition">Radio Addition</div>
+										</div>
+										<div class="settingsInputPart">
+											<input class="settingsInputPartContent" type="password"></input>
+										</div>
+									</div>
 									<div class="settingsHeader" info="settingsPreference"></div>
 									<div class="settingsUI settingsSelect" for="styleSelection">
 										<div class="settingsSelectInfo">
@@ -751,7 +794,7 @@
 										</div>
 									</div>
 									<div class="settingsSelectInfoAddition settingsReloadLanguages"><span info='reloadLanguages' onclick="reloadLanguages()"></span></div>
-									<div style="text-align: center; margin-top: 30px" class="settingsOpenProblems"><span info='openProblems' onclick="openProblemWin([])"></span></div>
+									<div style="text-align: center; margin-top: 30px"><span class="settingsOpenProblems"><span info='openProblems' onclick="openProblemWin([])"></span></span></div>
 									<!-- <div class="settingsUI settingsRadio" for="testRadio">
 										<div class="settingsRadioInfo">
 											<div class="settingsRadioInfoMain">Radio Name</div>

diff --git a/js/authorize.js b/js/authorize.js
@@ -1,6 +1,9 @@
 var loginTypeLoader = null;
+var CodeforcesUserAPIKey, CodeforcesUserAPISeg;
+
 function loadLoginType(){
 	currentLoginHandle = "";
+	if(problemNewWinLoaded)	initProblemNewWin();
 	getSolvedProblemsByContest = {problemCountsByContestId: {}, solvedProblemCountsByContestId: {}};
 	$(".settingsLoginType").html(`<span info='settingsLoadingLoginType'>${languageOption.general.settingsLoadingLoginType}</span>`);
 	if(loginTypeLoader != null)
@@ -38,6 +41,10 @@ function getFtaa(){
 	return ret;
 }
 function submitLogout(cb){
+	if(currentLoginHandle == ""){
+		cb();
+		return;
+	}
 	$.ajax({
 		url: settings.mainURL,
 		success: function(data){
@@ -72,7 +79,15 @@ function submitLogin(){
 	submitLogout(function(){$.ajax({
 		url: settings.mainURL,
 		success: function(data){
-			var csrf = queryCsrf.exec(data)[1];
+			var csrf = queryCsrf.exec(data);
+			if(csrf == null){
+				$(".settingsLoginButton").html(`<span info='errorCsrfLoadFailed'>${languageOption.error.errorCsrfLoadFailed}</span>`);
+				setTimeout(function(){
+					$(".settingsLoginButton").html(`<span info='settingsLoginButton' onclick="submitLogin()">${languageOption.general.settingsLoginButton}</span>`);
+				}, 2000)
+				return;
+			}
+			csrf = csrf[1];
 			$.ajax({
 				url: settings.mainURL + '/enter?back=%2F&locale=en',
 				type: "POST",
@@ -127,7 +142,12 @@ function submitSolution(ci, idx, code, lang, S, E){
 	$.ajax({
 		url: settings.mainURL,
 		success: function(data){
-			var csrf = queryCsrf.exec(data)[1];
+			var csrf = queryCsrf.exec(data);
+			if(csrf == null){
+				E('errorCsrfLoadFailed', languageOption.error.errorCsrfLoadFailed);
+				return;
+			}
+			csrf = csrf[1];
 			$.ajax({
 				url: settings.mainURL + `/${ci >= 100000 ? "gym" : "contest"}/` + ci + '/submit',
 				type: "POST",
@@ -216,7 +236,12 @@ function loadContestPassedStatus(S, E){
 	$.ajax({
 		url: settings.mainURL + '/contests',
 		success: function(data){
-			var csrf = queryCsrf.exec(data)[1];
+			var csrf = queryCsrf.exec(data);
+			if(csrf == null){
+				E();
+				return;
+			}
+			csrf = csrf[1];
 			$.ajax({
 				url: settings.mainURL + '/data/contests',
 				type: "POST",
@@ -267,7 +292,12 @@ function registerContest(ci, S, E){
 	$.ajax({
 		url: settings.mainURL,
 		success: function(data){
-			var csrf = queryCsrf.exec(data)[1];
+			var csrf = queryCsrf.exec(data);
+			if(csrf == null){
+				E();
+				return;
+			}
+			csrf = csrf[1];
 			$.ajax({
 				url: settings.mainURL + '/contestRegistration/' + ci,
 				type: "POST",
@@ -303,5 +333,46 @@ function registerContest(ci, S, E){
 	});
 }
 
+function generateAuthorizeURL(url, data){
+	function parseObject(x){
+		var ret = [];
+		for(var v in x)
+			if(x.hasOwnProperty(v))
+				ret.push([v, x[v]]);
+		return ret.sort();
+	}
+	function generateParams(x){
+		var ret = "";
+		for(var i=0; i<x.length; i++){
+			if(i == 0)
+				ret += '?';
+			else
+				ret += "&";
+			ret += (x[i][0] + '=' + x[i][1]);
+		}
+		return ret;
+	}
+	if(!settings.useApiKeys)
+		return url + generateParams(parseObject(data));
+	var method = url.split("/");
+	method = method[method.length - 1];
+	data.time = Math.floor((new Date()).getTime() / 1000);
+	data.apiKey = settings.apiKey;
+	data = parseObject(data);
+	var rnd = "";
+	var str = "0123456789qwertyuiopasdfghjklzxcvbnm";
+	for(var j=0; j<6; j++)
+		rnd += str[Math.floor(Math.random()*str.length)];
+	var shaCode = rnd + '/' + method + generateParams(data) + '#' + settings.apiSecret;
+	shaCode = hex_sha512(shaCode);
+	data.push(["apiSig", rnd + shaCode]);
+	return url + generateParams(data);
+}
+function openCodeforcesPage(){
+	if(!RunInNwjs)
+		return;
+	window.open(settings.mainURL)
+}
+
 if(RunInNwjs)
 	loadLoginType();