Skip to content

Commit

Permalink
Update files
Browse files Browse the repository at this point in the history
  • Loading branch information
RazanTayyem committed Dec 1, 2019
1 parent 0cddc32 commit 052706d
Show file tree
Hide file tree
Showing 14 changed files with 66 additions and 30 deletions.
33 changes: 28 additions & 5 deletions client/package-lock.json

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

Empty file.
Empty file.
Binary file removed client/src/components/Header/logo.png
Binary file not shown.
Binary file modified client/src/components/Header/rectangle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions client/src/components/HomePage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ class HomePage extends Component {
<Header />
<div className="tab-container">
<div className="buttons-container">
<input type="button" value="Halls" className="hallsBtn" />
<input type="button" value="Stage" className="stageBtn" />
<input type="button" value="Yards" className="stageBtn" />
<input type="button" value="Hostels" className="stageBtn" />
<input type="button" value="Stage" className="hallsBtn" />
</div>
<div className="tab-line" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Login/login.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.photo {
width: 50%;
width: 60%;
height: 50%;
margin-top: 30px;
}
Expand Down
Binary file modified client/src/components/Login/logobig.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion client/src/components/NavBar/NavBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
}

.logo {
width: 48.74px;
width: 40%;
height: 41px;
margin-top: 3px;
margin-left: 40px;
}
.nav-outer {
display: flex;
justify-content: center;
width: 95%;
margin-left:30px;
}

.main-title {
Expand Down
Binary file modified client/src/components/NavBar/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 21 additions & 7 deletions package-lock.json

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

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,18 @@
"server": "nodemon ./server/server.js",
"build": "cd client && npm run build",
"dev": "concurrently \"npm run server\" \"npm run client\"",
"heroku-postbuild": "cd client && npm install && npm run build",
"db:query": "psql -U staff -d ydrc1 -a -f ./queries.sql"
"heroku-postbuild": "cd client && npm install && npm run build"
},
"repository": {
"type": "git",
"url": "git+https://github.com/FACK1/ReservationSystem.git"
"url": "git+https://github.com/RazanTayyem/ReservationSystem.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/FACK1/ReservationSystem/issues"
"url": "https://github.com/RazanTayyem/ReservationSystem/issues"
},
"homepage": "https://github.com/FACK1/ReservationSystem#readme",
"homepage": "https://github.com/RazanTayyem/ReservationSystem#readme",
"dependencies": {
"bcrypt": "^3.0.4",
"bcryptjs": "^2.4.3",
Expand Down
13 changes: 7 additions & 6 deletions queries.sql
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
insert into users (username, password, role) values ('Admin','$2a$10$D/IX/AtYw5YHT4YWI2B2aOg5ZGMBodHNDx2x6vIbHWomyH4fsJ9SG','admin');
insert into users (username, password, role) values ('ydrc','$2a$10$D/IX/AtYw5YHT4YWI2B2aOg5ZGMBodHNDx2x6vIbHWomyH4fsJ9SG','user');
insert into users (username, password, role) values ('User','$2a$10$D/IX/AtYw5YHT4YWI2B2aOg5ZGMBodHNDx2x6vIbHWomyH4fsJ9SG','user');


insert into services (name,image,capacity,equipment) values ('Stage','http://goingsolo.in/wp-content/uploads/2014/07/theatre.jpg',120,'Datashow');
insert into services (name,image,capacity,equipment) values ('Co-working space 2',"https://files.gitter.im/YDRC-Rooms-Reservation/community/rVSp/Rectangle-2.5.png",40,"Mic, Datashow");


insert into events (title,start_date,end_date,org_name,price,capacity,note,"userId","serviceId",status)
values ('Interview',DATE 'Thu, 14 February 2019 13:30:00', DATE 'Thu, 14 February 2019 13:30:00','YDRC',120,10,'The event is for the interview',1,1,1);
values ('Interview',DATE 'Thu, 14 February 2019 13:30:00', DATE 'Thu, 14 February 2019 13:30:00','PTUK',120,10,'The event is for the interview',1,1,1);
insert into lunches (note,price,time,"eventId")
values ('Makloba',30,'12:15',1);
insert into coffees (note,price,time,"eventId")
Expand All @@ -18,7 +23,3 @@ insert into events (title,start_date,end_date,org_name,price,capacity,note,"user
values ('3 Coffee without suger! and 2 with suger',5,'11:00',2);
insert into equipment (note,price,"eventId")
values ('Datashow',20,2);


insert into services (name,image,capacity,equipment) values ('Co-working space 1',"https://files.gitter.im/YDRC-Rooms-Reservation/community/rVSp/Rectangle-2.5.png",30,"Datashow");
insert into services (name,image,capacity,equipment) values ('Co-working space 2',"https://files.gitter.im/YDRC-Rooms-Reservation/community/rVSp/Rectangle-2.5.png",40,"Mic, Datashow");
2 changes: 1 addition & 1 deletion server/database/models/sequelize.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const sequelize = new Sequelize(process.env.DB_URL, {
logging: false,
dialect: 'postgres',
dialectOptions: {
ssl: true,
ssl: false,
},
});

Expand Down

0 comments on commit 052706d

Please sign in to comment.