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
6d307b3e
Commit
6d307b3e
authored
1 year ago
by
Ikshita Sathanur
Browse files
Options
Downloads
Plain Diff
Merge branch 'ikshitas_staff_page' into 'main'
Ikshitas products and staff changed See merge request
!32
parents
e48f12da
d6fa8204
No related branches found
No related tags found
1 merge request
!32
Ikshitas products and staff changed
Pipeline
#576169
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
+11
-0
11 additions, 0 deletions
Products.java
Staff.java
+10
-0
10 additions, 0 deletions
Staff.java
images/products/icecream.png
+0
-0
0 additions, 0 deletions
images/products/icecream.png
images/staff/sunset.png
+0
-0
0 additions, 0 deletions
images/staff/sunset.png
with
21 additions
and
0 deletions
Products.java
+
11
−
0
View file @
6d307b3e
...
...
@@ -180,6 +180,17 @@ public class Products { /* a good class, but not as good as cse391 */
}
public
Product
ikshitasProduct
(){
return
new
Product
(
"Ice Cream"
,
"Sweet treat!"
,
"icecream.jpg"
,
"ice cream"
,
10.0
);
}
public
Product
skuttyProduct
()
{
return
new
Product
(
"Rake"
,
...
...
This diff is collapsed.
Click to expand it.
Staff.java
+
10
−
0
View file @
6d307b3e
...
...
@@ -37,6 +37,16 @@ public class Staff {
);
}
public
Employee
ikshitas
(){
return
new
Employee
(
"Ikshita"
,
"Student"
,
"Tired"
,
"sunset.png"
,
"sunset"
);
}
public
Employee
faangPup
()
{
return
new
Employee
(
"Steve"
,
...
...
This diff is collapsed.
Click to expand it.
images/products/icecream.png
0 → 100644
+
0
−
0
View file @
6d307b3e
874 KiB
This diff is collapsed.
Click to expand it.
images/staff/sunset.png
0 → 100644
+
0
−
0
View file @
6d307b3e
2.25 MiB
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