Browse Source

trouble

style
root 5 years ago
parent
commit
dee136cde7
12 changed files with 4 additions and 2919 deletions
  1. +3
    -0
      .gitignore
  2. +0
    -1
      familyark/app/entrypoint.sh
  3. +1
    -18
      familyark/app/package.json
  4. BIN
      familyark/app/public/images/Sorting icons.psd
  5. BIN
      familyark/app/public/images/favicon.ico
  6. BIN
      familyark/app/public/images/sort_asc.png
  7. BIN
      familyark/app/public/images/sort_asc_disabled.png
  8. BIN
      familyark/app/public/images/sort_both.png
  9. BIN
      familyark/app/public/images/sort_desc.png
  10. BIN
      familyark/app/public/images/sort_desc_disabled.png
  11. +0
    -1489
      familyark/app/yarn-error.log
  12. +0
    -1411
      familyark/app/yarn.lock

+ 3
- 0
.gitignore View File

@ -1 +1,4 @@
mongodb/
mongodb.old/
familyark/app/node_modules
**/*.lock

+ 0
- 1
familyark/app/entrypoint.sh View File

@ -1,4 +1,3 @@
#!/bin/bash
npm i --unsafe-perm
yarn
node server

+ 1
- 18
familyark/app/package.json View File

@ -5,25 +5,9 @@
"private": true,
"license": "MIT",
"scripts": {
"install": "cp node_modules/jquery/dist/jquery.min.js node_modules/bootstrap/dist/js/bootstrap.min.js node_modules/datatables/media/js/jquery.dataTables.min.js node_modules/treant-js/Treant.js node_modules/treant-js/vendor/raphael.js public/js/ && cp node_modules/bootstrap/dist/css/bootstrap.min.css* node_modules/datatables/media/css/jquery.dataTables.min.css node_modules/treant-js/Treant.css public/css/ && cp -r node_modules/datatables/media/images/ public/"
"install": "cp node_modules/jquery/dist/jquery.min.js node_modules/bootstrap/dist/js/bootstrap.min.js node_modules/datatables/media/js/jquery.dataTables.min.js public/js/ && cp node_modules/bootstrap/dist/css/bootstrap.min.css* node_modules/datatables/media/css/jquery.dataTables.min.css public/css/ && cp -r node_modules/datatables/media/images/ public/"
},
"dependencies": {
<<<<<<< HEAD
"body-parser": "^1.19.0",
"bootstrap": "^4.4.1",
"compression": "^1.7.4",
"cookie-parser": "^1.4.4",
"datatables": "^1.10.18",
"express": "^4.17.1",
"helmet": "^3.21.2",
"jquery": "^3.4.1",
"method-override": "^2.3.10",
"mongoose": "*",
"morgan": "^1.9.1",
"popper.js": "^1.16.0",
"request": "^2.88.2",
"serve-favicon": "^2.5.0"
=======
"body-parser": "*",
"bootstrap": "*",
"compression": "*",
@ -44,6 +28,5 @@
"request": "*",
"rotating-file-stream": "^1.4.6",
"serve-favicon": "*"
>>>>>>> d64f7d2a7f505b161de3c0ef05fc9e74e59d978c
}
}

BIN
familyark/app/public/images/Sorting icons.psd View File


BIN
familyark/app/public/images/favicon.ico View File

Before After

BIN
familyark/app/public/images/sort_asc.png View File

Before After
Width: 19  |  Height: 19  |  Size: 160 B

BIN
familyark/app/public/images/sort_asc_disabled.png View File

Before After
Width: 19  |  Height: 19  |  Size: 148 B

BIN
familyark/app/public/images/sort_both.png View File

Before After
Width: 19  |  Height: 19  |  Size: 201 B

BIN
familyark/app/public/images/sort_desc.png View File

Before After
Width: 19  |  Height: 19  |  Size: 158 B

BIN
familyark/app/public/images/sort_desc_disabled.png View File

Before After
Width: 19  |  Height: 19  |  Size: 146 B

+ 0
- 1489
familyark/app/yarn-error.log
File diff suppressed because it is too large
View File


+ 0
- 1411
familyark/app/yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save