Skip to content
This repository has been archived by the owner on Oct 3, 2020. It is now read-only.

18 exec management page #36

Merged
merged 40 commits into from Aug 19, 2019
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2425a87
added sass compiler and some scss classes
rcalimuoguelph Jun 6, 2019
c75b6f6
Changed styling of exec page
rcalimuoguelph Jun 9, 2019
3fc7a47
newExec form updates role when role selected
rcalimuoguelph Jun 15, 2019
de7b0fb
merged with master
rcalimuoguelph Jun 15, 2019
6e46e2c
admin exec template
rcalimuoguelph Jun 16, 2019
0cefafe
functionality to validate duplicate admin exec
rcalimuoguelph Jun 23, 2019
ccda5f8
admin_exec changes
rcalimuoguelph Jul 4, 2019
30e9bf0
some styling changes for add new exec
rcalimuoguelph Jul 25, 2019
1dad272
fixed missed illegal character
rcalimuoguelph Jul 25, 2019
07a5db0
Merge remote-tracking branch 'origin' into 18-exec-management-page
rcalimuoguelph Jul 25, 2019
72f1de7
revert main page to not display admin on default
rcalimuoguelph Jul 26, 2019
39fe12f
Added possible route change for get exec
rcalimuoguelph Jul 26, 2019
3495f4a
added logic on front end to change routes
rcalimuoguelph Jul 26, 2019
6e9e4f9
add refresh of page on successful create
rcalimuoguelph Jul 26, 2019
4433e32
added error logging and new route for adminExec
rcalimuoguelph Jul 29, 2019
ad53e46
updated logic for adminExec page
rcalimuoguelph Jul 29, 2019
ad26e2e
fixed find function
rcalimuoguelph Jul 29, 2019
c9daa06
updates to stylesheet
rcalimuoguelph Jul 29, 2019
a1dbc0a
Success and Error Modals
rcalimuoguelph Jul 31, 2019
6a2acc3
Remove Functionality working
rcalimuoguelph Jul 31, 2019
4b7e5a2
Added functionality to update execs
rcalimuoguelph Jul 31, 2019
448a70e
styling changes for modal and updates for uiroute
rcalimuoguelph Aug 10, 2019
b002b1b
Added helper to translate role values into name
rcalimuoguelph Aug 10, 2019
17a9356
fix linting issues
rcalimuoguelph Aug 10, 2019
dd3b9d9
Fixed linting issues
rcalimuoguelph Aug 10, 2019
470105f
Fixed some of the linter stuff to lint the sass files
MarshallAsch Aug 11, 2019
04479f6
removing scss files from gitignore
rcalimuoguelph Aug 14, 2019
568f4fe
re adding main-scss which contains compiled scss
rcalimuoguelph Aug 14, 2019
56d1670
restructured execRoles to array of role values
rcalimuoguelph Aug 14, 2019
eb1985f
updated front-end to use translate helper
rcalimuoguelph Aug 14, 2019
4a644e6
Code quality fix
rcalimuoguelph Aug 14, 2019
5f43625
Fixing Styling for admin exec page
rcalimuoguelph Aug 15, 2019
e1ba3c0
Added full execRoles with values and emails
rcalimuoguelph Aug 15, 2019
2012a59
Removing the editing of execEmails
rcalimuoguelph Aug 15, 2019
226988f
fixed creating new Execs
rcalimuoguelph Aug 15, 2019
4130307
added hover and focus styling for accessibility
rcalimuoguelph Aug 17, 2019
bbe54e0
fixed clear create exec modal
rcalimuoguelph Aug 17, 2019
9e44e6e
merged master
rcalimuoguelph Aug 17, 2019
3db998d
added a couple of the missing roles from the helper file
MarshallAsch Aug 18, 2019
2870315
removed one of the generated sass files
MarshallAsch Aug 19, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Expand Up @@ -17,4 +17,8 @@ out/*
*.rsa
*.pem

**/.DS_Store
**/.DS_Store


public/scss/.sass-cache/
public/scss/main-scss.css.map
14 changes: 0 additions & 14 deletions .stylelintrc

This file was deleted.

32 changes: 32 additions & 0 deletions .stylelintrc.json
@@ -0,0 +1,32 @@
{
"extends": "stylelint-config-standard",
"plugins": [
"stylelint-scss"
],
"rules": {
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": [true,
{
"ignoreAtRules": [
"mixin",
"for",
"include"
]
}
],
"selector-type-no-unknown": [true, {
"ignoreTypes": ["modal"]
}],
"scss/selector-no-redundant-nesting-selector": true,
"block-no-empty": true,
"color-no-invalid-hex": true,
"color-hex-case": "lower",
"comment-no-empty": true,
"font-family-no-missing-generic-family-keyword": true,
"no-extra-semicolons": true,
"no-invalid-double-slash-comments": true,
"property-no-unknown": true,
"string-quotes": "double",
"unit-no-unknown": true
}
}
38 changes: 38 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -11,8 +11,8 @@
"lint-fix": "npm run eslint-fix && npm run stylelint-fix",
"eslint": "eslint authentication config logger middleware models router test validator server.js --max-warnings=0",
"eslint-fix": "eslint authentication config logger middleware models router test validator server.js --fix",
"stylelint": "stylelint public/css --max-warnings=0 --rd",
"stylelint-fix": "stylelint public/css --fix",
"stylelint": "stylelint public/css public/scss --max-warnings=0 --rd",
"stylelint-fix": "stylelint public/css public/scss --fix",
"build-css": "node-sass public/scss/main-scss.scss public/css/main-scss.css",
"watch-css": "nodemon -e scss -x \"npm run build-css\""
},
Expand Down Expand Up @@ -56,6 +56,7 @@
"node-sass": "^4.12.0",
"nyc": "^14.0.0",
"stylelint": "^9.10.1",
"stylelint-scss": "^3.9.3",
"stylelint-config-standard": "^18.3.0",
"supertest": "^4.0.2"
}
Expand Down