Skip to content

Commit 66edadc

Browse files
Merge pull request #24 from UncoderIO/ui-fix-3
Add UI improvements
2 parents 7bd8d38 + 093ed6a commit 66edadc

File tree

75 files changed

+838
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+838
-282
lines changed

uncoder-os/.env.common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MODULE_VERSION=1.1.0

uncoder-os/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ yarn-error.log*
2020
# .env
2121

2222
/.idea
23+
.editorconfig

uncoder-os/configs/webpack.common.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,25 @@ const rules = [
1919
onlyCompileBundledFiles: true,
2020
},
2121
}],
22-
exclude: /node_modules/,
22+
exclude: [/node_modules/, /workers/],
23+
},
24+
{
25+
test: /\.worker\.ts$/,
26+
use: [
27+
{
28+
loader: 'worker-loader',
29+
options: {
30+
inline: 'no-fallback',
31+
},
32+
},
33+
'babel-loader',
34+
{
35+
loader: 'ts-loader',
36+
options: {
37+
onlyCompileBundledFiles: true,
38+
},
39+
}],
40+
exclude: [/node_modules/],
2341
},
2442
{
2543
test: /\.svg$/,

uncoder-os/configs/webpack.compile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const plugins = [
1212
name: 'uncoder',
1313
filename: 'remoteEntry.js',
1414
exposes: {
15-
'./UncoderEditor': './src/pages/UncoderEditor/bootstrap',
15+
'./UncoderEditor': './src/pages/UncoderEditor/bootstrap.tsx',
1616
},
1717
shared: packageJson.dependencies,
1818
}),

uncoder-os/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
"react": "^18",
1717
"react-ace": "^10.1.0",
1818
"react-dom": "^18",
19+
"react-error-boundary": "^4.0.11",
1920
"react-redux": "^8.1.3",
21+
"react-tooltip": "^5.24.0",
2022
"redux": "^4.2.1",
2123
"simplebar-react": "^3.2.4"
2224
},
@@ -63,6 +65,7 @@
6365
"webpack": "^5.89.0",
6466
"webpack-cli": "^5.1.4",
6567
"webpack-dev-server": "^4.15.1",
66-
"webpack-merge": "^5.10.0"
68+
"webpack-merge": "^5.10.0",
69+
"worker-loader": "^3.0.8"
6770
}
6871
}

uncoder-os/src/App.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import React, { FC, Suspense } from 'react';
2+
import { MainPage } from './pages/MainPage';
3+
import { Spinner } from './components/Spinner';
4+
5+
const App: FC = () => (
6+
<Suspense fallback={<Spinner />}>
7+
<MainPage />
8+
</Suspense>
9+
);
10+
11+
export default App;

uncoder-os/src/assets/svg/GridIcon.svg

Lines changed: 54 additions & 1 deletion
Loading
Lines changed: 27 additions & 0 deletions
Loading

uncoder-os/src/components/Buttons/Button/Button.sass

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
font-weight: 400
1515
font-size: 14px
1616
color: $textDarkBlue
17+
text-decoration: none
1718
transition: background-color .1s
1819
cursor: pointer
20+
&:hover
21+
text-decoration: none
1922
&:disabled,
2023
&.disabled
2124
&,
@@ -58,3 +61,5 @@
5861
font-size: 16px
5962
&.button--icon
6063
min-width: 30px
64+
&--inline
65+
display: inline-flex
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import React, { AnchorHTMLAttributes, FC } from 'react';
2+
3+
import './Button.sass';
4+
5+
type ButtonLinkPropsType = AnchorHTMLAttributes<Element> & {
6+
classes?: string;
7+
};
8+
9+
export const ButtonLink: FC<ButtonLinkPropsType> = ({
10+
children,
11+
classes = '',
12+
...otherProps
13+
}) => (
14+
<a className={`button ${classes}`} {...otherProps}>
15+
{children}
16+
</a>
17+
);

0 commit comments

Comments
 (0)