Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
withinJoel committed Aug 20, 2024
1 parent 34e1d1b commit d654bd5
Show file tree
Hide file tree
Showing 17 changed files with 66 additions and 58 deletions.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion build/resources/main/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spring.jpa.show-sql=true

//For teamSync
server.port=8084
server.servlet.context-path=/teamsync
//server.servlet.context-path=/teamsync

//External Database
//spring.datasource.url=jdbc:mysql://sql8.freesqldatabase.com:3306/sql8725664
Expand Down
8 changes: 4 additions & 4 deletions build/resources/main/static/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
</ul>
</div>
</nav>
Expand Down
12 changes: 6 additions & 6 deletions build/resources/main/static/departments.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -126,7 +126,7 @@ <h2 class="card-title">Department List</h2>
<!-- Materialize JS -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script>
const apiUrl = 'http://localhost:8081/api/departments';
const apiUrl = 'http://localhost:8084/teamsync/api/departments';

function fetchDepartments() {
fetch(apiUrl)
Expand Down
14 changes: 7 additions & 7 deletions build/resources/main/static/employees.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -150,8 +150,8 @@ <h2 class="card-title">Employee List</h2>

<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script>
const employeeApiUrl = 'http://localhost:8081/api/employees';
const departmentApiUrl = 'http://localhost:8081/api/departments';
const employeeApiUrl = 'http://localhost:8084/teamsync/api/employees';
const departmentApiUrl = 'http://localhost:8084/teamsync/api/departments';
// Create an empty array to store department names
const departmentNames = [];

Expand Down
8 changes: 4 additions & 4 deletions build/resources/main/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down
14 changes: 7 additions & 7 deletions build/resources/main/static/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -183,8 +183,8 @@ <h2 class="card-title">Project List</h2>

<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script>
const projectApiUrl = 'http://localhost:8081/api/projects';
const employeeApiUrl = 'http://localhost:8081/api/employees';
const projectApiUrl = 'http://localhost:8084/teamsync/api/projects';
const employeeApiUrl = 'http://localhost:8084/teamsync/api/employees';

function fetchEmployees() {
fetch(employeeApiUrl)
Expand Down
Binary file modified build/tmp/compileJava/previous-compilation-data.bin
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.teamsync.assembler;

public class DepartmentResourceAssembler {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.teamsync.assembler;

public class ProjectResourceAssembler {
}
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spring.jpa.show-sql=true

//For teamSync
server.port=8084
server.servlet.context-path=/teamsync
//server.servlet.context-path=/teamsync

//External Database
//spring.datasource.url=jdbc:mysql://sql8.freesqldatabase.com:3306/sql8725664
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/static/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
</ul>
</div>
</nav>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/static/departments.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -126,7 +126,7 @@ <h2 class="card-title">Department List</h2>
<!-- Materialize JS -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script>
const apiUrl = 'http://localhost:8081/api/departments';
const apiUrl = 'http://localhost:8084/teamsync/api/departments';

function fetchDepartments() {
fetch(apiUrl)
Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/static/employees.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -150,8 +150,8 @@ <h2 class="card-title">Employee List</h2>

<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script>
const employeeApiUrl = 'http://localhost:8081/api/employees';
const departmentApiUrl = 'http://localhost:8081/api/departments';
const employeeApiUrl = 'http://localhost:8084/teamsync/api/employees';
const departmentApiUrl = 'http://localhost:8084/teamsync/api/departments';
// Create an empty array to store department names
const departmentNames = [];

Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/static/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@
<div class="nav-wrapper">
<a href="#" class="brand-logo left" style="color:#1a73e8; font-weight: bolder">TeamSync</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/index.html">Home</a></li>
<li><a href="/employees.html">Employees</a></li>
<li><a href="/departments.html">Departments</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/teamsync/index.html">Home</a></li>
<li><a href="/teamsync/employees.html">Employees</a></li>
<li><a href="/teamsync/departments.html">Departments</a></li>
<li><a href="/teamsync/projects.html">Projects</a></li>
<li><a href="/teamsync/about.html">About</a></li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -183,8 +183,8 @@ <h2 class="card-title">Project List</h2>

<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script>
const projectApiUrl = 'http://localhost:8081/api/projects';
const employeeApiUrl = 'http://localhost:8081/api/employees';
const projectApiUrl = 'http://localhost:8084/teamsync/api/projects';
const employeeApiUrl = 'http://localhost:8084/teamsync/api/employees';

function fetchEmployees() {
fetch(employeeApiUrl)
Expand Down

0 comments on commit d654bd5

Please sign in to comment.