Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temp Radium example #167

Closed
wants to merge 71 commits into from
Closed

Temp Radium example #167

wants to merge 71 commits into from

Conversation

MaxSvargal
Copy link
Contributor

Miss pull request, sorry.

* master:
  refactor: load stores/actions programaticaly
  fix(guides): missing i18n data
  fix(docker): update npm && node version
  chore: bump boilerplate version
  fix: throw error as an object with `redirect` && `error` key
  refactor
  refactor
  test: update tests with context
  doc: update doc, now use `context`
  refactor: use `connect-alt` decorator
  fix: tests
  chore: drop `cssnext`, update `postcss` and use `precss`
  refactor
  style: disable `react/display-name`
  refactor: webpack config
  style: disable `react/display-name`

Conflicts:
	app/components/app.jsx
	app/utils/flux.js
	server/router.jsx
* master:
  refactor: move actions, stores into a flux dir && move AltResolver.render into `universerval-render`
* master:
  fix: use axios fork
  test: add tests with faking xhr
  doc: add note about ApiClient
  feat(api): use API in the App
  feat(api): add an API router on koa server
  feat(apiClient): add an ApiClient for easier requests
  fix(header): update loader
  chore: use circleci
  style: use `precss` features
  chore: bump travis nodejs version to `4.2.1`

Conflicts:
	app/components/header.jsx
* master:
  fix(altResolver)
  test: fix eslint
  refactor: drop lodash `mapValues`
  chore: update deps ([email protected] 🎉)
  fix: code style (fixes #142)

Conflicts:
	package.json
# Conflicts:
#	package.json
#	server/views/layouts/index.hbs
@iam4x
Copy link
Owner

iam4x commented Dec 14, 2015

Nice! It's nice to have an example with radium, do you have so code clean to do? I would like to publish this as another branch to give people the choice 👍

* master: (21 commits)
  style: lint tests as well
  feat(koa-2.0.0): update code
  feat(koa-2.0.0): update middlewares
  chore(koa-2.0.0): update deps
  fix(universal-render): iso returns DOMNode on 2nd parameter now
  chore: update `axios` to `0.8` which supports gzip
  chore: bump node version
  style: update style to `airbnb`
  doc: update `README.md` for `0.5.0`
  chore: update `iso` dep
  feat(alt-0.18): call `alt-resolver` with new alt fn return
  feat(alt.0-18): dont override `addActions` to pass `alt` instance into actions
  feat(alt-resolver): dont wrap action into promises
  refactor: remove not used param in `switchLocale`
  fix(users): use `this._flux` instead of `this.alt`
  fix(locale): use `dispatch()` in alt 0.18
  feat(alt-0.18): pass alt instance into actions
  chore: use `alt-utils`
  chore: update deps
  fix history dependency and warning
  ...

Conflicts:
	app/components/header.jsx
	app/routes.jsx
	package.json
	server/server-html.jsx
	test/spec/components/app.test.jsx
	test/spec/components/header.test.jsx
	test/spec/components/lang-picker.test.jsx
	test/spec/components/profile.test.jsx
	test/spec/stores/users.test.js
@MaxSvargal
Copy link
Contributor Author

@iam4x yes i can prepare a pull request later

@jaredcat
Copy link
Contributor

Yea I would like to see the latest master pulled into this and working clean so I could try to switch to Radium. CSS files are just a mess and becoming hard to maintain when I have almost 50 components.
I've wanted to switch after seeing this presentation https://speakerdeck.com/chantastic/styling-react-components

@MaxSvargal
Copy link
Contributor Author

@jaredkotoff see #225

@MaxSvargal MaxSvargal changed the title Merge kk branch Temp Jan 30, 2016
@MaxSvargal MaxSvargal changed the title Temp Temp Radium example Jan 30, 2016
@MaxSvargal
Copy link
Contributor Author

Moved to #225

@MaxSvargal MaxSvargal closed this Jan 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants