diff --git a/.gitignore b/.gitignore
index 196330b..1a3bedd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,6 @@ vue-social/node_modules
vue-social/src/firebase.js
vue-social/yarn.lock
+vue-social/nohup.out
+springbackend/nohup.out
+
diff --git a/README.md b/README.md
index d606980..e8eeaaf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
# Social-network
a simple social network
+
**Tutorials I followed**
##Frontend
https://medium.com/@anas.mammeri/vue-2-firebase-how-to-add-firebase-social-sign-in-into-your-vue-application-21f341bbf1b
diff --git a/runsocial.sh b/runsocial.sh
new file mode 100644
index 0000000..2169d4e
--- /dev/null
+++ b/runsocial.sh
@@ -0,0 +1,2 @@
+sh springbackend/run.sh
+sh vue-social/run.sh
diff --git a/springbackend/pom.xml b/springbackend/pom.xml
index ae90845..97ced05 100644
--- a/springbackend/pom.xml
+++ b/springbackend/pom.xml
@@ -37,7 +37,10 @@
org.springframework.boot
spring-boot-starter-validation
-
+
+ com.h2database
+ h2
+
org.springframework.boot
spring-boot-configuration-processor
diff --git a/springbackend/run.sh b/springbackend/run.sh
index f4e3a7b..58ef184 100644
--- a/springbackend/run.sh
+++ b/springbackend/run.sh
@@ -1,13 +1,7 @@
-#git stash
-#git checkout master
-#git pull
-
sudo kill -9 `sudo lsof -t -i:8080`
mvn package -DskipTests=true
-# create upload-dir
-#mkdir upload-dir
-nohup java -jar -Dspring.profiles.active=prod target/ecommerce-backend-0.0.1-SNAPSHOT.jar &
-#java -jar -Dspring.profiles.active=prod target/ecommerce-backend-0.0.1-SNAPSHOT.jar &
+nohup java -jar target/ecommerce-backend-0.0.1-SNAPSHOT.jar &
+#java -jar -Dspring.profiles.active=prod target/springandfirebaseauth-0.0.1-SNAPSHOT.jar &
#jobs -l
#nohup python3 -m http.server 8001 &
diff --git a/springbackend/src/main/resources/application.yml b/springbackend/src/main/resources/application.yml
index a6a8092..a2f98f6 100644
--- a/springbackend/src/main/resources/application.yml
+++ b/springbackend/src/main/resources/application.yml
@@ -7,17 +7,17 @@ spring:
application:
name: visualizer
datasource:
- # url: jdbc:h2:mem:testdb
- # username: sa
- # password: password
+ url: jdbc:h2:mem:testdb
+ username: sa
+ password: password
# alternative datasource: external mysql database example
- url: jdbc:mysql://localhost:3306/social_network
- username: root
- password: root
+ #url: jdbc:mysql://localhost:3306/social_network
+ #username: root
+ #password: abcdTest9
jpa:
# remove the next line, if you use mysql:
- database-platform: org.hibernate.dialect.MySQL5Dialect
+ database-platform: org.hibernate.dialect.H2Dialect
hibernate:
ddl-auto: update
@@ -39,7 +39,7 @@ security:
allowed-origins:
- https://${DOMAIN}
- http://localhost:3000
- - http://localhost:8081
+ - http://139.59.38.249:8081
allowed-methods:
- GET
- POST
diff --git a/vue-social/run.sh b/vue-social/run.sh
new file mode 100644
index 0000000..6674b05
--- /dev/null
+++ b/vue-social/run.sh
@@ -0,0 +1,2 @@
+npm i
+nohup npm run serve &
diff --git a/vue-social/src/config.js b/vue-social/src/config.js
index afb3eea..d9ec16b 100644
--- a/vue-social/src/config.js
+++ b/vue-social/src/config.js
@@ -1 +1 @@
-export const API_BASE_URL = "http://localhost:8080/";
+export const API_BASE_URL = "http://139.59.38.249:8080/";
diff --git a/vue-social/src/views/Chat.vue b/vue-social/src/views/Chat.vue
new file mode 100644
index 0000000..53d1d0e
--- /dev/null
+++ b/vue-social/src/views/Chat.vue
@@ -0,0 +1,48 @@
+
+
+ -
+
+
+
+ {{item.email}}
+
+
+ {{item.name}}
+
+
+
+
![avatar]()
+
+
+
+
+
+
+
+
+