Move from backend to . (#8)

* Move from backend to . * Remove /backend from go mod path --------- Co-authored-by: Valentin Zwerschke <vallezw@gmail.com>
RomManager · May 4, 2023 · cf8e8a6 · cf8e8a6
1 parent 636f819
commit cf8e8a6
Show file tree

Hide file tree

Showing 32 changed files with 48 additions and 47 deletions.
diff --git a/backend/.air.toml → .air.toml b/backend/.air.toml → .air.toml
diff --git a/backend/.dockerignore → .dockerignore b/backend/.dockerignore → .dockerignore
diff --git a/backend/.env.example → .env.example b/backend/.env.example → .env.example
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
-          context: ./backend
+          context: .
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

diff --git a/backend/.gitignore → .gitignore b/backend/.gitignore → .gitignore
diff --git a/backend/Dockerfile → Dockerfile b/backend/Dockerfile → Dockerfile
@@ -8,7 +8,7 @@ RUN go mod download
 COPY ./ ./
 
 # todo add tests
-# RUN CGO_ENABLED=1 go test -timeout 30s -v github.com/RomManager/server/backend/tests
+# RUN CGO_ENABLED=1 go test -timeout 30s -v github.com/RomManager/server/tests
 
 RUN mkdir /app
 RUN CGO_ENABLED=1 go build \

diff --git a/README.md b/README.md
@@ -3,4 +3,22 @@ Will be using [go.rice](https://github.com/GeertJohan/go.rice) to connect web-cl
 
 Automate with npm script or something like that
 
-`docker run --rm -p 8080:8080 ghcr.io/rommanager/server:edge`
+`docker run --rm -p 8080:8080 ghcr.io/rommanager/server:edge`
+
+## Backend
+-- To be extended -- 
+
+The backend is written in go with gin and gorm
+
+`cd backend`
+
+`go run *.go`
+
+To run it with live reloading use [air](https://github.com/cosmtrek/air)
+
+`air`
+
+
+For the Images and game information we use the [SteamGridDB Api](https://www.steamgriddb.com/api/v2). Create a key and set it in the `.env`
+
+`STEAMGRIDDBAPIKEY="yourapikey"`
diff --git a/backend/README.md b/backend/README.md
diff --git a/backend/config/config.go → config/config.go b/backend/config/config.go → config/config.go
diff --git a/backend/controllers/auth.go → controllers/auth.go b/backend/controllers/auth.go → controllers/auth.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/RomManager/server/backend/models"
-	"github.com/RomManager/server/backend/request_types"
-	"github.com/RomManager/server/backend/utils"
-	"github.com/RomManager/server/backend/utils/token"
+	"github.com/RomManager/server/models"
+	"github.com/RomManager/server/request_types"
+	"github.com/RomManager/server/utils"
+	"github.com/RomManager/server/utils/token"
 	"github.com/gin-gonic/gin"
 )
 

diff --git a/backend/controllers/home.go → controllers/home.go b/backend/controllers/home.go → controllers/home.go
@@ -3,7 +3,7 @@ package controllers
 import (
 	"net/http"
 
-	"github.com/RomManager/server/backend/roms"
+	"github.com/RomManager/server/roms"
 	"github.com/gin-gonic/gin"
 )
 

diff --git a/backend/controllers/rom.go → controllers/rom.go b/backend/controllers/rom.go → controllers/rom.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/RomManager/server/backend/models"
-	"github.com/RomManager/server/backend/utils"
+	"github.com/RomManager/server/models"
+	"github.com/RomManager/server/utils"
 	"github.com/gin-gonic/gin"
 )
 

diff --git a/backend/controllers/routes.go → controllers/routes.go b/backend/controllers/routes.go → controllers/routes.go
@@ -3,8 +3,8 @@ package controllers
 import (
 	"fmt"
 
-	"github.com/RomManager/server/backend/config"
-	"github.com/RomManager/server/backend/middlewares"
+	"github.com/RomManager/server/config"
+	"github.com/RomManager/server/middlewares"
 	"github.com/gin-gonic/gin"
 )
 

diff --git a/backend/controllers/synchronization.go → controllers/synchronization.go b/backend/controllers/synchronization.go → controllers/synchronization.go
@@ -3,7 +3,7 @@ package controllers
 import (
 	"net/http"
 
-	"github.com/RomManager/server/backend/roms"
+	"github.com/RomManager/server/roms"
 	"github.com/gin-gonic/gin"
 )
 

diff --git a/backend/go.mod → go.mod b/backend/go.mod → go.mod
@@ -1,4 +1,4 @@
-module github.com/RomManager/server/backend
+module github.com/RomManager/server
 
 go 1.19
 

diff --git a/backend/go.sum → go.sum b/backend/go.sum → go.sum
diff --git a/backend/gridapi/requests.go → gridapi/requests.go b/backend/gridapi/requests.go → gridapi/requests.go
diff --git a/backend/gridapi/response_types.go → gridapi/response_types.go b/backend/gridapi/response_types.go → gridapi/response_types.go
diff --git a/backend/gridapi/setup.go → gridapi/setup.go b/backend/gridapi/setup.go → gridapi/setup.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/RomManager/server/backend/config"
+	"github.com/RomManager/server/config"
 	"github.com/fatih/color"
 )
 

diff --git a/backend/main.go → main.go b/backend/main.go → main.go
@@ -3,11 +3,11 @@ package main
 import (
 	"fmt"
 
-	"github.com/RomManager/server/backend/config"
-	"github.com/RomManager/server/backend/controllers"
-	"github.com/RomManager/server/backend/gridapi"
-	"github.com/RomManager/server/backend/models"
-	"github.com/RomManager/server/backend/roms"
+	"github.com/RomManager/server/config"
+	"github.com/RomManager/server/controllers"
+	"github.com/RomManager/server/gridapi"
+	"github.com/RomManager/server/models"
+	"github.com/RomManager/server/roms"
 )
 
 func main() {

diff --git a/backend/middlewares/auth.go → middlewares/auth.go b/backend/middlewares/auth.go → middlewares/auth.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/RomManager/server/backend/utils"
-	"github.com/RomManager/server/backend/utils/token"
+	"github.com/RomManager/server/utils"
+	"github.com/RomManager/server/utils/token"
 	"github.com/gin-gonic/gin"
 )
 

diff --git a/backend/middlewares/cors.go → middlewares/cors.go b/backend/middlewares/cors.go → middlewares/cors.go
diff --git a/backend/models/rom.go → models/rom.go b/backend/models/rom.go → models/rom.go
diff --git a/backend/models/setup.go → models/setup.go b/backend/models/setup.go → models/setup.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/RomManager/server/backend/config"
+	"github.com/RomManager/server/config"
 	"github.com/fatih/color"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"

diff --git a/backend/models/user.go → models/user.go b/backend/models/user.go → models/user.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/RomManager/server/backend/utils/token"
+	"github.com/RomManager/server/utils/token"
 	"golang.org/x/crypto/bcrypt"
 	"gorm.io/gorm"
 )

diff --git a/backend/request_types/auth.go → request_types/auth.go b/backend/request_types/auth.go → request_types/auth.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/RomManager/server/backend/utils"
+	"github.com/RomManager/server/utils"
 )
 
 type LoginRequest struct {

diff --git a/backend/roms/emulator_list.go → roms/emulator_list.go b/backend/roms/emulator_list.go → roms/emulator_list.go
diff --git a/backend/roms/synchronization.go → roms/synchronization.go b/backend/roms/synchronization.go → roms/synchronization.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/RomManager/server/backend/config"
-	"github.com/RomManager/server/backend/gridapi"
-	"github.com/RomManager/server/backend/models"
-	"github.com/RomManager/server/backend/utils"
+	"github.com/RomManager/server/config"
+	"github.com/RomManager/server/gridapi"
+	"github.com/RomManager/server/models"
+	"github.com/RomManager/server/utils"
 	"github.com/fatih/color"
 )
 

diff --git a/backend/utils/http.go → utils/http.go b/backend/utils/http.go → utils/http.go
diff --git a/backend/utils/logger/logger.go → utils/logger/logger.go b/backend/utils/logger/logger.go → utils/logger/logger.go
diff --git a/backend/utils/os.go → utils/os.go b/backend/utils/os.go → utils/os.go
diff --git a/backend/utils/token/token.go → utils/token/token.go b/backend/utils/token/token.go → utils/token/token.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/RomManager/server/backend/config"
+	"github.com/RomManager/server/config"
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
 )