Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Commit

Permalink
Separate theme stuff into own folder.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Eldh committed Feb 27, 2015
1 parent 10baff3 commit 180faf8
Show file tree
Hide file tree
Showing 51 changed files with 65 additions and 105 deletions.
4 changes: 2 additions & 2 deletions dev/entry.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
React = require 'react'
Router = require 'react-router'
Routes = require '../elements/Routes.coffee'
require '../scss/main.scss'
require '../theme/scss/main.scss'

Router.run Routes, Router.HistoryLocation, (Handler) ->
React.render React.createElement(Handler, {}), document.body
React.render React.createElement(Handler, {}), document.body
9 changes: 9 additions & 0 deletions dev/page.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
React = require 'react'
Router = require 'react-router'
Routes = require '../elements/Routes.coffee'

module.exports = (req) ->
html = undefined
Router.run Routes, req.url, (Handler) ->
html = React.renderToString(React.createElement(Handler, null))
html
12 changes: 0 additions & 12 deletions dev/page.jsx

This file was deleted.

10 changes: 10 additions & 0 deletions dev/staticPage.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
React = require 'react'
Router = require 'react-router'
css = require '../theme/scss/main.scss'
Routes = require '../elements/Routes.coffee'

module.exports = (url) ->
html = undefined
Router.run Routes, url, (Handler) ->
html = React.renderToStaticMarkup(React.createElement(Handler, null))
html
13 changes: 0 additions & 13 deletions dev/staticPage.jsx

This file was deleted.

18 changes: 7 additions & 11 deletions elements/Layout.coffee
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
React = require('react')
Nav = React.createFactory require('./Nav')
Router = require('react-router')
React = require 'react'
Router = require 'react-router'
RouteHandler = React.createFactory Router.RouteHandler
Paths = require('./PathsMixin')
ThemeBody = React.createFactory require '../theme/ThemeBody'
Paths = require './PathsMixin'
config = require '../config'

{ html, head, body, div, title, script, link, main, meta } = require 'react-coffee-elements'
Expand All @@ -19,8 +19,8 @@ module.exports = React.createClass
head {},
title "#{if pageTitle then pageTitle + ' / ' else ''}#{config.siteName}"
meta
name:"viewport"
content:"width=device-width, initial-scale=1, maximum-scale=1, minimal-ui"
name:'viewport'
content:'width=device-width, initial-scale=1, maximum-scale=1, minimal-ui'
link
rel: 'alternate'
type: 'application/atom+xml'
Expand All @@ -31,10 +31,6 @@ module.exports = React.createClass
rel: 'stylesheet'
href: '/assets/main.css'
body {},
div { id: 'layout' },
Nav()
main { role: 'main' },
@props.children
RouteHandler()
ThemeBody {}, RouteHandler()
if process.env.NODE_ENV isnt 'production'
script src: '/main-bundle.js'
2 changes: 1 addition & 1 deletion elements/Routes.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ NotFoundRoute = React.createFactory Router.NotFoundRoute
DefaultRoute = React.createFactory Router.DefaultRoute
RouteHandler = React.createFactory Router.RouteHandler
Layout = require './Layout'
Post = require './Post'
Post = require '../theme/Post'
DevIndex = require './DevIndex'
_ = require 'lodash'
paths = require '../paths'
Expand Down
2 changes: 1 addition & 1 deletion pages/Blog.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
React = require('react')
Router = require('react-router')
Link = React.createFactory Router.Link
Moment = React.createFactory require('../elements/Moment')
Moment = React.createFactory require('../theme/Moment')
Paths = require('../elements/PathsMixin')
# md = require '../posts/2015-02-14-first_post.md'
_ = require('lodash')
Expand Down
9 changes: 0 additions & 9 deletions pages/Index.coffee
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
React = require('react')
Router = require('react-router')
Link = React.createFactory Router.Link
Nav = React.createFactory require '../elements/Nav'
Paths = require('../elements/PathsMixin')
_ = require('lodash')

{ div, li, br, ul, h1, blockquote } = require 'react-coffee-elements'
Expand All @@ -11,11 +7,6 @@ module.exports = React.createClass

displayName: 'Index'

mixins: [
Router.State
Paths
]

render: ->
div {}, 'Index hey'

2 changes: 1 addition & 1 deletion pages/Page.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
React = require('react')
Router = require('react-router')
Link = React.createFactory Router.Link
Moment = React.createFactory require('../elements/Moment')
Moment = React.createFactory require('../theme/Moment')
Paths = require('../elements/PathsMixin')
_ = require('lodash')

Expand Down
14 changes: 14 additions & 0 deletions pages/Theming.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
React = require('react')
_ = require('lodash')

{ div, p, h1 } = require 'react-coffee-elements'

module.exports = React.createClass

displayName: 'Theming'

render: ->
div {},
h1 'Theming'
p 'Theming in antwar is pretty simple. Three files are required: main.scss, ThemeBody and Post.'

49 changes: 0 additions & 49 deletions postinfo.coffee

This file was deleted.

File renamed without changes.
6 changes: 3 additions & 3 deletions elements/Nav.coffee → theme/Nav.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
React = require('react')
Router = require('react-router')
PathsMixin = require('./PathsMixin.coffee');
React = require 'react'
Router = require 'react-router'
PathsMixin = require '../elements/PathsMixin.coffee'
Link = React.createFactory Router.Link
_ = require 'lodash'

Expand Down
2 changes: 1 addition & 1 deletion elements/Post.coffee → theme/Post.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
React = require 'react'
Moment = React.createFactory require './Moment'
Paths = require './PathsMixin'
Paths = require '../elements/PathsMixin'
Router = require 'react-router'

{ div, span, header, h1 } = require 'react-coffee-elements'
Expand Down
14 changes: 14 additions & 0 deletions theme/ThemeBody.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
React = require 'react'
Nav = React.createFactory require './Nav'

{ div, main } = require 'react-coffee-elements'

module.exports = React.createClass

displayName: 'ThemeBody'


render: ->
div { },
Nav()
main { role: 'main' }, @props.children
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions webpack.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ build =
name: 'server'
target: 'node'
entry:
bundlePage: './dev/page.jsx'
bundlePage: './dev/page.coffee'
bundleStaticRss: './dev/staticRss.coffee'
bundleStaticPage: './dev/staticPage.jsx'
bundleStaticPage: './dev/staticPage.coffee'
paths: './dev/exportPaths.coffee'
output:
path: __dirname + '/build'
Expand Down

0 comments on commit 180faf8

Please sign in to comment.