From dc5ce9b9245c439131916d6c39e14d87f09f3ec7 Mon Sep 17 00:00:00 2001 From: Maura Date: Mon, 12 Oct 2020 07:49:49 -0700 Subject: [PATCH 01/36] Created homepage --- src/main/resources/templates/Homepage.html | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/resources/templates/Homepage.html diff --git a/src/main/resources/templates/Homepage.html b/src/main/resources/templates/Homepage.html new file mode 100644 index 0000000..6aeeb73 --- /dev/null +++ b/src/main/resources/templates/Homepage.html @@ -0,0 +1,11 @@ + + + + + HNA Resources +

Study guides, Quizlets, Videos

+ + + + + \ No newline at end of file From 39cf41b87d2d7f8377e866ca235041cd14b2a0db Mon Sep 17 00:00:00 2001 From: Josie Margarones Date: Mon, 19 Oct 2020 07:18:35 -0700 Subject: [PATCH 02/36] started basic outlines of home pages --- src/main/java/service/MainController.java | 1 + src/main/java/service/subjectThing.java | 19 +++++++++++++++++++ src/main/resources/static/index.html | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/main/java/service/subjectThing.java diff --git a/src/main/java/service/MainController.java b/src/main/java/service/MainController.java index 5f4dddd..3c7117d 100644 --- a/src/main/java/service/MainController.java +++ b/src/main/java/service/MainController.java @@ -14,4 +14,5 @@ public String hello(@RequestParam(name="name", required=false, defaultValue="Wor return "hello"; } + } \ No newline at end of file diff --git a/src/main/java/service/subjectThing.java b/src/main/java/service/subjectThing.java new file mode 100644 index 0000000..3b728b0 --- /dev/null +++ b/src/main/java/service/subjectThing.java @@ -0,0 +1,19 @@ +package service; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class WebServer { + //arrayLists with each subjects classes (Science ---> Chem, Bio... + //tells the subject.html what class it is + // + public static void main(String[] args) { + SpringApplication.run(WebServer.class, args); + + int numClasses = 0; + //for(int i =0; i < ___; i++){ } + + } + +} diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 702abed..28689fb 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -5,6 +5,7 @@ -

Get your greeting here

+

Get your greeting

+here \ No newline at end of file From 2c79e3afe5992e321d3bd58cbfc4ac34db7e7700 Mon Sep 17 00:00:00 2001 From: Maura Date: Wed, 21 Oct 2020 07:51:36 -0700 Subject: [PATCH 03/36] Created subject & class lists for homepage and subject templates --- src/main/resources/templates/Homepage.html | 10 +++++++++- src/main/resources/templates/subject.html | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/templates/subject.html diff --git a/src/main/resources/templates/Homepage.html b/src/main/resources/templates/Homepage.html index 6aeeb73..f447890 100644 --- a/src/main/resources/templates/Homepage.html +++ b/src/main/resources/templates/Homepage.html @@ -6,6 +6,14 @@

Study guides, Quizlets, Videos

- +
    +
  • Math
    • +
  • English
    • +
  • Science
    • +
  • History
    • +
  • Religion
    • +
  • Language
    • +
  • Electives
    • +
\ No newline at end of file diff --git a/src/main/resources/templates/subject.html b/src/main/resources/templates/subject.html new file mode 100644 index 0000000..9c6a7c2 --- /dev/null +++ b/src/main/resources/templates/subject.html @@ -0,0 +1,18 @@ + + + + + Title + + +
    +
  • Class 1
    • +
  • Class 2
    • +
  • Class 3
    • +
  • Class 4
    • +
  • Class 5
    • +
  • Class 6
    • +
+ + + \ No newline at end of file From ab5815897540c5a331c0a749ae3c0f26e8b9f169 Mon Sep 17 00:00:00 2001 From: Maura Date: Mon, 26 Oct 2020 07:49:59 -0700 Subject: [PATCH 04/36] Created html links that takes each subject and links to a different page --- src/main/java/service/MainController.java | 8 ++++---- src/main/resources/static/index.html | 24 +++++++++++++++------- src/main/resources/templates/Homepage.html | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/service/MainController.java b/src/main/java/service/MainController.java index 5f4dddd..b400b92 100644 --- a/src/main/java/service/MainController.java +++ b/src/main/java/service/MainController.java @@ -8,10 +8,10 @@ @Controller public class MainController { - @GetMapping("/hello") - public String hello(@RequestParam(name="name", required=false, defaultValue="World") String name, Model model) { - model.addAttribute("name", name); - return "hello"; + @GetMapping("/subject") + public String subject(@RequestParam(name="subject", required=false, defaultValue="World") String name, Model model) { + model.addAttribute("subject", name); + return "subject"; } } \ No newline at end of file diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 702abed..98a67c1 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -1,10 +1,20 @@ - - - - Getting Started: Serving Web Content - + + + + + HNA Resources +

Study guides, Quizlets, Videos

-

Get your greeting here

+ - + + diff --git a/src/main/resources/templates/Homepage.html b/src/main/resources/templates/Homepage.html index f447890..c9c50a6 100644 --- a/src/main/resources/templates/Homepage.html +++ b/src/main/resources/templates/Homepage.html @@ -7,7 +7,7 @@

Study guides, Quizlets, Videos