update dependencies; internal restructure

matthewboman · Dec 13, 2018 · 02f5cc1 · 02f5cc1
1 parent 6fd2778
commit 02f5cc1
Show file tree

Hide file tree

Showing 31 changed files with 2,451 additions and 67,403 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/node_modules
+node_modules
+dist
diff --git a/.npmignore b/.npmignore
@@ -1 +1,7 @@
-/node_modules
+node_modules
+src
+examples
+dummy_data
+.babelrc
+.gitignore
+webpack.config.js
diff --git a/dist/index.html b/dist/index.html
@@ -6,6 +6,5 @@
   </head>
   <body>
     <div id="root"></div>
-    <script src="./dist/main.js"></script>
   <script type="text/javascript" src="main.js"></script></body>
 </html>
diff --git a/dist/main.js b/dist/main.js
diff --git a/src/app/js/components/Demo.js → examples/src/Demo.js b/src/app/js/components/Demo.js → examples/src/Demo.js
@@ -1,13 +1,12 @@
 import React, { Component } from 'react'
 
-import { GOOGLE_API_KEY } from '../config.js'
-import Calendar from './Calendar'
+import Calendar from '../../src/index.js'
 import Docs1 from './Docs1'
 import Docs2 from './Docs2'
 import styles from './Demo.scss'
 
 const calendar_configuration = {
-  api_key: GOOGLE_API_KEY,
+  api_key: 'AIzaSyA13TZidErRpYRuet8rqXPRdxEX_dcM9gU',
   calendars: [
     {
       name: 'demo',

diff --git a/src/app/js/components/Demo.scss → examples/src/Demo.scss b/src/app/js/components/Demo.scss → examples/src/Demo.scss
diff --git a/src/app/js/components/Docs.scss → examples/src/Docs.scss b/src/app/js/components/Docs.scss → examples/src/Docs.scss
diff --git a/src/app/js/components/Docs1.js → examples/src/Docs1.js b/src/app/js/components/Docs1.js → examples/src/Docs1.js
diff --git a/src/app/js/components/Docs2.js → examples/src/Docs2.js b/src/app/js/components/Docs2.js → examples/src/Docs2.js
diff --git a/src/public/index.html → examples/src/index.html b/src/public/index.html → examples/src/index.html
@@ -2,10 +2,13 @@
 <html>
   <head>
     <title>React Google Calendar</title>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </head>
   <body>
+    <noscript>
+        You need to enable JavaScript to run this app.
+    </noscript>
     <div id="root"></div>
-    <script src="./public/dist/main.bundle.js"></script>
-  <script type="text/javascript" src="app.bundle.js"></script></body>
+  </body>
 </html>
diff --git a/src/app/js/index.js → examples/src/index.js b/src/app/js/index.js → examples/src/index.js
@@ -1,5 +1,5 @@
 import React from 'react'
 import { render } from 'react-dom'
-import Demo from './components/Demo'
+import Demo from './Demo'
 
 render(<Demo />, document.getElementById('root'))
diff --git a/index.html b/index.html
@@ -2,10 +2,13 @@
 <html>
   <head>
     <title>React Google Calendar</title>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </head>
   <body>
+    <noscript>
+        You need to enable JavaScript to run this app.
+    </noscript>
     <div id="root"></div>
-    <script src="./dist/main.js"></script>
   </body>
 </html>
diff --git a/index.js b/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,12 +1,16 @@
 {
   "name": "react_google_calendar",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "An implementation of react-big-calendar populated by linked Google calendars",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
-    "start": "webpack-dev-server --mode development --config webpack.base.config.js --open --hot --history-api-fallback --env.PLATFORM=local --env.VERSION=stag",
-    "build": "webpack --mode production --config webpack.prod.config.js --env.PLATFORM=production --env.VERSION=stag --progress",
-    "test": "jest"
+    "build": "webpack --mode production",
+    "deploy": "gh-pages -d examples/dist",
+    "prepublishOnly": "npm run transpile",
+    "publish-demo": "npm run build && npm run deploy",
+    "start": "webpack-dev-server --mode development --open --display-error-details",
+    "test": "jest",
+    "transpile": "babel src -d dist --copy-files"
   },
   "keywords": [
     "react",
@@ -15,20 +19,17 @@
   ],
   "author": "crash <[email protected]>",
   "license": "MIT",
-  "dependencies": {
+  "peerDependencies": {
     "array.prototype.flat": "^1.2.1",
-    "axios": "^0.16.2",
     "bluebird": "^3.5.2",
-    "bootstrap": "^4.1.3",
-    "dotenv": "^6.1.0",
-    "express": "^4.16.4",
     "moment": "^2.22.2",
-    "react": "^15.6.1",
-    "react-big-calendar": "^0.14.4",
-    "react-dom": "^15.6.1"
+    "react": "^16.6.3",
+    "react-big-calendar": "^0.20.2",
+    "react-dom": "^16.6.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-decorators": "^7.0.0",
     "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
@@ -38,9 +39,12 @@
     "@babel/polyfill": "^7.0.0-beta.51",
     "@babel/preset-env": "^7.0.0-beta.51",
     "@babel/preset-react": "^7.0.0-beta.51",
-    "babel-loader": "^8.0.0-beta.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-loader": "^8.0.4",
     "babel-preset-react": "^6.24.1",
     "css-loader": "^0.28.11",
+    "gh-pages": "^2.0.1",
+    "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
     "jest": "^23.6.0",
     "node-sass": "^4.9.4",
@@ -53,6 +57,9 @@
     "webpack-dev-server": "^3.1.0",
     "webpack-merge": "^4.1.4"
   },
+  "resolutions": {
+    "babel-core": "7.0.0-bridge.0"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/crashspringfield/react-google-calendar"

diff --git a/src/app/js/components/Calendar.js b/src/app/js/components/Calendar.js
diff --git a/src/app/js/config.js b/src/app/js/config.js
diff --git a/src/index.js b/src/index.js
@@ -1,3 +1,41 @@
-import Calendar from './app/components/Calendar.js'
+import React, { Component } from 'react'
+import BigCalendar from 'react-big-calendar'
+import moment from 'moment'
 
-export default Calendar
+import 'react-big-calendar/lib/css/react-big-calendar.css'
+import googleAPI from  "./utils/googleAPI"
+
+const localizer = BigCalendar.momentLocalizer(moment)
+
+export default class Calendar extends Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      events: []
+    }
+  }
+
+  componentDidMount = () => {
+    if (this.props.config) {
+      this.getGoogleCalendarEvents()
+    } else {
+      console.log("React Google Calendar requires you pass a configuration object")
+    }
+  }
+
+  getGoogleCalendarEvents = () => {
+    googleAPI.getAllCalendars(this.props.config)
+      .then(events => {
+        this.setState({ events })
+      })
+      .catch(err => { throw new Error(err) })
+  }
+
+  render = () =>
+    <div>
+      <BigCalendar
+        localizer={localizer}
+        events={this.state.events}
+        style={{ height: "100vh" }} />
+    </div>
+}