Skip to content

Commit 377afd7

Browse files
dedywahyudidedywahyudi
committed
fix: add vanilla links detection
1 parent 93b1d58 commit 377afd7

File tree

4 files changed

+45
-89
lines changed

4 files changed

+45
-89
lines changed

‎.deploy/circleci/token.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ database.password=1nf0rm1x
1212
database.INFORMIXSERVER=informixoltp_tcp
1313
database.locale=en_us.utf8
1414

15-
# context.security.url - URL for JNDI lookup
15+
# context.security.url - URL for JNDI lookup
1616
context.security.url=localhost:11199
1717

1818
## Used by cache.properties

‎src/main/java/com/cronos/onlinereview/util/ConfigHelper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ public class ConfigHelper {
10581058
* JWT default expiration time (1 day)
10591059
*/
10601060
private static final int DEFAULT_EXPIRATION_TIME = 60 * 24;
1061-
1061+
10621062
/**
10631063
* New Auth URL for Iframe to refresh the RS256 token
10641064
*/
@@ -1691,7 +1691,7 @@ public class ConfigHelper {
16911691
} catch (Exception e) {
16921692
preSignedExpTimeMilis = 60 * 60 * 1000;
16931693
}
1694-
1694+
16951695
ConfigManager.Property newAuth = cfgMgr.getPropertyObject(ONLINE_REVIEW_CFG_NS, "new_auth");
16961696
newAuthUrl = newAuth.getValue("new_auth_url");
16971697

@@ -2570,18 +2570,18 @@ public static String getS3BucketDmz() {
25702570
public static long getPreSignedExpTimeMilis() {
25712571
return preSignedExpTimeMilis;
25722572
}
2573-
2573+
25742574
/**
2575-
* Get new auth url
2576-
* @return url
2575+
* Get new auth url
2576+
* @return url
25772577
*/
25782578
public static String getNewAuthUrl() {
25792579
return newAuthUrl;
25802580
}
25812581

25822582
/**
25832583
* Get challenge by legacy id url
2584-
* @return url
2584+
* @return url
25852585
*/
25862586
public static String getChallengeByLegacyIdUrlV5() {
25872587
return challengeByLegacyIdUrlV5;

‎src/main/resources/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2095,4 +2095,4 @@
20952095
<Property name="challenge_by_legacy_id_url_v5">
20962096
<Value>@topcoder_api_base_url_v5@/challenges?legacyId=</Value>
20972097
</Property>
2098-
</Config>
2098+
</Config>

‎web/jsp/viewProjectDetails.jsp

Lines changed: 37 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<!-- CSS and JS by Petar -->
3131
<link type="text/css" rel="stylesheet" href="/css/or/new_styles.css" />
3232
<link type="text/css" rel="stylesheet" href="/css/or/phasetabs.css" />
33-
3433
<script language="JavaScript" type="text/javascript"
3534
src="/js/or/rollovers2.js"><!-- @ --></script>
3635
<script language="JavaScript" type="text/javascript"
@@ -79,9 +78,6 @@
7978
);
8079
}
8180
</script>
82-
83-
<!-- Reskin -->
84-
<link type="text/css" rel="stylesheet" href="/css/reskin-or/reskin.css">
8581
<script type="text/javascript">
8682
function updateForumLink(projectId) {
8783
return fetch("<%=com.cronos.onlinereview.util.ConfigHelper.getChallengeByLegacyIdUrlV5()%>" + projectId)
@@ -99,92 +95,52 @@
9995
document.addEventListener("DOMContentLoaded", function(){
10096
let projectId = ${project.id};
10197
updateForumLink(projectId);
102-
103-
let accordion = document.getElementsByClassName("projectDetails__accordion");
104-
for (let i = 0; i < accordion.length; i++) {
105-
accordion[i].addEventListener("click", function() {
106-
this.classList.toggle("projectDetails__accordion--collapse");
107-
let section = document.getElementsByClassName("projectDetails__sectionBody")[i];
108-
if (section.style.display === "none") {
109-
section.style.display = "block";
110-
} else {
111-
section.style.display = "none";
112-
}
113-
});
114-
}
115-
116-
let expand = document.querySelector(".accordionAction__expandAll");
117-
expand.addEventListener("click", function() {
118-
for (let i = 0; i < accordion.length; i++) {
119-
accordion[i].classList.remove("projectDetails__accordion--collapse");
120-
let section = document.getElementsByClassName("projectDetails__sectionBody")[i];
121-
section.style.display = "block";
122-
}
123-
});
124-
125-
let collapse = document.querySelector(".accordionAction__collapseAll");
126-
collapse.addEventListener("click", function() {
127-
for (let i = 0; i < accordion.length; i++) {
128-
accordion[i].classList.add("projectDetails__accordion--collapse");
129-
let section = document.getElementsByClassName("projectDetails__sectionBody")[i];
130-
section.style.display = "none";
131-
}
132-
});
133-
134-
let avatar = document.querySelector('.webHeader__avatar a');
135-
let avatarImage = document.createElement('div');
136-
avatarImage.className = "webHeader__avatarImage";
137-
let twoChar = avatar.text.substring(0, 2);
138-
avatarImage.innerText = twoChar;
139-
avatar.innerHTML = avatarImage.outerHTML;
14098
});
14199
</script>
142-
143100
</head>
144101
145102
<body>
103+
<div align="center">
104+
105+
<div class="maxWidthBody" align="left">
106+
107+
<jsp:include page="/includes/inc_header.jsp" />
108+
109+
<jsp:include page="/includes/project/project_tabs.jsp" />
110+
111+
<div id="mainMiddleContent">
112+
<div style="position: relative; width: 100%;">
113+
<jsp:include page="/includes/project/project_info.jsp" /><br />
114+
<jsp:include page="/includes/project/project_myrole.jsp" />
115+
<jsp:include page="/includes/project/project_timeline.jsp" />
116+
<jsp:include page="/includes/project/project_phase.jsp" />
117+
<jsp:include page="/includes/project/project_detail.jsp" />
118+
<jsp:include page="/includes/project/project_prizes.jsp" />
119+
<jsp:include page="/includes/project/project_resource.jsp" />
120+
<!-- OR Project Linking Assembly -->
121+
<jsp:include page="/includes/project/project_link.jsp" />
122+
<div align="right">
123+
<c:if test="${isAllowedToViewPayments}">
124+
<a href="ViewProjectPayments?pid=${project.id}"><img src="<or:text key='viewProjectDetails.btnPayments.img' />" border="0" alt="<or:text key='viewProjectDetails.btnPayments.alt' />" /></a>&#160;
125+
</c:if>
126+
<c:if test="${requestScope.isAllowedToManageProjects}">
127+
<a href="ViewManagementConsole?pid=${project.id}"><img src="<or:text key='viewProjectDetails.btnManagementConsoleLink.img' />" border="0" alt="<or:text key='viewProjectDetails.btnManagementConsoleLink.alt' />" /></a>&#160;
128+
</c:if>
129+
<c:if test="${isAllowedToEditProjects}">
130+
<a href="EditProjectLinks?pid=${project.id}"><img src="<or:text key='viewProjectDetails.btnEditLink.img' />" border="0" alt="<or:text key='viewProjectDetails.btnEditLink.alt' />" /></a>&#160;
131+
</c:if>
132+
<c:if test="${isAllowedToEditProjects}">
133+
<a href="EditProject?pid=${project.id}"><img src="<or:text key='viewProjectDetails.btnEdit.img' />" border="0" alt="<or:text key='viewProjectDetails.btnEdit.alt' />" /></a>&#160;
134+
</c:if>
135+
</div>
136+
</div>
137+
</div>
138+
139+
<jsp:include page="/includes/inc_footer.jsp" />
146140
147-
<jsp:include page="/includes/inc_header_reskin.jsp" />
148-
149-
<jsp:include page="/includes/project/project_tabs_reskin.jsp" />
150-
151-
<div class="content">
152-
<div class="content__inner">
153-
<jsp:include page="/includes/project/project_info_reskin.jsp" />
154-
<div class="divider"></div>
155-
<div class="accordionAction">
156-
<div class="accordionAction__expandAll">Expand All</div>
157-
<div class="accordionAction__collapseAll">Collapse All</div>
158-
</div>
159-
<jsp:include page="/includes/project/project_myrole_reskin.jsp" />
160-
<jsp:include page="/includes/project/project_timeline_reskin.jsp" />
161-
<jsp:include page="/includes/project/project_phase_reskin.jsp" />
162-
<jsp:include page="/includes/project/project_detail_reskin.jsp" />
163-
<jsp:include page="/includes/project/project_prizes_reskin.jsp" />
164-
<jsp:include page="/includes/project/project_resource_reskin.jsp" />
165-
<!-- OR Project Linking Assembly -->
166-
<jsp:include page="/includes/project/project_link.jsp" />
167141
</div>
168-
</div>
169142
170-
<div class="cta">
171-
<div class="cta__inner">
172-
<c:if test="${isAllowedToViewPayments}">
173-
<a href="ViewProjectPayments?pid=${project.id}"><or:text key='viewProjectDetails.btnPayments.alt' /></a>
174-
</c:if>
175-
<c:if test="${requestScope.isAllowedToManageProjects}">
176-
<a href="ViewManagementConsole?pid=${project.id}"><or:text key='viewProjectDetails.btnManagementConsoleLink.alt' /></a>
177-
</c:if>
178-
<c:if test="${isAllowedToEditProjects}">
179-
<a href="EditProjectLinks?pid=${project.id}"><or:text key='viewProjectDetails.btnEditLink.alt' /></a>
180-
</c:if>
181-
<c:if test="${isAllowedToEditProjects}">
182-
<a href="EditProject?pid=${project.id}"><or:text key='viewProjectDetails.btnEdit.alt' /></a>
183-
</c:if>
184-
</div>
185143
</div>
186144
187-
<jsp:include page="/includes/inc_footer_reskin.jsp" />
188-
189145
</body>
190146
</html>

0 commit comments

Comments
 (0)