diff --git a/.gitignore b/.gitignore index 79b5594..c4bf4a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +blog.db **/.DS_Store diff --git a/.vscode/launch.json b/.vscode/launch.json index 091c1c3..3938c30 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "type": "go", "request": "launch", "mode": "auto", - "program": "${workspaceFolder}/backend/cmd/", + "program": "${workspaceFolder}/cmd/", "args": ["serve"] } ] diff --git a/backend/README.md b/README.md similarity index 100% rename from backend/README.md rename to README.md diff --git a/backend b/backend new file mode 100755 index 0000000..84362d4 Binary files /dev/null and b/backend differ diff --git a/backend/.gitignore b/backend/.gitignore deleted file mode 100644 index 2fdf6da..0000000 --- a/backend/.gitignore +++ /dev/null @@ -1 +0,0 @@ -blog.db diff --git a/backend/blog.db b/backend/blog.db deleted file mode 100644 index daf3010..0000000 Binary files a/backend/blog.db and /dev/null differ diff --git a/backend/cmd/main.go b/cmd/main.go similarity index 84% rename from backend/cmd/main.go rename to cmd/main.go index 2171db9..f99141b 100644 --- a/backend/cmd/main.go +++ b/cmd/main.go @@ -6,8 +6,8 @@ import ( "net/http" "os" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/config" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/initialize" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/config" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/initialize" "go-simpler.org/env" ) diff --git a/backend/go.mod b/go.mod similarity index 88% rename from backend/go.mod rename to go.mod index adc5788..1fbc161 100644 --- a/backend/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.schreifuchs.ch/schreifuchs/ng-blog/backend +module git.schreifuchs.ch/schreifuchs/ng-blog go 1.24.2 diff --git a/backend/go.sum b/go.sum similarity index 100% rename from backend/go.sum rename to go.sum diff --git a/backend/internal/auth/controller.go b/internal/auth/controller.go similarity index 97% rename from backend/internal/auth/controller.go rename to internal/auth/controller.go index fe516f9..c8f47e8 100644 --- a/backend/internal/auth/controller.go +++ b/internal/auth/controller.go @@ -10,7 +10,7 @@ import ( "golang.org/x/crypto/bcrypt" "gorm.io/gorm" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" ) // Signup handles user signup by decoding request body, hashing the password, and saving user data to the database. diff --git a/backend/internal/auth/ctx.go b/internal/auth/ctx.go similarity index 100% rename from backend/internal/auth/ctx.go rename to internal/auth/ctx.go diff --git a/backend/internal/auth/jwt.go b/internal/auth/jwt.go similarity index 96% rename from backend/internal/auth/jwt.go rename to internal/auth/jwt.go index 2b688b5..6f4d920 100644 --- a/backend/internal/auth/jwt.go +++ b/internal/auth/jwt.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" jwt "github.com/golang-jwt/jwt/v5" ) diff --git a/backend/internal/auth/jwt_test.go b/internal/auth/jwt_test.go similarity index 95% rename from backend/internal/auth/jwt_test.go rename to internal/auth/jwt_test.go index a022949..735e992 100644 --- a/backend/internal/auth/jwt_test.go +++ b/internal/auth/jwt_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" "github.com/google/uuid" "gorm.io/driver/sqlite" "gorm.io/gorm" diff --git a/backend/internal/auth/middleware.go b/internal/auth/middleware.go similarity index 92% rename from backend/internal/auth/middleware.go rename to internal/auth/middleware.go index cf48e28..13e3026 100644 --- a/backend/internal/auth/middleware.go +++ b/internal/auth/middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "slices" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" ) // Authenticated: This function is a middleware that authenticates incoming HTTP requests using JWT tokens and role-based access control. diff --git a/backend/internal/auth/resource.go b/internal/auth/resource.go similarity index 96% rename from backend/internal/auth/resource.go rename to internal/auth/resource.go index f35b706..c06fc7d 100644 --- a/backend/internal/auth/resource.go +++ b/internal/auth/resource.go @@ -4,7 +4,7 @@ import ( "log" "time" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" jwt "github.com/golang-jwt/jwt/v5" "golang.org/x/crypto/bcrypt" "gorm.io/gorm" diff --git a/backend/internal/config/resource.go b/internal/config/resource.go similarity index 90% rename from backend/internal/config/resource.go rename to internal/config/resource.go index d89f84b..d1a9cf5 100644 --- a/backend/internal/config/resource.go +++ b/internal/config/resource.go @@ -3,7 +3,7 @@ package config import ( "time" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/auth" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/auth" ) // Config holds configuration settings for the application, loaded from environment variables. diff --git a/backend/internal/initialize/inject.go b/internal/initialize/inject.go similarity index 65% rename from backend/internal/initialize/inject.go rename to internal/initialize/inject.go index 62b499f..3cc5424 100644 --- a/backend/internal/initialize/inject.go +++ b/internal/initialize/inject.go @@ -3,23 +3,39 @@ package initialize import ( "net/http" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/auth" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/config" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/posts" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/pkg/cors" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/auth" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/config" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/posts" + "git.schreifuchs.ch/schreifuchs/ng-blog/pkg/cors" + "git.schreifuchs.ch/schreifuchs/ng-blog/pkg/middlewares" + "git.schreifuchs.ch/schreifuchs/ng-blog/web" "github.com/gorilla/mux" ) // CreateMux creates and configures a mux router with authentication and post-related routes. func CreateMux(cfg *config.Config) (r *mux.Router) { + r = mux.NewRouter() + r.Use(cors.HandlerForOrigin("*")) + + app(r.PathPrefix("/api").Subrouter(), cfg) + + frontend := web.Frontend + r.PathPrefix("/").Handler(middlewares.AddPrefix("/dist/frontend/browser", http.FileServerFS(frontend))) + + r.Methods("OPTIONS").HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // The CORS middleware should set up the headers for you + w.WriteHeader(http.StatusNoContent) + }) + + return +} + +func app(r *mux.Router, cfg *config.Config) { db := model.Init() blg := posts.New(db) auth := auth.New(&cfg.Auth, db) - r = mux.NewRouter() - r.Use(cors.HandlerForOrigin("*")) - // auth r.HandleFunc("/login", auth.Login).Methods("POST") r.HandleFunc("/signup", auth.Signup).Methods("POST") @@ -30,11 +46,4 @@ func CreateMux(cfg *config.Config) (r *mux.Router) { r.Handle("/posts", auth.Authenticated(blg.SavePost, model.RoleUser, model.RoleAdmin)).Methods("PUT") r.Handle("/posts/{postID}", auth.Authenticated(blg.DeletePost, model.RoleUser, model.RoleAdmin)).Methods("DELETE") r.Handle("/posts", http.HandlerFunc(blg.GetAllPosts)).Methods("GET") - - r.Methods("OPTIONS").HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - // The CORS middleware should set up the headers for you - w.WriteHeader(http.StatusNoContent) - }) - - return } diff --git a/backend/internal/model/auth.go b/internal/model/auth.go similarity index 100% rename from backend/internal/model/auth.go rename to internal/model/auth.go diff --git a/backend/internal/model/blog.go b/internal/model/blog.go similarity index 100% rename from backend/internal/model/blog.go rename to internal/model/blog.go diff --git a/backend/internal/model/init.go b/internal/model/init.go similarity index 100% rename from backend/internal/model/init.go rename to internal/model/init.go diff --git a/backend/internal/posts/controller.go b/internal/posts/controller.go similarity index 94% rename from backend/internal/posts/controller.go rename to internal/posts/controller.go index 361d118..1a5b73e 100644 --- a/backend/internal/posts/controller.go +++ b/internal/posts/controller.go @@ -7,8 +7,8 @@ import ( "net/http" "strconv" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/auth" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/auth" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" "github.com/gorilla/mux" ) diff --git a/backend/internal/posts/resource.go b/internal/posts/resource.go similarity index 100% rename from backend/internal/posts/resource.go rename to internal/posts/resource.go diff --git a/backend/internal/users/password.go b/internal/users/password.go similarity index 90% rename from backend/internal/users/password.go rename to internal/users/password.go index 3f6cf9a..c51de3b 100644 --- a/backend/internal/users/password.go +++ b/internal/users/password.go @@ -6,8 +6,8 @@ import ( "log" "net/http" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/auth" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/auth" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" "golang.org/x/crypto/bcrypt" ) diff --git a/backend/internal/users/resource.go b/internal/users/resource.go similarity index 100% rename from backend/internal/users/resource.go rename to internal/users/resource.go diff --git a/backend/internal/users/roles.go b/internal/users/roles.go similarity index 95% rename from backend/internal/users/roles.go rename to internal/users/roles.go index c188376..3f7f835 100644 --- a/backend/internal/users/roles.go +++ b/internal/users/roles.go @@ -7,8 +7,8 @@ import ( "log" "net/http" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/auth" - "git.schreifuchs.ch/schreifuchs/ng-blog/backend/internal/model" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/auth" + "git.schreifuchs.ch/schreifuchs/ng-blog/internal/model" "github.com/google/uuid" "github.com/gorilla/mux" "gorm.io/gorm" diff --git a/backend/pkg/cors/cors.go b/pkg/cors/cors.go similarity index 100% rename from backend/pkg/cors/cors.go rename to pkg/cors/cors.go diff --git a/pkg/middlewares/stripprefix.go b/pkg/middlewares/stripprefix.go new file mode 100644 index 0000000..b8d5f50 --- /dev/null +++ b/pkg/middlewares/stripprefix.go @@ -0,0 +1,25 @@ +package middlewares + +import ( + "net/http" + "net/url" +) + +func AddPrefix(prefix string, h http.Handler) http.Handler { + if prefix == "" { + return h + } + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + p := prefix + r.URL.Path + rp := prefix + r.URL.RawPath + + r2 := new(http.Request) + *r2 = *r + r2.URL = new(url.URL) + *r2.URL = *r.URL + r2.URL.Path = p + r2.URL.RawPath = rp + h.ServeHTTP(w, r2) + + }) +} diff --git a/frontend/.editorconfig b/web/.editorconfig similarity index 100% rename from frontend/.editorconfig rename to web/.editorconfig diff --git a/frontend/.gitignore b/web/.gitignore similarity index 100% rename from frontend/.gitignore rename to web/.gitignore diff --git a/frontend/.postcssrc.json b/web/.postcssrc.json similarity index 100% rename from frontend/.postcssrc.json rename to web/.postcssrc.json diff --git a/frontend/.vscode/extensions.json b/web/.vscode/extensions.json similarity index 100% rename from frontend/.vscode/extensions.json rename to web/.vscode/extensions.json diff --git a/frontend/.vscode/launch.json b/web/.vscode/launch.json similarity index 100% rename from frontend/.vscode/launch.json rename to web/.vscode/launch.json diff --git a/frontend/.vscode/tasks.json b/web/.vscode/tasks.json similarity index 100% rename from frontend/.vscode/tasks.json rename to web/.vscode/tasks.json diff --git a/frontend/README.md b/web/README.md similarity index 100% rename from frontend/README.md rename to web/README.md diff --git a/frontend/angular.json b/web/angular.json similarity index 100% rename from frontend/angular.json rename to web/angular.json diff --git a/web/embed.go b/web/embed.go new file mode 100644 index 0000000..2b1412f --- /dev/null +++ b/web/embed.go @@ -0,0 +1,6 @@ +package web + +import "embed" + +//go:embed all:dist/frontend/browser +var Frontend embed.FS diff --git a/frontend/package-lock.json b/web/package-lock.json similarity index 99% rename from frontend/package-lock.json rename to web/package-lock.json index b553057..9e60ca9 100644 --- a/frontend/package-lock.json +++ b/web/package-lock.json @@ -1,11 +1,11 @@ { - "name": "frontend", + "name": "web", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "frontend", + "name": "web", "version": "0.0.0", "dependencies": { "@angular/common": "^19.2.0", diff --git a/frontend/package.json b/web/package.json similarity index 98% rename from frontend/package.json rename to web/package.json index 77151e2..8446d49 100644 --- a/frontend/package.json +++ b/web/package.json @@ -1,5 +1,5 @@ { - "name": "frontend", + "name": "web", "version": "0.0.0", "scripts": { "ng": "ng", diff --git a/frontend/public/favicon.ico b/web/public/favicon.ico similarity index 100% rename from frontend/public/favicon.ico rename to web/public/favicon.ico diff --git a/frontend/src/app/app.component.html b/web/src/app/app.component.html similarity index 100% rename from frontend/src/app/app.component.html rename to web/src/app/app.component.html diff --git a/frontend/src/app/app.component.spec.ts b/web/src/app/app.component.spec.ts similarity index 100% rename from frontend/src/app/app.component.spec.ts rename to web/src/app/app.component.spec.ts diff --git a/frontend/src/app/app.component.ts b/web/src/app/app.component.ts similarity index 100% rename from frontend/src/app/app.component.ts rename to web/src/app/app.component.ts diff --git a/frontend/src/app/app.config.ts b/web/src/app/app.config.ts similarity index 100% rename from frontend/src/app/app.config.ts rename to web/src/app/app.config.ts diff --git a/frontend/src/app/app.routes.ts b/web/src/app/app.routes.ts similarity index 100% rename from frontend/src/app/app.routes.ts rename to web/src/app/app.routes.ts diff --git a/frontend/src/app/components/login/login.component.html b/web/src/app/components/login/login.component.html similarity index 100% rename from frontend/src/app/components/login/login.component.html rename to web/src/app/components/login/login.component.html diff --git a/frontend/src/app/components/login/login.component.spec.ts b/web/src/app/components/login/login.component.spec.ts similarity index 100% rename from frontend/src/app/components/login/login.component.spec.ts rename to web/src/app/components/login/login.component.spec.ts diff --git a/frontend/src/app/components/login/login.component.ts b/web/src/app/components/login/login.component.ts similarity index 100% rename from frontend/src/app/components/login/login.component.ts rename to web/src/app/components/login/login.component.ts diff --git a/frontend/src/app/components/markdown/markdown.component.html b/web/src/app/components/markdown/markdown.component.html similarity index 100% rename from frontend/src/app/components/markdown/markdown.component.html rename to web/src/app/components/markdown/markdown.component.html diff --git a/frontend/src/app/components/markdown/markdown.component.spec.ts b/web/src/app/components/markdown/markdown.component.spec.ts similarity index 100% rename from frontend/src/app/components/markdown/markdown.component.spec.ts rename to web/src/app/components/markdown/markdown.component.spec.ts diff --git a/frontend/src/app/components/markdown/markdown.component.ts b/web/src/app/components/markdown/markdown.component.ts similarity index 100% rename from frontend/src/app/components/markdown/markdown.component.ts rename to web/src/app/components/markdown/markdown.component.ts diff --git a/frontend/src/app/components/modal/modal.component.html b/web/src/app/components/modal/modal.component.html similarity index 100% rename from frontend/src/app/components/modal/modal.component.html rename to web/src/app/components/modal/modal.component.html diff --git a/frontend/src/app/components/modal/modal.component.spec.ts b/web/src/app/components/modal/modal.component.spec.ts similarity index 100% rename from frontend/src/app/components/modal/modal.component.spec.ts rename to web/src/app/components/modal/modal.component.spec.ts diff --git a/frontend/src/app/components/modal/modal.component.ts b/web/src/app/components/modal/modal.component.ts similarity index 100% rename from frontend/src/app/components/modal/modal.component.ts rename to web/src/app/components/modal/modal.component.ts diff --git a/frontend/src/app/components/post-editor/post-editor.component.html b/web/src/app/components/post-editor/post-editor.component.html similarity index 100% rename from frontend/src/app/components/post-editor/post-editor.component.html rename to web/src/app/components/post-editor/post-editor.component.html diff --git a/frontend/src/app/components/post-editor/post-editor.component.spec.ts b/web/src/app/components/post-editor/post-editor.component.spec.ts similarity index 100% rename from frontend/src/app/components/post-editor/post-editor.component.spec.ts rename to web/src/app/components/post-editor/post-editor.component.spec.ts diff --git a/frontend/src/app/components/post-editor/post-editor.component.ts b/web/src/app/components/post-editor/post-editor.component.ts similarity index 100% rename from frontend/src/app/components/post-editor/post-editor.component.ts rename to web/src/app/components/post-editor/post-editor.component.ts diff --git a/frontend/src/app/routes/dashboard/dashboard.component.html b/web/src/app/routes/dashboard/dashboard.component.html similarity index 100% rename from frontend/src/app/routes/dashboard/dashboard.component.html rename to web/src/app/routes/dashboard/dashboard.component.html diff --git a/frontend/src/app/routes/dashboard/dashboard.component.spec.ts b/web/src/app/routes/dashboard/dashboard.component.spec.ts similarity index 100% rename from frontend/src/app/routes/dashboard/dashboard.component.spec.ts rename to web/src/app/routes/dashboard/dashboard.component.spec.ts diff --git a/frontend/src/app/routes/dashboard/dashboard.component.ts b/web/src/app/routes/dashboard/dashboard.component.ts similarity index 100% rename from frontend/src/app/routes/dashboard/dashboard.component.ts rename to web/src/app/routes/dashboard/dashboard.component.ts diff --git a/frontend/src/app/routes/home/home.component.html b/web/src/app/routes/home/home.component.html similarity index 100% rename from frontend/src/app/routes/home/home.component.html rename to web/src/app/routes/home/home.component.html diff --git a/frontend/src/app/routes/home/home.component.spec.ts b/web/src/app/routes/home/home.component.spec.ts similarity index 100% rename from frontend/src/app/routes/home/home.component.spec.ts rename to web/src/app/routes/home/home.component.spec.ts diff --git a/frontend/src/app/routes/home/home.component.ts b/web/src/app/routes/home/home.component.ts similarity index 100% rename from frontend/src/app/routes/home/home.component.ts rename to web/src/app/routes/home/home.component.ts diff --git a/frontend/src/app/routes/post/create-post/create-post.component.html b/web/src/app/routes/post/create-post/create-post.component.html similarity index 100% rename from frontend/src/app/routes/post/create-post/create-post.component.html rename to web/src/app/routes/post/create-post/create-post.component.html diff --git a/frontend/src/app/routes/post/create-post/create-post.component.spec.ts b/web/src/app/routes/post/create-post/create-post.component.spec.ts similarity index 100% rename from frontend/src/app/routes/post/create-post/create-post.component.spec.ts rename to web/src/app/routes/post/create-post/create-post.component.spec.ts diff --git a/frontend/src/app/routes/post/create-post/create-post.component.ts b/web/src/app/routes/post/create-post/create-post.component.ts similarity index 100% rename from frontend/src/app/routes/post/create-post/create-post.component.ts rename to web/src/app/routes/post/create-post/create-post.component.ts diff --git a/frontend/src/app/routes/post/post.component.html b/web/src/app/routes/post/post.component.html similarity index 100% rename from frontend/src/app/routes/post/post.component.html rename to web/src/app/routes/post/post.component.html diff --git a/frontend/src/app/routes/post/post.component.spec.ts b/web/src/app/routes/post/post.component.spec.ts similarity index 100% rename from frontend/src/app/routes/post/post.component.spec.ts rename to web/src/app/routes/post/post.component.spec.ts diff --git a/frontend/src/app/routes/post/post.component.ts b/web/src/app/routes/post/post.component.ts similarity index 100% rename from frontend/src/app/routes/post/post.component.ts rename to web/src/app/routes/post/post.component.ts diff --git a/frontend/src/app/routes/post/update-post/update-post.component.html b/web/src/app/routes/post/update-post/update-post.component.html similarity index 100% rename from frontend/src/app/routes/post/update-post/update-post.component.html rename to web/src/app/routes/post/update-post/update-post.component.html diff --git a/frontend/src/app/routes/post/update-post/update-post.component.spec.ts b/web/src/app/routes/post/update-post/update-post.component.spec.ts similarity index 100% rename from frontend/src/app/routes/post/update-post/update-post.component.spec.ts rename to web/src/app/routes/post/update-post/update-post.component.spec.ts diff --git a/frontend/src/app/routes/post/update-post/update-post.component.ts b/web/src/app/routes/post/update-post/update-post.component.ts similarity index 100% rename from frontend/src/app/routes/post/update-post/update-post.component.ts rename to web/src/app/routes/post/update-post/update-post.component.ts diff --git a/frontend/src/app/shared/guards/logged-in.guard.spec.ts b/web/src/app/shared/guards/logged-in.guard.spec.ts similarity index 100% rename from frontend/src/app/shared/guards/logged-in.guard.spec.ts rename to web/src/app/shared/guards/logged-in.guard.spec.ts diff --git a/frontend/src/app/shared/guards/logged-in.guard.ts b/web/src/app/shared/guards/logged-in.guard.ts similarity index 100% rename from frontend/src/app/shared/guards/logged-in.guard.ts rename to web/src/app/shared/guards/logged-in.guard.ts diff --git a/frontend/src/app/shared/interceptors/auth.interceptor.spec.ts b/web/src/app/shared/interceptors/auth.interceptor.spec.ts similarity index 100% rename from frontend/src/app/shared/interceptors/auth.interceptor.spec.ts rename to web/src/app/shared/interceptors/auth.interceptor.spec.ts diff --git a/frontend/src/app/shared/interceptors/auth.interceptor.ts b/web/src/app/shared/interceptors/auth.interceptor.ts similarity index 100% rename from frontend/src/app/shared/interceptors/auth.interceptor.ts rename to web/src/app/shared/interceptors/auth.interceptor.ts diff --git a/frontend/src/app/shared/interfaces/auth.ts b/web/src/app/shared/interfaces/auth.ts similarity index 100% rename from frontend/src/app/shared/interfaces/auth.ts rename to web/src/app/shared/interfaces/auth.ts diff --git a/frontend/src/app/shared/interfaces/post.ts b/web/src/app/shared/interfaces/post.ts similarity index 100% rename from frontend/src/app/shared/interfaces/post.ts rename to web/src/app/shared/interfaces/post.ts diff --git a/frontend/src/app/shared/services/auth.service.spec.ts b/web/src/app/shared/services/auth.service.spec.ts similarity index 100% rename from frontend/src/app/shared/services/auth.service.spec.ts rename to web/src/app/shared/services/auth.service.spec.ts diff --git a/frontend/src/app/shared/services/auth.service.ts b/web/src/app/shared/services/auth.service.ts similarity index 100% rename from frontend/src/app/shared/services/auth.service.ts rename to web/src/app/shared/services/auth.service.ts diff --git a/frontend/src/app/shared/services/posts.service.spec.ts b/web/src/app/shared/services/posts.service.spec.ts similarity index 100% rename from frontend/src/app/shared/services/posts.service.spec.ts rename to web/src/app/shared/services/posts.service.spec.ts diff --git a/frontend/src/app/shared/services/posts.service.ts b/web/src/app/shared/services/posts.service.ts similarity index 100% rename from frontend/src/app/shared/services/posts.service.ts rename to web/src/app/shared/services/posts.service.ts diff --git a/frontend/src/environments/environment.ts b/web/src/environments/environment.ts similarity index 56% rename from frontend/src/environments/environment.ts rename to web/src/environments/environment.ts index aa209f8..b53507e 100644 --- a/frontend/src/environments/environment.ts +++ b/web/src/environments/environment.ts @@ -1,4 +1,4 @@ export const environment = { production: false, - apiRoot: 'http://localhost:8080', + apiRoot: 'http://localhost:8080/api', }; diff --git a/frontend/src/index.html b/web/src/index.html similarity index 100% rename from frontend/src/index.html rename to web/src/index.html diff --git a/frontend/src/main.ts b/web/src/main.ts similarity index 100% rename from frontend/src/main.ts rename to web/src/main.ts diff --git a/frontend/src/styles.css b/web/src/styles.css similarity index 100% rename from frontend/src/styles.css rename to web/src/styles.css diff --git a/frontend/tsconfig.app.json b/web/tsconfig.app.json similarity index 100% rename from frontend/tsconfig.app.json rename to web/tsconfig.app.json diff --git a/frontend/tsconfig.json b/web/tsconfig.json similarity index 100% rename from frontend/tsconfig.json rename to web/tsconfig.json diff --git a/frontend/tsconfig.spec.json b/web/tsconfig.spec.json similarity index 100% rename from frontend/tsconfig.spec.json rename to web/tsconfig.spec.json