Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mod4-wp-2023-2024-pokemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
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
Service Desk
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
Braun, C.V. (Christina, Student B-BIT)
mod4-wp-2023-2024-pokemon
Commits
53152c24
Commit
53152c24
authored
10 months ago
by
chrisb-3
Browse files
Options
Downloads
Patches
Plain Diff
added trainers page
parent
7d77e368
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#96667
failed
10 months ago
Stage: build
Stage: test
Stage: dast
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/nl/utwente/mod4/pokemon/model/PokemonType.java
+1
-1
1 addition, 1 deletion
src/main/java/nl/utwente/mod4/pokemon/model/PokemonType.java
src/main/webapp/trainersPage.html
+10
-0
10 additions, 0 deletions
src/main/webapp/trainersPage.html
with
11 additions
and
1 deletion
src/main/java/nl/utwente/mod4/pokemon/model/PokemonType.java
+
1
−
1
View file @
53152c24
...
...
@@ -24,7 +24,7 @@ public class PokemonType extends NamedEntity {
public
String
primaryType
;
public
String
secondaryType
;
public
PokemonType
()
{
public
PokemonType
()
{
//Constructor
super
();
pokedexNumber
=
0
;
generation
=
0
;
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/trainersPage.html
0 → 100644
+
10
−
0
View file @
53152c24
<!DOCTYPE html>
<html
lang=
"en"
>
<head>
<meta
charset=
"UTF-8"
>
<title>
Title
</title>
</head>
<body>
</body>
</html>
\ 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