-
Notifications
You must be signed in to change notification settings - Fork 0
Gregorio development #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
gasigala
wants to merge
6
commits into
main
Choose a base branch
from
GregorioDevelopment
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
23af3b5
add servelet and java script
gasigala de3e020
add array list, modify javascript
gasigala 974bfac
working json on html page
gasigala 5442ebb
week 2 done, add submission form
gasigala 182654c
pull request changes, 1 unresolved
gasigala 3efcbd6
requested changes made on java script file
gasigala File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
portfolio/src/main/java/com/google/sps/servlets/FormHandlerServlet.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.google.sps.servlets; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
|
|
||
| @WebServlet("/form-handler") | ||
|
|
||
| public class FormHandlerServlet extends HttpServlet { | ||
| @Override | ||
| public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { | ||
| // Get the value entered in the form. | ||
| String textValue = request.getParameter("text-input"); | ||
|
|
||
| // Print the value so you can see it in the server logs. | ||
| System.out.println("You submitted: " + textValue); | ||
|
|
||
| // Write the value to the response so the user can see it. | ||
| //want to be able to confirm resolution then go back to the page | ||
| response.setContentType("text/html;"); | ||
| response.getWriter().println("You submitted: " + textValue); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you want to add html tags to this, like |
||
|
|
||
| response.sendRedirect("http://gsigala-sps-spring21.appspot.com"); | ||
| } | ||
| } | ||
23 changes: 18 additions & 5 deletions
23
portfolio/src/main/java/com/google/sps/servlets/week2Servelet.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,34 @@ | ||
| package com.google.sps.servlets; | ||
|
|
||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import com.google.gson.Gson; | ||
| import javax.servlet.annotation.WebServlet; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
|
|
||
|
|
||
| /** Servlet that returns HTML that contains the page view count. */ | ||
| @WebServlet("/week2") | ||
| public class week2Servelet extends HttpServlet { | ||
|
|
||
|
|
||
| @Override | ||
| public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { | ||
| ArrayList<String> randomMessage= new ArrayList<String>(); | ||
| randomMessage.add("Hello there!"); | ||
| randomMessage.add("Hope you enjoy your stay."); | ||
| randomMessage.add("Stay tuned for what to come"); | ||
|
|
||
| response.setContentType("text/html;"); | ||
| response.getWriter().println("<h1>This is a servelet example:</h1>"); | ||
| response.getWriter().println("<p>Hello world!</p>"); | ||
| String json = convertToJsonUsingGson(randomMessage); | ||
| //not exactly sure | ||
| response.setContentType("application/json;"); | ||
| response.getWriter().println(json); | ||
|
|
||
| } | ||
| private static String convertToJsonUsingGson(ArrayList<String> randomMessage) { | ||
| Gson gson = new Gson(); | ||
| String json = gson.toJson(randomMessage); | ||
| return json; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| //will return a hardcoded message from json | ||
| async function random_greeting() { | ||
| const responseFromServer = await fetch('/week2');// week 2 is the week2Servelet.java | ||
| const messageContainer = document.getElementById('message-container'); | ||
|
|
||
| const textFromResponse = await responseFromServer.json(); | ||
| messageContainer.innerText = textFromResponse[Math.floor(Math.random() * 3)]; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.