Merge pull request #2 from OnrampLab/issue-1-ivr-settings-page

Issue 1 ivr settings page
OnrampLab · Oct 18, 2019 · df93c8e · df93c8e
2 parents 3dca67f + 7c1fefd
commit df93c8e
Show file tree

Hide file tree

Showing 29 changed files with 1,932 additions and 1,200 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,6 @@
 {
     "presets": [
-      "next/babel",
-      "@zeit/next-typescript/babel"
+      "next/babel"
     ],
     "plugins": [
       [

diff --git a/next-env.d.ts b/next-env.d.ts
@@ -0,0 +1,2 @@
+/// <reference types="next" />
+/// <reference types="next/types/global" />
diff --git a/next.config.js b/next.config.js
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const withPlugins = require('next-compose-plugins');
 
-const withTypescript = require('@zeit/next-typescript');
 const withCSS = require('@zeit/next-css');
 const withSass = require('@zeit/next-sass');
 const withLess = require('@zeit/next-less');
@@ -45,7 +44,6 @@ const nextConfig = {
 
 module.exports = withConfig(withPlugins(
   [
-    [withTypescript],
     [withCSS],
     [withSass],
     [withLess],

diff --git a/package.json b/package.json
@@ -21,24 +21,23 @@
     "@zeit/next-css": "^1.0.1",
     "@zeit/next-less": "1.0.2-canary.2",
     "@zeit/next-sass": "^1.0.1",
-    "@zeit/next-typescript": "^1.1.1",
     "antd": "3.23.3",
     "awesome-typescript-loader": "^5.2.1",
     "cssnano": "^4.1.10",
     "date-fns": "^1.30.1",
     "isomorphic-unfetch": "^3.0.0",
-    "next": "^8.1.0",
+    "next": "^9.0.7",
     "next-compose-plugins": "^2.2.0",
-    "next-redux-wrapper": "^2.1.0",
+    "next-redux-wrapper": "^4.0.0",
     "next-routes": "^1.4.2",
-    "next-runtime-dotenv": "^1.1.1",
+    "next-runtime-dotenv": "^1.2.0",
     "nock": "^10.0.6",
     "node-sass": "^4.12.0",
     "nprogress": "^0.2.0",
     "postcss-easy-import": "^3.0.0",
     "query-string": "^6.7.0",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
+    "react": "^16.10.1",
+    "react-dom": "^16.10.1",
     "react-feather": "^1.1.6",
     "react-no-ssr": "^1.1.0",
     "react-redux": "^7.1.0",
@@ -53,13 +52,13 @@
     "@types/enzyme-adapter-react-16": "^1.0.5",
     "@types/jest": "^24.0.12",
     "@types/lodash": "^4.14.138",
-    "@types/next": "^8.0.5",
+    "@types/next": "^8.0.6",
     "@types/next-redux-wrapper": "^2.0.2",
     "@types/node": "^12.0.8",
     "@types/nprogress": "^0.2.0",
-    "@types/react": "^16.9.2",
-    "@types/react-dom": "^16.9.0",
-    "@types/react-redux": "^7.1.0",
+    "@types/react": "^16.9.4",
+    "@types/react-dom": "^16.9.1",
+    "@types/react-redux": "^7.1.4",
     "@types/redux-mock-store": "^1.0.1",
     "@types/styled-components": "^4.1.16",
     "@typescript-eslint/eslint-plugin": "^2.3.0",

diff --git a/pages/ivr/message-settings.tsx b/pages/ivr/message-settings.tsx
diff --git a/pages/ivr/settings.tsx b/pages/ivr/settings.tsx
@@ -0,0 +1,3 @@
+import { SettingsPage } from '@onr/ivr';
+
+export default SettingsPage;
diff --git a/src/app/components/MyApp.tsx b/src/app/components/MyApp.tsx
@@ -1,7 +1,7 @@
 import '../../assets/styles.less';
 import '../../assets/tailwind-extension.css';
 
-import App, { Container, NextAppContext } from 'next/app';
+import App, { NextAppContext } from 'next/app';
 import React from 'react';
 import { Provider } from 'react-redux';
 import withRedux from 'next-redux-wrapper';
@@ -40,8 +40,9 @@ export class AppComponent extends App<any> {
     const { Component, pageProps, store } = this.props;
 
     return (
-      <Container>
+      <>
         <GlobalStyles />
+
         <Head>
           <meta
             name="viewport"
@@ -50,7 +51,7 @@ export class AppComponent extends App<any> {
           <meta charSet="utf-8" />
           <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
           <link rel="shortcut icon" href="/static/images/triangle.png" />
-          <title>Next Starter</title>
+          <title>Ava</title>
           <link
             href="https://fonts.googleapis.com/css?family=Anonymous+Pro:400,700"
             rel="stylesheet"
@@ -64,7 +65,7 @@ export class AppComponent extends App<any> {
             <Component {...pageProps} />
           </Page>
         </Provider>
-      </Container>
+      </>
     );
   }
 }

diff --git a/src/app/configs/menuItems.tsx b/src/app/configs/menuItems.tsx
@@ -15,27 +15,27 @@ export const menuItems: MenuItem[] = [
     name: 'Home',
     icon: <Home strokeWidth={1} size={16} />,
   },
-  {
-    name: 'Demo',
-    icon: <MessageCircle strokeWidth={1} size={16} />,
-    children: [
-      {
-        path: '/demo/planet',
-        name: 'Daily Planet',
-      },
-      {
-        path: '/demo/mars',
-        name: 'Mars Photos',
-      },
-    ],
-  },
+  // {
+  //   name: 'Demo',
+  //   icon: <MessageCircle strokeWidth={1} size={16} />,
+  //   children: [
+  //     {
+  //       path: '/demo/planet',
+  //       name: 'Daily Planet',
+  //     },
+  //     {
+  //       path: '/demo/mars',
+  //       name: 'Mars Photos',
+  //     },
+  //   ],
+  // },
   {
     name: 'IVR',
     icon: <PhoneCall strokeWidth={1} size={16} />,
     children: [
       {
-        path: '/ivr/message-settings',
-        name: 'Message Settings',
+        path: '/ivr/settings',
+        name: 'Settings',
       },
     ],
   },

diff --git a/src/modules/core/components/Header.tsx b/src/modules/core/components/Header.tsx
@@ -1,5 +1,5 @@
 import { Avatar, Layout, Menu } from 'antd';
-import { BarChart, ChevronsDown, Settings, Triangle } from 'react-feather';
+import { BarChart, ChevronsDown, Settings, PhoneCall } from 'react-feather';
 import Link from 'next/link';
 import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
@@ -24,8 +24,8 @@ const MainHeader = (props: IWrapperPage.IProps) => {
         )}
         <Link href="/">
           <a className="brand">
-            <Triangle size={24} strokeWidth={1} />
-            <strong className="mx-1 text-black">{state.name}</strong>
+            <PhoneCall size={20} strokeWidth={1} />
+            <strong className="mx-3 text-black">{state.name}</strong>
           </a>
         </Link>
 

diff --git a/src/modules/core/components/SidebarMenu.tsx b/src/modules/core/components/SidebarMenu.tsx
@@ -12,7 +12,7 @@ import {
   Switch,
   Tooltip,
 } from 'antd';
-import { Book, LogOut, Triangle } from 'react-feather';
+import { Book, LogOut, PhoneCall } from 'react-feather';
 import * as React from 'react';
 import { withRouter, WithRouterProps } from 'next/router';
 import Link from 'next/link';
@@ -110,7 +110,7 @@ const SidebarContent = (props: ISidebarMenuProps) => {
                   if (state.mobile) setMobileDrawer();
                 }}
               >
-                <Link href={route.path} prefetch>
+                <Link href={route.path}>
                   <a>
                     {sidebarIcons && <span className="anticon">{route.icon}</span>}
                     <span className="mr-auto">{capitalize(route.name)}</span>
@@ -139,7 +139,7 @@ const SidebarContent = (props: ISidebarMenuProps) => {
                         if (state.mobile) setMobileDrawer();
                       }}
                     >
-                      <Link href={`${subitem.path ? subitem.path : ''}`} prefetch>
+                      <Link href={`${subitem.path ? subitem.path : ''}`}>
                         <a>
                           <span className="mr-auto">{capitalize(subitem.name)}</span>
                         </a>
@@ -245,9 +245,9 @@ const SidebarContent = (props: ISidebarMenuProps) => {
                 <Header>
                   <Link href="/">
                     <a className="brand">
-                      <Triangle size={24} strokeWidth={1} />
+                      <PhoneCall size={24} strokeWidth={1} />
                       <strong
-                        className="mx-1"
+                        className="mx-3"
                         style={{
                           display: 'inline',
                         }}

diff --git a/src/modules/core/redux/reducers/wrapperReducer.ts b/src/modules/core/redux/reducers/wrapperReducer.ts
@@ -1,10 +1,9 @@
 import { ActionConsts } from '../actions/ActionConsts';
 
 import { IAction, IWrapperPage, IStore } from '@onr/core';
-
 const INITIAL_STATE: IWrapperPage.IStateProps = {
   version: 1,
-  name: 'Next Starter',
+  name: 'Ava',
   mobile: false,
   boxed: false,
   darkSidebar: false,

diff --git a/src/modules/ivr/components/index.ts b/src/modules/ivr/components/index.ts