CoralLogo added to Coral-UI as SVG. and Admin session

2026-07-04 09:37:38 +08:00 · 2016-11-21 18:30:12 -03:00
parent 2160a81b7b
commit fa190b4b3e
17 changed files with 189 additions and 10 deletions
@@ -7,3 +7,4 @@ dist/coral-admin/bundle.js
 *.iml
 .env
 gaba.cfg
+.idea/
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
@@ -0,0 +1,16 @@
+import * as actions from '../constants/auth';
+import {base, handleResp, getInit} from '../helpers/response';
+
+// Check Login
+
+const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
+const checkLoginSuccess = user => ({type: actions.CHECK_LOGIN_SUCCESS, user});
+const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
+
+export const checkLogin = () => dispatch => {
+  dispatch(checkLoginRequest());
+  fetch(`${base}/auth`, getInit('GET'))
+    .then(handleResp)
+    .then(user => dispatch(checkLoginSuccess(user)))
+    .catch(error => dispatch(checkLoginFailure(error)));
+};
@@ -0,0 +1,4 @@
+.header {
+    background: #505050;
+    overflow: hidden;
+}
@@ -4,9 +4,11 @@ import {Link} from 'react-router';
 import styles from './Header.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
+import {Logo} from './Logo';

 export default () => (
-  <Header title='Talk'>
+  <Header className={styles.header}>
+    <Logo />
    <Navigation>
      <Link className={styles.navLink} to="/admin">{lang.t('configure.moderate')}</Link>
      <Link className={styles.navLink} to="/admin/community">{lang.t('configure.community')}</Link>
@@ -0,0 +1,18 @@
+.logo h1 {
+    color: #272727;
+    font-size: 20px;
+    padding: 0 30px;
+}
+
+.logo span {
+    display: inline-block;
+    margin-left: 10px;
+    font-size: 18px;
+    vertical-align: middle;
+}
+
+.logo {
+    background: #E5E5E5;
+}
+
+
@@ -0,0 +1,12 @@
+import React from 'react';
+import styles from './Logo.css';
+import {CoralLogo} from 'coral-ui';
+
+export const Logo = () => (
+  <div className={styles.logo}>
+    <h1>
+      <CoralLogo stroke="#E5E5E5" />
+      <span>Talk</span>
+    </h1>
+  </div>
+);
@@ -0,0 +1,7 @@
+export const CHECK_LOGIN_REQUEST = 'CHECK_LOGIN_REQUEST';
+export const CHECK_LOGIN_SUCCESS = 'CHECK_LOGIN_SUCCESS';
+export const CHECK_LOGIN_FAILURE = 'CHECK_LOGIN_FAILURE';
+
+export const LOGOUT_REQUEST = 'LOGOUT_REQUEST';
+export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
+export const LOGOUT_FAILURE = 'LOGOUT_FAILURE';
@@ -1,9 +1,12 @@
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
-
 import {Layout} from '../components/ui/Layout';
+import {checkLogin} from 'coral-framework/actions/auth';

 class LayoutContainer extends Component {
+  componentWillMount () {
+    this.props.checkLogin();
+  }
  render () {
    return <Layout {...this.props} />;
  }
@@ -11,9 +14,16 @@ class LayoutContainer extends Component {

 LayoutContainer.propTypes = {};

-const mapStateToProps = () => ({});
+const mapStateToProps = state => ({
+  auth: state.auth.toJS()
+});

-const mapDispatchToProps = (dispatch) => ({dispatch});
+const mapDispatchToProps = dispatch => ({
+  checkLogin: () => dispatch(checkLogin()),
+});

-export default connect(mapStateToProps, mapDispatchToProps)(LayoutContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LayoutContainer);

@@ -0,0 +1,26 @@
+import {Map} from 'immutable';
+import * as actions from '../constants/auth';
+
+const initialState = Map({
+  loggedIn: false,
+  user: null
+});
+
+export default function auth (state = initialState, action) {
+  switch (action.type) {
+  case actions.CHECK_LOGIN_FAILURE:
+    return state
+      .set('loggedIn', false)
+      .set('user', null);
+  case actions.CHECK_LOGIN_SUCCESS:
+    return state
+      .set('loggedIn', true)
+      .set('user', action.user);
+  case actions.LOGOUT_SUCCESS:
+    return state
+      .set('loggedIn', false)
+      .set('user', null);
+  default :
+    return state;
+  }
+}
@@ -2,11 +2,13 @@ import {combineReducers} from 'redux';
 import comments from 'reducers/comments';
 import settings from 'reducers/settings';
 import community from 'reducers/community';
+import auth from 'reducers/auth';

 // Combine all reducers into a main one
 export default combineReducers({
  settings,
  comments,
-  community
+  community,
+  auth
 });

@@ -19,8 +19,8 @@ export const cleanState = () => ({type: actions.CLEAN_STATE});
 // Sign In Actions

 const signInRequest = () => ({type: actions.FETCH_SIGNIN_REQUEST});
-const signInSuccess = (user) => ({type: actions.FETCH_SIGNIN_SUCCESS, user});
-const signInFailure = (error) => ({type: actions.FETCH_SIGNIN_FAILURE, error});
+const signInSuccess = user => ({type: actions.FETCH_SIGNIN_SUCCESS, user});
+const signInFailure = error => ({type: actions.FETCH_SIGNIN_FAILURE, error});

 export const fetchSignIn = (formData) => dispatch => {
  dispatch(signInRequest());
@@ -114,3 +114,16 @@ export const logout = () => dispatch => {
 export const validForm = () => ({type: actions.VALID_FORM});
 export const invalidForm = error => ({type: actions.INVALID_FORM, error});

+// Check Login
+
+const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
+const checkLoginSuccess = user => ({type: actions.CHECK_LOGIN_SUCCESS, user});
+const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
+
+export const checkLogin = () => dispatch => {
+  dispatch(checkLoginRequest());
+  fetch(`${base}/auth`, getInit('GET'))
+    .then(handleResp)
+    .then(user => dispatch(checkLoginSuccess(user)))
+    .catch(error => dispatch(checkLoginFailure(error)));
+};
@@ -27,3 +27,7 @@ export const LOGOUT_FAILURE = 'LOGOUT_FAILURE';
 export const INVALID_FORM = 'INVALID_FORM';
 export const VALID_FORM = 'VALID_FORM';

+export const CHECK_LOGIN_REQUEST = 'CHECK_LOGIN_REQUEST';
+export const CHECK_LOGIN_SUCCESS = 'CHECK_LOGIN_SUCCESS';
+export const CHECK_LOGIN_FAILURE = 'CHECK_LOGIN_FAILURE';
+
@@ -33,6 +33,14 @@ export default function auth (state = initialState, action) {
  case actions.FETCH_SIGNIN_REQUEST:
    return state
      .set('isLoading', true);
+  case actions.CHECK_LOGIN_FAILURE:
+    return state
+      .set('loggedIn', false)
+      .set('user', null);
+  case actions.CHECK_LOGIN_SUCCESS:
+    return state
+      .set('loggedIn', true)
+      .set('user', action.user);
  case actions.FETCH_SIGNIN_SUCCESS:
    return state
      .set('loggedIn', true)
@@ -40,7 +48,8 @@ export default function auth (state = initialState, action) {
  case actions.FETCH_SIGNIN_FAILURE:
    return state
      .set('isLoading', false)
-      .set('error', action.error);
+      .set('error', action.error)
+      .set('user', null);
  case actions.FETCH_SIGNIN_FACEBOOK_SUCCESS:
    return state
      .set('user', action.user)
@@ -18,7 +18,8 @@ import {
  fetchForgotPassword,
  facebookCallback,
  invalidForm,
-  validForm
+  validForm,
+  checkLogin
 } from '../../coral-framework/actions/auth';

 class SignInContainer extends Component {
@@ -43,6 +44,10 @@ class SignInContainer extends Component {
    this.addError = this.addError.bind(this);
  }

+  componentWillMount () {
+    this.props.checkLogin();
+  }
+
  componentDidMount() {
    window.authCallback = this.props.facebookCallback;
    const {formData} = this.state;
@@ -147,6 +152,7 @@ const mapStateToProps = state => ({
 });

 const mapDispatchToProps = dispatch => ({
+  checkLogin: () => dispatch(checkLogin()),
  facebookCallback: (err, data) => dispatch(facebookCallback(err, data)),
  fetchSignUp: formData => dispatch(fetchSignUp(formData)),
  fetchSignIn: formData => dispatch(fetchSignIn(formData)),
@@ -0,0 +1,42 @@
+import React, {PropTypes} from 'react';
+
+const CoralLogo = ({height = '30px', width = '30px', stroke = '#FFFFFF'}) => (
+  <svg width={width} height={height} viewBox='0 0 381 391' version='1.1 xmlns=http://www.w3.org/2000/svg xmlns:xlink=http://www.w3.org/1999/xlink'>
+  <g stroke='none' strokeWidth='1' fill='none' fillRule='evenodd'>
+    <g id='Wordmark-Round' transform='translate(-1833.000000, -411.000000)' stroke={stroke} strokeWidth='22' strokeLinecap='round' strokeLinejoin='round'>
+      <g id='coralProjectLogo-2-Copy-2' transform='translate(1842.000000, 421.000000)'>
+        <g id='Layer_2' transform='translate(2.268750, 1.133903)'>
+          <rect id='Rectangle-1' fill='#F47E6B' x='0' y='0' width='358.4625' height='368.518519' rx='40'>
+        </rect>
+        <path d='M0.226875,105.679772 C13.7259375,122.688319 41.29125,131.986325 56.71875,116.792023 C67.0415625,106.586895 62.5040625,93.0934473 76.910625,63.3851852 C83.94375,48.7578348 90.523125,38.3259259 101.980313,37.5321937 C115.139063,36.6250712 131.814375,50.3452991 134.31,69.3948718 C137.826563,95.1344729 115.479375,105.339601 121.15125,123.822222 C127.390313,144.119088 157.110938,140.377208 166.52625,165.096296 C170.042813,174.394302 171.630938,190.382336 163.463438,198.319658 C149.170313,212.266667 120.584063,186.073504 80.7675,198.319658 C73.280625,200.587464 56.3784375,205.803419 51.500625,219.523647 C46.73625,233.130484 55.584375,251.046154 67.60875,260.797721 C93.245625,281.661538 119.79,254.674644 159.379688,271.909972 C181.840313,281.661538 203.053125,303.319088 208.725,330.305983 C211.674375,344.593162 209.6325,356.952707 207.704063,364.549858' id='Shape'>
+        </path>
+      </g>
+      <g id='Layer_3' transform='translate(43.106250, 289.145299)'>
+        <path d='M90.4096875,72.5698006 C78.8390625,41.3874644 64.9996875,31.4091168 54.1096875,28.234188 C41.8584375,24.7190883 30.7415625,29.0279202 17.8096875,21.2039886 C8.394375,15.4210826 3.403125,6.57663818 0.680625,0'id='Shape'></path>
+      </g><g id='Layer_4' transform='translate(220.068750, 209.772080)'>
+      <path d='M81.7884375,152.963533 C74.9821875,122.007977 61.8234375,104.77265 50.593125,94.5675214 C31.8759375,77.6723647 14.746875,77.1054131 5.218125,57.2621083 C4.4240625,55.5612536 -5.7853125,33.4501425 5.218125,17.008547 C14.52,3.06153846 33.350625,1.47407407 41.518125,0.907122507 C64.3190625,-0.907122507 73.280625,9.52478632 100.959375,13.039886 C117.180938,15.0809117 130.793438,13.4934473 139.30125,12.0193732'id='Shape'></path>
+    </g>
+      <g id='Layer_5' transform='translate(285.862500, 289.145299)'>
+        <path d='M74.415,2.04102564 C66.3609375,0.793732194 51.046875,-0.566951567 33.12375,5.1025641 C17.5828125,9.97834758 6.80625,18.0290598 0.9075,23.2450142'id='Shape'></path>
+      </g>
+      <g id='Layer_6' transform='translate(174.693750, 1.133903)'>
+        <path d='M184.109063,151.035897 C170.950313,174.507692 158.699063,180.290598 149.850938,181.311111 C133.85625,183.011966 129.091875,168.724786 104.475938,163.168661 C79.2928125,157.499145 72.2596875,169.745299 52.0678125,163.168661 C30.0609375,155.911681 18.7171875,134.821083 12.705,123.822222 C-1.588125,97.4022792 -0.3403125,71.6626781 0.5671875,51.2524217 C1.588125,29.4814815 6.125625,12.0193732 9.6421875,0.907122507'id='Shape'></path>
+        <path d='M183.541875,69.3948718 C170.496563,56.6951567 157.564688,45.8096866 149.28375,39.0062678 C143.385,34.1304843 134.990625,33.2233618 128.297813,36.8518519 C128.070938,36.9652422 127.844063,37.0786325 127.730625,37.1920228 C122.739375,40.1401709 119.449688,45.3561254 118.8825,51.1390313 C118.201875,59.0763533 117.0675,71.4358974 114.912188,82.8883191 C114.118125,87.0837607 107.085,103.865527 89.7290625,110.668946 C77.2509375,115.544729 62.0503125,110.668946 53.4290625,101.597721 C40.38375,87.7641026 44.8078125,66.9002849 47.416875,55.2210826 C53.5425,26.760114 73.3940625,9.07122507 82.6959375,1.81424501'id='Shape'></path>
+      </g>
+      <g id='Layer_7' transform='translate(3.403125, 179.156695)'>
+        <path d='M0.1134375,0.226780627 C2.949375,6.34985755 8.394375,16.1014245 18.2634375,25.3994302 C27.67875,34.2438746 37.3209375,39.0062678 43.4465625,41.5008547'id='Shape'></path>
+      </g>
+    </g>
+  </g>
+  </g>
+</svg>
+);
+
+CoralLogo.propTypes = {
+  height: PropTypes.string,
+  width: PropTypes.string,
+  stroke: PropTypes.string
+};
+
+export default CoralLogo;
+
@@ -1 +1,2 @@
 export {default as Dialog} from './components/Dialog';
+export {default as CoralLogo} from './components/CoralLogo';