Skip to content

2
2021-049
Commit d80cf719 authored by Gihan76's avatar Gihan76
Browse files
Options

Financial Details adding form with DB done!

parent 655c57b4
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 22 deletions
BackEnd/WebBackEnd/server.js
View file @ d80cf719
const express = require('express'); const express = require('express');
const cors = require('cors'); const cors = require('cors');
const bodyParser = require('body-parser');
const mongoose =require('mongoose'); const mongoose =require('mongoose');
require('dotenv').config(); require('dotenv').config();
const app = express(); const app = express();
const port = process.env.PORT || 5000; const port = process.env.PORT || 5000;
app.use(bodyParser.urlencoded({ extended: true }));
app.use(cors()); app.use(cors());
app.use(express.json()); app.use(express.json());
...@@ -17,17 +17,22 @@ mongoose.connect(uri,{useNewUrlParser:true, useUnifiedTopology: true, useCreateI ...@@ -17,17 +17,22 @@ mongoose.connect(uri,{useNewUrlParser:true, useUnifiedTopology: true, useCreateI
const connection = mongoose.connection; const connection = mongoose.connection;
connection.once('open',() => { connection.once('open',() => {
console.log("MongoDB database connection established successfully"); console.log("MongoDB database connection established successfully");
}).catch(err => {
console.error('App starting error:', err.stack);
process.exit(1);
}); });
const studentRouter = require('./routes/student.route'); const studentRouter = require('./routes/student.route');
const tutorRouter = require('./routes/tutor.route'); const tutorRouter = require('./routes/tutor.route');
const instituteRouter = require('./routes/institute.route'); const instituteRouter = require('./routes/institute.route');
const questionManage = require('./routes/question.route'); const questionManage = require('./routes/question.route');
const financeRouter = require('./routes/finance.route');
app.use('/studentSingUp',studentRouter); app.use('/studentSingUp',studentRouter);
app.use('/tutorSingUp',tutorRouter); app.use('/tutorSingUp',tutorRouter);
app.use('/instituteSingUp',instituteRouter); app.use('/instituteSingUp',instituteRouter);
app.use('/questions', questionManage); app.use('/questions', questionManage);
app.use('/admin/finance', financeRouter);
app.listen(port, () => { app.listen(port, () => {
console.log(`Server is running on Port: ${port}`); console.log(`Server is running on Port: ${port}`);
......
WebFrontEnd/smartcoach-frontend/public/DashboardAssets/css/dashboard.css
View file @ d80cf719
...@@ -9427,13 +9427,14 @@ a, button, .btn { ...@@ -9427,13 +9427,14 @@ a, button, .btn {
min-width: 280px; min-width: 280px;
position: relative; position: relative;
flex: 0 0 280px; flex: 0 0 280px;
/*margin-top: -60px;*/ margin-top: 60px;
padding-top: 10px; padding-top: 10px;
transition: all .2s transition: all .2s
} }
.app-sidebar .app-sidebar__inner { .app-sidebar .app-sidebar__inner {
padding: 2px 1.5rem 1.5rem padding: 2px 1.5rem 1.5rem
/*padding: 60px 1.5rem 1.5rem*/
} }
.app-sidebar .scrollbar-sidebar { .app-sidebar .scrollbar-sidebar {
...@@ -9998,7 +9999,8 @@ a, button, .btn { ...@@ -9998,7 +9999,8 @@ a, button, .btn {
} }
.app-main .app-main__inner { .app-main .app-main__inner {
padding: 30px 30px 0; /*padding: 30px 30px 0;*/
padding: 70px 30px 0;
flex: 1 flex: 1
} }
......
WebFrontEnd/smartcoach-frontend/src/App.js
View file @ d80cf719
import './App.css'; import './App.css';
import 'bootstrap/dist/css/bootstrap.min.css'; import 'bootstrap/dist/css/bootstrap.min.css';
import { BrowserRouter as Router, Route } from "react-router-dom"; import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
//Pages //Pages
import Login from "./Components/Login"; import Login from "./Components/Login";
...@@ -14,12 +14,15 @@ function App() { ...@@ -14,12 +14,15 @@ function App() {
return ( return (
<Router> <Router>
<div className="App"> <div className="App">
<ItemNav/> {/*<ItemNav/>*/}
<Route path="/UserLogin" exact component={Login}/> <Route path="/UserLogin" exact component={Login}/>
<Route path="/Home" exact component={Home}/> <Route path="/Home" exact component={Home}/>
<Route path="/SignUp" exact component={SignUp}/> <Route path="/SignUp" exact component={SignUp}/>
<Route path="/admin" exact component={Dashboard}/> {/*<Route path="/" exact component={Dashboard}/>*/}
<Switch>
<Route path="/admin"><Dashboard/></Route>
</Switch>
</div> </div>
</Router> </Router>
); );
......
WebFrontEnd/smartcoach-frontend/src/Components/Admin/Dashboard.js
View file @ d80cf719
import React, {Component} from 'react'; import React, {Component} from 'react';
import {NavLink, Route} from 'react-router-dom';
import {Link} from "react-router-dom";
import AddFinance from './add_financial_details';
export default class Dashboard extends Component { export default class Dashboard extends Component {
render() { render() {
...@@ -108,16 +112,16 @@ export default class Dashboard extends Component { ...@@ -108,16 +112,16 @@ export default class Dashboard extends Component {
<div className="switch has-switch switch-container-class" <div className="switch has-switch switch-container-class"
data-class="fixed-header"> data-class="fixed-header">
<div className="switch-animate switch-on"> <div className="switch-animate switch-on">
<input type="checkbox" defaultChecked <input type="checkbox" defaultChecked data-toggle="toggle" data-onstyle="success"/>
data-toggle="toggle" data-onstyle="success"/>
</div> </div>
</div> </div>
</div> </div>
<div className="widget-content-left"> <div className="widget-content-left">
<div className="widget-heading">Fixed Header <div className="widget-heading">
Fixed Header
</div> </div>
<div className="widget-subheading">Makes the header top <div className="widget-subheading">
fixed, always visible! Makes the header top fixed, always visible!
</div> </div>
</div> </div>
</div> </div>
...@@ -129,15 +133,16 @@ export default class Dashboard extends Component { ...@@ -129,15 +133,16 @@ export default class Dashboard extends Component {
<div className="widget-content-left mr-3"> <div className="widget-content-left mr-3">
<div className="switch has-switch switch-container-class" data-class="fixed-sidebar"> <div className="switch has-switch switch-container-class" data-class="fixed-sidebar">
<div className="switch-animate switch-on"> <div className="switch-animate switch-on">
<input type="checkbox" defaultChecked data-toggle="toggle" data-onstyle="success"/> <input type="checkbox" data-toggle="toggle" data-onstyle="success"/>
</div> </div>
</div> </div>
</div> </div>
<div className="widget-content-left"> <div className="widget-content-left">
<div className="widget-heading">Fixed Sidebar <div className="widget-heading">
Fixed Sidebar
</div> </div>
<div className="widget-subheading">Makes the sidebar left <div className="widget-subheading">
fixed, always visible! Makes the sidebar left fixed, always visible!
</div> </div>
</div> </div>
</div> </div>
...@@ -325,10 +330,14 @@ export default class Dashboard extends Component { ...@@ -325,10 +330,14 @@ export default class Dashboard extends Component {
<ul className="vertical-nav-menu"> <ul className="vertical-nav-menu">
<li> <li>
<a href="#" className="mm-active"> <NavLink activeClassName='mm-active' to={"/admin"}>
<i className="metismenu-icon fa fa-tachometer"></i> <i className="metismenu-icon fa fa-tachometer"></i>
Dashboard Dashboard
</a> </NavLink>
{/*<Link to={"/admin"}>*/}
{/* <i className="metismenu-icon fa fa-tachometer"></i>*/}
{/* Dashboard*/}
{/*</Link>*/}
</li> </li>
<li> <li>
...@@ -383,10 +392,10 @@ export default class Dashboard extends Component { ...@@ -383,10 +392,10 @@ export default class Dashboard extends Component {
</a> </a>
<ul> <ul>
<li> <li>
<a href="#"> <NavLink activeClassName='mm-active' to={"/admin/finance/add"}>
<i className="metismenu-icon"></i> <i className="metismenu-icon"></i>
Add Details Add Details
</a> </NavLink>
</li> </li>
<li> <li>
<a href="#"> <a href="#">
...@@ -429,6 +438,7 @@ export default class Dashboard extends Component { ...@@ -429,6 +438,7 @@ export default class Dashboard extends Component {
<div className="app-main__inner"> <div className="app-main__inner">
{/* ------------------------------Content---------------------------------------- */} {/* ------------------------------Content---------------------------------------- */}
<Route path="/admin/finance/add" exact component={AddFinance} />
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment