Merge pull request #2 from bharatari/dev

v2.1.0

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newshub-client",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "",
   "main": "index.js",
   "engines": {

client/src/routes/Events/routes/Event/View.js

@@ -47,7 +47,7 @@ export default class EventView extends React.Component {
     return (
       <div>
         <SidebarPage currentUrl={currentUrl} actions={actions}
-          header="Event" loading={requestingEvent || requestingUpdateEvent}
+          header="Event" loading={requestingEvent || requestingUpdateEvent || requestingCreateLog || manualLog.requesting}
           user={this.props.user} roles={roles}>
           <Card column="sixteen">
             <div>

client/src/routes/Reservations/routes/Reservation/components/Devices/Component.js

@@ -18,6 +18,7 @@ export default class Devices extends React.Component {
             <span className={classes.quantityHeader}>
               Quantity <span className={classes.quantity}>{device.reservation_devices.quantity}</span>
             </span>
+            <p className={classes.barcode}><i className="barcode icon"></i>{device.barcode}</p>
           </div>
         );
       });

client/src/routes/Reservations/routes/Reservation/components/Devices/Styles.scss

@@ -31,3 +31,10 @@
 .quantity {
   font-family: 'Open Sans';
 }
+
+.barcode {
+  font-family: 'Open Sans';
+  font-weight: 600;
+  display: block;
+  margin-top: 3px;
+}

client/src/routes/Users/routes/NewUser/View.js

@@ -10,14 +10,15 @@ export default class NewUserView extends React.Component {
 
     this.props.actions.createUser(values);
 
-    // if user is existing by email,
-    // just add the new join table details
-    // and ignore first name and last name
+    // TODO Check if the user already
+    // exists by email. If the user does
+    // exist, just add the new join table
+    // details and ignore first name and last name
 
     // After entering email address, it'll check the
-    // server to see if the email already exists
-
-    // If so, it'll gray out first name, last name and password
+    // server to see if the email already exists.
+    // If so, it'll gray out first name, last name
+    // and password
   };
   render() {
     return (
@@ -26,7 +27,7 @@ export default class NewUserView extends React.Component {
           header="New User" loading={this.props.createUser.loading} user={this.props.user}
           roles={this.props.roles}>
           <Card column="sixteen">
-            <Response error={this.props.createUser.error} response={this.props.createUser.user} />
+            <Response error={this.props.createUser.error} response={this.props.createUser.user} successText="Successfully created user." />
             <Form createUser={this.props.createUser} onSubmit={this.handleSubmit} />
           </Card>
         </SidebarPage>

docs/Conventions.md

@@ -12,6 +12,10 @@ File naming conventions should follow platform specific guidelines. For example,
 
 URLs and endpoints are always kebab-cased.
 
+## Database
+
+Tables should be **snake_cased**.
+
 ## Service/Model Naming
 
 Depending on the context, services and models may be referred to in their kebab-case form *or* camelCase form. The `newshub-room-reservation` service resides in the `/services/room-reservation` folder to follow the kebab-case folder structure naming convention and resides on the `/api/room-reservation` endpoint to follow the kebab-case endpoint naming convention. However, in all other contexts the service and model are referred to in their camelCase form. Within permissions, models are camelCased while the rest of the permission is kebab-cased.