Merge pull request #530 from appirio-tech/revert-528-remove-project-creation-from-ui

Revert "Redirect project creation to Topcoder Connect"

Author: Jaouad-Jaghrir

conf/ApplicationServer.properties

@@ -45,6 +45,4 @@ 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@
-
-TOPCODER_CONNECT_URL=@TopcoderConnectUrl@
+JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@

src/java/main/com/topcoder/direct/services/configs/ServerConfiguration.java

@@ -58,9 +58,4 @@ 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");
 }

src/web/WEB-INF/includes/newHeader.jsp

@@ -25,17 +25,15 @@
   -
   - 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">
@@ -66,7 +64,6 @@
 <div id="newHeader">
 <div class="topMenu">
 <ul class="menus">
-    
 <li <ui:isDashboardPage>class="current"</ui:isDashboardPage>>
     <span class="t"><a href="javascript:;">Dashboard</a> <i></i></span>
 
@@ -135,7 +132,7 @@
 
         <ul>
             <li>
-                <a class="first" href="${TCConnectURL}" target="_blank">Start New</a>
+                <a class="first" href="<s:url action="createNewProject" namespace="/"/>">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}'/>"/>
@@ -425,7 +422,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="${TCConnectURL}" target="_blank" class="start" title="Starts a new project">Start a Project</a>
+                <a href="<s:url action="createNewProject" namespace="/"/>" 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>

src/web/WEB-INF/includes/right.jsp

@@ -32,18 +32,15 @@
   - 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="${TCConnectURL}" target="_blank" class="start" title="Starts a new project">Start
+            <a href="<s:url action="createNewProject" namespace="/"/>" 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>

token.properties.docker

@@ -349,7 +349,4 @@
 @aws_s3_secret_key@=
 
 @trialBillingId@ =
-@defaultGroupIdForTrial@ =
-
-# The Topcoder Connect Url to which the projects creation will redirect
-@TopcoderConnectUrl@=https://connect.topcoder.com
+@defaultGroupIdForTrial@ =

token.properties.example

@@ -397,7 +397,4 @@
 @authorizationUrl@=http://api.topcoder-dev.com/v3/authorizations
 @userGroupsApiEndpoint@=http://172.18.0.1:8080/v3/groups
 @trialBillingId@ = 3
-@defaultGroupIdForTrial@ = 12347
-
-# The Topcoder Connect Url to which the projects creation will redirect
-@TopcoderConnectUrl@=https://connect.topcoder.com
+@defaultGroupIdForTrial@ = 12347