Skip to content

Commit

Permalink
Merge pull request #18 from LoveLiveSunshine/1.x-dev
Browse files Browse the repository at this point in the history 
v1.4.0
  • Loading branch information
@kokororin
kokororin committed Jun 28, 2018
2 parents 5ff8814 + 3b594b0 commit 50b2d93
Show file tree
Hide file tree
Showing 37 changed files with 1,366 additions and 2,088 deletions.
168 changes: 70 additions & 98 deletions README.md
View file
Expand Up @@ -7,7 +7,7 @@
[![Website](https://img.shields.io/website-up-down-green-red/http/shields.io.svg?label=pixivギャラリー)](https://pixiv.moe)
[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)

A pinterest-style layout site, shows illusts on [pixiv.net](http://pixiv.net) order by popularity. Written with react.
A pinterest-style layout site, shows illusts on [pixiv.net](http://pixiv.net) order by popularity. Written with React.

Table of Contents
=================
Expand All @@ -33,7 +33,8 @@ Table of Contents
* redux
* redux-thunk
* react-redux
* react-mdl
* react-intl
* material-ui
* whatwg-fetch

## Online Site
Expand All @@ -43,7 +44,8 @@ Table of Contents

* Pinterest-style layout illusts.
* Select keywords.
* Login in Pixiv and add bookmarks easily.
* Search keywords order by popularity without pixiv Premium.
* Login in pixiv and add bookmarks easily.

## Privacy

Expand Down Expand Up @@ -167,6 +169,60 @@ curl 'https://api.pixiv.moe/v1/ranking?page=1'
```
</details>

#### Search

##### request
`GET /ranking?word=[:word]&page=[:page]`

###### example
```bash
curl 'https://api.pixiv.moe/v1/search?word=fgo&page=1'
```

##### response
<details>
<summary>JSON</summary>

```json
{
"status":"success",
"response":[
{
"id":57808612,
"title":"邪ンヌ・オルタ",
"image_urls":{
"px_128x128":"https://api.pixiv.moe/v2/image/i.pximg.net/c/128x128/img-master/img/2016/07/09/00/10/10/57808612_p0_square1200.jpg",
"px_480mw":"https://api.pixiv.moe/v2/image/i.pximg.net/c/480x960/img-master/img/2016/07/09/00/10/10/57808612_p0_master1200.jpg",
"large":"https://api.pixiv.moe/v2/image/i.pximg.net/img-original/img/2016/07/09/00/10/10/57808612_p0.jpg",
"small":"https://api.pixiv.moe/v2/image/i.pximg.net/c/150x150/img-master/img/2016/07/09/00/10/10/57808612_p0_master1200.jpg",
"medium":"https://api.pixiv.moe/v2/image/i.pximg.net/c/600x600/img-master/img/2016/07/09/00/10/10/57808612_p0_master1200.jpg"
},
"stats":{
"scored_count":103183,
"score":1031301,
"views_count":626438,
"favorited_count":{
"public":102372,
"private":1832
},
"commented_count":255
},
"unique_id":"r9Earbs"
}
],
"count":50,
"pagination":{
"previous":null,
"next":2,
"current":1,
"per_page":50,
"total":161174,
"pages":2000
}
}
```
</details>

#### Illust List

##### request
Expand All @@ -189,11 +245,11 @@ curl 'https://api.pixiv.moe/v1/gallery?tag=nico&page=1'
"id":55080228,
"title":"３年生組",
"image_urls":{
"px_128x128":"//i1.pixiv.net/c/128x128/img-master/img/2016/02/04/10/09/39/55080228_p0_square1200.jpg",
"px_480mw":"//i1.pixiv.net/c/480x960/img-master/img/2016/02/04/10/09/39/55080228_p0_master1200.jpg",
"large":"//i1.pixiv.net/img-original/img/2016/02/04/10/09/39/55080228_p0.jpg",
"small":"//i1.pixiv.net/c/150x150/img-master/img/2016/02/04/10/09/39/55080228_p0_master1200.jpg",
"medium":"//i1.pixiv.net/c/600x600/img-master/img/2016/02/04/10/09/39/55080228_p0_master1200.jpg"
"px_128x128":"https://api.pixiv.moe/v2/image/i.pximg.net/c/128x128/img-master/img/2016/02/04/10/09/39/55080228_p0_square1200.jpg",
"px_480mw":"https://api.pixiv.moe/v2/image/i.pximg.net/c/480x960/img-master/img/2016/02/04/10/09/39/55080228_p0_master1200.jpg",
"large":"https://api.pixiv.moe/v2/image/i.pximg.net/img-original/img/2016/02/04/10/09/39/55080228_p0.jpg",
"small":"https://api.pixiv.moe/v2/image/i.pximg.net/c/150x150/img-master/img/2016/02/04/10/09/39/55080228_p0_master1200.jpg",
"medium":"https://api.pixiv.moe/v2/image/i.pximg.net/c/600x600/img-master/img/2016/02/04/10/09/39/55080228_p0_master1200.jpg"
},
"stats":{
"scored_count":14014,
Expand Down Expand Up @@ -260,9 +316,9 @@ curl 'https://api.pixiv.moe/v1/illust/50110342'

],
"image_urls":{
"px_128x128":"//i3.pixiv.net/c/128x128/img-master/img/2015/04/30/19/56/14/50110342_p0_square1200.jpg",
"px_480mw":"//i3.pixiv.net/c/480x960/img-master/img/2015/04/30/19/56/14/50110342_p0_master1200.jpg",
"large":"//i3.pixiv.net/img-original/img/2015/04/30/19/56/14/50110342_p0.png"
"px_128x128":"https://api.pixiv.moe/v2/image/i.pximg.net/c/128x128/img-master/img/2015/04/30/19/56/14/50110342_p0_square1200.jpg",
"px_480mw":"https://api.pixiv.moe/v2/image/i.pximg.net/c/480x960/img-master/img/2015/04/30/19/56/14/50110342_p0_master1200.jpg",
"large":"https://api.pixiv.moe/v2/image/i.pximg.net/img-original/img/2015/04/30/19/56/14/50110342_p0.png"
},
"width":784,
"height":704,
Expand All @@ -276,7 +332,7 @@ curl 'https://api.pixiv.moe/v1/illust/50110342'
"account":"axial",
"name":"あゆま紗由",
"profile_image_urls":{
"px_50x50":"http://i2.pixiv.net/user-profile/img/2016/07/13/11/20/47/11192925_b983eb7c8038bffa8db23d1341787d0e_50.jpg"
"px_50x50":"https://api.pixiv.moe/v2/image/i.pximg.net/user-profile/img/2016/07/13/11/20/47/11192925_b983eb7c8038bffa8db23d1341787d0e_50.jpg"
},
"stats":null,
"profile":null
Expand Down Expand Up @@ -347,87 +403,7 @@ curl 'https://api.pixiv.moe/v1/illust/comments/47527196?page=1'
"name":"小原林檎",
"account":"ai888",
"profile_image_urls":{
"medium":"https://i4.pixiv.net/user-profile/img/2016/12/31/18/35/26/11938047_60df513a413dbc60ece3c2328e300a6c_170.jpg"
}
},
"parent_comment":[

]
},
{
"id":43536113,
"comment":"凛ちゃんかわいいです！ LINEのトプ画にいただいてもいいですか？",
"date":"2015-02-09T18:03:15+09:00",
"user":{
"id":7954997,
"name":"かぼす",
"account":"nktama",
"profile_image_urls":{
"medium":"https://source.pixiv.net/common/images/no_profile.png"
}
},
"parent_comment":[

]
},
{
"id":42094960,
"comment":"絵のタッチかわいい すごい好き(*´ω｀*)",
"date":"2014-12-22T20:18:19+09:00",
"user":{
"id":4675404,
"name":"めろうん",
"account":"chaosevangel",
"profile_image_urls":{
"medium":"https://i1.pixiv.net/user-profile/img/2014/11/07/04/15/43/8594336_18ab997b91995f58ac7276919a868459_170.jpg"
}
},
"parent_comment":[

]
},
{
"id":41885041,
"comment":"途中、ホグワーツがあった。",
"date":"2014-12-14T16:56:06+09:00",
"user":{
"id":6695794,
"name":"ラブライバーエグゼイド",
"account":"touhousanngetusei",
"profile_image_urls":{
"medium":"https://i3.pixiv.net/user-profile/img/2015/02/10/22/23/46/8954842_fda4fed98e997f25ed3d9856395c98cf_170.jpg"
}
},
"parent_comment":[

]
},
{
"id":41875578,
"comment":"髪型変更いいゾ〜コレ",
"date":"2014-12-14T09:56:58+09:00",
"user":{
"id":9328878,
"name":"緑丸",
"account":"aimoti1341",
"profile_image_urls":{
"medium":"https://source.pixiv.net/common/images/no_profile.png"
}
},
"parent_comment":[

]
},
{
"id":41848371,
"comment":"www",
"date":"2014-12-13T11:58:48+09:00",
"user":{
"id":5498845,
"name":"bakaookami",
"account":"bakaookami_suzuha",
"profile_image_urls":{
"medium":"https://i4.pixiv.net/user-profile/img/2015/12/20/16/45/33/10264359_44a222b4c066644ecd7d4d5113009ea0_170.jpg"
"medium":"https://api.pixiv.moe/v2/image/i.pximg.net/user-profile/img/2016/12/31/18/35/26/11938047_60df513a413dbc60ece3c2328e300a6c_170.jpg"
}
},
"parent_comment":[
Expand Down Expand Up @@ -475,11 +451,7 @@ curl 'https://api.pixiv.moe/v1/user/auth' \
"scope":"unlimited",
"refresh_token":"BBBBBBBBBBBB",
"user":{
"profile_image_urls":{
"px_16x16":"http://i4.pixiv.net/user-profile/img/2016/08/22/18/33/22/11390779_2ffb9b376cf90d1876182b5d894d5e1f_16.jpg",
"px_50x50":"http://i4.pixiv.net/user-profile/img/2016/08/22/18/33/22/11390779_2ffb9b376cf90d1876182b5d894d5e1f_50.jpg",
"px_170x170":"http://i4.pixiv.net/user-profile/img/2016/08/22/18/33/22/11390779_2ffb9b376cf90d1876182b5d894d5e1f_170.jpg"
},
"profile_image_urls":{},
"id":"123456",
"name":"nickname",
"account":"username",
Expand Down
7 changes: 4 additions & 3 deletions build/webpack.config.base.js
View file
Expand Up @@ -4,7 +4,8 @@ const webpack = require('webpack');
module.exports = {
output: {
path: path.join(__dirname, '/../dist'),
filename: process.env.NODE_ENV === 'production' ? 'app.[hash].js' : 'app.js',
filename:
process.env.NODE_ENV === 'production' ? 'app.[hash].js' : 'app.js',
publicPath: '/'
},
resolve: {
Expand All @@ -23,7 +24,7 @@ module.exports = {
},
{
test: /(\.scss|\.css)$/,
exclude: /node_modules|material-design-lite\.scss/,
exclude: /node_modules/,
use: [
'style-loader',
{
Expand All @@ -41,7 +42,7 @@ module.exports = {
},
{
test: /(\.scss|\.css)$/,
include: /node_modules|material-design-lite\.scss/,
include: /node_modules/,
use: [
'style-loader',
{
Expand Down
1 change: 0 additions & 1 deletion build/webpack.config.dev.js
View file
Expand Up @@ -20,7 +20,6 @@ module.exports = {
entry: [
'babel-polyfill',
'react-hot-loader/patch',
'whatwg-fetch',
'classlist-polyfill',
'./src/index'
],
Expand Down
1 change: 0 additions & 1 deletion build/webpack.config.prod.js
View file
Expand Up @@ -11,7 +11,6 @@ const OptimizeJsPlugin = require('optimize-js-plugin');
module.exports = {
entry: [
'babel-polyfill',
'whatwg-fetch',
'classlist-polyfill',
path.join(__dirname, '../src/index')
],
Expand Down
15 changes: 8 additions & 7 deletions package.json
View file
@@ -1,6 +1,6 @@
{
"name": "pixiv.moe",
"version": "1.3.0",
"version": "1.4.0",
"description": "Source code of https://pixiv.moe",
"scripts": {
"clean": "rimraf dist/*",
Expand Down Expand Up @@ -56,7 +56,6 @@
"eslint-config-kotori": "^0.2.3",
"eslint-loader": "^1.9.0",
"eslint-plugin-prettier": "^2.6.0",
"fetch-mock": "^5.12.2",
"file-loader": "^0.11.2",
"glob": "^7.1.2",
"html-webpack-plugin": "^3.2.0",
Expand Down Expand Up @@ -95,34 +94,36 @@
"webpack-merge": "^4.1.0"
},
"dependencies": {
"@material-ui/core": "^1.2.3",
"@material-ui/docs": "^1.0.0-alpha.3",
"@material-ui/icons": "^1.1.0",
"animation-frame": "^0.3.0",
"autobind-decorator": "^1.4.1",
"classlist-polyfill": "^1.2.0",
"classnames": "^2.2.5",
"honoka": "^0.4.17",
"inobounce": "^0.1.6",
"jszip": "^3.1.4",
"material-design-icons": "^3.0.1",
"material-design-lite": "^1.2.1",
"moment": "^2.16.0",
"namespaced-types": "^0.1.2",
"prop-types": "^15.5.10",
"react": "^16.4.1",
"react-css-modules": "^4.7.1",
"react-document-title": "^2.0.3",
"react-dom": "^16.4.1",
"react-event-listener": "^0.6.1",
"react-ga": "^2.1.2",
"react-image": "^1.0.1",
"react-intl": "^2.4.0",
"react-masonry-component": "^6.2.1",
"react-mdl": "^1.10.3",
"react-md-spinner": "^0.2.5",
"react-modal": "^3.3.1",
"react-redux": "^5.0.6",
"react-router-dom": "^4.1.2",
"redux": "^3.7.2",
"redux-thunk": "^2.1.0",
"shortid": "^2.2.6",
"store": "^2.0.12",
"whatwg-fetch": "^2.0.3"
"store": "^2.0.12"
},
"engines": {
"node": ">=4.0.0"
Expand Down

0 comments on commit 50b2d93

Please sign in to comment.