Skip to content

Commit c850ff8

Browse files
baxterjobaxterjo
authored
Merge pull request #4 from baxterjo/baxterjo/upgrade-dioxus-to-0.6
Baxterjo/upgrade dioxus to 0.6
2 parents cbd3cb4 + a82c583 commit c850ff8

File tree

42 files changed

+5164
-1464
lines changed

Some content is hidden

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

42 files changed

+5164
-1464
lines changed

‎Cargo.lock‎

Lines changed: 4818 additions & 986 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,36 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
dioxus = "0.4.3"
10-
dioxus-html-macro = "0.3.0"
11-
dioxus-router = "0.4.3"
12-
dioxus-web = "0.4.3"
9+
dioxus = { version = "=0.6.3", features = ["router", "document"] }
1310
log = "0.4.20"
14-
# markdown = "1.0.0-alpha.16"
1511
wasm-logger = "0.2.0"
16-
dioxus_markdown = { version = "0.2.0", git = "https://github.com/DioxusLabs/markdown.git" }
1712
toml = "0.8.8"
1813
serde = { version = "1.0.194", features = ["derive"] }
1914
walkdir = "2.4.0"
2015
thiserror = "1.0.56"
2116
anyhow = "1.0.79"
2217
urlencoding = "2.1.3"
2318
include_dir = "0.7.3"
24-
pulldown-cmark = "0.9.3"
19+
pulldown-cmark = "0.13.0"
2520
web-sys = { version = "0.3.66", features = ["Window", "Document"] }
2621

2722
[dev-dependencies]
2823
env_logger = "0.10.1"
24+
25+
[features]
26+
default = ["web"]
27+
web = ["dioxus/web"]
28+
desktop = ["dioxus/desktop"]
29+
mobile = ["dioxus/mobile"]
30+
31+
[profile]
32+
33+
[profile.wasm-dev]
34+
inherits = "dev"
35+
opt-level = 1
36+
37+
[profile.server-dev]
38+
inherits = "dev"
39+
40+
[profile.android-dev]
41+
inherits = "dev"

‎Dioxus.toml‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
# App name
44
name = "baxterjo_webapp"
55

6-
# The Dioxus platform to default to
7-
default_platform = "web"
8-
96
# `build` & `serve` output path
107
out_dir = "docs"
118

@@ -25,24 +22,12 @@ reload_html = true
2522
index_on_404 = true
2623

2724
# Which files or dirs will be monitored
28-
watch_path = ["src", "public", "public/css", "site_content"]
25+
watch_path = ["src", "public", "site_content"]
2926

3027
# Include style or script assets
3128
[web.resource]
3229

33-
# CSS style file
34-
style = [
35-
"https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css",
36-
"https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css",
37-
"https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700",
38-
"/css/font-awesome/css/font-awesome.min.css",
39-
"/css/style.css",
40-
]
41-
42-
# Javascript code file
43-
script = [
44-
"https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js",
45-
]
30+
# style = ["assets/css/font-awesome/css/font-awesome.min.css"]
4631

4732
[web.resource.dev]
4833

@@ -54,5 +39,8 @@ style = []
5439
# JavaScript files
5540
script = []
5641

57-
[[web.proxy]]
58-
backend = "http://localhost:8000/api/"
42+
# [[web.proxy]]
43+
# backend = "http://localhost:8000/api/"
44+
45+
[bundle]
46+
icon = ["public/favicon.ico"]

‎docs/404.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
99
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css">
1010
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700">
11-
<link rel="stylesheet" href="/css/font-awesome/css/font-awesome.min.css">
12-
<link rel="stylesheet" href="/css/style.css">
11+
<link rel="stylesheet" href="/assets/css/font-awesome/css/font-awesome.min.css">
12+
<link rel="stylesheet" href="/assets/css/style.css">
1313

1414
</head>
1515
<body>
@@ -25,4 +25,4 @@
2525
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
2626

2727
</body>
28-
</html>
28+
</html>

‎docs/css/style.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ a:active {
175175
========================================================================== */
176176

177177
#home-page-header-wrap-non-bs {
178-
background: url(/img/back.jpg) no-repeat center top;
178+
background: url(/assets/img/back.jpg) no-repeat center top;
179179
margin-top: -70px;
180180
padding-top: 250px;
181181
text-align: center;
@@ -243,7 +243,7 @@ a:active {
243243
}
244244

245245
#work-wrap-non-bs {
246-
background: url(/img/work.jpg) no-repeat center top;
246+
background: url(/assets/img/work.jpg) no-repeat center top;
247247
margin-top: -70px;
248248
padding-top: 250px;
249249
text-align: center;
@@ -278,7 +278,7 @@ a:active {
278278
}
279279

280280
#aboutwrap {
281-
background: url(/img/aboutblackandwhite.JPG) no-repeat center top;
281+
background: url(/assets/img/aboutblackandwhite.JPG) no-repeat center top;
282282
margin-top: -70px;
283283
padding-top: 250px;
284284
text-align: center;
@@ -297,7 +297,7 @@ a:active {
297297
}
298298

299299
#projectswrap {
300-
background: url(/img/work.jpg) no-repeat center top;
300+
background: url(/assets/img/work.jpg) no-repeat center top;
301301
margin-top: -70px;
302302
padding-top: 250px;
303303
text-align: center;
@@ -329,7 +329,7 @@ a:active {
329329
/* Contact Form */
330330

331331
#contactwrap {
332-
background: url(/img/contact.jpg) no-repeat center top;
332+
background: url(/assets/img/contact.jpg) no-repeat center top;
333333
margin-top: -70px;
334334
padding-top: 250px;
335335
text-align: center;
@@ -493,4 +493,4 @@ a:active {
493493
.credits img {
494494
width: 50px;
495495
height: auto;
496-
}
496+
}

‎docs/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
99
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css">
1010
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700">
11-
<link rel="stylesheet" href="/css/font-awesome/css/font-awesome.min.css">
12-
<link rel="stylesheet" href="/css/style.css">
11+
<link rel="stylesheet" href="/assets/css/font-awesome/css/font-awesome.min.css">
12+
<link rel="stylesheet" href="/assets/css/style.css">
1313

1414
</head>
1515
<body>
@@ -25,4 +25,4 @@
2525
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
2626

2727
</body>
28-
</html>
28+
</html>

‎public/css/style.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ a:active {
175175
========================================================================== */
176176

177177
#home-page-header-wrap-non-bs {
178-
background: url(/img/back.jpg) no-repeat center top;
178+
background: url(/assets/img/back.jpg) no-repeat center top;
179179
margin-top: -70px;
180180
padding-top: 250px;
181181
text-align: center;
@@ -243,7 +243,7 @@ a:active {
243243
}
244244

245245
#work-wrap-non-bs {
246-
background: url(/img/work.jpg) no-repeat center top;
246+
background: url(/assets/img/work.jpg) no-repeat center top;
247247
margin-top: -70px;
248248
padding-top: 250px;
249249
text-align: center;
@@ -278,7 +278,7 @@ a:active {
278278
}
279279

280280
#aboutwrap {
281-
background: url(/img/aboutblackandwhite.JPG) no-repeat center top;
281+
background: url(/assets/img/aboutblackandwhite.JPG) no-repeat center top;
282282
margin-top: -70px;
283283
padding-top: 250px;
284284
text-align: center;
@@ -297,7 +297,7 @@ a:active {
297297
}
298298

299299
#projectswrap {
300-
background: url(/img/work.jpg) no-repeat center top;
300+
background: url(/assets/img/work.jpg) no-repeat center top;
301301
margin-top: -70px;
302302
padding-top: 250px;
303303
text-align: center;
@@ -329,7 +329,7 @@ a:active {
329329
/* Contact Form */
330330

331331
#contactwrap {
332-
background: url(/img/contact.jpg) no-repeat center top;
332+
background: url(/assets/img/contact.jpg) no-repeat center top;
333333
margin-top: -70px;
334334
padding-top: 250px;
335335
text-align: center;
@@ -493,4 +493,4 @@ a:active {
493493
.credits img {
494494
width: 50px;
495495
height: auto;
496-
}
496+
}

‎site_content/experience/apricity/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
title = "Apricity Consulting"
2-
thumbnail = "/img/experience/apricity.png"
2+
thumbnail = "/assets/img/experience/apricity.png"
33
description = "February 2018 - September 2021"
44
date_added = 2021-09-01
55
priority_level = 0

‎site_content/experience/generac/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
title = "Generac Clean Energy Solutions"
2-
thumbnail = "/img/experience/generac.png"
2+
thumbnail = "/assets/img/experience/generac.png"
33
description = "September 2021 - Present"
44
date_added = 2024-01-02
55
priority_level = 0

‎site_content/experience/navy/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
title = "US Navy and US Navy Reserves"
2-
thumbnail = "/img/experience/navy/us_navy.png"
2+
thumbnail = "/assets/img/experience/navy/us_navy.png"
33
description = "December 2010 - June 2020"
44
date_added = 2016-10-13
55
priority_level = 0

0 commit comments

Comments
 (0)