Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

redirect project creation to connect #532

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion conf/ApplicationServer.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ SSO_HASH_SECRET = @ApplicationServer.SSO_HASH_SECRET@
SSO_DOMAIN = @ApplicationServer.SSO_DOMAIN@

JWT_V3_COOKIE_KEY = @ApplicationServer.JWT_V3_COOKIE_KEY@
JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@
JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@

TOPCODER_CONNECT_URL=@TopcoderConnectUrl@
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,9 @@ public class ServerConfiguration extends ApplicationServer {
public static String JWT_V3_COOKIE_KEY = bundle.getProperty("JWT_V3_COOKIE_KEY", "v3jwt");

public static String JWT_COOKIE_KEY = bundle.getProperty("JWT_COOKIE_KEY", "tcjwt");

/**
* The Topcoder Connect URL
*/
public static String TOPCODER_CONNECT_URL = bundle.getProperty("TOPCODER_CONNECT_URL", "https://connect.topcoder.com");
}
12 changes: 7 additions & 5 deletions src/web/WEB-INF/includes/newHeader.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@
-
- Version 1.7 (TOPCODER - REMOVE TASKS TAB IN DIRECT APP)
- - Remove tasks tab
-
- Version 1.4 (Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0)
- remove the vm related things
-
- Version 1.4 (Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0)
- remove the vm related things
-
- Description: The new cockpit header and navigation.
--%>
<%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %>
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>

<c:set var="TCConnectURL" value="<%=ServerConfiguration.TOPCODER_CONNECT_URL%>"/>

<!-- topcoder maintenance module -->
<div id="topcoder-maintenance-notification">
<div class="content">
Expand Down Expand Up @@ -132,7 +134,7 @@

<ul>
<li>
<a class="first" href="<s:url action="createNewProject" namespace="/"/>">Start New</a>
<a class="first" href="${TCConnectURL}" target="_blank">Start New</a>
</li>
<s:if test="%{#session.currentSelectDirectProjectID > 0 && sessionData.currentProjectContext.name != null}">
<input type="hidden" name="topNavCurrentProjectId" value="<s:property value='%{#session.currentSelectDirectProjectID}'/>"/>
Expand Down Expand Up @@ -422,7 +424,7 @@
<c:if test="${requestScope.CURRENT_TAB eq 'enterprise' and !requestScope.NO_ENTERPRISE_DASHBOARD_TOP}">
<div class="topBtns" id="enterpriseDashboardTop">
<a href="${ctx}/copilot/launchCopilotContest" class="copilot" title="Finds a TopCoder Copilot for your project">Get a Copilot</a>
<a href="<s:url action="createNewProject" namespace="/"/>" class="start" title="Starts a new project">Start a Project</a>
<a href="${TCConnectURL}" target="_blank" class="start" title="Starts a new project">Start a Project</a>
<a href="${ctx}/launch/home" class="launch" title="Launch a new challenge for your project">Launch Challenge</a>
</div>
</c:if>
Expand Down
6 changes: 4 additions & 2 deletions src/web/WEB-INF/includes/right.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,18 @@
- the data via ajax.
-
--%>
<%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %>
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>

<c:set var="TCConnectURL" value="<%=ServerConfiguration.TOPCODER_CONNECT_URL%>"/>

<div id="area2" class="dashboardPage"><!-- the right column -->

<div class="newSidebar">
<div class="topBtns">
<a href="${ctx}/copilot/launchCopilotContest" class="copilot"
title="Finds a TopCoder Copilot for your project">Get a Copilot</a>
<a href="<s:url action="createNewProject" namespace="/"/>" class="start" title="Starts a new project">Start
a Project</a>
<a href="${TCConnectURL}" target="_blank" class="start" title="Starts a new project">Start a Project</a>
<a href="${ctx}/launch/home" class="launch" title="Launch a new challenge for your project">Launch
Challenge</a>
</div>
Expand Down
5 changes: 4 additions & 1 deletion token.properties.docker
Original file line number Diff line number Diff line change
Expand Up @@ -349,4 +349,7 @@
@aws_s3_secret_key@=

@trialBillingId@ =
@defaultGroupIdForTrial@ =
@defaultGroupIdForTrial@ =

# The Topcoder Connect Url to which the projects creation will redirect
@TopcoderConnectUrl@=https://connect.topcoder-dev.com
5 changes: 4 additions & 1 deletion token.properties.example
Original file line number Diff line number Diff line change
Expand Up @@ -397,4 +397,7 @@
@authorizationUrl@=http://api.topcoder-dev.com/v3/authorizations
@userGroupsApiEndpoint@=http://172.18.0.1:8080/v3/groups
@trialBillingId@ = 3
@defaultGroupIdForTrial@ = 12347
@defaultGroupIdForTrial@ = 12347

# The Topcoder Connect Url to which the projects creation will redirect
@TopcoderConnectUrl@=https://connect.topcoder.com