Skip to content

Commit 0373142

Browse files
maksymkaDmaksymkaD
committed
Minor fixes and improvements
1 parent 20232ef commit 0373142

File tree

30 files changed

+51
-25
lines changed

30 files changed

+51
-25
lines changed

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/typescript/node_modules/
22
/typescript/dist/
3-
/typescript-nextjs/node_modules/
4-
/typescript-nextjs/dist/
3+
/nextjs-ts/node_modules/
4+
/nextjs-ts/dist/
55
ES6/node_modules/
66
ES6/flexmonster/
77
package-lock.json

‎typescript-next/.gitignore ‎nextjs-ts/.gitignore

File renamed without changes.

‎typescript-next/README.md ‎nextjs-ts/README.md

File renamed without changes.

‎nextjs-ts/next.config.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/** @type {import('next').NextConfig} */
2+
const nextConfig = {
3+
compiler: {
4+
// Enables the styled-components SWC transform
5+
styledComponents: true
6+
}
7+
}
8+
9+
module.exports = nextConfig

‎typescript-next/package.json ‎nextjs-ts/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"version": "1.0.0",
44
"private": true,
55
"scripts": {
6-
"dev": "next dev",
6+
"start": "npm run open-browser && next dev",
7+
"open-browser": "start http://localhost:3000",
78
"build": "next build",
8-
"start": "next start",
9+
"prod": "next start",
910
"lint": "next lint"
1011
},
1112
"dependencies": {
@@ -19,7 +20,7 @@
1920
"next": "13.4.4",
2021
"react": "18.2.0",
2122
"react-dom": "18.2.0",
22-
"react-flexmonster": "^2.9.52",
23+
"react-flexmonster": "latest",
2324
"react-router-dom": "^5.2.0",
2425
"typescript": "5.1.3"
2526
}

‎typescript-next/public/next.svg ‎nextjs-ts/public/next.svg

File renamed without changes.

‎typescript-next/public/vercel.svg ‎nextjs-ts/public/vercel.svg

File renamed without changes.

‎typescript-next/src/UIElements/LogsList.tsx ‎nextjs-ts/src/UIElements/LogsList.tsx

File renamed without changes.

‎nextjs-ts/src/UIElements/NoSsrWrapper.tsx

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import dynamic from 'next/dynamic'
2+
import React from 'react'
3+
4+
const NoSSRWrapper = (props: any) => (
5+
<React.Fragment>{props.children}</React.Fragment>
6+
)
7+
8+
export default dynamic(() => Promise.resolve(NoSSRWrapper), {
9+
ssr: false
10+
})

‎typescript-next/src/UIElements/SideMenu.tsx ‎nextjs-ts/src/UIElements/SideMenu.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import React from "react";
44
export default class SideMenu extends React.Component {
55

66
activeClassName(pathname: string) : string {
7+
if(typeof window === 'undefined') return "";
78
return window.location.pathname == pathname ? "router-link-exact-active" : "";
89
}
910
render() {

‎typescript-next/src/UIElements/ToggleButton.tsx ‎nextjs-ts/src/UIElements/ToggleButton.tsx

File renamed without changes.

‎typescript-next/src/UIElements/ToggleSwitch.tsx ‎nextjs-ts/src/UIElements/ToggleSwitch.tsx

File renamed without changes.

‎typescript-next/src/UIElements/TopMenu.tsx ‎nextjs-ts/src/UIElements/TopMenu.tsx

File renamed without changes.

‎typescript-next/src/app/customizing-grid/page.tsx ‎nextjs-ts/src/app/customizing-grid/page.tsx

File renamed without changes.

‎typescript-next/src/app/customizing-toolbar/page.tsx ‎nextjs-ts/src/app/customizing-toolbar/page.tsx

File renamed without changes.

‎typescript-next/src/app/favicon.ico ‎nextjs-ts/src/app/favicon.ico

File renamed without changes.

‎typescript-next/src/app/globals.css ‎nextjs-ts/src/app/globals.css

File renamed without changes.

‎typescript-next/src/app/handling-events/page.tsx ‎nextjs-ts/src/app/handling-events/page.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
"use client"
22
import * as React from "react";
33
import LogsList from "@/UIElements/LogsList";
4-
import * as FlexmonsterReact from 'react-flexmonster';
54
import ToggleButton from "@/UIElements/ToggleButton";
6-
import 'flexmonster';
5+
import * as FlexmonsterReact from "react-flexmonster";
76

87
export default class HandlingEvents extends React.Component<any, {}> {
98

@@ -12,6 +11,8 @@ export default class HandlingEvents extends React.Component<any, {}> {
1211
event: string
1312
}[] = [];
1413

14+
private isSSR = () => typeof window === 'undefined';
15+
1516
private pivotRef: React.RefObject<FlexmonsterReact.Pivot> = React.createRef<FlexmonsterReact.Pivot>();
1617
private flexmonster!: Flexmonster.Pivot;
1718

@@ -132,7 +133,7 @@ export default class HandlingEvents extends React.Component<any, {}> {
132133
</div>
133134

134135
<div>
135-
<FlexmonsterReact.Pivot
136+
{!this.isSSR() && <FlexmonsterReact.Pivot
136137
ref={this.pivotRef}
137138
toolbar={true}
138139
beforetoolbarcreated={toolbar => {
@@ -145,8 +146,8 @@ export default class HandlingEvents extends React.Component<any, {}> {
145146
height={600}
146147
ready={this.signOnAllEvents}
147148
report="https://cdn.flexmonster.com/github/demo-report.json"
148-
//licenseKey="XXXX-XXXX-XXXX-XXXX-XXXX"
149-
/>
149+
//licenseKey="XXXX-XXXX-XXXX-XXXX-XXXX"
150+
/>}
150151
</div>
151152

152153
<div className="section">

‎typescript-next/src/app/layout.tsx ‎nextjs-ts/src/app/layout.tsx

+10-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import './globals.css'
22
import TopMenu from '@/UIElements/TopMenu'
33
import SideMenu from '@/UIElements/SideMenu'
44
import { Inter } from 'next/font/google'
5+
import NoSsrWrapper from '@/UIElements/NoSsrWrapper'
56

67
const inter = Inter({ subsets: ['latin'] })
78

@@ -17,15 +18,17 @@ export default function RootLayout({
1718
return (
1819
<html lang="en">
1920
<body className={inter.className}>
20-
<div id="app">
21-
<TopMenu />
22-
<div className="wrap">
23-
<SideMenu/>
24-
<div className="pivot-example-container">
25-
{children}
21+
<NoSsrWrapper>
22+
<div id="app">
23+
<TopMenu />
24+
<div className="wrap">
25+
<SideMenu />
26+
<div className="pivot-example-container">
27+
{children}
28+
</div>
2629
</div>
2730
</div>
28-
</div>
31+
</NoSsrWrapper>
2932
</body>
3033
</html>
3134
)

‎nextjs-ts/src/app/page.module.css

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Styles for home page */

‎typescript-next/src/app/page.tsx ‎nextjs-ts/src/app/page.tsx

File renamed without changes.

‎typescript-next/src/app/pivot-table-demo/page.tsx ‎nextjs-ts/src/app/pivot-table-demo/page.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
"use client"
22
import * as React from 'react';
3-
import * as FlexmonsterReact from 'react-flexmonster';
4-
import 'flexmonster';
3+
import dynamic from 'next/dynamic';
4+
import * as FlexmonsterReact from "react-flexmonster";
5+
56

67
class PivotTableDemo extends React.Component {
8+
9+
private isSSR = () => typeof window === 'undefined';
10+
711
render() {
812
return (
913
<>
@@ -20,7 +24,7 @@ class PivotTableDemo extends React.Component {
2024
</div>
2125

2226
<div className="App">
23-
<FlexmonsterReact.Pivot
27+
{!this.isSSR() && <FlexmonsterReact.Pivot
2428
toolbar={true}
2529
beforetoolbarcreated={toolbar => {
2630
toolbar.showShareReportTab = true;
@@ -32,7 +36,7 @@ class PivotTableDemo extends React.Component {
3236
height={600}
3337
report="https://cdn.flexmonster.com/github/demo-report.json"
3438
//licenseKey="XXXX-XXXX-XXXX-XXXX-XXXX"
35-
/>
39+
/>}
3640
</div>
3741
</>
3842
);

‎typescript-next/src/app/updating-data/page.tsx ‎nextjs-ts/src/app/updating-data/page.tsx

File renamed without changes.

‎typescript-next/src/app/using-api-calls/page.tsx ‎nextjs-ts/src/app/using-api-calls/page.tsx

File renamed without changes.

‎typescript-next/src/app/with-amcharts/page.tsx ‎nextjs-ts/src/app/with-amcharts/page.tsx

File renamed without changes.

‎typescript-next/src/app/with-amcharts4/page.tsx ‎nextjs-ts/src/app/with-amcharts4/page.tsx

File renamed without changes.

‎typescript-next/src/app/with-highcharts/page.tsx ‎nextjs-ts/src/app/with-highcharts/page.tsx

File renamed without changes.

‎typescript-next/tsconfig.json ‎nextjs-ts/tsconfig.json

File renamed without changes.

‎typescript-next/next.config.js

-4
This file was deleted.

‎typescript-next/src/app/page.module.css

Whitespace-only changes.

0 commit comments

Comments
 (0)