diff --git a/SQLQuery_1.sql b/SQLQuery_1.sql new file mode 100644 index 0000000..b596d6d --- /dev/null +++ b/SQLQuery_1.sql @@ -0,0 +1,5 @@ +DROP TABLE Student; +CREATE TABLE Student(Name TEXT DEFAULT 'Anonymous', ClassYear INTEGER NOT NULL, Recommendation TEXT, Why Text); +SELECT * FROM Student + + diff --git a/SQLQuery_2.sql b/SQLQuery_2.sql new file mode 100644 index 0000000..b3ffbba --- /dev/null +++ b/SQLQuery_2.sql @@ -0,0 +1,7 @@ +INSERT INTO Student (Name, ClassYear, Recommendation, Why) +VALUES ('Julia', '2021', 'Yes', 'good teacher'); +INSERT INTO Student (Name, ClassYear, Recommendation, Why) +VALUES ('Bri', '2009', 'No', 'talked too fast'); +INSERT INTO Student (ClassYear, Recommendation, Why) +VALUES ('2022', 'Yes', 'Not a lot of tests'); +SELECT * FROM Student diff --git a/SQLQuery_3.sql b/SQLQuery_3.sql new file mode 100644 index 0000000..9beaa1b --- /dev/null +++ b/SQLQuery_3.sql @@ -0,0 +1,2 @@ +SELECT * FROM Student +ORDER BY ClassYear DESC; \ No newline at end of file diff --git a/src/main/java/service/ConnectToStudentDatabase.java b/src/main/java/service/ConnectToStudentDatabase.java new file mode 100644 index 0000000..576f9b6 --- /dev/null +++ b/src/main/java/service/ConnectToStudentDatabase.java @@ -0,0 +1,109 @@ +package service; + +import java.sql.Connection; +import java.sql.Statement; +import java.sql.ResultSet; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.ArrayList; + + +public class ConnectToStudentDatabase { + public static double percentageCalculation(String teacherName) {//connects to database and returns percentages of yes for specific teacher + String hostname = "holynamesacademy.database.windows.net"; + String dbName = "GlassDome"; + String user = "hna-admin"; + String password = "HolyNames123"; + String url = String.format("jdbc:sqlserver://%s:1433;database=%s;user=%s;password=%s;encrypt=true;" + "hostNameInCertificate=*.database.windows.net;loginTimeout=30;", hostname, dbName, user, password); + Connection connection; + double percentage = 0; + int num = 0; + + try { + connection = DriverManager.getConnection(url); + String schema = connection.getSchema(); + System.out.println("Successful connection - Schema: " + schema); + + System.out.println("Query data example:"); + System.out.println("=============================="); + + String selectSql = " SELECT * from Student; "; + + try (Statement statement = connection.createStatement(); + ResultSet resultSet = statement.executeQuery(selectSql)) { + + + while (resultSet.next()) { + if(resultSet.getString(1).equals(teacherName)) + { + if(resultSet.getString(4)=="Yes") + { + percentage++; + } + num++; + } + + } + percentage = percentage/num; + + connection.close(); + + } catch (SQLException e)//handle any errors + { + e.printStackTrace(); + } + } catch (Exception e) { + e.printStackTrace(); + } + return percentage; + } + + public static ArrayList recommendationInfo() + { + ArrayList studentRecommendation = new ArrayList (); + Recommendations newRecommendation = new Recommendations("","",0,"",""); + + String hostname = "holynamesacademy.database.windows.net"; + String dbName = "GlassDome"; + String user = "hna-admin"; + String password = "HolyNames123"; + String url = String.format("jdbc:sqlserver://%s:1433;database=%s;user=%s;password=%s;encrypt=true;" + "hostNameInCertificate=*.database.windows.net;loginTimeout=30;", hostname, dbName, user, password); + Connection connection; + try + { + connection = DriverManager.getConnection(url); + + String query = "SELECT * FROM Student";//SQL SELECT query + Statement st = connection.createStatement();//create the java statement + + ResultSet rs = st.executeQuery(query);//execute the query and get a java resultset + + while(rs.next())//iterate through java resultset + { + String teacherName = rs.getString("student_TeacherName"); + newRecommendation.setTeacherName(teacherName); + String name = rs.getString("student_Name"); + newRecommendation.setStudentName(name); + int classYear = rs.getInt("student_ClassYear"); + newRecommendation.setClassYear(classYear); + String recommendation = rs.getString("student_Recommendation"); + newRecommendation.setRecommendation(recommendation); + String why = rs.getString("student_Why"); + newRecommendation.setWhy(why); + + studentRecommendation.add(newRecommendation); + //printing out the results + System.out.format(newRecommendation.getTeacherName(), newRecommendation.getStudentName(), newRecommendation.getClassYear(), newRecommendation.getRecommendation(), newRecommendation.getWhy()); + + } + st.close(); + } + catch (SQLException e)//handle any errors + { + e.printStackTrace(); + } + + return studentRecommendation; + } +} + diff --git a/src/main/java/service/ConnectToTeacherDatabase.java b/src/main/java/service/ConnectToTeacherDatabase.java new file mode 100644 index 0000000..8ba9650 --- /dev/null +++ b/src/main/java/service/ConnectToTeacherDatabase.java @@ -0,0 +1,154 @@ +package service; + +import java.util.ArrayList; +import java.sql.*; + +public class ConnectToTeacherDatabase { + public static ArrayList teacherInfo() { + ArrayList teacherInfo = new ArrayList(); + TeacherInfo newTeacherInfo = new TeacherInfo("","","","", ""); + + String hostname = "holynamesacademy.database.windows.net"; + String dbName = "GlassDome"; + String user = "hna-admin"; + String password = "HolyNames123"; + String url = String.format("jdbc:sqlserver://%s:1433;database=%s;user=%s;password=%s;encrypt=true;" + "hostNameInCertificate=*.database.windows.net;loginTimeout=30;", + hostname, dbName, user, password); + Connection connection; + + try { + connection = DriverManager.getConnection(url); + String schema = connection.getSchema(); + System.out.println("Successful connection - Schema: " + schema); + + System.out.println("Query data example:"); + System.out.println("=============================="); + + String selectSql = " SELECT * from Teacher; "; + + try (Statement statement = connection.createStatement(); + ResultSet resultSet = statement.executeQuery(selectSql)) { + + while (resultSet.next()) { + String teacherName = resultSet.getString("teacher_Name");//might need to capatalize if doesn't work + newTeacherInfo.setTeacherName(teacherName); + String title = resultSet.getString("teacher_Title"); + newTeacherInfo.setTitle(title); + String department = resultSet.getString("teacher_Department"); + newTeacherInfo.setDepartment(department); + String education = resultSet.getString("teacher_Education"); + newTeacherInfo.setEducation(education); + String email = resultSet.getString("teacher_Email"); + newTeacherInfo.setEmail(email); + + teacherInfo.add(newTeacherInfo); + //printing out the results + System.out.format(newTeacherInfo.getTeacherName(), newTeacherInfo.getTitle(), newTeacherInfo.getDepartment(), newTeacherInfo.getEducation(), newTeacherInfo.getEmail()); + } + + connection.close(); + + } catch (SQLException e)//handle any errors + { + e.printStackTrace(); + } + } catch (Exception e) { + e.printStackTrace(); + } + return teacherInfo; + } + public static ArrayList getTeacher(String teacherName) { + String hostname = "holynamesacademy.database.windows.net"; + String dbName = "GlassDome"; + String user = "hna-admin"; + String password = "HolyNames123"; + String url = String.format("jdbc:sqlserver://%s:1433;database=%s;user=%s;password=%s;encrypt=true;" + "hostNameInCertificate=*.database.windows.net;loginTimeout=30;", hostname, dbName, user, password); + Connection connection; + ArrayList teacherInfo = new ArrayList (); + + try { + connection = DriverManager.getConnection(url); + String schema = connection.getSchema(); + System.out.println("Successful connection - Schema: " + schema); + + System.out.println("Query data example:"); + System.out.println("=============================="); + + String selectSql = " SELECT * from Teacher; "; + + + try (Statement statement = connection.createStatement(); + ResultSet resultSet = statement.executeQuery(selectSql)) { + + while (resultSet.next()) { + if (resultSet.getString(1).equals(teacherName)) + { + teacherInfo.add(resultSet.getString(1)); + teacherInfo.add(resultSet.getString(2)); + teacherInfo.add(resultSet.getString(3)); + teacherInfo.add(resultSet.getString(4)); + teacherInfo.add(resultSet.getString(5)); + System.out.println(teacherInfo.add(resultSet.getString(1))); + System.out.println(teacherInfo.add(resultSet.getString(2))); + System.out.println(teacherInfo.add(resultSet.getString(3))); + System.out.println("Background: " + teacherInfo.add(resultSet.getString(4))); + System.out.println("Contact: " + teacherInfo.add(resultSet.getString(5))); + break; + } + } + connection.close(); + + } + catch (SQLException e)//handle any errors + { + e.printStackTrace(); + } + } catch (Exception e) { + e.printStackTrace(); + } + return teacherInfo; + } + + public static ArrayList getDepartmentNames(String department) { + String hostname = "holynamesacademy.database.windows.net"; + String dbName = "GlassDome"; + String user = "hna-admin"; + String password = "HolyNames123"; + String url = String.format("jdbc:sqlserver://%s:1433;database=%s;user=%s;password=%s;encrypt=true;" + "hostNameInCertificate=*.database.windows.net;loginTimeout=30;", hostname, dbName, user, password); + Connection connection; + ArrayList teacherNames = new ArrayList (); + + try { + connection = DriverManager.getConnection(url); + String schema = connection.getSchema(); + System.out.println("Successful connection - Schema: " + schema); + + System.out.println("Query data example:"); + System.out.println("=============================="); + + String selectSql = " SELECT * from Teacher; "; + + + try (Statement statement = connection.createStatement(); + ResultSet resultSet = statement.executeQuery(selectSql)) { + + while (resultSet.next()) { + if (resultSet.getString(3).equals(department)) + { + teacherNames.add(resultSet.getString(1)); + } + } + connection.close(); + + } + catch (SQLException e)//handle any errors + { + e.printStackTrace(); + } + } catch (Exception e) { + e.printStackTrace(); + } + return teacherNames; + } +} + diff --git a/src/main/java/service/MainController.java b/src/main/java/service/MainController.java index c0b9ea8..ecd301e 100644 --- a/src/main/java/service/MainController.java +++ b/src/main/java/service/MainController.java @@ -3,40 +3,51 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; @Controller public class MainController { - static Map> categoryToMembers = Map.of( - "fruits", List.of("apples", "bananas", "pears", "blueberries"), - "veggies", List.of("broccoli", "spinach", "eggplant") - ); - - @GetMapping("/hello") - public String hello(@RequestParam(name="name", required=false, defaultValue="World") String name, Model model) { - model.addAttribute("name", name); - return "hello"; - } - - @GetMapping("/") - public String index() { - return "index"; - } - - @GetMapping("/info/{category}") - public String category(@PathVariable("category") String category, Model model) { - String name = "Harsha"; - List members = categoryToMembers.getOrDefault(category, new ArrayList<>()); - model.addAttribute("category", category); - model.addAttribute("name", name); - model.addAttribute("members", members); - - return "info"; - } - -} \ No newline at end of file + + @GetMapping("/") + public String home() { + + return "Home"; + } + + @GetMapping("/Department") + public String department(@RequestParam(name = "department", required = true) String department, Model model) { + model.addAttribute("department", department); // make the variable subject available in your html + // this is where you call methods you've written to get information from your database, then store it a variable + // and call model.addAttribute with that variable so you can use it in your html + + //Fix this code- + ConnectToTeacherDatabase database = new ConnectToTeacherDatabase(); + ArrayList teacherNames = database.getDepartmentNames(department); + model.addAttribute("teachers", teacherNames); + + return "department"; + + //model.addAttribute("teachers", teacherNames); // make the variable subject available in your html + // this is where you call methods you've written to get information from your database, then store it a variable + // and call model.addAttribute with that variable so you can use it in your html + } + + @GetMapping("/Teacher") + public String teacher(@RequestParam(name = "teacher", required = true) String teacher, Model model) { + model.addAttribute("teacher", teacher); // make the variable subject available in your html + // this is where you call methods you've written to get information from your database, then store it a variable + // and call model.addAttribute with that variable so you can use it in your html + + //fix below + ArrayList studentRecommendation = ConnectToStudentDatabase.recommendationInfo(); + model.addAttribute("studentRecommendation", studentRecommendation); + + return "teacher"; + + //model.addAttribute("teachers", teacherNames); // make the variable subject available in your html + // this is where you call methods you've written to get information from your database, then store it a variable + // and call model.addAttribute with that variable so you can use it in your html + } + +} diff --git a/src/main/java/service/Recommendations.java b/src/main/java/service/Recommendations.java new file mode 100644 index 0000000..ea7ede9 --- /dev/null +++ b/src/main/java/service/Recommendations.java @@ -0,0 +1,63 @@ +package service; + +import java.util.ArrayList; + +public class Recommendations {//class for Recommendations + private String teacherName; + private String name; + private int classYear; + private String recommendation; + private String why; + private Recommendations studentRecommendation; + + public Recommendations(String t, String n, int i, String r, String w) + { + teacherName = t; + name = n; + classYear = i; + recommendation = r; + why = w; + } + + public String getTeacherName() + { + return teacherName; + } + public String getStudentName() + { + return name; + } + public int getClassYear() + { + return classYear; + } + public String getRecommendation() + { + return recommendation; + } + public String getWhy() + { + return why; + } + + public void setTeacherName(String t) + { + teacherName = t; + } + public void setStudentName(String n) + { + name = n; + } + public void setClassYear(int i) + { + classYear = i; + } + public void setRecommendation(String r) + { + recommendation = r; + } + public void setWhy(String w) + { + why = w; + } +} diff --git a/src/main/java/service/TeacherInfo.java b/src/main/java/service/TeacherInfo.java new file mode 100644 index 0000000..18d1314 --- /dev/null +++ b/src/main/java/service/TeacherInfo.java @@ -0,0 +1,64 @@ +package service; + +import java.util.ArrayList; + +public class TeacherInfo {//class for information on Teachers + private String teacherName; + private String title; + private String department; + private String education; + private String email; + private TeacherInfo studentRecommendation; + + public TeacherInfo(String n, String t, String d, String e, String m) + { + teacherName = n; + title = t; + department = d; + education = e; + email = m; + } + + public String getTeacherName() + { + return teacherName; + } + public String getTitle() + { + return title; + } + public String getDepartment() + { + return department; + } + public String getEducation() + { + return education; + } + public String getEmail() + { + return email; + } + + public void setTeacherName(String t) + { + teacherName = t; + } + public void setTitle(String n) + { + title = n; + } + public void setDepartment(String d) + { + department = d; + } + public void setEducation(String e) + { + education = e; + } + public void setEmail(String m) + { + email = m; + } +} + diff --git a/src/main/java/service/UserInput.java b/src/main/java/service/UserInput.java new file mode 100644 index 0000000..df087f6 --- /dev/null +++ b/src/main/java/service/UserInput.java @@ -0,0 +1,45 @@ +package service; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import com.microsoft.sqlserver.jdbc.SQLServerException; + +public class UserInput { + private static final String hostname = "holynamesacademy.database.windows.net"; + private static final String dbName = "GlassDome"; + private static final String user = "hna-admin"; + private static final String password = "HolyNames123"; + private static final String url = String.format("jdbc:sqlserver://%s:1433;database=%s;user=%s;password=%s;encrypt=true;" + "hostNameInCertificate=*.database.windows.net;loginTimeout=30;", hostname, dbName, user, password); + + public static void User() throws Exception, SQLException + { + try + { + Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver"); + Connection conn = DriverManager.getConnection(url); + + System.out.println("Connection Established ln"); + Statement query = conn.createStatement(); + + String SQL1 = "INSERT INTO dbo.Student VALUES " + "('Bri', 1880, 'Yes', 'Love treats')"; + + query.addBatch(SQL1); + + query.executeBatch(); + + conn.close(); + } + catch (SQLServerException sqe) + { + System.out.println("A result set was generated for update."); + sqe.printStackTrace(); + } + catch (java.sql.BatchUpdateException bae) + { + System.out.println("Executed Queries! Terminating Connection..."); + bae.printStackTrace(); + } + } +} diff --git a/src/main/java/service/WebServer.java b/src/main/java/service/WebServer.java index d11b642..5d8c89f 100644 --- a/src/main/java/service/WebServer.java +++ b/src/main/java/service/WebServer.java @@ -1,13 +1,11 @@ package service; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class WebServer { - public static void main(String[] args) { - SpringApplication.run(WebServer.class, args); - } + public static void main(String[] args) { + SpringApplication.run(WebServer.class, args); + } -} +} \ No newline at end of file diff --git a/src/main/resources/static/HNA.jpg b/src/main/resources/static/HNA.jpg new file mode 100644 index 0000000..c060356 Binary files /dev/null and b/src/main/resources/static/HNA.jpg differ diff --git a/src/main/resources/static/HNA2.jpg b/src/main/resources/static/HNA2.jpg new file mode 100644 index 0000000..ed88ad7 Binary files /dev/null and b/src/main/resources/static/HNA2.jpg differ diff --git a/src/main/resources/static/Projects Pics/AbbyDrake.jpg b/src/main/resources/static/Projects Pics/AbbyDrake.jpg new file mode 100644 index 0000000..747e7f1 Binary files /dev/null and b/src/main/resources/static/Projects Pics/AbbyDrake.jpg differ diff --git a/src/main/resources/static/Projects Pics/AdamButler.jpg b/src/main/resources/static/Projects Pics/AdamButler.jpg new file mode 100644 index 0000000..42e4083 Binary files /dev/null and b/src/main/resources/static/Projects Pics/AdamButler.jpg differ diff --git a/src/main/resources/static/Projects Pics/AmyAnderson.jpg b/src/main/resources/static/Projects Pics/AmyAnderson.jpg new file mode 100644 index 0000000..549ad0f Binary files /dev/null and b/src/main/resources/static/Projects Pics/AmyAnderson.jpg differ diff --git a/src/main/resources/static/Projects Pics/AndyLundquist.jpg b/src/main/resources/static/Projects Pics/AndyLundquist.jpg new file mode 100644 index 0000000..7024f17 Binary files /dev/null and b/src/main/resources/static/Projects Pics/AndyLundquist.jpg differ diff --git a/src/main/resources/static/Projects Pics/AngelAlvarado.jpg b/src/main/resources/static/Projects Pics/AngelAlvarado.jpg new file mode 100644 index 0000000..54f56db Binary files /dev/null and b/src/main/resources/static/Projects Pics/AngelAlvarado.jpg differ diff --git a/src/main/resources/static/Projects Pics/AnneGala.jpg b/src/main/resources/static/Projects Pics/AnneGala.jpg new file mode 100644 index 0000000..7b779b4 Binary files /dev/null and b/src/main/resources/static/Projects Pics/AnneGala.jpg differ diff --git a/src/main/resources/static/Projects Pics/AnnieSpung.jpg b/src/main/resources/static/Projects Pics/AnnieSpung.jpg new file mode 100644 index 0000000..71de9f2 Binary files /dev/null and b/src/main/resources/static/Projects Pics/AnnieSpung.jpg differ diff --git a/src/main/resources/static/Projects Pics/AprilLittle.jpg b/src/main/resources/static/Projects Pics/AprilLittle.jpg new file mode 100644 index 0000000..07a9deb Binary files /dev/null and b/src/main/resources/static/Projects Pics/AprilLittle.jpg differ diff --git a/src/main/resources/static/Projects Pics/AudreyHiatt.jpg b/src/main/resources/static/Projects Pics/AudreyHiatt.jpg new file mode 100644 index 0000000..08ec009 Binary files /dev/null and b/src/main/resources/static/Projects Pics/AudreyHiatt.jpg differ diff --git a/src/main/resources/static/Projects Pics/BeccaSager.jpg b/src/main/resources/static/Projects Pics/BeccaSager.jpg new file mode 100644 index 0000000..77188d4 Binary files /dev/null and b/src/main/resources/static/Projects Pics/BeccaSager.jpg differ diff --git a/src/main/resources/static/Projects Pics/BeccaShope.jpg b/src/main/resources/static/Projects Pics/BeccaShope.jpg new file mode 100644 index 0000000..c8a1534 Binary files /dev/null and b/src/main/resources/static/Projects Pics/BeccaShope.jpg differ diff --git a/src/main/resources/static/Projects Pics/Cecilia Lofqvist Traum.jpg b/src/main/resources/static/Projects Pics/Cecilia Lofqvist Traum.jpg new file mode 100644 index 0000000..13a8205 Binary files /dev/null and b/src/main/resources/static/Projects Pics/Cecilia Lofqvist Traum.jpg differ diff --git a/src/main/resources/static/Projects Pics/DallasJimenez.jpg b/src/main/resources/static/Projects Pics/DallasJimenez.jpg new file mode 100644 index 0000000..e5d6a25 Binary files /dev/null and b/src/main/resources/static/Projects Pics/DallasJimenez.jpg differ diff --git a/src/main/resources/static/Projects Pics/DavidKarp.jpg b/src/main/resources/static/Projects Pics/DavidKarp.jpg new file mode 100644 index 0000000..f20c14e Binary files /dev/null and b/src/main/resources/static/Projects Pics/DavidKarp.jpg differ diff --git a/src/main/resources/static/Projects Pics/ElizabethSwift.jpg b/src/main/resources/static/Projects Pics/ElizabethSwift.jpg new file mode 100644 index 0000000..96eb913 Binary files /dev/null and b/src/main/resources/static/Projects Pics/ElizabethSwift.jpg differ diff --git a/src/main/resources/static/Projects Pics/JamesRufoHill.jpg b/src/main/resources/static/Projects Pics/JamesRufoHill.jpg new file mode 100644 index 0000000..cae4aec Binary files /dev/null and b/src/main/resources/static/Projects Pics/JamesRufoHill.jpg differ diff --git a/src/main/resources/static/Projects Pics/JenniferEiken.jpg b/src/main/resources/static/Projects Pics/JenniferEiken.jpg new file mode 100644 index 0000000..4de3ffd Binary files /dev/null and b/src/main/resources/static/Projects Pics/JenniferEiken.jpg differ diff --git a/src/main/resources/static/Projects Pics/JenniferKelly.jpg b/src/main/resources/static/Projects Pics/JenniferKelly.jpg new file mode 100644 index 0000000..19ab1aa Binary files /dev/null and b/src/main/resources/static/Projects Pics/JenniferKelly.jpg differ diff --git a/src/main/resources/static/Projects Pics/JennyWielbruda.jpg b/src/main/resources/static/Projects Pics/JennyWielbruda.jpg new file mode 100644 index 0000000..df7c791 Binary files /dev/null and b/src/main/resources/static/Projects Pics/JennyWielbruda.jpg differ diff --git a/src/main/resources/static/Projects Pics/JessicaKershner.jpg b/src/main/resources/static/Projects Pics/JessicaKershner.jpg new file mode 100644 index 0000000..c89e0f8 Binary files /dev/null and b/src/main/resources/static/Projects Pics/JessicaKershner.jpg differ diff --git a/src/main/resources/static/Projects Pics/JessyWilliams.jpg b/src/main/resources/static/Projects Pics/JessyWilliams.jpg new file mode 100644 index 0000000..0c9c8c1 Binary files /dev/null and b/src/main/resources/static/Projects Pics/JessyWilliams.jpg differ diff --git a/src/main/resources/static/Projects Pics/JulieTilghman.jpg b/src/main/resources/static/Projects Pics/JulieTilghman.jpg new file mode 100644 index 0000000..224fe43 Binary files /dev/null and b/src/main/resources/static/Projects Pics/JulieTilghman.jpg differ diff --git a/src/main/resources/static/Projects Pics/KellyHaley.jpg b/src/main/resources/static/Projects Pics/KellyHaley.jpg new file mode 100644 index 0000000..3466eb5 Binary files /dev/null and b/src/main/resources/static/Projects Pics/KellyHaley.jpg differ diff --git a/src/main/resources/static/Projects Pics/KimDawson.jpg b/src/main/resources/static/Projects Pics/KimDawson.jpg new file mode 100644 index 0000000..93ac76d Binary files /dev/null and b/src/main/resources/static/Projects Pics/KimDawson.jpg differ diff --git a/src/main/resources/static/Projects Pics/KimFicele.jpg b/src/main/resources/static/Projects Pics/KimFicele.jpg new file mode 100644 index 0000000..efe940a Binary files /dev/null and b/src/main/resources/static/Projects Pics/KimFicele.jpg differ diff --git a/src/main/resources/static/Projects Pics/KimberlyDraggoo.jpg b/src/main/resources/static/Projects Pics/KimberlyDraggoo.jpg new file mode 100644 index 0000000..d5932b7 Binary files /dev/null and b/src/main/resources/static/Projects Pics/KimberlyDraggoo.jpg differ diff --git a/src/main/resources/static/Projects Pics/KristinKuzmanich.jpg b/src/main/resources/static/Projects Pics/KristinKuzmanich.jpg new file mode 100644 index 0000000..db1a0d5 Binary files /dev/null and b/src/main/resources/static/Projects Pics/KristinKuzmanich.jpg differ diff --git a/src/main/resources/static/Projects Pics/LaceyLondon.jpg b/src/main/resources/static/Projects Pics/LaceyLondon.jpg new file mode 100644 index 0000000..23b89c2 Binary files /dev/null and b/src/main/resources/static/Projects Pics/LaceyLondon.jpg differ diff --git a/src/main/resources/static/Projects Pics/LaurenKarp.jpg b/src/main/resources/static/Projects Pics/LaurenKarp.jpg new file mode 100644 index 0000000..d249070 Binary files /dev/null and b/src/main/resources/static/Projects Pics/LaurenKarp.jpg differ diff --git a/src/main/resources/static/Projects Pics/MarianneMcGah.jpg b/src/main/resources/static/Projects Pics/MarianneMcGah.jpg new file mode 100644 index 0000000..1538e5f Binary files /dev/null and b/src/main/resources/static/Projects Pics/MarianneMcGah.jpg differ diff --git a/src/main/resources/static/Projects Pics/MarissaKoon.jpg b/src/main/resources/static/Projects Pics/MarissaKoon.jpg new file mode 100644 index 0000000..15db655 Binary files /dev/null and b/src/main/resources/static/Projects Pics/MarissaKoon.jpg differ diff --git a/src/main/resources/static/Projects Pics/MattMerlino.jpg b/src/main/resources/static/Projects Pics/MattMerlino.jpg new file mode 100644 index 0000000..8025e1f Binary files /dev/null and b/src/main/resources/static/Projects Pics/MattMerlino.jpg differ diff --git a/src/main/resources/static/Projects Pics/Maureen Coulton.jpg b/src/main/resources/static/Projects Pics/Maureen Coulton.jpg new file mode 100644 index 0000000..b7777e1 Binary files /dev/null and b/src/main/resources/static/Projects Pics/Maureen Coulton.jpg differ diff --git a/src/main/resources/static/Projects Pics/MichaelBachhuber.jpg b/src/main/resources/static/Projects Pics/MichaelBachhuber.jpg new file mode 100644 index 0000000..2e4dab3 Binary files /dev/null and b/src/main/resources/static/Projects Pics/MichaelBachhuber.jpg differ diff --git a/src/main/resources/static/Projects Pics/MikaelaHertel.jpg b/src/main/resources/static/Projects Pics/MikaelaHertel.jpg new file mode 100644 index 0000000..132f7ec Binary files /dev/null and b/src/main/resources/static/Projects Pics/MikaelaHertel.jpg differ diff --git a/src/main/resources/static/Projects Pics/NatalieRadich.jpg b/src/main/resources/static/Projects Pics/NatalieRadich.jpg new file mode 100644 index 0000000..1a5fa67 Binary files /dev/null and b/src/main/resources/static/Projects Pics/NatalieRadich.jpg differ diff --git a/src/main/resources/static/Projects Pics/PattiSmith.jpg b/src/main/resources/static/Projects Pics/PattiSmith.jpg new file mode 100644 index 0000000..2915e7d Binary files /dev/null and b/src/main/resources/static/Projects Pics/PattiSmith.jpg differ diff --git a/src/main/resources/static/Projects Pics/RoseDeBoer.jpg b/src/main/resources/static/Projects Pics/RoseDeBoer.jpg new file mode 100644 index 0000000..5036391 Binary files /dev/null and b/src/main/resources/static/Projects Pics/RoseDeBoer.jpg differ diff --git a/src/main/resources/static/Projects Pics/RuthGavinoLutu.jpg b/src/main/resources/static/Projects Pics/RuthGavinoLutu.jpg new file mode 100644 index 0000000..4a32d53 Binary files /dev/null and b/src/main/resources/static/Projects Pics/RuthGavinoLutu.jpg differ diff --git a/src/main/resources/static/Projects Pics/SarahWahlen.jpg b/src/main/resources/static/Projects Pics/SarahWahlen.jpg new file mode 100644 index 0000000..cc06651 Binary files /dev/null and b/src/main/resources/static/Projects Pics/SarahWahlen.jpg differ diff --git a/src/main/resources/static/Projects Pics/SeanHarrisCampf.jpg b/src/main/resources/static/Projects Pics/SeanHarrisCampf.jpg new file mode 100644 index 0000000..5428a4a Binary files /dev/null and b/src/main/resources/static/Projects Pics/SeanHarrisCampf.jpg differ diff --git a/src/main/resources/static/Projects Pics/SisterMaryAnnetteDworshak.jpg b/src/main/resources/static/Projects Pics/SisterMaryAnnetteDworshak.jpg new file mode 100644 index 0000000..911c02b Binary files /dev/null and b/src/main/resources/static/Projects Pics/SisterMaryAnnetteDworshak.jpg differ diff --git a/src/main/resources/static/Projects Pics/TarynWebber.jpg b/src/main/resources/static/Projects Pics/TarynWebber.jpg new file mode 100644 index 0000000..571020b Binary files /dev/null and b/src/main/resources/static/Projects Pics/TarynWebber.jpg differ diff --git a/src/main/resources/static/Projects Pics/TriciaCavanaugh.jpg b/src/main/resources/static/Projects Pics/TriciaCavanaugh.jpg new file mode 100644 index 0000000..35cbf39 Binary files /dev/null and b/src/main/resources/static/Projects Pics/TriciaCavanaugh.jpg differ diff --git a/src/main/resources/static/Projects Pics/VeronicaDoyle.jpg b/src/main/resources/static/Projects Pics/VeronicaDoyle.jpg new file mode 100644 index 0000000..ebf2ba5 Binary files /dev/null and b/src/main/resources/static/Projects Pics/VeronicaDoyle.jpg differ diff --git a/src/main/resources/templates/Department.html b/src/main/resources/templates/Department.html new file mode 100644 index 0000000..263ad47 --- /dev/null +++ b/src/main/resources/templates/Department.html @@ -0,0 +1,180 @@ + + + + + + +</head> + +<title> Glass Dome + + + +

+ +> + +

+ + + + + +
class="flex-container" +
+ + + +
+ + + +
+
Kim Dawson +
+ + Dawson + +
+
Kim Draggoo +
+ + Draggoo + +
+
Anne Gala +
+ + Gala + +
+
David Karp +
+ + Karp + +
+
Lauren Karp +
+ + Karp + +
+
Kristin Kuzmanich +
+ + Kuzmanich + +
+
April Little +
+ + Little + +
+
Matt Merlino +
+ + Merlino + +
+
Rebecca Sager +
+ + Sager + +
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/Home.html b/src/main/resources/templates/Home.html new file mode 100644 index 0000000..60f3a29 --- /dev/null +++ b/src/main/resources/templates/Home.html @@ -0,0 +1,99 @@ + + + + + Glass Dome + + + + +

Glass Dome

+ + +English +Math +Arts +Science +Language +Other +

+

Welcome to Glass Dome!

+ +

This website will be a place to learn about teachers and + courses you haven't had at Holy Names and give feedback on the ones you have.

+ + +

About Us

+

Seattle-based students Julia Hopper and Claire Mattingly are current Holy Names Academy + seniors (class of 2021- Go skippers!) +
+ Outside of school Julia likes to spend her time rowing and sleeping, and she has a dog named Tilly. + Claire enjoys theater and dance, and likes to bake!

+ +

Mission

+

After experiencing the fast paced classes at Holy Names, and seeing friends struggle with getting the support they needed + we saw a clear need for an avenue of consistent feedback for teachers and courses. Glass Dome is a place for students to share their experiences + with teachers and one another- so our whole community can grow and flourish.



+

+ + + + + + + diff --git a/src/main/resources/templates/Teachers.html b/src/main/resources/templates/Teachers.html new file mode 100644 index 0000000..ad74e8d --- /dev/null +++ b/src/main/resources/templates/Teachers.html @@ -0,0 +1,98 @@ + + + + + English Department + + +Glass Dome + + + +

Kim Dawson

+

Vice Principal of Student Life, English Teacher +

+ +

+ Background: BA from Seattle University, MA from Seattle University +

+ +

+ Contact: kdawson@holynames-sea.org +

+
+
Positive Feedback + + +
+ +
Constructive Criticism + +
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/hello.html b/src/main/resources/templates/hello.html index aaeba56..1ad2fe9 100644 --- a/src/main/resources/templates/hello.html +++ b/src/main/resources/templates/hello.html @@ -6,5 +6,6 @@

+ \ No newline at end of file