Skip to content

Commit be6e5fe

Browse files
committed
fix(style): large rejig to fix bootstrap changes and retire font awesome
Signed-off-by: Jayne Doe <[email protected]>
1 parent b3ff7df commit be6e5fe

File tree

81 files changed

+308
-524
lines changed

Some content is hidden

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

81 files changed

+308
-524
lines changed

.npmignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.idea
2+
.nyc_output
3+
coverage
4+
data
5+
test
6+
7+
*eslint*
8+
.dockerignore
9+
docker-compose.yml
10+
*Dockerfile
11+
nyc*

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ RUN npm i --only=production
1313
# Stage 3 - package files
1414
FROM node:12-alpine AS package
1515
WORKDIR /opt/web/app
16-
COPY --from=compile /opt/web/app/bin ./bin
1716
COPY --from=compile /opt/web/app/config/default.js ./config/
1817
COPY --from=compile /opt/web/app/config/custom-environment-variables.json ./config/
1918
COPY --from=compile /opt/web/app/src ./src

bin/mongo_runner.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
mongodb:
4-
image: mongo
4+
image: mongo:5.0
55
command: mongod
66
ports:
77
- "27017:27017"
@@ -17,7 +17,7 @@ services:
1717
dockerfile: Dockerfile
1818
context: ./
1919
volumes:
20-
- "./test/spec/helpers/certs:/etc/ssl/"
20+
- "./certs:/etc/ssl/"
2121
environment:
2222
APP_NAME: "j4numbers"
2323
APP_HOSTNAME: "localhost"

gulpfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ gulp.task('copy-scripts', () => gulp
6969
gulp.task('copy-images', () => gulp
7070
.src([
7171
'./src/images/**/*.{png,ico,gif,jpg,svg}',
72+
'./node_modules/bootstrap-icons/*.svg',
7273
])
7374
.pipe(gulp.dest('./public/images')));
7475

package-lock.json

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

package.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,27 @@
77
"private": true,
88
"license": "MIT",
99
"scripts": {
10-
"start": "node ./src/app",
11-
"start:dev": "node bin/mongo_runner.js",
12-
"build": "gulp build",
10+
"clean": "gulp clean",
11+
"build": "npm run clean && npm run build:gulp",
12+
"build:gulp": "gulp build",
13+
"cover": "npm run cover:unit",
14+
"cover:unit": "nyc --nycrc-path nyc.js.config.js check-coverage",
1315
"generate-certs": "openssl req -x509 -newkey rsa:2048 -days 365 -nodes -sha256 -subj '/CN=localhost' -keyout certs/localhost-privkey.pem -out certs/localhost-cert.pem",
1416
"quality:eslint": "./node_modules/.bin/eslint -c .eslintrc.js .",
17+
"start": "node ./src/app",
1518
"test": "npm run quality:eslint && npm run test:unit",
1619
"test:unit": "nyc --nycrc-path nyc.js.config.js mocha --config test/.mocharc.js --check-leaks"
1720
},
21+
"repository": {
22+
"type": "git",
23+
"url": "git://[email protected]:j4numbers/personal-website.git"
24+
},
25+
"bugs": {
26+
"url": "https://github.com/j4numbers/personal-website/issues"
27+
},
1828
"dependencies": {
1929
"bootstrap": "^5.1.3",
30+
"bootstrap-icons": "^1.6.1",
2031
"bunyan": "^1.8.15",
2132
"config": "^3.3.6",
2233
"debug": "^4.3.2",
@@ -63,22 +74,14 @@
6374
"sinon-chai": "^3.7.0"
6475
},
6576
"files": [
66-
"bin",
67-
"config/default.js",
68-
"images",
69-
"js",
70-
"lib",
71-
"routes",
72-
"stylesheets",
73-
"views",
74-
".babelrc",
75-
".eslintrc.js",
76-
".gitignore",
77-
"app.js",
77+
"certs",
78+
"config",
79+
"public",
80+
"src",
7881
"gulpfile.js",
79-
"LICENSE",
8082
"lock.html",
8183
"package.json",
84+
"package-lock.json",
8285
"README.md",
8386
"robots.txt",
8487
"sitemap.txt"

src/journey/admin/anime/get_all_anime.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ const getAllAnime = async (req, res, next) => {
4141
top_page: {
4242
title: 'Administrator Toolkit',
4343
tagline: 'All the functions that the administrator of the site has available to them',
44-
fa_type: 'fas',
45-
fa_choice: 'fa-toolbox',
44+
bs_icon: 'tools',
4645
},
4746

4847
content: {

src/journey/admin/anime/get_edit_anime.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ const getEditAnime = async (req, res, next) => {
3535
top_page: {
3636
title: 'Administrator Toolkit',
3737
tagline: 'All the functions that the administrator of the site has available to them',
38-
fa_type: 'fas',
39-
fa_choice: 'fa-toolbox',
38+
bs_icon: 'tools',
4039
},
4140

4241
content: {

src/journey/admin/anime/get_one_anime.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ const getOneAnime = async (req, res, next) => {
3434
top_page: {
3535
title: 'Administrator Toolkit',
3636
tagline: 'All the functions that the administrator of the site has available to them',
37-
fa_type: 'fas',
38-
fa_choice: 'fa-toolbox',
37+
bs_icon: 'tools',
3938
},
4039

4140
content: {

0 commit comments

Comments
 (0)