김대철 / CafeRecommend

Go to a project
Toggle navigation Toggle navigation pinning
최정민
50e3d290 1 parent b9ee9eee

FIX : 잘못된 코드로 인한 오류수정및 전체적인 디자인 수정 

-
Inline Side-by-side
Showing 7 changed files with 34 additions and 31 deletions
...@@ -5,7 +5,6 @@ var cookieParser = require("cookie-parser"); ...@@ -5,7 +5,6 @@ var cookieParser = require("cookie-parser");
5 var logger = require("morgan"); 5 var logger = require("morgan");
6 6
7 var indexRouter = require("./routes/index"); 7 var indexRouter = require("./routes/index");
8 -var usersRouter = require("./routes/users");
9 8
10 var app = express(); 9 var app = express();
11 10
...@@ -20,7 +19,6 @@ app.use(cookieParser()); ...@@ -20,7 +19,6 @@ app.use(cookieParser());
20 app.use(express.static(path.join(__dirname, "public"))); 19 app.use(express.static(path.join(__dirname, "public")));
21 20
22 app.use("/", indexRouter); 21 app.use("/", indexRouter);
23 -app.use("/users", usersRouter);
24 22
25 // catch 404 and forward to error handler 23 // catch 404 and forward to error handler
26 app.use(function (req, res, next) { 24 app.use(function (req, res, next) {
......
...@@ -23,7 +23,7 @@ router.use( ...@@ -23,7 +23,7 @@ router.use(
23 ); 23 );
24 24
25 var connection = mysql.createConnection({ 25 var connection = mysql.createConnection({
26 - host: "IP주소 입력 (localhost 또는 서버 주소)", 26 + host: "IP주소 입력 (localhost 또는 AWS 서버 주소)",
27 user: "계정 입력", 27 user: "계정 입력",
28 password: "암호 입력", 28 password: "암호 입력",
29 database: "스키마이름 입력", 29 database: "스키마이름 입력",
...@@ -76,7 +76,7 @@ router.get("/login", checkAuthenticated, (req, res) => { ...@@ -76,7 +76,7 @@ router.get("/login", checkAuthenticated, (req, res) => {
76 req.session.user.nickname = row[0].NICKNAME; 76 req.session.user.nickname = row[0].NICKNAME;
77 req.session.user.age = row[0].AGE; 77 req.session.user.age = row[0].AGE;
78 req.session.user.gender = row[0].GENDER; 78 req.session.user.gender = row[0].GENDER;
79 - res.redirect("/map"); 79 + res.render("map", { user: req.session.user });
80 } else { 80 } else {
81 return res.render("login", { user: req.session.user, message: "none" }); 81 return res.render("login", { user: req.session.user, message: "none" });
82 } 82 }
...@@ -171,7 +171,7 @@ router.post("/login", (req, res) => { ...@@ -171,7 +171,7 @@ router.post("/login", (req, res) => {
171 } 171 }
172 }); 172 });
173 173
174 - res.redirect("/map"); 174 + res.render("map", { user: req.session.user });
175 } 175 }
176 }); 176 });
177 }); 177 });
......
1 +{"cookie":{"originalMaxAge":null,"expires":null,"httpOnly":true,"path":"/"},"__lastAccess":1623093255424,"user":{"email":"cjm104174@gmail.com","picture":"https://lh3.googleusercontent.com/a-/AOh14Gh3nytGsPbviGhkznR8HIwrL6o7xBIoFL08nIeU=s96-c","nickname":"Mayf","age":25,"gender":"male"}}
...\ No newline at end of file ...\ No newline at end of file
...@@ -61,18 +61,7 @@ ...@@ -61,18 +61,7 @@
61 <span class="navbar-toggler-icon"></span> 61 <span class="navbar-toggler-icon"></span>
62 </button> 62 </button>
63 <div class="collapse navbar-collapse" id="navbarSupportedContent"> 63 <div class="collapse navbar-collapse" id="navbarSupportedContent">
64 - <a class="navbar-brand" href="/"><strong>Home</strong></a> 64 + <a class="navbar-brand" href="/" style="margin-left: 10px"><strong>Home</strong></a>
65 - <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
66 - <li class="nav-item active">
67 - <a
68 - class="nav-link"
69 - style="color: #ffffff"
70 - href="/"
71 - onclick="signOut();"
72 - >Logout<span class="sr-only">(current)</span></a
73 - >
74 - </li>
75 - </ul>
76 </div> 65 </div>
77 </nav> 66 </nav>
78 <br /><br /> 67 <br /><br />
...@@ -93,17 +82,11 @@ ...@@ -93,17 +82,11 @@
93 button 82 button
94 </div> 83 </div>
95 <br /><br /> 84 <br /><br />
85 + </div>
96 </head> 86 </head>
97 87
98 -<body>
99 -<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
100 88
101 - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> 89 +
102 - <span class="navbar-toggler-icon"></span>
103 - </button>
104 - <div class="collapse navbar-collapse" id="navbarSupportedContent">
105 - <a class="navbar-brand" href="/" style="margin-left: 10px"><strong>Home</strong></a>
106 - </div>
107 </body> 90 </body>
108 91
109 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script> 92 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 style="color: #ffffff" 53 style="color: #ffffff"
54 href="/" 54 href="/"
55 onclick="signOut();" 55 onclick="signOut();"
56 - >Logout<span class="sr-only">(current)</span></a 56 + >Logout<span class="sr-only"></span></a
57 > 57 >
58 </li> 58 </li>
59 </ul> 59 </ul>
......
...@@ -124,24 +124,34 @@ ...@@ -124,24 +124,34 @@
124 data-toggle="modal" 124 data-toggle="modal"
125 data-target="#profile" 125 data-target="#profile"
126 ><%=user.nickname%>'s Profile<span class="sr-only" 126 ><%=user.nickname%>'s Profile<span class="sr-only"
127 - >(current)</span 127 + ></span
128 ></a 128 ></a
129 > 129 >
130 </li> 130 </li>
131 <li class="nav-item active"> 131 <li class="nav-item active">
132 <a 132 <a
133 + class="nav-link"
134 + style="color: #ffffff"
135 + href="#"
136 + onclick="recommend();"
137 + >recommend<span class="sr-only"></span></a
138 + >
139 + </li>
140 +
141 + <li class="nav-item active">
142 + <a
133 class="nav-link" 143 class="nav-link"
134 style="color: #ffffff" 144 style="color: #ffffff"
135 href="/" 145 href="/"
136 onclick="signOut();" 146 onclick="signOut();"
137 - >Logout<span class="sr-only">(current)</span></a 147 + >Logout<span class="sr-only"></span></a
138 > 148 >
139 </li> 149 </li>
140 </ul> 150 </ul>
141 </div> 151 </div>
142 </nav> 152 </nav>
143 <div class="pricing-header px-3 py-1 pt-md-3 pb-md-1 mx-auto text-center"> 153 <div class="pricing-header px-3 py-1 pt-md-3 pb-md-1 mx-auto text-center">
144 - <h3 class="display-6 font-weight-bold">Map</h3> 154 + <h1 class="font-weight-bold">Map</h1>
145 </div> 155 </div>
146 <section id="carousel-3" class="text-center"> 156 <section id="carousel-3" class="text-center">
147 <div class="row"> 157 <div class="row">
......
...@@ -51,6 +51,17 @@ ...@@ -51,6 +51,17 @@
51 </button> 51 </button>
52 <div class="collapse navbar-collapse" id="navbarSupportedContent"> 52 <div class="collapse navbar-collapse" id="navbarSupportedContent">
53 <a class="navbar-brand" href="/" style="margin-left: 10px"><strong>Home</strong></a> 53 <a class="navbar-brand" href="/" style="margin-left: 10px"><strong>Home</strong></a>
54 + <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
55 + <li class="nav-item active">
56 + <a
57 + class="nav-link"
58 + style="color: #ffffff"
59 + href="/map"
60 +
61 + >Map<span class="sr-only"></span></a
62 + >
63 + </li>
64 + </ul>
54 </div> 65 </div>
55 </nav> 66 </nav>
56 67
...@@ -63,9 +74,9 @@ ...@@ -63,9 +74,9 @@
63 <div class="row"> 74 <div class="row">
64 <div class="col-2"></div> 75 <div class="col-2"></div>
65 <div class="col-8"> 76 <div class="col-8">
66 - <hr class="my-4" style="background-color: white"> 77 + <hr class="my-2" style="background-color: white">
67 <form action="/review" method="post"> 78 <form action="/review" method="post">
68 - <hr class="my-3" style="background-color: white"> 79 +
69 <label for="cafeId" class="form-label">카페ID</label> 80 <label for="cafeId" class="form-label">카페ID</label>
70 <select class="form-select form-select-lg" id="cafeId" name="cafeId" required> 81 <select class="form-select form-select-lg" id="cafeId" name="cafeId" required>
71 <option value="<%=cafeId%>" selected><%=cafeId%></option> 82 <option value="<%=cafeId%>" selected><%=cafeId%></option>
......