Skip to content
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
9 changes: 7 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -195,7 +200,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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/actions/loadUser.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/api/requestInterceptor.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand Down
18 changes: 3 additions & 15 deletions src/assets/icons/connect-logo-mono.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/AuthenticatedComponent.jsx
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/TopBar/SectionToolBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
width: 53px;

path {
fill: $tc-gray-10;
fill: $tc-white;
}
}
}
Expand Down
12 changes: 2 additions & 10 deletions src/components/TopBar/TopBarContainer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down