diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..7bfef59 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java b/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java
index c407bd5..8cc26d7 100644
--- a/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java
@@ -2,6 +2,8 @@
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -9,19 +11,22 @@
 
 import com.example.cosmosclient.R;
 
-public class ForgotPasswordActivity extends AppCompatActivity {
+public class ForgotPasswordActivity extends AppCompatActivity{
+    String EMailPattern = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$";
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_forgot_password);
 
+        //idの取得
         final EditText EmailAddressText = findViewById(R.id.EMailAddressText);
         Button SendButton = findViewById(R.id.SendButton);
-
-        SendButton.setOnClickListener(new View.OnClickListener(){
+        //送信ボタン処理
+        SendButton.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v){
+            public void onClick(View v) {
                 String MailAddress = EmailAddressText.getText().toString();
 
                 //メールアドレスをサーバに送信する処理の予定
@@ -30,7 +35,5 @@
                 finish();
             }
         });
-
-
     }
 }
diff --git a/app/src/main/java/com/example/cosmosclient/views/Signin.java b/app/src/main/java/com/example/cosmosclient/views/Signin.java
index b67541e..4b35113 100644
--- a/app/src/main/java/com/example/cosmosclient/views/Signin.java
+++ b/app/src/main/java/com/example/cosmosclient/views/Signin.java
@@ -1,10 +1,12 @@
 package com.example.cosmosclient.views;
 
+import java.util.List;
+
 import retrofit2.Call;
 import retrofit2.http.POST;
 import retrofit2.http.Path;
 
 public interface Signin {
     @POST("/users/{uId}/login")
-    Call<login> loginlist(@Path("uId") String uId,@Path("pw")String pw);
+    Call<login> loginlist(@Path("uId") String uId, @Path("pw")String pw);
 }
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
index 451b52f..0d46890 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -10,6 +10,8 @@
 import com.example.cosmosclient.R;
 
 
+import java.util.regex.Pattern;
+
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -25,13 +27,11 @@
 
         //retrofitの処理
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://cyberjapandata2.gsi.go.jp/")
+                .baseUrl("/cosmos")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         Signup signup = retrofit.create(Signup.class);
 
-        //finalつけないとエラー出る
-        final Call<User> call = signup.listUser("1d","2d","3");
 
         //各種idを取得
         Button LoginButton = findViewById(R.id.LoginButton);
@@ -40,27 +40,30 @@
         final EditText PasswordText = findViewById(R.id.PasswordText);
         final EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText);
 
+        //finalつけないとエラー出る
+        final Call<User> call = signup.listUser(EmailAddressText.getText().toString(),PasswordText.getText().toString(),"3");
+
         //Make Accountボタンの処理
         MakeAccountButton.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v){
                 Intent intent = new Intent(getApplication(), GroupList.class);
-                call.enqueue(new Callback<User>() {
-                    //成功時
-                    @Override
-                    public void onResponse(Call<User> call, Response<User> response) {
-                        if (response.isSuccessful()) {
-                            User result = response.body();
-                        }
-                    }
-
-                    //失敗時
-                    @Override
-                    public void onFailure(Call<User> call, Throwable t) {
-                        t.printStackTrace();
-                    }
-
-                });
+//                call.enqueue(new Callback<User>() {
+//                    //成功時
+//                    @Override
+//                    public void onResponse(Call<User> call, Response<User> response) {
+//                        if (response.isSuccessful()) {
+//                            User result = response.body();
+//                        }
+//                    }
+//
+//                    //失敗時
+//                    @Override
+//                    public void onFailure(Call<User> call, Throwable t) {
+//                        t.printStackTrace();
+//                    }
+//
+//                });
                 startActivity(intent);
                 finish();
             }