Skip to content
This repository was archived by the owner on Jun 6, 2022. It is now read-only.

Inaki/new components #12

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
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
6b1f490
Testing
williamklancnik Jul 19, 2017
7808530
Revert "Testing"
williamklancnik Jul 19, 2017
e2a6001
Front-end init
jackschlotthauer-optimizely Jul 19, 2017
cb1b18d
basic building for front-end
jackschlotthauer-optimizely Jul 19, 2017
eed2447
updated for mock ui
jackschlotthauer-optimizely Jul 19, 2017
183d26d
Updates UI for integration
jackschlotthauer-optimizely Jul 19, 2017
f3db048
matching namespace
jackschlotthauer-optimizely Jul 19, 2017
97cec92
updated webpack
jackschlotthauer-optimizely Jul 19, 2017
4f10e05
updated for hot swapping
jackschlotthauer-optimizely Jul 19, 2017
7d9ac3a
First commit; minor cleanup on readme
daverau-optimizely Jul 19, 2017
19dcbeb
first comit, change readme
inakiaranzadi-optimizely Jul 19, 2017
1f7cb13
Merge branch 'master' into drau/readme
daverau-optimizely Jul 19, 2017
d643e56
Merge pull request #1 from optimizely/drau/readme
daverau-optimizely Jul 19, 2017
dd2128f
Add Main UI starting point
inakiaranzadi-optimizely Jul 19, 2017
b73885e
updated gitignore
jackschlotthauer-optimizely Jul 19, 2017
fd3905a
added dist-files
jackschlotthauer-optimizely Jul 19, 2017
ad4dc27
Merge pull request #2 from optimizely/inaki/gobetter-main-ui
jackschlotthauer-optimizely Jul 19, 2017
5ed9bd5
Fix npm run command
daverau-optimizely Jul 19, 2017
96958a9
Inline icons
daverau-optimizely Jul 19, 2017
33c86d4
Merge pull request #3 from optimizely/drau/icons
daverau-optimizely Jul 19, 2017
39b7835
Move presentational components from Container component
inakiaranzadi-optimizely Jul 19, 2017
17edcdf
Add Header component
inakiaranzadi-optimizely Jul 19, 2017
7aafd11
Merge pull request #4 from optimizely/inaki/gobetter-main-ui
jackschlotthauer-optimizely Jul 19, 2017
5a452ad
containerizing
jackschlotthauer-optimizely Jul 19, 2017
b9689f1
updated namespacing; removed dead code
jackschlotthauer-optimizely Jul 19, 2017
8d6c2a5
Add pagination HTML to be turned into component
daverau-optimizely Jul 19, 2017
32c81e2
Merge pull request #5 from optimizely/drau/layout-pagination
daverau-optimizely Jul 19, 2017
89aaa07
Fix Header component
inakiaranzadi-optimizely Jul 20, 2017
f8740cf
Add new components & inline icons
inakiaranzadi-optimizely Jul 20, 2017
5d1d800
Add pagination component & code adjustments
inakiaranzadi-optimizely Jul 20, 2017
f4edb15
Add Pagination component updates
inakiaranzadi-optimizely Jul 20, 2017
ae63bec
Fix pagination, need to be connected
inakiaranzadi-optimizely Jul 20, 2017
b24cc91
add plugin
inakiaranzadi-optimizely Jul 20, 2017
6bb08c7
Add icons
inakiaranzadi-optimizely Jul 20, 2017
dd158b2
icons
inakiaranzadi-optimizely Jul 20, 2017
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
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["react", "es2015", "stage-0"],
"plugins": ["react-hot-loader/babel"]
}
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dist
node_modules
coverage
webpack.*.js
*server.js
192 changes: 192 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
{
"parser": "babel-eslint", // https://github.com/babel/babel-eslint
"env": {
"browser": true,
"node": true,
"mocha": true
},
"globals": {
"expect": true,
"sinon": true,
"__DEV__": true
},
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"classes": true,
"defaultParams": true,
"destructuring": true,
"forOf": true,
"generators": false,
"modules": true,
"objectLiteralComputedProperties": true,
"objectLiteralDuplicateProperties": false,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"spread": true,
"superInFunctions": true,
"templateStrings": true,
"jsx": true
},
"rules": {
"no-var": 2, // http://eslint.org/docs/rules/no-var
"prefer-const": 2, // http://eslint.org/docs/rules/prefer-const

/**
* Variables
*/
"no-shadow": 2, // http://eslint.org/docs/rules/no-shadow
"no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names
"no-undef": 2, // http://eslint.org/docs/rules/no-undef
"no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars
"vars": "local",
"args": "after-used"
}],
"no-use-before-define": 2, // http://eslint.org/docs/rules/no-use-before-define

/**
* Possible errors
*/
"no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
"no-console": 1, // http://eslint.org/docs/rules/no-console
"no-debugger": 1, // http://eslint.org/docs/rules/no-debugger
"no-alert": 1, // http://eslint.org/docs/rules/no-alert
"no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition
"no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys
"no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case
"no-empty": 2, // http://eslint.org/docs/rules/no-empty
"no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign
"no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast
"no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi
"no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign
"no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations
"no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp
"no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace
"no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls
"no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays
"no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable
"use-isnan": 2, // http://eslint.org/docs/rules/use-isnan
"block-scoped-var": 2, // http://eslint.org/docs/rules/block-scoped-var

/**
* Best practices
*/
"consistent-return": 2, // http://eslint.org/docs/rules/consistent-return
"curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly
"default-case": 2, // http://eslint.org/docs/rules/default-case
"dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation
"allowKeywords": true
}],
"eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq
"guard-for-in": 2, // http://eslint.org/docs/rules/guard-for-in
"no-caller": 2, // http://eslint.org/docs/rules/no-caller
"no-else-return": 2, // http://eslint.org/docs/rules/no-else-return
"no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null
"no-eval": 2, // http://eslint.org/docs/rules/no-eval
"no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native
"no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind
"no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough
"no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal
"no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval
"no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks
"no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func
"no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str
"no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign
"no-new": 2, // http://eslint.org/docs/rules/no-new
"no-new-func": 2, // http://eslint.org/docs/rules/no-new-func
"no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers
"no-octal": 2, // http://eslint.org/docs/rules/no-octal
"no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape
"no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign
"no-proto": 2, // http://eslint.org/docs/rules/no-proto
"no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare
"no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign
"no-script-url": 2, // http://eslint.org/docs/rules/no-script-url
"no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
"no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
"no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
"no-with": 2, // http://eslint.org/docs/rules/no-with
"radix": 2, // http://eslint.org/docs/rules/radix
"vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
"yoda": 2, // http://eslint.org/docs/rules/yoda

/**
* Style
*/
"indent": [
2,
4,
{ "SwitchCase": 1 }
], // http://eslint.org/docs/rules/indent
"brace-style": [
2,
"1tbs", {
"allowSingleLine": true
}
], // http://eslint.org/docs/rules/brace-style
"quotes": [
2, "single", "avoid-escape" // http://eslint.org/docs/rules/quotes
],
"camelcase": [2, { // http://eslint.org/docs/rules/camelcase
"properties": "never"
}],
"comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing
"before": false,
"after": true
}],
"comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style
"eol-last": 2, // http://eslint.org/docs/rules/eol-last
"func-names": 1, // http://eslint.org/docs/rules/func-names
"key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing
"beforeColon": false,
"afterColon": true
}],
"new-cap": [0, { // http://eslint.org/docs/rules/new-cap
"newIsCap": true
}],
"no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines
"max": 2
}],
"no-nested-ternary": 2, // http://eslint.org/docs/rules/no-nested-ternary
"no-new-object": 2, // http://eslint.org/docs/rules/no-new-object
"no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func
"no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces
"no-extra-parens": [2, "functions"], // http://eslint.org/docs/rules/no-extra-parens
"no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle
"one-var": [2, "never"], // http://eslint.org/docs/rules/one-var
"padded-blocks": [2, "never"], // http://eslint.org/docs/rules/padded-blocks
"semi": [2, "always"], // http://eslint.org/docs/rules/semi
"semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing
"before": false,
"after": true
}],
"space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks
"space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren
"space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
"spaced-comment": [2, "always", {// http://eslint.org/docs/rules/spaced-comment
"exceptions": ["-", "+"],
"markers": ["=", "!"] // space here to support sprockets directives
}],
// React
"jsx-quotes": [2, "prefer-double"],
"react/display-name": 0,
"react/jsx-boolean-value": 1,
"react/jsx-no-undef": 2,
"react/jsx-sort-prop-types": 0,
"react/jsx-sort-props": 0,
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"react/no-did-mount-set-state": [2, "allow-in-func"],
"react/no-did-update-set-state": 2,
"react/no-multi-comp": 2,
"react/no-unknown-property": 2,
"react/prop-types": 2,
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 2,
"react/sort-comp": 2,
"react/wrap-multilines": 2
},
"plugins": [
"react"
]
}
53 changes: 52 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# OS X
.DS_Store*
Icon?
._*

# Windows
Expand All @@ -24,3 +23,55 @@ coverage

# Benchmarking
benchmarks/graphs


# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/*
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries

# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml

# Gradle:
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/

# Mongo Explorer plugin:
.idea/**/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
12 changes: 12 additions & 0 deletions .idea/gobetter.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .jsbeautifyrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"indent_size": 4,
"indent_char": " ",
"css": {
"indent_size": 2
}
}
21 changes: 6 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
# Node Url Shortener
# Go Better: A hackweek project to improve go/ links.

> A modern, minimalist, and lightweight URL shortener using [Node.js](http://nodejs.org) and [Redis](http://redis.io).

[![Build Status](https://travis-ci.org/dotzero/node-url-shortener.svg?branch=master)](https://travis-ci.org/dotzero/node-url-shortener)
[![GitHub tag](https://img.shields.io/github/tag/dotzero/node-url-shortener.svg)](https://github.com/dotzero/node-url-shortener)
[![Dependency Status](https://david-dm.org/dotzero/node-url-shortener.svg)](https://david-dm.org/dotzero/node-url-shortener)

## Using

* [Express 4](http://expressjs.com/)
* [Redis](http://redis.io)
> Based on a lightweight node URL shortener (https://github.com/dotzero/node-url-shortener)

## Quick Start

```bash
$ git clone https://github.com/dotzero/node-url-shortener nus
$ cd nus
$ npm install
$ node app
$ git clone https://github.com/optimizely/gobetter.git
$ cd gobetter
$ npm i
$ npm run hotreload
```

## Command Line Options
Expand Down
8 changes: 8 additions & 0 deletions app/actions/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import * as types from './types';

export function editDialog(linkId) {
return {
type: types.EDIT,
linkId
};
}
Loading