Merge branch 'master' into makefile-tests

3 files changed, 151 insertions, 0 deletions

diff --git a/web-ui/src/common/header/header.js b/web-ui/src/common/header/header.js
new file mode 100644
index 00000000..50c863b5
--- /dev/null
+++ b/web-ui/src/common/header/header.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import React from 'react';
+import { translate } from 'react-i18next';
+import './header.scss';
+
+export const Header = ({ t }) => (
+  <header className='header-wrapper'>
+    <div className='header-content'>
+      <a href='/'>
+        <img
+          className='header-logo'
+          src='/public/images/logo-orange.svg'
+          alt='Pixelated'
+        />
+      </a>
+      <div className='header-icons'>
+        <a href='/'>
+          <span>{t('logout')}</span>
+          <i className='fa fa-sign-out' aria-hidden='true' />
+        </a>
+      </div>
+    </div>
+  </header>
+);
+
+Header.propTypes = {
+  t: React.PropTypes.func.isRequired
+};
+
+export default translate('', { wait: true })(Header);
diff --git a/web-ui/src/common/header/header.scss b/web-ui/src/common/header/header.scss
new file mode 100644
index 00000000..d56629bf
--- /dev/null
+++ b/web-ui/src/common/header/header.scss
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+@import "~scss/base/colors";
+
+.header-wrapper {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  background: $white;
+  box-shadow: 0 2px 3px 0 $shadow;
+  padding: 7px 0;
+}
+
+.header-content {
+  display: flex;
+  align-items: center;
+}
+
+.header-logo {
+  width: 120px;
+}
+
+.header-icons {
+  display: flex;
+  align-items: center;
+
+  position: absolute;
+  right: 6%;
+  top: 13px;
+
+  span {
+    display: none;
+  }
+
+  .fa {
+    font-size: 1.3em;
+    margin-left: 0.4em;
+    color: $medium_light_grey;
+  }
+}
+
+
+@media only screen and (min-width : 960px) {
+  .header-content {
+    flex-basis: 64%;
+    max-width: 820px;
+    justify-content: space-between;
+  }
+
+  .header-icons {
+    position: relative;
+    right: 0;
+    top: 0;
+
+    a {
+      display: flex;
+      align-items: center;
+    }
+
+    span {
+      display: inline;
+      color: $medium_light_grey;
+      font-style: normal;
+      font-size: 0.7em;
+      padding-bottom: 0.1em;
+    }
+
+    .fa {
+      font-size: 1em;
+      margin-right: 0;
+    }
+  }
+}
diff --git a/web-ui/src/common/header/header.spec.js b/web-ui/src/common/header/header.spec.js
new file mode 100644
index 00000000..82e29e1c
--- /dev/null
+++ b/web-ui/src/common/header/header.spec.js
@@ -0,0 +1,17 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { Header } from 'src/common/header/header';
+
+describe('Header', () => {
+  let header;
+
+  beforeEach(() => {
+    const mockTranslations = key => key;
+    header = shallow(<Header t={mockTranslations} />);
+  });
+
+  it('renders the header content', () => {
+    expect(header.find('header').text()).toContain('logout');
+  });
+});