From 9e7d3b1adfcf6ebb34c737c54808c155048a8a39 Mon Sep 17 00:00:00 2001
From: lunarkid <4476442+dedywahyudi@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:28:41 +0700
Subject: [PATCH 1/4] fix: change tc-auth-lib to @topcoder-platform/tc-auth-lib
---
package.json | 2 +-
src/actions/loadUser.js | 2 +-
src/api/requestInterceptor.js | 2 +-
src/components/AuthenticatedComponent.jsx | 2 +-
src/routes.jsx | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index f3274f439..b36b6ce23 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
"remarkable": "^1.7.4",
"sanitize-html": "^1.27.4",
"svg-react-loader": "^0.4.5",
- "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4",
+ "@topcoder-platform/tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4",
"tc-ui": "git+https://github.com/appirio-tech/tc-ui.git#feature/connectv2",
"tlds": "^1.191.0",
"topcoder-react-utils": "0.0.39",
diff --git a/src/actions/loadUser.js b/src/actions/loadUser.js
index 0669fb51a..e5589e5f0 100644
--- a/src/actions/loadUser.js
+++ b/src/actions/loadUser.js
@@ -17,7 +17,7 @@ import {
ROLE_PROGRAM_MANAGER,
ROLE_PRESALES, ROLE_PROJECT_MANAGER, ROLE_SOLUTION_ARCHITECT
} from '../config/constants'
-import { getFreshToken, configureConnector, decodeToken } from 'tc-auth-lib'
+import { getFreshToken, configureConnector, decodeToken } from '@topcoder-platform/tc-auth-lib'
import { getUserProfile, getCredential } from '../api/users'
import { fetchGroups } from '../api/groups'
import { getOrgConfig } from '../api/orgConfig'
diff --git a/src/api/requestInterceptor.js b/src/api/requestInterceptor.js
index bb98ef3dd..9f7c301c3 100644
--- a/src/api/requestInterceptor.js
+++ b/src/api/requestInterceptor.js
@@ -1,6 +1,6 @@
import axios from 'axios'
import store from '../config/store'
-import { getFreshToken, isTokenExpired } from 'tc-auth-lib'
+import { getFreshToken, isTokenExpired } from '@topcoder-platform/tc-auth-lib'
export const getToken = () => {
return new Promise((resolve, reject) => {
diff --git a/src/components/AuthenticatedComponent.jsx b/src/components/AuthenticatedComponent.jsx
index e689bf3e4..c2f5249bb 100644
--- a/src/components/AuthenticatedComponent.jsx
+++ b/src/components/AuthenticatedComponent.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { withRouter } from 'react-router-dom'
-import { getFreshToken } from 'tc-auth-lib'
+import { getFreshToken } from '@topcoder-platform/tc-auth-lib'
import { ACCOUNTS_APP_LOGIN_URL } from '../config/constants'
export function requiresAuthentication(Component) {
diff --git a/src/routes.jsx b/src/routes.jsx
index 66129856b..b228982de 100644
--- a/src/routes.jsx
+++ b/src/routes.jsx
@@ -19,7 +19,7 @@ import LoadingIndicator from './components/LoadingIndicator/LoadingIndicator'
import OrganizationPage from './components/SpecialPage/OrganizationPage'
import {ACCOUNTS_APP_LOGIN_URL, PROJECT_FEED_TYPE_PRIMARY, PROJECT_FEED_TYPE_MESSAGES } from './config/constants'
import { getTopic } from './api/messages'
-import { getFreshToken } from 'tc-auth-lib'
+import { getFreshToken } from '@topcoder-platform/tc-auth-lib'
import { scrollToHash } from './components/ScrollToAnchors.jsx'
import { TCEmitter } from './helpers'
From 95356ed78f47b42efac0130c387733bb4890a1f5 Mon Sep 17 00:00:00 2001
From: lunarkid <4476442+dedywahyudi@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:29:06 +0700
Subject: [PATCH 2/4] fix: change logo
---
src/assets/icons/connect-logo-mono.svg | 18 +++---------------
.../NotificationsMobilePage.scss | 9 ++-------
src/components/TopBar/SectionToolBar.scss | 2 +-
src/components/TopBar/TopBarContainer.scss | 12 ++----------
4 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/src/assets/icons/connect-logo-mono.svg b/src/assets/icons/connect-logo-mono.svg
index 5b412cb66..ddb9c5f85 100644
--- a/src/assets/icons/connect-logo-mono.svg
+++ b/src/assets/icons/connect-logo-mono.svg
@@ -1,15 +1,3 @@
-
-
\ No newline at end of file
+
diff --git a/src/components/NotificationsDropdown/NotificationsMobilePage.scss b/src/components/NotificationsDropdown/NotificationsMobilePage.scss
index f9e96f042..69be215cf 100644
--- a/src/components/NotificationsDropdown/NotificationsMobilePage.scss
+++ b/src/components/NotificationsDropdown/NotificationsMobilePage.scss
@@ -25,16 +25,11 @@
overflow: hidden;
svg {
- margin-left: -4px;
- margin-top: -1px;
+ margin-top: -8px;
width: 60px;
path {
- fill: $tc-gray-10;
-
- &:last-child {
- display: none;
- }
+ fill: $tc-white;
}
}
}
diff --git a/src/components/TopBar/SectionToolBar.scss b/src/components/TopBar/SectionToolBar.scss
index 9f32ead22..c7ce867b2 100644
--- a/src/components/TopBar/SectionToolBar.scss
+++ b/src/components/TopBar/SectionToolBar.scss
@@ -104,7 +104,7 @@
width: 53px;
path {
- fill: $tc-gray-10;
+ fill: $tc-white;
}
}
}
diff --git a/src/components/TopBar/TopBarContainer.scss b/src/components/TopBar/TopBarContainer.scss
index 0a0284327..1522ef597 100644
--- a/src/components/TopBar/TopBarContainer.scss
+++ b/src/components/TopBar/TopBarContainer.scss
@@ -67,20 +67,12 @@
height: auto;
width: 53px;
@media screen and (max-width: $screen-md - 1px) {
- /* adjust so visible logo starts from the beginning of .logo */
- margin-left: -4px;
- margin-top: -1px;
- /* real visible logo is 53px when svg has width 60px */
+ margin-top: -8px;
width: 60px;
-
- /* hide "connect" text under the logo */
- path:last-child {
- display: none;
- }
}
path {
- fill: $tc-gray-10;
+ fill: $tc-white;
}
}
}
From b8ff0d7cabfdf0dd50694f964150fa91e7b68915 Mon Sep 17 00:00:00 2001
From: lunarkid <4476442+dedywahyudi@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:30:14 +0700
Subject: [PATCH 3/4] ci: set dev to reskin
---
.circleci/config.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 13e114af1..bd08431ef 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -195,7 +195,7 @@ workflows:
- build-dev
filters: &filters-dev
branches:
- only: ['dev', 'feature/milestone-customer-approval']
+ only: ['dev', 'feature/milestone-customer-approval', 'reskin']
- deployTest01:
context : org-global
From ea9def0198cc5aa4f83d6121534eaf0864e7a7c4 Mon Sep 17 00:00:00 2001
From: Gunasekar-K
Date: Fri, 19 Aug 2022 12:40:39 +0530
Subject: [PATCH 4/4] Build fix
Build fix
---
.circleci/config.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd08431ef..fe474ebb3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,7 +67,12 @@ build_steps: &build_steps
- setup_remote_docker
- run: *install_dependency
- run: *install_deploysuite
- - run: npm install
+ - run:
+ name: "Installing npm dependency"
+ command: |
+ npm config set unsafe-perm true
+ git config --global url."https://git@".insteadOf git://
+ npm install
- run:
name: "configuring environment"
command: |