Skip to content

Commit ebc8bf1

Browse files
authored
Merge pull request #117 from reZach/load-images
Load images
2 parents c4e046a + f101216 commit ebc8bf1

9 files changed

Lines changed: 51 additions & 4 deletions

File tree

.babelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"Core": "./app/src/core",
1111
"Pages": "./app/src/pages",
1212
"Redux": "./app/src/redux",
13-
"I18n": "./app/localization"
13+
"I18n": "./app/localization",
14+
"Images": "./resources/images"
1415
}
1516
},
1617
"@babel/plugin-syntax-dynamic-import"

app/src/constants/routes.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"MOTD": "/motd",
55
"LOCALIZATION": "/localization",
66
"UNDOREDO": "/undoredo",
7-
"CONTEXTMENU": "/contextmenu"
7+
"CONTEXTMENU": "/contextmenu",
8+
"IMAGE": "/image"
89
}

app/src/core/nav.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@ class Nav extends React.Component {
228228
onClick={() => this.navigate(ROUTES.CONTEXTMENU)}>
229229
Custom context menu
230230
</a>
231+
<a
232+
className="navbar-item"
233+
onClick={() => this.navigate(ROUTES.IMAGE)}>
234+
Sample image loaded
235+
</a>
231236
</div>
232237
</div>
233238
</div>

app/src/core/routes.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ const UndoRedo = loadable(() =>
2424
const ContextMenu = loadable(() =>
2525
import(/* webpackChunkName: "ContextMenuChunk" */ "Pages/contextmenu/contextmenu")
2626
);
27+
const Image = loadable(() =>
28+
import(/* webpackChunkName: "ContextMenuChunk" */ "Pages/image/image")
29+
);
2730

2831
class AppRoutes extends React.Component {
2932
render() {
@@ -35,6 +38,7 @@ class AppRoutes extends React.Component {
3538
<Route path={ROUTES.LOCALIZATION} element={<Localization />}></Route>
3639
<Route path={ROUTES.UNDOREDO} element={<UndoRedo />}></Route>
3740
<Route path={ROUTES.CONTEXTMENU} element={<ContextMenu />}></Route>
41+
<Route path={ROUTES.IMAGE} element={<Image />}></Route>
3842
</Routes>
3943
);
4044
}

app/src/pages/image/image.jsx

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from "react";
2+
3+
import img from "Images/testimage.png";
4+
5+
class Image extends React.Component {
6+
render() {
7+
return (
8+
<section className="section">
9+
<div className="container">
10+
<h1 className="title is-1">Loading images</h1>
11+
</div>
12+
<div className="container mt-2">
13+
This page is to demonstrate that we can load an image hosted from a
14+
directory in our project.
15+
</div>
16+
<div className="container mt-2">
17+
<img src={img} />
18+
</div>
19+
</section>
20+
);
21+
}
22+
}
23+
24+
export default Image;

app/src/pages/welcome/welcome.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class Welcome extends React.Component {
2828
<Link to={ROUTES.LOCALIZATION}>Changing locales.</Link> <br />
2929
<Link to={ROUTES.UNDOREDO}>Undo/redoing actions.</Link> <br />
3030
<Link to={ROUTES.CONTEXTMENU}>Custom context menu.</Link> <br />
31+
<Link to={ROUTES.IMAGE}>Sample image loaded.</Link> <br />
3132
</div>
3233
</div>
3334
</section>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "secure-electron-template",
3-
"version": "19.0.1",
3+
"version": "20.0.0",
44
"description": "The best way to build Electron apps with security in mind.",
55
"private": true,
66
"main": "app/electron/main.js",

resources/images/testimage.png

7.05 KB
Loading

webpack.config.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,18 @@ module.exports = {
6464
},
6565
// loads common image formats
6666
{
67-
test: /\.(eot|woff|woff2|ttf|svg|png|jpg|gif)$/,
67+
test: /\.(svg|png|jpg|gif)$/,
68+
include: [
69+
path.resolve(__dirname, "resources/images")
70+
],
71+
type: "asset/inline"
72+
},
73+
// loads common font formats
74+
{
75+
test: /\.(eot|woff|woff2|ttf)$/,
76+
include: [
77+
path.resolve(__dirname, "resources/fonts")
78+
],
6879
type: "asset/inline"
6980
}
7081
]

0 commit comments

Comments
 (0)