Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Team5 Sports League application
Manage
Activity
Members
Labels
Plan
Issues
37
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haoyu Sun
Team5 Sports League application
Commits
72f31059
Commit
72f31059
authored
5 months ago
by
Xiemuqing Xiao
Browse files
Options
Downloads
Patches
Plain Diff
Merge remote-tracking branch 'origin/28-registration-feature' into 28-registration-feature
parent
28f23846
No related branches found
No related tags found
4 merge requests
!51
Resolves 64
,
!49
Resolve issue 70
,
!48
Resolve issue 70
,
!47
Revert "Merge branch '26-as-a-user-i-want-to-see-the-rankings-of-each-member' into 'main'"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/uk/ac/cf/spring/demo/sports/match/MatchItemRepository.java
+0
-7
0 additions, 7 deletions
...k/ac/cf/spring/demo/sports/match/MatchItemRepository.java
src/main/resources/static/html/navBar.html
+10
-3
10 additions, 3 deletions
src/main/resources/static/html/navBar.html
with
10 additions
and
10 deletions
src/main/java/uk/ac/cf/spring/demo/sports/match/MatchItemRepository.java
+
0
−
7
View file @
72f31059
package
uk.ac.cf.spring.demo.sports.match
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.jdbc.core.JdbcTemplate
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.List
;
public
interface
MatchItemRepository
{
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/static/html/navBar.html
+
10
−
3
View file @
72f31059
...
...
@@ -12,9 +12,16 @@
<li><a
href=
"http://localhost:8080/html/ranking.html"
>
Rankings
</a></li>
</ul>
<!-- put login、 signup subscribe links here-->
<!-- <div class="auth-buttons">-->
<!-- <button class="login-btn">Login</button>-->
<!-- <li><a href="/html/login.html">Login</a></li>-->
<!-- <button class="signup-btn">Sign Up</button>-->
<!-- <button class="subscribe-btn">Subscribe</button>-->
<!-- </div>-->
<div
class=
"auth-buttons"
>
<
button
class=
"login-btn"
>
Login
</
button
>
<
button
class=
"signup-btn"
>
Sign Up
</
button
>
<
button
class=
"subscribe-btn"
>
Subscribe
</
button
>
<
a
href=
"html/login.html"
class=
"login-btn"
>
Login
</
a
>
<
a
href=
"html/signup.html"
class=
"signup-btn"
>
Sign Up
</
a
>
<
a
href=
"html/subscribe.html"
class=
"subscribe-btn"
>
Subscribe
</
a
>
</div>
</nav>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment