Merge branch 'master' into main

KhaledAshrafH · May 24, 2023 · ef5d585 · ef5d585
2 parents 8924915 + 8093230
commit ef5d585
Show file tree

Hide file tree

Showing 23 changed files with 66 additions and 104 deletions.
diff --git a/#screenshots/1- Docker Compose Up.png b/#screenshots/1- Docker Compose Up.png
diff --git a/#screenshots/10- 2_verified file have 14 students.png b/#screenshots/10- 2_verified file have 14 students.png
diff --git a/... Batch Students from file to test the second feature in the first component.png b/... Batch Students from file to test the second feature in the first component.png
diff --git a/.../12- Show Statistics last once after added 14 students from the second file.png b/.../12- Show Statistics last once after added 14 students from the second file.png
diff --git a/#screenshots/2- Show Running Containers.png b/#screenshots/2- Show Running Containers.png
diff --git a/#screenshots/3- Show First Component Running in First Terminal Tab.png b/#screenshots/3- Show First Component Running in First Terminal Tab.png
diff --git a/#screenshots/4- Show Second Component Running in second Terminal Tab.png b/#screenshots/4- Show Second Component Running in second Terminal Tab.png
diff --git a/#screenshots/5- Let's Show all Statistics in second component.png b/#screenshots/5- Let's Show all Statistics in second component.png
diff --git a/...enshots/6- Add new Student to test the first feature in the first component.png b/...enshots/6- Add new Student to test the first feature in the first component.png
diff --git a/#screenshots/7- Show Statistics once again.png b/#screenshots/7- Show Statistics once again.png
diff --git a/#screenshots/8- Add new Student with the same info of the previous student.png b/#screenshots/8- Add new Student with the same info of the previous student.png
diff --git a/#screenshots/8- Show Statistics once again.png b/#screenshots/8- Show Statistics once again.png
diff --git a/#screenshots/9- This all files in the directory that mounted.png b/#screenshots/9- This all files in the directory that mounted.png
diff --git a/.github/workflows/Main-CI.yml b/.github/workflows/Main-CI.yml
@@ -14,8 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        
-        
+
+
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -24,8 +24,8 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-        
-        
+
+
       - name: Build and run docker-image with the Dockerfile
         run: |
           docker build --tag registeration-process:v2.0 .
@@ -35,4 +35,3 @@ jobs:
           docker-compose build
           docker-compose up -d
           docker-compose down
-          
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,3 @@
-# Khaled Ashraf  => 20190186
-# Samah Moustafa => 20190248
 
 FROM openjdk:19
 COPY . /usr/src/myapp

diff --git a/app/data/batch/2_verified.csv b/app/data/batch/2_verified.csv
diff --git a/app/data/batch/database.csv b/app/data/batch/database.csv
diff --git a/app/data/batch/1_verified.csv → data/1_verified.csv b/app/data/batch/1_verified.csv → data/1_verified.csv
@@ -1,10 +1,10 @@
 Anna,1021,Geography,History,Politics
-Ben,1022,Music,Art,Drama
+Ben,1022,Music,Art,English
 Cathy,1023,Math,Physics,Computer Science
 Dan,1024,English,Literature,Creative Writing
 Emma,1025,Biology,Chemistry,Medicine
 Fred,1026,Sports,Fitness,Nutrition
-Gina,1027,French,Italian,Portuguese
+Gina,1027,French,English,Portuguese
 Henry,1028,Law,Business,Ethics
 Isabel,1029,Spirituality,Mysticism,Tarot
-Jake,1030,Carpentry,Metalwork,Welding
+Jake,1030,Carpentry,English,English
diff --git a/app/data/batch/2.csv → data/2.csv b/app/data/batch/2.csv → data/2.csv
diff --git a/data/2_verified.csv b/data/2_verified.csv
@@ -0,0 +1,14 @@
+Grace,1007,Sports,Dance,Yoga
+Harry,1008,Computer Science,Engineering,Robotics
+Irene,1009,Sociology,Psychology,Philosophy
+Jack,1010,Astronomy,Astrology,Piano
+Kate,1011,Cooking,Baking,Piano
+Leo,1012,Drawing,Painting,Sculpting
+Mary,1013,Sewing,Piano,Crocheting
+Nick,1014,Guitar,Piano,Crocheting
+Olivia,1015,Balloon Art,Dancing,Rapping
+Peter,1016,Martial Arts,Karate,Judo
+Quinn,1017,Puzzles,Games,Crocheting
+Ryan,1018,Camping,Sports,Fishing
+Sara,1019,Meditation,Yoga,Yoga
+Tom,1020,Camping,Sports,Computer Science
diff --git a/data/database.csv b/data/database.csv
@@ -0,0 +1,32 @@
+Alice,1001,Math,English,Science
+Bob,1002,History,Art,Art
+Charlie,1003,Law,Spanish,Law
+David,1004,Art,Chemistry,Math
+Eve,1005,Math,Law,Poetry
+Frank,1006,Economics,Business,Law
+Grace,1007,Art,Dance,Math
+Harry,1008,Computer Science,Engineering,Robotics
+Irene,1009,Math,Psychology,Art
+Jack,1010,Art,Law,Magic
+Kate,1011,Cooking,Law,Math
+Leo,1012,Drawing,Painting,Art
+Mary,1013,Art,Math,Art
+Khalouda,1542,OOP, Testing
+tgfgfd,,5555
+sf,fsf,sfs
+Khalouda,1234,OOP, Cloud, Computer Science, Drawing, Math
+Samah,2132,OOP, Cloud, Computer Science, Drawing, Math
+Grace,1007,Sports,Dance,Yoga
+Harry,1008,Computer Science,Engineering,Robotics
+Irene,1009,Sociology,Psychology,Philosophy
+Jack,1010,Astronomy,Astrology,Piano
+Kate,1011,Cooking,Baking,Piano
+Leo,1012,Drawing,Painting,Sculpting
+Mary,1013,Sewing,Piano,Crocheting
+Nick,1014,Guitar,Piano,Crocheting
+Olivia,1015,Balloon Art,Dancing,Rapping
+Peter,1016,Martial Arts,Karate,Judo
+Quinn,1017,Puzzles,Games,Crocheting
+Ryan,1018,Camping,Sports,Fishing
+Sara,1019,Meditation,Yoga,Yoga
+Tom,1020,Camping,Sports,Computer Science
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,22 +1,29 @@
 version: "3.9"
+
 services:
   student-statistics-process:
-    image: 5aleda4rf/student-statistics-process
+    build: .
+    image: 5aleda4rf/student-statistics-process:latest
 #    volumes:
-#      - C:/Users/5aleda4rf/IdeaProjects/students_registration_system/app/data/batch:/app/data/batch
+#      - C:\Users\5aleda4rf\IdeaProjects\data:/app/data/batch
     ports:
       - "80:80"
     stdin_open: true
     tty: true
+
   registeration-process:
-    image: 5aleda4rf/registeration-process
+    build: .
+    image: 5aleda4rf/registeration-process:latest
 #    volumes:
-#      - C:/Users/5aleda4rf/IdeaProjects/students_registration_system/app/data/batch:/app/data/batch
+#      - C:\Users\5aleda4rf\IdeaProjects\data:/app/data/batch
     ports:
       - "81:81"
     stdin_open: true
     tty: true
 
 
-# Note:- Volumes Comment to pull image with shared mounted folder without any problem related with fixed local folder path
+
+# Note:- Volumes Commented, in GitHub because you need to define the local path.
+# If you download this file in your pc, only uncomment this and put your local path to mount it and run
+# Like This:- Your Local Path:/app/data/batch
 
diff --git a/src/Main.java b/src/Main.java
@@ -86,7 +86,7 @@ public static void main(String[] args) throws IOException {
                 System.out.println("System closed Successfully.");
                 break;
             } else {
-                System.out.println("This number not valid .. Enter correct number!");
+                System.out.println("This number not valid ... Enter correct number!");
             }
         }
     }