Skip to content

Commit

Permalink
Sucsessful User Reg and Login
Browse files Browse the repository at this point in the history
  • Loading branch information
@BimsaraBodaragama
BimsaraBodaragama committed Apr 6, 2022
1 parent f67fa81 commit d4c04fa
Show file tree
Hide file tree
Showing 1,855 changed files with 157,939 additions and 167 deletions.
Binary file modified src/main/resources/static/assets/pics/trbLogo.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/assets/pics/trbLogo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/assets/pics/trbLogoCropped.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/static/assets/pics/trbLogoMain.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
166 changes: 83 additions & 83 deletions src/main/resources/templates/index.html
View file

Large diffs are not rendered by default.

97 changes: 16 additions & 81 deletions src/main/resources/templates/layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">School System</title>

<link rel="shortcut icon" th:href="@{/assets/pics/trbLogo.png}" />
<link rel="shortcut icon" th:href="@{/assets/pics/trbLogo.jpg}" />

<meta
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
Expand Down Expand Up @@ -91,7 +91,7 @@
<!-- Sidebar - Brand -->
<a class="sidebar-brand d-flex align-items-center justify-content-center" href="/home">
<div class="sidebar-brand-icon">
<img th:src="@{/assets/pics/trbLogo.png}" width="32" height="46">
<img th:src="@{/assets/pics/trbLogo.jpg}" width="32" height="46">
</div>
<div class="sidebar-brand-text mx-3">
<div class="t1">ROYAL</div>
Expand All @@ -114,7 +114,7 @@

<!-- Heading -->
<div class="sidebar-heading">
Student Management
SELECTION BAR
</div>

<!-- Nav Item - Pages Collapse Menu -->
Expand All @@ -123,46 +123,14 @@
aria-expanded="true" aria-controls="collapseTwo">
<!-- <i class="fas fa-fw fa-graduation-cap"></i>-->
<i class="fas fa-fw fa-address-card"></i>
<span>Main</span>
<span>Accounts</span>
</a>
<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo"
data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<h6 class="collapse-header" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add:</h6>
<a class="collapse-item" href="/student/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Student</a>
<a class="collapse-item" href="/teacher/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Teacher</a>
<a class="collapse-item" href="/class/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Class</a>
<div class="dropdown" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">
<span class="collapse-item dropbtn">Add Assign<i class="fa fa-caret-down"></i>
<div class="dropdown-content">
<a class="collapse-item" href="/assign/add">Assign A Student </a>
<a class="collapse-item" href="/assign/addList">Assign Student List</a>
<a class="collapse-item" href="/assign/switch-students">Promote Class</a>
</div>
</span>
</div>
<a class="collapse-item" href="/discountCoupon/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Discount Coupon</a>
<a class="collapse-item" href="/concession/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Concession</a>
<!--<a class="collapse-item" href="/admin/discountCoupon/add" sec:authorize="hasRole('ROLE_ADMIN')">Add Discount Coupon</a>-->


<h6 class="collapse-header">Lists:</h6>
<a class="collapse-item" href="/student">List Student</a>
<a class="collapse-item" href="/teacher">List Teacher</a>
<a class="collapse-item" href="/class">List Class</a>
<a class="collapse-item" href="/assign">List Assign</a>
<a class="collapse-item" href="/discountCoupon">List Discount Coupon</a>
<a class="collapse-item" href="/concession">List Concession</a>

<h6 class="collapse-header">Search:</h6>
<a class="collapse-item" href="/discountCoupon/search">Search Discount Coupon</a>

<h6 class="collapse-header">Past Members:</h6>
<a class="collapse-item" href="/student/leave" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Leave Student</a>
<a class="collapse-item" href="/teacher/leave" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Leave Teacher</a>
<a class="collapse-item" href="/student/left?frequency=All">Left Student</a>
<a class="collapse-item" href="/teacher/left">Left Teacher</a>

<!--<a class="collapse-item" href="/student/add" sec:authorize="hasAnyRole('ROLE_ADMIN')">Un Assign Bank Account</a>-->
<a class="collapse-item" href="/student">Primary Account</a>
<a class="collapse-item" href="/teacher">Savings Account</a>
</div>
</div>

Expand All @@ -173,32 +141,13 @@ <h6 class="collapse-header">Past Members:</h6>
aria-expanded="true" aria-controls="collapseReceipts">
<!-- <i class="fas fa-fw fa-graduation-cap"></i>-->
<i class="fas fa-fw fa-receipt"></i>
<span>Receipts</span>
<span>Transfer</span>
</a>
<div id="collapseReceipts" class="collapse" aria-labelledby="headingReceipts"
data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<h6 class="collapse-header" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add:</h6>
<a class="collapse-item" href="/receipt-type/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Receipt Type</a>


<div class="dropdown" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">
<span class="collapse-item dropbtn">Add Receipt <i class="fa fa-caret-down"></i>
<div class="dropdown-content">
<a class="collapse-item" href="/receipt/schoolFees">Add School Fees Receipts</a>
<a class="collapse-item" href="/receipt/generate">Add Class Wise Receipts</a>
<a class="collapse-item" href="/receipt/add">Add An Individual Receipt</a>
</div>
</span>
</div>

<h6 class="collapse-header">List:</h6>
<a class="collapse-item" href="/receipt-type">List Receipt Type</a>
<a class="collapse-item" href="/receipt">List Receipt</a>

<h6 class="collapse-header">Search:</h6>
<a class="collapse-item" href="/receipt/search">Search Receipt</a>
<a class="collapse-item" href="/receipt-type/search">Search Receipt Type</a>
<a class="collapse-item" href="/receipt-type">Between My Accounts</a>
<a class="collapse-item" href="/receipt-type">To a Payee</a>
</div>
</div>

Expand All @@ -209,25 +158,13 @@ <h6 class="collapse-header">Search:</h6>
aria-expanded="true" aria-controls="collapsePayments">
<!-- <i class="fas fa-fw fa-graduation-cap"></i>-->
<i class="fas fa-fw fa-credit-card"></i>
<span>Payments</span>
<span>Deposit & Withdraw</span>
</a>
<div id="collapsePayments" class="collapse" aria-labelledby="headingReceipts"
data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<h6 class="collapse-header" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add:</h6>
<a class="collapse-item" href="/payment/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Payment</a>
<a class="collapse-item" href="/issue-payment/add" sec:authorize="hasAnyRole('ROLE_ADMIN','ROLE_ACTUATOR')">Add Issue Payment</a>

<h6 class="collapse-header">List:</h6>
<a class="collapse-item" href="/payment-list">List Payment</a>
<a class="collapse-item" href="/payment-breakdown">List Payment Breakdown</a>
<a class="collapse-item" href="/issue-payment">List Issue Payment</a>

<h6 class="collapse-header">Search:</h6>
<!--<a class="collapse-item" href="/payment/search">Search Payment</a>-->
<a class="collapse-item" href="/payment-breakdown/breakdown-search">Search Payment Breakdown</a>
<a class="collapse-item" href="/issue-payment/search">Search Issue Payment</a>

<a class="collapse-item" href="/receipt-type">Deposit</a>
<a class="collapse-item" href="/receipt-type">Withdraw</a>
</div>
</div>
</li>
Expand All @@ -237,15 +174,13 @@ <h6 class="collapse-header">Search:</h6>
aria-expanded="true" aria-controls="collapseReports">
<!-- <i class="fas fa-fw fa-graduation-cap"></i>-->
<i class="fas fa-fw fa-paste"></i>
<span>Reports</span>
<span>Payees</span>
</a>
<div id="collapseReports" class="collapse" aria-labelledby="headingReports"
data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<a class="collapse-item" href="/report-arrears/student">Student Arrears Report</a>
<a class="collapse-item" href="/report-arrears/class">Class Arrears Report</a>
<a class="collapse-item" href="/admin/report/school" sec:authorize="hasRole('ROLE_ADMIN')">School Arrears Report</a>
<a class="collapse-item" href="/bank-record?err=''">Bank Records</a>
<a class="collapse-item" href="/receipt-type">Add a Payee</a>
<a class="collapse-item" href="/receipt-type">Payee List</a>
</div>
</div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<title>Registration</title>

<!--<link rel="shortcut icon" th:href="@{/assets/pics/TheSomethingCompanyLogo1.jpg}" />-->
<!--<link rel="shortcut icon" th:href="@{/assets/pics/trbLogo.png}" />-->
<!--<link rel="shortcut icon" th:href="@{/assets/pics/trbLogo.jpg}" />-->

</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/print-layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">School System-</title>

<link rel="shortcut icon" th:href="@{/assets/pics/trbLogo.png}" />
<link rel="shortcut icon" th:href="@{/assets/pics/trbLogo.jpg}" />

<meta
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
Expand Down Expand Up @@ -91,7 +91,7 @@
<!-- &lt;!&ndash; Sidebar - Brand &ndash;&gt;-->
<!-- <a class="sidebar-brand d-flex align-items-center justify-content-center" href="/home">-->
<!-- <div class="sidebar-brand-icon">-->
<!-- <img th:src="@{/assets/pics/trbLogo.png}" width="32" height="46">-->
<!-- <img th:src="@{/assets/pics/trbLogo.jpg}" width="32" height="46">-->
<!-- </div>-->
<!-- <div class="sidebar-brand-text mx-3">-->
<!-- <div class="t1">ROYAL</div>-->
Expand Down
14 changes: 14 additions & 0 deletions target/classes/application.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
spring.datasource.url = jdbc:mysql://localhost:3306/online_banking_sys_trb?useSSL=false
spring.datasource.username = root
spring.datasource.password =


## Hibernate Properties
spring.datasource.initialization-mode=always
# The SQL dialect makes Hibernate generate better SQL for the chosen database
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect

# Hibernate ddl auto (create, create-drop, validate, update)
spring.jpa.hibernate.ddl-auto = update
spring.jpa.show-sql=false
27 changes: 27 additions & 0 deletions target/classes/data.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
delete from users_roles;
delete from role;
delete from user;

INSERT INTO role(id, name)
VALUES
(1, 'ROLE_ADMIN'),
(2, 'ROLE_ACTUATOR'),
(3, 'ROLE_USER'),
(4, 'ROLE_VIEWER');

INSERT INTO user (id, email, first_name, last_name, password)
VALUES
(1, 'bodaragamadb.office@gmail.com', 'Bimsara', 'Bodaragama', '$2a$10$s3WZpdg3jTTDWuXvfW5dvO0loovVQ58g8fUMAf09nqlw022WVHn9a'),
(2, 'bimsarabodaragama@gmail.com', 'Dinuka', 'Bodaragama', '$2a$10$s3WZpdg3jTTDWuXvfW5dvO0loovVQ58g8fUMAf09nqlw022WVHn9a'),
(3, 'group03admin@gmail.com', 'Group03', 'Admin', '$2a$10$s3WZpdg3jTTDWuXvfW5dvO0loovVQ58g8fUMAf09nqlw022WVHn9a'),
(4, 'group03actuator@gmail.com', 'Group03', 'Actuator', '$2a$10$s3WZpdg3jTTDWuXvfW5dvO0loovVQ58g8fUMAf09nqlw022WVHn9a'),
(5, 'group03viewer@gmail.com','Group03','Viewer','$2a$10$s3WZpdg3jTTDWuXvfW5dvO0loovVQ58g8fUMAf09nqlw022WVHn9a');


INSERT INTO users_roles(user_id, role_id)
VALUES
(1, 1),
(2, 2),
(3, 1),
(4, 4),
(5, 2);
Loading

0 comments on commit d4c04fa

Please sign in to comment.