Skip to content

Commit

Permalink
Merge branch 'main' into database_and_authentication
Browse files Browse the repository at this point in the history
# Conflicts:
#	client/css/form.css
#	client/css/home.css
  • Loading branch information
muhammedp903 committed Mar 17, 2023
2 parents 8c6f5d4 + 1834e36 commit 0cbb7b2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@ Tutor: Elaine Duffin

Create a todo app that allows the user to track progress with assesments and exams.

## To Start Server

- Change Dir to server (```cd server```)
- make sure node/npm is installed (```npm --version``` OR ```node --version```)
- install node packages (```npm i```)
- install nodemon for dev package(```npm i nodemon --save-dev```)
- run server (```npm run dev```)
4 changes: 2 additions & 2 deletions client/css/form.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ body{
display:flex;
justify-content: center;
align-items:center;
background: url('/images/background.jpg');
background-size:cover;
background-position: center;
background-image: url('/images/taxi.jpg');
background-position:center;
font-family: 'roboto',sans-serif;
}

Expand Down
2 changes: 1 addition & 1 deletion client/css/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body{
display: flex;
flex-direction: column;
min-height:100vh;
background: url('/images/taxi.jpg');
background: url('/images/background.jpg');
background-size:cover;


Expand Down
Binary file added client/images/background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0cbb7b2

Please sign in to comment.