Merge pull request #89 from Pomog/den_dev

Den dev
Pomog · Jan 2, 2024 · df2bcb5 · df2bcb5
2 parents f361ad2 + aaf7d23
commit df2bcb5
Show file tree

Hide file tree

Showing 46 changed files with 268 additions and 3,282 deletions.
diff --git a/cmd/web/main.go b/cmd/web/main.go
@@ -49,6 +49,10 @@ func main() {
 	app.GitHubClientSecret = "2327f7f8677894e2726f70696d9321399efb6b61"
 	app.GitHubRedirectURL = "http://localhost:8080/github-callback"
 
+	app.GoogleClientID = "1045980296590-9c2dpdmdbp17kiih3oev5nsk55a33q29.apps.googleusercontent.com"
+	app.GoogleClientSecret = "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"
+	app.GoogleRedirectURL = "http://localhost:8080/google-callback"
+
 	//the list of games that are represented and will be covered on site.
 	app.GamesList = map[string]string{
 		"Lineage 2":                "L2",

diff --git a/cmd/web/routes.go b/cmd/web/routes.go
@@ -43,6 +43,9 @@ func routes(a *config.AppConfig) http.Handler {
 	mux.HandleFunc("/login-github", handler.Repo.LoginWithGitHubHandler)
 	mux.HandleFunc("/github-callback", handler.Repo.CallbackGitHubHandler)
 
+	mux.HandleFunc("/login-google", handler.Repo.LoginWithGoogleHandler)
+	mux.HandleFunc("/google-callback", handler.Repo.CallbackGoogleHandler)
+
 	return mux
 }
 

diff --git a/example/README.md b/example/README.md
diff --git a/example/config/db.go b/example/config/db.go
diff --git a/example/config/migrate.go b/example/config/migrate.go
diff --git a/example/config/migrations.go b/example/config/migrations.go
diff --git a/example/controller/categoryController.go b/example/controller/categoryController.go
diff --git a/example/controller/controllerHelpers.go b/example/controller/controllerHelpers.go