update Bootstrap to v5

SingingBush · Jun 17, 2023 · 83c41c4 · 83c41c4
1 parent 53deadb
commit 83c41c4
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ __dummy.html
 *.dll
 *.o
 *.obj
+*.pdb
 
 __test__library__
 

diff --git a/dub.json b/dub.json
@@ -9,8 +9,8 @@
 		"proper-d": "~>0.0.2",
 		"colourfulmoon": "~>1.0.2",
 		"vibe-core": "~>1.22.4",
-		"vibe-d:web": "~>0.9.5",
-		"vibe-d:tls": "~>0.9.5",
+		"vibe-d:web": "~>0.9.6",
+		"vibe-d:tls": "~>0.9.6",
 		"sha3-d": "~>1.0.0",
 		"poodinis": "~>8.1.3",
 		"hibernated": "~>0.3.7"
@@ -31,8 +31,7 @@
 		"printf \"\\033[94mInstalling front end dependencies with yarn...\\033[0m\n\"",
 		"yarn install",
 		"mkdir -p ./public/js ./public/css ./public/fonts",
-		"rsync -u node_modules/jquery/dist/jquery.slim.min.js ./public/js/jquery.slim.min.js",
-		"rsync -u node_modules/popper.js/dist/umd/popper.min.js ./public/js/popper.min.js",
+		"rsync -u node_modules/@popperjs/core/dist/umd/popper.min.js ./public/js/popper.min.js",
 		"rsync -u node_modules/bootstrap/dist/css/bootstrap.min.css ./public/css/bootstrap.min.css",
 		"rsync -u node_modules/bootstrap/dist/js/bootstrap.min.js ./public/js/bootstrap.min.js",
 		"rsync -u node_modules/font-awesome/css/font-awesome.min.css ./public/css/font-awesome.min.css",
@@ -47,8 +46,7 @@
         "if not exist public\\js md public\\js",
         "if not exist public\\css md public\\css",
         "if not exist public\\fonts md public\\fonts",
-        "if not exist /public/js/jquery.slim.min.js copy node_modules\\jquery\\dist\\jquery.slim.min.js public\\js\\jquery.slim.min.js",
-        "if not exist /public/js/popper.min.js copy node_modules\\popper.js\\dist\\umd\\popper.min.js public\\js\\popper.min.js",
+        "if not exist /public/js/popper.min.js copy node_modules\\@popperjs\\core\\dist\\umd\\popper.min.js public\\js\\popper.min.js",
         "if not exist /public/css/bootstrap.min.css copy node_modules\\bootstrap\\dist\\css\\bootstrap.min.css public\\css\\bootstrap.min.css",
         "if not exist /public/js/bootstrap.min.js copy node_modules\\bootstrap\\dist\\js\\bootstrap.min.js public\\js\\bootstrap.min.js",
         "if not exist /public/css/font-awesome.min.css copy node_modules\\font-awesome\\css\\font-awesome.min.css public\\css\\font-awesome.min.css",

diff --git a/package.json b/package.json
@@ -1,8 +1,7 @@
 {
   "dependencies": {
-    "jquery": "^3.5.1",
-    "popper.js": "^1.16.1",
-    "bootstrap": "^4.6.0",
+    "@popperjs/core": "^2.11.7",
+    "bootstrap": "^5.3.0",
     "font-awesome": "4.7.0"
   }
 }
diff --git a/views/admin_users.dt b/views/admin_users.dt
@@ -13,24 +13,21 @@ block body
             .col-md-12
                 h2 Create User
                 form.form-horizontal(action='/admin/user/create', method="POST")
-                    .form-group
+                    .mb-3
                         .input-group
                             label(for='usrName', class='sr-only') Username
                             input.form-control(id="usrName", type="text", name="username", placeholder="Username", autofocus)
-                            .input-group-append
-                                i.input-group-text.fa.fa-user
-                    .form-group
+                            i.input-group-text.fa.fa-user
+                    .mb-3
                         .input-group
                             label(for='passWrd', class='sr-only') Password
                             input.form-control(id="passWrd", type="password", name="password", placeholder="Password")
-                            .input-group-append
-                                i.input-group-text.fa.fa-lock
+                            i.input-group-text.fa.fa-lock
 
-                    .form-group
+                    .mb-3
                         .input-group
                             label(for='email', class='sr-only') Password
                             input.form-control(id="email", type="email", name="email", placeholder="Email")
-                            .input-group-append
-                                i.input-group-text @
+                            i.input-group-text @
 
                     button.btn.btn-primary.btn-lg(type="submit") Submit
diff --git a/views/index.dt b/views/index.dt
@@ -4,8 +4,8 @@ block title
 	title Home
 
 block body
-	.jumbotron.jumbotron-primary
-		.container
+	.p-5.mb-4.bg-light.rounded-3
+		.container.py-5
 			h1& home.welcome-message
 
 	.container(role='main')

diff --git a/views/layout.dt b/views/layout.dt
@@ -30,7 +30,6 @@ html(lang='en')
 		- css("/css/bootstrap.min.css");
 		- css("/styles/style.css");
 
-		script(src='/js/jquery.slim.min.js')
 		script(src='/js/popper.min.js')
 		script(src='/js/bootstrap.min.js')
 
@@ -46,4 +45,4 @@ html(lang='en')
 				p &copy;&nbsp;
 					a(href='#') Samael Bate
 					|
-					| 2022
+					| 2023
diff --git a/views/login.dt b/views/login.dt
@@ -16,18 +16,16 @@ block body
 					h4 Log in
 					hr
 					form.form-horizontal(action="login", method="POST")
-						.form-group
+						.mb-3
 							.input-group
+								i.input-group-text.fa.fa-user
 								input.form-control(id="usrName", type="text", name="username", placeholder="Username", autofocus)
 								label(for='usrName', class='sr-only') Username
-								.input-group-append
-									i.input-group-text.fa.fa-user
-						.form-group
+						.mb-3
 							.input-group
+								i.input-group-text.fa.fa-lock
 								input.form-control(id="passWrd", type="password", name="password", placeholder="Password")
 								label(for='passWrd', class='sr-only') Password
-								.input-group-append
-									i.input-group-text.fa.fa-lock
 
 						button.btn.btn-primary.btn-lg(type="submit") Login
 				- if (_error)

diff --git a/yarn.lock b/yarn.lock
@@ -2,22 +2,17 @@
 # yarn lockfile v1
 
 
-bootstrap@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
-  integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
+"@popperjs/core@^2.11.7":
+  version "2.11.8"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
+
+bootstrap@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.0.tgz#0718a7cc29040ee8dbf1bd652b896f3436a87c29"
+  integrity sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw==
 
 [email protected]:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
   integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
-jquery@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
-  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
-
-popper.js@^1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
-  integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==