Skip to content
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

Localtest #10

Open
wants to merge 80 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
ac2fe8c
wip: email working
bharani16592 Mar 19, 2022
1467a53
working with AWS rds
bharani16592 Mar 19, 2022
3544e39
Update pom.xml
bharani16592 Mar 19, 2022
8e7614e
Update pom.xml
bharani16592 Mar 19, 2022
1308051
working
bharani16592 Mar 20, 2022
a9090ae
resetpassword working
bharani16592 Mar 21, 2022
af07221
working code
bharani16592 Mar 22, 2022
255a131
Update README.md
bharani16592 Mar 22, 2022
a4f5191
Update application.yml
bharani16592 Mar 22, 2022
d7293a8
working
bharani16592 Mar 23, 2022
d03eb8c
working code chef menu
bharani16592 Mar 27, 2022
af0a266
customer image working
bharani16592 Apr 2, 2022
129cfd6
working code with image upload
bharani16592 Apr 2, 2022
5a61b5d
working code
bharani16592 Apr 3, 2022
7970f23
get chefmenu by id working
bharani16592 Apr 3, 2022
3ffd0bf
working
bharani16592 Apr 3, 2022
bf82886
working
bharani16592 Apr 4, 2022
d77179a
crossorgins added to all controllers
bharani16592 Apr 4, 2022
8eaa92c
working code
bharani16592 Apr 4, 2022
ac2ce51
contact FE working
bharani16592 Apr 4, 2022
ad2c339
chef signup FE working
bharani16592 Apr 4, 2022
cd63487
personal singup FE working
bharani16592 Apr 5, 2022
f668f03
saranya changes added but commented out
bharani16592 Apr 6, 2022
34b4cf3
Update application.yml
Saranya1994 Apr 6, 2022
8e2c206
working
bharani16592 Apr 7, 2022
98a0b49
login, update chef working
bharani16592 Apr 7, 2022
9f447f9
CuisineCategory and Zip
Saranya1994 Apr 7, 2022
c880cb5
Merge branch 'Bharani' into master
bharani16592 Apr 7, 2022
909a902
getCuisinebyZip service
lprasat1 Apr 7, 2022
e50e5ff
Merge pull request #4 from bharani16592/Saranya
bharani16592 Apr 8, 2022
2dc54d7
working
bharani16592 Apr 8, 2022
b620c6b
Merge branch 'master' of https://github.com/bharani16592/ethniconnect…
bharani16592 Apr 8, 2022
2b640ff
Update application.yml
bharani16592 Apr 8, 2022
6f450cd
chef details json format working
bharani16592 Apr 9, 2022
85c61fb
all working with changes
bharani16592 Apr 9, 2022
c06de28
all API's working
bharani16592 Apr 9, 2022
5bd20df
working
bharani16592 Apr 9, 2022
cc38d5b
All updated and working
bharani16592 Apr 9, 2022
c46704b
commit
bharani16592 Apr 10, 2022
7a79811
updated menucategories to lower and upper case working
bharani16592 Apr 10, 2022
a198ede
loginid
bharani16592 Apr 10, 2022
f2d5aa6
zipcontroller
Saranya1994 Apr 10, 2022
73e84bd
Merge pull request #5 from bharani16592/master
bharani16592 Apr 10, 2022
f1f3c01
working
bharani16592 Apr 10, 2022
d93020a
API integration
lprasat1 Apr 10, 2022
7159729
working
bharani16592 Apr 10, 2022
0b1ca34
working
bharani16592 Apr 10, 2022
1d71ee9
place order working
bharani16592 Apr 11, 2022
bed3025
get order details working
bharani16592 Apr 11, 2022
8085d58
no errors working
bharani16592 Apr 11, 2022
ef1fdbe
Merge pull request #6 from bharani16592/master
bharani16592 Apr 11, 2022
d5857ae
Merge pull request #7 from bharani16592/Saranya_V2
bharani16592 Apr 11, 2022
1aa5169
working all merged
bharani16592 Apr 11, 2022
3b5c2c9
order addition working
bharani16592 Apr 11, 2022
51b082f
working
bharani16592 Apr 11, 2022
077c2be
contact email update
bharani16592 Apr 11, 2022
eb3bc6d
API key change
Saranya1994 Apr 12, 2022
2ec6cb7
email working
bharani16592 Apr 12, 2022
2173605
Merge branch 'Saranya_V2' into master
bharani16592 Apr 12, 2022
4e68833
Merge pull request #8 from bharani16592/master
bharani16592 Apr 12, 2022
d8171a6
Merge pull request #9 from bharani16592/Saranya_V2
bharani16592 Apr 12, 2022
21b3e3f
get order working
bharani16592 Apr 12, 2022
8138ac3
place order is working
bharani16592 Apr 13, 2022
6b19e31
working
bharani16592 Apr 13, 2022
d859422
get chef menu working
bharani16592 Apr 13, 2022
681f84b
forgot pwd redirect url changed to FE url
bharani16592 Apr 13, 2022
016db68
orer item lazy issue
bharani16592 Apr 14, 2022
56c0217
working
bharani16592 Apr 14, 2022
4a2eef0
working
bharani16592 Apr 14, 2022
563a54f
order email working
bharani16592 Apr 14, 2022
d483702
working
bharani16592 Apr 15, 2022
8622e3f
activation link address changes
bharani16592 Apr 15, 2022
1539b2d
port change to localhost
bharani16592 Apr 15, 2022
00c8904
Customer Order email working
bharani16592 Apr 15, 2022
7fe6c1b
chef order email working
bharani16592 Apr 15, 2022
37603ad
Merge pull request #11 from bharani16592/master
bharani16592 Apr 15, 2022
760ec3b
application.yml update
bharani16592 Apr 15, 2022
ee5f4d5
zip api key changed
bharani16592 Apr 15, 2022
fcdcfe6
Merge pull request #12 from bharani16592/master
bharani16592 Apr 15, 2022
072b59f
api key changed to old one
bharani16592 Apr 15, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
33 changes: 0 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,33 +0,0 @@
# Login Registration Backend

Complete login registration backend system using Spring Boot.

[![YouTube Video](https://user-images.githubusercontent.com/40702606/104790682-d62ac880-578f-11eb-8353-aa68739ffe42.png)](https://www.youtube.com/watch?v=QwQuro7ekvc)

- [x] Spring Boot
- [x] Spring Security
- [x] Java Mail
- [x] Email verification with expiry
- [x] Spring Boot

## Diagram
![Screenshot 2021-01-13 at 23 38 08](https://user-images.githubusercontent.com/40702606/104789980-15581a00-578e-11eb-998d-30f2e6a9f461.png)

## Email verification link with expiry
![Screenshot 2021-01-13 at 23 37 33](https://user-images.githubusercontent.com/40702606/104789893-0c674880-578e-11eb-939a-2a1cd3a8dfd2.png)

## Example requests
### Postman
![Screenshot 2021-01-13 at 23 37 57](https://user-images.githubusercontent.com/40702606/104790087-7a137480-578e-11eb-8141-307a8850c39e.png)

### CURL
```
curl --location --request POST 'localhost:8080/api/v1/registration' \
--header 'Content-Type: application/json' \
--data-raw '{
"firstName": "Amigos",
"lastName": "Code",
"email": "[email protected]",
"password": "password"
}'
```
31 changes: 29 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
</properties>

<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
Expand All @@ -36,30 +41,52 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<!--<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
</dependency>-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand Down
Binary file added src/.DS_Store
Binary file not shown.
Binary file added src/main/.DS_Store
Binary file not shown.
Binary file added src/main/java/.DS_Store
Binary file not shown.
6 changes: 0 additions & 6 deletions src/main/java/com/example/demo/appuser/AppUserRole.java

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/java/com/example/demo/email/EmailSender.java

This file was deleted.

40 changes: 0 additions & 40 deletions src/main/java/com/example/demo/email/EmailService.java

This file was deleted.

This file was deleted.

142 changes: 0 additions & 142 deletions src/main/java/com/example/demo/registration/RegistrationService.java

This file was deleted.

Binary file added src/main/java/ethniconnect_backend/.DS_Store
Binary file not shown.
51 changes: 51 additions & 0 deletions src/main/java/ethniconnect_backend/ChefCreateMenu/ChefMenu.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package ethniconnect_backend.ChefCreateMenu;

import ethniconnect_backend.ChefDetails.Chef;
import ethniconnect_backend.Cuisines.CuisineCategory;
import lombok.*;

import javax.persistence.*;

@Data
@NoArgsConstructor
@AllArgsConstructor
@Getter
@Setter
@Entity
@Table(name = "chefmenu")
public class ChefMenu {
@Id
@GeneratedValue
private int id;
@Enumerated(EnumType.STRING)
private MenuCategories menucategories;
//private int cuisine_id;
@Lob
@Column(columnDefinition = "MEDIUMBLOB")
private String menu_item_image;
private String item_name;
private double menu_item_price;
private String item_ingredients;
private String item_intresting_facts;
@Enumerated(EnumType.STRING)
private Week week;
private long loginid;

//@ManyToOne
@ManyToOne
@JoinColumn(name = "cuisine_id")
private CuisineCategory cuisineCategory;
// @ManyToMany(mappedBy = "menu_items")
// Set<Order> orders;

@ManyToOne
@JoinColumn (name="loginid", insertable = false, updatable = false)
private Chef chef;
/*@JoinTable(
name = "selected_cuisines",
joinColumns = @JoinColumn(name = "menu_item_id"),
inverseJoinColumns = @JoinColumn(name = "cuisine_id"))
Set<CuisineCategories> selectedCuisines;*/


}
Loading