stage 3
This commit is contained in:
12
README.md
Normal file
12
README.md
Normal file
@@ -0,0 +1,12 @@
|
||||
first terminal
|
||||
cd web
|
||||
npm install
|
||||
npm start
|
||||
|
||||
second terminal
|
||||
cd backend
|
||||
npm install
|
||||
node express.js
|
||||
|
||||
requires running mongodb service
|
||||
|
||||
2
backend/config.js
Normal file
2
backend/config.js
Normal file
@@ -0,0 +1,2 @@
|
||||
export const dbURL = 'mongodb://localhost:27017/tellall';
|
||||
export const PORT = 5000;
|
||||
119
backend/express.js
Normal file
119
backend/express.js
Normal file
@@ -0,0 +1,119 @@
|
||||
var express = require('express');
|
||||
var alexa = require('alexa-app');
|
||||
|
||||
var bodyParser = require('body-parser');
|
||||
|
||||
const dbURL = 'mongodb://localhost:27017/tellall';
|
||||
const PORT = 5000;
|
||||
|
||||
|
||||
var MongoClient = require ('mongodb').MongoClient;
|
||||
var ObjectID = require ('mongodb').ObjectID;
|
||||
|
||||
const router = express.Router ();
|
||||
|
||||
router.get ('/intents', async (req, res, next) => {
|
||||
try {
|
||||
const id = req.params.id;
|
||||
|
||||
db.collection ('intent_list').find({}).toArray((err,result)=>{
|
||||
if (err) throw err;
|
||||
res.json(result);
|
||||
});
|
||||
|
||||
} catch (e) {
|
||||
console.log ('error:', e);
|
||||
next (e);
|
||||
}
|
||||
});
|
||||
|
||||
router.get ('/deleteIntent/:id', async (req, res, next) => {
|
||||
try {
|
||||
let id = req.params.id;
|
||||
let result = db.collection('intent_list').remove({_id: ObjectID(id)},(err,result)=>{
|
||||
if (err) throw err;
|
||||
res.json(result);
|
||||
});
|
||||
} catch (e) {
|
||||
console.log ('error:', e);
|
||||
next (e);
|
||||
}
|
||||
});
|
||||
|
||||
router.post ('/updateIntent/:id', async (req, res, next) => {
|
||||
try {
|
||||
let id = req.params.id;
|
||||
let intent = req.body;
|
||||
delete intent._id;
|
||||
let result = db.collection('intent_list').update({_id: ObjectID(id)}, intent,{upsert:true}, (err, result)=>{
|
||||
if (err) throw(err);
|
||||
res.json(result);
|
||||
});
|
||||
} catch (e) {
|
||||
console.log ('error:', e);
|
||||
next (e);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
var app = express();
|
||||
|
||||
// ALWAYS setup the alexa app and attach it to express before anything else.
|
||||
var alexaApp = new alexa.app('step3');
|
||||
|
||||
alexaApp.express({
|
||||
expressApp: app,
|
||||
|
||||
// verifies requests come from amazon alexa. Must be enabled for production.
|
||||
// You can disable this if you're running a dev environment and want to POST
|
||||
// things to test behavior. enabled by default.
|
||||
checkCert: false,
|
||||
|
||||
// sets up a GET route when set to true. This is handy for testing in
|
||||
// development, but not recommended for production. disabled by default
|
||||
debug: true
|
||||
});
|
||||
|
||||
// now POST calls to /test in express will be handled by the app.request() function
|
||||
|
||||
// from here on you can setup any other express routes or middlewares as normal
|
||||
app.set("view engine", "ejs");
|
||||
|
||||
alexaApp.launch(function(request, response) {
|
||||
response.say("You launched Saburly app!");
|
||||
});
|
||||
|
||||
alexaApp.intent("GetProcessIntent", {
|
||||
"utterances": [
|
||||
"tell me about projects", "say something about your project", "what are your projects"
|
||||
]
|
||||
},
|
||||
function(request, response) {
|
||||
response.say("We collaborate closely with our clients at each step of the developmentprocess. From designing the UX to developing the front-end andarchitecting the back-end.");
|
||||
}
|
||||
);
|
||||
|
||||
app.use (function (req, res, next) {
|
||||
res.header ('Access-Control-Allow-Origin', '*');
|
||||
res.header (
|
||||
'Access-Control-Allow-Headers',
|
||||
'Origin, Content-Type'
|
||||
);
|
||||
res.header ('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
|
||||
res.header ('Access-Control-Allow-Credentials', 'true');
|
||||
next ();
|
||||
});
|
||||
|
||||
app.use (bodyParser.json ());
|
||||
app.use ('/', router);
|
||||
|
||||
|
||||
MongoClient.connect (dbURL).then (database => {
|
||||
db = database;
|
||||
db.collection ('intent_list');
|
||||
app.listen (PORT, () =>
|
||||
console.log ('Express server running on port ' + PORT)
|
||||
);
|
||||
});
|
||||
43
express.js
43
express.js
@@ -1,43 +0,0 @@
|
||||
var express = require("express");
|
||||
var alexa = require("alexa-app");
|
||||
|
||||
var PORT = process.env.port || 5000;
|
||||
var app = express();
|
||||
|
||||
// ALWAYS setup the alexa app and attach it to express before anything else.
|
||||
var alexaApp = new alexa.app("step1");
|
||||
|
||||
alexaApp.express({
|
||||
expressApp: app,
|
||||
|
||||
// verifies requests come from amazon alexa. Must be enabled for production.
|
||||
// You can disable this if you're running a dev environment and want to POST
|
||||
// things to test behavior. enabled by default.
|
||||
checkCert: false,
|
||||
|
||||
// sets up a GET route when set to true. This is handy for testing in
|
||||
// development, but not recommended for production. disabled by default
|
||||
debug: true
|
||||
});
|
||||
|
||||
// now POST calls to /test in express will be handled by the app.request() function
|
||||
|
||||
// from here on you can setup any other express routes or middlewares as normal
|
||||
app.set("view engine", "ejs");
|
||||
|
||||
alexaApp.launch(function(request, response) {
|
||||
response.say("You launched Saburly app!");
|
||||
});
|
||||
|
||||
alexaApp.intent("GetProcessIntent", {
|
||||
"utterances": [
|
||||
"tell me about projects", "say something about your project", "what are your projects"
|
||||
]
|
||||
},
|
||||
function(request, response) {
|
||||
response.say("We collaborate closely with our clients at each step of the developmentprocess. From designing the UX to developing the front-end andarchitecting the back-end.");
|
||||
}
|
||||
);
|
||||
|
||||
app.listen(PORT);
|
||||
console.log("Listening on port " + PORT + ", try http://localhost:" + PORT + "/step1");
|
||||
21
web/.gitignore
vendored
Normal file
21
web/.gitignore
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
# See https://help.github.com/ignore-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
.env.local
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
2229
web/README.md
Normal file
2229
web/README.md
Normal file
File diff suppressed because it is too large
Load Diff
16
web/package.json
Normal file
16
web/package.json
Normal file
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"name": "web",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"react": "^16.1.1",
|
||||
"react-dom": "^16.1.1",
|
||||
"react-scripts": "1.0.17"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test --env=jsdom",
|
||||
"eject": "react-scripts eject"
|
||||
}
|
||||
}
|
||||
BIN
web/public/favicon.ico
Normal file
BIN
web/public/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
40
web/public/index.html
Normal file
40
web/public/index.html
Normal file
@@ -0,0 +1,40 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta name="theme-color" content="#000000">
|
||||
<!--
|
||||
manifest.json provides metadata used when your web app is added to the
|
||||
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
|
||||
-->
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
|
||||
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
|
||||
<!--
|
||||
Notice the use of %PUBLIC_URL% in the tags above.
|
||||
It will be replaced with the URL of the `public` folder during the build.
|
||||
Only files inside the `public` folder can be referenced from the HTML.
|
||||
|
||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
||||
work correctly both with client-side routing and a non-root public URL.
|
||||
Learn how to configure a non-root public URL by running `npm run build`.
|
||||
-->
|
||||
<title>React App</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
You need to enable JavaScript to run this app.
|
||||
</noscript>
|
||||
<div id="root"></div>
|
||||
<!--
|
||||
This HTML file is a template.
|
||||
If you open it directly in the browser, you will see an empty page.
|
||||
|
||||
You can add webfonts, meta tags, or analytics to this file.
|
||||
The build step will place the bundled scripts into the <body> tag.
|
||||
|
||||
To begin the development, run `npm start` or `yarn start`.
|
||||
To create a production bundle, use `npm run build` or `yarn build`.
|
||||
-->
|
||||
</body>
|
||||
</html>
|
||||
15
web/public/manifest.json
Normal file
15
web/public/manifest.json
Normal file
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"short_name": "React App",
|
||||
"name": "Create React App Sample",
|
||||
"icons": [
|
||||
{
|
||||
"src": "favicon.ico",
|
||||
"sizes": "64x64 32x32 24x24 16x16",
|
||||
"type": "image/x-icon"
|
||||
}
|
||||
],
|
||||
"start_url": "./index.html",
|
||||
"display": "standalone",
|
||||
"theme_color": "#000000",
|
||||
"background_color": "#ffffff"
|
||||
}
|
||||
87
web/src/App.js
Normal file
87
web/src/App.js
Normal file
@@ -0,0 +1,87 @@
|
||||
import React, { Component } from 'react';
|
||||
import './css/App.css';
|
||||
import IntentList from './components/IntentList';
|
||||
import IntentDetails from './components/IntentDetails';
|
||||
|
||||
import {getAllIntents, deleteIntent, updateIntent} from './lib/api'
|
||||
|
||||
class App extends Component {
|
||||
|
||||
constructor(props){
|
||||
super(props);
|
||||
|
||||
this.state={allIntents:[], selectedIntent: {questions:[''],answer:''}};
|
||||
|
||||
getAllIntents().then(l=> l.text()).then(result=>{
|
||||
this.setState({allIntents: JSON.parse(result), selectedIntent: this.state.selectedIntent})
|
||||
})
|
||||
|
||||
this.handleIntentClick = this.handleIntentClick.bind(this);
|
||||
this.handleDeleteIntentClick = this.handleDeleteIntentClick.bind(this);
|
||||
this.handleSaveIntentClick = this.handleSaveIntentClick.bind(this);
|
||||
this.handleAddIntentClick = this.handleAddIntentClick.bind(this);
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div className="App">
|
||||
<div className="App-header">
|
||||
<h1> Tell All </h1>
|
||||
</div>
|
||||
<IntentList allIntents={this.state.allIntents}
|
||||
onIntentClick={this.handleIntentClick}
|
||||
onAddIntentClick={this.handleAddIntentClick}>
|
||||
</IntentList>
|
||||
<IntentDetails selectedIntent={this.state.selectedIntent}
|
||||
onDeleteIntentClick={this.handleDeleteIntentClick}
|
||||
onSaveIntentClick={this.handleSaveIntentClick}>
|
||||
</IntentDetails>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
handleIntentClick(selectedIntent){
|
||||
this.setState({selectedIntent:selectedIntent});
|
||||
}
|
||||
|
||||
handleDeleteIntentClick(selectedIntent){
|
||||
if (selectedIntent._id){
|
||||
deleteIntent(selectedIntent._id).then(l=>l.text()).then(result=>{
|
||||
if (JSON.parse(result).n===1){
|
||||
let id = this.state.allIntents.indexOf(selectedIntent);
|
||||
if (id!==-1){
|
||||
this.state.allIntents.splice(id,1);
|
||||
this.setState({allIntents: this.state.allIntents, selectedIntent: {questions:[''],answer:''}});
|
||||
}else{
|
||||
alert("Error");
|
||||
}
|
||||
}else{
|
||||
alert("Error");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
handleSaveIntentClick(selectedIntent){
|
||||
updateIntent(selectedIntent._id, selectedIntent).then(l=>l.text()).then(result=>{
|
||||
if (JSON.parse(result).nModified===1){
|
||||
this.state.allIntents.map((intent,index)=>{
|
||||
if (intent._id === selectedIntent._id){
|
||||
let newAllIntents = this.state.allIntents;
|
||||
newAllIntents[index] = selectedIntent;
|
||||
this.setState({allIntents: newAllIntents, selectedIntent: selectedIntent});
|
||||
return 1;
|
||||
}
|
||||
});
|
||||
}else{
|
||||
alert("error - update went wrong");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
handleAddIntentClick(){
|
||||
this.setState({allIntents: this.state.allIntents, selectedIntent: {questions:[''], answer:''}});
|
||||
}
|
||||
}
|
||||
|
||||
export default App;
|
||||
8
web/src/App.test.js
Normal file
8
web/src/App.test.js
Normal file
@@ -0,0 +1,8 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import App from './App';
|
||||
|
||||
it('renders without crashing', () => {
|
||||
const div = document.createElement('div');
|
||||
ReactDOM.render(<App />, div);
|
||||
});
|
||||
61
web/src/components/IntentDetails.js
Normal file
61
web/src/components/IntentDetails.js
Normal file
@@ -0,0 +1,61 @@
|
||||
import React, { Component } from 'react';
|
||||
import '../css/Intent.css'
|
||||
|
||||
class IntentDetails extends Component {
|
||||
constructor(props){
|
||||
super(props);
|
||||
|
||||
this.state= {intent: props.selectedIntent};
|
||||
|
||||
this.addQuestion = this.addQuestion.bind(this);
|
||||
this.deleteQuestion = this.deleteQuestion.bind(this);
|
||||
}
|
||||
|
||||
componentWillReceiveProps(props){
|
||||
this.setState({intent: props.selectedIntent});
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div className="IntentDetails">
|
||||
<p> Questions </p>
|
||||
{
|
||||
this.state.intent.questions.map((question, index)=>{
|
||||
return (
|
||||
<div key={index} className="QuestionBox">
|
||||
<input value={question}></input>
|
||||
<button onClick={()=>{this.deleteQuestion(question)}}>Del</button>
|
||||
</div>
|
||||
);
|
||||
})
|
||||
}
|
||||
<p> Answer </p>
|
||||
{
|
||||
<input value={this.state.intent.answer}></input>
|
||||
}
|
||||
<br></br>
|
||||
<br></br>
|
||||
<button onClick={this.addQuestion}>Add question</button>
|
||||
<button onClick={()=>{this.props.onDeleteIntentClick(this.state.intent)}}>Delete</button>
|
||||
<button onClick={()=>{this.props.onSaveIntentClick(this.state.intent)}}>Save</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
addQuestion(){
|
||||
let newIntent = this.state.intent;
|
||||
newIntent.questions.push('New question');
|
||||
this.setState({intent: newIntent});
|
||||
}
|
||||
|
||||
deleteQuestion(question){
|
||||
let newIntent = this.state.intent;
|
||||
let removeId = newIntent.questions.indexOf(question);
|
||||
if (removeId !== -1)
|
||||
newIntent.questions.splice(removeId,1);
|
||||
|
||||
this.setState({intent: newIntent});
|
||||
}
|
||||
}
|
||||
|
||||
export default IntentDetails;
|
||||
21
web/src/components/IntentItem.js
Normal file
21
web/src/components/IntentItem.js
Normal file
@@ -0,0 +1,21 @@
|
||||
import React, { Component } from 'react';
|
||||
import '../css/Intent.css'
|
||||
|
||||
class IntentItem extends Component {
|
||||
|
||||
constructor(props){
|
||||
super(props);
|
||||
|
||||
this.state={intent: props.intent, index: props.index, onClick: props.onClick};
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div className={false ? 'IntentItem-selected' : 'IntentItem'} onClick={()=>{this.state.onClick(this.state.intent)}}>
|
||||
<p> {this.state.index+1}. {this.state.intent.questions[0]} </p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default IntentItem;
|
||||
37
web/src/components/IntentList.js
Normal file
37
web/src/components/IntentList.js
Normal file
@@ -0,0 +1,37 @@
|
||||
import React, { Component } from 'react';
|
||||
import QuestionItem from './IntentItem';
|
||||
import '../css/Intent.css'
|
||||
|
||||
class IntentList extends Component {
|
||||
constructor (props){
|
||||
super(props);
|
||||
|
||||
this.state = {intents: props.allIntents, selected:0, onIntentClick:props.onIntentClick};
|
||||
}
|
||||
|
||||
componentWillReceiveProps(props){
|
||||
this.setState({intents: props.allIntents});
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div className="IntentList">
|
||||
<div className="IntentList-title">
|
||||
<p>Intents</p>
|
||||
</div>
|
||||
{
|
||||
this.state.intents.map((intent,index)=>{
|
||||
return <QuestionItem
|
||||
key={index} intent={intent} index={index}
|
||||
onClick={this.state.onIntentClick}>
|
||||
</QuestionItem>
|
||||
})
|
||||
}
|
||||
<br></br>
|
||||
<button onClick={this.props.handleAddIntentClick}>Add intent</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default IntentList;
|
||||
1
web/src/config.js
Normal file
1
web/src/config.js
Normal file
@@ -0,0 +1 @@
|
||||
export const BASE_URL = 'localhost:5000';
|
||||
28
web/src/css/App.css
Normal file
28
web/src/css/App.css
Normal file
@@ -0,0 +1,28 @@
|
||||
.App {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.App-logo {
|
||||
animation: App-logo-spin infinite 20s linear;
|
||||
height: 80px;
|
||||
}
|
||||
|
||||
.App-header {
|
||||
background-color: #222;
|
||||
height: 150px;
|
||||
padding: 20px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.App-title {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
.App-intro {
|
||||
font-size: large;
|
||||
}
|
||||
|
||||
@keyframes App-logo-spin {
|
||||
from { transform: rotate(0deg); }
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
35
web/src/css/Intent.css
Normal file
35
web/src/css/Intent.css
Normal file
@@ -0,0 +1,35 @@
|
||||
/*IntentList and IntentItem CSS*/
|
||||
|
||||
.IntentList{
|
||||
max-width: 300px;
|
||||
width: 30%;
|
||||
border: 2px solid black;
|
||||
float:left;
|
||||
background-color: gray;
|
||||
}
|
||||
|
||||
.IntentList-title{
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
.IntentItem{
|
||||
margin-top: 1px;
|
||||
margin-bottom: 1px;
|
||||
background-color: blue;
|
||||
}
|
||||
|
||||
.IntentItem-selected{
|
||||
background-color: yellow;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*IntentDetails CSS*/
|
||||
|
||||
.IntentDetails{
|
||||
border: 2px solid blue;
|
||||
float: left;
|
||||
width: 70%;
|
||||
|
||||
|
||||
}
|
||||
5
web/src/css/index.css
Normal file
5
web/src/css/index.css
Normal file
@@ -0,0 +1,5 @@
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
8
web/src/index.js
Normal file
8
web/src/index.js
Normal file
@@ -0,0 +1,8 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import './css/index.css';
|
||||
import App from './App';
|
||||
import registerServiceWorker from './registerServiceWorker';
|
||||
|
||||
ReactDOM.render(<App />, document.getElementById('root'));
|
||||
registerServiceWorker();
|
||||
24
web/src/lib/api.js
Normal file
24
web/src/lib/api.js
Normal file
@@ -0,0 +1,24 @@
|
||||
import fetch from 'isomorphic-fetch';
|
||||
import {BASE_URL} from '../config';
|
||||
|
||||
export const getAllIntents = ()=>{
|
||||
let url = `http://${BASE_URL}/intents`
|
||||
return fetch(url, {method: 'GET'});
|
||||
}
|
||||
|
||||
export const deleteIntent = id=>{
|
||||
let url = `http://${BASE_URL}/deleteIntent/${id}`
|
||||
return fetch(url, {method: 'GET'});
|
||||
}
|
||||
|
||||
export const updateIntent = (id,intent)=>{
|
||||
let url = `http://${BASE_URL}/updateIntent/${id}`
|
||||
return fetch(url, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify(intent),
|
||||
});
|
||||
}
|
||||
7
web/src/logo.svg
Normal file
7
web/src/logo.svg
Normal file
@@ -0,0 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
|
||||
<g fill="#61DAFB">
|
||||
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
|
||||
<circle cx="420.9" cy="296.5" r="45.7"/>
|
||||
<path d="M520.5 78.1z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.6 KiB |
108
web/src/registerServiceWorker.js
Normal file
108
web/src/registerServiceWorker.js
Normal file
@@ -0,0 +1,108 @@
|
||||
// In production, we register a service worker to serve assets from local cache.
|
||||
|
||||
// This lets the app load faster on subsequent visits in production, and gives
|
||||
// it offline capabilities. However, it also means that developers (and users)
|
||||
// will only see deployed updates on the "N+1" visit to a page, since previously
|
||||
// cached resources are updated in the background.
|
||||
|
||||
// To learn more about the benefits of this model, read https://goo.gl/KwvDNy.
|
||||
// This link also includes instructions on opting out of this behavior.
|
||||
|
||||
const isLocalhost = Boolean(
|
||||
window.location.hostname === 'localhost' ||
|
||||
// [::1] is the IPv6 localhost address.
|
||||
window.location.hostname === '[::1]' ||
|
||||
// 127.0.0.1/8 is considered localhost for IPv4.
|
||||
window.location.hostname.match(
|
||||
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
|
||||
)
|
||||
);
|
||||
|
||||
export default function register() {
|
||||
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
|
||||
// The URL constructor is available in all browsers that support SW.
|
||||
const publicUrl = new URL(process.env.PUBLIC_URL, window.location);
|
||||
if (publicUrl.origin !== window.location.origin) {
|
||||
// Our service worker won't work if PUBLIC_URL is on a different origin
|
||||
// from what our page is served on. This might happen if a CDN is used to
|
||||
// serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374
|
||||
return;
|
||||
}
|
||||
|
||||
window.addEventListener('load', () => {
|
||||
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
|
||||
|
||||
if (isLocalhost) {
|
||||
// This is running on localhost. Lets check if a service worker still exists or not.
|
||||
checkValidServiceWorker(swUrl);
|
||||
} else {
|
||||
// Is not local host. Just register service worker
|
||||
registerValidSW(swUrl);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function registerValidSW(swUrl) {
|
||||
navigator.serviceWorker
|
||||
.register(swUrl)
|
||||
.then(registration => {
|
||||
registration.onupdatefound = () => {
|
||||
const installingWorker = registration.installing;
|
||||
installingWorker.onstatechange = () => {
|
||||
if (installingWorker.state === 'installed') {
|
||||
if (navigator.serviceWorker.controller) {
|
||||
// At this point, the old content will have been purged and
|
||||
// the fresh content will have been added to the cache.
|
||||
// It's the perfect time to display a "New content is
|
||||
// available; please refresh." message in your web app.
|
||||
console.log('New content is available; please refresh.');
|
||||
} else {
|
||||
// At this point, everything has been precached.
|
||||
// It's the perfect time to display a
|
||||
// "Content is cached for offline use." message.
|
||||
console.log('Content is cached for offline use.');
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error during service worker registration:', error);
|
||||
});
|
||||
}
|
||||
|
||||
function checkValidServiceWorker(swUrl) {
|
||||
// Check if the service worker can be found. If it can't reload the page.
|
||||
fetch(swUrl)
|
||||
.then(response => {
|
||||
// Ensure service worker exists, and that we really are getting a JS file.
|
||||
if (
|
||||
response.status === 404 ||
|
||||
response.headers.get('content-type').indexOf('javascript') === -1
|
||||
) {
|
||||
// No service worker found. Probably a different app. Reload the page.
|
||||
navigator.serviceWorker.ready.then(registration => {
|
||||
registration.unregister().then(() => {
|
||||
window.location.reload();
|
||||
});
|
||||
});
|
||||
} else {
|
||||
// Service worker found. Proceed as normal.
|
||||
registerValidSW(swUrl);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
console.log(
|
||||
'No internet connection found. App is running in offline mode.'
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export function unregister() {
|
||||
if ('serviceWorker' in navigator) {
|
||||
navigator.serviceWorker.ready.then(registration => {
|
||||
registration.unregister();
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user