Skip to content

Commit 8457d60

Browse files
authored
Merge pull request #16 from oslabs-beta/Rick/backend
Rick/backend
2 parents 6ec20f9 + 463525f commit 8457d60

File tree

3 files changed

+24
-13
lines changed

3 files changed

+24
-13
lines changed
Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
// Removes old link to css and creates a new stylesheet link on demo render
22
// this is not currently being used for the website version
3-
const cssRefresher = () => {
3+
const cssRefresher = (): void => {
44
const oldStylesheet = document.getElementById('stylesheet');
55
if (oldStylesheet !== null) oldStylesheet.remove();
6-
const newStylesheet = document.createElement('LINK');
7-
newStylesheet.setAttribute('rel', 'stylesheet');
8-
newStylesheet.setAttribute('type', 'text/css');
9-
newStylesheet.setAttribute('href', 'fake.css');
10-
newStylesheet.setAttribute('id', 'stylesheet');
11-
document.getElementById('renderFocus').append(newStylesheet);
6+
const newStylesheet = document.createElement('LINK') as HTMLLinkElement;
7+
newStylesheet.rel = 'stylesheet';
8+
newStylesheet.type = 'text/css';
9+
newStylesheet.href = 'fake.css';
10+
newStylesheet.id = 'stylesheet';
11+
const renderFocusElement = document.getElementById('renderFocus');
12+
if (renderFocusElement !== null) {
13+
renderFocusElement.appendChild(newStylesheet);
14+
}
1215
};
1316
export default cssRefresher;
17+
18+

server/models/Oauth-model.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
import mongoose from 'mongoose';
2-
const Schema = mongoose.Schema;
1+
import mongoose, { Document } from 'mongoose';
32

4-
const userSchema = new Schema({
3+
interface UserDocument extends Document {
4+
username?: string;
5+
githubId?: string;
6+
googleId?: string;
7+
}
8+
9+
const userSchema = new mongoose.Schema<UserDocument>({
510
username: { type: String },
611
githubId: { type: String, unique: true },
712
googleId: { type: String, unique: true }
813
});
914

10-
const User = mongoose.model('OauthUsers', userSchema);
15+
const User = mongoose.model<UserDocument>('OauthUsers', userSchema);
16+
1117

1218
export default User;

server/routers/stylesRouter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import express from 'express';
1+
import express, { Request, Response} from 'express';
22
import userStylesController from '../controllers/userStylesController';
33
const router = express.Router();
44

55
// save new css file
6-
router.post('/save', userStylesController.saveCssFile, (req, res) => {
6+
router.post('/save', userStylesController.saveCssFile, (req: Request, res: Response) => {
77
res.status(200).json({});
88
});
99
export default router;

0 commit comments

Comments
 (0)