Skip to content

Commit f36278f

Browse files
yash-thakuryash-thakur
committed
Resolve conflict
2 parents fc1c33b + eb81ee1 commit f36278f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+17172
-9891
lines changed

‎.demo.env‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
APP_NAME="ReactPWA"
2+
APP_DESCRIPTION="A highly scalable & plug-able, Progressive Web Application foundation with the best Developer Experience."
3+
4+
# PAWCONFIG
5+
# App Settings - Migrated from PawConfig `pawconfig.json`
6+
PORT=3003
7+
HOST=0.0.0.0
8+
APP_ROOT_URL="/"
9+
CDN_URL="https://res.cloudinary.com/atyantik/raw/upload/"
10+
SSR_ENABLED=true
11+
SERVICE_WORKER_ENABLED=true
12+
SINGLE_PAGE_APPLICATION=false
13+
USE_HASHED_ROUTES=false
14+
ASYNC_CSS=false
15+
POLYFILL_CDN=false
16+
REACT_CDN=false
17+
CLIENT_ROOT_ELEMENT_ID="app"
18+
HSTS_ENABLED=true
19+
HSTS_MAX_AGE=31536000
20+
ASSETS_MAX_AGE=2592000000
21+
HSTS_INCLUDE_SUBDOMAINS=false
22+
HSTS_PRELOAD=false
23+
DISABLE_JS=false
24+
DISABLE_CACHE=true

‎.eslintrc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
22
"extends": "./node_modules/@pawjs/pawjs/.eslintrc",
3-
"plugins": [
4-
"react"
5-
],
6-
"rules": {
7-
"quotes": [
8-
"error",
9-
"double"
10-
]
3+
"settings": {
4+
"import/resolver": {
5+
"webpack": {
6+
"config": "./node_modules/@pawjs/pawjs/src/webpack/inc/webpack-resolver-config.js"
7+
}
8+
}
119
}
1210
}

‎.prod.env‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
APP_NAME="ReactPWA"
2+
APP_DESCRIPTION="A highly scalable & plug-able, Progressive Web Application foundation with the best Developer Experience."
3+
4+
# PAWCONFIG
5+
# App Settings - Migrated from PawConfig `pawconfig.json`
6+
PORT=3003
7+
HOST=0.0.0.0
8+
APP_ROOT_URL="/"
9+
CDN_URL=""
10+
SSR_ENABLED=true
11+
SERVICE_WORKER_ENABLED=true
12+
SINGLE_PAGE_APPLICATION=false
13+
USE_HASHED_ROUTES=false
14+
ASYNC_CSS=true
15+
POLYFILL_CDN=false
16+
REACT_CDN=false
17+
CLIENT_ROOT_ELEMENT_ID="app"
18+
HSTS_ENABLED=true
19+
HSTS_MAX_AGE=31536000
20+
ASSETS_MAX_AGE=2592000000
21+
HSTS_INCLUDE_SUBDOMAINS=false
22+
HSTS_PRELOAD=false
23+
DISABLE_JS=false
24+
DISABLE_CACHE=true

‎.snyk‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
2+
version: v1.12.0
3+
ignore: {}
4+
# patches apply the minimum changes required to fix a vulnerability
5+
patch:
6+
'npm:tunnel-agent:20170305':
7+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-gifsicle > gifsicle > bin-build > download > caw > tunnel-agent':
8+
patched: '2018-10-31T15:40:11.360Z'
9+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-mozjpeg > mozjpeg > bin-build > download > caw > tunnel-agent':
10+
patched: '2018-10-31T15:40:11.360Z'
11+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-optipng > optipng-bin > bin-build > download > caw > tunnel-agent':
12+
patched: '2018-10-31T15:40:11.360Z'
13+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-webp > cwebp-bin > bin-build > download > caw > tunnel-agent':
14+
patched: '2018-10-31T15:40:11.360Z'
15+
- '@pawjs/srcset > webp-loader > imagemin-webp > cwebp-bin > bin-build > download > caw > tunnel-agent':
16+
patched: '2018-10-31T15:40:11.360Z'
17+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-gifsicle > gifsicle > bin-wrapper > download > caw > tunnel-agent':
18+
patched: '2018-10-31T15:40:11.360Z'
19+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-mozjpeg > mozjpeg > bin-wrapper > download > caw > tunnel-agent':
20+
patched: '2018-10-31T15:40:11.360Z'
21+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-optipng > optipng-bin > bin-wrapper > download > caw > tunnel-agent':
22+
patched: '2018-10-31T15:40:11.360Z'
23+
- '@pawjs/image-optimizer > image-webpack-loader > imagemin-webp > cwebp-bin > bin-wrapper > download > caw > tunnel-agent':
24+
patched: '2018-10-31T15:40:11.360Z'
25+
- '@pawjs/srcset > webp-loader > imagemin-webp > cwebp-bin > bin-wrapper > download > caw > tunnel-agent':
26+
patched: '2018-10-31T15:40:11.360Z'

‎README.md‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Clone the repository:
1818
git clone https://github.com/Atyantik/react-pwa.git && cd react-pwa
1919
```
2020

21+
Install the dependencies:
22+
```bash
23+
npm install
24+
```
2125

2226
To start the project run following command in your terminal:
2327
```bash
@@ -70,7 +74,12 @@ Our customized routes enable creating meta tags to create Twitter, Google+, Link
7074
Enable HSTS for secure sites. Options to define maxAge and preload of HSTS. All with very simple configuration.
7175
[Read More](https://www.reactpwa.com/docs/en/feature-hsts.html)
7276

73-
Now you are all set, Get your hands dirty with this awesome boilerplate.
77+
Now you are all set, Get your hands dirty with this awesome boilerplate.
78+
79+
#### Known bug
80+
For installed version of `@pawjs/pawjs@ts` there is a known bug of SEO params not updating
81+
in non-SSR mode i.e. Single Page Application mode. Please revert to version `@pawjs/[email protected]`
82+
if required.
7483

7584
### Need contributors.
7685
This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
@@ -101,13 +110,28 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
101110
<a href="https://opencollective.com/react-pwa/sponsor/9/website" target="_blank"><img src="https://opencollective.com/react-pwa/sponsor/9/avatar.svg"></a>
102111

103112
### Supporters
104-
##### Eventerprise.com
105-
<a href="https://www.eventerprise.com" target="_blank"><img width="80px" src="https://www.reactpwa.com/build/images/app/components/footer/9a05e4e59d20232f55938f0454da55f4.png"></a>
113+
##### Atyantik Technologies Private Limited
114+
Everyone at Atyantik Technologies is contributing their free time for contributing to the project and core discussions.
115+
<a href="https://www.atyantik.com" target="_blank"><img width="150px" src="https://www.reactpwa.com/img/supporters/atyantik.svg"></a>
116+
117+
##### DigitalOcean
118+
DigitalOcean has been supporting the open-source project since the very start and has given a dedicated free server to host the website and host the demos. Their contribution is invaluable to the project.
119+
<a href="https://www.digitalocean.com" target="_blank"><img width="120px" src="https://www.reactpwa.com/img/supporters/digitalocean.svg"></a>
120+
121+
122+
##### Eventerprise.com
106123
Eventerprise is the first company to implement react-pwa, The whole idea of PWA applications with react was created with unique requirement of Eventerprise. [Do try the application](https://www.eventerprise.com).
107124

125+
<a href="https://www.eventerprise.com" target="_blank"><img width="180px" src="https://www.reactpwa.com/img/supporters/eventerprise-blue.svg"></a>
126+
127+
108128
##### Browser stack
109129
Thanks to Browser stack we are able to test the PWA nature of application on various mobiles and write automated test cases.
110-
[![Browser Stack](https://www.atyantik.com/wp-content/uploads/2017/10/Browser-Stack-Logo.png)](https://www.browserstack.com)
130+
<a href="https://www.browserstack.com" target="_blank"><img width="180px" src="https://www.reactpwa.com/img/supporters/browserstack-black.png"></a>
131+
132+
##### Navicat
133+
We are very thankful to Navicat for offering their support to the project and providing us an open-source license for further project development.
134+
<a href="https://www.navicat.com" target="_blank"><img width="180px" src="https://www.reactpwa.com/img/supporters/navicat.png"></a>
111135

112136
#### License
113-
This project is licensed under the MIT license, Copyright (c) 2017 [Atyantik Technologies Private Limited](https://www.atyantik.com/). For more information see [LICENSE.md](https://github.com/atyantik/react-pwa/blob/master/LICENSE.md).
137+
This project is licensed under the MIT license, Copyright (c) 2018 [Atyantik Technologies Private Limited](https://www.atyantik.com/). For more information see [LICENSE.md](https://github.com/atyantik/react-pwa/blob/master/LICENSE.md).

‎cloudinary.js‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
const cloudinary = require('cloudinary').v2;
2+
const fs = require('fs');
3+
const path = require('path');
4+
5+
cloudinary.config({
6+
cloud_name: process.env.CLOUDINARY_CLOUD_NAME,
7+
api_key: process.env.CLOUDINARY_API_KEY,
8+
api_secret: process.env.CLOUDINARY_API_SECRET,
9+
});
10+
11+
const walkSync = (dir, fileList = [], rootDir = '') => {
12+
const files = fs.readdirSync(dir);
13+
files.forEach((file) => {
14+
if (fs.statSync(`${dir}/${file}`).isDirectory()) {
15+
// eslint-disable-next-line
16+
fileList = walkSync(dir + '/' + file, fileList, rootDir);
17+
} else {
18+
fileList.push(`${dir}/${file}`.replace(rootDir, ''));
19+
}
20+
});
21+
return fileList;
22+
};
23+
24+
const rootDir = path.resolve(path.join(__dirname, 'dist', 'build'));
25+
26+
27+
const cdnFiles = walkSync(rootDir, [], rootDir);
28+
cdnFiles.forEach((file) => {
29+
cloudinary.uploader.upload(path.resolve(path.join(rootDir, file)), {
30+
public_id: file
31+
.replace(/^\//, '')
32+
.split('.')
33+
.slice(0, -1)
34+
.join('.'),
35+
version: 'v1',
36+
use_filename: true,
37+
overwrite: true,
38+
resource_type: 'raw',
39+
}, (error, res) => {
40+
if (error) {
41+
// eslint-disable-next-line
42+
console.log(error);
43+
} else {
44+
// eslint-disable-next-line
45+
console.log(res);
46+
}
47+
});
48+
});

0 commit comments

Comments
 (0)