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
1b217844
Commit
1b217844
authored
1 year ago
by
Ian Delong
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' into 'idelong_staff_page'
# Conflicts: # Products.java # Staff.java
parents
4c571d34
bd346d94
No related branches found
Branches containing commit
No related tags found
1 merge request
!4
feat: added new product and staff member
Pipeline
#576027
failed
1 year ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Products.java
+9
-0
9 additions, 0 deletions
Products.java
Staff.java
+10
-0
10 additions, 0 deletions
Staff.java
images/products/monkey.jpg
+0
-0
0 additions, 0 deletions
images/products/monkey.jpg
images/staff/arya.png
+0
-0
0 additions, 0 deletions
images/staff/arya.png
with
19 additions
and
0 deletions
Products.java
+
9
−
0
View file @
1b217844
...
...
@@ -28,5 +28,14 @@ public class Products { /* a good class, but not as good as cse391 */
"Bowl of pasta"
,
100.0
);
public
Product
aryasProduct
()
{
return
new
Product
(
"Monkey"
,
"Just an animal"
,
"monkey.jpg"
,
"monkey image"
,
4.29
);
}
}
This diff is collapsed.
Click to expand it.
Staff.java
+
10
−
0
View file @
1b217844
...
...
@@ -39,4 +39,14 @@ public class Staff {
"Alpaca with dandelion hair"
);
}
public
Employee
agummadi
()
{
return
new
Employee
(
"Arya"
,
"Student"
,
"studies"
,
"arya.png"
,
"just an image"
);
}
}
This diff is collapsed.
Click to expand it.
images/products/monkey.jpg
0 → 100644
+
0
−
0
View file @
1b217844
25 KiB
This diff is collapsed.
Click to expand it.
images/staff/arya.png
0 → 100644
+
0
−
0
View file @
1b217844
28.3 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