Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
faang
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
CSE 391
24wi
faang
Commits
e2b1462d
Commit
e2b1462d
authored
1 year ago
by
Erin Song
Browse files
Options
Downloads
Plain Diff
Merge branch 'erinsong_staff_page' into 'main'
Added to Products and Staff See merge request
!33
parents
6d307b3e
11060d48
No related branches found
Branches containing commit
No related tags found
2 merge requests
!35
Main merge
,
!33
Added to Products and Staff
Pipeline
#576175
passed
1 year ago
Stage: test
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Products.java
+10
-0
10 additions, 0 deletions
Products.java
Staff.java
+10
-0
10 additions, 0 deletions
Staff.java
images/products/ramen.jpg
+0
-0
0 additions, 0 deletions
images/products/ramen.jpg
images/staff/sleep.jpg
+0
-0
0 additions, 0 deletions
images/staff/sleep.jpg
with
20 additions
and
0 deletions
Products.java
+
10
−
0
View file @
e2b1462d
...
...
@@ -200,4 +200,14 @@ public class Products { /* a good class, but not as good as cse391 */
5959.59
);
}
public
Product
erinsongProduct
()
{
return
new
Product
(
"Ramen"
,
"Perfect meal on a cold day"
,
"ramen.jpg"
,
"Bowl of soup with noodles and sliced boiled egg"
,
15.50
);
}
}
This diff is collapsed.
Click to expand it.
Staff.java
+
10
−
0
View file @
e2b1462d
...
...
@@ -219,4 +219,14 @@ public class Staff {
"sephiroth"
);
}
public
Employee
erinsong
()
{
return
new
Employee
(
"Erin"
,
"Student"
,
"Sleeps"
,
"sleep.jpg"
,
"Brown-haired girl slumped over a desk"
);
}
}
This diff is collapsed.
Click to expand it.
images/products/ramen.jpg
0 → 100644
+
0
−
0
View file @
e2b1462d
110 KiB
This diff is collapsed.
Click to expand it.
images/staff/sleep.jpg
0 → 100644
+
0
−
0
View file @
e2b1462d
79.9 KiB
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