Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
13386b6
Merge pull request #1987 from appirio-tech/hotfix/notifications-sorting
gondzo May 2, 2018
c93774f
issue #1991 - Email settings
maxceem May 14, 2018
8de01d2
Revert "issue #1991 - Email settings"
maxceem May 14, 2018
42cb957
issue #1991 - Email settings
maxceem May 14, 2018
c5f3871
tweaked some specs
dmessing May 15, 2018
7cb46aa
Merge branch 'dev' of github.com:appirio-tech/connect-app into dev
dmessing May 15, 2018
12a5d22
tweaked caas
dmessing May 15, 2018
c3e4dcb
Removed master-discourse-free branch check for exporting master env v…
RishiRajSahu May 15, 2018
8c9288a
Added missing import for react, without which page breaks - To see th…
n10l May 19, 2018
42a0a3b
Unlike src/routes/notifications/routes.jsx in this file a Switch is e…
n10l May 19, 2018
8b6cc79
Merge pull request #2005 from happyesthete/dev
RishiRajSahu May 20, 2018
05a0f0b
Merge pull request #1995 from maxceem/email-settings
gondzo May 20, 2018
30d3e49
Fix lint
gondzo May 20, 2018
ef898cf
Merge pull request #2007 from appirio-tech/feature/email-settings
May 21, 2018
ba9bfa0
topcoder connect ui responsive updates
suppermancool May 22, 2018
56d2970
Update config.yml
Gunasekar-K May 22, 2018
8a265f8
Update config.yml
Gunasekar-K May 22, 2018
99ff8ca
Update config.yml
Gunasekar-K May 22, 2018
8fdfea7
Update config.yml
Gunasekar-K May 22, 2018
04248b8
Update config.yml
Gunasekar-K May 22, 2018
68a61af
Update config.yml
Gunasekar-K May 22, 2018
0102c30
Update config.yml
Gunasekar-K May 22, 2018
3df0b98
Update config.yml
Gunasekar-K May 22, 2018
ffcad47
Update config.yml
Gunasekar-K May 22, 2018
164d495
Merge pull request #2008 from suppermancool/challenge-30065480-ui-res…
RishiRajSahu May 23, 2018
9ad4269
GitHub issue#1990 1.Removed extra space on right from project-grid in…
RishiRajSahu May 23, 2018
b31dd8a
disable unsupported email settings
gondzo May 23, 2018
7ed4f45
Merge pull request #2010 from appirio-tech/feature/email-settings
May 24, 2018
ba66e35
Update config.yml
Gunasekar-K May 28, 2018
e9ac5f3
Update config.yml
Gunasekar-K May 28, 2018
cb83ec6
Merge pull request #2012 from appirio-tech/dev-testing
Gunasekar-K May 28, 2018
3c0d675
updated enterprise mobile
dmessing May 30, 2018
099590c
Quick fix for empty tooltip on enabled email setting switch.
May 30, 2018
d2a7b99
Merge branch 'dev' into hot-fix/enterprise-mobile-2
May 30, 2018
8540da3
Merge pull request #2017 from appirio-tech/hot-fix/enterprise-mobile-2
May 30, 2018
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
30 changes: 27 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ version: 2
jobs:
test:
docker:
- image: circleci/node:8.9.4
- image: circleci/node:8.9.4-browsers
steps:
- run:
name: checking out qa framework repo
command: git clone --branch develop https://$GITUSER:$GITPASSWD@github.com/appirio-tech/qa-framework-js.git ../qa-framework
- checkout
- restore_cache:
key: test-node-modules-{{ .Environment.CACHE_VERSION }}-{{ checksum "package-lock.json" }}
Expand All @@ -18,8 +21,28 @@ jobs:
- persist_to_workspace:
root: .
paths:
- dist

- dist
- run:
name: starting server locally
command: npm run start
background: true
- run: sleep 90
- run:
name: Running qa frame work
command: |
cd $HOME/qa-framework
sudo chmod 777 /usr/local/lib/node_modules
sudo chmod 777 /usr/local/bin
echo 127.0.0.1 local.topcoder-dev.com | sudo tee -a /etc/hosts
echo 127.0.0.1 local.topcoder.com | sudo tee -a /etc/hosts
cat /etc/hosts
mv -f test/config/ci-config.js test/config/config.js
npm install
npm test
pwd
- store_artifacts:
path: /home/circleci/qa-framework/allure-report

# Just tests commited code.
deployDev:
docker:
Expand Down Expand Up @@ -56,6 +79,7 @@ jobs:
- attach_workspace:
at: ./workspace
- run: ./deploy.sh DISCOURSE


workflows:
version: 2
Expand Down
4 changes: 0 additions & 4 deletions config/constants/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
module.exports = (() => {
const branch = process.env.CIRCLE_BRANCH || 'dev'

if(branch === 'master-discourse-free') {
return require('./master')
}

// for security reason don't let to require any arbitrary file defined in process.env
if (['master', 'qa'].indexOf(branch) < 0) {
return require('./dev')
Expand Down
1,916 changes: 958 additions & 958 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/icons/coder-welcome.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/components/BtnGroup/BtnGroup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ class BtnGroup extends React.Component {
<button
key={item.value}
className={cn('tc-btn tc-btn-sm tc-btn-default', { active: item.value === this.state.value })}
onClick={() => {
onClick={(evt) => {
// prevent parent form to be submitted
evt.preventDefault()
if (item.value !== this.state.value) {
this.setState({ value: item.value })
if (this.props.onChange) {
Expand Down
18 changes: 14 additions & 4 deletions src/components/BtnGroup/BtnGroup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,34 @@
> .tc-btn {
border-radius: 0;
border-left-width: 0;
margin: 0;
}

> .tc-btn:first-child {
border-radius: 2 * $corner-radius 0 0 2 * $corner-radius;
border-left-width: 1px;
}

> .tc-btn:last-child {
border-radius: 0 2 * $corner-radius 2 * $corner-radius 0;
}

> .tc-btn.active,
> .tc-btn.active:hover,
> .tc-btn.active:active {
background: $tc-gray-20;
box-shadow: inset 0 1px 3px 0 rgba($tc-gray-80, 0.38);
cursor: default;
}

@media screen and (max-width: $screen-md - 1px) {
> .tc-btn,
> .tc-btn:first-child,
> .tc-btn:last-child {
border-radius: 2 * $corner-radius;
border-width: 1px;
margin: 5px;
}
}
}
}

46 changes: 42 additions & 4 deletions src/components/CoderBot/CoderBot.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,24 @@
position: relative;
padding-top: 55px;
text-align: center;
min-height: 606px;
min-width: 768px;
width: 970px;
min-height: 706px;
@media screen and (max-width: $screen-sm - 1px) {
min-height: 780px;
}
margin: 20px auto 0;
background: #ffffff;
.icon-coder-broken {
margin: 6% 20%;
float: left;
@media screen and (max-width: $screen-md - 1px) {
margin: 6% 10%;
}
@media screen and (max-width: $screen-sm - 1px) {
margin: 6% 5%;
}
@media screen and (max-width: 321px) {
margin: 6% 1%;
}
}
background-size: 307px 300px;
a{
Expand All @@ -36,24 +46,52 @@
letter-spacing: 0px;
padding: 0 168px 25px 168px;
line-height: inherit;
@media screen and (max-width: 1000px - 1px) {
padding: 0 100px 25px 100px;
}
@media screen and (max-width: $screen-md - 1px) {
padding: 0 28px 25px 28px;
}
@media screen and (max-width: $screen-sm - 1px) {
font-size: 30px;
}
}
p{
text-align: left;
min-height: 120px;
padding: 0 168px;
@include roboto;
font-size: $tc-label-lg;
color: $tc-gray-70;
letter-spacing: 0px;
line-height: 23px;
@media screen and (max-width: 1000px - 1px) {
padding: 0 100px;
}
@media screen and (max-width: $screen-md - 1px) {
padding: 0 28px;
}
}
span{
position: absolute;
left: 49%;
top: 45%;
bottom: 25%;
@include roboto-medium;
font-size: 190px;
color: $tc-orange-30;
letter-spacing: 0px;
@media screen and (max-width: $screen-md - 1px) {
font-size: 150px;
bottom: 30%;
}
@media screen and (max-width: $screen-sm - 1px) {
font-size: 100px;
bottom: 45%;
}
@media screen and (max-width: 400px) {
font-size: 65px;
left: 63%;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Grid/GridView.scss
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@
min-height: 0;
min-width: 0;
padding-bottom: 0;
padding-right: 9 * $base-unit;
padding-right: 0;
}

.row:not(.header) .flex-item-title.item-customer {
Expand Down
3 changes: 2 additions & 1 deletion src/components/Maintenance/Maintenance.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from 'react'
import './Maintenance.scss'

const Maintenance = () => {
return (
<section className="content content-error">
<div className="container">
<div className="page-error">
<div className="page-error-maintenance">
<h3>Welcome to Topcoder Connect</h3>
<p>We are temporarily down for maintenance. We will be back shortly, after Coder is done with all the amazing optimizations.</p>
</div>
Expand Down
17 changes: 12 additions & 5 deletions src/components/Maintenance/Maintenance.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
}
}

.page-error {
.page-error-maintenance {
border-radius:4px;
position: relative;
padding-top: 55px;
text-align: center;
min-height: 606px;
min-width: 768px;
width: 970px;
margin: 20px auto 0;
background: #ffffff;
/* background: $tc-white url('../../assets/icons/coder-broken.svg') no-repeat 18% 85%; */
background-size: 307px 300px;
a{
Expand All @@ -30,17 +29,25 @@
@include roboto-medium;
font-size: 48px;
letter-spacing: 0px;
padding: 0 168px 25px 168px;
padding: 0 28px 25px 28px;
line-height: inherit;
@media screen and (max-width: $screen-sm - 1px) {
font-size: 30px;
}
}
p{
text-align: left;
text-align: center;
padding: 0 168px;
@include roboto;
font-size: $tc-label-lg;
color: $tc-gray-70;
letter-spacing: 0px;
line-height: 23px;
padding: 0 28px 25px 28px;

@media screen and (max-width: $screen-md - 1px) {
text-align: justify;
}
}
span{
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion src/components/StatusFilters/StatusFiltersMobile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class StatusFiltersMobile extends React.Component {
return (
<div>
<div styleName={cn('handle', { 'is-open': isOpen })} onClick={this.toggle}>
<span>{currentSatusLabel}</span>
<div>{currentSatusLabel}</div>
<IconCarretDown />
</div>
{isOpen && <ul styleName="list">
Expand Down
2 changes: 1 addition & 1 deletion src/components/StatusFilters/StatusFiltersMobile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
display: flex;
height: 10 * $base-unit;
font-size: 15px;
justify-content: space-between;
padding: 0 4 * $base-unit;

> svg {
width: 12px;
margin-left: 10px;
}

&.is-open > svg {
Expand Down
8 changes: 8 additions & 0 deletions src/config/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -399,3 +399,11 @@ export const SCREEN_BREAKPOINT_RG = 992
export const SCREEN_BREAKPOINT_MD = 768
export const SCREEN_BREAKPOINT_SM = 640
export const SCREEN_BREAKPOINT_XS = 320

export const NOTIFICATION_SETTINGS_PERIODS = [
{ text: 'Send as they happen', value: 'immediately' },
{ text: 'Every 10m.', value: 'every10minutes' },
{ text: 'Hourly', value: 'hourly' },
{ text: 'Daily', value: 'daily' },
{ text: 'Weekly', value: 'weekly' },
]
Loading