Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hope I don't break everything #39

Merged
merged 2 commits into from
Sep 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Develop/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
package-lock.json
.DS_Store
.DS_Store
.env
3 changes: 2 additions & 1 deletion Develop/models/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var fs = require('fs');
var path = require('path');
var Sequelize = require('sequelize');
require(`dotenv`).config()
var basename = path.basename(module.filename);
var env = process.env.NODE_ENV || 'development';
var config = require(__dirname + '/../config/config.json')[env];
Expand All @@ -11,7 +12,7 @@ var db = {};
if (config.use_env_variable) {
var sequelize = new Sequelize(process.env[config.use_env_variable]);
} else {
var sequelize = new Sequelize(config.database, config.username, config.password, config);
var sequelize = new Sequelize(config.database, config.username, config.password || process.env.DB_PASSWORD, config);
}

fs
Expand Down
1 change: 1 addition & 0 deletions Develop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"express-handlebars": "^5.1.0",
"express-session": "^1.17.1",
"moment": "^2.27.0",
"dotenv": "^8.2.0",
"mysql2": "^1.7.0",
"passport": "^0.4.1",
"passport-local": "^1.0.0",
Expand Down
86 changes: 0 additions & 86 deletions Develop/public/index.html

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion Develop/public/js/signup.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ $(document).ready(function () {
console.log(role)

if (role == "doctor") {
clinicPasswordContainer.html("<label for='exampleInputPassword1'>ClinicPassword</label><input type='password' class='form-control' id='passwordClinic' placeholder='Password'/>")
clinicPasswordContainer.html("<label for='exampleInputPassword1'>Clinic Password*</label><input type='password' class='form-control' id='passwordClinic' placeholder='Password'/>")
clinicPasswordInput = $("#passwordClinic")
}
else {
Expand Down
File renamed without changes.
File renamed without changes.
139 changes: 0 additions & 139 deletions Develop/public/landingpage.html

This file was deleted.

109 changes: 0 additions & 109 deletions Develop/public/login.html

This file was deleted.

Loading