fix pagination and add appointments page

samuelcolvin · samuelcolvin · commit 7392975fa637 · 2018-04-06T14:31:17.000+01:00
diff --git a/config-overrides.js b/config-overrides.js
@@ -41,14 +41,21 @@ module.exports = function override (config, env) {
       )
     }
   }
-  // add another output file at /simple/
+  // add another output file at /simple/ and /appointments/
   config.plugins.splice(2, 0,
     new HtmlWebpackPlugin({
       inject: true,
       template: path.resolve(__dirname, 'public', 'simple/index.html'),
       filename: 'simple/index.html'
     })
   )
+  config.plugins.splice(2, 0,
+    new HtmlWebpackPlugin({
+      inject: true,
+      template: path.resolve(__dirname, 'public', 'appointments/index.html'),
+      filename: 'appointments/index.html'
+    })
+  )
   // console.dir(config, { depth: 10, colors: true })
   return config
 }
diff --git a/public/appointments/index.html b/public/appointments/index.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>tutorcruncher-socket</title>
+    <style>
+      @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,500);
+      body {
+        background: #eee;
+        font-family: 'Open Sans', sans-serif;
+      }
+      * {
+        box-sizing: border-box;  /* bootstrap does this on most sites. */
+      }
+      main {
+        max-width: 800px;
+        margin: 20px auto;
+      }
+      main > div {
+        background-color: white;
+        border: 1px solid #aaa;
+      }
+    </style>
+  </head>
+  <body>
+    <main>
+      <p><a href="https://github.com/tutorcruncher/socket-frontend">github.com/tutorcruncher/socket-frontend</a></p>
+      <p><a href="/">back to index</a></p>
+      <p>appointments socket view:</p>
+      <div id="socket"></div>
+    </main>
+  </body>
+  <script>
+    var public_key = '9c79f14df986a1ec693c'
+    var api_root = null  // 'https://socket-beta.tutorcruncher.com' 'http://localhost:8000'
+    window.socket = socket(public_key, {
+      mode: 'appointments',
+      api_root: api_root,
+    })
+  </script>
+</html>
diff --git a/public/index.html b/public/index.html
@@ -27,6 +27,7 @@
     <main>
       <p><a href="https://github.com/tutorcruncher/socket-frontend">github.com/tutorcruncher/socket-frontend</a></p>
       <p><a href="/simple/">view simple socket panel</a></p>
+      <p><a href="/appointments/">view appointments socket panel</a></p>
       <p>mode defined by options:</p>
       <div id="socket1"></div>
       <p>Grid mode:</p>
diff --git a/public/simple/index.html b/public/simple/index.html
@@ -35,7 +35,6 @@
     var public_key = '9c79f14df986a1ec693c'
     var api_root = null  // 'https://socket-beta.tutorcruncher.com' 'http://localhost:8000'
     window.socket = socket(public_key, {
-      mode: 'appointments',
       api_root: api_root,
     })
   </script>
diff --git a/src/components/appointments/Appointments.js b/src/components/appointments/Appointments.js
@@ -104,7 +104,7 @@ class Appointments extends Component {
     const on_previous_pages = (page - 1) * this.props.config.pagination
     this.sso_args && await this.update_attendees()
     this.setState({
-      appointments,
+      appointments, page,
       more_pages: appointments.count > appointments.results.length + on_previous_pages,
     })
   }

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,21 @@ module.exports = function override (config, env) {`
`41`	`41`	`)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`		`- // add another output file at /simple/`
	`44`	`+ // add another output file at /simple/ and /appointments/`
`45`	`45`	`config.plugins.splice(2, 0,`
`46`	`46`	`new HtmlWebpackPlugin({`
`47`	`47`	`inject: true,`
`48`	`48`	`template: path.resolve(__dirname, 'public', 'simple/index.html'),`
`49`	`49`	`filename: 'simple/index.html'`
`50`	`50`	`})`
`51`	`51`	`)`
	`52`	`+ config.plugins.splice(2, 0,`
	`53`	`+ new HtmlWebpackPlugin({`
	`54`	`+ inject: true,`
	`55`	`+ template: path.resolve(__dirname, 'public', 'appointments/index.html'),`
	`56`	`+ filename: 'appointments/index.html'`
	`57`	`+ })`
	`58`	`+ )`
`52`	`59`	`// console.dir(config, { depth: 10, colors: true })`
`53`	`60`	`return config`
`54`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class Appointments extends Component {`
`104`	`104`	`const on_previous_pages = (page - 1) * this.props.config.pagination`
`105`	`105`	`this.sso_args && await this.update_attendees()`
`106`	`106`	`this.setState({`
`107`		`- appointments,`
	`107`	`+ appointments, page,`
`108`	`108`	`more_pages: appointments.count > appointments.results.length + on_previous_pages,`
`109`	`109`	`})`
`110`	`110`	`}`