Skip to content

Update name #2

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 21, 2019
Merged

Update name #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f88041
Update name
vforge Jan 21, 2019
7df3aed
Rebuild
vforge Jan 21, 2019
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

# @Wikia/react-design-system
# @Wikia/react-common

[![Travis](https://img.shields.io/travis/Wikia/react-design-system/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-design-system)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-design-system.svg?style=flat-square)](https://github.com/Wikia/react-design-system/releases)
[![Travis](https://img.shields.io/travis/Wikia/react-common/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-common)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-common.svg?style=flat-square)](https://github.com/Wikia/react-common/releases)

Wikia's reusable React parts.

Expand Down
22 changes: 11 additions & 11 deletions docs/build/bundle.5d5c4701.js → docs/build/bundle.2ae668c2.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-design-system</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:400,700"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.5d5c4701.js"></script></body></html>
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:400,700"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.2ae668c2.js"></script></body></html>
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wikia/react-design-system",
"version": "2.8.4",
"name": "@wikia/react-common",
"version": "0.0.0",
"description": "Wikia's reusable React parts",
"license": "UNLICENSED",
"private": true,
Expand Down
6 changes: 3 additions & 3 deletions source/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @Wikia/react-design-system
# @Wikia/react-common

[![Travis](https://img.shields.io/travis/Wikia/react-design-system/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-design-system)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-design-system.svg?style=flat-square)](https://github.com/Wikia/react-design-system/releases)
[![Travis](https://img.shields.io/travis/Wikia/react-common/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-common)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-common.svg?style=flat-square)](https://github.com/Wikia/react-common/releases)

Wikia's reusable React parts.

Expand Down
2 changes: 1 addition & 1 deletion source/config/styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function getSections() {
}

module.exports = {
title: 'react-design-system',
title: 'react-common',
template: {
head: {
links: [{
Expand Down
8 changes: 4 additions & 4 deletions source/docs/INSTALLATION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
## 2. Use it in the code

```js static
import Button from '@wikia/react-design-system/components/Button';
import Icon from '@wikia/react-design-system/components/Button';
import Button from '@wikia/react-common/components/Button';
import Icon from '@wikia/react-common/components/Button';


...
Expand All @@ -27,6 +27,6 @@ import Icon from '@wikia/react-design-system/components/Button';
Make sure you include the CSS in your styles.

```scss static
@import "~@wikia/react-design-system/components/Icon.css";
@import "~@wikia/react-design-system/components/Button.css";
@import "~@wikia/react-common/components/Icon.css";
@import "~@wikia/react-common/components/Button.css";
```
4 changes: 2 additions & 2 deletions source/docs/PREAMBULE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Travis](https://img.shields.io/travis/Wikia/react-design-system/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-design-system)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-design-system.svg?style=flat-square)](https://github.com/Wikia/react-design-system/releases)
[![Travis](https://img.shields.io/travis/Wikia/react-common/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-common)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-common.svg?style=flat-square)](https://github.com/Wikia/react-common/releases)

Wikia's reusable React parts.
4 changes: 2 additions & 2 deletions source/hocs/withTimeoutFallback/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Adds a component to display after a set time (accurate to the nearest 100ms)
## Usage

```js static
import withTimeoutFallback from '@react-design-system/hocs/withTimeoutFallback';
import withTimeoutFallback from '@react-common/hocs/withTimeoutFallback';

const Spinner = props => (<div> ...spinner </div>)
const SpinnerWithTimeout = withTimeoutFallback(Spinner);
Expand All @@ -15,7 +15,7 @@ const SpinnerWithTimeout = withTimeoutFallback(Spinner);
Custom Fallback and Timeout:

```js static
import withTimeoutFallback from '@react-design-system/hocs/withTimeoutFallback';
import withTimeoutFallback from '@react-common/hocs/withTimeoutFallback';

const Spinner = props => (<div> ...spinner </div>)
const Fallback = props => (<div> Error Loading </div>)
Expand Down
2 changes: 1 addition & 1 deletion source/models/Model/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Usage

```js static
import Model from '@react-design-system/models/Model';
import Model from '@react-common/models/Model';

export const MY_MODEL_KEYS = Object.freeze({
type: 'type',
Expand Down
6 changes: 3 additions & 3 deletions source/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@wikia/react-design-system",
"version": "2.8.4",
"name": "@wikia/react-common",
"version": "0.0.0",
"description": "Wikia's reusable React parts",
"repository": "git@github.com:Wikia/react-design-system.git",
"repository": "git@github.com:Wikia/react-common.git",
"license": "UNLICENSED",
"private": true,
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions source/scripts/build-readme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ const directories = config.sourceDirectories.map(
).join('\n');

const rootReadme = `
# @Wikia/react-design-system
# @Wikia/react-common

[![Travis](https://img.shields.io/travis/Wikia/react-design-system/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-design-system)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-design-system.svg?style=flat-square)](https://github.com/Wikia/react-design-system/releases)
[![Travis](https://img.shields.io/travis/Wikia/react-common/master.svg?style=flat-square)](https://travis-ci.org/Wikia/react-common)
[![Release](https://img.shields.io/github/package-json/v/Wikia/react-common.svg?style=flat-square)](https://github.com/Wikia/react-common/releases)

Wikia's reusable React parts.

Expand Down
12 changes: 6 additions & 6 deletions source/systems/BannerNotifications/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The reducer/store need to be included in Redux.
Example:

```js static
import { BannerNotificationsStore } from '@wikia/react-design-system/systems/BannerNotifications';
import { BannerNotificationsStore } from '@wikia/react-common/systems/BannerNotifications';
import { combineReducers } from 'redux';

const rootReducer = combineReducers({
Expand All @@ -37,8 +37,8 @@ The component that connects to the Redux state needs to be included on the page
```js static
import React from 'react';
import PropTypes from 'prop-types';
import FandomContentWell from '@wikia/react-design-system/components/FandomContentWell';
import { BannerNotificationsComponent } from '@wikia/react-design-system/systems/BannerNotifications';
import FandomContentWell from '@wikia/react-common/components/FandomContentWell';
import { BannerNotificationsComponent } from '@wikia/react-common/systems/BannerNotifications';

class PageLayout extends React.Component {
static propTypes = {
Expand All @@ -61,7 +61,7 @@ export default PageLayout;
**NOTE**: Remember to also include styles!

```css static
@import "~@wikia/react-design-system/systems/BannerNotifications.css";
@import "~@wikia/react-common/systems/BannerNotifications.css";
```

## API
Expand All @@ -75,13 +75,13 @@ BannerNotifications system exports few actions that should be used to add new no

The `id` is optional and it's needed only when the notification needs to be manually removed with `removeNotfication(id)` action. If omitted its value is assigned automatically.

Types of notifications are shown in [components/BannerNotification](https://wikia.github.io/react-design-system/#bannernotification) section.
Types of notifications are shown in [components/BannerNotification](https://wikia.github.io/react-common/#bannernotification) section.

Example usage in thunk:

```js static
import axios from 'axios';
import { addAlert } from '@wikia/react-design-system/systems/BannerNotifications';
import { addAlert } from '@wikia/react-common/systems/BannerNotifications';

export const loadData = () => (
async dispatch => {
Expand Down