Merge remote-tracking branch 'origin/choi'

canbus-web/app.js

@@ -3,18 +3,18 @@ const express = require('express')
 const path = require('path');
 const app = express()
 
-// 라우트 정의
-app.get('/', (req, res) => {
-  res.sendFile(path.join(__dirname, 'main', 'main.html'));
-});
+  // 라우트 정의
+  app.get('/', (req, res) => {
+    res.sendFile(path.join(__dirname, 'auth', 'signin', 'signin.html'));
+  });
 
-app.get('/auth/login', (req, res) => {
-  res.sendFile(path.join(__dirname, 'auth', 'signin', 'signin.html'));
-});
+  app.get('/main', (req, res) => {
+    res.sendFile(path.join(__dirname, 'main', 'main.html'));
+  });
 
-app.get('/auth/register', (req, res) => {
-  res.sendFile(path.join(__dirname, 'auth', 'signup', 'signup.html'));
-});
+  app.get('/register', (req, res) => {
+    res.sendFile(path.join(__dirname, 'auth', 'signup', 'signup.html'));
+  });
 
 app.get('/map', (req, res) => {
   res.sendFile(path.join(__dirname, 'kakaomap', 'map.html'));
@@ -24,12 +24,15 @@ app.get('/sheet', (req, res) => {
   res.sendFile(path.join(__dirname, 'sheet', 'sheet.html'));
 });
 
-app.get('/mybus', (req, res) => {
-  res.sendFile(path.join(__dirname, 'busRoute', 'busRouteSheet.html'));
-});
-
-
-// 서버 시작
-app.listen(3000, () => {
-  console.log('Server running on port 3000');
-});
+  app.get('/mybus', (req, res) => {
+    res.sendFile(path.join(__dirname, 'busRoute', 'busRouteSheet.html'));
+  });
+
+  app.get('/busRoute', (req, res) => {
+    res.sendFile(path.join(__dirname, 'busRoute', 'busRoute.html'));
+  });
+
+  // 서버 시작
+  app.listen(3000, () => {
+    console.log('Server running on port 3000');
+  });

canbus-web/auth/signin/signin.html

@@ -102,7 +102,7 @@
         })
         .then(response => {
             alert(response.data.message);
-            document.location.href='../';
+            document.location.href='../main';
             console.log(response.data);
         })
         .catch(error => {

canbus-web/auth/signup/signup.html

@@ -114,7 +114,7 @@
         })
         .then(response => {
             alert(response.data.message);
-            document.location.href='../auth/login';
+            document.location.href='../';
             console.log(response.data);
         })
         .catch(error => {