diff --git a/client/package-lock.json b/client/package-lock.json index 05710f8..90d7403 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -3366,6 +3366,11 @@ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" }, + "cldrjs": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/cldrjs/-/cldrjs-0.5.1.tgz", + "integrity": "sha512-xyiP8uAm8K1IhmpDndZLraloW1yqu0L+HYdQ7O1aGPxx9Cr+BMnPANlNhSt++UKfxytL2hd2NPXgTjiy7k43Ew==" + }, "clean-css": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", @@ -6232,7 +6237,8 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -6241,7 +6247,8 @@ }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6344,7 +6351,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6354,6 +6362,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6373,11 +6382,13 @@ }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6394,6 +6405,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6466,7 +6478,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6476,6 +6489,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6581,6 +6595,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6742,6 +6757,14 @@ "which": "^1.2.14" } }, + "globalize": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/globalize/-/globalize-1.4.2.tgz", + "integrity": "sha512-IfKeYI5mAITBmT5EnH8kSQB5uGson4Fkj2XtTpyEbIS7IHNfLHoeTyLJ6tfjiKC6cJXng3IhVurDk5C7ORqFhQ==", + "requires": { + "cldrjs": "^0.5.0" + } + }, "globals": { "version": "11.10.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz", diff --git a/client/src/components/Hall/Hall.css b/client/src/components/Hall/Hall.css deleted file mode 100644 index e69de29..0000000 diff --git a/client/src/components/Hall/index.js b/client/src/components/Hall/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/client/src/components/Header/logo.png b/client/src/components/Header/logo.png deleted file mode 100644 index e578125..0000000 Binary files a/client/src/components/Header/logo.png and /dev/null differ diff --git a/client/src/components/Header/rectangle.png b/client/src/components/Header/rectangle.png index 28fc16d..58d967b 100644 Binary files a/client/src/components/Header/rectangle.png and b/client/src/components/Header/rectangle.png differ diff --git a/client/src/components/HomePage/index.js b/client/src/components/HomePage/index.js index c2852fd..ec32b49 100644 --- a/client/src/components/HomePage/index.js +++ b/client/src/components/HomePage/index.js @@ -44,10 +44,7 @@ class HomePage extends Component {
- - - - +
diff --git a/client/src/components/Login/login.css b/client/src/components/Login/login.css index 1848f6c..7b7187c 100644 --- a/client/src/components/Login/login.css +++ b/client/src/components/Login/login.css @@ -1,5 +1,5 @@ .photo { - width: 50%; + width: 60%; height: 50%; margin-top: 30px; } diff --git a/client/src/components/Login/logobig.png b/client/src/components/Login/logobig.png index 16bb4f3..b80c694 100644 Binary files a/client/src/components/Login/logobig.png and b/client/src/components/Login/logobig.png differ diff --git a/client/src/components/NavBar/NavBar.css b/client/src/components/NavBar/NavBar.css index 801c2e3..280e355 100644 --- a/client/src/components/NavBar/NavBar.css +++ b/client/src/components/NavBar/NavBar.css @@ -22,7 +22,7 @@ } .logo { - width: 48.74px; + width: 40%; height: 41px; margin-top: 3px; margin-left: 40px; @@ -30,6 +30,8 @@ .nav-outer { display: flex; justify-content: center; + width: 95%; + margin-left:30px; } .main-title { diff --git a/client/src/components/NavBar/logo.png b/client/src/components/NavBar/logo.png index e578125..b80c694 100644 Binary files a/client/src/components/NavBar/logo.png and b/client/src/components/NavBar/logo.png differ diff --git a/package-lock.json b/package-lock.json index 721f310..17d1d8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2017,7 +2017,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2038,12 +2039,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2058,17 +2061,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2185,7 +2191,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2197,6 +2204,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2211,6 +2219,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2218,12 +2227,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2242,6 +2253,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2322,7 +2334,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2334,6 +2347,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2419,7 +2433,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2455,6 +2470,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2474,6 +2490,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2517,12 +2534,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -3446,9 +3465,9 @@ "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", diff --git a/package.json b/package.json index c8d559f..224f6f1 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/queries.sql b/queries.sql index 522fd28..4b1dbdf 100644 --- a/queries.sql +++ b/queries.sql @@ -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") @@ -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"); diff --git a/server/database/models/sequelize.js b/server/database/models/sequelize.js index 9cb9586..6a973e1 100644 --- a/server/database/models/sequelize.js +++ b/server/database/models/sequelize.js @@ -7,7 +7,7 @@ const sequelize = new Sequelize(process.env.DB_URL, { logging: false, dialect: 'postgres', dialectOptions: { - ssl: true, + ssl: false, }, });